@adhdev/daemon-core 0.9.82-rc.470 → 0.9.82-rc.471

package/dist/providers/cli-provider-instance.d.ts

@@ -69,6 +69,17 @@ export declare class CliProviderInstance implements ProviderInstance {
      * bound below still caps the episode, so a worker whose approval truly never
      * returns is surfaced to the coordinator within AUTO_APPROVE_MASK_STALL_MS
      * rather than held forever.
+     *
+     * INVARIANT (do not regress the ordering): this window must fully BRIDGE a
+     * single busy phase, and the mask-stall bound below must in turn exceed it —
+     * AUTO_APPROVE_MASK_STALL_MS > AUTO_APPROVE_FLAP_CONTINUITY_MS + max_busy_phase
+     * + AUTO_APPROVE_SETTLE_MS. Observed flap geometry (delegated-worker Bash
+     * approval): approval frames last ~1.5s, busy phases (modal=none) last
+     * ~4.3–4.5s. With the old 4000ms this window was SHORTER than a busy phase, so
+     * the settle clock was torn down every cycle and never accrued 600ms while the
+     * 4500ms mask-stall tripped INSIDE the first busy phase → a stalled-approval
+     * nudge leaked to the coordinator. 6000ms bridges the ~4.5s busy phase with
+     * margin so the returning approval frame survives to resume its settle clock.
      */
     private static readonly AUTO_APPROVE_FLAP_CONTINUITY_MS;
     /**
@@ -87,6 +98,15 @@ export declare class CliProviderInstance implements ProviderInstance {
      * genuine never-resolving stall surfaces within this window. The settle gate keeps
      * running underneath, so a prompt that finally stabilises still auto-approves, and
      * mesh_approve (raw FSM, unmasked) works throughout.
+     *
+     * INVARIANT (do not regress): must be STRICTLY GREATER than
+     * AUTO_APPROVE_FLAP_CONTINUITY_MS + max_busy_phase + AUTO_APPROVE_SETTLE_MS so
+     * that during a flap the settle clock (which FLAP_CONTINUITY keeps alive across
+     * each ~4.3–4.5s busy phase) gets to accrue its 600ms on the RETURNING approval
+     * frame before this stall bound can trip. Observed geometry: approval ~1.5s,
+     * busy ~4.3–4.5s. 9000ms ≥ CONTINUITY(6000) + busy(~4.5s) + SETTLE(600) headroom;
+     * the old 4500ms tripped inside the very first busy phase (while modal=none, so
+     * the nudge was NOT deferred) and leaked to the coordinator.
      */
     private static readonly AUTO_APPROVE_MASK_STALL_MS;
     private adapter;
@@ -340,6 +360,21 @@ export declare class CliProviderInstance implements ProviderInstance {
     private recordCompletionGateTrace;
     private recordFsmTransitionTrace;
     private flushCompletedDebounceIfFinalized;
+    /**
+     * A-3 (CLI 완료판정 통합): single authoritative emit for a CLI turn's
+     * `agent:generating_completed` event. The completion JUDGMENT — WHETHER and
+     * WHEN a turn is done (settle windows, continuity guards, the finalization
+     * gate, the short-gen / startup-grace / no-progress-monitor discriminators) —
+     * stays at each call site, where it is legitimately path-specific. What used
+     * to be duplicated across all five completion paths was the EVENT-SHAPE
+     * assembly: the `event` name, the conditional `taskId` spread, and the
+     * optional `finalSummary` / `evidenceLevel` / `completionDiagnostic` fields.
+     * Folding that assembly here removes the divergence (e.g. one site spreading
+     * taskId, others omitting it) without touching any judgment. Callers pass the
+     * values they have already computed; omitted optionals are simply absent from
+     * the emitted event, exactly as each inline builder produced before.
+     */
+    private emitGeneratingCompleted;
     private maybeAutoApproveStatus;
     /**
      * Re-drive the auto-approve check after the settle quiet window elapses.

package/package.json

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

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

@@ -145,8 +145,19 @@ export class CliProviderInstance implements ProviderInstance {
      * bound below still caps the episode, so a worker whose approval truly never
      * returns is surfaced to the coordinator within AUTO_APPROVE_MASK_STALL_MS
      * rather than held forever.
+     *
+     * INVARIANT (do not regress the ordering): this window must fully BRIDGE a
+     * single busy phase, and the mask-stall bound below must in turn exceed it —
+     * AUTO_APPROVE_MASK_STALL_MS > AUTO_APPROVE_FLAP_CONTINUITY_MS + max_busy_phase
+     * + AUTO_APPROVE_SETTLE_MS. Observed flap geometry (delegated-worker Bash
+     * approval): approval frames last ~1.5s, busy phases (modal=none) last
+     * ~4.3–4.5s. With the old 4000ms this window was SHORTER than a busy phase, so
+     * the settle clock was torn down every cycle and never accrued 600ms while the
+     * 4500ms mask-stall tripped INSIDE the first busy phase → a stalled-approval
+     * nudge leaked to the coordinator. 6000ms bridges the ~4.5s busy phase with
+     * margin so the returning approval frame survives to resume its settle clock.
      */
-    private static readonly AUTO_APPROVE_FLAP_CONTINUITY_MS = 4000;
+    private static readonly AUTO_APPROVE_FLAP_CONTINUITY_MS = 6000;
 
     /**
      * STATUS-MISMATCH: upper bound on how long the auto-approve→`generating` SURFACE
@@ -164,8 +175,17 @@ export class CliProviderInstance implements ProviderInstance {
      * genuine never-resolving stall surfaces within this window. The settle gate keeps
      * running underneath, so a prompt that finally stabilises still auto-approves, and
      * mesh_approve (raw FSM, unmasked) works throughout.
+     *
+     * INVARIANT (do not regress): must be STRICTLY GREATER than
+     * AUTO_APPROVE_FLAP_CONTINUITY_MS + max_busy_phase + AUTO_APPROVE_SETTLE_MS so
+     * that during a flap the settle clock (which FLAP_CONTINUITY keeps alive across
+     * each ~4.3–4.5s busy phase) gets to accrue its 600ms on the RETURNING approval
+     * frame before this stall bound can trip. Observed geometry: approval ~1.5s,
+     * busy ~4.3–4.5s. 9000ms ≥ CONTINUITY(6000) + busy(~4.5s) + SETTLE(600) headroom;
+     * the old 4500ms tripped inside the very first busy phase (while modal=none, so
+     * the nudge was NOT deferred) and leaked to the coordinator.
      */
-    private static readonly AUTO_APPROVE_MASK_STALL_MS = 4500;
+    private static readonly AUTO_APPROVE_MASK_STALL_MS = 9000;
 
     private adapter: ProviderCliAdapter;
     private context: InstanceContext | null = null;
@@ -1836,13 +1856,11 @@ export class CliProviderInstance implements ProviderInstance {
                 waitedMs,
                 busyEpoch: this.busyEpoch,
             });
-            this.pushEvent({
-                event: 'agent:generating_completed',
+            this.emitGeneratingCompleted({
                 chatTitle: pending.chatTitle,
                 duration: pending.duration,
                 timestamp: pending.timestamp,
-                // ARCH-REFACTOR R1: attribute to the turn captured at idle-transition.
-                ...(pending.taskId ? { taskId: pending.taskId } : {}),
+                taskId: pending.taskId,
                 // When finalization is forced past the timeout on a `parsed_status:` block
                 // (the parser never confirmed a final assistant turn) we previously rode an
                 // empty `finalSummary` unconditionally. That empty value propagates to the
@@ -1875,13 +1893,11 @@ export class CliProviderInstance implements ProviderInstance {
             duration: pending.duration,
             busyEpoch: this.busyEpoch,
         });
-        this.pushEvent({
-            event: 'agent:generating_completed',
+        this.emitGeneratingCompleted({
             chatTitle: pending.chatTitle,
             duration: pending.duration,
             timestamp: pending.timestamp,
-            // ARCH-REFACTOR R1: attribute to the turn captured at idle-transition.
-            ...(pending.taskId ? { taskId: pending.taskId } : {}),
+            taskId: pending.taskId,
             finalSummary: this.completionFinalSummary(this.adapter?.getScriptParsedStatus()?.messages, pending.turnStartedAt),
         });
         this.completedDebouncePending = null;
@@ -1890,7 +1906,46 @@ export class CliProviderInstance implements ProviderInstance {
         this.lastApprovalEventFingerprint = '';
     }
 
+    /**
+     * A-3 (CLI 완료판정 통합): single authoritative emit for a CLI turn's
+     * `agent:generating_completed` event. The completion JUDGMENT — WHETHER and
+     * WHEN a turn is done (settle windows, continuity guards, the finalization
+     * gate, the short-gen / startup-grace / no-progress-monitor discriminators) —
+     * stays at each call site, where it is legitimately path-specific. What used
+     * to be duplicated across all five completion paths was the EVENT-SHAPE
+     * assembly: the `event` name, the conditional `taskId` spread, and the
+     * optional `finalSummary` / `evidenceLevel` / `completionDiagnostic` fields.
+     * Folding that assembly here removes the divergence (e.g. one site spreading
+     * taskId, others omitting it) without touching any judgment. Callers pass the
+     * values they have already computed; omitted optionals are simply absent from
+     * the emitted event, exactly as each inline builder produced before.
+     */
+    private emitGeneratingCompleted(opts: {
+        chatTitle: string;
+        duration: number | undefined;
+        timestamp: number;
+        taskId?: string;
+        finalSummary?: string;
+        evidenceLevel?: string;
+        completionDiagnostic?: Record<string, unknown>;
+    }): void {
+        this.pushEvent({
+            event: 'agent:generating_completed',
+            chatTitle: opts.chatTitle,
+            duration: opts.duration,
+            timestamp: opts.timestamp,
+            // ARCH-REFACTOR R1: attribute to the turn captured at idle-transition.
+            ...(opts.taskId ? { taskId: opts.taskId } : {}),
+            // finalSummary is always carried (value may be undefined) — every prior
+            // inline builder included the key, so downstream consumers see the same shape.
+            finalSummary: opts.finalSummary,
+            ...(opts.evidenceLevel !== undefined ? { evidenceLevel: opts.evidenceLevel } : {}),
+            ...(opts.completionDiagnostic !== undefined ? { completionDiagnostic: opts.completionDiagnostic } : {}),
+        });
+    }
+
     private maybeAutoApproveStatus(adapterStatus: any, now = Date.now()): boolean {
+        // Manual-attendance suppression (provider-common): when a human is
         // Manual-attendance suppression (provider-common): when a human is
         // actively driving this session from the dashboard, hold auto-approve so
         // the modal stays visible and they can pick a button / use the controlbar
@@ -2281,8 +2336,7 @@ export class CliProviderInstance implements ProviderInstance {
             missingEvidence,
             evidenceLevel: 'weak',
         });
-        this.pushEvent({
-            event: 'agent:generating_completed',
+        this.emitGeneratingCompleted({
             chatTitle,
             duration: 0,
             timestamp: now,
@@ -2618,8 +2672,7 @@ export class CliProviderInstance implements ProviderInstance {
                         // surface its completion promptly without a 4s settle) still holds, and a
                         // non-mesh session has no coordinator to be falsely notified — the false-idle
                         // bug being fixed is specifically the mesh worker/coordinator misfire above.
-                        this.pushEvent({
-                            event: 'agent:generating_completed',
+                        this.emitGeneratingCompleted({
                             chatTitle,
                             duration: 0,
                             timestamp: now,
@@ -2857,8 +2910,7 @@ export class CliProviderInstance implements ProviderInstance {
                 if (this.isMeshWorkerSession()) {
                     traceMeshEventStage('fired', this.meshTraceCtx(), 'no_progress_monitor_final_summary');
                 }
-                this.pushEvent({
-                    event: 'agent:generating_completed',
+                this.emitGeneratingCompleted({
                     chatTitle,
                     duration: this.generatingStartedAt ? Math.round((now - this.generatingStartedAt) / 1000) : undefined,
                     timestamp: me.timestamp,