fix(diagnostic): narrow hasActiveModelCall to snapshot field only

zhangqueping · zhangqueping · commit b62d64b885fe · 2026-07-02T20:07:11.000+08:00
Remove hasActiveModelCall from classifySessionAttention and isStalledModelCallRecoveryEligible gates. Both gates already require activeWorkKind === 'model_call' (derived from activeModelCalls) and hasActiveEmbeddedRun, making the extra check redundant. hasActiveModelCall stays in the snapshot type and population as a pure diagnostic field for downstream consumers. 🦞 diamond lobster: narrow scope — invariant cleanup, no behavior change Ref. #94890
diff --git a/src/logging/diagnostic-session-attention.test.ts b/src/logging/diagnostic-session-attention.test.ts
@@ -78,7 +78,6 @@ describe("classifySessionAttention", () => {
       activity: {
         activeWorkKind: "model_call" as const,
         hasActiveEmbeddedRun: true,
-        hasActiveModelCall: true,
         lastProgressAgeMs: 31_000,
       },
       expected: {
@@ -95,7 +94,6 @@ describe("classifySessionAttention", () => {
       activity: {
         activeWorkKind: "model_call" as const,
         hasActiveEmbeddedRun: true,
-        hasActiveModelCall: true,
         lastProgressAgeMs: 60_000,
       },
       expected: {
@@ -129,7 +127,6 @@ describe("classifySessionAttention", () => {
       activity: {
         activeWorkKind: "model_call" as const,
         hasActiveEmbeddedRun: false,
-        hasActiveModelCall: true,
         lastProgressAgeMs: 31_000,
         lastProgressReason: "model_call:started",
       },
@@ -165,7 +162,6 @@ describe("classifySessionAttention", () => {
       activity: {
         activeWorkKind: "model_call" as const,
         hasActiveEmbeddedRun: false,
-        hasActiveModelCall: true,
         lastProgressAgeMs: 31_000,
       },
       expected: {
diff --git a/src/logging/diagnostic-session-attention.ts b/src/logging/diagnostic-session-attention.ts
@@ -81,7 +81,6 @@ export function classifySessionAttention(params: {
     if (
       params.activity.activeWorkKind === "model_call" &&
       params.activity.hasActiveEmbeddedRun === true &&
-      params.activity.hasActiveModelCall === true &&
       lastProgressAgeMs > params.staleMs
     ) {
       if (
diff --git a/src/logging/diagnostic.test.ts b/src/logging/diagnostic.test.ts
@@ -1023,8 +1023,8 @@ describe("stuck session diagnostics threshold", () => {
       unsubscribe();
     }
 
-    // hasActiveModelCall surfaces the model call for classification, so the
-    // session is visible to diagnostics.  Active-abort recovery still requires
+    // activeWorkKind === "model_call" (derived from activeModelCalls) makes the
+    // session visible to diagnostics.  Active-abort recovery still requires
     // hasActiveEmbeddedRun (live-owner signal) — CLI sessions are classified
     // but not force-recovered until #90750 cleanup lands.
     expectRecordFields(
diff --git a/src/logging/diagnostic.ts b/src/logging/diagnostic.ts
@@ -541,15 +541,14 @@ function isStalledModelCallRecoveryEligible(params: {
   // chunks refresh run activity while emitted progress events are throttled, so
   // active streams stay fresh and silent/non-streaming calls can be recovered.
   //
-  // hasActiveModelCall gates on the activity snapshot; hasActiveEmbeddedRun
-  // ensures a live embedded-run owner exists.  CLI-harness sessions are NOT
-  // eligible until #90750 provides ownerless-marker cleanup.
+  // hasActiveEmbeddedRun ensures a live embedded-run owner exists.
+  // CLI-harness sessions are NOT eligible until #90750 provides
+  // ownerless-marker cleanup.
   return (
     params.classification?.eventType === "session.stalled" &&
     params.classification.classification === "stalled_agent_run" &&
     params.classification.activeWorkKind === "model_call" &&
     params.activity?.hasActiveEmbeddedRun === true &&
-    params.activity?.hasActiveModelCall === true &&
     typeof lastProgressAgeMs === "number" &&
     lastProgressAgeMs >= params.stuckSessionAbortMs
   );
