@@ -973,6 +973,7 @@ describe("ClaudeAdapterV2 Auto-accept edits", () => {
973973 }),
974974 forkSession: () => Effect.die("unused"),
975975 subagentLaunchToolUseId: () => Effect.succeed(null),
976+ subagentModel: () => Effect.succeed(null),
976977 assertComplete: Effect.void,
977978 },
978979 });
@@ -1099,6 +1100,7 @@ describe("ClaudeAdapterV2 append-system-prompt-file launch argument", () => {
10991100 }),
11001101 forkSession: () => Effect.die("unused"),
11011102 subagentLaunchToolUseId: () => Effect.succeed(null),
1103+ subagentModel: () => Effect.succeed(null),
11021104 assertComplete: Effect.void,
11031105 },
11041106 });
@@ -1365,6 +1367,7 @@ describe("ClaudeAdapterV2 provider installation gate", () => {
13651367 }),
13661368 forkSession: () => Effect.die("unused"),
13671369 subagentLaunchToolUseId: () => Effect.succeed(null),
1370+ subagentModel: () => Effect.succeed(null),
13681371 assertComplete: Effect.void,
13691372 },
13701373 });
@@ -1552,6 +1555,7 @@ const captureSdkExecutablePaths = Effect.fn("captureSdkExecutablePaths")(functio
15521555 }),
15531556 forkSession: () => Effect.die("unused"),
15541557 subagentLaunchToolUseId: () => Effect.succeed(null),
1558+ subagentModel: () => Effect.succeed(null),
15551559 assertComplete: Effect.void,
15561560 }),
15571561 );
@@ -1646,6 +1650,7 @@ describe("ClaudeAdapterV2 resumeThread", () => {
16461650 open: () => Effect.die("unused"),
16471651 forkSession: () => Effect.die("unused"),
16481652 subagentLaunchToolUseId: () => Effect.succeed(null),
1653+ subagentModel: () => Effect.succeed(null),
16491654 assertComplete: Effect.void,
16501655 },
16511656 });
@@ -1744,6 +1749,7 @@ describe("ClaudeAdapterV2 resume compaction", () => {
17441749 }),
17451750 forkSession: () => Effect.die("unused"),
17461751 subagentLaunchToolUseId: () => Effect.succeed(null),
1752+ subagentModel: () => Effect.succeed(null),
17471753 assertComplete: Effect.void,
17481754 },
17491755 });
@@ -2134,6 +2140,7 @@ describe("ClaudeAdapterV2 attachments", () => {
21342140 }),
21352141 forkSession: () => Effect.die("unused forkSession"),
21362142 subagentLaunchToolUseId: () => Effect.succeed(null),
2143+ subagentModel: () => Effect.succeed(null),
21372144 assertComplete: Effect.void,
21382145 },
21392146 });
@@ -2688,6 +2695,7 @@ describe("ClaudeAdapterV2 native fork", () => {
26882695 return yield* realRunner.forkSession(input);
26892696 }),
26902697 subagentLaunchToolUseId: () => Effect.succeed(null),
2698+ subagentModel: () => Effect.succeed(null),
26912699 assertComplete: Effect.void,
26922700 },
26932701 });
@@ -3032,6 +3040,7 @@ describe("ClaudeAdapterV2 native session identity", () => {
30323040 }),
30333041 forkSession: () => Effect.die("unused forkSession"),
30343042 subagentLaunchToolUseId: () => Effect.succeed(null),
3043+ subagentModel: () => Effect.succeed(null),
30353044 assertComplete: Effect.void,
30363045 },
30373046 });
@@ -3365,6 +3374,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
33653374 Partial<Pick<ClaudeAdapterV2.ClaudeAgentSdkQuerySession, "listPermissionRules">>;
33663375 readonly environment?: NodeJS.ProcessEnv;
33673376 readonly subagentLaunchToolUseId?: string;
3377+ readonly subagentModel?: string;
33683378 readonly nativeSessionId?: string;
33693379 readonly settings?: ClaudeSettings;
33703380 readonly modelCatalog?: Effect.Effect<ClaudeModelCatalog>;
@@ -3537,6 +3547,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
35373547 }),
35383548 forkSession: options?.forkSession ?? (() => Effect.die("unused forkSession")),
35393549 subagentLaunchToolUseId: () => Effect.succeed(options?.subagentLaunchToolUseId ?? null),
3550+ subagentModel: () => Effect.succeed(options?.subagentModel ?? null),
35403551 assertComplete: Effect.void,
35413552 },
35423553 });
@@ -12189,6 +12200,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1218912200 }),
1219012201 forkSession: () => Effect.die("unused forkSession"),
1219112202 subagentLaunchToolUseId: () => Effect.succeed(null),
12203+ subagentModel: () => Effect.succeed(null),
1219212204 assertComplete: Effect.void,
1219312205 },
1219412206 });
@@ -12382,6 +12394,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1238212394 }),
1238312395 forkSession: () => Effect.die("unused forkSession"),
1238412396 subagentLaunchToolUseId: () => Effect.succeed(null),
12397+ subagentModel: () => Effect.succeed(null),
1238512398 assertComplete: Effect.void,
1238612399 },
1238712400 });
@@ -12516,6 +12529,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1251612529 }),
1251712530 forkSession: () => Effect.die("unused forkSession"),
1251812531 subagentLaunchToolUseId: () => Effect.succeed(null),
12532+ subagentModel: () => Effect.succeed(null),
1251912533 assertComplete: Effect.void,
1252012534 },
1252112535 });
@@ -15795,6 +15809,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1579515809 }),
1579615810 forkSession: () => Effect.die("unused forkSession"),
1579715811 subagentLaunchToolUseId: () => Effect.succeed(null),
15812+ subagentModel: () => Effect.succeed(null),
1579815813 assertComplete: Effect.void,
1579915814 },
1580015815 });
@@ -17863,6 +17878,83 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1786317878 ),
1786417879 );
1786517880
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+
1786617958 it.effect.each([
1786717959 {
1786817960 source: "custom model",
@@ -18753,6 +18845,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1875318845 }),
1875418846 forkSession: () => Effect.die("unused forkSession"),
1875518847 subagentLaunchToolUseId: () => Effect.succeed(null),
18848+ subagentModel: () => Effect.succeed(null),
1875618849 assertComplete: Effect.void,
1875718850 },
1875818851 });
@@ -18931,6 +19024,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1893119024 }),
1893219025 forkSession: () => Effect.die("unused forkSession"),
1893319026 subagentLaunchToolUseId: () => Effect.succeed(null),
19027+ subagentModel: () => Effect.succeed(null),
1893419028 assertComplete: Effect.void,
1893519029 },
1893619030 });
@@ -19112,6 +19206,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1911219206 }),
1911319207 forkSession: () => Effect.die("unused forkSession"),
1911419208 subagentLaunchToolUseId: () => Effect.succeed(null),
19209+ subagentModel: () => Effect.succeed(null),
1911519210 assertComplete: Effect.void,
1911619211 },
1911719212 });
@@ -19313,6 +19408,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1931319408 }),
1931419409 forkSession: () => Effect.die("unused forkSession"),
1931519410 subagentLaunchToolUseId: () => Effect.succeed(null),
19411+ subagentModel: () => Effect.succeed(null),
1931619412 assertComplete: Effect.void,
1931719413 },
1931819414 });
@@ -19459,6 +19555,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1945919555 },
1946019556 forkSession: () => Effect.die("unused forkSession"),
1946119557 subagentLaunchToolUseId: () => Effect.succeed(null),
19558+ subagentModel: () => Effect.succeed(null),
1946219559 assertComplete: Effect.void,
1946319560 },
1946419561 });
@@ -19581,6 +19678,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
1958119678 }),
1958219679 forkSession: () => Effect.die("unused forkSession"),
1958319680 subagentLaunchToolUseId: () => Effect.succeed(null),
19681+ subagentModel: () => Effect.succeed(null),
1958419682 assertComplete: Effect.void,
1958519683 },
1958619684 });
0 commit comments