Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion apps/server/src/provider/ClaudeProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ function claudeAuthStatus(
// Amazon Bedrock initializes far slower than first-party auth: the SDK boots the Bedrock
// backend and runs the `awsAuthRefresh` credential hook before returning account info.
const CAPABILITIES_PROBE_TIMEOUT_MS = 25_000;
// Native CLI startup on Windows can exceed the shared probe deadline.
const CLAUDE_VERSION_CHECK_TIMEOUT_MS = 20_000;

export const CLAUDE_CAPABILITIES_PROBE_SETTING_SOURCES = [
"user",
Expand Down Expand Up @@ -514,7 +516,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
["--version"],
resolvedEnvironment,
cwd,
).pipe(Effect.timeoutOption(DEFAULT_TIMEOUT_MS), Effect.result);
).pipe(Effect.timeoutOption(CLAUDE_VERSION_CHECK_TIMEOUT_MS), Effect.result);

if (Result.isFailure(versionProbe)) {
const error = versionProbe.failure;
Expand Down
60 changes: 60 additions & 0 deletions apps/server/src/provider/ProviderRegistry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3969,6 +3969,66 @@ it.layer(
),
);

it.effect.each([
{
name: "accepts a healthy claude --version response after 19 seconds",
answer: Effect.sleep("19 seconds"),
elapsed: 19_000,
status: "ready",
version: "1.0.0",
},
{
name: "bounds a hung claude --version probe",
answer: Effect.never,
elapsed: 21_000,
status: "error",
version: null,
},
])("$name", ({ answer, elapsed, status: expectedStatus, version }) =>
Effect.gen(function* () {
const started = yield* Deferred.make<void>();
const statusFiber = yield* checkClaudeProviderStatus(
defaultClaudeSettings,
claudeCapabilities(),
).pipe(
Effect.provide(
Layer.succeed(
ChildProcessSpawner.ChildProcessSpawner,
ChildProcessSpawner.make((command) => {
assert.deepStrictEqual(
(command as unknown as { args: ReadonlyArray<string> }).args,
["--version"],
);
return Effect.succeed(
ChildProcessSpawner.makeHandle({
...mockHandle({ stdout: "", stderr: "", code: 0 }),
exitCode: answer.pipe(Effect.as(ChildProcessSpawner.ExitCode(0))),
stdout: Stream.fromEffect(
Deferred.succeed(started, undefined).pipe(
Effect.andThen(answer),
Effect.as(encoder.encode("1.0.0\n")),
),
),
}),
);
}),
),
),
Effect.forkChild,
);
yield* Deferred.await(started);
yield* TestClock.adjust(elapsed);

const status = yield* Fiber.join(statusFiber);
assert.strictEqual(status.status, expectedStatus);
assert.strictEqual(status.installed, true);
assert.strictEqual(status.version, version);
if (expectedStatus === "error") {
assert.include(status.message, "Timed out while running command.");
}
}),
);

it.effect("returns ready and labels Bedrock-backed Claude as authenticated", () =>
Effect.gen(function* () {
// Bedrock authenticates via external AWS credentials, so the SDK init
Expand Down
Loading