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(ssh): restore user PATH for remote servers (#7213)
Guilherme Barros49c2b4471c59
diff --git a/apps/server/src/provider/Layers/ClaudeProvider.ts b/apps/server/src/provider/Layers/ClaudeProvider.tsindex b08b5db68..806f7e19b 100644--- a/apps/server/src/provider/Layers/ClaudeProvider.ts+++ b/apps/server/src/provider/Layers/ClaudeProvider.ts@@ -862,7 +862,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(status: "error",auth: { status: "unknown" },message: isCommandMissingCause(error)- ? "Claude Agent CLI (`claude`) is not installed or not on PATH."+ ? "Claude Agent CLI (`claude`) was not found on PATH.": "Failed to execute Claude Agent CLI health check.",},});diff --git a/apps/server/src/provider/Layers/CodexProvider.ts b/apps/server/src/provider/Layers/CodexProvider.tsindex 1d58ca6b1..6e485dd0a 100644--- a/apps/server/src/provider/Layers/CodexProvider.ts+++ b/apps/server/src/provider/Layers/CodexProvider.ts@@ -576,7 +576,7 @@ export const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(fuauth: { status: "unknown" },message: installed? `Codex app-server provider probe failed: ${error.message}.`- : "Codex CLI (`codex`) is not installed or not on PATH.",+ : "Codex CLI (`codex`) was not found on PATH.",},});}diff --git a/apps/server/src/provider/Layers/ProviderRegistry.test.ts b/apps/server/src/provider/Layers/ProviderRegistry.test.tsindex 9a72ea83d..cc994f8e5 100644--- a/apps/server/src/provider/Layers/ProviderRegistry.test.ts+++ b/apps/server/src/provider/Layers/ProviderRegistry.test.ts@@ -494,10 +494,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Teassert.strictEqual(status.status, "error");assert.strictEqual(status.installed, false);assert.strictEqual(status.auth.status, "unknown");- assert.strictEqual(- status.message,- "Codex CLI (`codex`) is not installed or not on PATH.",- );+ assert.strictEqual(status.message, "Codex CLI (`codex`) was not found on PATH.");}),);@@ -1462,7 +1459,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Teassert.strictEqual(codexPersonal?.installed, false);assert.strictEqual(codexPersonal?.message,- "Codex CLI (`codex`) is not installed or not on PATH.",+ "Codex CLI (`codex`) was not found on PATH.",);}).pipe(Effect.provide(runtimeServices));}),@@ -2252,10 +2249,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Teassert.strictEqual(status.status, "error");assert.strictEqual(status.installed, false);assert.strictEqual(status.auth.status, "unknown");- assert.strictEqual(- status.message,- "Claude Agent CLI (`claude`) is not installed or not on PATH.",- );+ assert.strictEqual(status.message, "Claude Agent CLI (`claude`) was not found on PATH.");}).pipe(Effect.provide(failingSpawnerLayer("spawn claude ENOENT"))),);diff --git a/packages/ssh/src/tunnel.test.ts b/packages/ssh/src/tunnel.test.tsindex 461509ea0..392885b64 100644--- a/packages/ssh/src/tunnel.test.ts+++ b/packages/ssh/src/tunnel.test.ts@@ -243,8 +243,12 @@ describe("ssh tunnel scripts", () => {username: "julius",port: 2222,} as const;- const spawner = ChildProcessSpawner.make(() =>- Effect.succeed(makeSuccessfulProcess('loaded nvm default\n{"remotePort":3774}\n')),+ const spawnedCommands: Array<ReadonlyArray<string>> = [];+ const spawner = ChildProcessSpawner.make((command) =>+ Effect.sync(() => {+ spawnedCommands.push(commandArgs(command));+ return makeSuccessfulProcess('loaded nvm default\n{"remotePort":3774}\n');+ }),);const spawnerLayer = Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner);const processLayer = Layer.merge(NodeServices.layer, spawnerLayer);@@ -252,6 +256,7 @@ describe("ssh tunnel scripts", () => {return Effect.gen(function* () {const result = yield* launchOrReuseRemoteServer(target);assert.equal(result.remotePort, 3774);+ assert.deepEqual(spawnedCommands[0]?.slice(-5, -1), ["sh", "-l", "-s", "--"]);}).pipe(Effect.provide(processLayer));});diff --git a/packages/ssh/src/tunnel.ts b/packages/ssh/src/tunnel.tsindex 12ab00278..0afd1007f 100644--- a/packages/ssh/src/tunnel.ts+++ b/packages/ssh/src/tunnel.ts@@ -724,7 +724,7 @@ export const launchOrReuseRemoteServer = Effect.fn("ssh/tunnel.launchOrReuseRemostateKey: remoteStateKey(target),});const result = yield* runSshCommand(target, {- remoteCommandArgs: ["sh", "-s", "--", remoteStateKey(target)],+ remoteCommandArgs: ["sh", "-l", "-s", "--", remoteStateKey(target)],stdin: buildRemoteLaunchScript(runner),timeoutMs: REMOTE_LAUNCH_TIMEOUT_MS,...(input?.authSecret === undefined ? {} : { authSecret: input.authSecret }),