@adhdev/daemon-core 0.9.82-rc.213 → 0.9.82-rc.215

package/dist/providers/spec/driver.d.ts

@@ -146,6 +146,12 @@ export declare class SpecDriver {
     private completionIdleKey;
     /** Previous screen lines — passed to evaluate() for `changed` condition detection. */
     private prevScreenLines;
+    /** Timestamp when idle was last committed (either direct or via idle_hold_ms).
+     *  Used to suppress immediate idle → busy re-entry from transient `changed`
+     *  condition blips (e.g. completion-marker counter "Completed for Xs" updating
+     *  every second, which triggers cursor_above:changed and bounces back to busy
+     *  right after an idle commit). */
+    private lastIdleCommittedAt;
     /** Timestamp of the last PTY frame that changed the screen content.
      *  Used by screen_active_hold_ms to suppress idle downshifts while
      *  the terminal is still actively updating. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.213",
+  "version": "0.9.82-rc.215",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

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

@@ -555,11 +555,35 @@ export class CliStateEngine {
         // The real completion gate is applyIdle's idleFinishCandidate +
         // idleFinish timeout, which requires stable quiet AND a parsed
         // assistant message.
+        //
+        // Fast-path exception: only release the hold if the parser shows a
+        // *current-turn* final standard assistant after the last user message,
+        // and it is not still streaming. Using !!lastParsedAssistant was too
+        // broad — it matched previous-turn assistant messages and caused
+        // false-idle between the first assistant text chunk and the first
+        // tool call (the agent outputs text, then immediately begins tool use;
+        // the gap between them hit this fast path and committed idle).
+        const hasFinalCurrentTurnAssistant = (() => {
+            if (parsedStatus !== 'idle') return false;
+            const msgs: any[] = Array.isArray(parsedMessages) ? parsedMessages : [];
+            let lastUserIdx = -1;
+            for (let i = msgs.length - 1; i >= 0; i--) {
+                if (msgs[i]?.role === 'user') { lastUserIdx = i; break; }
+            }
+            // No user message visible: fall back to any non-streaming standard assistant.
+            const searchSlice = lastUserIdx >= 0 ? msgs.slice(lastUserIdx + 1) : msgs;
+            return searchSlice.some((m: any) => {
+                if (!m || m.role !== 'assistant') return false;
+                if (typeof m.content !== 'string' || !m.content.trim()) return false;
+                const kind = typeof m.kind === 'string' && m.kind.trim() ? m.kind.trim() : 'standard';
+                return kind === 'standard' && m.meta?.streaming !== true;
+            });
+        })();
         const shouldHoldGenerating = status === 'idle'
             && this.isWaitingForResponse
             && !!this.currentTurnScope
             && !modal
-            && !(parsedStatus === 'idle' && !!lastParsedAssistant);
+            && !hasFinalCurrentTurnAssistant;
 
         if (shouldHoldGenerating) { this.applyHoldGenerating(ctx); return; }
         if (status === 'error') {

package/src/commands/router.ts

@@ -66,6 +66,7 @@ import { getSessionCompletionMarker } from '../status/snapshot.js';
 import { execNpmCommandSync, resolveCurrentGlobalInstallSurface, spawnDetachedDaemonUpgradeHelper } from './upgrade-helper.js';
 import { getMeshQueueRevision } from '../mesh/mesh-work-queue.js';
 import type { RepoMeshSessionCleanupMode } from '../repo-mesh-types.js';
+import { DEFAULT_MESH_POLICY } from '../repo-mesh-types.js';
 import { homedir, hostname as osHostname } from 'os';
 import { basename as pathBasename, join as pathJoin, resolve as pathResolve } from 'path';
 import * as fs from 'fs';
@@ -3333,6 +3334,7 @@ export class DaemonCommandRouter {
                         success: result.success === true,
                         result,
                         finalBranchConvergenceState: result.finalBranchConvergenceState,
+                        ...(result.blockerContext ? { blockerContext: result.blockerContext } : {}),
                     } : {}),
                 },
             });
@@ -3904,6 +3906,30 @@ export class DaemonCommandRouter {
                 };
             }
 
+            // Push logic: after a successful merge, either auto-push or surface push info
+            // so coordinators don't need manual discovery after each refine.
+            const requireApprovalForPush: boolean = (mesh as any)?.policy?.requireApprovalForPush ?? DEFAULT_MESH_POLICY.requireApprovalForPush;
+            let pushResult: Record<string, unknown> | undefined;
+            if (!requireApprovalForPush) {
+                const pushStarted = Date.now();
+                try {
+                    await execFileAsync('git', ['push', 'origin', baseBranch], { cwd: repoRoot, encoding: 'utf8' });
+                    pushResult = { pushed: true, remote: 'origin', branch: baseBranch, durationMs: Date.now() - pushStarted };
+                    recordMeshRefineStage(refineStages, 'push', 'passed', pushStarted, pushResult);
+                    finalBranchConvergenceState.status = 'merged_pushed';
+                } catch (e: any) {
+                    pushResult = {
+                        pushed: false,
+                        remote: 'origin',
+                        branch: baseBranch,
+                        error: e?.message || String(e),
+                        stderr: e?.stderr,
+                        durationMs: Date.now() - pushStarted,
+                    };
+                    recordMeshRefineStage(refineStages, 'push', 'failed', pushStarted, pushResult);
+                }
+            }
+
             return {
                 success: true,
                 merged: true,
@@ -3918,6 +3944,14 @@ export class DaemonCommandRouter {
                 refineStages,
                 ...(ledgerError ? { ledgerError } : {}),
                 finalBranchConvergenceState,
+                // Push outcome or readiness info for coordinator.
+                ...(pushResult
+                    ? { pushResult }
+                    : {
+                        pushReady: true,
+                        pushCommand: `git push origin ${baseBranch}`,
+                        pushNote: 'requireApprovalForPush is enabled — run the push command or obtain user approval before pushing.',
+                    }),
             };
         } catch (e: any) {
             return { success: false, error: e.message, refineStages };
@@ -3952,9 +3986,59 @@ export class DaemonCommandRouter {
                                 ? 'cleanup_failed'
                                 : 'merge_failed'; // fallback for unclassified failures
         const isTerminalSuccess = refineTerminalKind === 'completed';
+
+        // Build structured blocker context for task_failed ledger entries so coordinators
+        // can inspect the failure cause without parsing free-form error strings.
+        const blockerContext: Record<string, unknown> | undefined = isTerminalSuccess ? undefined : (() => {
+            const code = typeof result.code === 'string' ? result.code : refineTerminalKind;
+            const stage = refineTerminalKind === 'validation_failed' ? 'validation'
+                : refineTerminalKind === 'submodule_reachability_failed' ? 'submodule_reachability'
+                : refineCode === 'patch_equivalence_failed' ? 'patch_equivalence'
+                : refineCode === 'needs_rebase' || refineCode === 'needs_rebase_with_conflicts' ? 'patch_equivalence'
+                : refineTerminalKind === 'merge_failed' ? 'merge'
+                : refineTerminalKind === 'cleanup_failed' ? 'cleanup'
+                : 'unknown';
+            const ctx: Record<string, unknown> = {
+                stage,
+                reason: code,
+                terminalKind: refineTerminalKind,
+            };
+            if (typeof result.error === 'string') ctx.error = result.error;
+            if (typeof result.blockedReason === 'string') ctx.blockedReason = result.blockedReason;
+            // Patch equivalence details
+            if (stage === 'patch_equivalence' && result.patchEquivalence) {
+                const pe = result.patchEquivalence as Record<string, unknown>;
+                ctx.details = {
+                    expectedPatchId: pe.expectedPatchId,
+                    actualPatchId: pe.actualPatchId,
+                    status: pe.status,
+                    actionableHint: pe.actionableHint,
+                    error: pe.error,
+                };
+            }
+            // Submodule reachability details
+            if (stage === 'submodule_reachability' && Array.isArray(result.unreachableSubmoduleCommits)) {
+                ctx.details = {
+                    unreachableCount: (result.unreachableSubmoduleCommits as unknown[]).length,
+                    paths: (result.unreachableSubmoduleCommits as Array<Record<string, unknown>>).map(e => e.path),
+                    autoPublishAllowed: (result.unreachableSubmoduleCommits as Array<Record<string, unknown>>)[0]?.autoPublishAllowed,
+                };
+            }
+            // Validation details
+            if (stage === 'validation' && result.validationSummary) {
+                const vs = result.validationSummary as Record<string, unknown>;
+                ctx.details = {
+                    failureCode: vs.failureCode,
+                    commandsRun: Array.isArray(vs.commandsRun) ? vs.commandsRun.length : undefined,
+                };
+            }
+            return ctx;
+        })();
+
         const normalizedResult = {
             ...result,
             terminalKind: refineTerminalKind,
+            ...(blockerContext ? { blockerContext } : {}),
             ...(result.nextStep === undefined && !isTerminalSuccess ? {
                 nextStep: refineTerminalKind === 'blocked_review'
                     ? 'Request user review/approval before attempting to merge again.'

package/src/providers/native-history/codex-cli-transcript.ts

@@ -159,6 +159,44 @@ function extractToolOutputContent(payload: Record<string, unknown>): string {
   return '';
 }
 
+function hasAssistantStandardMessageSinceLastUser(records: NativeHistoryMessage[], content: string): boolean {
+  const normalized = content.trim();
+  if (!normalized) return false;
+  for (let i = records.length - 1; i >= 0; i--) {
+    const record = records[i];
+    if (record.kind === 'session_start') continue;
+    if (record.role === 'user') return false;
+    if (record.role === 'assistant' && record.kind === 'standard' && record.content.trim() === normalized) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function pushAssistantStandardMessage(
+  records: NativeHistoryMessage[],
+  sessionId: string,
+  receivedAt: number,
+  content: string,
+  workspace?: string,
+): void {
+  const text = content.trim();
+  if (!text) return;
+  if (hasAssistantStandardMessageSinceLastUser(records, text)) return;
+
+  const msg: NativeHistoryMessage = {
+    ts: new Date(receivedAt).toISOString(),
+    receivedAt,
+    role: 'assistant',
+    content: text,
+    kind: 'standard',
+    agent: 'codex-cli',
+    historySessionId: sessionId,
+  };
+  if (workspace) msg.workspace = workspace;
+  records.push(msg);
+}
+
 /**
  * Read the first line of a Codex JSONL session file and parse the session_meta record.
  * Returns the payload object (containing id, cwd, etc.) or null.
@@ -233,16 +271,38 @@ function parseSessionFile(
       continue;
     }
 
-    if (type !== 'response_item') continue;
-
     const payloadType = String(payload.type ?? '').trim();
 
+    if (type === 'event_msg') {
+      if (payloadType === 'task_complete') {
+        pushAssistantStandardMessage(
+          records,
+          sessionId,
+          receivedAt,
+          flattenCodexContent(payload.last_agent_message),
+          detectedWorkspace,
+        );
+      } else if (payloadType === 'agent_message' && String(payload.phase ?? '').trim() === 'final_answer') {
+        pushAssistantStandardMessage(
+          records,
+          sessionId,
+          receivedAt,
+          flattenCodexContent(payload.message),
+          detectedWorkspace,
+        );
+      }
+      continue;
+    }
+
+    if (type !== 'response_item') continue;
+
     if (payloadType === 'message') {
       const role = String(payload.role ?? '').trim();
       if (role !== 'user' && role !== 'assistant') continue;
 
       const content = flattenCodexContent(payload.content);
       if (!content) continue;
+      if (role === 'assistant' && hasAssistantStandardMessageSinceLastUser(records, content)) continue;
 
       const msg: NativeHistoryMessage = {
         ts: new Date(receivedAt).toISOString(),

package/src/providers/spec/driver.ts

@@ -230,6 +230,12 @@ export class SpecDriver {
     private completionIdleKey = '';
     /** Previous screen lines — passed to evaluate() for `changed` condition detection. */
     private prevScreenLines: string[] = [];
+    /** Timestamp when idle was last committed (either direct or via idle_hold_ms).
+     *  Used to suppress immediate idle → busy re-entry from transient `changed`
+     *  condition blips (e.g. completion-marker counter "Completed for Xs" updating
+     *  every second, which triggers cursor_above:changed and bounces back to busy
+     *  right after an idle commit). */
+    private lastIdleCommittedAt = 0;
     /** Timestamp of the last PTY frame that changed the screen content.
      *  Used by screen_active_hold_ms to suppress idle downshifts while
      *  the terminal is still actively updating. */
@@ -303,7 +309,7 @@ export class SpecDriver {
             case 'click_modal_button': this.handleClickModalButton(cmd.index); return;
             case 'attach_image': this.handleAttachImage(cmd.blob, cmd.mime); return;
             case 'resize': this.adapter.resize(cmd.cols, cmd.rows); return;
-            case 'cancel': this.adapter.send_keys('\x03'); return;
+            case 'cancel': this.lastIdleCommittedAt = 0; this.adapter.send_keys('\x03'); return;
             case 'shutdown': this.shutdown(); return;
         }
     }
