@adhdev/daemon-standalone 1.0.39-rc.1 → 1.0.39-rc.10

package/dist/index.js

@@ -31423,9 +31423,9 @@ var require_streamx = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/b4a/index.js
+// ../../node_modules/tar-stream/node_modules/b4a/index.js
 var require_b4a2 = __commonJS({
-  "../daemon-core/node_modules/b4a/index.js"(exports2, module2) {
+  "../../node_modules/tar-stream/node_modules/b4a/index.js"(exports2, module2) {
     "use strict";
     function isBuffer(value) {
       return Buffer.isBuffer(value) || value instanceof Uint8Array;
@@ -31581,9 +31581,9 @@ var require_b4a2 = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-stream/headers.js
+// ../../node_modules/tar-stream/headers.js
 var require_headers = __commonJS({
-  "../daemon-core/node_modules/tar-stream/headers.js"(exports2) {
+  "../../node_modules/tar-stream/headers.js"(exports2) {
     "use strict";
     var b4a = require_b4a2();
     var ZEROS = "0000000000000000000";
@@ -31844,9 +31844,9 @@ var require_headers = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-stream/extract.js
+// ../../node_modules/tar-stream/extract.js
 var require_extract = __commonJS({
-  "../daemon-core/node_modules/tar-stream/extract.js"(exports2, module2) {
+  "../../node_modules/tar-stream/extract.js"(exports2, module2) {
     "use strict";
     var { Writable, Readable, getStreamError } = require_streamx();
     var FIFO = require_fast_fifo();
@@ -32189,9 +32189,9 @@ var require_extract = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-stream/constants.js
+// ../../node_modules/tar-stream/constants.js
 var require_constants = __commonJS({
-  "../daemon-core/node_modules/tar-stream/constants.js"(exports2, module2) {
+  "../../node_modules/tar-stream/constants.js"(exports2, module2) {
     "use strict";
     var constants = {
       // just for envs without fs
@@ -32210,9 +32210,9 @@ var require_constants = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-stream/pack.js
+// ../../node_modules/tar-stream/pack.js
 var require_pack = __commonJS({
-  "../daemon-core/node_modules/tar-stream/pack.js"(exports2, module2) {
+  "../../node_modules/tar-stream/pack.js"(exports2, module2) {
     "use strict";
     var { Readable, Writable, getStreamError } = require_streamx();
     var b4a = require_b4a2();
@@ -32445,9 +32445,9 @@ var require_pack = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-stream/index.js
+// ../../node_modules/tar-stream/index.js
 var require_tar_stream = __commonJS({
-  "../daemon-core/node_modules/tar-stream/index.js"(exports2) {
+  "../../node_modules/tar-stream/index.js"(exports2) {
     "use strict";
     exports2.extract = require_extract();
     exports2.pack = require_pack();
@@ -32690,9 +32690,9 @@ var require_pump = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-fs/index.js
+// ../../node_modules/tar-fs/index.js
 var require_tar_fs = __commonJS({
-  "../daemon-core/node_modules/tar-fs/index.js"(exports2) {
+  "../../node_modules/tar-fs/index.js"(exports2) {
     "use strict";
     var tar = require_tar_stream();
     var pump = require_pump();
@@ -36528,10 +36528,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "a1082159590bba25809d2f8a65c10055b8d3bc97" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "a1082159" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "1.0.39-rc.1" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-08-07T02:52:22.815Z" : void 0);
+      const commit = readInjected(true ? "e83658a6a9fa9fe9529dd88548adac8581276d02" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "e83658a6" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "1.0.39-rc.10" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-08-08T05:15:16.251Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -38643,6 +38643,7 @@ child.on('exit', () => process.exit(0));
     });
     var config_exports = {};
     __export2(config_exports, {
+      clearAuthCredentials: () => clearAuthCredentials,
       generateMachineId: () => generateMachineId,
       getConfigDir: () => getConfigDir2,
       getDaemonDataDir: () => getDaemonDataDir,
@@ -38879,6 +38880,13 @@ child.on('exit', () => process.exit(0));
     function resetConfig() {
       saveConfig({ ...DEFAULT_CONFIG });
     }
+    function clearAuthCredentials() {
+      const config2 = loadConfig2();
+      config2.machineSecret = void 0;
+      config2.userEmail = null;
+      config2.userName = null;
+      saveConfig(config2);
+    }
     var import_path4;
     var import_fs3;
     var import_crypto2;
@@ -40714,7 +40722,7 @@ child.on('exit', () => process.exit(0));
       resolveWorktreePath: () => resolveWorktreePath
     });
     function getDefaultWorktreeBaseDir() {
-      return path11.join(os52.homedir(), ".adhdev", WORKTREE_DIR_NAME);
+      return path11.join(resolveConfigDir(), WORKTREE_DIR_NAME);
     }
     function resolveWorktreeBaseDir(worktreeBaseDir) {
       const override = typeof worktreeBaseDir === "string" ? worktreeBaseDir.trim() : "";
@@ -41004,7 +41012,6 @@ ${error48.message || ""}`;
       }
     }
     var path11;
-    var os52;
     var import_promises3;
     var import_node_fs2;
     var import_node_child_process3;
@@ -41018,11 +41025,11 @@ ${error48.message || ""}`;
       "src/git/git-worktree.ts"() {
         "use strict";
         path11 = __toESM2(require("path"));
-        os52 = __toESM2(require("os"));
         import_promises3 = require("fs/promises");
         import_node_fs2 = require("fs");
         import_node_child_process3 = require("child_process");
         import_node_util2 = require("util");
+        init_config_dir();
         execFileAsync2 = (0, import_node_util2.promisify)(import_node_child_process3.execFile);
         WORKTREE_DIR_NAME = "worktrees";
         GIT_TIMEOUT_MS = 3e4;
@@ -41033,7 +41040,7 @@ ${error48.message || ""}`;
     function expandPath(p) {
       const t = (p || "").trim();
       if (!t) return "";
-      if (t.startsWith("~")) return path13.join(os7.homedir(), t.slice(1).replace(/^\//, ""));
+      if (t.startsWith("~")) return path13.join(os62.homedir(), t.slice(1).replace(/^\//, ""));
       return path13.resolve(t);
     }
     function validateWorkspacePath(absPath) {
@@ -41106,7 +41113,7 @@ ${error48.message || ""}`;
         };
       }
       if (a.useHome === true) {
-        return { ok: true, path: os7.homedir(), source: "home" };
+        return { ok: true, path: os62.homedir(), source: "home" };
       }
       return {
         ok: false,
@@ -41190,7 +41197,7 @@ ${error48.message || ""}`;
       return { config: { ...config2, defaultWorkspaceId: id } };
     }
     var fs7;
-    var os7;
+    var os62;
     var path13;
     var import_crypto22;
     var MAX_WORKSPACES;
@@ -41198,7 +41205,7 @@ ${error48.message || ""}`;
       "src/config/workspaces.ts"() {
         "use strict";
         fs7 = __toESM2(require("fs"));
-        os7 = __toESM2(require("os"));
+        os62 = __toESM2(require("os"));
         path13 = __toESM2(require("path"));
         import_crypto22 = require("crypto");
         MAX_WORKSPACES = 50;
@@ -46795,11 +46802,11 @@ Next step: ${nextStep}`;
       const pinnedProvider = typeof providerType === "string" && providerType.trim() ? providerType.trim() : void 0;
       const providerTags = pinnedProvider ? [pinnedProvider] : readNodeProviderTypes(node?.policy);
       const worktreeBranch = typeof node?.worktreeBranch === "string" && node.worktreeBranch.trim() ? node.worktreeBranch.trim() : null;
-      const os30 = readNodeOverride(node, "platform") ?? readNodeReporter(node, "platform") ?? process.platform;
+      const os29 = readNodeOverride(node, "platform") ?? readNodeReporter(node, "platform") ?? process.platform;
       const arch2 = readNodeOverride(node, "arch") ?? readNodeReporter(node, "arch") ?? process.arch;
       return normalizeMeshCapabilityTags([
         ...Array.isArray(node?.capabilities) ? node.capabilities : [],
-        `os=${os30}`,
+        `os=${os29}`,
         `arch=${arch2}`,
         ...providerTags.map((p) => `provider=${p}`),
         // Worktree nodes automatically expose a "worktree=<branch>" tag so that
@@ -51163,7 +51170,8 @@ Valid status values: \`completed\` | \`failed\` | \`blocked\` | \`partial\`.`;
           "task_approval_needed",
           "task_question_pending",
           "p2p_dispatch_failed",
-          "dispatch_duplicate_rebound"
+          "dispatch_duplicate_rebound",
+          "queue_hold_hard_deadline"
         ]);
         LEDGER_DIR_NAME = "mesh-ledger";
         MAX_FILE_SIZE_BYTES = 10 * 1024 * 1024;
@@ -51646,7 +51654,8 @@ Default branch: \`${mesh.defaultBranch}\`` : ""}`);
         checkpoint_then_continue: "- Auto-checkpoint dirty nodes before sending tasks"
       }[policy.dirtyWorkspaceBehavior] || "";
       if (dirtyBehavior) rules.push(dirtyBehavior);
-      rules.push(`- Maximum **${policy.maxParallelTasks}** tasks running in parallel`);
+      rules.push(`- Maximum **${policy.maxParallelTasks}** concurrent WRITE tasks; **${resolveMaxReadonlyParallelTasks(policy.maxParallelTasks)}** concurrent READ-ONLY tasks (\`live_debug_readonly\`) \u2014 read-only work runs under its own, larger cap`);
+      rules.push("- Write tasks are limited to **one active task per node**, so N parallel write tasks need N nodes (clone worktrees). Read-only tasks are exempt and may stack on a node that is already busy. Both caps are ceilings, not targets");
       if (policy.coordinatorIdlePushPolicy === "auto_silent_on_dispatch") {
         rules.push("- Delegated-worker completions are **auto-silenced**: the routine idle/completion push for a task you dispatch is suppressed once (approval-needed, failure, and long-running alerts still notify the owner normally)");
       }
@@ -51661,14 +51670,14 @@ ${rules.join("\n")}`;
 - **Route, don't implement.** Delegate all code reading, analysis, and execution to node agents. Never read source files or run commands in the coordinator \u2014 keep context lean. See also: **Never use local sub-agents** below.
 - **Never use local sub-agents.** Do NOT spawn your runtime's own sub-agents (e.g. Claude Code's Task/Explore/Agent tools, or any equivalent in-process agent-spawning tool) to read code, investigate, run RCA, or implement. Such sub-agents execute on the coordinator's machine, outside the mesh \u2014 they escape mesh parallelism, the ledger/audit trail, node capability profiles, and worktree isolation, and leave no \`mesh_task_history\` record. ALL code reading, analysis, RCA, and implementation must be delegated to mesh nodes via \`mesh_enqueue_task\` / \`mesh_send_task\` (use \`task_mode: "live_debug_readonly"\` for read-only investigation), or cross-verified via \`mesh_magi_review\` for read-only fan-out. The coordinator's own actions are limited to \`mesh_*\` tool orchestration and synthesizing results.
 - **Front-load task messages.** Include everything the agent needs (files, problem, expected fix) in \`mesh_enqueue_task\` / \`mesh_send_task\`. Append a structured result request at the end: ask the worker to conclude with a JSON block containing \`status\`, \`changedFiles\`, \`gitStatus\`, \`validationResults\`, \`errors\`, \`nextAction\`. The daemon parses this automatically; you can read it from \`mesh_task_history\`.
-- **Reuse idle sessions.** For follow-up, retry, commit/push, or cleanup on the same issue, send only the delta to the existing idle session. Start a fresh session only when: (a) branch/worktree isolation is required, (b) the existing session had a dispatch failure or provider mismatch, (c) the transcript/runtime is contaminated or interrupted, or (d) the user explicitly asks for a different provider/session. Continuation of the same issue in an already-idle session is allowed and preferred \u2014 this rule blocks concurrent unrelated work interleaved into a live (still-generating) session, not sequential same-issue follow-ups.
-- **Worktree affinity.** A worktree is a durable per-branch workspace; keep all of a branch's code_change/fix/review work on its worktree node by targeting \`required_tags: ["worktree=<branch>"]\` or \`target_node_id\`. Get the id/branch from the \`mesh_clone_node\` result or a live \`mesh_status\` \u2014 the Configured Nodes snapshot won't list a worktree cloned after launch. Untargeted same-branch follow-ups drift to the base node. Only \`convergence\` (merge/push) runs on the base, never pinned to the worktree.
+- **Reuse idle sessions.** For follow-up, retry, commit/push, or cleanup on the same issue, send only the delta to the existing idle session. Start a fresh session only when: (a) branch/worktree isolation is required, (b) the existing session had a dispatch failure or provider mismatch, (c) the transcript/runtime is contaminated or interrupted, (d) the user explicitly asks for a different provider/session, or (e) **the delta is a genuinely NEW subject rather than a continuation** \u2014 a new topic appended to an existing session can be dropped or re-run as the previous task, so give it its own task even when a session sits idle. Continuation of the same issue in an already-idle session is allowed and preferred \u2014 this rule blocks concurrent unrelated work interleaved into a live (still-generating) session, not sequential same-issue follow-ups. The test is subject continuity, not timing: carrying an investigation forward into its own fix is the SAME subject and belongs in that session (Workflow 3f), while an unrelated bug is a new subject even if the same session just went idle.
+- **Worktree affinity.** A worktree is a durable per-branch workspace; keep all of a branch's code_change/fix/review work on its worktree node. Target it with \`required_tags: ["worktree=<branch>"]\` or \`target_node_id\`. Get the id/branch from the \`mesh_clone_node\` result or a live \`mesh_status\` \u2014 the Configured Nodes snapshot won't list a worktree cloned after launch. Untargeted same-branch follow-ups drift to the base node. Only \`convergence\` (merge/push) runs on the base, never pinned to the worktree.
 - **Classify task difficulty to save tokens.** For each task you enqueue, judge its execution difficulty and pass \`difficulty\`: \`easy\` (extraction, renames, doc tweaks, trivial fixes), \`medium\` (ordinary feature/bugfix work), \`difficult\` (architecture, tricky debugging, multi-file refactors, subtle reasoning), or \`freeform\`. The mesh's per-difficulty brain preset then runs easy tasks on a cheaper model at low reasoning effort and hard tasks on a stronger model at high effort \u2014 real token savings on simple work. The current presets are shown in the "Brain presets" section below. You may still pass an explicit \`model\`/\`thinkingLevel\` to override the preset for one task.
 - **Retune node profiles when routing is a poor fit \u2014 but only with approval.** A node's capability slots (its provider/model/thinking + difficulty range + capability tags, seen via \`mesh_node_slots_list\`) are what task\u2192node fitness routing matches against. If you notice a persistent mismatch \u2014 e.g. every \`difficult\` task lands on a node whose only slot is a cheap model, or a capability a node clearly has isn't declared \u2014 you MAY propose a slot change with \`mesh_node_slots_set\` (write=false). That returns current-vs-proposed; present that diff to the user with a one-line reason and apply (write=true) ONLY after they approve. It is a WHOLESALE replacement of the node's slots, so include the slots you want to keep. Never rewrite a node's profile silently or without a clear routing reason.
 - **Bootstrap a node's slots from what's actually installed.** When a node has NO slots configured (routing then falls back to "first available provider"), or CLI agents were newly installed on it, call \`mesh_node_slots_propose({ node_id })\` instead of hand-writing a profile. It detects the node's installed CLI agents and drafts a slot list from them \u2014 read-only, it never writes. Present its \`proposedSlots\` with the \`droppedSlots\` / \`destructive\` fields it reports (a wholesale write would delete any existing hand-tuned slot the draft doesn't reproduce, including providers not currently on PATH), then apply with \`mesh_node_slots_set({ slots: proposedSlots, write: true })\` after approval. It flags \`unknownProvider\` / \`provisional\` slots whose placement is a conservative guess rather than an attested one \u2014 call those out rather than presenting them as settled.
 - **Respect explicit provider requests.** Map: Hermes \u2192 \`hermes-cli\`, Claude/Claude Code \u2192 \`claude-cli\`, Codex \u2192 \`codex-cli\`, Gemini \u2192 \`gemini-cli\`, Antigravity \u2192 \`antigravity-cli\`. Never substitute the coordinator's own runtime.
 - **Verify via git, not source.** Use \`mesh_git_status\` to confirm side effects. Treat agent summaries as self-reports, not verification.
-- **Limit parallelism.** Start with 1\u20132 tasks; scale only on success. Never duplicate a session because \`mesh_read_chat\` shows no final message while tool/terminal activity is ongoing. This caps *concurrent* load \u2014 it does not mean serialize independent work: when a new, independent request arrives and there is headroom under \`maxParallelTasks\`, dispatch it right away rather than waiting for an in-flight task or a user nudge (read-only diagnosis especially, since it has no merge cost).
+- **Match concurrency to task kind.** Read-only investigation (\`live_debug_readonly\`) carries no isolation or merge cost and is exempt from the one-write-per-node limit: dispatch every independent read-only task at once, up to the read-only cap shown in Policy \u2014 they need neither a free node nor a worktree. Write tasks (\`code_change\`) are limited to ONE active task per node, so N parallel write tasks need N nodes; clone worktrees rather than queueing them onto one node. Ramp up cautiously only when tasks share a base branch or a submodule pointer, where landing order actually matters. Never launch a second session onto work already in flight for the same issue, and never duplicate a session because \`mesh_read_chat\` shows no final message while tool/terminal activity is ongoing. All of this is about *unrelated* work running side by side; it does not mean splitting one line of work across sessions \u2014 successive stages of the same investigation belong in the session that already has the context (see Workflow 3f).
 - **Check history first.** Call \`mesh_task_history\` at session start to avoid duplicate work and inform recovery. On failure, read task history before retrying.
 - **Don't reopen already-done work after a resume.** Before reopening a reported issue after context compaction or session resume, check current git state and recent session context. If another session has already completed the work, continue from the existing diff/commit instead of starting a duplicate investigation.
 - **Sequence shared-base-moving merges.** Parallel dispatch is encouraged, but merging one worktree can advance another in-flight worktree's base \u2014 especially a shared submodule pointer \u2014 turning a clean fast-forward into a diverged rebase (patch-equivalence correctly blocks this). Before merging an in-flight worktree while siblings are also in flight, land in an intentional order, re-clone long-running worktrees from the advanced base, or expect to manually rebase + ff-only the laggards; merging an independent fix mid-flight can strand siblings into a rebase.
@@ -51677,6 +51686,7 @@ ${rules.join("\n")}`;
 - **Submodule reachability = publish-needed.** \`submodule_reachability_failed\` \u2192 classify as \`blocked_review\`, request user approval to push to submodule main, then rerun \`mesh_refine_node\`.
 - **Honor per-node instructions.** When a node carries a \u{1F4CC} Node instruction in the nodes section, include the relevant parts of that instruction in the task message you send to that node. Don't paraphrase the instruction into your own words \u2014 quote it verbatim so the worker agent sees exactly what the user wrote.
 - **Mission status does not update itself.** When a mission's tasks are all done or the work is abandoned, explicitly call \`mesh_mission_upsert\` to set status \`completed\` or \`abandoned\`. Never leave a finished mission in \`active\`. All-cancelled tasks with no further work \u2192 \`abandoned\`.
+- **Promote durable lessons to operating notes \u2014 especially at mission close.** Before calling \`mesh_mission_upsert\` with status \`completed\`/\`abandoned\`, ask whether this mission taught something a future coordinator needs (a provider quirk, a pattern to avoid, a recovery lesson); if so, call \`mesh_record_note\` FIRST \u2014 a mission's goal/history is invisible to the next coordinator once it completes, so an unrecorded lesson is lost at exactly the moment it was learned. Record only when all three hold: (a) a coordinator on another day or another session would act differently knowing it, (b) it cannot be rediscovered from code, config, or \`git log\`, and (c) it is not a one-off detail specific to this single mission. Note that operating notes reach the COORDINATOR prompt only \u2014 they are never injected into delegated worker sessions, so a convention workers must follow belongs in a CI gate or the repo's agent instructions file, not in a note.
 - **Don't spawn a nested coordinator for simple inspection.** Do not spawn a nested coordinator-like agent for simple inspection tasks. If delegation is required, use explicit provider selection and a fully self-contained, bounded task instruction.
 - **Keep internal traffic out of the transcript.** Internal tool calls, status events, control messages, and debug output must not appear as ordinary user-visible chat transcript content unless explicitly marked user-facing by the producing agent.
 - **Never fabricate tool results.** Always call the actual tool.
@@ -51778,11 +51788,12 @@ 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. **For multi-task work, create a mission first**: call \`mesh_mission_upsert\` with a title and goal, then attach every enqueued task with \`mission_id\`. Express "B after A" ordering with \`depends_on\` on the queue task instead of waiting and polling \u2014 the system claims dependents automatically when their dependencies complete. When the mission's outcome is decided, update its status (\`completed\`/\`abandoned\`) via \`mesh_mission_upsert\`. If the prompt already shows an **Active Mission**, continue it from its current task state \u2014 do not re-enqueue tasks that already exist.
 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**: 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.
-   b1. **Keep a branch's work on its worktree (worktree affinity).** A worktree node is a durable per-branch workspace, not a one-task throwaway \u2014 implement, review, and fix for the same branch all belong on the SAME worktree, and it lives until its work is converged (merged/pushed) and it is cleaned up. So once you clone a worktree for a branch, route every subsequent \`code_change\`/\`validation\`/fix task for that branch back to that same node: pass \`required_tags: ["worktree=<branch>"]\` or \`target_node_id: <that worktree node's id>\`. **Where to get the node id / tag:** the \`mesh_clone_node\` result returns the new node's \`id\` and \`worktreeBranch\` directly \u2014 use them immediately. The Configured Nodes list in this prompt is a launch-time snapshot and will NOT list a worktree you cloned after this session started, so do not rely on it for freshly-cloned worktrees; take the id/branch from the \`mesh_clone_node\` result, or call \`mesh_status\` to re-list the live nodes (each worktree there advertises its \`worktree=<branch>\` tag). Do NOT leave same-branch follow-ups untargeted \u2014 an untargeted task is claimed by whichever node polls first (usually the base machine node), which strands the work off the branch's worktree. The ONE exception is a \`convergence\` task (merge/push): that is base-only and must NOT be pinned to the worktree.
+   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. **A node is not limited to one live session for read-only work** \u2014 \`readonly\`/\`live_debug_readonly\` tasks are exempt from the one-active-per-node invariant, so the SAME node can auto-launch multiple concurrent read-only sessions with no worktree needed. Cloning a worktree costs roughly 10 seconds, so it is cheap enough to create one whenever write work needs a free node; use it for branch isolation, for parallel write tasks (one active write per node), or when a node's read-only queue is deep enough that a second node would clearly finish faster \u2014 call \`mesh_clone_node\` to create the worktree node first.
+   b1. **Keep a branch's work on its worktree (worktree affinity).** This is about routing a branch's follow-ups back to its OWN worktree \u2014 it is never a reason to avoid creating a NEW worktree for independent work. A worktree node is a durable per-branch workspace, not a one-task throwaway \u2014 implement, review, and fix for the same branch all belong on the SAME worktree, and it lives until its work is converged (merged/pushed) and it is cleaned up. So once you clone a worktree for a branch, route every subsequent \`code_change\`/\`validation\`/fix task for that branch back to that same node: pass \`required_tags: ["worktree=<branch>"]\` or \`target_node_id: <that worktree node's id>\`. **Where to get the node id / tag:** the \`mesh_clone_node\` result returns the new node's \`id\` and \`worktreeBranch\` directly \u2014 use them immediately. The Configured Nodes list in this prompt is a launch-time snapshot and will NOT list a worktree you cloned after this session started, so do not rely on it for freshly-cloned worktrees; take the id/branch from the \`mesh_clone_node\` result, or call \`mesh_status\` to re-list the live nodes (each worktree there advertises its \`worktree=<branch>\` tag). Do NOT leave same-branch follow-ups untargeted \u2014 an untargeted task is claimed by whichever node polls first (usually the base machine node), which strands the work off the branch's worktree. The ONE exception is a \`convergence\` task (merge/push): that is base-only and must NOT be pinned to the worktree.
    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. 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.
+   f. **Let the investigator apply the fix when the findings settle it \u2014 otherwise split deliberately.** An investigator that has read the source and named the file:line and the fix already holds context a fresh worker must rebuild from scratch, and you would have to restate its findings in the new task message to get there. Task mode is **per task, not per session**: the read-only guardrail is evaluated on each dispatch from that task's own \`readonly\`/\`task_mode\`, so you hand off by sending a follow-up \`mesh_send_task\` to the SAME session WITHOUT the read-only flag (use \`task_mode: "code_change"\`). You do not need a new session or a fresh worktree for the mode to change. **Hand off in-session when** the findings match your hypothesis, the fix stays inside the files just investigated, and no user decision is pending. **Split to a separate task when** the investigation needs a user decision (it surfaced design options, or a cost/risk tradeoff), when it OVERTURNED your hypothesis so the direction itself needs rethinking, or when the fix touches files another in-flight worker owns. **Never convert an investigation whose own conclusion was "do not change this"** \u2014 a correct no-op finding is a completed task, and pushing it into a fix produces an unverified change nobody asked for. Dispatching the investigation as an ordinary report-first task skips the handoff, but drops the guardrail against premature fixes \u2014 keep \`live_debug_readonly\` whenever the point is to find out whether anything is wrong at all.
 4. **Monitor** \u2014 Prefer event-driven completion/status notifications. Do **not** poll \`mesh_read_chat\` repeatedly. Do **not** repeatedly call \`mesh_status\` or \`mesh_view_queue\` just to wait for assigned/generating work. After dispatching a direct or queued task, send one progress update with the task/session handle, then stop. Wait for \`pendingCoordinatorEvents\` or another completion/approval/status signal, an explicit user status request, or a real timeout/stall signal before reading status/chat/queue again. Use at most one compact \`mesh_read_chat\` check after a terminal signal. Handle approvals via \`mesh_approve\`. **Proactively parallelize new work.** When the user reports a new bug or asks for new work, start it immediately if it is independent of in-flight tasks and there is headroom under \`maxParallelTasks\` \u2014 do not wait for a current task to finish or for the user to prompt you to parallelize. Read-only diagnosis (\`live_debug_readonly\`) has no isolation or merge cost, so dispatch it in parallel right away. The no-polling / concurrency-limit rules constrain *re-checking or duplicating already-dispatched work*; they are **not** a reason to defer starting a new, independent task.
 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.
@@ -53181,14 +53192,14 @@ When the user asks to **set up / configure / onboard** this repo for Repo Mesh (
     }
     function resolveHermesCoordinatorHome(meshId, workspace) {
       const key2 = `${meshId || "mesh"}
-${(0, import_node_path3.resolve)(workspace || os8.tmpdir())}`;
+${(0, import_node_path3.resolve)(workspace || os7.tmpdir())}`;
       const hash2 = shortHash(key2);
-      return (0, import_node_path3.join)(os8.tmpdir(), `adhdev-hermes-mesh-coordinator-${hash2}`);
+      return (0, import_node_path3.join)(os7.tmpdir(), `adhdev-hermes-mesh-coordinator-${hash2}`);
     }
     function resolveMcpConfigPath(configPath, workspace) {
       const trimmed = configPath.trim();
-      if (trimmed === "~") return os8.homedir();
-      if (trimmed.startsWith("~/")) return (0, import_node_path3.join)(os8.homedir(), trimmed.slice(2));
+      if (trimmed === "~") return os7.homedir();
+      if (trimmed.startsWith("~/")) return (0, import_node_path3.join)(os7.homedir(), trimmed.slice(2));
       if ((0, import_node_path3.isAbsolute)(trimmed)) return trimmed;
       return (0, import_node_path3.join)(workspace, trimmed);
     }
@@ -53394,7 +53405,7 @@ ${rendered}`, "utf-8");
       });
     }
     var import_node_fs3;
-    var os8;
+    var os7;
     var import_session_host_core32;
     var import_node_path3;
     var DEFAULT_SERVER_NAME;
@@ -53405,7 +53416,7 @@ ${rendered}`, "utf-8");
       "src/commands/mesh-coordinator.ts"() {
         "use strict";
         import_node_fs3 = require("fs");
-        os8 = __toESM2(require("os"));
+        os7 = __toESM2(require("os"));
         import_session_host_core32 = require_dist();
         import_node_path3 = require("path");
         init_logger();
@@ -61201,7 +61212,7 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
             continue;
           }
           if (!isLaunchableNode(node)) {
-            markSkip(nodeId, "node_not_launch_ready");
+            markSkip(nodeId, "node_health_not_launchable");
             continue;
           }
           if (!isMeshNodeFreshEnoughToLaunch(node, freshnessGate)) {
@@ -62240,7 +62251,7 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
       }
     });
     async function updateDarwinMemoryCache() {
-      if (os9.platform() !== "darwin") return;
+      if (os8.platform() !== "darwin") return;
       try {
         const { stdout } = await execAsync2("vm_stat", {
           encoding: "utf-8",
@@ -62264,26 +62275,26 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
         const fileBacked = counts["file_backed"] ?? 0;
         const availPages = free + inactive + speculative + purgeable + fileBacked;
         const bytes = availPages * pageSize;
-        cachedDarwinAvail = Number.isFinite(bytes) && bytes >= 0 ? Math.min(bytes, os9.totalmem()) : null;
+        cachedDarwinAvail = Number.isFinite(bytes) && bytes >= 0 ? Math.min(bytes, os8.totalmem()) : null;
       } catch {
       }
     }
     function getHostMemorySnapshot() {
-      if (os9.platform() === "darwin" && !darwinMemoryInterval) {
+      if (os8.platform() === "darwin" && !darwinMemoryInterval) {
         updateDarwinMemoryCache();
         darwinMemoryInterval = setInterval(updateDarwinMemoryCache, 3e3);
         darwinMemoryInterval.unref();
       }
-      const totalMem = os9.totalmem();
-      const freeMem = os9.freemem();
-      const availableMem = os9.platform() === "darwin" ? cachedDarwinAvail ?? freeMem : freeMem;
+      const totalMem = os8.totalmem();
+      const freeMem = os8.freemem();
+      const availableMem = os8.platform() === "darwin" ? cachedDarwinAvail ?? freeMem : freeMem;
       return {
         totalMem,
         freeMem,
         availableMem
       };
     }
-    var os9;
+    var os8;
     var import_child_process4;
     var import_util3;
     var execAsync2;
@@ -62292,7 +62303,7 @@ The mesh has no work in flight. For each mission, decide its outcome: continue i
     var init_host_memory = __esm2({
       "src/system/host-memory.ts"() {
         "use strict";
-        os9 = __toESM2(require("os"));
+        os8 = __toESM2(require("os"));
         import_child_process4 = require("child_process");
         import_util3 = require("util");
         execAsync2 = (0, import_util3.promisify)(import_child_process4.exec);
@@ -63431,8 +63442,8 @@ ${cleanBody}`;
     }
     function buildMachineInfo2(profile = "full") {
       const base = {
-        hostname: os10.hostname(),
-        platform: os10.platform()
+        hostname: os9.hostname(),
+        platform: os9.platform()
       };
       if (profile === "live") {
         return base;
@@ -63441,23 +63452,23 @@ ${cleanBody}`;
         const memSnap2 = getHostMemorySnapshot();
         return {
           ...base,
-          arch: os10.arch(),
-          cpus: os10.cpus().length,
+          arch: os9.arch(),
+          cpus: os9.cpus().length,
           totalMem: memSnap2.totalMem,
-          release: os10.release()
+          release: os9.release()
         };
       }
       const memSnap = getHostMemorySnapshot();
       return {
         ...base,
-        arch: os10.arch(),
-        cpus: os10.cpus().length,
+        arch: os9.arch(),
+        cpus: os9.cpus().length,
         totalMem: memSnap.totalMem,
         freeMem: memSnap.freeMem,
         availableMem: memSnap.availableMem,
-        loadavg: os10.loadavg(),
-        uptime: os10.uptime(),
-        release: os10.release()
+        loadavg: os9.loadavg(),
+        uptime: os9.uptime(),
+        release: os9.release()
       };
     }
     function parseMessageTime(value) {
@@ -63694,13 +63705,13 @@ ${cleanBody}`;
         }
       };
     }
-    var os10;
+    var os9;
     var READ_DEBUG_ENABLED;
     var recentReadDebugSignatureBySession;
     var init_snapshot2 = __esm2({
       "src/status/snapshot.ts"() {
         "use strict";
-        os10 = __toESM2(require("os"));
+        os9 = __toESM2(require("os"));
         init_config();
         init_state_store();
         init_recent_activity();
@@ -67344,6 +67355,40 @@ ${cleanBody}`;
         return false;
       }
     }
+    function queueHoldHardDeadlineExceeded(meshId, row, gate, dispatchedAtMs, nowMs, detail) {
+      const heldMs = nowMs - dispatchedAtMs;
+      if (!Number.isFinite(heldMs) || heldMs < QUEUE_HOLD_HARD_DEADLINE_MS) return false;
+      const auditKey = `${meshId}::${row.id}::${gate}`;
+      if (queueHoldHardDeadlineAudited.has(auditKey)) return true;
+      queueHoldHardDeadlineAudited.add(auditKey);
+      const heldMin = Math.round(heldMs / 6e4);
+      LOG2.warn("MeshReconcile", `Queue-hold HARD DEADLINE exceeded for task ${row.id} on mesh ${meshId}: gate '${gate}'${detail ? ` (${detail})` : ""} held the row 'assigned' for ${heldMin}min (> ${Math.round(QUEUE_HOLD_HARD_DEADLINE_MS / 6e4)}min ceiling) on node=${row.assignedNodeId ?? "?"} session=${row.assignedSessionId ?? "?"} \u2014 the hold signal is presumed stale (a lost queue-status write), forcing the bounded reclaim so the node can claim again`);
+      try {
+        appendLedgerEntry(meshId, {
+          kind: "queue_hold_hard_deadline",
+          nodeId: row.assignedNodeId,
+          sessionId: row.assignedSessionId,
+          providerType: row.assignedProviderType,
+          payload: {
+            taskId: row.id,
+            reason: "queue_hold_hard_deadline",
+            gate,
+            heldMs,
+            ceilingMs: QUEUE_HOLD_HARD_DEADLINE_MS,
+            ...detail ? { detail } : {}
+          }
+        });
+      } catch {
+      }
+      traceMeshEventStage("queue_hold_hard_deadline", {
+        taskId: row.id,
+        sessionId: row.assignedSessionId,
+        nodeId: row.assignedNodeId,
+        meshId,
+        event: "agent:generating_completed"
+      }, `${gate} held ${heldMin}min > ceiling \u2014 forcing reclaim`);
+      return true;
+    }
     function resolveAssignedTranscriptProfile(components, row) {
       const stamped = row.assignedTranscriptProfile;
       if (stamped && typeof stamped === "object" && typeof stamped.emitsPtyTurnEvents === "boolean") {
@@ -67533,6 +67578,11 @@ ${cleanBody}`;
       for (const key2 of [...assignedIdleFinalAssistantSince.keys()]) {
         if (key2.startsWith(meshKeyPrefix) && !assignedKeys.has(key2)) assignedIdleFinalAssistantSince.delete(key2);
       }
+      for (const key2 of [...queueHoldHardDeadlineAudited]) {
+        if (!key2.startsWith(meshKeyPrefix)) continue;
+        const taskKey = key2.slice(0, key2.lastIndexOf("::"));
+        if (!assignedKeys.has(taskKey)) queueHoldHardDeadlineAudited.delete(key2);
+      }
       for (const row of assigned) {
         restampReboundMeshWorkerAssignment(components, store, meshId, row);
         const dispatchedAtMs = Date.parse(row.dispatchTimestamp ?? "");
@@ -67681,7 +67731,7 @@ ${cleanBody}`;
             }
             if (verdict === "IDLE_CONFIRMED") {
               deliveredUnconsumedUnknownStreak.delete(shortStreakKey);
-            } else if (assignedRowLiveStatusIsAwaitingApproval(mesh, row.assignedNodeId, evidenceSessionId)) {
+            } else if (assignedRowLiveStatusIsAwaitingApproval(mesh, row.assignedNodeId, evidenceSessionId) && !queueHoldHardDeadlineExceeded(meshId, row, "live_awaiting_approval", dispatchedAtMs, nowMs, "short_redrive")) {
               traceMeshEventDrop("short_redrive_deferred_awaiting_approval", {
                 taskId: row.id,
                 sessionId: row.assignedSessionId,
@@ -67713,7 +67763,15 @@ ${cleanBody}`;
               // the bounded UNKNOWN grace just exhausted above
               nowMs
             });
-            if (suspensionGate.kind === "recovered" || suspensionGate.kind === "blocked") {
+            const suspensionHoldExpired = suspensionGate.kind === "blocked" && queueHoldHardDeadlineExceeded(
+              meshId,
+              row,
+              "held_suspension",
+              dispatchedAtMs,
+              nowMs,
+              `short_redrive; stages ${suspensionGate.stages.join("/")}`
+            );
+            if (!suspensionHoldExpired && (suspensionGate.kind === "recovered" || suspensionGate.kind === "blocked")) {
               deliveredUnconsumedUnknownStreak.delete(shortStreakKey);
               traceMeshEventDrop(suspensionGate.kind === "recovered" ? "suspension_consumed_recovered" : "redrive_blocked_by_suspension", {
                 taskId: row.id,
@@ -67819,7 +67877,7 @@ ${cleanBody}`;
           if (verdict === "IDLE_CONFIRMED") {
             deliveredNoTurnUnknownStreak.delete(streakKey);
             reclaimReason = "delivered_no_turn_deadline";
-          } else if (assignedRowLiveStatusIsAwaitingApproval(mesh, row.assignedNodeId, evidenceSessionId)) {
+          } else if (assignedRowLiveStatusIsAwaitingApproval(mesh, row.assignedNodeId, evidenceSessionId) && !queueHoldHardDeadlineExceeded(meshId, row, "live_awaiting_approval", dispatchedAtMs, nowMs, "delivered_no_turn")) {
             traceMeshEventDrop("reclaim_deferred_awaiting_approval", {
               taskId: row.id,
               sessionId: row.assignedSessionId,
@@ -67852,7 +67910,15 @@ ${cleanBody}`;
             // the bounded UNKNOWN grace just exhausted above
             nowMs
           });
-          if (suspensionGate.kind === "recovered" || suspensionGate.kind === "blocked") {
+          const suspensionHoldExpired = suspensionGate.kind === "blocked" && queueHoldHardDeadlineExceeded(
+            meshId,
+            row,
+            "held_suspension",
+            dispatchedAtMs,
+            nowMs,
+            `delivered_no_turn; stages ${suspensionGate.stages.join("/")}`
+          );
+          if (!suspensionHoldExpired && (suspensionGate.kind === "recovered" || suspensionGate.kind === "blocked")) {
             deliveredNoTurnUnknownStreak.delete(streakKey);
             traceMeshEventDrop(suspensionGate.kind === "recovered" ? "suspension_consumed_recovered" : "redrive_blocked_by_suspension", {
               taskId: row.id,
@@ -67923,7 +67989,14 @@ ${cleanBody}`;
             }
           })();
           const attemptStage = readNonEmptyString(currentAttempt?.stage);
-          if (currentAttempt && !currentAttempt.terminalOutcome && (attemptStage === "generating" || attemptStage === "waiting_approval" || attemptStage === "waiting_choice" || attemptStage === "finalizing")) {
+          if (currentAttempt && !currentAttempt.terminalOutcome && (attemptStage === "generating" || attemptStage === "waiting_approval" || attemptStage === "waiting_choice" || attemptStage === "finalizing") && !queueHoldHardDeadlineExceeded(
+            meshId,
+            row,
+            "active_attempt_stage",
+            dispatchedAtMs,
+            nowMs,
+            `attempt ${currentAttempt.attemptId} stage ${attemptStage}`
+          )) {
             deliveredNoTurnUnknownStreak.delete(streakKey);
             noteRedriveBlocked("active_attempt_stage");
             traceMeshEventDrop("redrive_blocked_active_attempt", {
@@ -68589,6 +68662,8 @@ ${cleanBody}`;
     var NATIVE_SOURCE_ACTIVITY_STALE_MS;
     var ASSIGNED_DELIVERED_UNCONSUMED_REDRIVE_MS;
     var RECLAIM_UNKNOWN_GRACE_TICKS;
+    var QUEUE_HOLD_HARD_DEADLINE_MS;
+    var queueHoldHardDeadlineAudited;
     var deliveredNoTurnUnknownStreak;
     var deliveredUnconsumedUnknownStreak;
     var ASSIGNED_IDLE_TRANSCRIPT_COMPLETE_MS;
@@ -68642,6 +68717,8 @@ ${cleanBody}`;
         NATIVE_SOURCE_ACTIVITY_STALE_MS = 10 * 6e4;
         ASSIGNED_DELIVERED_UNCONSUMED_REDRIVE_MS = 25e3;
         RECLAIM_UNKNOWN_GRACE_TICKS = 3;
+        QUEUE_HOLD_HARD_DEADLINE_MS = 90 * 6e4;
+        queueHoldHardDeadlineAudited = /* @__PURE__ */ new Set();
         deliveredNoTurnUnknownStreak = /* @__PURE__ */ new Map();
         deliveredUnconsumedUnknownStreak = /* @__PURE__ */ new Map();
         ASSIGNED_IDLE_TRANSCRIPT_COMPLETE_MS = 8e3;
@@ -70331,14 +70408,14 @@ ${cleanBody}`;
       }
       return cachedPty;
     }
-    var os13;
+    var os12;
     var cachedPty;
     var NodePtyRuntimeTransport;
     var NodePtyTransportFactory;
     var init_pty_transport = __esm2({
       "src/cli-adapters/pty-transport.ts"() {
         "use strict";
-        os13 = __toESM2(require("os"));
+        os12 = __toESM2(require("os"));
         init_spawn_env();
         init_resolve_executable();
         NodePtyRuntimeTransport = class {
@@ -70378,9 +70455,9 @@ ${cleanBody}`;
               try {
                 const fs54 = require("fs");
                 const stat2 = fs54.statSync(cwd);
-                if (!stat2.isDirectory()) cwd = os13.homedir();
+                if (!stat2.isDirectory()) cwd = os12.homedir();
               } catch {
-                cwd = os13.homedir();
+                cwd = os12.homedir();
               }
             }
             const handle = pty.spawn(resolveWin32Executable(command), args, {
@@ -72843,7 +72920,7 @@ ${cont}` : cont;
     function resolveCliSpawnPlanFromParts(options) {
       const { command, baseArgs, shell, baseEnv, workingDir, extraArgs, extraEnv, geometry, diagnosticCliType, diagnosticProviderVersion } = options;
       const binaryPath = findBinary(command);
-      const isWin = os14.platform() === "win32";
+      const isWin = os13.platform() === "win32";
       const allArgs = [...baseArgs ?? [], ...extraArgs ?? []].map(
         (arg) => typeof arg === "string" ? arg.replace(/\{\{workingDir\}\}/g, workingDir) : arg
       );
@@ -72931,13 +73008,13 @@ ${cont}` : cont;
       }
       return "";
     }
-    var os14;
+    var os13;
     var path27;
     var import_session_host_core7;
     var init_provider_cli_runtime = __esm2({
       "src/cli-adapters/provider-cli-runtime.ts"() {
         "use strict";
-        os14 = __toESM2(require("os"));
+        os13 = __toESM2(require("os"));
         path27 = __toESM2(require("path"));
         init_logger();
         import_session_host_core7 = require_dist();
@@ -73081,7 +73158,7 @@ ${cont}` : cont;
     }
     function expandTemplateRootForEnumeration(template, input) {
       if (!template) return "";
-      const posixHome = () => toPosixPath(os15.homedir());
+      const posixHome = () => toPosixPath(os14.homedir());
       let out = template;
       if (out === "~") out = posixHome();
       else if (out.startsWith("~/")) out = `${posixHome()}/${out.slice(2)}`;
@@ -73639,13 +73716,13 @@ ${cont}` : cont;
       if (!template) return null;
       let out = template;
       if (out.startsWith("~/") || out === "~") {
-        out = path28.join(os15.homedir(), out.slice(2));
+        out = path28.join(os14.homedir(), out.slice(2));
       }
       out = out.replace(/\$\{([A-Z_][A-Z0-9_]*)(?::-(.*?))?\}/g, (_m, name, fallback) => {
         const v = input.envOverrides?.[name] ?? process.env[name];
         return v != null && v !== "" ? v : fallback ?? "";
       });
-      if (out.startsWith("~/")) out = path28.join(os15.homedir(), out.slice(2));
+      if (out.startsWith("~/")) out = path28.join(os14.homedir(), out.slice(2));
       const now = /* @__PURE__ */ new Date();
       const workspaceRaw = input.workspace ?? "";
       let workspaceResolved = workspaceRaw;
@@ -73688,7 +73765,7 @@ ${cont}` : cont;
     function scanProjectsRootForSessionFile(template, input, requestedSessionId) {
       if (!requestedSessionId) return null;
       let head = template;
-      if (head.startsWith("~/") || head === "~") head = path28.join(os15.homedir(), head.slice(2));
+      if (head.startsWith("~/") || head === "~") head = path28.join(os14.homedir(), head.slice(2));
       const base = staticTemplateBase(head);
       if (!base) return null;
       let baseStat = null;
@@ -73837,13 +73914,13 @@ ${cont}` : cont;
       if (!template) return null;
       let out = template;
       if (out.startsWith("~/") || out === "~") {
-        out = path28.join(os15.homedir(), out.slice(2));
+        out = path28.join(os14.homedir(), out.slice(2));
       }
       out = out.replace(/\$\{([A-Z_][A-Z0-9_]*)(?::-(.*?))?\}/g, (_m, name, fallback) => {
         const v = input.envOverrides?.[name] ?? process.env[name];
         return v != null && v !== "" ? v : fallback ?? "";
       });
-      if (out.startsWith("~/")) out = path28.join(os15.homedir(), out.slice(2));
+      if (out.startsWith("~/")) out = path28.join(os14.homedir(), out.slice(2));
       const workspaceRaw = input.workspace ?? "";
       let workspaceResolved = workspaceRaw;
       if (workspaceRaw) {
@@ -74302,7 +74379,7 @@ ${cont}` : cont;
       return t.negate ? !result : result;
     }
     var fs222;
-    var os15;
+    var os14;
     var path28;
     var UUID_RE;
     var DEFAULT_TOOL_CALL_TYPES;
@@ -74311,7 +74388,7 @@ ${cont}` : cont;
       "src/providers/spec/native-history-executor.ts"() {
         "use strict";
         fs222 = __toESM2(require("fs"));
-        os15 = __toESM2(require("os"));
+        os14 = __toESM2(require("os"));
         path28 = __toESM2(require("path"));
         init_logger();
         init_load_better_sqlite3();
@@ -74607,7 +74684,7 @@ ${cont}` : cont;
       missingBackgroundSourceWarned.add(cliType);
       LOG2.warn("CLI", `[${cliType}] background-task tracking declared but nativeHistory.source missing after provider resolve; background detection inactive`);
     }
-    var os16;
+    var os15;
     var import_crypto11;
     var import_session_host_core8;
     var missingBackgroundSourceWarned;
@@ -74616,7 +74693,7 @@ ${cont}` : cont;
     var init_provider_cli_adapter = __esm2({
       "src/cli-adapters/provider-cli-adapter.ts"() {
         "use strict";
-        os16 = __toESM2(require("os"));
+        os15 = __toESM2(require("os"));
         import_crypto11 = require("crypto");
         init_logger();
         init_debug_config();
@@ -74643,7 +74720,7 @@ ${cont}` : cont;
             this.transportFactory = transportFactory;
             this.cliType = provider.type;
             this.cliName = provider.name;
-            this.workingDir = workingDir.startsWith("~") ? workingDir.replace(/^~/, os16.homedir()) : workingDir;
+            this.workingDir = workingDir.startsWith("~") ? workingDir.replace(/^~/, os15.homedir()) : workingDir;
             const resolvedConfig = resolveCliAdapterConfig(provider);
             this.timeouts = resolvedConfig.timeouts;
             this.approvalKeys = resolvedConfig.approvalKeys;
@@ -77255,6 +77332,7 @@ ${lastSnapshot}`;
       classifyShadowDivergence: () => classifyShadowDivergence,
       classifyStaleDirectForPrune: () => classifyStaleDirectForPrune,
       cleanupTerminalDirectDispatches: () => cleanupTerminalDirectDispatches,
+      clearAuthCredentials: () => clearAuthCredentials,
       clearDebugTrace: () => clearDebugTrace,
       clearPendingMeshCoordinatorEvents: () => clearPendingMeshCoordinatorEvents,
       collectPendingApprovals: () => collectPendingApprovals,
@@ -77537,6 +77615,7 @@ ${lastSnapshot}`;
       resolveMuted: () => resolveMuted,
       resolveNodeSchedulingPriority: () => resolveNodeSchedulingPriority,
       resolveNotBefore: () => resolveNotBefore,
+      resolveNpmPublishedVersion: () => resolveNpmPublishedVersion,
       resolveProviderChannel: () => resolveProviderChannel,
       resolveProviderMaxParallel: () => resolveProviderMaxParallel,
       resolveScopedMeshId: () => resolveScopedMeshId,
@@ -78878,7 +78957,7 @@ ${lastSnapshot}`;
     };
     init_git_worktree();
     init_config();
-    var os62 = __toESM2(require("os"));
+    var os52 = __toESM2(require("os"));
     var path12 = __toESM2(require("path"));
     var import_session_host_core22 = require_dist();
     init_config_dir();
@@ -78922,7 +79001,7 @@ ${lastSnapshot}`;
     var cached22 = null;
     function resolveInstanceContext(options = {}) {
       const env2 = options.env ?? process.env;
-      const homeDir = options.homeDir ?? os62.homedir();
+      const homeDir = options.homeDir ?? os52.homedir();
       const envDir = typeof env2.ADHDEV_CONFIG_DIR === "string" ? env2.ADHDEV_CONFIG_DIR.trim() : "";
       const explicitDir = typeof options.configDir === "string" ? options.configDir.trim() : "";
       if (explicitDir && envDir && (0, import_session_host_core22.canonicalizeInstancePath)(explicitDir) !== (0, import_session_host_core22.canonicalizeInstancePath)(envDir)) {
@@ -78943,7 +79022,7 @@ ${lastSnapshot}`;
     }
     function getProcessInstanceContext(options = {}) {
       const envDir = typeof process.env.ADHDEV_CONFIG_DIR === "string" ? process.env.ADHDEV_CONFIG_DIR.trim() : "";
-      const key2 = `${envDir}|${os62.homedir()}|${options.standalone ? "standalone" : "daemon"}`;
+      const key2 = `${envDir}|${os52.homedir()}|${options.standalone ? "standalone" : "daemon"}`;
       if (!cached22 || cached22.key !== key2) {
         cached22 = { key: key2, context: resolveInstanceContext({ standalone: options.standalone }) };
       }
@@ -80235,17 +80314,17 @@ ${lastSnapshot}`;
       return null;
     }
     async function detectIDEs(providerLoader) {
-      const os30 = (0, import_os3.platform)();
+      const os29 = (0, import_os3.platform)();
       const results = [];
       for (const def of getMergedDefinitions()) {
         const cliPath = findCliCommand(providerLoader?.getIdeCliCommand(def.id, def.cli) || def.cli);
-        const appPath = checkPathExists(providerLoader?.getIdePathCandidates(def.id, def.paths[os30] || []) || []);
+        const appPath = checkPathExists(providerLoader?.getIdePathCandidates(def.id, def.paths[os29] || []) || []);
         let resolvedCli = cliPath;
-        if (!resolvedCli && appPath && os30 === "darwin") {
+        if (!resolvedCli && appPath && os29 === "darwin") {
           const bundledCli = `${appPath}/Contents/Resources/app/bin/${def.cli}`;
           if ((0, import_fs18.existsSync)(bundledCli)) resolvedCli = bundledCli;
         }
-        if (!resolvedCli && appPath && os30 === "win32") {
+        if (!resolvedCli && appPath && os29 === "win32") {
           const { dirname: dirname22 } = await import("path");
           const appDir = dirname22(appPath);
           const candidates = [
@@ -80262,7 +80341,7 @@ ${lastSnapshot}`;
             }
           }
         }
-        const installed = os30 === "darwin" ? !!(resolvedCli || appPath) : !!resolvedCli;
+        const installed = os29 === "darwin" ? !!(resolvedCli || appPath) : !!resolvedCli;
         const version2 = null;
         results.push({
           id: def.id,
@@ -86970,7 +87049,7 @@ ${effect.notification.body || ""}`.trim();
     }
     var fs15 = __toESM2(require("fs"));
     var path232 = __toESM2(require("path"));
-    var os11 = __toESM2(require("os"));
+    var os10 = __toESM2(require("os"));
     var KEY_TO_VK = {
       Backspace: 8,
       Tab: 9,
@@ -87224,7 +87303,7 @@ ${effect.notification.body || ""}`.trim();
     function resolveSafePath(requestedPath) {
       const rawPath = typeof requestedPath === "string" ? requestedPath.trim() : "";
       const inputPath = rawPath || ".";
-      const home = os11.homedir();
+      const home = os10.homedir();
       if (inputPath.startsWith("~")) {
         return path232.resolve(path232.join(home, inputPath.slice(1)));
       }
@@ -89838,12 +89917,13 @@ ${formatManifestValidationIssues2(validation.issues)}`,
     var import_child_process8 = require("child_process");
     var import_child_process9 = require("child_process");
     var fs20 = __toESM2(require("fs"));
-    var os12 = __toESM2(require("os"));
+    var os11 = __toESM2(require("os"));
     var path26 = __toESM2(require("path"));
     var import_child_process7 = require("child_process");
     var fs19 = __toESM2(require("fs"));
     var http2 = __toESM2(require("http"));
     var path25 = __toESM2(require("path"));
+    init_track_identity();
     var import_child_process6 = require("child_process");
     init_logger();
     function errorText(error48) {
@@ -90040,7 +90120,9 @@ ${formatManifestValidationIssues2(validation.issues)}`,
     }
     var POINTER_NAME = ".adhdev-current";
     var STABLE_FILES = [POINTER_NAME, "adhdev.cmd", "adhdev.ps1", "adhdev"];
-    var DEFAULT_HEALTH_PORT = 19222;
+    function resolveDefaultHealthPort(env2 = process.env) {
+      return getTrackIdentity(resolveBuildTrack(env2)).defaultPort;
+    }
     var DEFAULT_HEALTH_TIMEOUT_MS = 12e4;
     function fetchLocalJson(port, pathname) {
       return new Promise((resolve29) => {
@@ -90379,6 +90461,11 @@ exec "${portableNode}" "${cliEntry}" "$@"
         publishStableShimsAndPointer(layout, versionName);
         hooks.log(`Atomically activated ${versionName}`);
         restarted = hooks.restart(portableNode, stagedCliEntry);
+        if (restarted === null) {
+          hooks.log(`Activated ${targetVersion} without restarting a daemon (none was running)`);
+          await hooks.cleanup(layout, stagedPrefix);
+          return { stagedPrefix, stagedCliEntry, daemonPid: null };
+        }
         const daemonPid = restarted.pid;
         if (!daemonPid || !await hooks.waitForHealth(daemonPid, targetVersion)) {
           throw new Error("replacement daemon did not pass the health/version gate");
@@ -90410,7 +90497,7 @@ exec "${portableNode}" "${cliEntry}" "$@"
       }
     }
     function createDefaultWindowsAtomicHooks(options) {
-      const healthPort = options.healthPort ?? DEFAULT_HEALTH_PORT;
+      const healthPort = options.healthPort ?? resolveDefaultHealthPort(options.env);
       const healthTimeoutMs = options.healthTimeoutMs ?? DEFAULT_HEALTH_TIMEOUT_MS;
       return {
         install: (stagedPrefix, portableNode) => {
@@ -90442,7 +90529,10 @@ exec "${portableNode}" "${cliEntry}" "$@"
         },
         restart: (portableNode, stagedCliEntry) => {
           const restartArgv = options.restartArgv.map((arg, index) => index === 0 ? stagedCliEntry : arg);
-          if (restartArgv.length === 0) throw new Error("replacement daemon restart arguments are missing");
+          if (restartArgv.length === 0) {
+            options.log("No restart arguments provided (daemon was not running); leaving the activated version in place without starting a daemon");
+            return null;
+          }
           const child = (0, import_child_process7.spawn)(portableNode, restartArgv, {
             detached: true,
             stdio: "ignore",
@@ -90543,6 +90633,7 @@ exec "${portableNode}" "${cliEntry}" "$@"
     }
     var import_session_host_core6 = require_dist();
     init_config();
+    init_track_identity();
     var UPGRADE_HELPER_ENV = "ADHDEV_DAEMON_UPGRADE_HELPER";
     function resolveInstanceDir(configDir = getConfigDir2()) {
       const base = path26.basename(configDir).trim();
@@ -90649,7 +90740,7 @@ exec "${portableNode}" "${cliEntry}" "$@"
       const packageRoot = findCurrentPackageRoot(options.currentCliPath || process.argv[1], options.packageName);
       const npmInvocation = resolveSiblingNpmInvocation(options.nodeExecutable || process.execPath, options.platform);
       const platform10 = options.platform || process.platform;
-      const homeDir = options.homeDir || os12.homedir();
+      const homeDir = options.homeDir || os11.homedir();
       const instanceDir = options.instanceDir || resolveInstanceDir();
       let installPrefix = packageRoot ? resolveInstallPrefixFromPackageRoot(packageRoot, options.packageName) : null;
       if (platform10 === "win32" && isPortableNode22Prefix(installPrefix, homeDir, instanceDir)) {
@@ -90707,6 +90798,27 @@ exec "${portableNode}" "${cliEntry}" "$@"
         }
       );
     }
+    function resolveNpmPublishedVersion(packageName, tagOrVersion, surface, options = {}) {
+      const args = ["view", `${packageName}@${tagOrVersion}`, "version"];
+      const execOptions = {
+        encoding: "utf-8",
+        ..."timeout" in options ? options.timeout === void 0 ? {} : { timeout: options.timeout } : { timeout: 1e4 },
+        ...options.stdio ? { stdio: options.stdio } : {}
+      };
+      if (options.execFileSync) {
+        const runnerOptions = surface?.execOptions || getNpmExecOptions();
+        return String(options.execFileSync(
+          surface?.npmExecutable || "npm",
+          [...surface?.npmArgsPrefix || [], ...args],
+          {
+            ...execOptions,
+            ...runnerOptions,
+            ...process.platform === "win32" ? { windowsHide: true } : {}
+          }
+        )).trim();
+      }
+      return String(execNpmCommandSync(args, execOptions, surface)).trim();
+    }
     function isManagedSessionHostPid(pid) {
       const commandLine = getProcessCommandLine(pid);
       return !!commandLine && /session-host-daemon/i.test(commandLine);
@@ -90807,24 +90919,75 @@ exec "${portableNode}" "${cliEntry}" "$@"
     function buildManualRecoveryCommand(installCommand) {
       return [installCommand.command, ...installCommand.args].map((part) => /\s/.test(part) ? `"${part}"` : part).join(" ");
     }
-    function emitUpgradeFailureNotice(lines, configDir = getConfigDir2()) {
+    var UPGRADE_FAILURE_TARGET_MARKER = "adhdev-upgrade-target:";
+    function emitUpgradeFailureNotice(lines, configDir = getConfigDir2(), options = {}) {
       const body = lines.join("\n");
       appendUpgradeLog(`Upgrade blocked \u2014 user action required:
 ${body}`, configDir);
+      const target = typeof options.targetVersion === "string" ? options.targetVersion.trim() : "";
+      const marker = target ? `${UPGRADE_FAILURE_TARGET_MARKER} ${target}
+` : "";
       try {
-        fs20.writeFileSync(getUpgradeFailureNoticePath(configDir), `[${(/* @__PURE__ */ new Date()).toISOString()}]
+        fs20.writeFileSync(
+          getUpgradeFailureNoticePath(configDir),
+          `[${(/* @__PURE__ */ new Date()).toISOString()}]
 ${body}
-`, "utf8");
+${marker}`,
+          "utf8"
+        );
       } catch {
       }
     }
+    function clearUpgradeFailureNotice(configDir = getConfigDir2()) {
+      const noticePath = getUpgradeFailureNoticePath(configDir);
+      try {
+        fs20.unlinkSync(noticePath);
+      } catch (error48) {
+        if (error48?.code === "ENOENT") return;
+        appendUpgradeLog(
+          `Failed to clear stale upgrade-failure notice (${error48?.code || "error"}): ${noticePath} \u2014 ${error48?.message || String(error48)}. Investigate a file lock or permissions: until it is removed, every daemon boot will keep warning about this ALREADY-RESOLVED failure.`,
+          configDir
+        );
+      }
+    }
+    function formatUpgradeNoticeAge(ageMs2) {
+      if (ageMs2 < 0) return "in the future (clock skew?)";
+      const minutes = Math.floor(ageMs2 / 6e4);
+      if (minutes < 1) return "just now";
+      if (minutes < 60) return `${minutes}m ago`;
+      const hours = Math.floor(minutes / 60);
+      if (hours < 24) return `${hours}h ago`;
+      return `${Math.floor(hours / 24)}d ago`;
+    }
+    function parseUpgradeNoticeTimestamp(notice) {
+      const match = /^\[([^\]\n]+)\]/.exec(notice);
+      if (!match) return null;
+      const parsed = Date.parse(match[1]);
+      return Number.isFinite(parsed) ? new Date(parsed).toISOString() : null;
+    }
+    function parseUpgradeNoticeTargetVersion(notice) {
+      const pattern = new RegExp(`^${UPGRADE_FAILURE_TARGET_MARKER}\\s*(.+)$`, "m");
+      const match = pattern.exec(notice);
+      const value = match?.[1]?.trim();
+      return value ? value : null;
+    }
     function readUpgradeFailureNotice(configDir = getConfigDir2()) {
       try {
         const noticePath = getUpgradeFailureNoticePath(configDir);
         if (!fs20.existsSync(noticePath)) return null;
         const notice = fs20.readFileSync(noticePath, "utf8").trim();
         if (!notice) return null;
-        return { noticePath, logPath: getUpgradeLogPath(configDir), notice };
+        const recordedAt = parseUpgradeNoticeTimestamp(notice);
+        const ageMs2 = recordedAt ? Date.now() - Date.parse(recordedAt) : null;
+        return {
+          noticePath,
+          logPath: getUpgradeLogPath(configDir),
+          notice,
+          recordedAt,
+          ageMs: ageMs2,
+          ageLabel: ageMs2 === null ? null : formatUpgradeNoticeAge(ageMs2),
+          targetVersion: parseUpgradeNoticeTargetVersion(notice)
+        };
       } catch {
         return null;
       }
@@ -90930,20 +91093,17 @@ ${body}
       if (payload.skipInstall) {
         appendUpgradeLog("Restart-only mode \u2014 package install skipped, re-spawning daemon");
         spawnDetachedDaemonRestart(restartArgv, payload.cwd);
-        try {
-          fs20.unlinkSync(getUpgradeFailureNoticePath());
-        } catch {
-        }
+        clearUpgradeFailureNotice();
         return;
       }
       const instanceDir = resolveInstanceDir();
       const windowsInstallerLayout = resolveWindowsInstallerLayout({
-        homeDir: os12.homedir(),
+        homeDir: os11.homedir(),
         installPrefix: installCommand.surface.installPrefix,
         instanceDir
       });
       if (windowsInstallerLayout) {
-        const portableNode = findPortableNode22(os12.homedir(), process.execPath, instanceDir);
+        const portableNode = findPortableNode22(os11.homedir(), process.execPath, instanceDir);
         if (!portableNode) {
           throw new Error("installer-managed Windows update requires the portable Node.js 22 runtime");
         }
@@ -90965,8 +91125,9 @@ ${body}
             `Cannot upgrade: owned processes still running under current prefix: ${preStop.survivors.map((s2) => s2.pid).join(", ")}`
           );
         }
+        let atomicResult;
         try {
-          await performWindowsAtomicUpgrade({
+          atomicResult = await performWindowsAtomicUpgrade({
             layout: windowsInstallerLayout,
             packageName: payload.packageName,
             targetVersion: payload.targetVersion,
@@ -90987,14 +91148,17 @@ ${body}
             `adhdev ${payload.packageName}@${payload.targetVersion} upgrade failed and was rolled back: ${error48?.message || String(error48)}`,
             `Previous version preserved (active prefix: ${windowsInstallerLayout.activePrefix}).`,
             "See daemon-upgrade.log for the full install/health trace. The next daemon start will retry."
-          ]);
+          ], getConfigDir2(), { targetVersion: payload.targetVersion });
           throw error48;
         }
-        try {
-          fs20.unlinkSync(getUpgradeFailureNoticePath());
-        } catch {
+        clearUpgradeFailureNotice();
+        if (atomicResult.daemonPid === null) {
+          appendUpgradeLog(
+            `Installer-managed Windows atomic upgrade completed (no daemon was running, so none was started \u2014 run \`${IDENTITY.binaryName} daemon\` to start it)`
+          );
+        } else {
+          appendUpgradeLog("Installer-managed Windows atomic upgrade completed");
         }
-        appendUpgradeLog("Installer-managed Windows atomic upgrade completed");
         return;
       }
       await stopForeignNativeAddonHolders(installCommand.surface.packageRoot, { parentPid: payload.parentPid });
@@ -91041,7 +91205,7 @@ ${body}
               notice.push("To recover, reinstall manually:");
             }
             notice.push(`  ${buildManualRecoveryCommand(installCommand)}`);
-            emitUpgradeFailureNotice(notice);
+            emitUpgradeFailureNotice(notice, getConfigDir2(), { targetVersion: payload.targetVersion });
           }
           throw error48;
         }
@@ -91060,7 +91224,7 @@ ${body}
             "so the running daemon was left on its previous version and was NOT restarted.",
             "To recover, reinstall (this forces the shipped prebuild instead of a source rebuild):",
             `  ${buildManualRecoveryCommand(installCommand)}`
-          ]);
+          ], getConfigDir2(), { targetVersion: payload.targetVersion });
           throw error48;
         }
       }
@@ -91070,10 +91234,7 @@ ${body}
         appendUpgradeLog("Post-install staging cleanup complete");
       }
       spawnDetachedDaemonRestart(restartArgv, payload.cwd);
-      try {
-        fs20.unlinkSync(getUpgradeFailureNoticePath());
-      } catch {
-      }
+      clearUpgradeFailureNotice();
     }
     function spawnDetachedDaemonRestart(restartArgv, cwd) {
       if (restartArgv.length > 0) {
@@ -91435,7 +91596,7 @@ ${body}
             LOG2.info("Upgrade", "Ignoring deprecated channel hint \u2014 upgrade target is the build track");
           }
           const npmTag = IDENTITY.npmTag;
-          const latest = String(execNpmCommandSync(["view", `${pkgName}@${npmTag}`, "version"], { encoding: "utf-8", timeout: 1e4 }, npmSurface)).trim();
+          const latest = resolveNpmPublishedVersion(pkgName, npmTag, npmSurface);
           LOG2.info("Upgrade", `Latest ${pkgName}@${npmTag}: v${latest}`);
           let currentInstalled = null;
           try {
@@ -92073,7 +92234,7 @@ ${body}
       })
     );
     init_dist();
-    var os21 = __toESM2(require("os"));
+    var os20 = __toESM2(require("os"));
     var path35 = __toESM2(require("path"));
     var crypto6 = __toESM2(require("crypto"));
     var import_fs19 = require("fs");
@@ -92167,7 +92328,7 @@ ${body}
       }
     }
     init_summary_metadata();
-    var os20 = __toESM2(require("os"));
+    var os19 = __toESM2(require("os"));
     var crypto5 = __toESM2(require("crypto"));
     var fs29 = __toESM2(require("fs"));
     init_contracts2();
@@ -92305,7 +92466,7 @@ ${body}
     var path31 = __toESM2(require("path"));
     init_provider_cli_adapter();
     var fs25 = __toESM2(require("fs"));
-    var os18 = __toESM2(require("os"));
+    var os17 = __toESM2(require("os"));
     var path30 = __toESM2(require("path"));
     init_terminal_screen();
     var import_session_host_core9 = require_dist();
@@ -92484,12 +92645,12 @@ ${body}
     init_fsm_types();
     init_fsm_loader();
     var fs24 = __toESM2(require("fs"));
-    var os17 = __toESM2(require("os"));
+    var os16 = __toESM2(require("os"));
     var path29 = __toESM2(require("path"));
     init_logger();
     function expandHome2(p) {
-      if (p === "~") return os17.homedir();
-      if (p.startsWith("~/")) return path29.join(os17.homedir(), p.slice(2));
+      if (p === "~") return os16.homedir();
+      if (p.startsWith("~/")) return path29.join(os16.homedir(), p.slice(2));
       return p;
     }
     function realWorkspacePath(workingDir) {
@@ -93299,7 +93460,7 @@ ${body}
       }
       fireDelegate(d) {
         const ev = this.currentEval;
-        const task = d.task_template.replace(/\{node\}/g, os18.hostname()).replace(/\{state\.label\}/g, ev?.state.label ?? "").replace(/\{state\.title\}/g, ev?.state.title ?? "").replace(/\{duration_ms\}/g, String(d.after_duration_ms ?? 0));
+        const task = d.task_template.replace(/\{node\}/g, os17.hostname()).replace(/\{state\.label\}/g, ev?.state.label ?? "").replace(/\{state\.title\}/g, ev?.state.title ?? "").replace(/\{duration_ms\}/g, String(d.after_duration_ms ?? 0));
         this.emit({ kind: "delegate", id: d.id, task });
       }
       // ────────────────────────────────────────────────────────────────────
@@ -93597,7 +93758,7 @@ ${body}
         const ctl = (this.spec.control_bar ?? []).find((c) => c.action.type === "attach_image");
         if (!ctl || ctl.action.type !== "attach_image") return;
         const ext = guessExt(mime);
-        const tmp = path30.join(os18.tmpdir(), `adhdev-attach-${Date.now()}${ext}`);
+        const tmp = path30.join(os17.tmpdir(), `adhdev-attach-${Date.now()}${ext}`);
         try {
           fs25.writeFileSync(tmp, Buffer.from(blob, "base64"));
         } catch {
@@ -94898,7 +95059,7 @@ ${body}
     init_transcript_claim_registry();
     init_chat_message_normalization();
     init_working_dir();
-    var os19 = __toESM2(require("os"));
+    var os18 = __toESM2(require("os"));
     var path322 = __toESM2(require("path"));
     var crypto4 = __toESM2(require("crypto"));
     var fs28 = __toESM2(require("fs"));
@@ -94969,7 +95130,7 @@ ${body}
       const promptParts = [];
       const imageRefs = [];
       const resourceRefs = [];
-      const materializeDir = options.materializeDir || path322.join(os19.tmpdir(), "adhdev-input-media");
+      const materializeDir = options.materializeDir || path322.join(os18.tmpdir(), "adhdev-input-media");
       input.parts.forEach((part, index) => {
         if (part.type === "text" && part.text.trim()) {
           promptParts.push(part.text.trim());
@@ -95708,7 +95869,7 @@ ${body}
        * Replaces the previously duplicated probeOpenCode/Codex/Goose functions.
        */
       probeSessionIdFromConfig(probe) {
-        const resolvedDbPath = probe.dbPath.replace(/^~/, os20.homedir());
+        const resolvedDbPath = probe.dbPath.replace(/^~/, os19.homedir());
         const now = Date.now();
         if (this.cachedSqliteDbMissingUntil > now) return null;
         if (!fs29.existsSync(resolvedDbPath)) {
@@ -100503,7 +100664,7 @@ ${rawInput}` : rawInput;
     }
     function expandExecutable(command) {
       const trimmed = command.trim();
-      return trimmed.startsWith("~") ? path35.join(os21.homedir(), trimmed.slice(1)) : trimmed;
+      return trimmed.startsWith("~") ? path35.join(os20.homedir(), trimmed.slice(1)) : trimmed;
     }
     function commandExists(command) {
       const trimmed = command.trim();
@@ -100653,9 +100814,9 @@ ${rawInput}` : rawInput;
       return false;
     }
     function ensureEmptyDelegatedMcpConfig(workspace) {
-      const baseDir = path35.join(os21.tmpdir(), "adhdev-delegated-agent-empty-mcp");
+      const baseDir = path35.join(os20.tmpdir(), "adhdev-delegated-agent-empty-mcp");
       (0, import_fs19.mkdirSync)(baseDir, { recursive: true });
-      const workspaceHash = shortHash(path35.resolve(workspace || os21.tmpdir()));
+      const workspaceHash = shortHash(path35.resolve(workspace || os20.tmpdir()));
       const filePath = path35.join(baseDir, `${workspaceHash}.json`);
       (0, import_fs19.writeFileSync)(filePath, JSON.stringify({ mcpServers: {} }, null, 2), "utf-8");
       return filePath;
@@ -101050,7 +101211,7 @@ ${rawInput}` : rawInput;
       async startSession(cliType, workingDir, cliArgs, initialModel, options) {
         const trimmed = (workingDir || "").trim();
         if (!trimmed) throw new Error("working directory required");
-        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os21.homedir()) : path35.resolve(trimmed);
+        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os20.homedir()) : path35.resolve(trimmed);
         const normalizedType = this.providerLoader.resolveAlias(cliType);
         const rawProvider = this.providerLoader.getByAlias(cliType);
         const provider = rawProvider ? this.providerLoader.resolve(normalizedType) || rawProvider : void 0;
@@ -102077,11 +102238,11 @@ Run 'adhdev doctor' for detailed diagnostics.`
     };
     var import_child_process12 = require("child_process");
     var net3 = __toESM2(require("net"));
-    var os26 = __toESM2(require("os"));
+    var os25 = __toESM2(require("os"));
     var path46 = __toESM2(require("path"));
     var fs39 = __toESM2(require("fs"));
     var path45 = __toESM2(require("path"));
-    var os25 = __toESM2(require("os"));
+    var os24 = __toESM2(require("os"));
     var chokidar = __toESM2(require_chokidar());
     init_hash();
     init_logger();
@@ -102556,7 +102717,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
     init_config();
     init_native_history_executor();
     var fs35 = __toESM2(require("fs"));
-    var os24 = __toESM2(require("os"));
+    var os23 = __toESM2(require("os"));
     var path40 = __toESM2(require("path"));
     var fs31 = __toESM2(require("fs"));
     var path36 = __toESM2(require("path"));
@@ -103062,7 +103223,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
     }
     var fs33 = __toESM2(require("fs"));
     var path38 = __toESM2(require("path"));
-    var os222 = __toESM2(require("os"));
+    var os21 = __toESM2(require("os"));
     init_load_better_sqlite3();
     init_logger();
     function extractTimestampValue3(value) {
@@ -103086,7 +103247,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value);
     }
     function antigravityRoot() {
-      return path38.join(os222.homedir(), ".gemini", "antigravity-cli");
+      return path38.join(os21.homedir(), ".gemini", "antigravity-cli");
     }
     function historyJsonlPath() {
       return path38.join(antigravityRoot(), "history.jsonl");
@@ -103673,11 +103834,11 @@ Run 'adhdev doctor' for detailed diagnostics.`
     }
     var fs34 = __toESM2(require("fs"));
     var path39 = __toESM2(require("path"));
-    var os23 = __toESM2(require("os"));
+    var os222 = __toESM2(require("os"));
     init_load_better_sqlite3();
     init_usage_normalize();
-    var HERMES_STATE_DB = path39.join(os23.homedir(), ".hermes", "state.db");
-    var HERMES_LEGACY_SESSIONS_DIR = path39.join(os23.homedir(), ".hermes", "sessions");
+    var HERMES_STATE_DB = path39.join(os222.homedir(), ".hermes", "state.db");
+    var HERMES_LEGACY_SESSIONS_DIR = path39.join(os222.homedir(), ".hermes", "sessions");
     function statMtimeMs4(p) {
       try {
         return Math.floor(fs34.statSync(p).mtimeMs);
@@ -103962,7 +104123,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       }
     }
     function resolveClaudePath(workspace, sessionId) {
-      const dir = path40.join(os24.homedir(), ".claude", "projects", cwdAsDashes(workspace));
+      const dir = path40.join(os23.homedir(), ".claude", "projects", cwdAsDashes(workspace));
       if (!fs35.existsSync(dir)) return null;
       if (sessionId) {
         const candidate = path40.join(dir, `${sessionId}.jsonl`);
@@ -104084,7 +104245,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
     }
     var AGY_SPAWN_CLAIM_GRACE_MS = 2e3;
     function resolveAntigravityPath(workspace, sessionId, sessionStartedAtMs, instanceId) {
-      const agyRoot = path40.join(os24.homedir(), ".gemini", "antigravity-cli");
+      const agyRoot = path40.join(os23.homedir(), ".gemini", "antigravity-cli");
       const owner = antigravityOwnerToken(workspace, sessionStartedAtMs, instanceId);
       if (sessionId && isUuidLikeSessionId2(sessionId)) {
         const dbPath = path40.join(agyRoot, "conversations", `${sessionId}.db`);
@@ -104168,9 +104329,9 @@ Run 'adhdev doctor' for detailed diagnostics.`
     function resolveHermesPath(workspace, sessionId) {
       void workspace;
       void sessionId;
-      const dbPath = path40.join(os24.homedir(), ".hermes", "state.db");
+      const dbPath = path40.join(os23.homedir(), ".hermes", "state.db");
       if (fs35.existsSync(dbPath)) return dbPath;
-      const dir = path40.join(os24.homedir(), ".hermes", "sessions");
+      const dir = path40.join(os23.homedir(), ".hermes", "sessions");
       if (!fs35.existsSync(dir)) return null;
       return newestRecentFile2(dir, /^session_.*\.json$/);
     }
@@ -104196,7 +104357,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       return cwd.replace(/\//g, "-");
     }
     function codexSessionsRoot() {
-      return path40.join(os24.homedir(), ".codex", "sessions");
+      return path40.join(os23.homedir(), ".codex", "sessions");
     }
     function isUuidLikeSessionId2(sessionId) {
       return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(sessionId);
@@ -106602,8 +106763,8 @@ Run 'adhdev doctor' for detailed diagnostics.`
             return { updated: false };
           }
           this.log("Downloading latest providers from GitHub...");
-          const tmpTar = path45.join(os25.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
-          const tmpExtract = path45.join(os25.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
+          const tmpTar = path45.join(os24.tmpdir(), `adhdev-providers-${Date.now()}.tar.gz`);
+          const tmpExtract = path45.join(os24.tmpdir(), `adhdev-providers-extract-${Date.now()}`);
           await this.downloadFile(tarballTarget.url, tmpTar);
           fs39.mkdirSync(tmpExtract, { recursive: true });
           await extractTarballGz(tmpTar, tmpExtract);
@@ -107358,7 +107519,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       });
     }
     async function killIdeProcess(ideId) {
-      const plat = os26.platform();
+      const plat = os25.platform();
       const appName = getMacAppIdentifiers()[ideId];
       const winProcesses = getWinProcessNames()[ideId];
       try {
@@ -107419,7 +107580,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       }
     }
     async function isIdeRunning(ideId) {
-      const plat = os26.platform();
+      const plat = os25.platform();
       try {
         if (plat === "darwin") {
           const appName = getMacAppIdentifiers()[ideId];
@@ -107474,7 +107635,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       }
     }
     async function detectCurrentWorkspace(ideId) {
-      const plat = os26.platform();
+      const plat = os25.platform();
       if (plat === "darwin") {
         try {
           const appName = getMacAppIdentifiers()[ideId];
@@ -107494,7 +107655,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
           const appName = appNameMap[ideId];
           if (appName) {
             const storagePath = path46.join(
-              process.env.APPDATA || path46.join(os26.homedir(), "AppData", "Roaming"),
+              process.env.APPDATA || path46.join(os25.homedir(), "AppData", "Roaming"),
               appName,
               "storage.json"
             );
@@ -107516,7 +107677,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       return void 0;
     }
     async function launchWithCdp(options = {}) {
-      const platform10 = os26.platform();
+      const platform10 = os25.platform();
       let targetIde;
       const ides = await detectIDEs(getProviderLoader());
       if (options.ideId) {
@@ -108590,6 +108751,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
             if (sessionCleanup.success === false) return { success: false, removed: false, sessionCleanup };
           }
           let worktreeCleanup;
+          let remoteForwardedResult;
           if (node?.isLocalWorktree) {
             const nodeDaemonId = typeof node.daemonId === "string" ? node.daemonId.trim() : void 0;
             const isRemoteWorktree = nodeDaemonId && !daemonIdsEquivalent(nodeDaemonId, ctx.deps.statusInstanceId) && ctx.deps.dispatchMeshCommand && !args?._meshDirectDispatch;
@@ -108598,7 +108760,11 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
                 ...typeof args === "object" && args !== null ? args : {},
                 _meshDirectDispatch: true
               });
-              return forwarded ?? { success: false, error: "no response from remote node" };
+              const forwardedResult = forwarded ?? { success: false, error: "no response from remote node" };
+              const forwardedRemoved = forwardedResult.success === true && forwardedResult.removed !== false;
+              if (!forwardedRemoved) return forwardedResult;
+              remoteForwardedResult = forwardedResult;
+              worktreeCleanup = forwardedResult.worktreeCleanup !== null && typeof forwardedResult.worktreeCleanup === "object" ? forwardedResult.worktreeCleanup : void 0;
             }
             const cleanupResult = await ctx.cleanupLocalWorktreeNode({ mesh, node, nodeId, force: args?.force === true });
             if (cleanupResult.success === false) {
@@ -108650,6 +108816,10 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
                 nodeId,
                 payload: {
                   worktree: !!node?.isLocalWorktree,
+                  // Distinguish a removal executed by a remote owning daemon
+                  // (this entry records only the coordinator-side membership
+                  // reconciliation) from a fully local one.
+                  ...remoteForwardedResult ? { removedByRemoteDaemon: true } : {},
                   sessionCleanupMode,
                   workspace: typeof node?.workspace === "string" ? node.workspace : void 0,
                   daemonId: typeof node?.daemonId === "string" ? node.daemonId : void 0,
@@ -108670,6 +108840,10 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
           const orphanedSessionsRemaining = skippedLiveSessionIds.length > 0;
           const orphanNextAction = orphanedSessionsRemaining ? `Live session(s) [${skippedLiveSessionIds.join(", ")}] were skipped and still survive this node removal. Run mesh_cleanup_sessions with mode:'stop_and_delete' and sessionIds:[${skippedLiveSessionIds.map((id) => `'${id}'`).join(", ")}] to release them.` : void 0;
           return {
+            // Remote-forwarded removal: start from the owning daemon's own response
+            // so its detail fields survive, then overlay this coordinator's
+            // membership bookkeeping (removed/ledger/cache) computed above.
+            ...remoteForwardedResult ?? {},
             success: true,
             removed,
             ...residueWarning ? { residueWarning } : {},
@@ -115006,6 +115180,7 @@ ${e?.stderr || ""}`;
       return handle;
     }
     var fs44 = __toESM2(require("fs"));
+    var import_node_os2 = require("os");
     var import_path19 = require("path");
     init_logger();
     init_dist();
@@ -115036,6 +115211,19 @@ ${e?.stderr || ""}`;
       const v = mesh?.policy?.worktreeBaseDir;
       return typeof v === "string" && v.trim() ? v.trim() : void 0;
     }
+    var TRACK_CONFIG_DIR_NAMES = [".adhdev", ".adhdev-preview"];
+    function looksLikeCrossTrackWorktreePath(actualPath, normalizePath2) {
+      const home = normalizePath2((0, import_node_os2.homedir)());
+      return TRACK_CONFIG_DIR_NAMES.some((trackDirName) => {
+        const trackWorktreesDir = (0, import_path19.join)(home, trackDirName, "worktrees");
+        return actualPath === normalizePath2(trackWorktreesDir) || actualPath.startsWith(normalizePath2(trackWorktreesDir) + import_path19.sep);
+      });
+    }
+    function unexpectedPathRecoveryHint(actualPath, normalizePath2, suffix) {
+      const base = "Use git worktree list/status to inspect the path. Retry only after confirming the mesh node metadata points to an ADHDev-managed worktree.";
+      const legacyHint = looksLikeCrossTrackWorktreePath(actualPath, normalizePath2) ? " This path matches the layout used before worktree paths became build-track-aware (oss c24ae254) and is likely a legacy worktree from an older daemon version \u2014 mesh_remove_node will not remove it automatically. To clean it up: run `git worktree remove --force '" + actualPath + "'` directly, then retry mesh_remove_node so it can drop the now-missing-path node from the mesh registry." : "";
+      return base + legacyHint + suffix;
+    }
     function sessionMatchesMeshNode(self, record2, node, nodeId, sessionIds) {
       const sessionId = typeof record2?.sessionId === "string" ? record2.sessionId : "";
       if (!sessionId) return false;
@@ -115120,7 +115308,7 @@ ${e?.stderr || ""}`;
           ok: false,
           code: "mesh_worktree_cleanup_unexpected_path",
           error: `Refusing to remove worktree '${workspace}' because it is not at the expected managed path '${expectedPaths[0]}'`,
-          recoveryHint: "Use git worktree list/status to inspect the path. Retry only after confirming the mesh node metadata points to an ADHDev-managed worktree." + sessionPreservedNote
+          recoveryHint: unexpectedPathRecoveryHint(actualPath, normalizePath2, sessionPreservedNote)
         };
       }
       const entries = await listWorktrees2(repoRoot);
@@ -115216,7 +115404,7 @@ ${e?.stderr || ""}`;
           success: false,
           code: "mesh_worktree_cleanup_unexpected_path",
           error: `Refusing to remove worktree '${workspace}' because it is not at the expected managed path '${expectedPaths[0]}'`,
-          recoveryHint: "Use git worktree list/status to inspect the path. Retry only after confirming the mesh node metadata points to an ADHDev-managed worktree."
+          recoveryHint: unexpectedPathRecoveryHint(actualPath, normalizePath2, "")
         };
       }
       const entries = await listWorktrees2(repoRoot);
@@ -118324,7 +118512,7 @@ ${e?.stderr || ""}`;
     init_chat_message_normalization();
     var fs47 = __toESM2(require("fs"));
     var path48 = __toESM2(require("path"));
-    var os27 = __toESM2(require("os"));
+    var os26 = __toESM2(require("os"));
     var import_os6 = require("os");
     init_config();
     var import_child_process13 = require("child_process");
@@ -118449,7 +118637,7 @@ ${e?.stderr || ""}`;
     function checkPathExists2(paths) {
       for (const p of paths) {
         if (p.includes("*")) {
-          const home = os27.homedir();
+          const home = os26.homedir();
           const resolved = p.replace(/\*/g, home.split(path48.sep).pop() || "");
           if (fs47.existsSync(resolved)) return resolved;
         } else {
@@ -120846,7 +121034,7 @@ async (params) => {
     }
     var fs50 = __toESM2(require("fs"));
     var path51 = __toESM2(require("path"));
-    var os28 = __toESM2(require("os"));
+    var os27 = __toESM2(require("os"));
     var import_session_host_core11 = require_dist();
     function getAutoImplPid(ctx) {
       const pid = ctx.autoImplProcess?.pid;
@@ -121048,7 +121236,7 @@ async (params) => {
         });
         const referenceScripts = loadAutoImplReferenceScripts(ctx, resolvedReference);
         const prompt = buildAutoImplPrompt(ctx, type2, provider, providerDir, functions, domContext, referenceScripts, comment, resolvedReference, verification);
-        const tmpDir = path51.join(os28.tmpdir(), "adhdev-autoimpl");
+        const tmpDir = path51.join(os27.tmpdir(), "adhdev-autoimpl");
         if (!fs50.existsSync(tmpDir)) fs50.mkdirSync(tmpDir, { recursive: true });
         const promptFile = path51.join(tmpDir, `prompt-${type2}-${Date.now()}.md`);
         fs50.writeFileSync(promptFile, prompt, "utf-8");
@@ -121203,7 +121391,7 @@ async (params) => {
         const interactiveFlags = ["--yolo", "--interactive", "-i"];
         const baseArgs = [...spawn7.args || []].filter((a) => !interactiveFlags.includes(a));
         let shellCmd;
-        const isWin = os28.platform() === "win32";
+        const isWin = os27.platform() === "win32";
         const escapeArg = (a) => isWin ? `"${a.replace(/"/g, '""')}"` : `'${a.replace(/'/g, "'\\''")}'`;
         const promptMode = autoImpl?.promptMode ?? "stdin";
         const extraArgs = autoImpl?.extraArgs ?? [];
@@ -121242,7 +121430,7 @@ async (params) => {
         try {
           const pty = require("node-pty");
           ctx.log(`Auto-implement spawn (PTY): ${shellCmd}`);
-          const isWin2 = os28.platform() === "win32";
+          const isWin2 = os27.platform() === "win32";
           child = pty.spawn(isWin2 ? "cmd.exe" : process.env.SHELL || "/bin/zsh", [isWin2 ? "/c" : "-c", shellCmd], {
             name: "xterm-256color",
             cols: import_session_host_core11.DEFAULT_SESSION_HOST_COLS,
@@ -123897,7 +124085,7 @@ data: ${JSON.stringify(msg.data)}
     }
     var import_child_process14 = require("child_process");
     var fs52 = __toESM2(require("fs"));
-    var os29 = __toESM2(require("os"));
+    var os28 = __toESM2(require("os"));
     var path53 = __toESM2(require("path"));
     var import_session_host_core15 = require_dist();
     init_logger();
@@ -123969,7 +124157,7 @@ data: ${JSON.stringify(msg.data)}
         }
         let portableNode = null;
         try {
-          portableNode = findPortableNode22(os29.homedir(), process.execPath, resolveInstanceDir());
+          portableNode = findPortableNode22(os28.homedir(), process.execPath, resolveInstanceDir());
         } catch (error48) {
           LOG2.warn(
             "SessionHost",
@@ -124469,8 +124657,12 @@ data: ${JSON.stringify(msg.data)}
       loadMeshCoordinatorRegistry();
       const upgradeFailureNotice = readUpgradeFailureNotice();
       if (upgradeFailureNotice) {
-        LOG2.warn("Upgrade", `Previous daemon upgrade FAILED and was rolled back \u2014 this daemon is running the previous version. Notice (${upgradeFailureNotice.noticePath}):
-${upgradeFailureNotice.notice}`);
+        const age = upgradeFailureNotice.ageLabel ? `${upgradeFailureNotice.ageLabel}, recorded ${upgradeFailureNotice.recordedAt}` : "recorded at an unknown time";
+        const target = upgradeFailureNotice.targetVersion ? `, attempted target v${upgradeFailureNotice.targetVersion}` : "";
+        const running = (config2.statusVersion || "").trim().replace(/^v/, "");
+        const supersededHint = upgradeFailureNotice.targetVersion && running && upgradeFailureNotice.targetVersion.replace(/^v/, "") !== running ? ` This notice targets a DIFFERENT version than the one now running (v${running}) \u2014 it is most likely a stale record of an earlier attempt, not a report about this boot.` : "";
+        LOG2.warn("Upgrade", `Previous daemon upgrade FAILED and was rolled back \u2014 this daemon is running the previous version. Notice (${age}${target}) at ${upgradeFailureNotice.noticePath}:
+${upgradeFailureNotice.notice}${supersededHint}`);
       }
       const appConfig = loadConfig2();
       const providerSourceMode = appConfig.providerSourceMode || "normal";