@adhdev/daemon-core 0.9.82-rc.405 → 0.9.82-rc.406

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.405",
+  "version": "0.9.82-rc.406",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -46,7 +46,7 @@
   "author": "vilmire",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@adhdev/mesh-shared": "0.9.82-rc.405",
+    "@adhdev/mesh-shared": "0.9.82-rc.406",
     "@adhdev/session-host-core": "*",
     "@agentclientprotocol/sdk": "^0.16.1",
     "ajv": "^8.20.0",

package/src/cli-adapters/cli-state-engine.ts

@@ -111,6 +111,13 @@ export class CliStateEngine {
     // queued in pendingOutbound and only flushed asynchronously after idle), so the
     // completion event carries the correct id instead of the racy session scalar.
     currentTurnTaskId: string | null = null;
+    // GENERATING-BOUNDARY (R4d): wall-clock when the most recently STARTED turn began
+    // (set by onTurnStarted, persists past completion until the next turn starts).
+    // The startup-grace idle-stayed synthesis anchors its window on when the FIRST turn
+    // STARTED — not on when it finished — so a turn dispatched a few seconds after the
+    // grace collapse and then running for a non-trivial duration is still attributed to
+    // the startup collapse even though its COMPLETION lands past a now-anchored window.
+    currentTurnStartedAt = 0;
     activeModal: { message: string; buttons: string[] } | null = null;
 
     // ── Approval ─────────────────────────────────────
@@ -247,6 +254,9 @@ export class CliStateEngine {
         this.currentTurnTaskId = typeof turnScope.taskId === 'string' && turnScope.taskId.trim()
             ? turnScope.taskId
             : null;
+        // R4d: stamp the turn-start moment so the startup-grace idle-stayed synthesis can
+        // anchor its window on dispatch time rather than completion time.
+        this.currentTurnStartedAt = Date.now();
         this.responseEpoch += 1;
     }
 

package/src/cli-adapters/provider-cli-adapter.ts

@@ -1988,6 +1988,11 @@ export class ProviderCliAdapter implements CliAdapter {
     // reads this when stamping completion events so they carry the completing turn's
     // task rather than the racy last-write-wins session scalar.
     get currentTurnTaskId(): string | null { return this.engine.currentTurnTaskId; }
+    // R4d: wall-clock when the most recently started turn began (persists past settle).
+    // The provider instance's startup-grace idle-stayed synthesis anchors its window on
+    // this so a delayed-dispatch first turn whose duration overruns the now-anchored
+    // window is still attributed to the startup collapse.
+    get currentTurnStartedAt(): number { return this.engine.currentTurnStartedAt; }
 
     get responseEpoch(): number { return this.engine.responseEpoch; }
     set responseEpoch(v: number) { this.engine.responseEpoch = v; }

package/src/providers/cli-provider-instance.ts

@@ -148,7 +148,9 @@ const USER_INPUT_ACK_DEDUP_WINDOW_MS = 60_000;
 // before collapsing to idle; a turn can be dispatched a few seconds AFTER that collapse
 // (the live R4b miss: collapse at boot+8s, dispatch at boot+12.4s — already past a 12s
 // boot-anchored window before the turn even started). Anchoring on the collapse moment
-// makes the window cover dispatch-delay + turn-duration. The strong discriminator is
+// covers dispatch-delay; R4d additionally anchors on the turn-START moment
+// (engine.currentTurnStartedAt) so a non-trivial turn-DURATION cannot push the completion
+// past a now-anchored window (the live rc.405 Probe2 miss). The strong discriminator is
 // generatingStartedAt===0 (generating was never observed) AND a started-but-finished turn
 // — the window only keeps the synthesized reason honest and scopes the synthesis to the
 // boot collapse, so a much-later unobservably-fast turn is not mislabelled a startup collapse.
@@ -2468,11 +2470,35 @@ export class CliProviderInstance implements ProviderInstance {
         // idle. Normal turns that DO reach 'busy' set generatingStartedAt and are
         // excluded; a queued-pending first turn that only runs after grace falls
         // outside the window and completes normally via idle→busy→idle.
+        //
+        // R4d (the live rc.405 Probe2 miss): R4c anchored the window on the collapse
+        // moment but still measured its END against `now` (the poll/completion time). The
+        // helper only fires once the turn has FINISHED (!hasAdapterPendingResponse()), so
+        // the first eligible poll happens at completion. When the first turn is dispatched
+        // a few seconds after the collapse AND runs for a non-trivial duration, that
+        // completion lands PAST the 12s now-anchored window even though the turn was a
+        // genuine startup-grace first turn (live: collapse→dispatch +5.2s, turn ~11s →
+        // completion at collapse+16.2s > 12s). Anchor the window on when the first turn
+        // STARTED (engine.currentTurnStartedAt, set by onTurnStarted) instead: a turn that
+        // STARTED within the collapse window is a startup-grace first turn no matter how
+        // long it then ran. The now-anchored check is retained as a union so a fast turn
+        // (dispatched+completed quickly within 12s of collapse) keeps firing too; both
+        // close for a much-later turn, preserving the "don't mislabel a late fast turn"
+        // honesty the window exists for.
+        const firstTurnStartedAt = typeof (this.adapter as any)?.currentTurnStartedAt === 'number'
+            ? (this.adapter as any).currentTurnStartedAt as number
+            : 0;
+        const collapsedAt = this.startupGraceCollapseAt;
+        const turnStartedWithinCollapseWindow = collapsedAt !== null
+            && firstTurnStartedAt > 0
+            && firstTurnStartedAt >= collapsedAt
+            && (firstTurnStartedAt - collapsedAt) < STARTUP_GRACE_IDLE_COLLAPSE_WINDOW_MS;
+        const nowWithinCollapseWindow = collapsedAt !== null
+            && (now - collapsedAt) < STARTUP_GRACE_IDLE_COLLAPSE_WINDOW_MS;
         if (
             newStatus === 'idle'
             && previousStatus === 'idle'
-            && this.startupGraceCollapseAt !== null
-            && (now - this.startupGraceCollapseAt) < STARTUP_GRACE_IDLE_COLLAPSE_WINDOW_MS
+            && (turnStartedWithinCollapseWindow || nowWithinCollapseWindow)
         ) {
             this.maybeSynthesizeStartupGraceCollapse(chatTitle, now, 'startup_grace_idle_turn_collapse');
         }