The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 21:00 UTC
fix(server): subagent threads get short ids agents can quote back (#34877)
Julius Marminge committed
Nov 11, 2026 at 23:45 UTC
db04d3abe924f73f3c2c15991b4f8591669fa373
16 files changed
+143
-16
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
+4
@@ -17381,6 +17381,10 @@ describe("ClaudeAdapterV2 background wake turns", () => {
17381
17382
const routing = subagentRouting(harness.events, ["toolu-early-bash"]);
17383
assert.isDefined(routing.childThreadId);
17384
+ // Agents quote this id back to t3_thread_send/t3_thread_read.
17385
+ const childThreadId = routing.childThreadId ?? "";
17386
+ assert.notInclude(childThreadId, "%");
17387
+ assert.isAtMost(childThreadId.length, 64);
17388
assert.deepEqual(
17389
[...(routing.toolThreadIds.get("toolu-early-bash") ?? [])],
17390
[routing.childThreadId],
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+2
-2
@@ -6400,7 +6400,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
6400
driver: CLAUDE_PROVIDER,
6401
nativeItemId: `task:${taskId}:thread-root`,
6402
}),
6403
- childThreadId: idAllocator.derive.threadFromProviderThread({
6403
+ childThreadId: idAllocator.derive.subagentThread({
6404
driver: CLAUDE_PROVIDER,
6405
nativeThreadId: `${context.input.providerThread.id}:${taskId}`,
6406
}),
@@ -6738,7 +6738,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
6738
...workflow,
6739
agents: workflow.agents.map((member) => ({
6740
...member,
6741
- childThreadId: idAllocator.derive.threadFromProviderThread({
6741
+ childThreadId: idAllocator.derive.subagentThread({
6742
driver: CLAUDE_PROVIDER,
6743
nativeThreadId: `${coordinatorChildThreadId}:agent:${member.index}`,
6744
}),
apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
+1
-1
@@ -3069,7 +3069,7 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
3069
driver: CODEX_PROVIDER,
3070
nativeItemId: `${input.nativeItemId}:thread-root`,
3071
});
3072
- const childThreadId = idAllocator.derive.threadFromProviderThread({
3072
+ const childThreadId = idAllocator.derive.subagentThread({
3073
driver: CODEX_PROVIDER,
3074
nativeThreadId: input.nativeThreadId,
3075
});
apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts
+1
-1
@@ -1638,7 +1638,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
1638
(recoveredChild) =>
1639
Effect.gen(function* () {
1640
const ids = yield* IdAllocator.IdAllocatorV2.pipe(Effect.provide(IdAllocator.layer));
1641
- const childThreadId = ids.derive.threadFromProviderThread({
1641
+ const childThreadId = ids.derive.subagentThread({
1642
driver: OPENCODE_PROVIDER,
1643
nativeThreadId: CHILD,
1644
providerInstanceId: instanceId,
apps/server/src/provider/ProviderInstanceRegistry.test.ts
+2
-1
@@ -52,6 +52,7 @@ import * as ProviderInstallationGate from "./ProviderInstallationGate.ts";
52
import * as ProviderOrchestrationAdapterInfrastructure from "./ProviderOrchestrationAdapterInfrastructure.ts";
53
import * as PortScanner from "../preview/PortScanner.ts";
54
import * as ProviderHostLive from "./ProviderHostLive.ts";
55
+import * as SqlitePersistence from "../persistence/Sqlite.ts";
56
import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
57
import type { AnyProviderDriver, ProviderInstance } from "@t3tools/provider-core/server/driver";
58
@@ -211,7 +212,7 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => {
212
);
213
const layerBase = ProviderHostLive.layer.pipe(Layer.provideMerge(layerBaseDeps));
214
const layerTest = ProviderOrchestrationAdapterInfrastructure.layer.pipe(
214
- Layer.provide(PortScanner.layerTest),
215
+ Layer.provide(Layer.merge(PortScanner.layerTest, SqlitePersistence.layerMemory)),
216
Layer.provideMerge(layerBase),
217
);
218
apps/server/src/provider/ProviderInstanceRegistryHydration.ts
+4
-1
@@ -15,6 +15,7 @@ import type * as SecureRandom from "effect/crypto/SecureRandom";
15
import * as Effect from "effect/Effect";
16
import * as FileSystem from "effect/FileSystem";
17
import * as Layer from "effect/Layer";
18
+import type * as SqlClient from "effect/sql/SqlClient";
19
import * as Path from "effect/Path";
20
import * as Stream from "effect/Stream";
21
@@ -47,7 +48,9 @@ type ProviderInstanceRegistryHydrationEnv =
48
// Secret provider reads.
49
| SecureRandom.SecureRandom
50
// The Claude runner counts its CLIs as running agents for port discovery.
50
- | PortScanner.PortDiscovery;
51
+ | PortScanner.PortDiscovery
52
+ // Adapter ids read which subagent threads predate short ids.
53
+ | SqlClient.SqlClient;
54
55
export const deriveProviderInstanceConfigMap = (
56
settings: ServerSettings,
apps/server/src/provider/ProviderOrchestrationAdapterInfrastructure.test.ts
new
+42
@@ -0,0 +1,42 @@
1
+import { assert, it } from "@effect/vitest";
2
+import { ProviderDriverKind } from "@t3tools/contracts";
3
+import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
4
+import * as Effect from "effect/Effect";
5
+import * as Layer from "effect/Layer";
6
+import * as SqlClient from "effect/sql/SqlClient";
7
+
8
+import * as SqlitePersistence from "../persistence/Sqlite.ts";
9
+import { layerIdAllocator } from "./ProviderOrchestrationAdapterInfrastructure.ts";
10
+
11
+it.effect("subagent threads stored under a legacy id keep it when re-derived", () =>
12
+ Effect.gen(function* () {
13
+ const stored = {
14
+ driver: ProviderDriverKind.make("claudeAgent"),
15
+ nativeThreadId: "parent:task-1",
16
+ };
17
+ const legacyId = IdAllocator.deriveThreadFromProviderThread(stored);
18
+ const layerStored = Layer.effectDiscard(
19
+ Effect.gen(function* () {
20
+ const sql = yield* SqlClient.SqlClient;
21
+ yield* sql`
22
+ INSERT INTO orchestration_v2_projection_threads (
23
+ thread_id, project_id, title, default_provider, runtime_mode, interaction_mode,
24
+ created_at, updated_at, payload_json
25
+ ) VALUES (
26
+ ${legacyId}, 'project-1', 'Subagent', 'claudeAgent', 'full-access', 'default',
27
+ '2026-01-01T00:00:00.000Z', '2026-01-01T00:00:00.000Z', '{}'
28
+ )
29
+ `;
30
+ }),
31
+ ).pipe(Layer.provideMerge(SqlitePersistence.layerMemory));
32
+ const ids = yield* IdAllocator.IdAllocatorV2.pipe(
33
+ Effect.provide(layerIdAllocator.pipe(Layer.provide(layerStored))),
34
+ );
35
+
36
+ assert.strictEqual(ids.derive.subagentThread(stored), legacyId);
37
+ assert.match(
38
+ ids.derive.subagentThread({ ...stored, nativeThreadId: "parent:task-2" }),
39
+ /^thread:subagent:[0-9a-f]{16}$/,
40
+ );
41
+ }),
42
+);
apps/server/src/provider/ProviderOrchestrationAdapterInfrastructure.ts
+21
-1
@@ -1,4 +1,6 @@
1
+import * as Effect from "effect/Effect";
2
import * as Layer from "effect/Layer";
3
+import * as SqlClient from "effect/sql/SqlClient";
4
5
import * as ClaudeAdapterV2 from "../orchestration-v2/Adapters/ClaudeAdapterV2.ts";
6
import * as CodexAdapterV2 from "../orchestration-v2/Adapters/CodexAdapterV2.ts";
@@ -14,11 +16,29 @@ export type ProviderOrchestrationAdapterInfrastructure =
16
| CursorSdk.CursorSdk
17
| IdAllocator.IdAllocatorV2;
18
19
+// Subagent threads created before short ids keep their stored id when an adapter resumes them.
20
+export const layerIdAllocator = Layer.unwrap(
21
+ Effect.gen(function* () {
22
+ const sql = yield* SqlClient.SqlClient;
23
+ const rows = yield* sql<{ readonly threadId: string }>`
24
+ SELECT thread_id AS "threadId" FROM orchestration_v2_projection_threads
25
+ WHERE thread_id LIKE 'thread:provider:%'
26
+ `.pipe(
27
+ Effect.catch((cause) =>
28
+ Effect.logWarning("orchestration-v2.legacy-subagent-thread-ids-unavailable", {
29
+ cause,
30
+ }).pipe(Effect.as([])),
31
+ ),
32
+ );
33
+ return IdAllocator.layerWithLegacySubagentThreads(new Set(rows.map((row) => row.threadId)));
34
+ }),
35
+);
36
+
37
/** Reuse the continuation worker's exact layer reference so memoization shares one queue. */
38
export const layer = Layer.mergeAll(
39
ClaudeAdapterV2.layerQueryRunner,
40
CodexAdapterV2.layerAppServerClientFactory,
41
CursorAgentSdk.layer.pipe(Layer.provideMerge(CursorSdk.layer)),
22
- IdAllocator.layer,
42
+ layerIdAllocator,
43
ProviderContinuationRequests.layer,
44
);
apps/server/src/provider/ProviderRegistry.test.ts
+22
-3
@@ -62,6 +62,7 @@ import * as ProviderInstanceRegistryHydration from "./ProviderInstanceRegistryHy
62
import * as PortScanner from "../preview/PortScanner.ts";
63
import * as ServerConfig from "../config.ts";
64
import * as ServerSettingsModule from "../serverSettings.ts";
65
+import * as SqlitePersistence from "../persistence/Sqlite.ts";
66
import {
67
readProviderStatusCache,
68
resolveProviderStatusCachePath,
@@ -3168,7 +3169,13 @@ it.layer(
3169
const layerProviderRegistry = ProviderRegistry.layer.pipe(
3170
Layer.provideMerge(
3171
ProviderInstanceRegistryHydration.layer.pipe(
3171
- Layer.provide(Layer.mergeAll(PortScanner.layerTest, ProviderInstallationGate.layer)),
3172
+ Layer.provide(
3173
+ Layer.mergeAll(
3174
+ PortScanner.layerTest,
3175
+ ProviderInstallationGate.layer,
3176
+ SqlitePersistence.layerMemory,
3177
+ ),
3178
+ ),
3179
),
3180
),
3181
Layer.provideMerge(AntigravityInstallation.AntigravityInstallation.layer),
@@ -3288,7 +3295,13 @@ it.layer(
3295
const layerProviderRegistry = ProviderRegistry.layer.pipe(
3296
Layer.provideMerge(
3297
ProviderInstanceRegistryHydration.layer.pipe(
3291
- Layer.provide(Layer.mergeAll(PortScanner.layerTest, ProviderInstallationGate.layer)),
3298
+ Layer.provide(
3299
+ Layer.mergeAll(
3300
+ PortScanner.layerTest,
3301
+ ProviderInstallationGate.layer,
3302
+ SqlitePersistence.layerMemory,
3303
+ ),
3304
+ ),
3305
),
3306
),
3307
Layer.provideMerge(AntigravityInstallation.AntigravityInstallation.layer),
@@ -3425,7 +3438,13 @@ it.layer(
3438
readSeed = false;
3439
const services = yield* Layer.build(
3440
ProviderInstanceRegistryHydration.layer.pipe(
3428
- Layer.provide(Layer.mergeAll(PortScanner.layerTest, ProviderInstallationGate.layer)),
3441
+ Layer.provide(
3442
+ Layer.mergeAll(
3443
+ PortScanner.layerTest,
3444
+ ProviderInstallationGate.layer,
3445
+ SqlitePersistence.layerMemory,
3446
+ ),
3447
+ ),
3448
),
3449
).pipe(Effect.provide(dependencies));
3450
failCurrentRead = input.failCurrentRead ?? false;
apps/server/src/server.ts
+3
-1
@@ -700,7 +700,9 @@ const layerRuntimeCoreDependenciesBase = Layer.mergeAll(
700
Layer.mergeAll(Keybindings.layer, EnvironmentTheme.layer, UsageLimitSources.layer),
701
),
702
Layer.provideMerge(ProviderRegistry.layer),
703
- Layer.provideMerge(ProviderInstanceRegistryHydration.layer),
703
+ Layer.provideMerge(
704
+ ProviderInstanceRegistryHydration.layer.pipe(Layer.provide(SqlitePersistence.layerConfig)),
705
+ ),
706
// One gate for the server, below hydration so the Claude adapter sees it: layers memoize by
707
// reference, so the runtime layer shares it.
708
Layer.provideMerge(ProviderInstallationGate.layer),
packages/provider-acp/src/server/adapter.ts
+1
-1
@@ -3194,7 +3194,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
3194
const nodeId = existing?.task.id ?? providerNodeId(nativeTaskId);
3195
const childThreadId =
3196
existing?.childThreadId ??
3197
- idAllocator.derive.threadFromProviderThread({
3197
+ idAllocator.derive.subagentThread({
3198
driver,
3199
providerInstanceId: context.input.modelSelection.instanceId,
3200
nativeThreadId: `${context.nativeThreadId}:task:${nativeTaskId}`,
packages/provider-core/src/server/IdAllocator.ts
+36
@@ -21,6 +21,9 @@ import {
21
ThreadId,
22
TurnItemId,
23
} from "@t3tools/contracts";
24
+// @effect-diagnostics-next-line nodeBuiltinImport:off -- derive ids are synchronous, so the hash must be too.
25
+import * as NodeCrypto from "node:crypto";
26
+
27
import * as Context from "effect/Context";
28
import * as Effect from "effect/Effect";
29
import * as Layer from "effect/Layer";
@@ -140,6 +143,11 @@ export interface IdAllocatorV2Derive {
143
readonly nativeThreadId: string;
144
readonly providerInstanceId?: ProviderInstanceId;
145
}) => ThreadId;
146
+ readonly subagentThread: (input: {
147
+ readonly driver: ProviderDriverKind;
148
+ readonly nativeThreadId: string;
149
+ readonly providerInstanceId?: ProviderInstanceId;
150
+ }) => ThreadId;
151
readonly run: (input: { readonly threadId: ThreadId; readonly ordinal: number }) => RunId;
152
readonly runAttempt: (input: {
153
readonly runId: RunId;
@@ -212,6 +220,18 @@ export function deriveThreadFromProviderThread(input: {
220
);
221
}
222
223
+// Agents quote subagent thread ids back to thread tools, and the native id often
224
+// nests the parent's encoded ids, so hash it to a short stable id instead. Adapters
225
+// re-derive child ids on resume, so a child stored under its legacy id keeps it.
226
+const makeDeriveSubagentThread =
227
+ (legacyThreadIds: ReadonlySet<string>): IdAllocatorV2Derive["subagentThread"] =>
228
+ (input) => {
229
+ const legacy = deriveThreadFromProviderThread(input);
230
+ if (legacyThreadIds.has(legacy)) return legacy;
231
+ const digest = NodeCrypto.createHash("sha256").update(legacy).digest("hex").slice(0, 16);
232
+ return ThreadId.make(`thread:subagent:${digest}`);
233
+ };
234
+
235
export function deriveProviderThread(input: {
236
readonly driver: ProviderDriverKind;
237
readonly providerInstanceId?: ProviderInstanceId;
@@ -266,6 +286,7 @@ export const derive: IdAllocatorV2Derive = {
286
createdThreadTurnItem: (input) =>
287
TurnItemId.make(joinId("turn-item", "created-thread", input.commandId)),
288
threadFromProviderThread: deriveThreadFromProviderThread,
289
+ subagentThread: makeDeriveSubagentThread(new Set()),
290
run: (input) => RunId.make(joinId("run", "thread", input.threadId, "ordinal", input.ordinal)),
291
runAttempt: (input) =>
292
RunAttemptId.make(joinId("run-attempt", "run", input.runId, "attempt", input.attemptOrdinal)),
@@ -430,3 +451,18 @@ export const layer: Layer.Layer<IdAllocatorV2> = Layer.succeed(
451
derive,
452
}),
453
);
454
+
455
+/** For adapters: subagent threads already stored under a legacy derived id keep that id. */
456
+export const layerWithLegacySubagentThreads = (
457
+ legacyThreadIds: ReadonlySet<string>,
458
+): Layer.Layer<IdAllocatorV2> =>
459
+ Layer.effect(
460
+ IdAllocatorV2,
461
+ Effect.gen(function* () {
462
+ const base = yield* IdAllocatorV2;
463
+ return IdAllocatorV2.of({
464
+ allocate: base.allocate,
465
+ derive: { ...base.derive, subagentThread: makeDeriveSubagentThread(legacyThreadIds) },
466
+ });
467
+ }),
468
+ ).pipe(Layer.provide(layer));
packages/provider-cursor/src/server/adapter.ts
+1
-1
@@ -1689,7 +1689,7 @@ export const makeCursorAdapterV2 = Effect.fn("makeCursorAdapterV2")(function* (
1689
});
1690
const childThreadId =
1691
existing?.childThreadId ??
1692
- idAllocator.derive.threadFromProviderThread({
1692
+ idAllocator.derive.subagentThread({
1693
driver: CursorAgentSdk.CURSOR_PROVIDER,
1694
nativeThreadId: `${input.context.run.runId}:task:${input.callId}`,
1695
});
packages/provider-muse/src/server/adapter.ts
+1
-1
@@ -603,7 +603,7 @@ export const makeMuseAdapterV2 = Effect.fn("makeMuseAdapterV2")(function* (
603
const existing = childrenByItemId.get(item.itemId);
604
const childSessionId = item.childSessionId;
605
if (existing || !childSessionId) return existing;
606
- const childThreadId = idAllocator.derive.threadFromProviderThread({
606
+ const childThreadId = idAllocator.derive.subagentThread({
607
driver: MUSE_PROVIDER,
608
providerInstanceId: options.instanceId,
609
nativeThreadId: childSessionId,
packages/provider-opencode/src/server/adapter.ts
+1
-1
@@ -1349,7 +1349,7 @@ export const makeOpenCodeAdapterV2 = Effect.fn("makeOpenCodeAdapterV2")(function
1349
const childSessionId = taskSessionId(part);
1350
if (childSessionId !== null && context.childSessionId === null) {
1351
context.childSessionId = childSessionId;
1352
- context.childThreadId = idAllocator.derive.threadFromProviderThread({
1352
+ context.childThreadId = idAllocator.derive.subagentThread({
1353
driver: OPENCODE_PROVIDER,
1354
nativeThreadId: childSessionId,
1355
});
packages/provider-opencode/src/server/v2/adapter.ts
+1
-1
@@ -1884,7 +1884,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
1884
driver,
1885
nativeItemId: call.nativeId,
1886
});
1887
- const childThreadId = idAllocator.derive.threadFromProviderThread({
1887
+ const childThreadId = idAllocator.derive.subagentThread({
1888
driver,
1889
nativeThreadId: childId,
1890
providerInstanceId: instanceId,