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

package/dist/index.js

@@ -37056,10 +37056,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "48ce5d9b7420dbc3520cd6c7ddee34af47c23627" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "48ce5d9b" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "1.0.49-rc.2" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-08-14T06:05:14.635Z" : void 0);
+      const commit = readInjected(true ? "9884122c80eb621bb1e4da9f0269c9bb2e8421fe" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "9884122c" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "1.0.49-rc.4" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-08-14T10:06:01.458Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -42270,6 +42270,8 @@ ${error48.message || ""}`;
       interpolateArgs: () => interpolateArgs,
       interpolateString: () => interpolateString,
       isMeshTaskDifficulty: () => isMeshTaskDifficulty,
+      isPhantomDaemonEntry: () => isPhantomDaemonEntry,
+      isRawDaemonDoId: () => isRawDaemonDoId,
       joinRepoPath: () => joinRepoPath,
       machineCoreFromDaemonId: () => machineCoreFromDaemonId,
       meshNodeIdMatches: () => meshNodeIdMatches,
@@ -42565,6 +42567,18 @@ ${error48.message || ""}`;
       if (!left || !right) return false;
       return left === right;
     }
+    function isRawDaemonDoId(id) {
+      const trimmed = readString2(id);
+      return !!trimmed && /^[0-9a-f]{64}$/i.test(trimmed);
+    }
+    function isPhantomDaemonEntry(entry) {
+      if (!entry) return false;
+      if (!isRawDaemonDoId(entry.id)) return false;
+      const hasMachineEvidence = Boolean(
+        readString2(entry.machineNickname) || readString2(entry.nickname) || readString2(entry.hostname) || readString2(entry.platform) || readString2(entry.machine?.hostname) || readString2(entry.machine?.platform) || readString2(entry.machineId) || Array.isArray(entry.sessions) && entry.sessions.length > 0
+      );
+      return !hasMachineEvidence;
+    }
     function machineCoreFromDaemonId(id) {
       const trimmed = readString2(id);
       if (!trimmed) return void 0;
@@ -55444,6 +55458,8 @@ ${rendered}`, "utf-8");
     });
     function readProviderPriorityFromPolicy(policy) {
       const record2 = policy && typeof policy === "object" && !Array.isArray(policy) ? policy : {};
+      const derived = deriveProviderPriorityFromSlots(record2.slots);
+      if (derived.length) return derived;
       const raw = record2.providerPriority;
       if (Array.isArray(raw)) {
         const seen = /* @__PURE__ */ new Set();
@@ -55454,7 +55470,7 @@ ${rendered}`, "utf-8");
         });
         if (explicit.length) return explicit;
       }
