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): Claude forked skills record the model they run on (#34848)
Julius Marminge committed
Nov 12, 2026 at 00:01 UTC
e77384bf0095310b5d6ee8c131f380ad3424f1ca
4 files changed
+173
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
+98
@@ -973,6 +973,7 @@ describe("ClaudeAdapterV2 Auto-accept edits", () => {
973
}),
974
forkSession: () => Effect.die("unused"),
975
subagentLaunchToolUseId: () => Effect.succeed(null),
976
+ subagentModel: () => Effect.succeed(null),
977
assertComplete: Effect.void,
978
},
979
});
@@ -1099,6 +1100,7 @@ describe("ClaudeAdapterV2 append-system-prompt-file launch argument", () => {
1100
}),
1101
forkSession: () => Effect.die("unused"),
1102
subagentLaunchToolUseId: () => Effect.succeed(null),
1103
+ subagentModel: () => Effect.succeed(null),
1104
assertComplete: Effect.void,
1105
},
1106
});
@@ -1365,6 +1367,7 @@ describe("ClaudeAdapterV2 provider installation gate", () => {
1367
}),
1368
forkSession: () => Effect.die("unused"),
1369
subagentLaunchToolUseId: () => Effect.succeed(null),
1370
+ subagentModel: () => Effect.succeed(null),
1371
assertComplete: Effect.void,
1372
},
1373
});
@@ -1552,6 +1555,7 @@ const captureSdkExecutablePaths = Effect.fn("captureSdkExecutablePaths")(functio
1555
}),
1556
forkSession: () => Effect.die("unused"),
1557
subagentLaunchToolUseId: () => Effect.succeed(null),
1558
+ subagentModel: () => Effect.succeed(null),
1559
assertComplete: Effect.void,
1560
}),
1561
);
@@ -1646,6 +1650,7 @@ describe("ClaudeAdapterV2 resumeThread", () => {
1650
open: () => Effect.die("unused"),
1651
forkSession: () => Effect.die("unused"),
1652
subagentLaunchToolUseId: () => Effect.succeed(null),
1653
+ subagentModel: () => Effect.succeed(null),
1654
assertComplete: Effect.void,
1655
},
1656
});
@@ -1744,6 +1749,7 @@ describe("ClaudeAdapterV2 resume compaction", () => {
1749
}),
1750
forkSession: () => Effect.die("unused"),
1751
subagentLaunchToolUseId: () => Effect.succeed(null),
1752
+ subagentModel: () => Effect.succeed(null),
1753
assertComplete: Effect.void,
1754
},
1755
});
@@ -2134,6 +2140,7 @@ describe("ClaudeAdapterV2 attachments", () => {
2140
}),
2141
forkSession: () => Effect.die("unused forkSession"),
2142
subagentLaunchToolUseId: () => Effect.succeed(null),
2143
+ subagentModel: () => Effect.succeed(null),
2144
assertComplete: Effect.void,
2145
},
2146
});
@@ -2688,6 +2695,7 @@ describe("ClaudeAdapterV2 native fork", () => {
2695
return yield* realRunner.forkSession(input);
2696
}),
2697
subagentLaunchToolUseId: () => Effect.succeed(null),
2698
+ subagentModel: () => Effect.succeed(null),
2699
assertComplete: Effect.void,
2700
},
2701
});
@@ -3032,6 +3040,7 @@ describe("ClaudeAdapterV2 native session identity", () => {
3040
}),
3041
forkSession: () => Effect.die("unused forkSession"),
3042
subagentLaunchToolUseId: () => Effect.succeed(null),
3043
+ subagentModel: () => Effect.succeed(null),
3044
assertComplete: Effect.void,
3045
},
3046
});
@@ -3365,6 +3374,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
3374
Partial<Pick<ClaudeAdapterV2.ClaudeAgentSdkQuerySession, "listPermissionRules">>;
3375
readonly environment?: NodeJS.ProcessEnv;
3376
readonly subagentLaunchToolUseId?: string;
3377
+ readonly subagentModel?: string;
3378
readonly nativeSessionId?: string;
3379
readonly settings?: ClaudeSettings;
3380
readonly modelCatalog?: Effect.Effect<ClaudeModelCatalog>;
@@ -3537,6 +3547,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
3547
}),
3548
forkSession: options?.forkSession ?? (() => Effect.die("unused forkSession")),
3549
subagentLaunchToolUseId: () => Effect.succeed(options?.subagentLaunchToolUseId ?? null),
3550
+ subagentModel: () => Effect.succeed(options?.subagentModel ?? null),
3551
assertComplete: Effect.void,
3552
},
3553
});
@@ -12189,6 +12200,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
12200
}),
12201
forkSession: () => Effect.die("unused forkSession"),
12202
subagentLaunchToolUseId: () => Effect.succeed(null),
12203
+ subagentModel: () => Effect.succeed(null),
12204
assertComplete: Effect.void,
12205
},
12206
});
@@ -12382,6 +12394,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
12394
}),
12395
forkSession: () => Effect.die("unused forkSession"),
12396
subagentLaunchToolUseId: () => Effect.succeed(null),
12397
+ subagentModel: () => Effect.succeed(null),
12398
assertComplete: Effect.void,
12399
},
12400
});
@@ -12516,6 +12529,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
12529
}),
12530
forkSession: () => Effect.die("unused forkSession"),
12531
subagentLaunchToolUseId: () => Effect.succeed(null),
12532
+ subagentModel: () => Effect.succeed(null),
12533
assertComplete: Effect.void,
12534
},
12535
});
@@ -15795,6 +15809,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
15809
}),
15810
forkSession: () => Effect.die("unused forkSession"),
15811
subagentLaunchToolUseId: () => Effect.succeed(null),
15812
+ subagentModel: () => Effect.succeed(null),
15813
assertComplete: Effect.void,
15814
},
15815
});
@@ -17863,6 +17878,83 @@ describe("ClaudeAdapterV2 background wake turns", () => {
17878
),
17879
);
17880
17881
+ it.effect("records a forked skill's model from its transcript instead of the parent's", () =>
17882
+ Effect.scoped(
17883
+ Effect.gen(function* () {
17884
+ const harness = yield* makeWakeHarnessWithOptions({
17885
+ subagentModel: "claude-haiku-4-5-20251001",
17886
+ });
17887
+ const now = yield* DateTime.now;
17888
+ const parentModel = "claude-opus-4-6";
17889
+ yield* harness.runtime.startTurn(
17890
+ makeClaudeTestTurnInput({
17891
+ threadId: harness.threadId,
17892
+ providerThread: harness.providerThread,
17893
+ now,
17894
+ attemptId: RunAttemptId.make("attempt-forked-skill-model"),
17895
+ text: "/fork-probe go",
17896
+ attachments: [],
17897
+ modelSelection: { ...CLAUDE_TEST_MODEL_SELECTION, model: parentModel },
17898
+ }),
17899
+ );
17900
+ // A `context: fork` skill has no Agent call and streams none of its own replies:
17901
+ // task_started carries no tool_use_id, and only its prompt echo names the fork.
17902
+ for (const frame of [
17903
+ claudeSdkFrame({
17904
+ type: "system",
17905
+ subtype: "task_started",
17906
+ task_id: "task-forked-skill",
17907
+ description: "/fork-probe",
17908
+ prompt: "go",
17909
+ subagent_type: "general-purpose",
17910
+ task_type: "local_agent",
17911
+ skip_transcript: true,
17912
+ ambient: true,
17913
+ uuid: "00000000-0000-4000-8000-000000000231",
17914
+ session_id: WAKE_NATIVE_SESSION,
17915
+ }),
17916
+ claudeSdkFrame({
17917
+ type: "system",
17918
+ subtype: "task_notification",
17919
+ task_id: "task-forked-skill",
17920
+ status: "completed",
17921
+ summary: "/fork-probe",
17922
+ output_file: "",
17923
+ uuid: "00000000-0000-4000-8000-000000000232",
17924
+ session_id: WAKE_NATIVE_SESSION,
17925
+ }),
17926
+ claudeSdkFrame({
17927
+ type: "user",
17928
+ parent_tool_use_id: "forked-command-fork-probe",
17929
+ message: { role: "user", content: [{ type: "text", text: "go" }] },
17930
+ uuid: "00000000-0000-4000-8000-000000000233",
17931
+ session_id: WAKE_NATIVE_SESSION,
17932
+ }),
17933
+ makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000234", result: "OK" }),
17934
+ ]) {
17935
+ yield* Queue.offer(harness.sdkMessages, frame);
17936
+ }
17937
+ yield* Queue.take(harness.terminalReceipts);
17938
+
17939
+ const fork = harness.events
17940
+ .filter((event) => event.type === "subagent.updated")
17941
+ .at(-1)?.subagent;
17942
+ assert.equal(fork?.status, "completed");
17943
+ assert.equal(fork?.model, "claude-haiku-4-5");
17944
+ assert.equal(fork?.modelSelection?.model, "claude-haiku-4-5");
17945
+ }).pipe(
17946
+ Effect.provide(
17947
+ Layer.mergeAll(
17948
+ IdAllocator.layer,
17949
+ McpProviderSessions.layer,
17950
+ NodeServices.layer,
17951
+ NodeCrypto.layer,
17952
+ ),
17953
+ ),
17954
+ ),
17955
+ ),
17956
+ );
17957
+
17958
it.effect.each([
17959
{
17960
source: "custom model",
@@ -18753,6 +18845,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
18845
}),
18846
forkSession: () => Effect.die("unused forkSession"),
18847
subagentLaunchToolUseId: () => Effect.succeed(null),
18848
+ subagentModel: () => Effect.succeed(null),
18849
assertComplete: Effect.void,
18850
},
18851
});
@@ -18931,6 +19024,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
19024
}),
19025
forkSession: () => Effect.die("unused forkSession"),
19026
subagentLaunchToolUseId: () => Effect.succeed(null),
19027
+ subagentModel: () => Effect.succeed(null),
19028
assertComplete: Effect.void,
19029
},
19030
});
@@ -19112,6 +19206,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
19206
}),
19207
forkSession: () => Effect.die("unused forkSession"),
19208
subagentLaunchToolUseId: () => Effect.succeed(null),
19209
+ subagentModel: () => Effect.succeed(null),
19210
assertComplete: Effect.void,
19211
},
19212
});
@@ -19313,6 +19408,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
19408
}),
19409
forkSession: () => Effect.die("unused forkSession"),
19410
subagentLaunchToolUseId: () => Effect.succeed(null),
19411
+ subagentModel: () => Effect.succeed(null),
19412
assertComplete: Effect.void,
19413
},
19414
});
@@ -19459,6 +19555,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
19555
},
19556
forkSession: () => Effect.die("unused forkSession"),
19557
subagentLaunchToolUseId: () => Effect.succeed(null),
19558
+ subagentModel: () => Effect.succeed(null),
19559
assertComplete: Effect.void,
19560
},
19561
});
@@ -19581,6 +19678,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
19678
}),
19679
forkSession: () => Effect.die("unused forkSession"),
19680
subagentLaunchToolUseId: () => Effect.succeed(null),
19681
+ subagentModel: () => Effect.succeed(null),
19682
assertComplete: Effect.void,
19683
},
19684
});
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.testkit.ts
+1
@@ -943,6 +943,7 @@ function replayQueryRunnerService(
943
open: (input) => replay(() => queryRunner.open(input)),
944
forkSession: (input) => replay(() => queryRunner.forkSession(input)),
945
subagentLaunchToolUseId: (input) => replay(() => queryRunner.subagentLaunchToolUseId(input)),
946
+ subagentModel: () => Effect.succeed(null),
947
assertComplete: replay(() => queryRunner.assertComplete()),
948
});
949
}
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+71
@@ -746,6 +746,10 @@ export interface ClaudeAgentSdkQueryRunnerShape {
746
readonly subagentLaunchToolUseId: (
747
input: ClaudeAgentSdkSubagentLookupInput,
748
) => Effect.Effect<string | null, ClaudeAgentSdkQueryRunnerError>;
749
+ /** The model a subagent's transcript says it ran on. */
750
+ readonly subagentModel: (
751
+ input: ClaudeAgentSdkSubagentLookupInput,
752
+ ) => Effect.Effect<string | null, ClaudeAgentSdkQueryRunnerError>;
753
readonly assertComplete: Effect.Effect<void, ClaudeAgentSdkQueryRunnerError>;
754
}
755
@@ -1812,6 +1816,27 @@ export const layerQueryRunner: Layer.Layer<
1816
return toolUseId;
1817
},
1818
),
1819
+ subagentModel: Effect.fn("ClaudeAgentSdkQueryRunner.subagentModel")(function* (
1820
+ input: ClaudeAgentSdkSubagentLookupInput,
1821
+ ) {
1822
+ const messages = yield* Effect.tryPromise({
1823
+ try: () =>
1824
+ getSubagentMessages(
1825
+ input.sessionId,
1826
+ input.agentId,
1827
+ input.dir === null ? {} : { dir: input.dir },
1828
+ ),
1829
+ catch: (cause) => queryRunnerError(cause, "getSubagentMessages"),
1830
+ });
1831
+ return (
1832
+ messages
1833
+ .toReversed()
1834
+ .flatMap((message) =>
1835
+ message.type === "assistant" ? [text(field(message.message, "model"))] : [],
1836
+ )
1837
+ .find((model) => model !== undefined) ?? null
1838
+ );
1839
+ }),
1840
assertComplete: Effect.void,
1841
});
1842
}),
@@ -6643,6 +6668,42 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
6668
});
6669
});
6670
6671
+ // A `context: fork` skill has no Agent call and streams none of its own frames;
6672
+ // only its transcript records the model, written after the fork reports its outcome.
6673
+ const forkedSkillModel = Effect.fnUntraced(function* (
6674
+ context: ActiveClaudeTurnContext,
6675
+ nativeThreadId: string,
6676
+ taskId: string,
6677
+ ) {
6678
+ const registered = (yield* Ref.get(sessionSubagentsByTaskId)).get(taskId);
6679
+ if (
6680
+ registered === undefined ||
6681
+ registered.runToolUseId !== null ||
6682
+ registered.task.model !== null ||
6683
+ registered.task.status === "running"
6684
+ ) {
6685
+ return undefined;
6686
+ }
6687
+ const model = yield* queryRunner
6688
+ .subagentModel({
6689
+ sessionId: nativeThreadId,
6690
+ agentId: taskId,
6691
+ dir: context.input.runtimePolicy.cwd,
6692
+ threadId: context.input.threadId,
6693
+ providerSessionId: input.providerSessionId,
6694
+ })
6695
+ .pipe(
6696
+ Effect.catch(() =>
6697
+ Effect.logWarning("orchestration-v2.claude-subagent-model-lookup-failed", {
6698
+ taskId,
6699
+ }).pipe(Effect.as(null)),
6700
+ ),
6701
+ );
6702
+ return model === null || model === "<synthetic>"
6703
+ ? undefined
6704
+ : canonicalClaudeSubagentModel(modelCatalog, model);
6705
+ });
6706
+
6707
// Resume frames reference the launch call, but task_started names SendMessage; recover the mapping from CLI storage.
6708
const recoverResumedClaudeSubagent = Effect.fnUntraced(function* (resume: {
6709
readonly context: ActiveClaudeTurnContext;
@@ -10826,6 +10887,16 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
10887
next.delete(context.providerTurnId);
10888
return next;
10889
});
10890
+ for (const taskId of context.subagentsByTaskId.keys()) {
10891
+ const model = yield* forkedSkillModel(context, liveQuery.nativeThreadId, taskId);
10892
+ const status = (yield* Ref.get(sessionSubagentsByTaskId)).get(taskId)?.task.status;
10893
+ if (
10894
+ model !== undefined &&
10895
+ (status === "completed" || status === "failed" || status === "cancelled")
10896
+ ) {
10897
+ yield* updateClaudeSubagentNode({ context, taskId, model, status });
10898
+ }
10899
+ }
10900
if (!isClaudeProviderContinuationTurn(context.input)) {
10901
yield* markAbsorbedWake(liveQuery.nativeThreadId);
10902
}
apps/server/src/orchestration-v2/ClaudeAutomaticDelivery.integration.test.ts
+3
@@ -181,6 +181,7 @@ it.effect.each(deliveries)(
181
}),
182
forkSession: () => Effect.die("unused"),
183
subagentLaunchToolUseId: () => Effect.succeed(null),
184
+ subagentModel: () => Effect.succeed(null),
185
assertComplete: Effect.void,
186
},
187
});
@@ -535,6 +536,7 @@ it.effect("applies an effort change to the running Claude query without waiting
536
}),
537
forkSession: () => Effect.die("unused"),
538
subagentLaunchToolUseId: () => Effect.succeed(null),
539
+ subagentModel: () => Effect.succeed(null),
540
assertComplete: Effect.void,
541
},
542
});
@@ -732,6 +734,7 @@ it.effect("offers a continuation for a later wake after a queued continuation is
734
}),
735
forkSession: () => Effect.die("unused"),
736
subagentLaunchToolUseId: () => Effect.succeed(null),
737
+ subagentModel: () => Effect.succeed(null),
738
assertComplete: Effect.void,
739
},
740
}).pipe(Effect.provideContext(services));