Skip to content

Commit db04d3a

Browse files
fix(server): subagent threads get short ids agents can quote back (pingdotgg#34877)
1 parent 555bb2f commit db04d3a

16 files changed

Lines changed: 143 additions & 16 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17381,6 +17381,10 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1738117381

1738217382
const routing = subagentRouting(harness.events, ["toolu-early-bash"]);
1738317383
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);
1738417388
assert.deepEqual(
1738517389
[...(routing.toolThreadIds.get("toolu-early-bash") ?? [])],
1738617390
[routing.childThreadId],

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6400,7 +6400,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
64006400
driver: CLAUDE_PROVIDER,
64016401
nativeItemId: `task:${taskId}:thread-root`,
64026402
}),
6403-
childThreadId: idAllocator.derive.threadFromProviderThread({
6403+
childThreadId: idAllocator.derive.subagentThread({
64046404
driver: CLAUDE_PROVIDER,
64056405
nativeThreadId: `${context.input.providerThread.id}:${taskId}`,
64066406
}),
@@ -6738,7 +6738,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
67386738
...workflow,
67396739
agents: workflow.agents.map((member) => ({
67406740
...member,
6741-
childThreadId: idAllocator.derive.threadFromProviderThread({
6741+
childThreadId: idAllocator.derive.subagentThread({
67426742
driver: CLAUDE_PROVIDER,
67436743
nativeThreadId: `${coordinatorChildThreadId}:agent:${member.index}`,
67446744
}),

‎apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3069,7 +3069,7 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
30693069
driver: CODEX_PROVIDER,
30703070
nativeItemId: `${input.nativeItemId}:thread-root`,
30713071
});
3072-
const childThreadId = idAllocator.derive.threadFromProviderThread({
3072+
const childThreadId = idAllocator.derive.subagentThread({
30733073
driver: CODEX_PROVIDER,
30743074
nativeThreadId: input.nativeThreadId,
30753075
});

‎apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
16381638
(recoveredChild) =>
16391639
Effect.gen(function* () {
16401640
const ids = yield* IdAllocator.IdAllocatorV2.pipe(Effect.provide(IdAllocator.layer));
1641-
const childThreadId = ids.derive.threadFromProviderThread({
1641+
const childThreadId = ids.derive.subagentThread({
16421642
driver: OPENCODE_PROVIDER,
16431643
nativeThreadId: CHILD,
16441644
providerInstanceId: instanceId,

‎apps/server/src/provider/ProviderInstanceRegistry.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import * as ProviderInstallationGate from "./ProviderInstallationGate.ts";
5252
import * as ProviderOrchestrationAdapterInfrastructure from "./ProviderOrchestrationAdapterInfrastructure.ts";
5353
import * as PortScanner from "../preview/PortScanner.ts";
5454
import * as ProviderHostLive from "./ProviderHostLive.ts";
55+
import * as SqlitePersistence from "../persistence/Sqlite.ts";
5556
import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
5657
import type { AnyProviderDriver, ProviderInstance } from "@t3tools/provider-core/server/driver";
5758

@@ -211,7 +212,7 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => {
211212
);
212213
const layerBase = ProviderHostLive.layer.pipe(Layer.provideMerge(layerBaseDeps));
213214
const layerTest = ProviderOrchestrationAdapterInfrastructure.layer.pipe(
214-
Layer.provide(PortScanner.layerTest),
215+
Layer.provide(Layer.merge(PortScanner.layerTest, SqlitePersistence.layerMemory)),
215216
Layer.provideMerge(layerBase),
216217
);
217218

‎apps/server/src/provider/ProviderInstanceRegistryHydration.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import type * as SecureRandom from "effect/crypto/SecureRandom";
1515
import * as Effect from "effect/Effect";
1616
import * as FileSystem from "effect/FileSystem";
1717
import * as Layer from "effect/Layer";
18+
import type * as SqlClient from "effect/sql/SqlClient";
1819
import * as Path from "effect/Path";
1920
import * as Stream from "effect/Stream";
2021

@@ -47,7 +48,9 @@ type ProviderInstanceRegistryHydrationEnv =
4748
// Secret provider reads.
4849
| SecureRandom.SecureRandom
4950
// 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;
5154

5255
export const deriveProviderInstanceConfigMap = (
5356
settings: ServerSettings,
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
import * as Effect from "effect/Effect";
12
import * as Layer from "effect/Layer";
3+
import * as SqlClient from "effect/sql/SqlClient";
24

35
import * as ClaudeAdapterV2 from "../orchestration-v2/Adapters/ClaudeAdapterV2.ts";
46
import * as CodexAdapterV2 from "../orchestration-v2/Adapters/CodexAdapterV2.ts";
@@ -14,11 +16,29 @@ export type ProviderOrchestrationAdapterInfrastructure =
1416
| CursorSdk.CursorSdk
1517
| IdAllocator.IdAllocatorV2;
1618

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+
1737
/** Reuse the continuation worker's exact layer reference so memoization shares one queue. */
1838
export const layer = Layer.mergeAll(
1939
ClaudeAdapterV2.layerQueryRunner,
2040
CodexAdapterV2.layerAppServerClientFactory,
2141
CursorAgentSdk.layer.pipe(Layer.provideMerge(CursorSdk.layer)),
22-
IdAllocator.layer,
42+
layerIdAllocator,
2343
ProviderContinuationRequests.layer,
2444
);

‎apps/server/src/provider/ProviderRegistry.test.ts‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ import * as ProviderInstanceRegistryHydration from "./ProviderInstanceRegistryHy
6262
import * as PortScanner from "../preview/PortScanner.ts";
6363
import * as ServerConfig from "../config.ts";
6464
import * as ServerSettingsModule from "../serverSettings.ts";
65+
import * as SqlitePersistence from "../persistence/Sqlite.ts";
6566
import {
6667
readProviderStatusCache,
6768
resolveProviderStatusCachePath,
@@ -3168,7 +3169,13 @@ it.layer(
31683169
const layerProviderRegistry = ProviderRegistry.layer.pipe(
31693170
Layer.provideMerge(
31703171
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+
),
31723179
),
31733180
),
31743181
Layer.provideMerge(AntigravityInstallation.AntigravityInstallation.layer),
@@ -3288,7 +3295,13 @@ it.layer(
32883295
const layerProviderRegistry = ProviderRegistry.layer.pipe(
32893296
Layer.provideMerge(
32903297
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+
),
32923305
),
32933306
),
32943307
Layer.provideMerge(AntigravityInstallation.AntigravityInstallation.layer),
@@ -3425,7 +3438,13 @@ it.layer(
34253438
readSeed = false;
34263439
const services = yield* Layer.build(
34273440
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+
),
34293448
),
34303449
).pipe(Effect.provide(dependencies));
34313450
failCurrentRead = input.failCurrentRead ?? false;

‎apps/server/src/server.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,9 @@ const layerRuntimeCoreDependenciesBase = Layer.mergeAll(
700700
Layer.mergeAll(Keybindings.layer, EnvironmentTheme.layer, UsageLimitSources.layer),
701701
),
702702
Layer.provideMerge(ProviderRegistry.layer),
703-
Layer.provideMerge(ProviderInstanceRegistryHydration.layer),
703+
Layer.provideMerge(
704+
ProviderInstanceRegistryHydration.layer.pipe(Layer.provide(SqlitePersistence.layerConfig)),
705+
),
704706
// One gate for the server, below hydration so the Claude adapter sees it: layers memoize by
705707
// reference, so the runtime layer shares it.
706708
Layer.provideMerge(ProviderInstallationGate.layer),

0 commit comments

Comments
 (0)