-      return deriveProviderPriorityFromSlots(record2.slots);
+      return [];
     }
     function normalizeProviderRoles(value) {
       if (!Array.isArray(value)) return [];
@@ -55536,7 +55552,7 @@ ${rendered}`, "utf-8");
       const workspace = readStringValue(node.workspace, node.repoRoot, node.repo_root);
       const workspaceName = workspace ? workingDirBasename(workspace) : void 0;
       const host = readStringValue(node.machineName, node.machine_name, node.hostname, node.host, node.daemonId, node.daemon_id, node.machineId, node.machine_id);
-      const provider = providerPriority[0] || (Array.isArray(node.providers) ? readStringValue(...node.providers) : void 0);
+      const provider = readProviderPriorityFromPolicy(node.policy)[0] || providerPriority[0] || (Array.isArray(node.providers) ? readStringValue(...node.providers) : void 0);
       const parts = [workspaceName, host, provider].filter(Boolean);
       if (parts.length > 0) return parts.join(" \xB7 ");
       return nodeId || "unidentified mesh node";
@@ -110583,7 +110599,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
             ...slots.length ? { slots } : {}
           };
           if (providerRoles.length) migrateProviderRolesToSlots2(policy);
-          if (!providerPriority.length) syncProviderPriorityFromSlots(policy);
+          syncProviderPriorityFromSlots(policy);
           const role = normalizeMeshDaemonRole(args?.role);
           const daemonId = typeof args?.daemonId === "string" && args.daemonId.trim() ? args.daemonId.trim() : void 0;
           const machineId = typeof args?.machineId === "string" && args.machineId.trim() ? args.machineId.trim() : void 0;
@@ -110635,10 +110651,8 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
             else delete policy.providerRoles;
           }
           migrateProviderRolesToSlots2(policy);
-          if (!Array.isArray(args?.providerPriority) && !Object.prototype.hasOwnProperty.call(policy, "providerPriority")) {
-            const finalSlots = Object.prototype.hasOwnProperty.call(policy, "slots") ? policy.slots : getMesh2(meshId)?.nodes.find((n) => n.id === nodeId)?.policy?.slots;
-            syncProviderPriorityFromSlots(policy, finalSlots);
-          }
+          const finalSlots = Object.prototype.hasOwnProperty.call(policy, "slots") ? policy.slots : getMesh2(meshId)?.nodes.find((n) => n.id === nodeId)?.policy?.slots;
+          syncProviderPriorityFromSlots(policy, finalSlots);
           const patch = { policy };
           if (typeof args?.systemPrompt === "string") {
             const trimmed = args.systemPrompt.trim();
@@ -110663,9 +110677,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
             ...inlineNode.policy && typeof inlineNode.policy === "object" && !Array.isArray(inlineNode.policy) ? inlineNode.policy : {},
             ...patch.policy
           };
-          if (!Array.isArray(args?.providerPriority) && !Object.prototype.hasOwnProperty.call(patch.policy, "providerPriority")) {
-            syncProviderPriorityFromSlots(inlineNode.policy);
-          }
+          syncProviderPriorityFromSlots(inlineNode.policy);
           if (Object.prototype.hasOwnProperty.call(patch, "systemPrompt")) {
             const sp = patch.systemPrompt;
             if (typeof sp === "string" && sp.trim()) inlineNode.systemPrompt = sp;
@@ -113669,6 +113681,7 @@ ${ptyResult.output.slice(-2e3)}`);
     init_dist();
     init_mesh_events();
     init_mesh_reconcile_identity();
+    init_mesh_reconcile_acked_hold();
     init_mesh_fast_forward();
     var import_node_child_process7 = require("child_process");
     var import_node_util5 = require("util");
@@ -115671,11 +115684,20 @@ ${mergeTreeErr?.stderr || ""}`;
         LOG2.warn("Mesh", `[Refinery] Failed to append async refine ledger entry: ${e?.message || e}`);
       }
     }
+    function resolveRefineResumeDispatchGraceMs() {
+      return resolveTunedReconcileMs("MESH_REFINE_RESUME_DISPATCH_GRACE_MS", 6e4, 0, 10 * 6e4);
+    }
+    function resolveRefineResumeZombieCutoffMs() {
+      return resolveTunedReconcileMs("MESH_REFINE_RESUME_ZOMBIE_CUTOFF_MS", 24 * 60 * 6e4, 5 * 6e4, 30 * 24 * 60 * 6e4);
+    }
     async function resumePendingRefineJobsOnStartup(self) {
       try {
         const { listMeshes: listMeshes2 } = await Promise.resolve().then(() => (init_mesh_config(), mesh_config_exports));
         const { readLedgerEntries: readLedgerEntries2 } = await Promise.resolve().then(() => (init_mesh_ledger(), mesh_ledger_exports));
         const meshIds = listMeshes2().map((m) => m.id).filter(Boolean);
+        const nowMs = Date.now();
+        const dispatchGraceMs = resolveRefineResumeDispatchGraceMs();
+        const zombieCutoffMs = resolveRefineResumeZombieCutoffMs();
         for (const meshId of meshIds) {
           const entries = readLedgerEntries2(meshId, { kind: ["task_dispatched", "task_completed", "task_failed"] });
           const terminal = /* @__PURE__ */ new Set();
@@ -115693,10 +115715,44 @@ ${mergeTreeErr?.stderr || ""}`;
             if (!jobId || terminal.has(`${e.nodeId}:${jobId}`)) continue;
             const key2 = buildRefineJobKey(self, meshId, e.nodeId);
             if (self.runningRefineJobs.has(key2)) continue;
