Skip to content

fix(claude-code): propagate installation failures #1063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
35C4n0r merged 4 commits into from
Aug 25, 2026
Merged

fix(claude-code): propagate installation failures #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
511c889
fix(claude-code): propagate installation failures
Edd88-pixel Aug 19, 2026
e6d5454
test(claude-code): validate configured binary path
Edd88-pixel Aug 25, 2026
98b8ae6
test(claude-code): create configured binary path as root
Edd88-pixel Aug 25, 2026
254b75a
Merge branch 'main' into eddy/claude-code-install-reliability
35C4n0r Aug 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
175 changes: 156 additions & 19 deletions registry/coder/modules/claude-code/main.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,50 @@ const setup = async (
return { id, coderEnvVars, scripts };
};

const writeCurlMock = async (
containerId: string,
installer: string,
exitCode = 0,
) => {
const installerBase64 = Buffer.from(installer).toString("base64");
await writeExecutable({
containerId,
filePath: "/usr/local/bin/curl",
content: `#!/bin/bash
printf '%s\n' "$*" > /tmp/claude-installer-curl-args
output=""
while [ "$#" -gt 0 ]; do
if [ "$1" = "--output" ]; then
output="$2"
shift 2
continue
fi
shift
done
if [ ${exitCode} -ne 0 ]; then
exit ${exitCode}
fi
printf '%s' '${installerBase64}' | base64 -d > "$output"
`,
});
};

const successfulInstaller = `#!/bin/bash
set -euo pipefail
if [ "$#" -ne 1 ]; then
exit 2
fi
version="$1"
mkdir -p "$HOME/.local/bin"
cat > "$HOME/.local/bin/claude" <<CLAUDE
#!/bin/bash
if [ "\\$1" = "--version" ]; then
echo "claude version $version"
fi
CLAUDE
chmod +x "$HOME/.local/bin/claude"
`;

// Runs the coder-utils script pipeline (pre_install, install, post_install) in
// order inside the container. Each script is written to /tmp and executed
// under bash with the test's env vars exported first.
Expand Down Expand Up @@ -208,12 +252,113 @@ describe("claude-code", async () => {
claude_code_version: version,
},
});
await writeCurlMock(id, successfulInstaller);
await runScripts(id, scripts, coderEnvVars);
const installLog = await readFileContainer(
id,
"/home/coder/.coder-modules/coder/claude-code/logs/install.log",
);
expect(installLog).toContain(
"Claude Code installed successfully: claude version 1.0.40",
);
const curlArgs = await readFileContainer(
id,
"/tmp/claude-installer-curl-args",
);
expect(curlArgs).toContain("--retry 2");
expect(curlArgs).toContain("--connect-timeout 10");
expect(curlArgs).toContain("--max-time 60");
});

test.each([
[
"download failure",
"",
28,
"Claude Code could not be downloaded after up to 3 attempts.",
],
[
"invalid installer",
"<html>service unavailable</html>",
0,
"Claude Code installer download was invalid.",
],
[
"installer failure",
"#!/bin/bash\nexit 7\n",
0,
"Claude Code installation failed.",
],
[
"missing installed binary",
"#!/bin/bash\nexit 0\n",
0,
"Claude Code binary was not found.",
],
])(
"%s is propagated without reporting success",
async (_scenario, installer, exitCode, expectedError) => {
const { id, coderEnvVars, scripts } = await setup({
skipClaudeMock: true,
moduleVariables: { install_claude_code: "true" },
});
await writeCurlMock(id, installer, exitCode);

await expect(runScripts(id, scripts, coderEnvVars)).rejects.toThrow();

const installLog = await readFileContainer(
id,
"/home/coder/.coder-modules/coder/claude-code/logs/install.log",
);
expect(installLog).toContain(expectedError);
expect(installLog).not.toContain("Claude Code installed successfully");
},
);

