Skip to content
TypeScript

fix(server): ACP agents get T3CODE_THREAD_ID like Claude and Codex sessions (#30361)

Frank Hommers396e646c4fd3
diff --git a/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts
index dff370bd611..80767503418 100644
--- a/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts
@@ -4431,7 +4431,10 @@ describe("AcpAdapterV2", () => {
{
sessionId: "mock-session-1-fork",
command: process.execPath,
- args: ["-e", "process.stdout.write(process.env.T3_ACP_MCP_AUTHORIZATION ?? '')"],
+ args: [
+ "-e",
+ "process.stdout.write(`${process.env.T3CODE_THREAD_ID ?? ''}\n${process.env.T3_ACP_MCP_AUTHORIZATION ?? ''}`)",
+ ],
},
{ requestId: "test-terminal-create", method: "terminal/create" },
);
@@ -4449,7 +4452,10 @@ describe("AcpAdapterV2", () => {
},
{ requestId: "test-terminal-output", method: "terminal/output" },
);
- assert.equal(terminalOutput.output, "Bearer target-thread-token");
+ assert.equal(
+ terminalOutput.output,
+ "thread-acp-native-fork-target\nBearer target-thread-token",
+ );
}).pipe(Effect.provide(layerTest), Effect.scoped),
);
@@ -5081,6 +5087,10 @@ describe("AcpAdapterV2", () => {
runtimeInputs[1]?.processEnvironment?.T3_ACP_MCP_AUTHORIZATION,
"Bearer rollback-target-token",
);
+ assert.equal(
+ runtimeInputs[1]?.processEnvironment?.T3CODE_THREAD_ID,
+ "thread-acp-rollback-session-target",
+ );
const replacementMcpServer = runtimeInputs[1]?.mcpServers[0];
const replacementMcpEnvironment =
replacementMcpServer !== undefined &&
diff --git a/apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts
index 8b9852ebc05..df5b8fee2f7 100644
--- a/apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts
@@ -1248,6 +1248,85 @@ describe("AcpRegistryAdapterV2", () => {
}).pipe(Effect.provide(layerTest), Effect.scoped),
);
+ it.effect("the agent process env names the thread it serves", () =>
+ Effect.gen(function* () {
+ const selfInvocation = yield* resolveSelfInvocation();
+ const mockAgentPath = yield* (yield* Path.Path).fromFileUrl(
+ new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
+ );
+ const endpoint = "http://127.0.0.1:43123/mcp";
+ const instanceId = ProviderInstanceId.make("acp-registry-thread-env");
+ const threadId = ThreadId.make("thread-acp-registry-thread-env");
+ yield* (yield* McpProviderSessions.McpProviderSessions).set({
+ environmentId: EnvironmentId.make("environment-acp-registry-thread-env"),
+ threadId,
+ providerSessionId: "mcp-session-acp-registry-thread-env",
+ providerInstanceId: instanceId,
+ endpoint,
+ authorizationHeader: "Bearer thread-env-token",
+ browserToolsAvailable: false,
+ });
+ // Several agents can run from one directory at once; the spawn env is how
+ // a process the agent starts (an MCP server, a shell tool) finds its own
+ // T3 thread, the same way Claude and Codex sessions do.
+ const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+ const spawnEnvironments: Array<Record<string, unknown> | undefined> = [];
+ const capturingSpawner = ChildProcessSpawner.make((command) =>
+ Effect.sync(() => {
+ if (command._tag === "StandardCommand") spawnEnvironments.push(command.options.env);
+ }).pipe(Effect.andThen(spawner.spawn(command))),
+ );
+ const withCapturedSpawns = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
+ effect.pipe(
+ Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, capturingSpawner),
+ );
+ const adapter = yield* withCapturedSpawns(
+ makeAcpRegistryAdapterV2({
+ selfInvocation,
+ instanceId,
+ settings: yield* decodeAcpRegistryAdapterSettings({ agentId: "claude-acp" }),
+ environment: {},
+ }).pipe(
+ Effect.provide(
+ Layer.mock(AcpRegistrySupport.AcpRegistryCatalog)({
+ resolve: () =>
+ Effect.succeed({
+ distribution: "local" as const,
+ spawn: {
+ command: process.execPath,
+ args: [mockAgentPath],
+ env: { T3_ACP_SESSION_LIFECYCLE: "1" },
+ },
+ }),
+ }),
+ ),
+ ),
+ );
+ const modelSelection = { instanceId, model: "default" } as const;
+ const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+ runtimeMode: "full-access",
+ interactionMode: "default",
+ cwd: process.cwd(),
+ });
+ const runtime = yield* withCapturedSpawns(
+ adapter.openSession({
+ threadId,
+ providerSessionId: ProviderSessionId.make("provider-session-acp-registry-thread-env"),
+ modelSelection,
+ runtimePolicy,
+ }),
+ );
+ yield* withCapturedSpawns(runtime.ensureThread({ threadId, modelSelection, runtimePolicy }));
+ const agentEnvironment = spawnEnvironments.find(
+ (environment) => environment?.T3_ACP_SESSION_LIFECYCLE === "1",
+ );
+ assert.isDefined(agentEnvironment, "the agent itself must have been spawned");
+ assert.equal(agentEnvironment?.T3CODE_THREAD_ID, "thread-acp-registry-thread-env");
+ assert.equal(agentEnvironment?.T3_ACP_MCP_ENDPOINT, endpoint);
+ assert.equal(agentEnvironment?.T3_ACP_MCP_AUTHORIZATION, "Bearer thread-env-token");
+ }).pipe(Effect.provide(layerTest), Effect.scoped),
+ );
+
it.effect.each(["before", "after"] as const)(
"reconciles a full prompt echo %s acknowledgment",
(ordering) =>
diff --git a/packages/provider-acp/src/server/adapter.ts b/packages/provider-acp/src/server/adapter.ts
index 678cd7edf22..f10be3c952d 100644
--- a/packages/provider-acp/src/server/adapter.ts
+++ b/packages/provider-acp/src/server/adapter.ts
@@ -870,6 +870,11 @@ function acpMcpContext(
endpoint: session.endpoint,
authorization: session.authorizationHeader,
processEnvironment: {
+ // The thread id every process the agent starts inherits, so a tool run
+ // from its shell can find its T3 thread. Claude and Codex sessions set
+ // the same variable (PortScanner.AGENT_THREAD_ENV; a string literal here
+ // because this package cannot reach apps/server).
+ T3CODE_THREAD_ID: session.threadId,
T3_ACP_MCP_ENDPOINT: session.endpoint,
T3_ACP_MCP_AUTHORIZATION: session.authorizationHeader,
T3_ACP_MCP_NODE: self.command,