+            const dispatchedAtMs = new Date(e.timestamp).getTime();
+            const ageMs2 = Number.isFinite(dispatchedAtMs) ? nowMs - dispatchedAtMs : void 0;
+            if (ageMs2 !== void 0 && ageMs2 >= 0 && ageMs2 < dispatchGraceMs) {
+              LOG2.info("Mesh", `[Refinery] Deferring resume of refine job for node ${e.nodeId} (jobId=${jobId}) \u2014 dispatched ${ageMs2}ms ago, within the ${dispatchGraceMs}ms grace window; may still be running.`);
+              continue;
+            }
+            if (ageMs2 !== void 0 && ageMs2 >= zombieCutoffMs) {
+              const node = e.payload?.refineJob;
+              const coordinatorDaemonId2 = node?.targetCoordinatorDaemonId;
+              const coordinatorSessionId2 = node?.targetCoordinatorSessionId;
+              const zombieHandle = buildRefineJobHandle(self, {
+                meshId,
+                nodeId: e.nodeId,
+                jobId,
+                interactionId: typeof node?.interactionId === "string" ? node.interactionId : void 0,
+                status: "failed",
+                startedAt: typeof node?.startedAt === "string" ? node.startedAt : e.timestamp,
+                completedAt: (/* @__PURE__ */ new Date()).toISOString(),
+                coordinatorDaemonId: coordinatorDaemonId2,
+                coordinatorSessionId: coordinatorSessionId2
+              });
+              LOG2.warn("Mesh", `[Refinery] Closing out stale refine job for node ${e.nodeId} (jobId=${jobId}) as failed \u2014 dispatched ${ageMs2}ms ago, past the ${zombieCutoffMs}ms zombie cutoff with no terminal entry; not resuming.`);
+              const zombieResult = {
+                success: false,
+                code: "resume_abandoned_stale_dispatch",
+                error: `Refine job dispatched at ${e.timestamp} never reached a terminal state and exceeded the ${zombieCutoffMs}ms zombie cutoff on daemon restart; closed out without resuming.`
+              };
+              await appendRefineJobLedger(self, "task_failed", zombieHandle, zombieResult);
+              queueRefineJobEvent(self, "refine:failed", zombieHandle, zombieResult);
+              continue;
+            }
             const coordinatorDaemonId = e.payload?.refineJob?.targetCoordinatorDaemonId;
+            const coordinatorSessionId = e.payload?.refineJob?.targetCoordinatorSessionId;
             LOG2.info("Mesh", `[Refinery] Auto-resuming interrupted refine job for node ${e.nodeId} (jobId=${jobId})`);
             void startMeshRefineJob(self, meshId, e.nodeId, {
-              coordinatorDaemonId
+              jobId,
+              coordinatorDaemonId,
+              coordinatorSessionId
             });
           }
         }
@@ -117420,7 +117476,7 @@ ${e?.stderr || ""}`;
       const terminal = self.terminalRefineJobs.get(key2);
       const alreadyRunning = self.runningRefineJobs.get(key2);
       if (alreadyRunning) return { ...alreadyRunning, duplicate: true };
-      const jobId = `refine_${createInteractionId()}`;
+      const jobId = typeof args?.jobId === "string" && args.jobId.trim() ? args.jobId.trim() : `refine_${createInteractionId()}`;
       const interactionId = createInteractionId();
       const placeholder = buildRefineJobHandle(self, { meshId, nodeId, jobId, interactionId, retryOfJobId: terminal?.jobId });
       self.runningRefineJobs.set(key2, placeholder);