test("pre-installed-binary-is-required-when-install-is-disabled", async () => {
const { id, coderEnvVars, scripts } = await setup({ skipClaudeMock: true });

await expect(runScripts(id, scripts, coderEnvVars)).rejects.toThrow();

const installLog = await readFileContainer(
id,
"/home/coder/.coder-modules/coder/claude-code/logs/install.log",
);
expect(installLog).toContain("Claude Code binary was not found.");
});

test("configured-pre-installed-binary-is-available-to-later-steps", async () => {
const { id, coderEnvVars, scripts } = await setup({
skipClaudeMock: true,
moduleVariables: {
claude_binary_path: "/opt/claude/bin",
Comment thread
Edd88-pixel marked this conversation as resolved.
mcp: JSON.stringify({
mcpServers: { test: { command: "test-cmd", type: "stdio" } },
}),
},
});
const mkdirResult = await execContainer(
id,
["mkdir", "-p", "/opt/claude/bin"],
["--user", "root"],
);
expect(mkdirResult.exitCode).toBe(0);
await writeExecutable({
containerId: id,
filePath: "/opt/claude/bin/claude",
content: await Bun.file(
path.join(import.meta.dir, "testdata", "claude-mock.sh"),
).text(),
});

await runScripts(id, scripts, coderEnvVars);

const installLog = await readFileContainer(
id,
"/home/coder/.coder-modules/coder/claude-code/logs/install.log",
);
expect(installLog).toContain(version);
expect(installLog).toContain("Claude Code validated successfully");
expect(installLog).toContain("claude invoked with: mcp add-json");
});

test("anthropic-api-key", async () => {
Expand Down Expand Up @@ -246,18 +391,19 @@ describe("claude-code", async () => {
},
});
const { id, coderEnvVars, scripts } = await setup({
skipClaudeMock: true,
moduleVariables: {
install_claude_code: "true",
mcp: mcpConfig,
},
});
await runScripts(id, scripts, coderEnvVars);
const claudeConfig = await readFileContainer(
const installLog = await readFileContainer(
id,
"/home/coder/.claude.json",
"/home/coder/.coder-modules/coder/claude-code/logs/install.log",
);
expect(claudeConfig).toContain("test-cmd");
expect(installLog).toContain(
"claude invoked with: mcp add-json --scope user test",
);
expect(installLog).toContain("test-cmd");
});

