From a2132568dcdd271ffefb84b5ae7c868178cc9232 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Tue, 10 Nov 2026 19:09:49 +0000 Subject: [PATCH 1/2] test(server): Grok agent launch env names its thread (repro #34024) Grok's runtime factory drops the per-thread processEnvironment that other ACP flavors merge into the spawn env, so the Grok process never gets T3CODE_THREAD_ID. This test fails on main for that reason. AI-assisted; verified with the tests and tools listed above. Co-Authored-By: Claude Opus 5.5 --- .../Adapters/GrokAdapterV2.test.ts | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/apps/server/src/orchestration-v2/Adapters/GrokAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/GrokAdapterV2.test.ts index dec55480af30..c582b87019c2 100644 --- a/apps/server/src/orchestration-v2/Adapters/GrokAdapterV2.test.ts +++ b/apps/server/src/orchestration-v2/Adapters/GrokAdapterV2.test.ts @@ -1,6 +1,7 @@ import * as NodeCrypto from "@effect/platform-node/NodeCrypto"; import * as NodeServices from "@effect/platform-node/NodeServices"; import { + EnvironmentId, ProjectId, MessageId, NodeId, @@ -289,6 +290,52 @@ describe("Grok launch permission mode", () => { ...override, }); + it.effect("launches the agent with the env that names the thread it serves", () => + Effect.gen(function* () { + const instanceId = ProviderInstanceId.make("grok-launch-test"); + const threadId = ThreadId.make("grok-launch-thread-env"); + const endpoint = "http://127.0.0.1:43123/mcp"; + yield* (yield* McpProviderSessions.McpProviderSessions).set({ + environmentId: EnvironmentId.make("environment-grok-launch-thread-env"), + threadId, + providerSessionId: "mcp-session-grok-launch-thread-env", + providerInstanceId: instanceId, + endpoint, + authorizationHeader: "Bearer grok-thread-env-token", + browserToolsAvailable: false, + }); + const environments: Array | undefined> = []; + const childProcessSpawner = ChildProcessSpawner.make((command) => { + if (command._tag === "StandardCommand") environments.push(command.options.env); + return Effect.fail( + PlatformError.systemError({ + _tag: "NotFound", + module: "grok-launch-test", + method: "spawn", + }), + ); + }); + const adapter = yield* makeGrokAdapterV2({ + instanceId, + settings: LAUNCH_TEST_GROK_SETTINGS, + environment: {}, + hostPlatform: "darwin", + selfInvocation: yield* resolveSelfInvocation(), + }).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, childProcessSpawner)); + yield* adapter + .openSession({ + threadId, + providerSessionId: ProviderSessionId.make("grok-launch-thread-env"), + modelSelection: { instanceId, model: "grok-build" }, + runtimePolicy: policy("full-access"), + }) + .pipe(Effect.scoped, Effect.ignore); + assert.lengthOf(environments, 1); + assert.equal(environments[0]?.T3CODE_THREAD_ID, "grok-launch-thread-env"); + assert.equal(environments[0]?.T3_ACP_MCP_ENDPOINT, endpoint); + }).pipe(Effect.provideService(HostProcess.Platform, "darwin"), Effect.provide(layerTest)), + ); + it.effect.each( ( [ From a6f0a6c9ea5266f684eacf650f996288efe49603 Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Tue, 10 Nov 2026 19:18:22 +0000 Subject: [PATCH 2/2] fix(server): Grok agent processes receive the thread's environment Merge the per-thread processEnvironment (T3CODE_THREAD_ID, T3_ACP_MCP_*) into the Grok ACP spawn environment, as the ACP registry, Fx and Kiro adapters do. Fixes pingdotgg/t3code#34024 AI-assisted; verified with the tests and tools listed above. --- packages/provider-grok/src/server/adapter.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/provider-grok/src/server/adapter.ts b/packages/provider-grok/src/server/adapter.ts index 9ed1368f1698..5ab250dee56e 100644 --- a/packages/provider-grok/src/server/adapter.ts +++ b/packages/provider-grok/src/server/adapter.ts @@ -291,12 +291,12 @@ export function makeGrokAcpAdapterFlavor( }), makeRuntime: options.makeRuntime ?? - (({ runtimePolicy, ...input }) => + (({ runtimePolicy, processEnvironment, ...input }) => makeGrokAcpRuntime({ ...input, interruptPromptOnCancel: input.interruptPromptOnCancel ?? false, grokSettings: options.settings, - environment: options.environment, + environment: { ...options.environment, ...processEnvironment }, runtimeMode: grokLaunchRuntimeMode(runtimePolicy), })), // Auto prompts represent classifier refusals and must reach the user.