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

package/dist/index.js

@@ -10401,7 +10401,25 @@ var init_cli_state_engine = __esm({
           "CLI",
           `[${this.provider.type}] settled diagnostics prompt=${JSON.stringify(this.currentTurnScope?.prompt || "").slice(0, 140)} status=${String(status || "")} parsedStatus=${String(parsedStatus || "")} parsedMsgCount=${parsedMessages.length} lastParsedAssistant=${JSON.stringify((lastParsedAssistant?.content || "").slice(0, 120)).slice(0, 160)} responseBuffer=${JSON.stringify((snap.responseBuffer || "").slice(0, 160)).slice(0, 220)} recentActivity=${recentInteractiveActivity}`
         );
-        const shouldHoldGenerating = status === "idle" && this.isWaitingForResponse && !!this.currentTurnScope && !modal && !(parsedStatus === "idle" && !!lastParsedAssistant);
+        const hasFinalCurrentTurnAssistant = (() => {
+          if (parsedStatus !== "idle") return false;
+          const msgs = Array.isArray(parsedMessages) ? parsedMessages : [];
+          let lastUserIdx = -1;
+          for (let i = msgs.length - 1; i >= 0; i--) {
+            if (msgs[i]?.role === "user") {
+              lastUserIdx = i;
+              break;
+            }
+          }
+          const searchSlice = lastUserIdx >= 0 ? msgs.slice(lastUserIdx + 1) : msgs;
+          return searchSlice.some((m) => {
+            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 && !hasFinalCurrentTurnAssistant;
         if (shouldHoldGenerating) {
           this.applyHoldGenerating(ctx);
           return;
@@ -29225,6 +29243,12 @@ var SpecDriver = class {
   completionIdleKey = "";
   /** Previous screen lines — passed to evaluate() for `changed` condition detection. */
   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). */
+  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. */
@@ -29279,6 +29303,7 @@ var SpecDriver = class {
         this.adapter.resize(cmd.cols, cmd.rows);
         return;
       case "cancel":
+        this.lastIdleCommittedAt = 0;
         this.adapter.send_keys("");
         return;
       case "shutdown":
@@ -29503,6 +29528,12 @@ var SpecDriver = class {
     if (screenIsActive && this.currentStateId === "busy" && evState.id === (this.spec.default_state ?? "idle")) {
       evState = this.lastBusyState ?? evState;
     }
+    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\u2192busy 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;
@@ -29538,6 +29569,7 @@ var SpecDriver = class {
           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, {
@@ -29580,6 +29612,9 @@ var SpecDriver = class {
       }
     }
     if (changed) {
+      if (evState.id === (this.spec.default_state ?? "idle")) {
+        this.lastIdleCommittedAt = Date.now();
+      }
       this.currentStateId = evState.id;
       const matchedRules = extractMatchedRules(ev);
       let transitionReason;
@@ -29647,6 +29682,7 @@ var SpecDriver = class {
       this.pendingSends.push(text);
       return;
     }
+    this.lastIdleCommittedAt = 0;
     this.actuallySendMessage(text);
   }
   actuallySendMessage(text) {
@@ -35792,6 +35828,35 @@ function extractToolOutputContent(payload) {
   }
   return "";
 }
+function hasAssistantStandardMessageSinceLastUser(records, content) {
+  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, sessionId, receivedAt, content, workspace) {
+  const text = content.trim();
+  if (!text) return;
+  if (hasAssistantStandardMessageSinceLastUser(records, text)) return;
+  const msg = {
+    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);
+}
 function readSessionMeta(filePath) {
   try {
     const firstLine = fs15.readFileSync(filePath, "utf-8").split("\n").find(Boolean);
@@ -35847,13 +35912,34 @@ function parseSessionFile(filePath, sessionId, workspaceFallback) {
       }
       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 = {
         ts: new Date(receivedAt).toISOString(),
         receivedAt,
@@ -39786,6 +39872,7 @@ async function maybeRunDaemonUpgradeHelperFromEnv() {
 
 // src/commands/router.ts
 init_mesh_work_queue();
+init_repo_mesh_types();
 var import_os3 = require("os");
 var import_path10 = require("path");
 var fs22 = __toESM(require("fs"));
@@ -42345,7 +42432,8 @@ var DaemonCommandRouter = class {
           ...result ? {
             success: result.success === true,
             result,
-            finalBranchConvergenceState: result.finalBranchConvergenceState
+            finalBranchConvergenceState: result.finalBranchConvergenceState,
+            ...result.blockerContext ? { blockerContext: result.blockerContext } : {}
           } : {}
         }
       });
@@ -42875,6 +42963,27 @@ var DaemonCommandRouter = class {
           finalBranchConvergenceState
         };
       }
+      const requireApprovalForPush = mesh?.policy?.requireApprovalForPush ?? DEFAULT_MESH_POLICY.requireApprovalForPush;
+      let pushResult;
+      if (!requireApprovalForPush) {
+        const pushStarted = Date.now();
+        try {
+          await execFileAsync3("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) {
+          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,
@@ -42888,7 +42997,13 @@ var DaemonCommandRouter = class {
         mergeResult,
         refineStages,
         ...ledgerError ? { ledgerError } : {},
-        finalBranchConvergenceState
+        finalBranchConvergenceState,
+        // Push outcome or readiness info for coordinator.
+        ...pushResult ? { pushResult } : {
+          pushReady: true,
+          pushCommand: `git push origin ${baseBranch}`,
+          pushNote: "requireApprovalForPush is enabled \u2014 run the push command or obtain user approval before pushing."
+        }
       };
     } catch (e) {
       return { success: false, error: e.message, refineStages };
@@ -42906,9 +43021,46 @@ var DaemonCommandRouter = class {
     const refineCode = typeof result.code === "string" ? result.code : "";
     const refineTerminalKind = result.success === true ? "completed" : refineCode === "blocked_review" ? "blocked_review" : refineCode === "validation_failed" || refineCode === "validation_dependencies_missing" ? "validation_failed" : refineCode === "submodule_reachability_failed" ? "submodule_reachability_failed" : refineCode === "merge_failed" || refineCode === "patch_equivalence_failed" || refineCode === "needs_rebase" || refineCode === "needs_rebase_with_conflicts" ? "merge_failed" : refineCode === "cleanup_failed" ? "cleanup_failed" : "merge_failed";
     const isTerminalSuccess = refineTerminalKind === "completed";
+    const blockerContext = isTerminalSuccess ? void 0 : (() => {
+      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 = {
+        stage,
+        reason: code,
+        terminalKind: refineTerminalKind
+      };
+      if (typeof result.error === "string") ctx.error = result.error;
+      if (typeof result.blockedReason === "string") ctx.blockedReason = result.blockedReason;
+      if (stage === "patch_equivalence" && result.patchEquivalence) {
+        const pe = result.patchEquivalence;
+        ctx.details = {
+          expectedPatchId: pe.expectedPatchId,
+          actualPatchId: pe.actualPatchId,
+          status: pe.status,
+          actionableHint: pe.actionableHint,
+          error: pe.error
+        };
+      }
+      if (stage === "submodule_reachability" && Array.isArray(result.unreachableSubmoduleCommits)) {
+        ctx.details = {
+          unreachableCount: result.unreachableSubmoduleCommits.length,
+          paths: result.unreachableSubmoduleCommits.map((e) => e.path),
+          autoPublishAllowed: result.unreachableSubmoduleCommits[0]?.autoPublishAllowed
+        };
+      }
+      if (stage === "validation" && result.validationSummary) {
+        const vs = result.validationSummary;
+        ctx.details = {
+          failureCode: vs.failureCode,
+          commandsRun: Array.isArray(vs.commandsRun) ? vs.commandsRun.length : void 0
+        };
+      }
+      return ctx;
+    })();
     const normalizedResult = {
       ...result,
       terminalKind: refineTerminalKind,
+      ...blockerContext ? { blockerContext } : {},
       ...result.nextStep === void 0 && !isTerminalSuccess ? {
         nextStep: refineTerminalKind === "blocked_review" ? "Request user review/approval before attempting to merge again." : refineTerminalKind === "validation_failed" ? "Fix failing tests or configure validation.bootstrapCommands and retry mesh_refine_node." : refineTerminalKind === "submodule_reachability_failed" ? "Push unreachable submodule commits to origin/main, then retry mesh_refine_node." : refineTerminalKind === "merge_failed" ? "Resolve merge conflicts or patch equivalence issues, then retry mesh_refine_node." : refineTerminalKind === "cleanup_failed" ? "Manually remove the worktree and retry or use mesh_remove_node." : "Inspect refineStages for the failing stage and retry."
       } : {}