test("claude-model", async () => {
Expand Down Expand Up @@ -314,9 +460,7 @@ describe("claude-code", async () => {
"https://raw.githubusercontent.com/coder/coder/main/.mcp.json";

const { id, coderEnvVars, scripts } = await setup({
skipClaudeMock: true,
moduleVariables: {
install_claude_code: "true",
mcp_config_remote_path: JSON.stringify([failingUrl, successUrl]),
},
});
Expand All @@ -341,21 +485,14 @@ describe("claude-code", async () => {
`Warning: Failed to fetch MCP configuration from '${successUrl}'`,
);

// Should contain the MCP server add command from the successful fetch.
// The mock mirrors invocations so the test verifies the module-to-CLI
// boundary without depending on Claude Code's on-disk config format.
expect(installLog).toContain(
"Added stdio MCP server go-language-server to user config",
"claude invoked with: mcp add-json --scope user go-language-server",
);
expect(installLog).toContain(
"Added stdio MCP server typescript-language-server to user config",
);

// Verify the MCP config was added to .claude.json.
const claudeConfig = await readFileContainer(
id,
"/home/coder/.claude.json",
"claude invoked with: mcp add-json --scope user typescript-language-server",
);
expect(claudeConfig).toContain("typescript-language-server");
expect(claudeConfig).toContain("go-language-server");
});

test("standalone-mode-with-api-key", async () => {
Expand Down
69 changes: 48 additions & 21 deletions registry/coder/modules/claude-code/scripts/install.sh.tftpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,50 +76,77 @@ function add_path_to_shell_profiles() {
fi
}

function ensure_claude_in_path() {
local CLAUDE_BIN=""
if command -v claude > /dev/null 2>&1; then
CLAUDE_BIN=$(command -v claude)
elif [ -x "$${ARG_CLAUDE_BINARY_PATH}/claude" ]; then
CLAUDE_BIN="$${ARG_CLAUDE_BINARY_PATH}/claude"
function resolve_claude_binary() {
if [ -x "$${ARG_CLAUDE_BINARY_PATH}/claude" ]; then
printf '%s\n' "$${ARG_CLAUDE_BINARY_PATH}/claude"
elif command -v claude > /dev/null 2>&1; then
command -v claude
elif [ -x "$HOME/.local/bin/claude" ]; then
CLAUDE_BIN="$HOME/.local/bin/claude"
printf '%s\n' "$HOME/.local/bin/claude"
else
echo "Claude Code binary was not found." >&2
return 1
fi
}

if [ -z "$${CLAUDE_BIN}" ] || [ ! -x "$${CLAUDE_BIN}" ]; then
echo "Warning: Could not find claude binary"
return
function configure_claude_binary() {
local action="$1"
local CLAUDE_BIN
local CLAUDE_VERSION

CLAUDE_BIN=$(resolve_claude_binary)

if ! CLAUDE_VERSION=$("$${CLAUDE_BIN}" --version); then
echo "Claude Code binary could not be executed." >&2
return 1
Comment thread
35C4n0r marked this conversation as resolved.
fi

local CLAUDE_DIR
CLAUDE_DIR=$(dirname "$${CLAUDE_BIN}")
export PATH="$${CLAUDE_DIR}:$PATH"

if [ -n "$${CODER_SCRIPT_BIN_DIR:-}" ] && [ ! -e "$${CODER_SCRIPT_BIN_DIR}/claude" ]; then
ln -s "$${CLAUDE_BIN}" "$${CODER_SCRIPT_BIN_DIR}/claude"
echo "Created symlink: $${CODER_SCRIPT_BIN_DIR}/claude -> $${CLAUDE_BIN}"
fi

add_path_to_shell_profiles "$${CLAUDE_DIR}"
printf "Claude Code %s successfully: %s\n" "$${action}" "$${CLAUDE_VERSION}"
}

function install_with_official_installer() (
local installer_file
installer_file=$(mktemp)
trap 'rm -f "$${installer_file}"' EXIT

if ! curl --fail --silent --show-error --location \
--retry 2 --retry-connrefused --connect-timeout 10 --max-time 60 \
--output "$${installer_file}" https://claude.ai/install.sh; then
echo "Claude Code could not be downloaded after up to 3 attempts." >&2
return 1
fi

if ! bash -n "$${installer_file}"; then
echo "Claude Code installer download was invalid." >&2
return 1
fi

if ! bash "$${installer_file}" "$${ARG_CLAUDE_CODE_VERSION}"; then
echo "Claude Code installation failed." >&2
return 1
fi
)

function install_claude_code_cli() {
if [ "$${ARG_INSTALL_CLAUDE_CODE}" != "true" ]; then
echo "Skipping Claude Code installation as per configuration."
ensure_claude_in_path
configure_claude_binary "validated"
return
fi

echo "Installing Claude Code via official installer"
set +e
curl -fsSL claude.ai/install.sh | bash -s -- "$${ARG_CLAUDE_CODE_VERSION}" 2>&1
CURL_EXIT=$${PIPESTATUS[0]}
set -e
if [ $${CURL_EXIT} -ne 0 ]; then
echo "Claude Code installer failed with exit code $${CURL_EXIT}"
fi
echo "Installed Claude Code successfully. Version: $(claude --version || echo 'unknown')"

ensure_claude_in_path
install_with_official_installer
configure_claude_binary "installed"
}

function setup_claude_configurations() {
Expand Down