Skip to content

Commit e77384b

Browse files
fix(server): Claude forked skills record the model they run on (pingdotgg#34848)
1 parent 74ffe35 commit e77384b

4 files changed

Lines changed: 173 additions & 0 deletions

File tree

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

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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
});

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -943,6 +943,7 @@ function replayQueryRunnerService(
943943
open: (input) => replay(() => queryRunner.open(input)),
944944
forkSession: (input) => replay(() => queryRunner.forkSession(input)),
945945
subagentLaunchToolUseId: (input) => replay(() => queryRunner.subagentLaunchToolUseId(input)),
946+
subagentModel: () => Effect.succeed(null),
946947
assertComplete: replay(() => queryRunner.assertComplete()),
947948
});
948949
}

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

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -746,6 +746,10 @@ export interface ClaudeAgentSdkQueryRunnerShape {
746746
readonly subagentLaunchToolUseId: (
747747
input: ClaudeAgentSdkSubagentLookupInput,
748748
) => 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>;
749753
readonly assertComplete: Effect.Effect<void, ClaudeAgentSdkQueryRunnerError>;
750754
}
751755

@@ -1812,6 +1816,27 @@ export const layerQueryRunner: Layer.Layer<
18121816
return toolUseId;
18131817
},
18141818
),
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+
}),
18151840
assertComplete: Effect.void,
18161841
});
18171842
}),
@@ -6643,6 +6668,42 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
66436668
});
66446669
});
66456670

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+
66466707
// Resume frames reference the launch call, but task_started names SendMessage; recover the mapping from CLI storage.
66476708
const recoverResumedClaudeSubagent = Effect.fnUntraced(function* (resume: {
66486709
readonly context: ActiveClaudeTurnContext;
@@ -10826,6 +10887,16 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1082610887
next.delete(context.providerTurnId);
1082710888
return next;
1082810889
});
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+
}
1082910900
if (!isClaudeProviderContinuationTurn(context.input)) {
1083010901
yield* markAbsorbedWake(liveQuery.nativeThreadId);
1083110902
}

‎apps/server/src/orchestration-v2/ClaudeAutomaticDelivery.integration.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ it.effect.each(deliveries)(
181181
}),
182182
forkSession: () => Effect.die("unused"),
183183
subagentLaunchToolUseId: () => Effect.succeed(null),
184+
subagentModel: () => Effect.succeed(null),
184185
assertComplete: Effect.void,
185186
},
186187
});
@@ -535,6 +536,7 @@ it.effect("applies an effort change to the running Claude query without waiting
535536
}),
536537
forkSession: () => Effect.die("unused"),
537538
subagentLaunchToolUseId: () => Effect.succeed(null),
539+
subagentModel: () => Effect.succeed(null),
538540
assertComplete: Effect.void,
539541
},
540542
});
@@ -732,6 +734,7 @@ it.effect("offers a continuation for a later wake after a queued continuation is
732734
}),
733735
forkSession: () => Effect.die("unused"),
734736
subagentLaunchToolUseId: () => Effect.succeed(null),
737+
subagentModel: () => Effect.succeed(null),
735738
assertComplete: Effect.void,
736739
},
737740
}).pipe(Effect.provideContext(services));

0 commit comments

Comments
 (0)