Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
fix(server): thread cwd through Claude capability probe (#2048) (#2124)
Matt Van Horn4e3f2f04d577
diff --git a/apps/server/src/provider/Drivers/ClaudeDriver.ts b/apps/server/src/provider/Drivers/ClaudeDriver.tsindex f2b04b3a2..ee9cddf94 100644--- a/apps/server/src/provider/Drivers/ClaudeDriver.ts+++ b/apps/server/src/provider/Drivers/ClaudeDriver.ts@@ -119,6 +119,7 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv> = {Effect.gen(function* () {const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;const path = yield* Path.Path;+ const { cwd } = yield* ServerConfig;const httpClient = yield* HttpClient.HttpClient;const serverSettings = yield* ServerSettingsService;const eventLoggers = yield* ProviderEventLoggers;@@ -154,11 +155,11 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv> = {capacity: 1,timeToLive: CAPABILITIES_PROBE_TTL,lookup: () =>- probeClaudeCapabilities(effectiveConfig, processEnv).pipe(+ probeClaudeCapabilities(effectiveConfig, processEnv, cwd).pipe(Effect.provideService(Path.Path, path),),});- const capabilitiesCacheKey = yield* makeClaudeCapabilitiesCacheKey(effectiveConfig);+ const capabilitiesCacheKey = yield* makeClaudeCapabilitiesCacheKey(effectiveConfig, cwd);const checkProvider = checkClaudeProviderStatus(effectiveConfig,diff --git a/apps/server/src/provider/Drivers/ClaudeHome.test.ts b/apps/server/src/provider/Drivers/ClaudeHome.test.tsindex 97a71fb6e..a7ff41fc8 100644--- a/apps/server/src/provider/Drivers/ClaudeHome.test.ts+++ b/apps/server/src/provider/Drivers/ClaudeHome.test.ts@@ -34,11 +34,20 @@ it.layer(NodeServices.layer)("ClaudeHome", (it) => {expect((yield* makeClaudeEnvironment({ homePath })).CLAUDE_CONFIG_DIR).toBe(resolved);expect(yield* makeClaudeContinuationGroupKey({ homePath })).toBe(`claude:home:${resolved}`);expect(yield* makeClaudeCapabilitiesCacheKey({ binaryPath: "claude", homePath })).toBe(- `claude\0${resolved}`,+ `claude\0${resolved}\0`,);}),);+ it.effect("separates capability probes by cwd", () =>+ Effect.gen(function* () {+ const config = { binaryPath: "claude", homePath: "" };+ const first = yield* makeClaudeCapabilitiesCacheKey(config, "/repo-a");+ const second = yield* makeClaudeCapabilitiesCacheKey(config, "/repo-b");+ expect(first).not.toBe(second);+ }),+ );+it.effect("keeps continuation compatible across instances with the same Claude HOME", () =>Effect.gen(function* () {const path = yield* Path.Path;diff --git a/apps/server/src/provider/Drivers/ClaudeHome.ts b/apps/server/src/provider/Drivers/ClaudeHome.tsindex f7d1ee539..b3ef22b64 100644--- a/apps/server/src/provider/Drivers/ClaudeHome.ts+++ b/apps/server/src/provider/Drivers/ClaudeHome.ts@@ -44,8 +44,9 @@ export const makeClaudeContinuationGroupKey = Effect.fn("makeClaudeContinuationGexport const makeClaudeCapabilitiesCacheKey = Effect.fn("makeClaudeCapabilitiesCacheKey")(function* (config: Pick<ClaudeSettings, "binaryPath" | "homePath">,+ cwd?: string,): Effect.fn.Return<string, never, Path.Path> {const resolvedHomePath = yield* resolveClaudeHomePath(config);- return `${config.binaryPath}\0${resolvedHomePath}`;+ return `${config.binaryPath}\0${resolvedHomePath}\0${cwd ?? ""}`;},);diff --git a/apps/server/src/provider/Layers/ClaudeProvider.ts b/apps/server/src/provider/Layers/ClaudeProvider.tsindex 59b7d0464..af8f5d670 100644--- a/apps/server/src/provider/Layers/ClaudeProvider.ts+++ b/apps/server/src/provider/Layers/ClaudeProvider.ts@@ -583,6 +583,7 @@ function waitForAbortSignal(signal: AbortSignal): Promise<void> {const probeClaudeCapabilities = (claudeSettings: ClaudeSettings,environment?: NodeJS.ProcessEnv,+ cwd?: string,) => {const abort = new AbortController();return Effect.gen(function* () {@@ -602,6 +603,7 @@ const probeClaudeCapabilities = (settingSources: ["user", "project", "local"],allowedTools: [],env: claudeEnvironment,+ ...(cwd ? { cwd } : {}),stderr: () => {},},});