@@ -595,6 +601,29 @@ export class SpecDriver {
             evState = this.lastBusyState ?? evState;
         }
 
+        // Idle → busy re-entry hold: suppress false-busy transitions that fire
+        // immediately after an idle commit. The most common source is the
+        // `cursor_above: 3, changed: true` condition matching tiny updates
+        // (e.g. "✻ Completed for Ns" counter ticking once per second) right
+        // after the completion hold expired and idle was committed. Without
+        // this guard the dashboard bounces back to generating within 1s of
+        // seeing idle.
+        //
+        // Guard window: prefer screen_active_hold_ms (already the "micro-change
+        // suppressor" window), floor to 1500ms so specs that omit it still
+        // get protection. This is intentionally shorter than busy_hold_ms —
+        // a real new generation (user types a message) will produce many
+        // more decisive signals (spinner, token counter, esc-to-interrupt)
+        // that override the hold long before it expires.
+        const idleReentryHoldMs = Math.max(screenActiveMs, 1500);
+        if (evState.id === 'busy' && this.currentStateId === (this.spec.default_state ?? 'idle')
+                && this.lastIdleCommittedAt > 0
+                && (now - this.lastIdleCommittedAt) < idleReentryHoldMs) {
+            LOG.debug('SpecDriver', `[${this.opts.specPath.split('/').slice(-3).join('/')}] idle→busy suppressed (idle_reentry_hold ageMs=${now - this.lastIdleCommittedAt} holdMs=${idleReentryHoldMs})`);
+            this.scheduleBusyExpiry(idleReentryHoldMs - (now - this.lastIdleCommittedAt) + 50);
+            return;
+        }
+
         if (evState.id === 'busy') {
             this.lastBusyAt = Date.now();
             this.lastBusyState = evState;
@@ -661,6 +690,7 @@ export class SpecDriver {
                     this.pendingIdleState = null;
                     if (!committed) return;
                     LOG.debug('SpecDriver', `[${this.opts.specPath.split('/').slice(-3).join('/')}] idleHold committed after ${idleHoldMs}ms`);
+                    this.lastIdleCommittedAt = Date.now();
                     this.currentStateId = committed.id;
                     this.currentEval = capturedEv;
                     this.pushHistory(committed.id, committed.label, {
@@ -721,6 +751,9 @@ export class SpecDriver {
             }
         }
         if (changed) {
+            if (evState.id === (this.spec.default_state ?? 'idle')) {
+                this.lastIdleCommittedAt = Date.now();
+            }
             this.currentStateId = evState.id;
             const matchedRules = extractMatchedRules(ev);
             // Determine reason and debounce kind for this transition
@@ -799,6 +832,9 @@ export class SpecDriver {
             this.pendingSends.push(text);
             return;
         }
+        // Clear the idle re-entry hold so a new generation starting
+        // immediately after idle doesn't get its busy state suppressed.
+        this.lastIdleCommittedAt = 0;
         this.actuallySendMessage(text);
     }