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 22, 22:00 UTC
fix(server): Claude subagents resumed after a missed launch get their child thread (#18362)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Guillermo Casanova committed
Oct 20, 2026 at 02:08 UTC
2d62f7dcb92c7e826c9a7d7b428c9bf92579aa61
5 files changed
+103
-13
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
+23
-4
@@ -14414,11 +14414,30 @@ describe("ClaudeAdapterV2 background wake turns", () => {
14414
threadMessages(harness.events, member?.childThreadId).map((event) => event.message.text),
14415
["Reply with exactly: A1", "A1 from the transcript"],
14416
);
14417
- assert.isFalse(
14418
- harness.events.some(
14417
+ assert.isDefined(coordinator?.childThreadId);
14418
+ const recoveredThreads = harness.events.filter(
14419
+ (event) =>
14420
+ event.type === "app_thread.created" &&
14421
+ event.appThread.id === coordinator?.childThreadId,
14422
+ );
14423
+ assert.lengthOf(recoveredThreads, 1);
14424
+ const recovered = recoveredThreads[0];
14425
+ assert.equal(recovered?.type, "app_thread.created");
14426
+ if (recovered?.type !== "app_thread.created") throw new Error("Expected recovered thread");
14427
+ assert.isTrue(recovered.createOnly);
14428
+ assert.deepEqual(recovered.appThread.lineage, {
14429
+ parentThreadId: harness.threadId,
14430
+ relationshipToParent: "subagent",
14431
+ rootThreadId: harness.threadId,
14432
+ });
14433
+ assert.equal(recovered.appThread.createdBy, "agent");
14434
+ assert.equal(recovered.appThread.creationSource, "provider");
14435
+ assert.isBelow(
14436
+ harness.events.indexOf(recovered),
14437
+ harness.events.findIndex(
14438
(event) =>
14420
- event.type === "app_thread.created" &&
14421
- event.appThread.id === coordinator?.childThreadId,
14439
+ event.type === "subagent.updated" &&
14440
+ event.subagent.childThreadId === coordinator?.childThreadId,
14441
),
14442
);
14443
}).pipe(
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+7
-7
@@ -5456,13 +5456,13 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
5456
createdBy: "agent",
5457
creationSource: "provider",
5458
});
5459
- if (existingSubagent === undefined) {
5460
- yield* emitProviderEvent({
5461
- type: "app_thread.created",
5462
- driver: CLAUDE_PROVIDER,
5463
- appThread: childThread,
5464
- });
5465
- }
5459
+ // Recovery cannot tell whether the child thread was already persisted.
5460
+ yield* emitProviderEvent({
5461
+ type: "app_thread.created",
5462
+ driver: CLAUDE_PROVIDER,
5463
+ appThread: childThread,
5464
+ ...(existingSubagent === undefined ? {} : { createOnly: true }),
5465
+ });
5466
subagent.childThread = childThread;
5467
}
5468
apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts
+69
@@ -2120,6 +2120,75 @@ layer("ProviderEventIngestorV2", (it) => {
2120
}),
2121
);
2122
2123
+ it.effect(
2124
+ "recovers a missing Claude child once and preserves saved metadata on later recovery",
2125
+ () =>
2126
+ Effect.gen(function* () {
2127
+ const now = yield* DateTime.now;
2128
+ const eventSink = yield* EventSink.EventSinkV2;
2129
+ const projectionStore = yield* ProjectionStore.ProjectionStoreV2;
2130
+ const ingestor = yield* ProviderEventIngestor.ProviderEventIngestorV2;
2131
+ const idAllocator = yield* IdAllocator.IdAllocatorV2;
2132
+ const rootEvent = yield* threadCreatedEvent(now);
2133
+ if (rootEvent.type !== "thread.created") throw new Error("Expected thread fixture");
2134
+ const driver = ProviderDriverKind.make("claude");
2135
+ const providerInstanceId = ProviderInstanceId.make("claude");
2136
+ const childThreadId = idAllocator.derive.threadFromProviderThread({
2137
+ driver,
2138
+ nativeThreadId: "recovered-claude-child",
2139
+ });
2140
+ const providerSessionId = yield* idAllocator.allocate.providerSession({
2141
+ providerInstanceId,
2142
+ threadId: rootEvent.threadId,
2143
+ });
2144
+ const recovered: OrchestrationV2AppThread = {
2145
+ ...rootEvent.payload,
2146
+ id: childThreadId,
2147
+ title: "Recovered subagent",
2148
+ providerInstanceId,
2149
+ modelSelection: { instanceId: providerInstanceId, model: "claude-sonnet-4-6" },
2150
+ activeProviderThreadId: null,
2151
+ createdBy: "agent",
2152
+ creationSource: "provider",
2153
+ lineage: {
2154
+ parentThreadId: rootEvent.threadId,
2155
+ relationshipToParent: "subagent",
2156
+ rootThreadId: rootEvent.threadId,
2157
+ },
2158
+ };
2159
+ const ingest = (appThread: OrchestrationV2AppThread, createOnly: boolean) =>
2160
+ ingestor.ingestNormalized({
2161
+ providerSessionId,
2162
+ providerInstanceId,
2163
+ threadId: rootEvent.threadId,
2164
+ event: { type: "app_thread.created", driver, appThread, createOnly },
2165
+ });
2166
+ yield* eventSink.write({ events: [rootEvent] });
2167
+ const created = yield* Effect.all([ingest(recovered, true), ingest(recovered, true)], {
2168
+ concurrency: "unbounded",
2169
+ });
2170
+ assert.deepEqual(
2171
+ created.flat().map((stored) => stored.event.type),
2172
+ ["thread.created"],
2173
+ );
2174
+ assert.deepEqual(yield* projectionStore.getThread(childThreadId), recovered);
2175
+
2176
+ yield* ingest(
2177
+ {
2178
+ ...recovered,
2179
+ title: "Review authentication",
2180
+ modelSelection: { instanceId: providerInstanceId, model: "claude-opus-4-6" },
2181
+ },
2182
+ false,
2183
+ );
2184
+ const saved = yield* projectionStore.getThread(childThreadId);
2185
+ assert.equal(saved.title, "Review authentication");
2186
+ assert.equal(saved.modelSelection.model, "claude-opus-4-6");
2187
+ assert.deepEqual(yield* ingest(recovered, true), []);
2188
+ assert.deepEqual(yield* projectionStore.getThread(childThreadId), saved);
2189
+ }),
2190
+ );
2191
+
2192
it.effect("moves a native subagent's thread to the model its provider reports later", () =>
2193
Effect.gen(function* () {
2194
const now = yield* DateTime.now;
apps/server/src/orchestration-v2/ProviderEventIngestor.ts
+3
-2
@@ -532,8 +532,9 @@ export const layer: Layer.Layer<
532
);
533
if (
534
existing !== null &&
535
- existing.title === offered.title &&
536
- modelSelectionsEqual(existing.modelSelection, offered.modelSelection)
535
+ (input.event.createOnly === true ||
536
+ (existing.title === offered.title &&
537
+ modelSelectionsEqual(existing.modelSelection, offered.modelSelection)))
538
)
539
return [];
540
const now = yield* DateTime.now;
packages/provider-core/src/server/ProviderAdapter.ts
+1
@@ -81,6 +81,7 @@ export const ProviderAdapterV2Event = Schema.Union([
81
type: Schema.Literal("app_thread.created"),
82
driver: ProviderDriverKind,
83
appThread: OrchestrationV2AppThread,
84
+ createOnly: Schema.optional(Schema.Boolean),
85
}),
86
Schema.Struct({
87
type: Schema.Literal("provider_session.updated"),