omnius 1.0.621 → 1.0.622

package/dist/index.js

@@ -734,24 +734,31 @@ async function runVerifiedUpdateTransaction(initial, dependencies, paths = resol
       executable_version: evidence.executableVersion
     }, paths);
     state2 = transition(state2, { phase: "daemon_restarting" }, paths);
-    if (!await dependencies.restartDaemon(target)) {
-      throw new Error(
-        `The daemon restart at ${state2.daemon_endpoint ?? "the configured endpoint"} did not produce Omnius v${target}`
-      );
+    let daemon = null;
+    let restartAcknowledged = false;
+    for (let attempt = 1; attempt <= 3; attempt++) {
+      restartAcknowledged = await dependencies.restartDaemon(target, evidence.executablePath) || restartAcknowledged;
+      daemon = await dependencies.observeDaemon();
+      if (daemon?.bootVersion === target && daemon.bootPackageHash === evidence.packageHash) {
+        break;
+      }
+      if (attempt < 3) await new Promise((resolve88) => setTimeout(resolve88, 1e3));
     }
-    daemonQuiesced = false;
-    const daemon = await dependencies.observeDaemon();
     if (!daemon || daemon.bootVersion !== target) {
-      throw new Error(`Daemon verification failed: expected ${target}, observed ${daemon?.bootVersion ?? "unreachable"}`);
+      const observed = daemon?.bootVersion ?? "unreachable";
+      throw new Error(
+        restartAcknowledged ? `Daemon verification failed after 3 recovery attempts: expected ${target}, observed ${observed}` : `The daemon at ${state2.daemon_endpoint ?? "the configured endpoint"} could not be restarted from the verified Omnius v${target} executable after 3 attempts`
+      );
     }
     if (!daemon.bootPackageHash) {
-      throw new Error("Daemon package verification failed: the restarted runtime did not report a boot package hash");
+      throw new Error("Daemon package verification failed after 3 recovery attempts: the restarted runtime did not report a boot package hash");
     }
     if (daemon.bootPackageHash !== evidence.packageHash) {
       throw new Error(
-        `Daemon package verification failed: boot hash ${daemon.bootPackageHash} does not match installed hash ${evidence.packageHash}`
+        `Daemon package verification failed after 3 recovery attempts: boot hash ${daemon.bootPackageHash} does not match installed hash ${evidence.packageHash}`
       );
     }
+    daemonQuiesced = false;
     state2 = transition(state2, {
       phase: "runtime_verified",
       daemon_version: daemon.bootVersion,
@@ -832,6 +839,23 @@ function launchWorkerInTransientUserService(input) {
   });
   return launched.status === 0;
 }
+function waitForUpdateWorkerAdoption(operationId, paths, timeoutMs = 1e4) {
+  const deadline = Date.now() + timeoutMs;
+  const sleeper = new Int32Array(new SharedArrayBuffer(4));
+  while (Date.now() < deadline) {
+    const observed = readUpdateState(paths);
+    if (observed?.operation_id === operationId) {
+      if (observed.status === "failed") {
+        throw new Error(observed.error || "The detached update worker failed before package installation");
+      }
+      if (observed.status === "completed" || isPidAlive(observed.pid) && observed.pid !== process.pid) {
+        return observed;
+      }
+    }
+    Atomics.wait(sleeper, 0, 0, 100);
+  }
+  throw new Error("The detached update worker did not adopt the transaction within 10 seconds; the package was not modified");
+}
 function startDetachedGlobalUpdate(input, paths = resolveUpdatePaths()) {
   const targetVersion = assertExactUpdateTarget(input.targetVersion, input.fromVersion);
   const operationId = randomUUID();
@@ -904,6 +928,7 @@ function startDetachedGlobalUpdate(input, paths = resolveUpdatePaths()) {
       if (!child.pid) throw new Error("Detached update worker did not return a PID");
       child.unref();
     }
+    state2 = waitForUpdateWorkerAdoption(operationId, paths);
     return { state: state2, pollUrl: "/v1/update" };
   } catch (error) {
     state2 = {
@@ -679524,9 +679549,9 @@ async function resolveActiveDaemonRuntime(preferredEndpoint, dependencies = DEFA
 function systemdQuote(value2) {
   return /[\s"\\]/.test(value2) ? `"${value2.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"` : value2;
 }
-async function repairManagedDaemonUnit(port) {
+async function repairManagedDaemonUnit(port, preferredEntrypoint) {
   if (process.platform !== "linux") return false;
-  const command = await resolveDaemonCommand(process.execPath);
+  const command = await resolveDaemonCommand(process.execPath, preferredEntrypoint);
   if (!command) return false;
   try {
     const configHome2 = process.env["XDG_CONFIG_HOME"] || join130(homedir39(), ".config");
@@ -679728,7 +679753,7 @@ async function reclaimOwnedDaemonListener(port = getDaemonPort(), dependencies =
   }
   return { ok: true, action: "cleared", port, clearedPids, blockedPids: [] };
 }
-async function restartDaemon(port, expectedVersion) {
+async function restartDaemon(port, expectedVersion, preferredEntrypoint) {
   const p2 = port ?? getDaemonPort();
   const managed = await managedDaemonServiceMatchesPort(p2);
   if (managed) {
@@ -679737,12 +679762,14 @@ async function restartDaemon(port, expectedVersion) {
       if (!reclaimed.ok) return false;
       await reclaimStaleDaemonEndpointClaim(p2);
     }
+    await runUserSystemctl(["reset-failed", "omnius-daemon.service"]);
     const restarted = await runUserSystemctl(["restart", "omnius-daemon.service"]);
     if (restarted.ok && (await waitForDaemonReady(p2, expectedVersion)).ok) return true;
-    const repaired = await repairManagedDaemonUnit(p2);
+    const repaired = await repairManagedDaemonUnit(p2, preferredEntrypoint);
     if (repaired) {
       await runUserSystemctl(["stop", "omnius-daemon.service"]);
       await waitForDaemonStopped(p2);
+      await runUserSystemctl(["reset-failed", "omnius-daemon.service"]);
       const started = await runUserSystemctl(["start", "omnius-daemon.service"]);
       if (started.ok && (await waitForDaemonReady(p2, expectedVersion)).ok) return true;
     }
@@ -679757,7 +679784,7 @@ async function restartDaemon(port, expectedVersion) {
     if (!reclaimed.ok) return false;
   }
   if (!await reclaimStaleDaemonEndpointClaim(p2)) return false;
-  const pid = await startDaemon(p2);
+  const pid = await startDaemon(p2, preferredEntrypoint);
   if (!pid) return false;
   return (await waitForDaemonReady(p2, expectedVersion)).ok;
 }
@@ -679792,8 +679819,9 @@ function commandForEntrypoint(path16, nodeExe) {
   }
   return { command: path16, args };
 }
-async function resolveDaemonCommand(nodeExe) {
+async function resolveDaemonCommand(nodeExe, preferredEntrypoint) {
   const candidates = [];
+  if (preferredEntrypoint) candidates.push(preferredEntrypoint);
   const thisDir = dirname44(fileURLToPath18(import.meta.url));
   candidates.push(join130(thisDir, "index.js"));
   if (process.argv[1]) candidates.push(process.argv[1]);
@@ -679816,13 +679844,13 @@ async function resolveDaemonCommand(nodeExe) {
   }
   return null;
 }
-async function startDaemon(port = getDaemonPort()) {
+async function startDaemon(port = getDaemonPort(), preferredEntrypoint) {
   mkdirSync70(OMNIUS_DIR, { recursive: true });
   const daemonPort = port;
   const endpointClaim = claimDaemonEndpoint(daemonPort);
   if (!endpointClaim) return null;
   const nodeExe = process.execPath;
-  const daemonCommand = await resolveDaemonCommand(nodeExe);
+  const daemonCommand = await resolveDaemonCommand(nodeExe, preferredEntrypoint);
   if (!daemonCommand) {
     releaseDaemonEndpointClaim(endpointClaim);
     return null;

package/dist/update-worker.js

@@ -293776,9 +293776,9 @@ async function managedDaemonServiceOwnsPort(port, dependencies = {
 function systemdQuote(value) {
   return /[\s"\\]/.test(value) ? `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"` : value;
 }
-async function repairManagedDaemonUnit(port) {
+async function repairManagedDaemonUnit(port, preferredEntrypoint) {
   if (process.platform !== "linux") return false;
-  const command = await resolveDaemonCommand(process.execPath);
+  const command = await resolveDaemonCommand(process.execPath, preferredEntrypoint);
   if (!command) return false;
   try {
     const configHome = process.env["XDG_CONFIG_HOME"] || join14(homedir14(), ".config");
@@ -293990,7 +293990,7 @@ async function reclaimOwnedDaemonListener(port = getDaemonPort(), dependencies =
   }
   return { ok: true, action: "cleared", port, clearedPids, blockedPids: [] };
 }
-async function restartDaemon(port, expectedVersion) {
+async function restartDaemon(port, expectedVersion, preferredEntrypoint) {
   const p = port ?? getDaemonPort();
   const managed = await managedDaemonServiceMatchesPort(p);
   if (managed) {
@@ -293999,12 +293999,14 @@ async function restartDaemon(port, expectedVersion) {
       if (!reclaimed.ok) return false;
       await reclaimStaleDaemonEndpointClaim(p);
     }
+    await runUserSystemctl(["reset-failed", "omnius-daemon.service"]);
     const restarted = await runUserSystemctl(["restart", "omnius-daemon.service"]);
     if (restarted.ok && (await waitForDaemonReady(p, expectedVersion)).ok) return true;
-    const repaired = await repairManagedDaemonUnit(p);
+    const repaired = await repairManagedDaemonUnit(p, preferredEntrypoint);
     if (repaired) {
       await runUserSystemctl(["stop", "omnius-daemon.service"]);
       await waitForDaemonStopped(p);
+      await runUserSystemctl(["reset-failed", "omnius-daemon.service"]);
       const started = await runUserSystemctl(["start", "omnius-daemon.service"]);
       if (started.ok && (await waitForDaemonReady(p, expectedVersion)).ok) return true;
     }
@@ -294019,7 +294021,7 @@ async function restartDaemon(port, expectedVersion) {
     if (!reclaimed.ok) return false;
   }
   if (!await reclaimStaleDaemonEndpointClaim(p)) return false;
-  const pid = await startDaemon(p);
+  const pid = await startDaemon(p, preferredEntrypoint);
   if (!pid) return false;
   return (await waitForDaemonReady(p, expectedVersion)).ok;
 }
@@ -294039,8 +294041,9 @@ function commandForEntrypoint(path, nodeExe) {
   }
   return { command: path, args };
 }
-async function resolveDaemonCommand(nodeExe) {
+async function resolveDaemonCommand(nodeExe, preferredEntrypoint) {
   const candidates = [];
+  if (preferredEntrypoint) candidates.push(preferredEntrypoint);
   const thisDir = dirname8(fileURLToPath2(import.meta.url));
   candidates.push(join14(thisDir, "index.js"));
   if (process.argv[1]) candidates.push(process.argv[1]);
@@ -294063,13 +294066,13 @@ async function resolveDaemonCommand(nodeExe) {
   }
   return null;
 }
-async function startDaemon(port = getDaemonPort()) {
+async function startDaemon(port = getDaemonPort(), preferredEntrypoint) {
   mkdirSync3(OMNIUS_DIR, { recursive: true });
   const daemonPort = port;
   const endpointClaim = claimDaemonEndpoint(daemonPort);
   if (!endpointClaim) return null;
   const nodeExe = process.execPath;
-  const daemonCommand = await resolveDaemonCommand(nodeExe);
+  const daemonCommand = await resolveDaemonCommand(nodeExe, preferredEntrypoint);
   if (!daemonCommand) {
     releaseDaemonEndpointClaim(endpointClaim);
     return null;
@@ -294496,24 +294499,31 @@ async function runVerifiedUpdateTransaction(initial, dependencies, paths = resol
       executable_version: evidence.executableVersion
     }, paths);
     state = transition(state, { phase: "daemon_restarting" }, paths);
-    if (!await dependencies.restartDaemon(target)) {
-      throw new Error(
-        `The daemon restart at ${state.daemon_endpoint ?? "the configured endpoint"} did not produce Omnius v${target}`
-      );
+    let daemon = null;
+    let restartAcknowledged = false;
+    for (let attempt = 1; attempt <= 3; attempt++) {
+      restartAcknowledged = await dependencies.restartDaemon(target, evidence.executablePath) || restartAcknowledged;
+      daemon = await dependencies.observeDaemon();
+      if (daemon?.bootVersion === target && daemon.bootPackageHash === evidence.packageHash) {
+        break;
+      }
+      if (attempt < 3) await new Promise((resolve12) => setTimeout(resolve12, 1e3));
     }
-    daemonQuiesced = false;
-    const daemon = await dependencies.observeDaemon();
     if (!daemon || daemon.bootVersion !== target) {
-      throw new Error(`Daemon verification failed: expected ${target}, observed ${daemon?.bootVersion ?? "unreachable"}`);
+      const observed = daemon?.bootVersion ?? "unreachable";
+      throw new Error(
+        restartAcknowledged ? `Daemon verification failed after 3 recovery attempts: expected ${target}, observed ${observed}` : `The daemon at ${state.daemon_endpoint ?? "the configured endpoint"} could not be restarted from the verified Omnius v${target} executable after 3 attempts`
+      );
     }
     if (!daemon.bootPackageHash) {
-      throw new Error("Daemon package verification failed: the restarted runtime did not report a boot package hash");
+      throw new Error("Daemon package verification failed after 3 recovery attempts: the restarted runtime did not report a boot package hash");
     }
     if (daemon.bootPackageHash !== evidence.packageHash) {
       throw new Error(
-        `Daemon package verification failed: boot hash ${daemon.bootPackageHash} does not match installed hash ${evidence.packageHash}`
+        `Daemon package verification failed after 3 recovery attempts: boot hash ${daemon.bootPackageHash} does not match installed hash ${evidence.packageHash}`
       );
     }
+    daemonQuiesced = false;
     state = transition(state, {
       phase: "runtime_verified",
       daemon_version: daemon.bootVersion,
@@ -294865,8 +294875,8 @@ async function main() {
     state,
     {
       quiesceDaemon: () => quiesceDaemonForUpdate(port),
-      restartDaemon: (expected) => restartDaemon(port, expected),
-      recoverDaemon: () => restartDaemon(port),
+      restartDaemon: (expected, executable) => restartDaemon(port, expected, executable),
+      recoverDaemon: () => restartDaemon(port, target),
       observeDaemon: async () => {
         const identity = await getDaemonReportedIdentity(port);
         return identity ? { bootVersion: identity.bootVersion, bootPackageHash: identity.bootPackageHash } : null;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "omnius",
-  "version": "1.0.621",
+  "version": "1.0.622",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "omnius",
-      "version": "1.0.621",
+      "version": "1.0.622",
       "bundleDependencies": [
         "image-to-ascii"
       ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omnius",
-  "version": "1.0.621",
+  "version": "1.0.622",
   "description": "AI coding agent powered by open-source models (Ollama/vLLM) — interactive TUI with agentic tool-calling loop",
   "type": "module",
   "main": "./dist/library.js",