@adhdev/daemon-standalone 1.0.39-rc.2 → 1.0.39-rc.4

package/dist/index.js

@@ -36528,10 +36528,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "38c912aafd78adf13d2647bd84b7dffc3c65eece" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "38c912aa" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "1.0.39-rc.2" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-08-07T06:34:33.803Z" : void 0);
+      const commit = readInjected(true ? "501b92e11df69e7a1e1a20767fd4c924e8bd4f95" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "501b92e1" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "1.0.39-rc.4" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-08-07T12:41:05.960Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -40714,7 +40714,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 +41004,6 @@ ${error48.message || ""}`;
       }
     }
     var path11;
-    var os52;
     var import_promises3;
     var import_node_fs2;
     var import_node_child_process3;
@@ -41018,11 +41017,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 +41032,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 +41105,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 +41189,7 @@ ${error48.message || ""}`;
       return { config: { ...config2, defaultWorkspaceId: id } };
     }
     var fs7;
-    var os7;
+    var os62;
     var path13;
     var import_crypto22;
     var MAX_WORKSPACES;
@@ -41198,7 +41197,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 +46794,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
@@ -53181,14 +53180,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 +53393,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 +53404,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 +61200,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 +62239,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 +62263,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 +62291,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 +63430,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 +63440,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 +63693,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();
@@ -70331,14 +70330,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 +70377,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 +72842,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 +72930,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 +73080,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 +73638,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 +73687,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 +73836,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 +74301,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 +74310,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 +74606,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 +74615,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 +74642,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;
@@ -78879,7 +78878,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();
@@ -78923,7 +78922,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)) {
@@ -78944,7 +78943,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 }) };
       }
@@ -80236,17 +80235,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 = [
@@ -80263,7 +80262,7 @@ ${lastSnapshot}`;
             }
           }
         }
-        const installed = os30 === "darwin" ? !!(resolvedCli || appPath) : !!resolvedCli;
+        const installed = os29 === "darwin" ? !!(resolvedCli || appPath) : !!resolvedCli;
         const version2 = null;
         results.push({
           id: def.id,
@@ -86971,7 +86970,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,
@@ -87225,7 +87224,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)));
       }
@@ -89839,12 +89838,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) {
@@ -90041,7 +90041,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) => {
@@ -90411,7 +90413,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) => {
@@ -90650,7 +90652,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)) {
@@ -90829,24 +90831,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;
       }
@@ -90952,20 +91005,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");
         }
@@ -91009,13 +91059,10 @@ ${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();
         appendUpgradeLog("Installer-managed Windows atomic upgrade completed");
         return;
       }
@@ -91063,7 +91110,7 @@ ${body}
               notice.push("To recover, reinstall manually:");
             }
             notice.push(`  ${buildManualRecoveryCommand(installCommand)}`);
-            emitUpgradeFailureNotice(notice);
+            emitUpgradeFailureNotice(notice, getConfigDir2(), { targetVersion: payload.targetVersion });
           }
           throw error48;
         }
@@ -91082,7 +91129,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;
         }
       }
@@ -91092,10 +91139,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) {
@@ -92095,7 +92139,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");
@@ -92189,7 +92233,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();
@@ -92327,7 +92371,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();
@@ -92506,12 +92550,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) {
@@ -93321,7 +93365,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 });
       }
       // ────────────────────────────────────────────────────────────────────
@@ -93619,7 +93663,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 {
@@ -94920,7 +94964,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"));
@@ -94991,7 +95035,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());
@@ -95730,7 +95774,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)) {
@@ -100525,7 +100569,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();
@@ -100675,9 +100719,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;
@@ -101072,7 +101116,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;
@@ -102099,11 +102143,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();
@@ -102578,7 +102622,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"));
@@ -103084,7 +103128,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) {
@@ -103108,7 +103152,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");
@@ -103695,11 +103739,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);
@@ -103984,7 +104028,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`);
@@ -104106,7 +104150,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`);
@@ -104190,9 +104234,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$/);
     }
@@ -104218,7 +104262,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);
@@ -106624,8 +106668,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);
@@ -107380,7 +107424,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 {
@@ -107441,7 +107485,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       }
     }
     async function isIdeRunning(ideId) {
-      const plat = os26.platform();
+      const plat = os25.platform();
       try {
         if (plat === "darwin") {
           const appName = getMacAppIdentifiers()[ideId];
@@ -107496,7 +107540,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
       }
     }
     async function detectCurrentWorkspace(ideId) {
-      const plat = os26.platform();
+      const plat = os25.platform();
       if (plat === "darwin") {
         try {
           const appName = getMacAppIdentifiers()[ideId];
@@ -107516,7 +107560,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"
             );
@@ -107538,7 +107582,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) {
@@ -108612,6 +108656,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;
@@ -108620,7 +108665,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) {
@@ -108672,6 +108721,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,
@@ -108692,6 +108745,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 } : {},
@@ -118346,7 +118403,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");
@@ -118471,7 +118528,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 {
@@ -120868,7 +120925,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;
@@ -121070,7 +121127,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");
@@ -121225,7 +121282,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 ?? [];
@@ -121264,7 +121321,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,
@@ -123919,7 +123976,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();
@@ -123991,7 +124048,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",
@@ -124491,8 +124548,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";