@@ -2619,6 +2619,193 @@ describe("ClaudeAdapterLive", () => {
26192619 ) ;
26202620 } ) ;
26212621
2622+ it . effect ( "preserves subagent attribution when task_started repeats for a resume" , ( ) => {
2623+ const harness = makeHarness ( ) ;
2624+ return Effect . gen ( function * ( ) {
2625+ const adapter = yield * ClaudeAdapter ;
2626+
2627+ const taskEventsFiber = yield * adapter . streamEvents . pipe (
2628+ Stream . filter ( ( event ) => event . type . startsWith ( "task." ) ) ,
2629+ Stream . takeUntil ( ( event ) => event . type === "task.progress" ) ,
2630+ Stream . runCollect ,
2631+ Effect . forkChild ,
2632+ ) ;
2633+
2634+ const session = yield * adapter . startSession ( {
2635+ threadId : THREAD_ID ,
2636+ provider : ProviderDriverKind . make ( "claudeAgent" ) ,
2637+ runtimeMode : "full-access" ,
2638+ } ) ;
2639+ yield * adapter . sendTurn ( {
2640+ threadId : session . threadId ,
2641+ input : "spawn an agent" ,
2642+ attachments : [ ] ,
2643+ } ) ;
2644+
2645+ harness . query . emit ( {
2646+ type : "system" ,
2647+ subtype : "task_started" ,
2648+ task_id : "task-resumed" ,
2649+ description : "Agent R" ,
2650+ task_type : "local_agent" ,
2651+ tool_use_id : "toolu_agent_original" ,
2652+ uuid : "task-resumed-initial-uuid" ,
2653+ session_id : "sdk-session" ,
2654+ } as unknown as SDKMessage ) ;
2655+ harness . query . emit ( {
2656+ type : "assistant" ,
2657+ parent_tool_use_id : "toolu_agent_original" ,
2658+ message : {
2659+ model : "claude-opus-5" ,
2660+ content : [ ] ,
2661+ } ,
2662+ uuid : "task-resumed-model-uuid" ,
2663+ session_id : "sdk-session" ,
2664+ } as unknown as SDKMessage ) ;
2665+ yield * Effect . promise ( ( ) =>
2666+ invokeSubagentEffortHook ( harness , "SubagentStart" , "task-resumed" , "high" ) ,
2667+ ) ;
2668+
2669+ // Claude emits task_started again when SendMessage resumes a background
2670+ // agent. Its tool_use_id identifies the resume request, not the Agent
2671+ // launch whose id remains on the subagent's assistant snapshots.
2672+ harness . query . emit ( {
2673+ type : "system" ,
2674+ subtype : "task_started" ,
2675+ task_id : "task-resumed" ,
2676+ description : "Agent R" ,
2677+ task_type : "local_agent" ,
2678+ tool_use_id : "toolu_send_message_resume" ,
2679+ uuid : "task-resumed-repeat-uuid" ,
2680+ session_id : "sdk-session" ,
2681+ } as unknown as SDKMessage ) ;
2682+ harness . query . emit ( {
2683+ type : "assistant" ,
2684+ parent_tool_use_id : "toolu_agent_original" ,
2685+ message : {
2686+ model : "claude-opus-5[1m]" ,
2687+ content : [ ] ,
2688+ } ,
2689+ uuid : "task-resumed-late-model-uuid" ,
2690+ session_id : "sdk-session" ,
2691+ } as unknown as SDKMessage ) ;
2692+ harness . query . emit ( {
2693+ type : "system" ,
2694+ subtype : "task_progress" ,
2695+ task_id : "task-resumed" ,
2696+ description : "Agent R" ,
2697+ usage : { total_tokens : 100 , tool_uses : 1 , duration_ms : 10 } ,
2698+ uuid : "task-resumed-progress-uuid" ,
2699+ session_id : "sdk-session" ,
2700+ } as unknown as SDKMessage ) ;
2701+
2702+ const taskEvents = Array . from ( yield * Fiber . join ( taskEventsFiber ) ) ;
2703+ const repeatedStart = taskEvents . filter ( ( event ) => event . type === "task.started" ) [ 1 ] ;
2704+ assert . equal ( repeatedStart ?. type , "task.started" ) ;
2705+ if ( repeatedStart ?. type === "task.started" ) {
2706+ assert . equal ( repeatedStart . payload . toolUseId , "toolu_agent_original" ) ;
2707+ assert . equal ( repeatedStart . payload . model , "claude-opus-5" ) ;
2708+ assert . equal ( repeatedStart . payload . effort , "high" ) ;
2709+ }
2710+
2711+ const lateCorrection = taskEvents . find (
2712+ ( event ) => event . type === "task.updated" && event . payload . model === "claude-opus-5[1m]" ,
2713+ ) ;
2714+ assert . equal ( lateCorrection ?. type , "task.updated" ) ;
2715+ const progress = taskEvents . at ( - 1 ) ;
2716+ assert . equal ( progress ?. type , "task.progress" ) ;
2717+ if ( progress ?. type === "task.progress" ) {
2718+ assert . equal ( progress . payload . toolUseId , "toolu_agent_original" ) ;
2719+ assert . equal ( progress . payload . model , "claude-opus-5[1m]" ) ;
2720+ assert . equal ( progress . payload . effort , "high" ) ;
2721+ }
2722+ } ) . pipe (
2723+ Effect . provideService ( Random . Random , makeDeterministicRandomService ( ) ) ,
2724+ Effect . provide ( harness . layer ) ,
2725+ ) ;
2726+ } ) ;
2727+
2728+ it . effect ( "ignores synthetic error models when refining subagent attribution" , ( ) => {
2729+ const harness = makeHarness ( ) ;
2730+ return Effect . gen ( function * ( ) {
2731+ const adapter = yield * ClaudeAdapter ;
2732+
2733+ const taskEventsFiber = yield * adapter . streamEvents . pipe (
2734+ Stream . filter ( ( event ) => event . type . startsWith ( "task." ) ) ,
2735+ Stream . takeUntil ( ( event ) => event . type === "task.progress" ) ,
2736+ Stream . runCollect ,
2737+ Effect . forkChild ,
2738+ ) ;
2739+
2740+ const session = yield * adapter . startSession ( {
2741+ threadId : THREAD_ID ,
2742+ provider : ProviderDriverKind . make ( "claudeAgent" ) ,
2743+ runtimeMode : "full-access" ,
2744+ } ) ;
2745+ yield * adapter . sendTurn ( {
2746+ threadId : session . threadId ,
2747+ input : "spawn an agent" ,
2748+ attachments : [ ] ,
2749+ } ) ;
2750+
2751+ harness . query . emit ( {
2752+ type : "system" ,
2753+ subtype : "task_started" ,
2754+ task_id : "task-synthetic-model" ,
2755+ description : "Agent S" ,
2756+ task_type : "local_agent" ,
2757+ tool_use_id : "toolu_agent_synthetic" ,
2758+ uuid : "task-synthetic-model-uuid" ,
2759+ session_id : "sdk-session" ,
2760+ } as unknown as SDKMessage ) ;
2761+ harness . query . emit ( {
2762+ type : "assistant" ,
2763+ parent_tool_use_id : "toolu_agent_synthetic" ,
2764+ message : {
2765+ model : "claude-opus-5" ,
2766+ content : [ ] ,
2767+ } ,
2768+ uuid : "task-real-model-uuid" ,
2769+ session_id : "sdk-session" ,
2770+ } as unknown as SDKMessage ) ;
2771+ harness . query . emit ( {
2772+ type : "assistant" ,
2773+ parent_tool_use_id : "toolu_agent_synthetic" ,
2774+ error : "server_error" ,
2775+ message : {
2776+ model : "<synthetic>" ,
2777+ content : [ ] ,
2778+ } ,
2779+ uuid : "task-synthetic-error-uuid" ,
2780+ session_id : "sdk-session" ,
2781+ } as unknown as SDKMessage ) ;
2782+ harness . query . emit ( {
2783+ type : "system" ,
2784+ subtype : "task_progress" ,
2785+ task_id : "task-synthetic-model" ,
2786+ description : "Agent S" ,
2787+ usage : { total_tokens : 100 , tool_uses : 1 , duration_ms : 10 } ,
2788+ uuid : "task-synthetic-progress-uuid" ,
2789+ session_id : "sdk-session" ,
2790+ } as unknown as SDKMessage ) ;
2791+
2792+ const taskEvents = Array . from ( yield * Fiber . join ( taskEventsFiber ) ) ;
2793+ assert . isFalse (
2794+ taskEvents . some ( ( event ) =>
2795+ "model" in event . payload ? event . payload . model === "<synthetic>" : false ,
2796+ ) ,
2797+ ) ;
2798+ const progress = taskEvents . at ( - 1 ) ;
2799+ assert . equal ( progress ?. type , "task.progress" ) ;
2800+ if ( progress ?. type === "task.progress" ) {
2801+ assert . equal ( progress . payload . model , "claude-opus-5" ) ;
2802+ }
2803+ } ) . pipe (
2804+ Effect . provideService ( Random . Random , makeDeterministicRandomService ( ) ) ,
2805+ Effect . provide ( harness . layer ) ,
2806+ ) ;
2807+ } ) ;
2808+
26222809 it . effect ( "keeps explicit Agent tool model and effort overrides" , ( ) => {
26232810 const harness = makeHarness ( ) ;
26242811 return Effect . gen ( function * ( ) {
0 commit comments