@adhdev/daemon-core 0.9.77-rc.6 → 0.9.77-rc.60

package/dist/index.mjs

@@ -96,13 +96,25 @@ async function createWorktree(opts) {
     branch
   };
 }
-async function removeWorktree(repoRoot, worktreePath) {
+async function removeWorktree(repoRoot, worktreePath, opts = {}) {
   if (!existsSync(worktreePath)) {
     await pruneWorktrees(repoRoot);
     return { success: true, removedPath: worktreePath };
   }
+  if (opts.requireClean) {
+    const { stdout } = await execFileAsync2("git", ["status", "--porcelain"], {
+      cwd: worktreePath,
+      encoding: "utf8",
+      timeout: GIT_TIMEOUT_MS,
+      maxBuffer: GIT_MAX_BUFFER,
+      windowsHide: true
+    });
+    if (stdout.trim()) {
+      throw new Error(`Refusing to remove dirty worktree: ${worktreePath}`);
+    }
+  }
   try {
-    await execFileAsync2("git", ["worktree", "remove", worktreePath, "--force"], {
+    await execFileAsync2("git", ["worktree", "remove", worktreePath], {
       cwd: repoRoot,
       encoding: "utf8",
       timeout: GIT_TIMEOUT_MS,
@@ -111,7 +123,33 @@ async function removeWorktree(repoRoot, worktreePath) {
     });
   } catch (error) {
     const stderr = typeof error.stderr === "string" ? error.stderr : "";
-    throw new Error(`git worktree remove failed: ${stderr.trim() || error.message}`);
+    const stdout = typeof error.stdout === "string" ? error.stdout : "";
+    const detail = `${stderr}
+${stdout}
+${error.message || ""}`;
+    if (opts.allowSubmoduleForceFallback && SUBMODULE_WORKTREE_REMOVE_RE.test(detail)) {
+      try {
+        await execFileAsync2("git", ["worktree", "remove", "--force", worktreePath], {
+          cwd: repoRoot,
+          encoding: "utf8",
+          timeout: GIT_TIMEOUT_MS,
+          maxBuffer: GIT_MAX_BUFFER,
+          windowsHide: true
+        });
+      } catch (forceError) {
+        const forceStderr = typeof forceError.stderr === "string" ? forceError.stderr : "";
+        const forceStdout = typeof forceError.stdout === "string" ? forceError.stdout : "";
+        throw new Error(`git worktree remove --force fallback failed: ${forceStderr.trim() || forceStdout.trim() || forceError.message}`);
+      }
+      return {
+        success: true,
+        removedPath: worktreePath,
+        fallback: "git_worktree_remove_force_submodule",
+        forced: true,
+        reason: "working_trees_containing_submodules"
+      };
+    }
+    throw new Error(`git worktree remove failed: ${stderr.trim() || stdout.trim() || error.message}`);
   }
   return { success: true, removedPath: worktreePath };
 }
@@ -161,7 +199,7 @@ async function pruneWorktrees(repoRoot) {
   } catch {
   }
 }
-var execFileAsync2, WORKTREE_DIR_NAME, GIT_TIMEOUT_MS, GIT_MAX_BUFFER;
+var execFileAsync2, WORKTREE_DIR_NAME, GIT_TIMEOUT_MS, GIT_MAX_BUFFER, SUBMODULE_WORKTREE_REMOVE_RE;
 var init_git_worktree = __esm({
   "src/git/git-worktree.ts"() {
     "use strict";
@@ -169,6 +207,7 @@ var init_git_worktree = __esm({
     WORKTREE_DIR_NAME = ".adhdev-worktrees";
     GIT_TIMEOUT_MS = 3e4;
     GIT_MAX_BUFFER = 4 * 1024 * 1024;
+    SUBMODULE_WORKTREE_REMOVE_RE = /working trees containing submodules cannot be moved or removed/i;
   }
 });
 
@@ -282,7 +321,8 @@ function ensureMachineId(config) {
   };
 }
 function getConfigDir() {
-  const dir = join2(homedir(), ".adhdev");
+  const override = process.env.ADHDEV_CONFIG_DIR;
+  const dir = override && override.trim() ? override.trim() : join2(homedir(), ".adhdev");
   if (!existsSync2(dir)) {
     mkdirSync(dir, { recursive: true });
   }
@@ -544,6 +584,7 @@ function addNode(meshId, opts) {
     workspace: opts.workspace.trim(),
     repoRoot: opts.repoRoot,
     daemonId: opts.daemonId,
+    machineId: opts.machineId,
     userOverrides: opts.userOverrides || {},
     policy: opts.policy || {},
     isLocalWorktree: opts.isLocalWorktree,
@@ -671,7 +712,8 @@ function buildRulesSection(coordinatorCliType) {
 - **Minimize coordinator context.** The coordinator's job is routing, not implementing. Do not read source files, run commands, or analyze code directly \u2014 delegate all of that to node agents. Your context should stay lean.
 - **Delegate analysis too.** If you need to understand a bug or explore the codebase, send that investigation as a task to the queue or a node. Do not do it yourself.
 - **Respect explicit provider requests.** If the user names an agent/provider, pass the matching provider type to \`mesh_launch_session\`: Hermes \u2192 \`hermes-cli\`, Claude Code/Claude \u2192 \`claude-cli\`, Codex \u2192 \`codex-cli\`, Gemini \u2192 \`gemini-cli\`. Never substitute \`claude-cli\` just because the coordinator itself is Claude Code.
-- **Front-load the task message.** When calling \`mesh_enqueue_task\` or \`mesh_send_task\`, include everything the agent needs: what files to touch, what the problem is, what the fix should look like. The agent won't ask follow-up questions.
+- **Front-load new task messages.** When calling \`mesh_enqueue_task\` or \`mesh_send_task\` for a new task, include everything the agent needs: what files to touch, what the problem is, what the fix should look like. The agent won't ask follow-up questions.
+- **Avoid context-wasting restarts.** For follow-up, retry, commit/push, preview, or cleanup work on the same issue, prefer the existing idle session and send only the delta from its last verified state. Start a fresh chat/session only for genuinely independent work, explicit provider/user request, unsafe transcript contamination, or required branch/worktree isolation.
 - **Don't inspect code.** Treat delegated agent summaries as self-reports, not verification. Verify side effects via \`mesh_git_status\` (including related repo freshness when configured), not by reading source files.
 - **Don't over-parallelize.** Start with 1-2 concurrent tasks. Scale up if they succeed. Never launch a duplicate session or second worker solely because \`mesh_read_chat\` has no final assistant message while the delegated session is still showing tool/terminal activity.
 - **Handle failures with context.** If a task fails, check \`mesh_task_history\` first to see if this task was attempted before and how it failed. Read the chat to understand why, then decide: retry on the same node, reassign to a different node, or escalate to the user.
@@ -680,6 +722,7 @@ function buildRulesSection(coordinatorCliType) {
 - **Respect node capabilities.** Don't send build tasks to read-only nodes. Don't push from nodes that aren't allowed to.
 - **Never fabricate tool results.** Always call the actual tool; never pretend you did.
 - **Clean up worktree nodes.** After a worktree task completes and its changes are merged or checkpointed, call \`mesh_remove_node\` to free resources.
+- **Do not strand completed branches.** A checkpointed or clean feature/worktree branch is not done by itself. Merge/refine it to the mesh default branch, or explicitly report one of \`pushed_feature_branch_needs_merge\`, \`blocked_review\`, \`cleanup_candidate\`, or \`not_mergeable\` with the next action.
 - **Name worktree branches meaningfully.** Use descriptive names like \`feat/auth-refactor\` or \`fix/build-123\`.${coordinatorNote}`;
 }
 var TOOLS_SECTION, TOOL_EXPOSURE_PREFLIGHT_SECTION, WORKFLOW_SECTION;
@@ -691,17 +734,24 @@ var init_coordinator_prompt = __esm({
 
 | Tool | Purpose |
 |------|---------|
-| \`mesh_status\` | Check all nodes' health, git state, and active sessions |
+| \`mesh_status\` | Check all nodes' health, git state, active sessions, and branch convergence |
 | \`mesh_list_nodes\` | List nodes with workspace paths |
+| \`mesh_enqueue_task\` | Add a task to the pull-based work queue; idle nodes auto-claim |
+| \`mesh_view_queue\` | View queue status \u2014 pending, assigned, completed, failed, cancelled tasks |
+| \`mesh_queue_cancel\` | Cancel a queue task without deleting audit history |
+| \`mesh_queue_requeue\` | Return a task to pending for retry; clears stale session targets |
+| \`mesh_send_task\` | Legacy push: enqueue a task targeted at a specific node |
 | \`mesh_launch_session\` | Start a new agent session on a node |
-| \`mesh_send_task\` | Send a task (natural language) to a running agent |
-| \`mesh_read_chat\` | Read an agent's recent messages to check progress |
+| \`mesh_read_chat\` | Read recent chat messages from a delegated agent session |
+| \`mesh_read_debug\` | Collect a daemon-side chat/parser debug bundle for a session |
 | \`mesh_task_history\` | Read the task ledger \u2014 dispatches, completions, failures. Use to understand what has been done before deciding next steps |
 | \`mesh_git_status\` | Check git status on a specific node |
 | \`mesh_checkpoint\` | Create a git checkpoint on a node |
 | \`mesh_approve\` | Approve/reject a pending agent action |
 | \`mesh_clone_node\` | Create a worktree node for isolated parallel branch work |
-| \`mesh_remove_node\` | Remove a node (cleans up worktree if applicable) |`;
+| \`mesh_refine_node\` | Validate and merge a completed worktree node back into its base branch |
+| \`mesh_remove_node\` | Remove a node (cleans up worktree if applicable) |
+| \`mesh_cleanup_sessions\` | Manually clean up delegated session records for a node |`;
     TOOL_EXPOSURE_PREFLIGHT_SECTION = `## Tool Exposure Preflight
 
 Before doing any coordinator work, confirm that the actual callable tool list includes \`mesh_status\` and the other \`mesh_*\` tools from the table above. If this Repo Mesh coordinator prompt is present but the callable \`mesh_*\` tools are missing, the MCP server/tool manifest is stale or not injected yet. Do not substitute terminal/file/git tools, do not inspect or edit the repository directly, and do not continue as a non-mesh local coding agent. Stop immediately and tell the user to run \`/reload-mcp\` or start a fresh coordinator session so ADHDev can reconnect \`adhdev-mesh\`.`;
@@ -711,14 +761,16 @@ Before doing any coordinator work, confirm that the actual callable tool list in
 2. **Plan** \u2014 Decompose the user's request into independent tasks for parallel execution, or sequential tasks when dependencies exist. If \`mesh_task_history\` shows a recent failure for a task, decide whether to retry or reassign.
 3. **Queue / Delegate** \u2014 The Mesh uses an autonomous pull-based Work Queue:
    a. **General Tasks**: Enqueue tasks using \`mesh_enqueue_task\`. Idle node agents will automatically pull tasks from the queue and begin working.
-   b. **Node Preparation**: Call \`mesh_launch_session\` to ensure enough agent sessions are active to handle the queue. If you need branch isolation for parallel work, call \`mesh_clone_node\` to create a worktree node first.
+   b. **Node Preparation**: Reuse an existing idle session on the correct node/provider before launching a new chat/session. Call \`mesh_launch_session\` only when no suitable session exists, when the user explicitly asks for a fresh provider/session, or when branch/worktree isolation requires it. If you need branch isolation for parallel work, call \`mesh_clone_node\` to create a worktree node first.
    c. **Targeted Tasks**: Use \`mesh_send_task\` only when you need to bypass the queue and force a specific node to execute a task immediately.
-   d. Always provide a **complete, self-contained** instruction that includes all context the agent needs (file paths, line numbers, what to change, why). Do not send partial instructions expecting future follow-up.
+   d. For the first dispatch of a new task, provide a **complete, self-contained** instruction that includes all context the agent needs (file paths, line numbers, what to change, why). Do not send partial instructions expecting future follow-up.
+   e. For a continuation of the same issue in an existing session, send a concise **delta instruction**: current verified state, the exact failed/blocked step, the newly approved action, and final reporting requirements. Do not resend the full original task or open a new chat solely to continue the same work; that wastes coordinator and worker context.
 4. **Monitor** \u2014 Prefer event-driven completion/status notifications. Do **not** poll \`mesh_read_chat\` repeatedly. Use \`mesh_view_queue\` to see the status of all pending, assigned, completed, and failed tasks. Do not call \`mesh_read_chat\` again within a few seconds for the same generating session. Use at most one compact \`mesh_read_chat\` check after a completion/approval signal. Handle approvals via \`mesh_approve\`.
 5. **Verify** \u2014 When a task reports completion or git work is visible, call \`mesh_git_status\` to verify changes were made.
 6. **Checkpoint** \u2014 Call \`mesh_checkpoint\` to save the work.
-7. **Clean up** \u2014 Remove worktree nodes via \`mesh_remove_node\` after their work is merged or no longer needed.
-8. **Report** \u2014 Summarize what was done, what changed, and any issues.
+7. **Converge branches** \u2014 Before marking any task complete, classify every touched node/branch into exactly one final state: \`merged_to_main\`, \`pushed_feature_branch_needs_merge\`, \`blocked_review\`, \`cleanup_candidate\`, or \`not_mergeable\`. Use \`mesh_status\` branchConvergenceSummary and \`mesh_refine_node\` for clean worktree branches when safe. A task that remains on a non-main branch is not fully complete unless the final report names the follow-up state and next step.
+8. **Clean up** \u2014 Remove worktree nodes via \`mesh_remove_node\` after their work is merged or no longer needed.
+9. **Report** \u2014 Summarize what was done, what changed, any issues, and the branch convergence state.
 
 ## Failure Recovery
 
@@ -728,7 +780,7 @@ When a node agent stops unexpectedly, the daemon automatically enriches the syst
 - A recommendation: **retry**, **reassign**, or **escalate**
 
 Follow these recovery rules:
-1. **If "Retry recommended"**: Re-launch the session on the same node (\`mesh_launch_session\`), then resend the original task (\`mesh_send_task\`). The system message includes the original task text.
+1. **If "Retry recommended"**: Check \`mesh_view_queue\` first \u2014 the daemon may have auto-requeued. If not, re-launch the session on the same node (\`mesh_launch_session\`), then resend the original task (\`mesh_send_task\`). The system message includes the original task text.
 2. **If "Max retries exceeded"**: Do NOT retry on the same node. Either reassign the task to a different node, or inform the user that the task requires manual intervention.
 3. **If no recovery context**: The stop may be intentional (normal completion). Use \`mesh_read_chat\` once to verify, then move on.
 4. **Always record what happened**: After handling a failure, briefly note the outcome in your report to the user.`;
@@ -738,18 +790,27 @@ Follow these recovery rules:
 // src/mesh/mesh-ledger.ts
 var mesh_ledger_exports = {};
 __export(mesh_ledger_exports, {
+  MAX_LEDGER_SLICE_LIMIT: () => MAX_LEDGER_SLICE_LIMIT,
   appendLedgerEntry: () => appendLedgerEntry,
   appendRemoteLedgerEntries: () => appendRemoteLedgerEntries,
+  buildTaskCompletionEvidence: () => buildTaskCompletionEvidence,
   getLedgerDir: () => getLedgerDir,
   getLedgerSummary: () => getLedgerSummary,
   getSessionRecoveryContext: () => getSessionRecoveryContext,
+  isIntentionalCleanupStopEntry: () => isIntentionalCleanupStopEntry,
   meshLedgerEvents: () => meshLedgerEvents,
-  readLedgerEntries: () => readLedgerEntries
+  readLedgerEntries: () => readLedgerEntries,
+  readLedgerSlice: () => readLedgerSlice
 });
 import { existsSync as existsSync5, mkdirSync as mkdirSync3, readFileSync as readFileSync3, appendFileSync, statSync as statSync2, renameSync } from "fs";
 import { join as join5 } from "path";
 import { randomUUID as randomUUID4 } from "crypto";
 import { EventEmitter } from "events";
+function isIntentionalCleanupStopEntry(entry) {
+  if (entry.kind !== "session_stopped" && entry.kind !== "task_failed" && entry.kind !== "task_stalled") return false;
+  const payload = entry.payload && typeof entry.payload === "object" && !Array.isArray(entry.payload) ? entry.payload : {};
+  return payload.intentional === true && (payload.reason === "operator_cleanup" || payload.intentionalStopReason === "operator_cleanup" || payload.source === "mesh_cleanup_sessions" || payload.source === "mesh_remove_node");
+}
 function getLedgerDir() {
   const dir = join5(getConfigDir(), LEDGER_DIR_NAME);
   if (!existsSync5(dir)) {
@@ -765,6 +826,37 @@ function getRotatedPath(meshId, index) {
   const safe = meshId.replace(/[^a-zA-Z0-9_-]/g, "_");
   return join5(getLedgerDir(), `${safe}.${index}.jsonl`);
 }
+function buildTaskCompletionEvidence(opts) {
+  const providerSessionId = opts.providerSessionId?.trim() || void 0;
+  const providerType = opts.providerType?.trim() || void 0;
+  return {
+    source: "agent_status_event",
+    event: opts.event,
+    nodeId: opts.nodeId,
+    sessionId: opts.sessionId,
+    providerType,
+    completedAt: opts.completedAt || (/* @__PURE__ */ new Date()).toISOString(),
+    transcriptHandle: {
+      kind: providerSessionId ? "provider_session" : "runtime_session",
+      sessionId: opts.sessionId,
+      providerSessionId,
+      finalSummaryAvailable: typeof opts.finalSummary === "string" && opts.finalSummary.trim().length > 0
+    },
+    git: {
+      status: "deferred",
+      reason: "ordinary_completion_git_status_not_checked"
+    },
+    validation: {
+      status: "deferred",
+      commandsRun: [],
+      reason: "ordinary_completion_validation_not_run"
+    },
+    checkpoint: {
+      attempted: false,
+      reason: "not_attempted_for_ordinary_completion"
+    }
+  };
+}
 function appendLedgerEntry(meshId, partial) {
   const entry = {
     id: randomUUID4(),
@@ -791,15 +883,49 @@ function appendLedgerEntry(meshId, partial) {
     throw new Error(`Failed to append to ledger for mesh ${meshId}: ${e.message}`);
   }
 }
+function clampLedgerSliceLimit(limit) {
+  if (typeof limit !== "number" || !Number.isFinite(limit)) return DEFAULT_LEDGER_SLICE_LIMIT;
+  return Math.max(1, Math.min(MAX_LEDGER_SLICE_LIMIT, Math.floor(limit)));
+}
+function isValidRemoteLedgerEntry(meshId, value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+  const entry = value;
+  if (typeof entry.id !== "string" || !entry.id.trim()) return false;
+  if (entry.meshId !== meshId) return false;
+  if (typeof entry.timestamp !== "string" || Number.isNaN(new Date(entry.timestamp).getTime())) return false;
+  if (typeof entry.kind !== "string" || !entry.kind.trim()) return false;
+  if (!entry.payload || typeof entry.payload !== "object" || Array.isArray(entry.payload)) return false;
+  return true;
+}
 function appendRemoteLedgerEntries(meshId, entries) {
-  if (entries.length === 0) return;
+  if (entries.length === 0) return { accepted: 0, skippedDuplicate: 0, rejectedInvalid: 0, entries: [] };
   const ledgerPath = getLedgerPath(meshId);
   const existing = new Set(readLedgerEntries(meshId).map((e) => e.id));
-  const newEntries = entries.filter((e) => !existing.has(e.id));
-  if (newEntries.length === 0) return;
+  const validEntries = [];
+  let rejectedInvalid = 0;
+  let skippedDuplicate = 0;
+  for (const entry of entries) {
+    if (!isValidRemoteLedgerEntry(meshId, entry)) {
+      rejectedInvalid++;
+      continue;
+    }
+    if (existing.has(entry.id)) {
+      skippedDuplicate++;
+      continue;
+    }
+    existing.add(entry.id);
+    validEntries.push(entry);
+  }
+  if (validEntries.length === 0) {
+    return { accepted: 0, skippedDuplicate, rejectedInvalid, entries: [] };
+  }
   try {
-    const lines = newEntries.map((e) => JSON.stringify(e)).join("\n") + "\n";
+    const lines = validEntries.map((e) => JSON.stringify(e)).join("\n") + "\n";
     appendFileSync(ledgerPath, lines, { encoding: "utf-8", mode: 384 });
+    for (const entry of validEntries) {
+      meshLedgerEvents.emit("append", meshId, entry);
+    }
+    return { accepted: validEntries.length, skippedDuplicate, rejectedInvalid, entries: validEntries };
   } catch (e) {
     throw new Error(`Failed to append remote ledger entries for mesh ${meshId}: ${e.message}`);
   }
@@ -838,6 +964,34 @@ function readLedgerEntries(meshId, opts) {
   }
   return entries;
 }
+function readLedgerSlice(meshId, opts) {
+  const limit = clampLedgerSliceLimit(opts?.limit);
+  let entries = readLedgerEntries(meshId, { since: opts?.since, kind: opts?.kind });
+  const afterId = typeof opts?.afterId === "string" && opts.afterId.trim() ? opts.afterId.trim() : null;
+  if (afterId) {
+    const index = entries.findIndex((entry) => entry.id === afterId);
+    entries = index >= 0 ? entries.slice(index + 1) : entries;
+  }
+  const bounded = entries.slice(0, limit);
+  return {
+    protocol: "adhdev.mesh.ledger.slice.v1",
+    meshId,
+    entries: bounded,
+    cursor: {
+      afterId,
+      nextAfterId: bounded.length ? bounded[bounded.length - 1].id : afterId,
+      limit,
+      hasMore: entries.length > bounded.length
+    },
+    summary: getLedgerSummary(meshId),
+    sourceOfTruth: {
+      kind: "local_jsonl",
+      path: getLedgerPath(meshId),
+      bounded: true,
+      maxLimit: MAX_LEDGER_SLICE_LIMIT
+    }
+  };
+}
 function getLedgerSummary(meshId) {
   const entries = readLedgerEntries(meshId);
   const now = Date.now();
@@ -863,15 +1017,17 @@ function getLedgerSummary(meshId) {
         summary.taskCompleted++;
         break;
       case "task_failed": {
+        if (isIntentionalCleanupStopEntry(entry)) break;
         summary.taskFailed++;
         if (new Date(entry.timestamp).getTime() >= recentFailureCutoff) {
           summary.recentFailures++;
         }
         break;
       }
-      case "task_stalled":
-        summary.taskStalled++;
+      case "task_stalled": {
+        if (!isIntentionalCleanupStopEntry(entry)) summary.taskStalled++;
         break;
+      }
       case "session_launched":
         summary.sessionLaunched++;
         break;
@@ -910,6 +1066,7 @@ function getSessionRecoveryContext(meshId, opts) {
     if (new Date(e.timestamp).getTime() < recentWindow) break;
     if (opts.nodeId && e.nodeId !== opts.nodeId) continue;
     if (e.kind === "task_failed") {
+      if (isIntentionalCleanupStopEntry(e)) continue;
       consecutiveNodeFailures++;
     } else if (e.kind === "task_completed" || e.kind === "task_dispatched") {
       break;
@@ -960,7 +1117,7 @@ function rotateLedgerFile(meshId, currentPath) {
   } catch {
   }
 }
-var LEDGER_DIR_NAME, MAX_FILE_SIZE_BYTES, RECENT_FAILURE_WINDOW_MS, meshLedgerEvents;
+var LEDGER_DIR_NAME, MAX_FILE_SIZE_BYTES, RECENT_FAILURE_WINDOW_MS, DEFAULT_LEDGER_SLICE_LIMIT, MAX_LEDGER_SLICE_LIMIT, meshLedgerEvents;
 var init_mesh_ledger = __esm({
   "src/mesh/mesh-ledger.ts"() {
     "use strict";
@@ -968,11 +1125,27 @@ var init_mesh_ledger = __esm({
     LEDGER_DIR_NAME = "mesh-ledger";
     MAX_FILE_SIZE_BYTES = 10 * 1024 * 1024;
     RECENT_FAILURE_WINDOW_MS = 30 * 60 * 1e3;
+    DEFAULT_LEDGER_SLICE_LIMIT = 100;
+    MAX_LEDGER_SLICE_LIMIT = 500;
     meshLedgerEvents = new EventEmitter();
   }
 });
 
 // src/mesh/mesh-work-queue.ts
+var mesh_work_queue_exports = {};
+__export(mesh_work_queue_exports, {
+  ACTIVE_MESH_QUEUE_STATUSES: () => ACTIVE_MESH_QUEUE_STATUSES,
+  HISTORICAL_MESH_QUEUE_STATUSES: () => HISTORICAL_MESH_QUEUE_STATUSES,
+  cancelTask: () => cancelTask,
+  claimNextTask: () => claimNextTask,
+  enqueueTask: () => enqueueTask,
+  getMeshQueueStats: () => getMeshQueueStats,
+  getQueue: () => getQueue,
+  recordTaskAutoLaunch: () => recordTaskAutoLaunch,
+  requeueTask: () => requeueTask,
+  updateSessionTaskStatus: () => updateSessionTaskStatus,
+  updateTaskStatus: () => updateTaskStatus
+});
 import { existsSync as existsSync6, writeFileSync as writeFileSync3, readFileSync as readFileSync4 } from "fs";
 import { join as join6 } from "path";
 import { randomUUID as randomUUID5 } from "crypto";
@@ -1002,6 +1175,7 @@ function enqueueTask(meshId, message, opts) {
     message,
     status: "pending",
     targetNodeId: opts?.targetNodeId,
+    targetSessionId: opts?.targetSessionId,
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     updatedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
@@ -1019,15 +1193,21 @@ function getQueue(meshId, opts) {
 }
 function claimNextTask(meshId, nodeId, sessionId) {
   const queue = readQueue(meshId);
-  let targetIdx = queue.findIndex((q) => q.status === "pending" && q.targetNodeId === nodeId);
+  const hasActiveAssignment = queue.some((q) => q.status === "assigned" && (q.assignedSessionId === sessionId || q.assignedNodeId === nodeId));
+  if (hasActiveAssignment) return null;
+  let targetIdx = queue.findIndex((q) => q.status === "pending" && q.targetSessionId === sessionId);
+  if (targetIdx === -1) {
+    targetIdx = queue.findIndex((q) => q.status === "pending" && q.targetNodeId === nodeId && !q.targetSessionId);
+  }
   if (targetIdx === -1) {
-    targetIdx = queue.findIndex((q) => q.status === "pending" && !q.targetNodeId);
+    targetIdx = queue.findIndex((q) => q.status === "pending" && !q.targetNodeId && !q.targetSessionId);
   }
   if (targetIdx === -1) return null;
   const entry = queue[targetIdx];
   entry.status = "assigned";
   entry.assignedNodeId = nodeId;
   entry.assignedSessionId = sessionId;
+  entry.dispatchTimestamp = (/* @__PURE__ */ new Date()).toISOString();
   entry.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
   writeQueue(meshId, queue);
   return entry;
@@ -1041,38 +1221,253 @@ function updateTaskStatus(meshId, taskId, status) {
   writeQueue(meshId, queue);
   return queue[idx];
 }
+function recordTaskAutoLaunch(meshId, taskId, autoLaunch) {
+  const queue = readQueue(meshId);
+  const idx = queue.findIndex((q) => q.id === taskId);
+  if (idx === -1) return null;
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  queue[idx].autoLaunch = {
+    ...autoLaunch,
+    updatedAt: now
+  };
+  queue[idx].updatedAt = now;
+  writeQueue(meshId, queue);
+  return queue[idx];
+}
+function cancelTask(meshId, taskId, opts) {
+  const queue = readQueue(meshId);
+  const idx = queue.findIndex((q) => q.id === taskId);
+  if (idx === -1) return null;
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  queue[idx].status = "cancelled";
+  queue[idx].updatedAt = now;
+  queue[idx].cancelledAt = now;
+  if (opts?.reason) queue[idx].cancelReason = opts.reason;
+  writeQueue(meshId, queue);
+  return queue[idx];
+}
+function requeueTask(meshId, taskId, opts) {
+  const queue = readQueue(meshId);
+  const idx = queue.findIndex((q) => q.id === taskId);
+  if (idx === -1) return null;
+  const entry = queue[idx];
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  entry.status = "pending";
+  delete entry.assignedNodeId;
+  delete entry.assignedSessionId;
+  delete entry.cancelledAt;
+  delete entry.cancelReason;
+  if (opts?.clearTargetNode) delete entry.targetNodeId;
+  if (typeof opts?.targetNodeId === "string") entry.targetNodeId = opts.targetNodeId;
+  if (opts?.clearTargetSession !== false) delete entry.targetSessionId;
+  if (typeof opts?.targetSessionId === "string") entry.targetSessionId = opts.targetSessionId;
+  entry.updatedAt = now;
+  entry.requeuedAt = now;
+  entry.requeueCount = (entry.requeueCount || 0) + 1;
+  if (opts?.reason) entry.requeueReason = opts.reason;
+  writeQueue(meshId, queue);
+  return entry;
+}
 function updateSessionTaskStatus(meshId, sessionId, status) {
   const queue = readQueue(meshId);
+  let bestIdx = -1;
+  let bestTime = 0;
   for (let i = queue.length - 1; i >= 0; i--) {
     if (queue[i].assignedSessionId === sessionId && queue[i].status === "assigned") {
-      queue[i].status = status;
-      queue[i].updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-      writeQueue(meshId, queue);
-      return queue[i];
+      const time = new Date(queue[i].dispatchTimestamp || queue[i].updatedAt).getTime();
+      if (time > bestTime) {
+        bestTime = time;
+        bestIdx = i;
+      }
     }
   }
-  return null;
+  if (bestIdx === -1) return null;
+  queue[bestIdx].status = status;
+  queue[bestIdx].updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+  writeQueue(meshId, queue);
+  return queue[bestIdx];
 }
 function getMeshQueueStats(meshId) {
   const queue = readQueue(meshId);
+  const pending = queue.filter((q) => q.status === "pending").length;
+  const assigned = queue.filter((q) => q.status === "assigned").length;
+  const completed = queue.filter((q) => q.status === "completed").length;
+  const failed = queue.filter((q) => q.status === "failed").length;
+  const cancelled = queue.filter((q) => q.status === "cancelled").length;
   return {
-    pending: queue.filter((q) => q.status === "pending").length,
-    assigned: queue.filter((q) => q.status === "assigned").length,
-    completed: queue.filter((q) => q.status === "completed").length,
-    failed: queue.filter((q) => q.status === "failed").length
+    total: queue.length,
+    active: pending + assigned,
+    historical: completed + failed + cancelled,
+    pending,
+    assigned,
+    completed,
+    failed,
+    cancelled,
+    activeCounts: {
+      pending,
+      assigned
+    },
+    historicalCounts: {
+      completed,
+      failed,
+      cancelled
+    },
+    activeAssignments: queue.filter((q) => q.status === "assigned").map((q) => ({
+      id: q.id,
+      nodeId: q.assignedNodeId,
+      sessionId: q.assignedSessionId,
+      message: q.message
+    }))
   };
 }
+var ACTIVE_MESH_QUEUE_STATUSES, HISTORICAL_MESH_QUEUE_STATUSES;
 var init_mesh_work_queue = __esm({
   "src/mesh/mesh-work-queue.ts"() {
     "use strict";
     init_mesh_ledger();
+    ACTIVE_MESH_QUEUE_STATUSES = ["pending", "assigned"];
+    HISTORICAL_MESH_QUEUE_STATUSES = ["completed", "failed", "cancelled"];
+  }
+});
+
+// src/detection/cli-detector.ts
+import { exec } from "child_process";
+import * as os2 from "os";
+import * as path8 from "path";
+import { existsSync as existsSync7 } from "fs";
+function parseVersion(raw) {
+  const match = raw.match(/v?(\d+\.\d+(?:\.\d+)?(?:-[a-zA-Z0-9.]+)?)/);
+  return match ? match[1] : raw.split("\n")[0].slice(0, 100);
+}
+function shellQuote(value) {
+  if (/^[a-zA-Z0-9_./:@%+=,-]+$/.test(value)) return value;
+  return `"${value.replace(/(["\\$`])/g, "\\$1")}"`;
+}
+function expandHome(value) {
+  const trimmed = value.trim();
+  if (!trimmed.startsWith("~")) return trimmed;
+  return path8.join(os2.homedir(), trimmed.slice(1));
+}
+function isExplicitCommandPath(command) {
+  const trimmed = command.trim();
+  return path8.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~");
+}
+function resolveCommandPath(command) {
+  const trimmed = command.trim();
+  if (!trimmed) return null;
+  if (isExplicitCommandPath(trimmed)) {
+    const expanded = expandHome(trimmed);
+    const candidate = path8.isAbsolute(expanded) ? expanded : path8.resolve(expanded);
+    return existsSync7(candidate) ? candidate : null;
+  }
+  return null;
+}
+function execAsync(cmd, timeoutMs = 5e3) {
+  return new Promise((resolve16) => {
+    const child = exec(cmd, {
+      encoding: "utf-8",
+      timeout: timeoutMs,
+      ...process.platform === "win32" ? { windowsHide: true } : {}
+    }, (err, stdout) => {
+      if (err || !stdout?.trim()) {
+        resolve16(null);
+      } else {
+        resolve16(stdout.trim());
+      }
+    });
+    child.on("error", () => resolve16(null));
+  });
+}
+async function detectCLIs(providerLoader, options) {
+  const platform10 = os2.platform();
+  const whichCmd = platform10 === "win32" ? "where" : "which";
+  const includeVersion = options?.includeVersion !== false;
+  const cliList = providerLoader ? providerLoader.getCliDetectionList() : [];
+  const results = await Promise.all(
+    cliList.map(async (cli) => {
+      try {
+        const explicitPath = resolveCommandPath(cli.command);
+        const pathResult = explicitPath || await execAsync(`${whichCmd} ${shellQuote(cli.command)}`);
+        if (!pathResult) return { ...cli, installed: false };
+        const firstPath = explicitPath || pathResult.split("\n")[0];
+        let version;
+        if (includeVersion) {
+          const versionCommands = [
+            `"${firstPath}" --version`,
+            `"${firstPath}" -V`,
+            `"${firstPath}" -v`,
+            cli.versionCommand
+          ].filter((v) => !!v);
+          try {
+            for (const versionCommand of versionCommands) {
+              const versionResult = await execAsync(versionCommand, 3e3);
+              if (versionResult) {
+                version = parseVersion(versionResult);
+                break;
+              }
+            }
+          } catch {
+          }
+        }
+        return { ...cli, installed: true, version, path: firstPath };
+      } catch {
+        return { ...cli, installed: false };
+      }
+    })
+  );
+  return results;
+}
+async function detectCLI(cliId, providerLoader, options) {
+  const resolvedId = providerLoader ? providerLoader.resolveAlias(cliId) : cliId;
+  if (providerLoader) {
+    const cliList = providerLoader.getCliDetectionList();
+    const target = cliList.find((c) => c.id === resolvedId);
+    if (target) {
+      const platform10 = os2.platform();
+      const whichCmd = platform10 === "win32" ? "where" : "which";
+      try {
+        const explicitPath = resolveCommandPath(target.command);
+        const pathResult = explicitPath || await execAsync(`${whichCmd} ${shellQuote(target.command)}`);
+        if (!pathResult) return null;
+        const firstPath = explicitPath || pathResult.split("\n")[0];
+        let version;
+        if (options?.includeVersion !== false) {
+          const versionCommands = [
+            `"${firstPath}" --version`,
+            `"${firstPath}" -V`,
+            `"${firstPath}" -v`,
+            target.versionCommand
+          ].filter((v) => !!v);
+          try {
+            for (const versionCommand of versionCommands) {
+              const versionResult = await execAsync(versionCommand, 3e3);
+              if (versionResult) {
+                version = parseVersion(versionResult);
+                break;
+              }
+            }
+          } catch {
+          }
+        }
+        return { ...target, installed: true, version, path: firstPath };
+      } catch {
+        return null;
+      }
+    }
+  }
+  const all = await detectCLIs(providerLoader, options);
+  return all.find((c) => c.id === resolvedId && c.installed) || null;
+}
+var init_cli_detector = __esm({
+  "src/detection/cli-detector.ts"() {
+    "use strict";
   }
 });
 
 // src/logging/logger.ts
 import * as fs2 from "fs";
-import * as path8 from "path";
-import * as os2 from "os";
+import * as path9 from "path";
+import * as os3 from "os";
 function setLogLevel(level) {
   currentLevel = level;
   daemonLog("Logger", `Log level set to: ${level}`, "info");
@@ -1087,13 +1482,13 @@ function getDaemonLogDir() {
   return LOG_DIR;
 }
 function getCurrentDaemonLogPath(date = /* @__PURE__ */ new Date()) {
-  return path8.join(LOG_DIR, `daemon-${date.toISOString().slice(0, 10)}.log`);
+  return path9.join(LOG_DIR, `daemon-${date.toISOString().slice(0, 10)}.log`);
 }
 function checkDateRotation() {
   const today = getDateStr();
   if (today !== currentDate) {
     currentDate = today;
-    currentLogFile = path8.join(LOG_DIR, `daemon-${currentDate}.log`);
+    currentLogFile = path9.join(LOG_DIR, `daemon-${currentDate}.log`);
     cleanOldLogs();
   }
 }
@@ -1107,7 +1502,7 @@ function cleanOldLogs() {
       const dateMatch = file.match(/daemon-(\d{4}-\d{2}-\d{2})/);
       if (dateMatch && dateMatch[1] < cutoffStr) {
         try {
-          fs2.unlinkSync(path8.join(LOG_DIR, file));
+          fs2.unlinkSync(path9.join(LOG_DIR, file));
         } catch {
         }
       }
@@ -1230,7 +1625,7 @@ var init_logger = __esm({
     LEVEL_NUM = { debug: 0, info: 1, warn: 2, error: 3 };
     LEVEL_LABEL = { debug: "DBG", info: "INF", warn: "WRN", error: "ERR" };
     currentLevel = "info";
-    LOG_DIR = process.platform === "win32" ? path8.join(process.env.LOCALAPPDATA || process.env.APPDATA || path8.join(os2.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path8.join(os2.homedir(), "Library", "Logs", "adhdev") : path8.join(os2.homedir(), ".local", "share", "adhdev", "logs");
+    LOG_DIR = process.platform === "win32" ? path9.join(process.env.LOCALAPPDATA || process.env.APPDATA || path9.join(os3.homedir(), "AppData", "Local"), "adhdev", "logs") : process.platform === "darwin" ? path9.join(os3.homedir(), "Library", "Logs", "adhdev") : path9.join(os3.homedir(), ".local", "share", "adhdev", "logs");
     MAX_LOG_SIZE = 5 * 1024 * 1024;
     MAX_LOG_DAYS = 7;
     try {
@@ -1238,16 +1633,16 @@ var init_logger = __esm({
     } catch {
     }
     currentDate = getDateStr();
-    currentLogFile = path8.join(LOG_DIR, `daemon-${currentDate}.log`);
+    currentLogFile = path9.join(LOG_DIR, `daemon-${currentDate}.log`);
     cleanOldLogs();
     try {
-      const oldLog = path8.join(LOG_DIR, "daemon.log");
+      const oldLog = path9.join(LOG_DIR, "daemon.log");
       if (fs2.existsSync(oldLog)) {
         const stat2 = fs2.statSync(oldLog);
         const oldDate = stat2.mtime.toISOString().slice(0, 10);
-        fs2.renameSync(oldLog, path8.join(LOG_DIR, `daemon-${oldDate}.log`));
+        fs2.renameSync(oldLog, path9.join(LOG_DIR, `daemon-${oldDate}.log`));
       }
-      const oldLogBackup = path8.join(LOG_DIR, "daemon.log.old");
+      const oldLogBackup = path9.join(LOG_DIR, "daemon.log.old");
       if (fs2.existsSync(oldLogBackup)) {
         fs2.unlinkSync(oldLogBackup);
       }
@@ -1279,14 +1674,16 @@ var init_logger = __esm({
       }
     };
     interceptorInstalled = false;
-    LOG_PATH = path8.join(LOG_DIR, `daemon-${getDateStr()}.log`);
+    LOG_PATH = path9.join(LOG_DIR, `daemon-${getDateStr()}.log`);
   }
 });
 
 // src/mesh/mesh-events.ts
 var mesh_events_exports = {};
 __export(mesh_events_exports, {
+  clearPendingMeshCoordinatorEvents: () => clearPendingMeshCoordinatorEvents,
   drainPendingMeshCoordinatorEvents: () => drainPendingMeshCoordinatorEvents,
+  getPendingMeshCoordinatorEvents: () => getPendingMeshCoordinatorEvents,
   handleMeshForwardEvent: () => handleMeshForwardEvent,
   setupMeshEventForwarding: () => setupMeshEventForwarding,
   triggerMeshQueue: () => triggerMeshQueue,
@@ -1295,9 +1692,18 @@ __export(mesh_events_exports, {
 function drainPendingMeshCoordinatorEvents() {
   return pendingMeshCoordinatorEvents.splice(0);
 }
+function getPendingMeshCoordinatorEvents() {
+  return pendingMeshCoordinatorEvents.slice();
+}
+function clearPendingMeshCoordinatorEvents() {
+  pendingMeshCoordinatorEvents.splice(0);
+}
 function readNonEmptyString(value) {
   return typeof value === "string" && value.trim() ? value.trim() : "";
 }
+function resolveEventSessionId(event, fallback) {
+  return readNonEmptyString(event.targetSessionId) || readNonEmptyString(event.sessionId) || readNonEmptyString(event.instanceId) || readNonEmptyString(fallback);
+}
 function isMeshCoordinatorEvent(eventName) {
   return typeof eventName === "string" && MESH_COORDINATOR_EVENTS.has(eventName);
 }
@@ -1309,38 +1715,323 @@ function formatCompletionMetadata(event) {
   ].filter(Boolean);
   return parts.length > 0 ? ` (${parts.join("; ")})` : "";
 }
+function getMeshWithCache(components, meshId) {
+  const localMesh = getMesh(meshId);
+  if (localMesh) return localMesh;
+  return components.router?.getCachedInlineMesh(meshId);
+}
+function isIntentionalCleanupStopMetadata(event) {
+  return event.intentional === true || event.intentionalStop === true || event.operatorCleanup === true || event.reason === "operator_cleanup" || event.stopReason === "operator_cleanup" || event.cleanupReason === "operator_cleanup" || event.source === "mesh_cleanup_sessions" || event.source === "mesh_remove_node";
+}
+function hasRecentIntentionalCleanupStop(meshId, sessionId, nodeId) {
+  if (!sessionId && !nodeId) return false;
+  const cutoff = Date.now() - INTENTIONAL_CLEANUP_STOP_SUPPRESSION_MS;
+  const entries = readLedgerEntries(meshId);
+  for (let i = entries.length - 1; i >= 0; i--) {
+    const entry = entries[i];
+    const timestamp = new Date(entry.timestamp).getTime();
+    if (!Number.isNaN(timestamp) && timestamp < cutoff) break;
+    if (!isIntentionalCleanupStopEntry(entry)) continue;
+    if (sessionId && entry.sessionId === sessionId) return true;
+    if (!sessionId && nodeId && entry.nodeId === nodeId) return true;
+  }
+  return false;
+}
+function shouldSuppressIntentionalCleanupStop(args) {
+  if (args.event !== "agent:stopped" && args.event !== "monitor:long_generating") return false;
+  if (isIntentionalCleanupStopMetadata(args.metadataEvent)) return true;
+  return hasRecentIntentionalCleanupStop(args.meshId, args.sessionId, args.nodeId);
+}
 function tryAssignQueueTask(components, meshId, nodeId, sessionId, providerType) {
   const task = claimNextTask(meshId, nodeId, sessionId);
-  if (!task) return false;
+  if (!task) {
+    return false;
+  }
   LOG.info("MeshQueue", `Node ${nodeId} (${sessionId}) pulled task ${task.id}`);
+  const mesh = getMeshWithCache(components, meshId);
+  const node = mesh?.nodes.find((n) => n.id === nodeId);
+  if (node?.daemonId && components.dispatchMeshCommand) {
+    const isLocalNode = components.cliManager.adapters.has(sessionId);
+    if (!isLocalNode) {
+      components.dispatchMeshCommand(node.daemonId, "agent_command", {
+        targetSessionId: sessionId,
+        cliType: providerType,
+        action: "send_chat",
+        message: task.message
+      }).catch((e) => {
+        LOG.error("MeshQueue", `Failed to dispatch task via P2P to remote node ${nodeId}: ${e?.message}`);
+        updateTaskStatus(meshId, task.id, "failed");
+      });
+      return true;
+    }
+  }
   components.cliManager.handleCliCommand("agent_command", {
     targetSessionId: sessionId,
     cliType: providerType,
     action: "send_chat",
-    input: task.message
+    message: task.message
   }).catch((e) => {
-    LOG.error("MeshQueue", `Failed to dispatch task to node ${nodeId}: ${e?.message}`);
+    LOG.error("MeshQueue", `Failed to dispatch task locally to node ${nodeId}: ${e?.message}`);
+    updateTaskStatus(meshId, task.id, "failed");
   });
   return true;
 }
-function triggerMeshQueue(components, meshId) {
-  const mesh = getMesh(meshId);
+function normalizeProviderPriority(policy) {
+  const raw = policy && typeof policy === "object" && !Array.isArray(policy) ? policy.providerPriority : void 0;
+  if (!Array.isArray(raw)) return [];
+  const seen = /* @__PURE__ */ new Set();
+  return raw.map((type) => typeof type === "string" ? type.trim() : "").filter(Boolean).filter((type) => {
+    if (seen.has(type)) return false;
+    seen.add(type);
+    return true;
+  });
+}
+function isTerminalSessionStatus(status) {
+  return ["stopped", "failed", "terminated", "exited", "closed"].includes(status);
+}
+function isIdleSessionState(state) {
+  const status = readNonEmptyString(state?.status).toLowerCase();
+  if (isTerminalSessionStatus(status)) return false;
+  return status === "idle" || state?.activeChat?.status === "waiting_input";
+}
+function isDirtyNode(node) {
+  return node?.health === "dirty" || node?.git?.dirty === true;
+}
+function isLaunchableNode(node) {
+  if (!node || node.status === "disabled" || node.status === "removed") return false;
+  const health = readNonEmptyString(node.health).toLowerCase();
+  if (!health) return true;
+  return health === "online" || health === "unknown";
+}
+function localAutoLaunchSkipReason(node) {
+  const daemonId = readNonEmptyString(node?.daemonId);
+  const machineId = readNonEmptyString(node?.machineId);
+  const appConfig = loadConfig();
+  const localMachineId = readNonEmptyString(appConfig.machineId) || readNonEmptyString(appConfig.registeredMachineId);
+  const cloudDaemonId = localMachineId ? `daemon_${localMachineId}` : "";
+  const standaloneDaemonId = localMachineId ? `standalone_${localMachineId}` : "";
+  const daemonMatchesLocal = !daemonId || daemonId === cloudDaemonId || daemonId === standaloneDaemonId;
+  const machineMatchesLocal = !machineId || localMachineId && machineId === localMachineId;
+  if (node?.isLocalWorktree === true) {
+    return daemonMatchesLocal && machineMatchesLocal ? null : "remote_auto_launch_unsupported";
+  }
+  if (daemonId || machineId) {
+    return daemonMatchesLocal && machineMatchesLocal ? null : "remote_auto_launch_unsupported";
+  }
+  return null;
+}
+function activeAssignedCount(meshId) {
+  return getQueue(meshId, { status: ["assigned"] }).length;
+}
+function nodeHasActiveAssignment(meshId, nodeId) {
+  return getQueue(meshId, { status: ["assigned"] }).some((task) => task.assignedNodeId === nodeId);
+}
+function liveSessionCountForNode(components, meshId, nodeId) {
+  return components.instanceManager.getByCategory("cli").filter((inst) => {
+    const state = inst.getState();
+    const settings = state.settings || {};
+    if (readNonEmptyString(settings.meshNodeFor) !== meshId) return false;
+    const instNodeId = readNonEmptyString(settings.meshNodeId) || readNonEmptyString(settings.nodeId);
+    if (instNodeId !== nodeId) return false;
+    const status = readNonEmptyString(state.status).toLowerCase();
+    return !isTerminalSessionStatus(status);
+  }).length;
+}
+function recordAutoLaunchEvent(meshId, args) {
+  try {
+    appendLedgerEntry(meshId, {
+      kind: "session_auto_launch",
+      nodeId: args.nodeId,
+      sessionId: args.sessionId,
+      providerType: args.providerType,
+      payload: {
+        phase: args.phase,
+        taskId: args.taskId,
+        reason: args.reason,
+        error: args.error
+      }
+    });
+  } catch (e) {
+    LOG.warn("MeshQueue", `Failed to record auto-launch ledger event: ${e?.message || e}`);
+  }
+}
+function markAutoLaunch(meshId, taskId, args) {
+  recordTaskAutoLaunch(meshId, taskId, {
+    status: args.status,
+    reason: args.reason || args.error,
+    nodeId: args.nodeId,
+    providerType: args.providerType,
+    sessionId: args.sessionId
+  });
+  recordAutoLaunchEvent(meshId, {
+    phase: args.status,
+    taskId,
+    nodeId: args.nodeId,
+    providerType: args.providerType,
+    sessionId: args.sessionId,
+    reason: args.reason,
+    error: args.error
+  });
+}
+async function resolveUsableProvider(components, nodeId, node) {
+  const providerPriority = normalizeProviderPriority(node?.policy);
+  if (!providerPriority.length) return { reason: "missing_provider_priority" };
+  const providerLoader = components.providerLoader;
+  if (!providerLoader) return { reason: "provider_loader_unavailable" };
+  const failed = [];
+  for (const requestedType of providerPriority) {
+    const normalizedType = typeof providerLoader.resolveAlias === "function" ? providerLoader.resolveAlias(requestedType) : requestedType;
+    if (typeof providerLoader.isMachineProviderEnabled === "function" && !providerLoader.isMachineProviderEnabled(normalizedType)) {
+      failed.push(`${requestedType}: disabled`);
+      continue;
+    }
+    let detected;
+    try {
+      detected = await detectCLI(normalizedType, providerLoader, { includeVersion: false });
+    } catch (e) {
+      failed.push(`${requestedType}: detect failed: ${e?.message || e}`);
+      continue;
+    }
+    if (typeof providerLoader.setCliDetectionResults === "function") {
+      providerLoader.setCliDetectionResults([{
+        id: normalizedType,
+        installed: !!detected,
+        path: detected?.path
+      }], false);
+    }
+    components.onStatusChange?.();
+    if (detected) return { providerType: normalizedType };
+    failed.push(`${requestedType}: not detected`);
+  }
+  return { reason: `provider_priority_unusable: ${failed.join("; ") || nodeId}` };
+}
+async function maybeAutoLaunchOneQueueSession(components, meshId, mesh) {
+  const queue = getQueue(meshId);
+  const pending = queue.filter((task) => task.status === "pending");
+  if (!pending.length) return false;
+  const maxParallelTasks = Math.max(1, Math.floor(Number(mesh?.policy?.maxParallelTasks) || 2));
+  for (const task of pending) {
+    if (activeAssignedCount(meshId) >= maxParallelTasks) {
+      markAutoLaunch(meshId, task.id, { status: "skipped", reason: "max_parallel_tasks_reached" });
+      return false;
+    }
+    if (task.targetSessionId) {
+      markAutoLaunch(meshId, task.id, { status: "skipped", reason: "target_session_constraint" });
+      continue;
+    }
+    const candidateNodes = Array.isArray(mesh?.nodes) ? mesh.nodes.filter((node) => task.targetNodeId ? node?.id === task.targetNodeId : true) : [];
+    if (!candidateNodes.length) {
+      markAutoLaunch(meshId, task.id, { status: "skipped", reason: "no_matching_node", nodeId: task.targetNodeId });
+      continue;
+    }
+    for (const node of candidateNodes) {
+      const nodeId = readNonEmptyString(node?.id);
+      if (!nodeId) continue;
+      const launchKey = `${meshId}:${nodeId}`;
+      const cooldownUntil = autoLaunchCooldownUntil.get(launchKey) || 0;
+      if (autoLaunchInProgress.has(launchKey)) {
+        markAutoLaunch(meshId, task.id, { status: "skipped", reason: "auto_launch_in_progress", nodeId });
+        continue;
+      }
+      if (Date.now() < cooldownUntil) {
+        markAutoLaunch(meshId, task.id, { status: "skipped", reason: "auto_launch_cooldown", nodeId });
+        continue;
+      }
+      if (isDirtyNode(node)) {
+        markAutoLaunch(meshId, task.id, { status: "skipped", reason: "dirty_workspace", nodeId });
+        continue;
+      }
+      if (!isLaunchableNode(node)) {
+        markAutoLaunch(meshId, task.id, { status: "skipped", reason: "node_not_launch_ready", nodeId });
+        continue;
+      }
+      const localSkipReason = localAutoLaunchSkipReason(node);
+      if (localSkipReason) {
+        markAutoLaunch(meshId, task.id, { status: "skipped", reason: localSkipReason, nodeId });
+        continue;
+      }
+      if (nodeHasActiveAssignment(meshId, nodeId)) {
+        markAutoLaunch(meshId, task.id, { status: "skipped", reason: "node_has_active_assignment", nodeId });
+        continue;
+      }
+      const maxConcurrentSessions = Number(node?.policy?.maxConcurrentSessions);
+      if (Number.isFinite(maxConcurrentSessions) && maxConcurrentSessions >= 0 && liveSessionCountForNode(components, meshId, nodeId) >= maxConcurrentSessions) {
+        markAutoLaunch(meshId, task.id, { status: "skipped", reason: "max_concurrent_sessions_reached", nodeId });
+        continue;
+      }
+      autoLaunchInProgress.add(launchKey);
+      try {
+        const resolved = await resolveUsableProvider(components, nodeId, node);
+        if (!resolved.providerType) {
+          markAutoLaunch(meshId, task.id, { status: "skipped", reason: resolved.reason || "provider_unusable", nodeId });
+          continue;
+        }
+        markAutoLaunch(meshId, task.id, { status: "started", nodeId, providerType: resolved.providerType });
+        const launchResult = await components.cliManager.handleCliCommand("launch_cli", {
+          cliType: resolved.providerType,
+          dir: node.workspace,
+          settings: {
+            meshNodeFor: meshId,
+            meshNodeId: nodeId,
+            spawnedSessionVisibility: mesh?.policy?.spawnedSessionVisibility || "hidden",
+            launchedByCoordinator: true,
+            autoLaunchedForQueueTaskId: task.id
+          }
+        });
+        if (!launchResult?.success) {
+          const reason = launchResult?.error || "launch_cli_failed";
+          markAutoLaunch(meshId, task.id, { status: "failed", reason, nodeId, providerType: resolved.providerType });
+          autoLaunchCooldownUntil.set(launchKey, Date.now() + AUTO_LAUNCH_COOLDOWN_MS);
+          return false;
+        }
+        const sessionId = readNonEmptyString(launchResult.sessionId) || readNonEmptyString(launchResult.id) || readNonEmptyString(launchResult.runtimeSessionId);
+        if (!sessionId) {
+          markAutoLaunch(meshId, task.id, { status: "failed", reason: "launch_missing_session_id", nodeId, providerType: resolved.providerType });
+          autoLaunchCooldownUntil.set(launchKey, Date.now() + AUTO_LAUNCH_COOLDOWN_MS);
+          return false;
+        }
+        markAutoLaunch(meshId, task.id, { status: "completed", nodeId, providerType: resolved.providerType, sessionId });
+        tryAssignQueueTask(components, meshId, nodeId, sessionId, resolved.providerType);
+        return true;
+      } catch (e) {
+        markAutoLaunch(meshId, task.id, { status: "failed", error: e?.message || String(e), nodeId });
+        autoLaunchCooldownUntil.set(launchKey, Date.now() + AUTO_LAUNCH_COOLDOWN_MS);
+        return false;
+      } finally {
+        autoLaunchInProgress.delete(launchKey);
+      }
+    }
+  }
+  return false;
+}
+async function triggerMeshQueue(components, meshId) {
+  const mesh = getMeshWithCache(components, meshId);
   if (!mesh) return;
   const cliInstances = components.instanceManager.getByCategory("cli");
   for (const inst of cliInstances) {
     const state = inst.getState();
     const settings = state.settings || {};
     const instMeshId = readNonEmptyString(settings.meshNodeFor);
-    if (instMeshId !== meshId && !settings.launchedByCoordinator) continue;
+    if (instMeshId !== meshId) continue;
     const nodeId = readNonEmptyString(settings.meshNodeId) || readNonEmptyString(settings.nodeId);
     if (!nodeId) continue;
-    if (state.status !== "idle" && state.status !== "stopped" && state.activeChat?.status !== "waiting_input") continue;
+    if (!isIdleSessionState(state)) continue;
     const sessionId = state.instanceId;
     const providerType = state.type || readNonEmptyString(settings.providerType);
     if (providerType) {
       tryAssignQueueTask(components, meshId, nodeId, sessionId, providerType);
     }
   }
+  for (const [key, idle] of remoteIdleSessions.entries()) {
+    const node = mesh.nodes.find((n) => n.id === idle.nodeId);
+    if (node) {
+      const assigned = tryAssignQueueTask(components, meshId, idle.nodeId, idle.sessionId, idle.providerType);
+      if (assigned) {
+        remoteIdleSessions.delete(key);
+      }
+    }
+  }
+  await maybeAutoLaunchOneQueueSession(components, meshId, mesh);
 }
 function buildMeshSystemMessage(args) {
   const metadata = formatCompletionMetadata(args.metadataEvent);
@@ -1387,20 +2078,91 @@ Do NOT retry on this node. Consider reassigning to a different node or asking th
   return "";
 }
 function injectMeshSystemMessage(components, args) {
+  const eventSessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
+  const eventNodeId = readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
+  const intentionalCleanupStop = shouldSuppressIntentionalCleanupStop({
+    event: args.event,
+    meshId: args.meshId,
+    metadataEvent: args.metadataEvent,
+    sessionId: eventSessionId || void 0,
+    nodeId: eventNodeId || void 0
+  });
+  if (intentionalCleanupStop) {
+    if (eventSessionId && eventNodeId) {
+      remoteIdleSessions.delete(`${eventNodeId}:${eventSessionId}`);
+    }
+    LOG.info("MeshEvents", `Suppressed ${args.event} for intentionally cleanup-stopped session ${eventSessionId || "(unknown session)"}`);
+    return { success: true, forwarded: 0, suppressed: true, intentionalCleanupStop: true };
+  }
+  let completedTaskForLedger = null;
   if (args.event === "agent:generating_completed") {
-    const sessionId = readNonEmptyString(args.metadataEvent.targetSessionId);
-    const nodeId = readNonEmptyString(args.metadataEvent.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
+    const sessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
+    const nodeId = readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
     const providerType = readNonEmptyString(args.metadataEvent.providerType);
     if (sessionId) {
-      updateSessionTaskStatus(args.meshId, sessionId, "completed");
+      const completedTask = updateSessionTaskStatus(args.meshId, sessionId, "completed");
+      completedTaskForLedger = completedTask ? { id: completedTask.id } : null;
       if (nodeId && providerType) {
         setTimeout(() => {
           tryAssignQueueTask(components, args.meshId, nodeId, sessionId, providerType);
         }, 500);
       }
     }
+  } else if (args.event === "agent:ready") {
+    const sessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
+    const nodeId = readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
+    const providerType = readNonEmptyString(args.metadataEvent.providerType);
+    const completedTask = sessionId ? updateSessionTaskStatus(args.meshId, sessionId, "completed") : null;
+    if (completedTask) {
+      completedTaskForLedger = { id: completedTask.id };
+      try {
+        appendLedgerEntry(args.meshId, {
+          kind: "task_completed",
+          nodeId: nodeId || void 0,
+          sessionId,
+          providerType: providerType || void 0,
+          payload: {
+            event: args.event,
+            nodeLabel: args.nodeLabel,
+            taskId: completedTask.id,
+            completedViaReady: true,
+            providerSessionId: readNonEmptyString(args.metadataEvent.providerSessionId) || void 0,
+            finalSummary: readNonEmptyString(args.metadataEvent.finalSummary) || void 0,
+            evidence: buildTaskCompletionEvidence({
+              event: "agent:ready",
+              nodeId,
+              sessionId,
+              providerType: providerType || void 0,
+              providerSessionId: readNonEmptyString(args.metadataEvent.providerSessionId) || void 0,
+              finalSummary: readNonEmptyString(args.metadataEvent.finalSummary) || void 0
+            })
+          }
+        });
+      } catch (e) {
+        LOG.warn("MeshLedger", `Failed to record task_completed from ready: ${e?.message || e}`);
+      }
+    }
+    if (sessionId && nodeId && providerType) {
+      remoteIdleSessions.set(`${nodeId}:${sessionId}`, { nodeId, sessionId, providerType });
+      setTimeout(() => {
+        const assigned = tryAssignQueueTask(components, args.meshId, nodeId, sessionId, providerType);
+        if (assigned) {
+          remoteIdleSessions.delete(`${nodeId}:${sessionId}`);
+        }
+      }, 500);
+    }
+  } else if (args.event === "agent:generating_started") {
+    const sessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
+    const nodeId = readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
+    if (sessionId && nodeId) {
+      remoteIdleSessions.delete(`${nodeId}:${sessionId}`);
+    }
   } else if (args.event === "agent:stopped") {
-    const sessionId = readNonEmptyString(args.metadataEvent.targetSessionId);
+    const sessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId);
+    const nodeId = readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId);
+    if (sessionId && nodeId) {
+      remoteIdleSessions.delete(`${nodeId}:${sessionId}`);
+    }
     if (sessionId) {
       updateSessionTaskStatus(args.meshId, sessionId, "failed");
     }
@@ -1408,15 +2170,29 @@ function injectMeshSystemMessage(components, args) {
   const ledgerKind = EVENT_TO_LEDGER_KIND[args.event];
   if (ledgerKind) {
     try {
+      const ledgerNodeId = readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId) || void 0;
+      const ledgerSessionId = resolveEventSessionId(args.metadataEvent, args.sourceInstanceId) || void 0;
+      const ledgerProviderType = readNonEmptyString(args.metadataEvent.providerType) || void 0;
+      const completionEvidence = ledgerKind === "task_completed" && ledgerNodeId && ledgerSessionId ? buildTaskCompletionEvidence({
+        event: "agent:generating_completed",
+        nodeId: ledgerNodeId,
+        sessionId: ledgerSessionId,
+        providerType: ledgerProviderType,
+        providerSessionId: readNonEmptyString(args.metadataEvent.providerSessionId) || void 0,
+        finalSummary: readNonEmptyString(args.metadataEvent.finalSummary) || void 0
+      }) : void 0;
       appendLedgerEntry(args.meshId, {
         kind: ledgerKind,
-        nodeId: readNonEmptyString(args.metadataEvent.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId) || void 0,
-        sessionId: readNonEmptyString(args.metadataEvent.targetSessionId) || void 0,
-        providerType: readNonEmptyString(args.metadataEvent.providerType) || void 0,
+        nodeId: ledgerNodeId,
+        sessionId: ledgerSessionId,
+        providerType: ledgerProviderType,
         payload: {
           event: args.event,
           nodeLabel: args.nodeLabel,
-          providerSessionId: readNonEmptyString(args.metadataEvent.providerSessionId) || void 0
+          taskId: completedTaskForLedger?.id || void 0,
+          providerSessionId: readNonEmptyString(args.metadataEvent.providerSessionId) || void 0,
+          finalSummary: readNonEmptyString(args.metadataEvent.finalSummary) || void 0,
+          evidence: completionEvidence
         }
       });
     } catch (e) {
@@ -1429,8 +2205,8 @@ function injectMeshSystemMessage(components, args) {
       const mesh = getMesh(args.meshId);
       const maxRetries = mesh?.policy?.maxTaskRetries ?? 1;
       recoveryContext = getSessionRecoveryContext(args.meshId, {
-        sessionId: readNonEmptyString(args.metadataEvent.targetSessionId) || void 0,
-        nodeId: readNonEmptyString(args.metadataEvent.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId) || void 0,
+        sessionId: resolveEventSessionId(args.metadataEvent, args.sourceInstanceId) || void 0,
+        nodeId: readNonEmptyString(args.nodeId) || readNonEmptyString(args.metadataEvent.meshNodeId) || void 0,
         maxRetries
       });
       recoveryContext.failedProviderType = readNonEmptyString(args.metadataEvent.providerType) || null;
@@ -1525,12 +2301,21 @@ function handleMeshForwardEvent(components, payload) {
   const nodeLabel = nodeId ? `Node '${nodeId}'` : workspace ? `Agent at ${workspace}` : "Remote agent";
   return injectMeshSystemMessage(components, {
     meshId,
+    nodeId,
     nodeLabel,
     event: eventName,
     metadataEvent: {
-      targetSessionId: readNonEmptyString(payload.targetSessionId) || readNonEmptyString(payload.sessionId),
+      targetSessionId: readNonEmptyString(payload.targetSessionId) || readNonEmptyString(payload.sessionId) || readNonEmptyString(payload.instanceId),
       providerType: readNonEmptyString(payload.providerType),
-      providerSessionId: readNonEmptyString(payload.providerSessionId)
+      providerSessionId: readNonEmptyString(payload.providerSessionId),
+      finalSummary: readNonEmptyString(payload.finalSummary) || readNonEmptyString(payload.summary),
+      intentional: payload.intentional === true,
+      intentionalStop: payload.intentionalStop === true,
+      operatorCleanup: payload.operatorCleanup === true,
+      reason: readNonEmptyString(payload.reason),
+      stopReason: readNonEmptyString(payload.stopReason),
+      cleanupReason: readNonEmptyString(payload.cleanupReason),
+      source: readNonEmptyString(payload.source)
     }
   });
 }
@@ -1549,35 +2334,42 @@ function setupMeshEventForwarding(components) {
     const meshIdFromRuntime = readNonEmptyString(settings.meshNodeFor);
     const isMeshDelegate = Boolean(meshIdFromRuntime || settings.launchedByCoordinator);
     if (!isMeshDelegate) return;
-    const mesh = meshIdFromRuntime ? getMesh(meshIdFromRuntime) : getMeshByRepo(workspace);
+    const mesh = meshIdFromRuntime ? getMeshWithCache(components, meshIdFromRuntime) : getMeshByRepo(workspace);
     const meshId = meshIdFromRuntime || readNonEmptyString(mesh?.id);
     if (!meshId) return;
     const targetNode = mesh?.nodes?.find((n) => n.workspace === workspace);
     const runtimeNodeId = readNonEmptyString(settings.meshNodeId);
+    const resolvedNodeId = targetNode?.id || runtimeNodeId;
     const nodeLabel = targetNode ? `Node '${targetNode.id}'` : runtimeNodeId ? `Node '${runtimeNodeId}'` : `Agent at ${workspace}`;
     injectMeshSystemMessage(components, {
       meshId,
       sourceInstanceId: instanceId,
+      nodeId: resolvedNodeId,
       nodeLabel,
       event: event.event,
       metadataEvent: event
     });
   });
 }
-var MAX_PENDING_EVENTS, pendingMeshCoordinatorEvents, MESH_COORDINATOR_EVENTS, EVENT_TO_LEDGER_KIND;
+var remoteIdleSessions, MAX_PENDING_EVENTS, pendingMeshCoordinatorEvents, MESH_COORDINATOR_EVENTS, EVENT_TO_LEDGER_KIND, INTENTIONAL_CLEANUP_STOP_SUPPRESSION_MS, autoLaunchInProgress, autoLaunchCooldownUntil, AUTO_LAUNCH_COOLDOWN_MS;
 var init_mesh_events = __esm({
   "src/mesh/mesh-events.ts"() {
     "use strict";
+    init_config();
     init_mesh_config();
+    init_cli_detector();
     init_logger();
     init_mesh_ledger();
     init_mesh_work_queue();
+    remoteIdleSessions = /* @__PURE__ */ new Map();
     MAX_PENDING_EVENTS = 50;
     pendingMeshCoordinatorEvents = [];
     MESH_COORDINATOR_EVENTS = /* @__PURE__ */ new Set([
+      "agent:generating_started",
       "agent:generating_completed",
       "agent:waiting_approval",
       "agent:stopped",
+      "agent:ready",
       "monitor:long_generating"
     ]);
     EVENT_TO_LEDGER_KIND = {
@@ -1586,6 +2378,10 @@ var init_mesh_events = __esm({
       "agent:stopped": "task_failed",
       "monitor:long_generating": "task_stalled"
     };
+    INTENTIONAL_CLEANUP_STOP_SUPPRESSION_MS = 30 * 60 * 1e3;
+    autoLaunchInProgress = /* @__PURE__ */ new Set();
+    autoLaunchCooldownUntil = /* @__PURE__ */ new Map();
+    AUTO_LAUNCH_COOLDOWN_MS = 5e3;
   }
 });
 
@@ -2613,6 +3409,7 @@ var init_provider_cli_adapter = __esm({
         this.requirePromptEchoBeforeSubmit = resolvedConfig.requirePromptEchoBeforeSubmit;
         this.providerResolutionMeta = resolvedConfig.providerResolutionMeta;
         this.cliScripts = provider.scripts || {};
+        this.scriptState = typeof this.cliScripts.createState === "function" ? this.cliScripts.createState() ?? null : null;
         const scriptNames = listCliScriptNames(this.cliScripts);
         if (scriptNames.length > 0) {
           LOG.info("CLI", `[${this.cliType}] CLI scripts: [${scriptNames.join(", ")}]`);
@@ -2695,6 +3492,8 @@ var init_provider_cli_adapter = __esm({
       statusHistory = [];
       // ─── CLI Scripts (script-based parsing) ───
       cliScripts;
+      /** Per-session opaque state object created by cliScripts.createState(), reset on stop. */
+      scriptState = null;
       runtimeSettings = {};
       /** Full accumulated rendered PTY transcript for parser/readback use */
       accumulatedBuffer = "";
@@ -2771,9 +3570,13 @@ ${lastSnapshot}`;
         this.lastScreenChangeAt = 0;
         this.lastScreenSnapshotReadAt = Number.NEGATIVE_INFINITY;
       }
+      getAccumulatedRawBufferCacheKey() {
+        return this.accumulatedRawBuffer.replace(/\x1B\][^\x07]*(?:\x07|\x1B\\)/g, "").replace(/\x1B[P^_X][\s\S]*?(?:\x07|\x1B\\)/g, "").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "");
+      }
       getFreshParsedStatusCache() {
         const cached = this.parsedStatusCache;
-        if (cached && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.screenText === this.lastScreenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName) {
+        const accumulatedRawBufferKey = this.getAccumulatedRawBufferCacheKey();
+        if (cached && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.accumulatedRawBufferKey === accumulatedRawBufferKey && cached.screenText === this.lastScreenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName) {
           return cached.result;
         }
         return null;
@@ -2876,6 +3679,7 @@ ${lastSnapshot}`;
         this.cliScripts = scripts;
         this.parsedStatusCache = null;
         this.parseErrorMessage = null;
+        this.scriptState = typeof scripts.createState === "function" ? scripts.createState() ?? null : null;
         const scriptNames = listCliScriptNames(scripts);
         LOG.info("CLI", `[${this.cliType}] CLI scripts injected: [${scriptNames.join(", ")}]`);
       }
@@ -2993,6 +3797,7 @@ ${lastSnapshot}`;
           this.ready = false;
           this.startupParseGate = false;
           this.spawnAt = 0;
+          this.scriptState = null;
           this.onStatusChange?.();
         });
         this.spawnAt = Date.now();
@@ -3746,6 +4551,11 @@ ${lastSnapshot}`;
         };
       }
       // ─── Script Execution ──────────────────────────
+      invokeCliScript(script, input) {
+        const hasStateFactory = typeof this.cliScripts?.createState === "function";
+        const expectsStateArgument = hasStateFactory || this.scriptState !== null || script.length >= 2;
+        return expectsStateArgument ? script(this.scriptState, input) : script(input);
+      }
       runParseSession() {
         if (typeof this.cliScripts?.parseSession !== "function") {
           this.parseErrorMessage = `${this.cliType} parseSession unavailable`;
@@ -3766,7 +4576,10 @@ ${lastSnapshot}`;
             scope: this.currentTurnScope,
             runtimeSettings: this.runtimeSettings
           });
-          const session = this.cliScripts.parseSession({ ...input, tail, tailScreen: buildCliScreenSnapshot(tail) });
+          const session = this.invokeCliScript(
+            this.cliScripts.parseSession,
+            { ...input, tail, tailScreen: buildCliScreenSnapshot(tail) }
+          );
           this.parseErrorMessage = null;
           return session && typeof session === "object" ? session : null;
         } catch (e) {
@@ -3780,7 +4593,7 @@ ${lastSnapshot}`;
         if (!this.cliScripts?.detectStatus) return null;
         try {
           const screenText = this.terminalScreen.getText();
-          const status = this.cliScripts.detectStatus({
+          const status = this.invokeCliScript(this.cliScripts.detectStatus, {
             tail: text.slice(-500),
             screenText,
             rawBuffer: this.accumulatedRawBuffer,
@@ -3799,7 +4612,7 @@ ${lastSnapshot}`;
         try {
           const screenText = this.terminalScreen.getText();
           const buffer = screenText || this.accumulatedBuffer;
-          return this.cliScripts.parseApproval({
+          return this.invokeCliScript(this.cliScripts.parseApproval, {
             buffer,
             screenText,
             rawBuffer: this.accumulatedRawBuffer,
@@ -3855,7 +4668,8 @@ ${lastSnapshot}`;
         const screenText = this.readTerminalScreenText();
         const parseScreenText = this.getParseScreenText(screenText);
         const cached = this.parsedStatusCache;
-        if (cached && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.screenText === parseScreenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName) {
+        const accumulatedRawBufferKey = this.getAccumulatedRawBufferCacheKey();
+        if (cached && cached.responseBuffer === this.responseBuffer && cached.currentTurnScope === this.currentTurnScope && cached.recentOutputBuffer === this.recentOutputBuffer && cached.accumulatedBuffer === this.accumulatedBuffer && cached.accumulatedRawBufferKey === accumulatedRawBufferKey && cached.screenText === parseScreenText && cached.currentStatus === this.currentStatus && cached.activeModal === this.activeModal && cached.cliName === this.cliName) {
           return cached.result;
         }
         const parsed = this.runParseSession();
@@ -3883,6 +4697,7 @@ ${lastSnapshot}`;
           currentTurnScope: this.currentTurnScope,
           recentOutputBuffer: this.recentOutputBuffer,
           accumulatedBuffer: this.accumulatedBuffer,
+          accumulatedRawBufferKey,
           screenText: parseScreenText,
           currentStatus: this.currentStatus,
           activeModal: this.activeModal,
@@ -3907,7 +4722,7 @@ ${lastSnapshot}`;
           scope: this.currentTurnScope,
           runtimeSettings: this.runtimeSettings
         });
-        return await Promise.resolve(fn({
+        return await Promise.resolve(this.invokeCliScript(fn, {
           ...input,
           args: args && typeof args === "object" ? { ...args } : {}
         }));
@@ -6124,7 +6939,7 @@ function addWorkspaceEntry(config, rawPath, label, options) {
     }
   }
   const v = validateWorkspacePath(abs);
-  if (!v.ok) return { error: v.error };
+  if (v.ok !== true) return { error: v.error };
   const list = [...config.workspaces || []];
   if (list.some((w) => path5.resolve(w.path) === abs)) {
     return { error: "Workspace already in list" };
@@ -6507,36 +7322,188 @@ async function syncMeshes(transport) {
       }
     }
   }
-  if (transport.syncMeshLedger) {
-    for (const local of localMeshes) {
-      try {
-        await syncMeshLedger(local.id, transport);
-      } catch (e) {
-        result.errors.push(`Ledger sync failed for "${local.name}": ${e.message}`);
-      }
-    }
-  }
   return result;
 }
-async function syncMeshLedger(meshId, transport) {
-  if (!transport.syncMeshLedger) return;
-  const { readLedgerEntries: readLedgerEntries2, appendRemoteLedgerEntries: appendRemoteLedgerEntries2 } = await Promise.resolve().then(() => (init_mesh_ledger(), mesh_ledger_exports));
-  const localEntries = readLedgerEntries2(meshId);
-  const res = await transport.syncMeshLedger(meshId, { newEntries: localEntries });
-  if (res.missingEntries && res.missingEntries.length > 0) {
-    appendRemoteLedgerEntries2(meshId, res.missingEntries);
-  }
-}
 
 // src/index.ts
 init_mesh_ledger();
+
+// src/mesh/mesh-ledger-reconciliation.ts
+function lastTimestamp(slice) {
+  const entries = Array.isArray(slice?.entries) ? slice.entries : [];
+  return entries.length ? entries[entries.length - 1].timestamp : null;
+}
+function buildMeshLedgerReplicaEvidence(args) {
+  const entriesReceived = Array.isArray(args.slice?.entries) ? args.slice.entries.length : 0;
+  return {
+    nodeId: args.nodeId,
+    ...args.daemonId ? { daemonId: args.daemonId } : {},
+    status: args.status ?? (args.importResult && args.importResult.accepted > 0 ? "imported" : "queried"),
+    transport: args.transport,
+    protocol: "adhdev.mesh.ledger.slice.v1",
+    entriesReceived,
+    entriesImported: args.importResult?.accepted ?? 0,
+    skippedDuplicate: args.importResult?.skippedDuplicate ?? 0,
+    rejectedInvalid: args.importResult?.rejectedInvalid ?? 0,
+    hasMore: args.slice?.cursor?.hasMore === true,
+    nextAfterId: args.slice?.cursor?.nextAfterId ?? null,
+    lastTimestamp: lastTimestamp(args.slice),
+    ...args.slice?.summary ? { summary: args.slice.summary } : {},
+    ...args.error ? {
+      error: args.error,
+      noFallbackReason: "Ledger reconciliation is P2P/local-first only; Cloud/D1 ledger sync is intentionally disabled."
+    } : {}
+  };
+}
+function buildMeshLedgerReconciliationEvidence(meshId, replicas) {
+  const failedNodes = replicas.filter((replica) => replica.status === "failed").map((replica) => replica.nodeId);
+  const pendingNodes = replicas.filter((replica) => replica.hasMore && replica.status !== "failed").map((replica) => replica.nodeId);
+  return {
+    protocol: "adhdev.mesh.ledger.reconciliation.v1",
+    meshId,
+    generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    sourceOfTruth: {
+      kind: "coordinator_local_jsonl",
+      p2pOnly: true,
+      cloudD1LedgerSync: false,
+      notes: "Coordinator reconciles bounded slices from daemon-local JSONL ledgers over P2P DataChannel; Cloud/D1 is not a ledger source of truth."
+    },
+    replicas,
+    totals: {
+      replicas: replicas.length,
+      queried: replicas.filter((replica) => replica.status !== "failed").length,
+      failed: failedNodes.length,
+      entriesReceived: replicas.reduce((sum, replica) => sum + replica.entriesReceived, 0),
+      entriesImported: replicas.reduce((sum, replica) => sum + replica.entriesImported, 0),
+      skippedDuplicate: replicas.reduce((sum, replica) => sum + replica.skippedDuplicate, 0),
+      rejectedInvalid: replicas.reduce((sum, replica) => sum + replica.rejectedInvalid, 0)
+    },
+    convergence: {
+      complete: failedNodes.length === 0 && pendingNodes.length === 0,
+      pendingNodes,
+      failedNodes
+    }
+  };
+}
+
+// src/index.ts
 init_mesh_work_queue();
 init_mesh_events();
 
+// src/mesh/p2p-relay-failure.ts
+var NO_FALLBACK_REASON = "Repo Mesh command/data-plane is P2P-only; WS/REST command fallback is intentionally disabled to preserve the transport boundary.";
+var P2P_NEXT_ACTION = "Check daemon/P2P health, wait briefly for connection establishment, then do one bounded retry or requeue the mesh task after clearing stale target session metadata.";
+var NON_P2P_NEXT_ACTION = "Inspect the provider/command error and fix the underlying logic or configuration before retrying.";
+function messageFromError(error) {
+  if (error instanceof Error) return error.message;
+  if (typeof error === "string") return error;
+  if (error && typeof error === "object") {
+    const candidate = error.error ?? error.message ?? error.reason;
+    if (typeof candidate === "string") return candidate;
+  }
+  return String(error || "mesh relay command failed");
+}
+function classifyP2pRelayFailure(error, _context = {}) {
+  const message = messageFromError(error);
+  const lower = message.toLowerCase();
+  const hasP2pSignal = /p2p|datachannel|node-datachannel|webrtc|ice|mesh_relay_command|daemon_mesh_p2p_transport/i.test(message);
+  const hasFailureSignal = /unavailable|missing|failed|failure|timeout|timed out|not connected|closed|disconnected|offline|no route|route unavailable|cannot send|cannot establish/i.test(message);
+  if (/requires targetdaemonid and command|providerpriority|no inference provider|permission denied|read-only|not a member/i.test(message)) {
+    return {
+      code: "mesh_logic_or_provider_failure",
+      reason: "mesh_logic_or_provider_failure",
+      transport: "unknown",
+      recoverable: false,
+      retryRecommended: false,
+      nextAction: NON_P2P_NEXT_ACTION,
+      noFallbackReason: NO_FALLBACK_REASON
+    };
+  }
+  let code = null;
+  let reason = "";
+  if (/timeout|timed out/i.test(message) && (hasP2pSignal || /mesh transport/i.test(message))) {
+    code = "p2p_timeout";
+    reason = "daemon_mesh_p2p_timeout";
+  } else if (/no route|route unavailable/i.test(message)) {
+    code = "p2p_no_route";
+    reason = "daemon_mesh_p2p_no_route";
+  } else if (/offline|not owned|not found|not connected to server/i.test(message) && /daemon|peer|target/i.test(message)) {
+    code = "p2p_daemon_offline";
+    reason = "daemon_mesh_target_offline";
+  } else if (/closed|disconnected/i.test(message) && (hasP2pSignal || /state changed/i.test(message))) {
+    code = "p2p_datachannel_closed";
+    reason = "daemon_mesh_p2p_datachannel_closed";
+  } else if (/not connected|cannot send|cannot establish/i.test(message) && hasP2pSignal) {
+    code = "p2p_not_connected";
+    reason = "daemon_mesh_p2p_not_connected";
+  } else if (hasP2pSignal && hasFailureSignal) {
+    code = "p2p_unavailable";
+    reason = "daemon_mesh_p2p_transport_unavailable";
+  }
+  if (!code) {
+    return {
+      code: "mesh_logic_or_provider_failure",
+      reason: "mesh_logic_or_provider_failure",
+      transport: "unknown",
+      recoverable: false,
+      retryRecommended: false,
+      nextAction: NON_P2P_NEXT_ACTION,
+      noFallbackReason: NO_FALLBACK_REASON
+    };
+  }
+  return {
+    code,
+    reason,
+    transport: "p2p",
+    recoverable: true,
+    retryRecommended: true,
+    nextAction: P2P_NEXT_ACTION,
+    noFallbackReason: NO_FALLBACK_REASON
+  };
+}
+function isP2pRelayTransportFailure(error) {
+  return classifyP2pRelayFailure(error).recoverable === true;
+}
+function buildP2pRelayFailurePayload(error, context = {}) {
+  const classification = classifyP2pRelayFailure(error, context);
+  return {
+    success: false,
+    ...classification,
+    error: messageFromError(error),
+    ...context.command ? { command: context.command } : {},
+    ...context.targetDaemonId ? { targetDaemonId: context.targetDaemonId } : {}
+  };
+}
+var P2pRelayFailureError = class extends Error {
+  code;
+  reason;
+  transport;
+  recoverable;
+  retryRecommended;
+  nextAction;
+  noFallbackReason;
+  command;
+  targetDaemonId;
+  constructor(message, context = {}) {
+    super(message);
+    this.name = "P2pRelayFailureError";
+    const payload = buildP2pRelayFailurePayload(message, context);
+    this.code = payload.code;
+    this.reason = payload.reason;
+    this.transport = payload.transport;
+    this.recoverable = payload.recoverable;
+    this.retryRecommended = payload.retryRecommended;
+    this.nextAction = payload.nextAction;
+    this.noFallbackReason = payload.noFallbackReason;
+    this.command = context.command;
+    this.targetDaemonId = context.targetDaemonId;
+  }
+};
+
 // src/config/state-store.ts
 init_config();
-import { existsSync as existsSync8, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
-import { join as join8 } from "path";
+import { existsSync as existsSync9, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
+import { join as join9 } from "path";
 var DEFAULT_STATE = {
   recentActivity: [],
   savedProviderSessions: [],
@@ -6549,7 +7516,7 @@ function isPlainObject2(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function getStatePath() {
-  return join8(getConfigDir(), "state.json");
+  return join9(getConfigDir(), "state.json");
 }
 function normalizeState(raw) {
   const parsed = isPlainObject2(raw) ? raw : {};
@@ -6585,7 +7552,7 @@ function normalizeState(raw) {
 }
 function loadState() {
   const statePath = getStatePath();
-  if (!existsSync8(statePath)) {
+  if (!existsSync9(statePath)) {
     return { ...DEFAULT_STATE };
   }
   try {
@@ -6606,9 +7573,9 @@ function resetState() {
 
 // src/detection/ide-detector.ts
 import { execSync } from "child_process";
-import { existsSync as existsSync9 } from "fs";
-import { platform, homedir as homedir4 } from "os";
-import * as path9 from "path";
+import { existsSync as existsSync10 } from "fs";
+import { platform as platform2, homedir as homedir5 } from "os";
+import * as path10 from "path";
 var BUILTIN_IDE_DEFINITIONS = [];
 var registeredIDEs = /* @__PURE__ */ new Map();
 function registerIDEDefinition(def) {
@@ -6627,14 +7594,14 @@ function getMergedDefinitions() {
 function findCliCommand(command) {
   const trimmed = String(command || "").trim();
   if (!trimmed) return null;
-  if (path9.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~")) {
-    const candidate = trimmed.startsWith("~") ? path9.join(homedir4(), trimmed.slice(1)) : trimmed;
-    const resolved = path9.isAbsolute(candidate) ? candidate : path9.resolve(candidate);
-    return existsSync9(resolved) ? resolved : null;
+  if (path10.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~")) {
+    const candidate = trimmed.startsWith("~") ? path10.join(homedir5(), trimmed.slice(1)) : trimmed;
+    const resolved = path10.isAbsolute(candidate) ? candidate : path10.resolve(candidate);
+    return existsSync10(resolved) ? resolved : null;
   }
   try {
     const result = execSync(
-      platform() === "win32" ? `where ${trimmed}` : `which ${trimmed}`,
+      platform2() === "win32" ? `where ${trimmed}` : `which ${trimmed}`,
       { encoding: "utf-8", timeout: 5e3, stdio: ["pipe", "pipe", "pipe"] }
     ).trim();
     return result.split("\n")[0] || null;
@@ -6655,21 +7622,21 @@ function getIdeVersion(cliCommand) {
   }
 }
 function checkPathExists(paths) {
-  const home = homedir4();
+  const home = homedir5();
   for (const p of paths) {
-    const normalized = p.startsWith("~") ? path9.join(home, p.slice(1)) : p;
+    const normalized = p.startsWith("~") ? path10.join(home, p.slice(1)) : p;
     if (normalized.includes("*")) {
       const username = home.split(/[\\/]/).pop() || "";
       const resolved = normalized.replace("*", username);
-      if (existsSync9(resolved)) return resolved;
+      if (existsSync10(resolved)) return resolved;
     } else {
-      if (existsSync9(normalized)) return normalized;
+      if (existsSync10(normalized)) return normalized;
     }
   }
   return null;
 }
 async function detectIDEs(providerLoader) {
-  const os22 = platform();
+  const os22 = platform2();
   const results = [];
   for (const def of getMergedDefinitions()) {
     const cliPath = findCliCommand(providerLoader?.getIdeCliCommand(def.id, def.cli) || def.cli);
@@ -6677,7 +7644,7 @@ async function detectIDEs(providerLoader) {
     let resolvedCli = cliPath;
     if (!resolvedCli && appPath && os22 === "darwin") {
       const bundledCli = `${appPath}/Contents/Resources/app/bin/${def.cli}`;
-      if (existsSync9(bundledCli)) resolvedCli = bundledCli;
+      if (existsSync10(bundledCli)) resolvedCli = bundledCli;
     }
     if (!resolvedCli && appPath && os22 === "win32") {
       const { dirname: dirname9 } = await import("path");
@@ -6690,7 +7657,7 @@ async function detectIDEs(providerLoader) {
         `${appDir}\\\\resources\\\\app\\\\bin\\\\${def.cli}.cmd`
       ];
       for (const c of candidates) {
-        if (existsSync9(c)) {
+        if (existsSync10(c)) {
           resolvedCli = c;
           break;
         }
@@ -6712,134 +7679,8 @@ async function detectIDEs(providerLoader) {
   return results;
 }
 
-// src/detection/cli-detector.ts
-import { exec } from "child_process";
-import * as os3 from "os";
-import * as path10 from "path";
-import { existsSync as existsSync10 } from "fs";
-function parseVersion(raw) {
-  const match = raw.match(/v?(\d+\.\d+(?:\.\d+)?(?:-[a-zA-Z0-9.]+)?)/);
-  return match ? match[1] : raw.split("\n")[0].slice(0, 100);
-}
-function shellQuote(value) {
-  if (/^[a-zA-Z0-9_./:@%+=,-]+$/.test(value)) return value;
-  return `"${value.replace(/(["\\$`])/g, "\\$1")}"`;
-}
-function expandHome(value) {
-  const trimmed = value.trim();
-  if (!trimmed.startsWith("~")) return trimmed;
-  return path10.join(os3.homedir(), trimmed.slice(1));
-}
-function isExplicitCommandPath(command) {
-  const trimmed = command.trim();
-  return path10.isAbsolute(trimmed) || trimmed.includes("/") || trimmed.includes("\\") || trimmed.startsWith("~");
-}
-function resolveCommandPath(command) {
-  const trimmed = command.trim();
-  if (!trimmed) return null;
-  if (isExplicitCommandPath(trimmed)) {
-    const expanded = expandHome(trimmed);
-    const candidate = path10.isAbsolute(expanded) ? expanded : path10.resolve(expanded);
-    return existsSync10(candidate) ? candidate : null;
-  }
-  return null;
-}
-function execAsync(cmd, timeoutMs = 5e3) {
-  return new Promise((resolve16) => {
-    const child = exec(cmd, {
-      encoding: "utf-8",
-      timeout: timeoutMs,
-      ...process.platform === "win32" ? { windowsHide: true } : {}
-    }, (err, stdout) => {
-      if (err || !stdout?.trim()) {
-        resolve16(null);
-      } else {
-        resolve16(stdout.trim());
-      }
-    });
-    child.on("error", () => resolve16(null));
-  });
-}
-async function detectCLIs(providerLoader, options) {
-  const platform10 = os3.platform();
-  const whichCmd = platform10 === "win32" ? "where" : "which";
-  const includeVersion = options?.includeVersion !== false;
-  const cliList = providerLoader ? providerLoader.getCliDetectionList() : [];
-  const results = await Promise.all(
-    cliList.map(async (cli) => {
-      try {
-        const explicitPath = resolveCommandPath(cli.command);
-        const pathResult = explicitPath || await execAsync(`${whichCmd} ${shellQuote(cli.command)}`);
-        if (!pathResult) return { ...cli, installed: false };
-        const firstPath = explicitPath || pathResult.split("\n")[0];
-        let version;
-        if (includeVersion) {
-          const versionCommands = [
-            `"${firstPath}" --version`,
-            `"${firstPath}" -V`,
-            `"${firstPath}" -v`,
-            cli.versionCommand
-          ].filter((v) => !!v);
-          try {
-            for (const versionCommand of versionCommands) {
-              const versionResult = await execAsync(versionCommand, 3e3);
-              if (versionResult) {
-                version = parseVersion(versionResult);
-                break;
-              }
-            }
-          } catch {
-          }
-        }
-        return { ...cli, installed: true, version, path: firstPath };
-      } catch {
-        return { ...cli, installed: false };
-      }
-    })
-  );
-  return results;
-}
-async function detectCLI(cliId, providerLoader, options) {
-  const resolvedId = providerLoader ? providerLoader.resolveAlias(cliId) : cliId;
-  if (providerLoader) {
-    const cliList = providerLoader.getCliDetectionList();
-    const target = cliList.find((c) => c.id === resolvedId);
-    if (target) {
-      const platform10 = os3.platform();
-      const whichCmd = platform10 === "win32" ? "where" : "which";
-      try {
-        const explicitPath = resolveCommandPath(target.command);
-        const pathResult = explicitPath || await execAsync(`${whichCmd} ${shellQuote(target.command)}`);
-        if (!pathResult) return null;
-        const firstPath = explicitPath || pathResult.split("\n")[0];
-        let version;
-        if (options?.includeVersion !== false) {
-          const versionCommands = [
-            `"${firstPath}" --version`,
-            `"${firstPath}" -V`,
-            `"${firstPath}" -v`,
-            target.versionCommand
-          ].filter((v) => !!v);
-          try {
-            for (const versionCommand of versionCommands) {
-              const versionResult = await execAsync(versionCommand, 3e3);
-              if (versionResult) {
-                version = parseVersion(versionResult);
-                break;
-              }
-            }
-          } catch {
-          }
-        }
-        return { ...target, installed: true, version, path: firstPath };
-      } catch {
-        return null;
-      }
-    }
-  }
-  const all = await detectCLIs(providerLoader, options);
-  return all.find((c) => c.id === resolvedId && c.installed) || null;
-}
+// src/index.ts
+init_cli_detector();
 
 // src/system/host-memory.ts
 import * as os4 from "os";
@@ -8708,6 +9549,28 @@ var StatusMonitor = class {
 };
 
 // src/providers/chat-message-normalization.ts
+function extractFinalSummaryFromMessages(messages, maxChars = 500) {
+  if (!Array.isArray(messages) || messages.length === 0) return "";
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const msg = messages[i];
+    if (!msg) continue;
+    const classification = classifyChatMessageVisibility(msg);
+    if (classification.isUserFacing && (msg.role === "assistant" || msg.role === "model")) {
+      const text = flattenContent(msg.content).trim();
+      if (text) return text.slice(0, maxChars);
+    }
+  }
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const msg = messages[i];
+    if (!msg) continue;
+    const classification = classifyChatMessageVisibility(msg);
+    if (classification.isUserFacing) {
+      const text = flattenContent(msg.content).trim();
+      if (text) return text.slice(0, maxChars);
+    }
+  }
+  return "";
+}
 var BUILTIN_CHAT_MESSAGE_KINDS = ["standard", "thought", "tool", "terminal", "system"];
 var CHAT_MESSAGE_VISIBILITIES = ["user", "debug", "internal", "hidden"];
 var CHAT_MESSAGE_TRANSCRIPT_VISIBILITIES = ["visible", "chat", "user", "debug", "internal", "hidden"];
@@ -10719,7 +11582,8 @@ var ExtensionProviderInstance = class {
           ideType: this.ideType || this.type,
           agentType: this.type,
           agentName: this.agentName || this.provider.name,
-          extensionId: this.extensionId || this.type
+          extensionId: this.extensionId || this.type,
+          finalSummary: extractFinalSummaryFromMessages(data?.messages)
         });
         this.generatingStartedAt = 0;
       }
@@ -11487,7 +12351,7 @@ var IdeProviderInstance = class {
       } else if (agentStatus === "idle" && (lastStatus === "generating" || lastStatus === "waiting_approval")) {
         const startedAt = this.generatingStartedAt.get(agentKey);
         const duration = startedAt ? Math.round((now - startedAt) / 1e3) : 0;
-        this.pushEvent({ event: "agent:generating_completed", chatTitle, duration, timestamp: now, ideType: this.type });
+        this.pushEvent({ event: "agent:generating_completed", chatTitle, duration, timestamp: now, ideType: this.type, finalSummary: extractFinalSummaryFromMessages(chatData?.messages) });
         this.generatingStartedAt.delete(agentKey);
       }
       this.lastAgentStatuses.set(agentKey, agentStatus);
@@ -14983,11 +15847,13 @@ async function handleOpenPanel(h, args) {
 async function handlePtyInput(h, args) {
   const { cliType, data, targetSessionId } = args || {};
   if (!data) return { success: false, error: "data required" };
+  const cleanData = typeof data === "string" ? data.replace(/\x1b\[[?>][0-9;]*c/g, "") : data;
+  if (!cleanData) return { success: true };
   const adapter = h.getCliAdapter(targetSessionId || cliType);
   if (!adapter || typeof adapter.writeRaw !== "function") {
     return { success: false, error: `CLI adapter not found: ${targetSessionId || cliType || "unknown"}` };
   }
-  await adapter.writeRaw(data);
+  await adapter.writeRaw(cleanData);
   return { success: true };
 }
 function handlePtyResize(_h, args) {
@@ -15941,13 +16807,14 @@ var DaemonCommandHandler = class {
 
 // src/commands/cli-manager.ts
 init_provider_cli_adapter();
+init_cli_detector();
+init_config();
 import * as os13 from "os";
 import * as path18 from "path";
 import * as crypto4 from "crypto";
 import { existsSync as existsSync14, mkdirSync as mkdirSync9, writeFileSync as writeFileSync9 } from "fs";
 import { execFileSync } from "child_process";
 import chalk from "chalk";
-init_config();
 
 // src/providers/cli-provider-instance.ts
 import * as os12 from "os";
@@ -15976,6 +16843,8 @@ function normalizeProviderSessionId(provider, providerSessionId) {
 }
 
 // src/providers/cli-provider-instance.ts
+var COMPLETED_FINALIZATION_RETRY_MS = 1e3;
+var COMPLETED_FINALIZATION_MAX_WAIT_MS = 3e4;
 var IMAGE_MIME_EXTENSIONS = {
   "image/png": ".png",
   "image/jpeg": ".jpg",
@@ -16039,6 +16908,13 @@ function cleanupStaleMaterializedImages(dir) {
   } catch {
   }
 }
+function hasNonEmptyCliModalButtons(activeModal) {
+  const buttons = activeModal?.buttons;
+  return Array.isArray(buttons) && buttons.some((button) => String(button || "").trim().length > 0);
+}
+function isCliGeneratingLikeStatus(status) {
+  return status === "generating" || status === "streaming" || status === "long_generating" || status === "starting";
+}
 function buildCliStructuredInputPrompt(input, options = {}) {
   const promptParts = [];
   const imageRefs = [];
@@ -16323,10 +17199,12 @@ var CliProviderInstance = class {
     const mergedMessages = this.mergeConversationMessages(parsedMessages);
     const canonicalBackedHistory = this.syncCanonicalSavedHistoryIfNeeded();
     const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
+    const parsedChatStatus = typeof parsedStatus?.status === "string" && parsedStatus.status.trim() ? parsedStatus.status.trim() : void 0;
+    const suppressStaleParsedBusyStatus = this.shouldSuppressStaleParsedBusyStatus(parsedStatus, adapterStatus);
     if (parsedMessages.length > 0) {
       const shouldSkipReplayPersist = this.suppressIdleHistoryReplay && adapterStatus.status === "idle" && parsedStatus?.status === "idle";
       let messagesToSave = parsedMessages;
-      if (parsedStatus?.status === "generating" || parsedStatus?.status === "long_generating") {
+      if (!suppressStaleParsedBusyStatus && (parsedChatStatus === "generating" || parsedChatStatus === "long_generating")) {
         const lastIdx = messagesToSave.length - 1;
         if (lastIdx >= 0 && messagesToSave[lastIdx]?.role === "assistant") {
           messagesToSave = messagesToSave.slice(0, lastIdx);
@@ -16360,6 +17238,7 @@ var CliProviderInstance = class {
       summaryMetadata: this.summaryMetadata,
       controlValues: this.controlValues
     });
+    const activeChatStatus = parseErrorMessage ? "error" : autoApproveActive && parsedStatus?.status === "waiting_approval" ? "generating" : adapterStatus.status !== "idle" ? visibleStatus : suppressStaleParsedBusyStatus ? visibleStatus : parsedChatStatus || visibleStatus;
     return {
       type: this.type,
       name: this.provider.name,
@@ -16369,7 +17248,7 @@ var CliProviderInstance = class {
       activeChat: {
         id: `${this.type}_${this.workingDir}`,
         title: parsedStatus?.title || dirName,
-        status: parseErrorMessage ? "error" : autoApproveActive && parsedStatus?.status === "waiting_approval" ? "generating" : adapterStatus.status !== "idle" ? visibleStatus : parsedStatus?.status || visibleStatus,
+        status: activeChatStatus,
         messages: mergedMessages,
         activeModal: autoApproveActive ? null : parsedStatus?.activeModal ?? adapterStatus.activeModal,
         inputContent: ""
@@ -16499,6 +17378,103 @@ var CliProviderInstance = class {
     }
     this.applyProviderResponse(parsed.payload, { phase: "immediate" });
   }
+  completionHasFinalAssistantMessage(messages) {
+    const visibleMessages = (Array.isArray(messages) ? messages : []).filter((message) => isUserFacingChatMessage(message));
+    const lastVisible = visibleMessages[visibleMessages.length - 1];
+    const role = typeof lastVisible?.role === "string" ? lastVisible.role.trim().toLowerCase() : "";
+    const content = lastVisible ? flattenContent(lastVisible.content).trim() : "";
+    return role === "assistant" && !!content;
+  }
+  hasAdapterPendingResponse() {
+    const adapterAny = this.adapter;
+    if (adapterAny?.isWaitingForResponse === true) return true;
+    if (adapterAny?.currentTurnScope) return true;
+    try {
+      if (typeof this.adapter.isProcessing === "function" && this.adapter.isProcessing()) return true;
+    } catch {
+    }
+    try {
+      const partial = typeof this.adapter.getPartialResponse === "function" ? this.adapter.getPartialResponse() : "";
+      if (typeof partial === "string" && partial.trim()) return true;
+    } catch {
+    }
+    return false;
+  }
+  shouldSuppressStaleParsedBusyStatus(parsedStatus, adapterStatus) {
+    const parsedRawStatus = typeof parsedStatus?.status === "string" ? parsedStatus.status.trim() : "";
+    const adapterRawStatus = typeof adapterStatus?.status === "string" ? adapterStatus.status.trim() : "";
+    if (!isCliGeneratingLikeStatus(parsedRawStatus)) return false;
+    if (adapterRawStatus !== "idle") return false;
+    if (hasNonEmptyCliModalButtons(parsedStatus?.activeModal ?? parsedStatus?.modal)) return false;
+    return !this.hasAdapterPendingResponse();
+  }
+  getCompletedFinalizationBlockReason(latestVisibleStatus) {
+    if (latestVisibleStatus !== "idle") return `status:${latestVisibleStatus}`;
+    const adapterAny = this.adapter;
+    if (adapterAny?.isWaitingForResponse === true) return "adapter_waiting_for_response";
+    if (adapterAny?.currentTurnScope) return "adapter_turn_scope_active";
+    const partial = typeof this.adapter.getPartialResponse === "function" ? this.adapter.getPartialResponse() : "";
+    if (typeof partial === "string" && partial.trim()) return "partial_response_pending";
+    let parsed;
+    try {
+      parsed = this.adapter.getScriptParsedStatus();
+    } catch (error) {
+      return `parse_error:${error?.message || String(error)}`;
+    }
+    const parsedStatus = typeof parsed?.status === "string" ? parsed.status : "unknown";
+    if (parsedStatus !== "idle") return `parsed_status:${parsedStatus}`;
+    if (parsed?.activeModal || parsed?.modal) return "parsed_modal_active";
+    if (!this.completionHasFinalAssistantMessage(parsed?.messages)) return "missing_final_assistant";
+    return null;
+  }
+  scheduleCompletedDebounceFlush(delayMs) {
+    if (this.completedDebounceTimer) clearTimeout(this.completedDebounceTimer);
+    this.completedDebounceTimer = setTimeout(() => this.flushCompletedDebounceIfFinalized(), delayMs);
+  }
+  flushCompletedDebounceIfFinalized() {
+    const pending = this.completedDebouncePending;
+    if (!pending) {
+      this.completedDebounceTimer = null;
+      return;
+    }
+    const latestStatus = this.adapter.getStatus({ allowParse: false });
+    const latestAutoApproveActive = latestStatus.status === "waiting_approval" && this.shouldAutoApprove();
+    const latestVisibleStatus = latestAutoApproveActive ? "generating" : latestStatus.status;
+    if (latestVisibleStatus !== "idle") {
+      LOG.info("CLI", `[${this.type}] cancelled pending completed (resumed ${latestVisibleStatus})`);
+      this.completedDebouncePending = null;
+      this.completedDebounceTimer = null;
+      return;
+    }
+    const blockReason = this.getCompletedFinalizationBlockReason(latestVisibleStatus);
+    if (blockReason) {
+      const waitedMs = Date.now() - pending.firstObservedAt;
+      if (waitedMs < COMPLETED_FINALIZATION_MAX_WAIT_MS) {
+        if (pending.loggedBlockReason !== blockReason) {
+          LOG.info("CLI", `[${this.type}] waiting to emit completed until transcript finalizes (${blockReason})`);
+          pending.loggedBlockReason = blockReason;
+        }
+        this.scheduleCompletedDebounceFlush(COMPLETED_FINALIZATION_RETRY_MS);
+        return;
+      }
+      LOG.warn("CLI", `[${this.type}] suppressed completed event after ${waitedMs}ms without finalized assistant turn (${blockReason})`);
+      this.completedDebouncePending = null;
+      this.completedDebounceTimer = null;
+      this.generatingStartedAt = 0;
+      return;
+    }
+    LOG.info("CLI", `[${this.type}] completed in ${pending.duration}s`);
+    this.pushEvent({
+      event: "agent:generating_completed",
+      chatTitle: pending.chatTitle,
+      duration: pending.duration,
+      timestamp: pending.timestamp,
+      finalSummary: extractFinalSummaryFromMessages(this.adapter?.getScriptParsedStatus()?.messages)
+    });
+    this.completedDebouncePending = null;
+    this.completedDebounceTimer = null;
+    this.generatingStartedAt = 0;
+  }
   maybeAutoApproveStatus(adapterStatus, now = Date.now()) {
     const autoApproveActive = adapterStatus?.status === "waiting_approval" && this.shouldAutoApprove();
     if (autoApproveActive && !this.autoApproveBusy) {
@@ -16596,27 +17572,11 @@ var CliProviderInstance = class {
           this.generatingDebouncePending = null;
           this.generatingStartedAt = 0;
         } else {
-          if (this.completedDebounceTimer) clearTimeout(this.completedDebounceTimer);
-          this.completedDebouncePending = { chatTitle, duration, timestamp: now };
-          this.completedDebounceTimer = setTimeout(() => {
-            if (this.completedDebouncePending) {
-              const latestStatus = this.adapter.getStatus({ allowParse: false });
-              const latestAutoApproveActive = latestStatus.status === "waiting_approval" && this.shouldAutoApprove();
-              const latestVisibleStatus = latestAutoApproveActive ? "generating" : latestStatus.status;
-              if (latestVisibleStatus !== "idle") {
-                LOG.info("CLI", `[${this.type}] cancelled pending completed (resumed ${latestVisibleStatus})`);
-                this.completedDebouncePending = null;
-                this.completedDebounceTimer = null;
-                return;
-              }
-              LOG.info("CLI", `[${this.type}] completed in ${this.completedDebouncePending.duration}s`);
-              this.pushEvent({ event: "agent:generating_completed", ...this.completedDebouncePending });
-              this.completedDebouncePending = null;
-              this.generatingStartedAt = 0;
-            }
-            this.completedDebounceTimer = null;
-          }, 3e3);
+          this.completedDebouncePending = { chatTitle, duration, timestamp: now, firstObservedAt: now };
+          this.scheduleCompletedDebounceFlush(3e3);
         }
+      } else if (newStatus === "idle" && this.lastStatus === "starting") {
+        this.pushEvent({ event: "agent:ready", chatTitle, timestamp: now });
       } else if (newStatus === "stopped") {
         if (this.generatingDebounceTimer) {
           clearTimeout(this.generatingDebounceTimer);
@@ -18257,7 +19217,7 @@ ${rawInput}` : rawInput;
         });
       } else if (newStatus === "idle" && (this.lastStatus === "generating" || this.lastStatus === "waiting_approval")) {
         const duration = this.generatingStartedAt ? Math.round((now - this.generatingStartedAt) / 1e3) : 0;
-        this.pushEvent({ event: "agent:generating_completed", chatTitle, duration, timestamp: now });
+        this.pushEvent({ event: "agent:generating_completed", chatTitle, duration, timestamp: now, finalSummary: extractFinalSummaryFromMessages(this.messages) });
         this.generatingStartedAt = 0;
       } else if (newStatus === "stopped") {
         this.pushEvent({ event: "agent:stopped", chatTitle, timestamp: now });
@@ -18365,9 +19325,6 @@ function buildCoordinatorDelegatedCliLaunchOptions(input) {
   const cliType = String(input.cliType || "").trim();
   const cliArgs = Array.isArray(input.cliArgs) ? [...input.cliArgs] : [];
   const env = { ...input.env || {}, ...COORDINATOR_DELEGATED_ENV_UNSETS };
-  if (cliType === "hermes-cli" && !hasCliArg(cliArgs, "--ignore-user-config")) {
-    cliArgs.unshift("--ignore-user-config");
-  }
   if (cliType === "claude-cli" && !hasCliArg(cliArgs, "--mcp-config")) {
     cliArgs.unshift("--mcp-config", ensureEmptyDelegatedMcpConfig(input.workspace));
   }
@@ -21444,6 +22401,7 @@ function getAvailableIdeIds() {
 
 // src/commands/router.ts
 init_config();
+init_cli_detector();
 init_logger();
 
 // src/logging/command-log.ts
@@ -21613,7 +22571,9 @@ function resolveHermesMeshCoordinatorSetup(options) {
   const mcpServer = resolveAdhdevMcpServerLaunch({
     meshId: options.meshId,
     nodeExecutable: options.nodeExecutable,
-    adhdevMcpEntryPath: options.adhdevMcpEntryPath
+    adhdevMcpEntryPath: options.adhdevMcpEntryPath,
+    adhdevMcpTransport: options.adhdevMcpTransport,
+    adhdevMcpPort: options.adhdevMcpPort
   });
   if (!mcpServer) {
     return {
@@ -21680,7 +22640,9 @@ function resolveMeshCoordinatorSetup(options) {
     const mcpServer = resolveAdhdevMcpServerLaunch({
       meshId,
       nodeExecutable: options.nodeExecutable,
-      adhdevMcpEntryPath: options.adhdevMcpEntryPath
+      adhdevMcpEntryPath: options.adhdevMcpEntryPath,
+      adhdevMcpTransport: options.adhdevMcpTransport,
+      adhdevMcpPort: options.adhdevMcpPort
     });
     if (!mcpServer) {
       return {
@@ -21702,19 +22664,30 @@ function resolveMeshCoordinatorSetup(options) {
     if (!instructions || !template?.trim()) {
       return { kind: "unsupported", reason: "Provider manual MCP setup is missing instructions or template" };
     }
+    const renderedTemplate = renderMeshCoordinatorTemplate(template, {
+      meshId,
+      workspace,
+      serverName,
+      adhdevMcpCommand: options.adhdevMcpCommand || DEFAULT_ADHDEV_MCP_COMMAND
+    });
+    const isCliCommand = !renderedTemplate.trim().includes("\n") && !renderedTemplate.trim().startsWith("{");
+    if (isCliCommand) {
+      return {
+        kind: "cli_command",
+        serverName,
+        command: renderedTemplate.trim(),
+        requiresRestart: mcpConfig.requiresRestart === true,
+        instructions
+      };
+    }
     return {
       kind: "manual",
       serverName,
       configFormat: mcpConfig.format,
       configPathCommand: mcpConfig.configPathCommand,
       requiresRestart: mcpConfig.requiresRestart === true,
-      instructions,
-      template: renderMeshCoordinatorTemplate(template, {
-        meshId,
-        workspace,
-        serverName,
-        adhdevMcpCommand: options.adhdevMcpCommand || DEFAULT_ADHDEV_MCP_COMMAND
-      })
+      instructions,
+      template: renderedTemplate
     };
   }
   return {
@@ -21743,11 +22716,27 @@ function resolveAdhdevMcpServerLaunch(options) {
   if (!entryPath) return null;
   const nodeExecutable = resolveMcpNodeExecutable(options.nodeExecutable);
   if (!nodeExecutable) return null;
+  const transport = resolveMcpTransport(options.adhdevMcpTransport);
+  const args = [entryPath, "--mode", transport, "--repo-mesh", options.meshId];
+  const port = resolveMcpPort(options.adhdevMcpPort);
+  if (port !== void 0) args.push("--port", String(port));
   return {
     command: nodeExecutable,
-    args: [entryPath, "--mode", "ipc", "--repo-mesh", options.meshId]
+    args
   };
 }
+function resolveMcpTransport(explicitTransport) {
+  if (explicitTransport === "local" || explicitTransport === "ipc") return explicitTransport;
+  const envTransport = process.env.ADHDEV_COORDINATOR_MCP_TRANSPORT?.trim();
+  return envTransport === "local" ? "local" : "ipc";
+}
+function resolveMcpPort(explicitPort) {
+  if (typeof explicitPort === "number" && Number.isInteger(explicitPort) && explicitPort > 0) return explicitPort;
+  const raw = process.env.ADHDEV_COORDINATOR_MCP_PORT?.trim();
+  if (!raw) return void 0;
+  const parsed = Number(raw);
+  return Number.isInteger(parsed) && parsed > 0 ? parsed : void 0;
+}
 function resolveMcpNodeExecutable(explicitExecutable) {
   const explicit = explicitExecutable?.trim();
   if (explicit) return explicit;
@@ -22559,6 +23548,209 @@ async function resolveProviderTypeFromPriority(args) {
   }
   return { error: `No usable provider detected for node '${args.nodeId}' from providerPriority: ${failed.join("; ")}` };
 }
+var REFINE_VALIDATION_CATEGORIES = ["typecheck", "test", "lint", "build"];
+var REFINE_VALIDATION_TIMEOUT_MS = 12e4;
+var REFINE_VALIDATION_OUTPUT_LIMIT_BYTES = 128 * 1024;
+var REFINE_VALIDATION_SUMMARY_CHARS = 2e3;
+var REFINE_VALIDATION_MAX_COMMANDS = 4;
+function truncateValidationOutput(value) {
+  const text = typeof value === "string" ? value : value == null ? "" : String(value);
+  if (text.length <= REFINE_VALIDATION_SUMMARY_CHARS) return text;
+  return `${text.slice(0, REFINE_VALIDATION_SUMMARY_CHARS)}
+[truncated ${text.length - REFINE_VALIDATION_SUMMARY_CHARS} chars]`;
+}
+function readPackageScripts(workspace) {
+  try {
+    const packageJsonPath = pathJoin(workspace, "package.json");
+    const parsed = JSON.parse(fs10.readFileSync(packageJsonPath, "utf-8"));
+    return parsed?.scripts && typeof parsed.scripts === "object" && !Array.isArray(parsed.scripts) ? parsed.scripts : {};
+  } catch {
+    return {};
+  }
+}
+function tokenizeValidationCommand(command) {
+  const trimmed = command.trim();
+  if (!trimmed) return null;
+  if (/[;&|<>`$\\\n\r'\"]/.test(trimmed)) return null;
+  const tokens = trimmed.split(/\s+/).filter(Boolean);
+  if (!tokens.length) return null;
+  if (tokens.some((token) => !/^[A-Za-z0-9_@./:=+-]+$/.test(token))) return null;
+  return tokens;
+}
+function scriptMatchesValidationCategory(scriptName, category) {
+  return scriptName === category || scriptName.startsWith(`${category}:`);
+}
+function parsePackageManagerValidationCommand(rawCommand, category, scripts, source) {
+  const tokens = tokenizeValidationCommand(rawCommand);
+  if (!tokens) {
+    return { rejected: { command: rawCommand, category, source, reason: "unsafe command string is not allowlisted" } };
+  }
+  const [binary, second, third, ...rest] = tokens;
+  let scriptName = "";
+  let command = binary;
+  let args = [];
+  if ((binary === "npm" || binary === "pnpm" || binary === "bun") && second === "run" && third) {
+    scriptName = third;
+    args = ["run", scriptName, ...rest];
+  } else if (binary === "npm" && second === "test" && !third) {
+    scriptName = "test";
+    args = ["test"];
+  } else if (binary === "yarn" && second === "run" && third) {
+    scriptName = third;
+    args = ["run", scriptName, ...rest];
+  } else if (binary === "yarn" && second && !third) {
+    scriptName = second;
+    args = [scriptName];
+  } else {
+    return { rejected: { command: rawCommand, category, source, reason: "command is not a supported package-manager script invocation" } };
+  }
+  if (!scriptName || !Object.prototype.hasOwnProperty.call(scripts, scriptName)) {
+    return { rejected: { command: rawCommand, category, source, script: scriptName, reason: "script is not declared in package.json" } };
+  }
+  if (!scriptMatchesValidationCategory(scriptName, category)) {
+    return { rejected: { command: rawCommand, category, source, script: scriptName, reason: "script name is outside the validation category allowlist" } };
+  }
+  return {
+    command: {
+      command,
+      args,
+      displayCommand: [command, ...args].join(" "),
+      category,
+      source
+    }
+  };
+}
+function collectProjectContextValidationCandidates(mesh) {
+  const commands = mesh?.projectContext?.commands;
+  if (!commands || typeof commands !== "object" || Array.isArray(commands)) return [];
+  const candidates = [];
+  for (const category of REFINE_VALIDATION_CATEGORIES) {
+    const entries = Array.isArray(commands[category]) ? commands[category] : [];
+    for (const entry of entries) {
+      if (typeof entry?.command !== "string") continue;
+      candidates.push({
+        command: entry.command,
+        category,
+        source: typeof entry.sourcePath === "string" ? entry.sourcePath : "projectContext.commands",
+        confidence: typeof entry.confidence === "string" ? entry.confidence : void 0
+      });
+    }
+  }
+  return candidates.sort((a, b) => {
+    const rank = (value) => value === "high" ? 0 : value === "medium" ? 1 : 2;
+    return rank(a.confidence) - rank(b.confidence);
+  });
+}
+function collectPolicyValidationCandidates(mesh) {
+  const policy = mesh?.policy && typeof mesh.policy === "object" && !Array.isArray(mesh.policy) ? mesh.policy : {};
+  const configured = Array.isArray(policy.validationCommands) ? policy.validationCommands : Array.isArray(policy.validationGate?.commands) ? policy.validationGate.commands : [];
+  return configured.map((entry) => typeof entry === "string" ? { command: entry, category: "", source: "mesh.policy.validationCommands" } : entry).filter((entry) => entry && typeof entry.command === "string").map((entry) => {
+    const commandText = entry.command.trim();
+    const category = REFINE_VALIDATION_CATEGORIES.find((cat) => commandText.includes(` ${cat}`)) ?? "";
+    return { command: commandText, category, source: "mesh.policy.validationCommands" };
+  }).filter((entry) => !!entry.category);
+}
+function selectMeshRefineValidationCommands(mesh, workspace) {
+  const scripts = readPackageScripts(workspace);
+  const rejectedCommands = [];
+  const selected = [];
+  const seen = /* @__PURE__ */ new Set();
+  const candidates = [
+    ...collectPolicyValidationCandidates(mesh),
+    ...collectProjectContextValidationCandidates(mesh)
+  ];
+  for (const candidate of candidates) {
+    const parsed = parsePackageManagerValidationCommand(candidate.command, candidate.category, scripts, candidate.source);
+    if (parsed.rejected) {
+      rejectedCommands.push(parsed.rejected);
+      continue;
+    }
+    if (!parsed.command || seen.has(parsed.command.displayCommand)) continue;
+    selected.push(parsed.command);
+    seen.add(parsed.command.displayCommand);
+    if (selected.length >= REFINE_VALIDATION_MAX_COMMANDS) break;
+  }
+  if (!selected.length && candidates.length === 0) {
+    for (const category of REFINE_VALIDATION_CATEGORIES) {
+      if (!Object.prototype.hasOwnProperty.call(scripts, category)) continue;
+      const fallback = parsePackageManagerValidationCommand(`npm run ${category}`, category, scripts, "package.json:scripts");
+      if (fallback.command && !seen.has(fallback.command.displayCommand)) {
+        selected.push(fallback.command);
+        seen.add(fallback.command.displayCommand);
+      } else if (fallback.rejected) {
+        rejectedCommands.push(fallback.rejected);
+      }
+      if (selected.length >= 2) break;
+    }
+  }
+  return {
+    commands: selected,
+    rejectedCommands,
+    source: selected.some((command) => command.source === "mesh.policy.validationCommands") ? "mesh_policy" : selected.some((command) => command.source !== "package.json:scripts") ? "project_context" : selected.length ? "package_json_scripts" : "unavailable"
+  };
+}
+async function runMeshRefineValidationGate(mesh, workspace) {
+  const { execFile: execFile3 } = await import("child_process");
+  const { promisify: promisify3 } = await import("util");
+  const execFileAsync3 = promisify3(execFile3);
+  const selection = selectMeshRefineValidationCommands(mesh, workspace);
+  const summary = {
+    status: "skipped",
+    required: true,
+    commandsRun: [],
+    rejectedCommands: selection.rejectedCommands,
+    skippedReason: void 0,
+    timeoutMs: REFINE_VALIDATION_TIMEOUT_MS,
+    outputLimitBytes: REFINE_VALIDATION_OUTPUT_LIMIT_BYTES
+  };
+  if (!selection.commands.length) {
+    summary.skippedReason = "validation_unavailable: no allowlisted projectContext, mesh policy, or package.json build/test/typecheck/lint command was available";
+    return summary;
+  }
+  for (const candidate of selection.commands) {
+    const startedAt = Date.now();
+    try {
+      const result = await execFileAsync3(candidate.command, candidate.args, {
+        cwd: workspace,
+        encoding: "utf8",
+        timeout: REFINE_VALIDATION_TIMEOUT_MS,
+        maxBuffer: REFINE_VALIDATION_OUTPUT_LIMIT_BYTES,
+        env: { ...process.env, CI: process.env.CI || "1" }
+      });
+      summary.commandsRun.push({
+        command: candidate.command,
+        args: candidate.args,
+        displayCommand: candidate.displayCommand,
+        category: candidate.category,
+        source: candidate.source,
+        passed: true,
+        exitCode: 0,
+        durationMs: Date.now() - startedAt,
+        stdout: truncateValidationOutput(result.stdout),
+        stderr: truncateValidationOutput(result.stderr)
+      });
+    } catch (error) {
+      summary.commandsRun.push({
+        command: candidate.command,
+        args: candidate.args,
+        displayCommand: candidate.displayCommand,
+        category: candidate.category,
+        source: candidate.source,
+        passed: false,
+        exitCode: typeof error?.code === "number" ? error.code : null,
+        signal: typeof error?.signal === "string" ? error.signal : null,
+        timedOut: error?.killed === true || /timed out/i.test(String(error?.message || "")),
+        durationMs: Date.now() - startedAt,
+        stdout: truncateValidationOutput(error?.stdout),
+        stderr: truncateValidationOutput(error?.stderr || error?.message)
+      });
+      summary.status = "failed";
+      return summary;
+    }
+  }
+  summary.status = "passed";
+  return summary;
+}
 function loadYamlModule() {
   return yaml;
 }
@@ -22588,6 +23780,34 @@ function loadHermesCoordinatorBaseConfig(targetConfigPath) {
   const { mcp_servers: _mcpServers, ...baseConfig } = parsed;
   return { config: baseConfig, sourceHome, sourceConfigPath };
 }
+function stripHermesCoordinatorTempModelProviderOverrides(config) {
+  const {
+    model: _model,
+    provider: _provider,
+    default_model: _defaultModel,
+    defaultProvider: _defaultProvider,
+    default_provider: _defaultProviderSnake,
+    modelProvider: _modelProvider,
+    model_provider: _modelProviderSnake,
+    ...sanitized
+  } = config;
+  const delegation = sanitized.delegation;
+  if (delegation && typeof delegation === "object" && !Array.isArray(delegation)) {
+    const {
+      model: _delegationModel,
+      provider: _delegationProvider,
+      modelProvider: _delegationModelProvider,
+      model_provider: _delegationModelProviderSnake,
+      ...delegationRest
+    } = delegation;
+    if (Object.keys(delegationRest).length > 0) {
+      sanitized.delegation = delegationRest;
+    } else {
+      delete sanitized.delegation;
+    }
+  }
+  return sanitized;
+}
 function copyHermesCoordinatorCredentialFiles(sourceHome, targetHome) {
   if (pathResolve(sourceHome) === pathResolve(targetHome)) return;
   for (const fileName of [".env", "auth.json"]) {
@@ -22745,9 +23965,191 @@ var DaemonCommandRouter = class {
     if (record?.meta?.meshNodeId === nodeId) return true;
     return false;
   }
+  async cleanupLocalWorktreeNode(args) {
+    const workspace = typeof args.node?.workspace === "string" ? args.node.workspace.trim() : "";
+    if (!workspace) {
+      return {
+        success: false,
+        code: "mesh_worktree_cleanup_missing_workspace",
+        error: `Worktree node '${args.nodeId}' is missing workspace metadata`,
+        recoveryHint: "Inspect the mesh node record before removing it, or remove stale metadata manually only after confirming no managed worktree remains."
+      };
+    }
+    const worktreeExists = fs10.existsSync(workspace);
+    const sourceNode = args.node?.clonedFromNodeId ? args.mesh?.nodes?.find((n) => n.id === args.node.clonedFromNodeId || n.nodeId === args.node.clonedFromNodeId) : args.mesh?.nodes?.find((n) => !n.isLocalWorktree);
+    const repoRoot = typeof sourceNode?.repoRoot === "string" && sourceNode.repoRoot.trim() ? sourceNode.repoRoot.trim() : typeof sourceNode?.workspace === "string" && sourceNode.workspace.trim() ? sourceNode.workspace.trim() : "";
+    if (!worktreeExists) {
+      return { success: true, skipped: true, removedPath: workspace, repoRoot: repoRoot || void 0, reason: "worktree_path_missing" };
+    }
+    if (!repoRoot || !fs10.existsSync(repoRoot)) {
+      return {
+        success: false,
+        code: "mesh_worktree_cleanup_missing_source_repo",
+        error: `Refusing to remove worktree '${workspace}' because the source repo root is unavailable`,
+        recoveryHint: "Run mesh_remove_node from the machine that owns the source repo, or verify the source node metadata before retrying."
+      };
+    }
+    if (typeof args.node?.worktreeBranch !== "string" || !args.node.worktreeBranch.trim()) {
+      return {
+        success: false,
+        code: "mesh_worktree_cleanup_missing_branch",
+        error: `Refusing to remove worktree '${workspace}' because worktreeBranch metadata is missing`,
+        recoveryHint: "Confirm this is an ADHDev-managed worktree before removing it manually; managed worktree nodes include worktreeBranch metadata."
+      };
+    }
+    const { resolveWorktreePath: resolveWorktreePath2, listWorktrees: listWorktrees2, removeWorktree: removeWorktree2 } = await Promise.resolve().then(() => (init_git_worktree(), git_worktree_exports));
+    const normalizePath = (value) => {
+      const resolved = pathResolve(value);
+      try {
+        return fs10.realpathSync(resolved);
+      } catch {
+        return resolved;
+      }
+    };
+    const expectedPath = normalizePath(resolveWorktreePath2(repoRoot, String(args.mesh?.name || args.mesh?.id || "mesh"), args.node.worktreeBranch));
+    const actualPath = normalizePath(workspace);
+    if (actualPath !== expectedPath) {
+      return {
+        success: false,
+        code: "mesh_worktree_cleanup_unexpected_path",
+        error: `Refusing to remove worktree '${workspace}' because it is not at the expected managed path '${expectedPath}'`,
+        recoveryHint: "Use git worktree list/status to inspect the path. Retry only after confirming the mesh node metadata points to an ADHDev-managed worktree."
+      };
+    }
+    const entries = await listWorktrees2(repoRoot);
+    const managedEntry = entries.find((entry) => normalizePath(entry.path) === actualPath);
+    if (!managedEntry) {
+      return {
+        success: false,
+        code: "mesh_worktree_cleanup_not_registered",
+        error: `Refusing to remove '${workspace}' because it is not registered in git worktree list for '${repoRoot}'`,
+        recoveryHint: "Inspect git worktree list --porcelain from the source repo. If the path was already removed, prune git worktrees before retrying."
+      };
+    }
+    if (managedEntry.branch && managedEntry.branch !== args.node.worktreeBranch) {
+      return {
+        success: false,
+        code: "mesh_worktree_cleanup_branch_mismatch",
+        error: `Refusing to remove '${workspace}' because git reports branch '${managedEntry.branch}', expected '${args.node.worktreeBranch}'`,
+        recoveryHint: "Inspect the worktree branch and mesh metadata before retrying cleanup."
+      };
+    }
+    const forceFallbackConvergence = await this.getWorktreeForceCleanupConvergence({
+      repoRoot,
+      workspace,
+      node: args.node
+    });
+    try {
+      const result = await removeWorktree2(repoRoot, workspace, {
+        requireClean: true,
+        allowSubmoduleForceFallback: forceFallbackConvergence.allow
+      });
+      return {
+        success: true,
+        removedPath: result.removedPath,
+        repoRoot,
+        ...result.fallback ? {
+          fallback: result.fallback,
+          forced: result.forced,
+          reason: result.reason,
+          convergence: forceFallbackConvergence
+        } : {}
+      };
+    } catch (e) {
+      const message = String(e?.message || e || "worktree cleanup failed");
+      const dirty = message.includes("dirty worktree") || message.includes("local changes");
+      const submoduleForceBlocked = /working trees containing submodules cannot be moved or removed/i.test(message) && !forceFallbackConvergence.allow;
+      return {
+        success: false,
+        code: dirty ? "mesh_worktree_cleanup_dirty" : submoduleForceBlocked ? "mesh_worktree_cleanup_force_fallback_blocked" : "mesh_worktree_cleanup_failed",
+        error: submoduleForceBlocked ? `${message}; refusing --force fallback because convergence could not be verified: ${forceFallbackConvergence.error || "unknown convergence state"}` : message,
+        recoveryHint: dirty ? "Commit, stash, or intentionally discard the worktree changes before retrying mesh_remove_node. The mesh registry entry is preserved until cleanup is safe." : submoduleForceBlocked ? "Verify the worktree branch is merged/contained in the source default branch (for example origin/main) or mark the node with a safe branchConvergence final state before retrying. The mesh registry entry is preserved." : "Inspect git worktree status/list from the source repo and retry after resolving the reported cleanup failure.",
+        ...submoduleForceBlocked ? { convergence: forceFallbackConvergence } : {}
+      };
+    }
+  }
+  async getWorktreeForceCleanupConvergence(args) {
+    const metadataStatus = typeof args.node?.branchConvergence?.status === "string" ? args.node.branchConvergence.status : "";
+    if (metadataStatus === "merged_to_main" || metadataStatus === "cleanup_candidate") {
+      return { allow: true, status: metadataStatus, source: "node_branch_convergence" };
+    }
+    const { execFile: execFile3 } = await import("child_process");
+    const { promisify: promisify3 } = await import("util");
+    const execFileAsync3 = promisify3(execFile3);
+    const runGit2 = async (gitArgs, cwd) => {
+      const { stdout } = await execFileAsync3("git", gitArgs, {
+        cwd,
+        encoding: "utf8",
+        timeout: 3e4,
+        maxBuffer: 4 * 1024 * 1024,
+        windowsHide: true
+      });
+      return String(stdout || "").trim();
+    };
+    let head = "";
+    try {
+      head = await runGit2(["rev-parse", "HEAD"], args.workspace);
+    } catch (e) {
+      return { allow: false, error: `could not resolve worktree HEAD: ${e?.message || e}` };
+    }
+    if (!head) return { allow: false, error: "worktree HEAD is empty" };
+    const candidateRefs = [];
+    try {
+      const defaultBranch = await runGit2(["branch", "--show-current"], args.repoRoot);
+      if (defaultBranch) {
+        candidateRefs.push(defaultBranch, `origin/${defaultBranch}`);
+      }
+    } catch {
+    }
+    candidateRefs.push("origin/main", "origin/master", "main", "master");
+    const seen = /* @__PURE__ */ new Set();
+    const checkedRefs = [];
+    for (const ref of candidateRefs) {
+      if (!ref || seen.has(ref)) continue;
+      seen.add(ref);
+      let commit = "";
+      try {
+        commit = await runGit2(["rev-parse", "--verify", `${ref}^{commit}`], args.repoRoot);
+      } catch {
+        continue;
+      }
+      checkedRefs.push(ref);
+      try {
+        await runGit2(["merge-base", "--is-ancestor", head, commit], args.repoRoot);
+        return { allow: true, status: "merged_to_default_ref", source: "git_merge_base", ref };
+      } catch {
+      }
+    }
+    return {
+      allow: false,
+      status: metadataStatus || void 0,
+      error: checkedRefs.length ? `worktree HEAD is not contained in checked refs: ${checkedRefs.join(", ")}` : "no default/main refs were available for convergence verification"
+    };
+  }
   isCompletedHostedSession(record) {
     return record?.lifecycle === "stopped" || record?.lifecycle === "failed" || record?.lifecycle === "interrupted";
   }
+  async recordIntentionalMeshSessionStop(args) {
+    try {
+      const { appendLedgerEntry: appendLedgerEntry2 } = await Promise.resolve().then(() => (init_mesh_ledger(), mesh_ledger_exports));
+      appendLedgerEntry2(args.meshId, {
+        kind: "session_stopped",
+        nodeId: args.nodeId,
+        sessionId: args.sessionId,
+        payload: {
+          intentional: true,
+          reason: "operator_cleanup",
+          intentionalStopReason: "operator_cleanup",
+          source: args.source,
+          cleanupMode: args.mode,
+          action: args.action,
+          workspace: typeof args.node?.workspace === "string" ? args.node.workspace : void 0
+        }
+      });
+    } catch (e) {
+      LOG.warn("MeshCleanup", `Failed to record intentional cleanup stop for ${args.sessionId}: ${e?.message || e}`);
+    }
+  }
   async cleanupMeshSessions(args) {
     if (args.mode === "preserve") {
       return { success: true, mode: "preserve", matchedCount: 0, stoppedSessionIds: [], deletedSessionIds: [], skippedSessionIds: [] };
@@ -22764,6 +24166,21 @@ var DaemonCommandRouter = class {
     const deleteUnsupportedSessionIds = [];
     const recordsRemainSessionIds = [];
     const errors = [];
+    const cleanupSource = args.source || "mesh_cleanup_sessions";
+    const markedIntentionalStopSessionIds = /* @__PURE__ */ new Set();
+    const markIntentionalStop = async (sessionId, action) => {
+      if (args.dryRun || markedIntentionalStopSessionIds.has(sessionId)) return;
+      markedIntentionalStopSessionIds.add(sessionId);
+      await this.recordIntentionalMeshSessionStop({
+        meshId: args.meshId,
+        nodeId: args.nodeId,
+        node: args.node,
+        sessionId,
+        mode: args.mode,
+        source: cleanupSource,
+        action
+      });
+    };
     const matchedBySurfaceKind = {
       live_runtime: 0,
       recovery_snapshot: 0,
@@ -22786,7 +24203,10 @@ var DaemonCommandRouter = class {
       try {
         if (args.mode === "stop") {
           if (!completed) {
-            if (!args.dryRun) await this.deps.sessionHostControl.stopSession(sessionId);
+            if (!args.dryRun) {
+              await markIntentionalStop(sessionId, "stop_session");
+              await this.deps.sessionHostControl.stopSession(sessionId);
+            }
             stoppedSessionIds.push(sessionId);
           } else {
             skippedSessionIds.push(sessionId);
@@ -22803,6 +24223,7 @@ var DaemonCommandRouter = class {
           continue;
         }
         if (args.mode === "stop_and_delete") {
+          if (!completed) await markIntentionalStop(sessionId, "delete_session_force");
           if (!args.dryRun) await this.deps.sessionHostControl.deleteSession(sessionId, { force: true });
           deletedSessionIds.push(sessionId);
           continue;
@@ -22814,6 +24235,7 @@ var DaemonCommandRouter = class {
           recordsRemainSessionIds.push(sessionId);
           if (args.mode === "stop_and_delete" && !completed) {
             try {
+              await markIntentionalStop(sessionId, "stop_session");
               await this.deps.sessionHostControl.stopSession(sessionId);
               stoppedSessionIds.push(sessionId);
             } catch (stopError) {
@@ -23568,6 +24990,91 @@ var DaemonCommandRouter = class {
           return { success: false, error: e.message };
         }
       }
+      case "get_mesh_ledger_slice": {
+        const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
+        if (!meshId) return { success: false, error: "meshId required" };
+        try {
+          const { readLedgerSlice: readLedgerSlice2 } = await Promise.resolve().then(() => (init_mesh_ledger(), mesh_ledger_exports));
+          const kind = Array.isArray(args?.kind) ? args.kind.filter((k) => typeof k === "string") : void 0;
+          const slice = readLedgerSlice2(meshId, {
+            afterId: typeof args?.afterId === "string" ? args.afterId : void 0,
+            since: typeof args?.since === "string" ? args.since : void 0,
+            kind,
+            limit: typeof args?.limit === "number" ? args.limit : void 0
+          });
+          return { success: true, slice };
+        } catch (e) {
+          return { success: false, error: e.message };
+        }
+      }
+      case "import_mesh_ledger_slice": {
+        const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
+        if (!meshId) return { success: false, error: "meshId required" };
+        try {
+          const { appendRemoteLedgerEntries: appendRemoteLedgerEntries2, getLedgerSummary: getLedgerSummary2 } = await Promise.resolve().then(() => (init_mesh_ledger(), mesh_ledger_exports));
+          const entries = Array.isArray(args?.entries) ? args.entries : Array.isArray(args?.slice?.entries) ? args.slice.entries : [];
+          const result = appendRemoteLedgerEntries2(meshId, entries);
+          return { success: true, result, summary: getLedgerSummary2(meshId) };
+        } catch (e) {
+          return { success: false, error: e.message };
+        }
+      }
+      case "get_mesh_queue": {
+        const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
+        if (!meshId) return { success: false, error: "meshId required" };
+        try {
+          const { getMeshQueueStats: getMeshQueueStats2, getQueue: getQueue2 } = await Promise.resolve().then(() => (init_mesh_work_queue(), mesh_work_queue_exports));
+          const status = Array.isArray(args?.status) ? args.status.map((s) => typeof s === "string" ? s.trim() : "").filter(Boolean) : void 0;
+          const queue = getQueue2(meshId, { status });
+          const summary = getMeshQueueStats2(meshId);
+          return {
+            success: true,
+            queue,
+            summary,
+            sourceOfTruth: {
+              kind: "mesh_work_queue_file",
+              activeStatuses: ["pending", "assigned"],
+              historicalStatuses: ["completed", "failed", "cancelled"],
+              notes: "pending/assigned are active work; completed/failed/cancelled are historical records."
+            }
+          };
+        } catch (e) {
+          return { success: false, error: e.message };
+        }
+      }
+      case "cancel_mesh_queue_task": {
+        const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
+        const taskId = typeof args?.taskId === "string" ? args.taskId.trim() : "";
+        if (!meshId || !taskId) return { success: false, error: "meshId and taskId required" };
+        try {
+          const { cancelTask: cancelTask2 } = await Promise.resolve().then(() => (init_mesh_work_queue(), mesh_work_queue_exports));
+          const reason = typeof args?.reason === "string" ? args.reason : void 0;
+          const task = cancelTask2(meshId, taskId, { reason });
+          if (!task) return { success: false, error: `Queue task '${taskId}' not found` };
+          return { success: true, task };
+        } catch (e) {
+          return { success: false, error: e.message };
+        }
+      }
+      case "requeue_mesh_queue_task": {
+        const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
+        const taskId = typeof args?.taskId === "string" ? args.taskId.trim() : "";
+        if (!meshId || !taskId) return { success: false, error: "meshId and taskId required" };
+        try {
+          const { requeueTask: requeueTask2 } = await Promise.resolve().then(() => (init_mesh_work_queue(), mesh_work_queue_exports));
+          const task = requeueTask2(meshId, taskId, {
+            reason: typeof args?.reason === "string" ? args.reason : void 0,
+            targetNodeId: typeof args?.targetNodeId === "string" ? args.targetNodeId.trim() : void 0,
+            targetSessionId: typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : void 0,
+            clearTargetNode: args?.clearTargetNode === true,
+            clearTargetSession: args?.clearTargetSession !== false
+          });
+          if (!task) return { success: false, error: `Queue task '${taskId}' not found` };
+          return { success: true, task };
+        } catch (e) {
+          return { success: false, error: e.message };
+        }
+      }
       case "add_mesh_node": {
         const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
         const workspace = typeof args?.workspace === "string" ? args.workspace.trim() : "";
@@ -23629,7 +25136,8 @@ var DaemonCommandRouter = class {
             node,
             mode,
             sessionIds,
-            dryRun: args?.dryRun === true
+            dryRun: args?.dryRun === true,
+            source: "mesh_cleanup_sessions"
           });
           return result;
         } catch (e) {
@@ -23659,10 +25167,61 @@ var DaemonCommandRouter = class {
           if (!branch) return { success: false, error: "Could not determine branch of the worktree node" };
           const { stdout: baseBranchStdout } = await execFileAsync3("git", ["branch", "--show-current"], { cwd: repoRoot, encoding: "utf8" });
           const baseBranch = baseBranchStdout.trim();
+          const validationSummary = await runMeshRefineValidationGate(mesh, node.workspace);
+          if (validationSummary.status === "failed") {
+            return {
+              success: false,
+              code: "validation_failed",
+              convergenceStatus: "blocked_review",
+              error: "Refinery validation gate failed; merge/refine was not attempted.",
+              branch,
+              into: baseBranch,
+              validationSummary,
+              finalBranchConvergenceState: {
+                branch,
+                baseBranch,
+                merged: false,
+                removed: false,
+                validation: "failed",
+                status: "blocked_review"
+              }
+            };
+          }
+          if (validationSummary.status === "skipped") {
+            return {
+              success: false,
+              code: "validation_unavailable",
+              convergenceStatus: "blocked_review",
+              error: "Refinery validation gate is required but no allowlisted validation command was available; merge/refine was not attempted.",
+              branch,
+              into: baseBranch,
+              validationSummary,
+              finalBranchConvergenceState: {
+                branch,
+                baseBranch,
+                merged: false,
+                removed: false,
+                validation: "unavailable",
+                status: "blocked_review"
+              }
+            };
+          }
           try {
             await execFileAsync3("git", ["merge", "--no-ff", branch, "-m", `Auto-merge branch '${branch}' via Refinery`], { cwd: repoRoot, encoding: "utf8" });
           } catch (e) {
-            return { success: false, error: `Merge failed (conflicts?): ${e.message}` };
+            return {
+              success: false,
+              error: `Merge failed (conflicts?): ${e.message}`,
+              validationSummary,
+              finalBranchConvergenceState: {
+                branch,
+                baseBranch,
+                merged: false,
+                removed: false,
+                validation: "passed",
+                status: "not_mergeable"
+              }
+            };
           }
           const removeResult = await this.execute("remove_mesh_node", {
             meshId,
@@ -23675,11 +25234,27 @@ var DaemonCommandRouter = class {
             appendLedgerEntry2(meshId, {
               kind: "node_removed",
               nodeId,
-              payload: { refined: true, mergedBranch: branch, into: baseBranch }
+              payload: { refined: true, mergedBranch: branch, into: baseBranch, validationSummary }
             });
           } catch {
           }
-          return { success: true, merged: true, branch, into: baseBranch, removeResult };
+          return {
+            success: true,
+            merged: true,
+            branch,
+            into: baseBranch,
+            removeResult,
+            validationSummary,
+            finalBranchConvergenceState: {
+              branch: baseBranch,
+              mergedBranch: branch,
+              baseBranch,
+              merged: true,
+              removed: removeResult?.success !== false,
+              validation: "passed",
+              status: removeResult?.success === false ? "merged_cleanup_failed" : "merged"
+            }
+          };
         } catch (e) {
           return { success: false, error: e.message };
         }
@@ -23697,20 +25272,24 @@ var DaemonCommandRouter = class {
           );
           let sessionCleanup;
           if (node && sessionCleanupMode !== "preserve") {
-            sessionCleanup = await this.cleanupMeshSessions({ meshId, nodeId, node, mode: sessionCleanupMode });
+            sessionCleanup = await this.cleanupMeshSessions({ meshId, nodeId, node, mode: sessionCleanupMode, source: "mesh_remove_node" });
             if (sessionCleanup.success === false) return { success: false, removed: false, sessionCleanup };
           }
-          if (node?.isLocalWorktree && node.workspace) {
-            try {
-              const sourceNode = node.clonedFromNodeId ? mesh?.nodes.find((n) => n.id === node.clonedFromNodeId || n.nodeId === node.clonedFromNodeId) : mesh?.nodes.find((n) => !n.isLocalWorktree);
-              const repoRoot = sourceNode?.repoRoot || sourceNode?.workspace;
-              if (repoRoot) {
-                const { removeWorktree: removeWorktree2 } = await Promise.resolve().then(() => (init_git_worktree(), git_worktree_exports));
-                await removeWorktree2(repoRoot, node.workspace);
-              }
-            } catch (e) {
-              LOG.warn("MeshNode", `Worktree cleanup failed for ${nodeId}: ${e.message}`);
+          let worktreeCleanup;
+          if (node?.isLocalWorktree) {
+            const cleanupResult = await this.cleanupLocalWorktreeNode({ mesh, node, nodeId });
+            if (cleanupResult.success === false) {
+              return {
+                success: false,
+                removed: false,
+                code: cleanupResult.code,
+                error: cleanupResult.error,
+                recoveryHint: cleanupResult.recoveryHint,
+                ...sessionCleanup ? { sessionCleanup } : {},
+                worktreeCleanup: cleanupResult
+              };
             }
+            worktreeCleanup = cleanupResult;
           }
           let removed = false;
           if (meshRecord?.inline) {
@@ -23725,12 +25304,21 @@ var DaemonCommandRouter = class {
               appendLedgerEntry2(meshId, {
                 kind: "node_removed",
                 nodeId,
-                payload: { worktree: !!node?.isLocalWorktree, sessionCleanupMode }
+                payload: {
+                  worktree: !!node?.isLocalWorktree,
+                  sessionCleanupMode,
+                  workspace: typeof node?.workspace === "string" ? node.workspace : void 0,
+                  daemonId: typeof node?.daemonId === "string" ? node.daemonId : void 0,
+                  worktreeBranch: typeof node?.worktreeBranch === "string" ? node.worktreeBranch : void 0,
+                  worktreeCleanupFallback: typeof worktreeCleanup?.fallback === "string" ? worktreeCleanup.fallback : void 0,
+                  forced: worktreeCleanup?.forced === true ? true : void 0,
+                  forceFallbackReason: typeof worktreeCleanup?.reason === "string" ? worktreeCleanup.reason : void 0
+                }
               });
             } catch {
             }
           }
-          return { success: true, removed, ...sessionCleanup ? { sessionCleanup } : {} };
+          return { success: true, removed, ...sessionCleanup ? { sessionCleanup } : {}, ...worktreeCleanup ? { worktreeCleanup } : {} };
         } catch (e) {
           return { success: false, error: e.message };
         }
@@ -23765,6 +25353,7 @@ var DaemonCommandRouter = class {
               workspace: result.worktreePath,
               repoRoot: result.worktreePath,
               daemonId: sourceNode.daemonId,
+              machineId: sourceNode.machineId ?? sourceNode.machine_id,
               userOverrides: { ...sourceNode.userOverrides || {} },
               policy: { ...sourceNode.policy || {} },
               isLocalWorktree: true,
@@ -23778,6 +25367,7 @@ var DaemonCommandRouter = class {
               workspace: result.worktreePath,
               repoRoot: result.worktreePath,
               daemonId: sourceNode.daemonId,
+              machineId: sourceNode.machineId ?? sourceNode.machine_id,
               userOverrides: { ...sourceNode.userOverrides || {} },
               isLocalWorktree: true,
               worktreeBranch: result.branch,
@@ -23896,6 +25486,93 @@ var DaemonCommandRouter = class {
               meshCoordinatorSetup: coordinatorSetup
             };
           }
+          if (coordinatorSetup.kind === "cli_command") {
+            let cliCmdSystemPrompt = "";
+            try {
+              cliCmdSystemPrompt = buildCoordinatorSystemPrompt2({ mesh, coordinatorCliType: cliType });
+            } catch (error) {
+              const message = error?.message || String(error);
+              LOG.error("MeshCoordinator", `Failed to build coordinator prompt: ${message}`);
+              return {
+                success: false,
+                code: "mesh_coordinator_prompt_failed",
+                error: `Failed to build Repo Mesh coordinator prompt: ${message}`,
+                meshId,
+                cliType,
+                workspace
+              };
+            }
+            try {
+              const { execFileSync: execCmdSync } = await import("child_process");
+              const cmdParts = coordinatorSetup.command.trim().split(/\s+/);
+              const [regCmd, ...regArgs] = cmdParts;
+              LOG.info("MeshCoordinator", `Running MCP registration: ${coordinatorSetup.command}`);
+              execCmdSync(regCmd, regArgs, { stdio: "pipe", timeout: 15e3 });
+            } catch (error) {
+              LOG.warn("MeshCoordinator", `MCP registration command failed (may be pre-registered): ${error?.message || error}`);
+            }
+            const cliCmdArgs = [];
+            const cliCmdEnv = {};
+            if (cliCmdSystemPrompt) {
+              if (cliType === "codex-cli") {
+                cliCmdArgs.push("-c", `developer_instructions=${JSON.stringify(cliCmdSystemPrompt)}`);
+              } else if (cliType === "gemini-cli") {
+                try {
+                  const { writeFileSync: wfs, existsSync: efs, readFileSync: rfs } = await import("fs");
+                  const geminiMdPath = `${workspace}/GEMINI.md`;
+                  const marker = "<!-- adhdev-mesh-coordinator-prompt -->";
+                  const markerEnd = "<!-- /adhdev-mesh-coordinator-prompt -->";
+                  const block = `${marker}
+${cliCmdSystemPrompt}
+${markerEnd}`;
+                  if (efs(geminiMdPath)) {
+                    const existing = rfs(geminiMdPath, "utf-8");
+                    const replaced = existing.replace(
+                      new RegExp(`${marker}[\\s\\S]*?${markerEnd}`, "g"),
+                      block
+                    );
+                    wfs(geminiMdPath, replaced.includes(marker) ? replaced : `${existing}
+
+${block}`);
+                  } else {
+                    wfs(geminiMdPath, block);
+                  }
+                  LOG.info("MeshCoordinator", `Wrote coordinator prompt to ${workspace}/GEMINI.md`);
+                } catch (e) {
+                  LOG.warn("MeshCoordinator", `Could not write GEMINI.md: ${e?.message || e}`);
+                }
+              }
+            }
+            const cliCmdLaunch = await this.deps.cliManager.handleCliCommand("launch_cli", {
+              cliType,
+              dir: workspace,
+              cliArgs: cliCmdArgs.length > 0 ? cliCmdArgs : void 0,
+              env: Object.keys(cliCmdEnv).length > 0 ? cliCmdEnv : void 0,
+              settings: { meshCoordinatorFor: meshId }
+            });
+            if (!cliCmdLaunch?.success) {
+              return { success: false, error: cliCmdLaunch?.error || "Failed to launch CLI session" };
+            }
+            LOG.info("MeshCoordinator", `Launched ${cliType} coordinator (cli_command) for mesh ${meshId}`);
+            try {
+              const { appendLedgerEntry: appendLedgerEntry2 } = await Promise.resolve().then(() => (init_mesh_ledger(), mesh_ledger_exports));
+              appendLedgerEntry2(meshId, {
+                kind: "coordinator_started",
+                sessionId: cliCmdLaunch.sessionId || cliCmdLaunch.id,
+                providerType: cliType,
+                payload: { workspace }
+              });
+            } catch {
+            }
+            return {
+              success: true,
+              meshId,
+              cliType,
+              workspace,
+              sessionId: cliCmdLaunch.sessionId || cliCmdLaunch.id,
+              mcpRegistered: true
+            };
+          }
           const configFormat = coordinatorSetup.configFormat;
           if (configFormat !== "claude_mcp_json" && configFormat !== "hermes_config_yaml") {
             return {
@@ -23950,9 +25627,11 @@ var DaemonCommandRouter = class {
             args: coordinatorSetup.mcpServer.args
           };
           if (args?.inlineMesh) {
+            const modeArgIndex = coordinatorSetup.mcpServer.args.findIndex((value) => value === "--mode");
+            const mcpTransport = modeArgIndex >= 0 ? coordinatorSetup.mcpServer.args[modeArgIndex + 1] : "ipc";
             mcpServerEntry.env = {
               ADHDEV_INLINE_MESH: JSON.stringify(mesh),
-              ADHDEV_MCP_TRANSPORT: "ipc"
+              ADHDEV_MCP_TRANSPORT: mcpTransport === "local" ? "local" : "ipc"
             };
           }
           try {
@@ -23971,7 +25650,8 @@ var DaemonCommandRouter = class {
           if (hadExistingMcpConfig) {
             try {
               const parsedExistingMcpConfig = parseMeshCoordinatorMcpConfig(readFileSync17(mcpConfigPath, "utf-8"), configFormat);
-              existingMcpConfig = { ...existingMcpConfig, ...parsedExistingMcpConfig };
+              const existingCoordinatorConfig = hermesManualFallback ? stripHermesCoordinatorTempModelProviderOverrides(parsedExistingMcpConfig) : parsedExistingMcpConfig;
+              existingMcpConfig = { ...existingMcpConfig, ...existingCoordinatorConfig };
               copyFileSync4(mcpConfigPath, mcpConfigPath + ".backup");
             } catch (error) {
               LOG.error("MeshCoordinator", `Failed to parse existing MCP config ${mcpConfigPath}: ${error?.message || error}`);
@@ -24052,6 +25732,69 @@ var DaemonCommandRouter = class {
           return { success: false, error: e.message };
         }
       }
+      case "mesh_status": {
+        const meshId = typeof args?.meshId === "string" ? args.meshId.trim() : "";
+        if (!meshId) return { success: false, error: "meshId required" };
+        try {
+          const meshRecord = await this.getMeshForCommand(meshId, args?.inlineMesh);
+          const mesh = meshRecord?.mesh;
+          if (!mesh) return { success: false, error: "Mesh not found" };
+          const { getMeshQueueStats: getMeshQueueStats2, getQueue: getQueue2 } = await Promise.resolve().then(() => (init_mesh_work_queue(), mesh_work_queue_exports));
+          const queue = getQueue2(meshId);
+          const queueSummary = getMeshQueueStats2(meshId);
+          const { readLedgerEntries: readLedgerEntries2, getLedgerSummary: getLedgerSummary2 } = await Promise.resolve().then(() => (init_mesh_ledger(), mesh_ledger_exports));
+          const ledgerEntries = readLedgerEntries2(meshId, { tail: 20 });
+          const ledgerSummary = getLedgerSummary2(meshId);
+          const nodeStatuses = [];
+          for (const node of mesh.nodes || []) {
+            const status = {
+              nodeId: node.id || node.nodeId,
+              workspace: node.workspace,
+              repoRoot: node.repoRoot,
+              isLocalWorktree: node.isLocalWorktree,
+              worktreeBranch: node.worktreeBranch,
+              daemonId: node.daemonId,
+              machineId: node.machineId,
+              health: "unknown"
+            };
+            if (node.workspace && typeof node.workspace === "string") {
+              try {
+                const { execFile: execFile3 } = await import("child_process");
+                const { promisify: promisify3 } = await import("util");
+                const execFileAsync3 = promisify3(execFile3);
+                const branch = await execFileAsync3("git", ["-C", node.workspace, "branch", "--show-current"], {
+                  encoding: "utf8",
+                  timeout: 1e4
+                }).then((r) => r.stdout.trim()).catch(() => "");
+                const porc = await execFileAsync3("git", ["-C", node.workspace, "status", "--porcelain"], {
+                  encoding: "utf8",
+                  timeout: 1e4
+                }).then((r) => r.stdout.trim()).catch(() => "");
+                const dirty = porc.length > 0;
+                status.branch = branch;
+                status.isDirty = dirty;
+                status.uncommittedChanges = porc ? porc.split("\n").filter(Boolean).length : 0;
+                status.health = branch ? dirty ? "dirty" : "online" : "degraded";
+              } catch {
+                status.health = "degraded";
+              }
+            }
+            nodeStatuses.push(status);
+          }
+          return {
+            success: true,
+            meshId: mesh.id,
+            meshName: mesh.name,
+            repoIdentity: mesh.repoIdentity,
+            defaultBranch: mesh.defaultBranch,
+            nodes: nodeStatuses,
+            queue: { tasks: queue, summary: queueSummary },
+            ledger: { entries: ledgerEntries, summary: ledgerSummary }
+          };
+        } catch (e) {
+          return { success: false, error: e.message };
+        }
+      }
       default:
         break;
     }
@@ -31769,6 +33512,9 @@ function launchIDE(ide, workspacePath) {
   }
 }
 
+// src/boot/daemon-lifecycle.ts
+init_cli_detector();
+
 // src/sessions/registry.ts
 var SessionRegistry = class {
   bySessionId = /* @__PURE__ */ new Map();
@@ -31999,7 +33745,8 @@ async function initDaemonComponents(config) {
     cdpManagers,
     sessionRegistry,
     detectedIdes: detectedIdesRef,
-    refreshProviderAvailability
+    refreshProviderAvailability,
+    dispatchMeshCommand: config.dispatchMeshCommand
   };
   setupMeshEventForwarding(components);
   return components;
@@ -32100,10 +33847,12 @@ export {
   IdeProviderInstance,
   InMemoryGitSnapshotStore,
   LOG,
+  MAX_LEDGER_SLICE_LIMIT,
   MIN_GIT_WORKSPACE_POLL_INTERVAL_MS,
   MIN_MACHINE_RUNTIME_SUBSCRIPTION_INTERVAL_MS,
   MIN_SESSION_HOST_DIAGNOSTICS_SUBSCRIPTION_INTERVAL_MS,
   NodePtyTransportFactory,
+  P2pRelayFailureError,
   ProviderCliAdapter,
   ProviderInstanceManager,
   ProviderLoader,
@@ -32114,12 +33863,16 @@ export {
   addNode,
   appendLedgerEntry,
   appendRecentActivity,
+  appendRemoteLedgerEntries,
   buildAssistantChatMessage,
   buildChatMessage,
   buildChatMessageSignature,
   buildChatTailDeliverySignature,
   buildCoordinatorSystemPrompt,
   buildMachineInfo,
+  buildMeshLedgerReconciliationEvidence,
+  buildMeshLedgerReplicaEvidence,
+  buildP2pRelayFailurePayload,
   buildPinnedGlobalInstallCommand,
   buildRuntimeSystemChatMessage,
   buildSessionEntries,
@@ -32130,10 +33883,13 @@ export {
   buildThoughtChatMessage,
   buildToolChatMessage,
   buildUserChatMessage,
+  cancelTask,
   claimNextTask,
   classifyChatMessageVisibility,
   classifyHotChatSessionsForSubscriptionFlush,
+  classifyP2pRelayFailure,
   clearDebugTrace,
+  clearPendingMeshCoordinatorEvents,
   compareGitSnapshots,
   configureDebugTraceStore,
   connectCdpManager,
@@ -32149,6 +33905,7 @@ export {
   detectAllVersions,
   detectCLIs,
   detectIDEs,
+  drainPendingMeshCoordinatorEvents,
   enqueueTask,
   ensureSessionHostReady,
   execNpmCommandSync,
@@ -32173,7 +33930,9 @@ export {
   getLogLevel,
   getMesh,
   getMeshByRepo,
+  getMeshQueueStats,
   getNpmExecOptions,
+  getPendingMeshCoordinatorEvents,
   getQueue,
   getRecentActivity,
   getRecentCommands,
@@ -32199,6 +33958,7 @@ export {
   isInternalChatMessage,
   isManagedStatusWaiting,
   isManagedStatusWorking,
+  isP2pRelayTransportFailure,
   isPathInside,
   isSessionHostLiveRuntime,
   isSessionHostRecoverySnapshot,
@@ -32237,10 +33997,12 @@ export {
   probeCdpPort,
   readChatHistory,
   readLedgerEntries,
+  readLedgerSlice,
   recordDebugTrace,
   registerExtensionProviders,
   removeNode,
   removeWorktree,
+  requeueTask,
   resetConfig,
   resetDebugRuntimeConfig,
   resetState,