omnius 1.0.617 → 1.0.618

package/dist/index.js

@@ -679198,6 +679198,8 @@ __export(daemon_exports, {
   getDaemonStatus: () => getDaemonStatus,
   getLocalCliVersion: () => getLocalCliVersion,
   isDaemonRunning: () => isDaemonRunning,
+  managedDaemonServiceOwnsPort: () => managedDaemonServiceOwnsPort,
+  pidIsInManagedDaemonUnit: () => pidIsInManagedDaemonUnit,
   quiesceDaemonForUpdate: () => quiesceDaemonForUpdate,
   reclaimOwnedDaemonListener: () => reclaimOwnedDaemonListener,
   recoverDaemonVersionBoundedly: () => recoverDaemonVersionBoundedly,
@@ -679442,6 +679444,27 @@ async function managedDaemonServiceMatchesPort(port) {
   if (environment === null) return false;
   return daemonServiceMatchesPort(port, environment);
 }
+function pidIsInManagedDaemonUnit(pid, readCgroup = defaultReadProcCgroup) {
+  const cgroup = readCgroup(pid);
+  return cgroup === null ? false : cgroup.includes("omnius-daemon.service");
+}
+function defaultReadProcCgroup(pid) {
+  try {
+    return readFileSync95(`/proc/${pid}/cgroup`, "utf8");
+  } catch {
+    return null;
+  }
+}
+async function managedDaemonServiceOwnsPort(port, dependencies = {
+  holderPids: (value2) => portHolderPids(value2),
+  pidInUnit: (pid) => pidIsInManagedDaemonUnit(pid)
+}) {
+  const holders = await dependencies.holderPids(port);
+  if (holders === null) return false;
+  const uniqueHolders = [...new Set(holders.filter((pid) => pid > 0 && pid !== process.pid))];
+  if (uniqueHolders.length === 0) return true;
+  return uniqueHolders.every((pid) => dependencies.pidInUnit(pid));
+}
 async function managedDaemonServicePort() {
   if (!await hasManagedDaemonService()) return null;
   const environment = await readUserSystemctl([
@@ -679718,6 +679741,11 @@ async function restartDaemon(port, expectedVersion) {
   const p2 = port ?? getDaemonPort();
   const managed = await managedDaemonServiceMatchesPort(p2);
   if (managed) {
+    if (!await managedDaemonServiceOwnsPort(p2)) {
+      const reclaimed = await reclaimOwnedDaemonListener(p2);
+      if (!reclaimed.ok) return false;
+      await reclaimStaleDaemonEndpointClaim(p2);
+    }
     const restarted = await runUserSystemctl(["restart", "omnius-daemon.service"]);
     if (restarted.ok && (await waitForDaemonReady(p2, expectedVersion)).ok) return true;
     const repaired = await repairManagedDaemonUnit(p2);
@@ -679903,7 +679931,7 @@ async function stopDaemonAtPort(port = getDaemonPort()) {
 async function quiesceDaemonForUpdate(port = getDaemonPort()) {
   if (await managedDaemonServiceMatchesPort(port)) {
     const stopped = await runUserSystemctl(["stop", "omnius-daemon.service"]);
-    return stopped.ok && await waitForDaemonStopped(port);
+    if (stopped.ok && await waitForDaemonStopped(port)) return true;
   }
   if (!await isDaemonRunning(port)) {
     return daemonPortIsFree(port);
@@ -680023,6 +680051,13 @@ async function ensureDaemonVersion(expectedVersion = getLocalCliVersion(), port
     return finish(false, "failed", null, 0, process.platform === "linux");
   }
   getDaemonPid();
+  if (await managedDaemonServiceMatchesPort(port)) {
+    const started = await runUserSystemctl(["start", "omnius-daemon.service"]);
+    if (started.ok) {
+      const ready2 = await waitForDaemonReady(port, expectedVersion);
+      if (ready2.ok) return finish(true, "started", ready2.observedVersion);
+    }
+  }
   const pid = await startDaemon(port);
   if (!pid) {
     for (let i2 = 0; i2 < 20; i2++) {
@@ -751174,17 +751209,12 @@ async function handleUpdate(subcommand, ctx3) {
       daemonUpgrade = await ensureDaemonVersion2(expectedDaemonVersion);
     }
   }
-  if (!daemonUpgrade.ok) {
-    installOverlay.stop("Update installed, but daemon upgrade was not verified");
-    await new Promise((r2) => setTimeout(r2, 1200));
-    installOverlay.dismiss();
-    renderError(
-      `Updated CLI to ${expectedDaemonVersion}, but the shared daemon still reports ${daemonUpgrade.observedVersion ?? "unavailable"} after ${daemonUpgrade.recoveryAttempts} verified recovery round(s). A privileged owner was ${daemonUpgrade.requiresPrivilegedMigration ? "not safely migratable" : "not detected"}; no arbitrary port holder was terminated.`
-    );
-    return;
+  const daemonUpgradeFailure = daemonUpgrade.ok ? null : `The shared daemon still reports ${daemonUpgrade.observedVersion ?? "unavailable"} after ${daemonUpgrade.recoveryAttempts} verified recovery round(s). A privileged owner was ${daemonUpgrade.requiresPrivilegedMigration ? "not safely migratable" : "not detected"}; no arbitrary port holder was terminated. Restarting this session on ${expectedDaemonVersion} anyway — run /daemon restart to retry the daemon.`;
+  if (daemonUpgradeFailure) {
+    renderWarning(daemonUpgradeFailure);
   }
   installOverlay.setStatus(
-    daemonUpgrade.action === "restarted" ? `Daemon upgraded to ${expectedDaemonVersion}` : `Daemon verified at ${expectedDaemonVersion}`
+    !daemonUpgrade.ok ? `Daemon still at ${daemonUpgrade.observedVersion ?? "unknown"} — restarting client anyway` : daemonUpgrade.action === "restarted" ? `Daemon upgraded to ${expectedDaemonVersion}` : `Daemon verified at ${expectedDaemonVersion}`
   );
   ctx3.contextSave?.();
   const hadActiveTask = ctx3.savePendingTaskState?.() ?? false;
@@ -828090,6 +828120,14 @@ This is an independent background session started from /background.`
       }, 1500);
       return;
     }
+    setTimeout(() => {
+      if (statusBar.isActive)
+        writeContent(
+          () => renderWarning(
+            `Shared daemon on port ${apiPort} reports ${daemon.observedVersion ?? "unavailable"}, expected ${daemon.expectedVersion}. Run /daemon restart to retry it.`
+          )
+        );
+    }, 1500);
     const { startApiServer: startApiServer2 } = await Promise.resolve().then(() => (init_serve(), serve_exports));
     const apiServer = startApiServer2({
       port: apiPort,

package/dist/update-worker.js

@@ -293764,6 +293764,27 @@ async function managedDaemonServiceMatchesPort(port) {
   if (environment === null) return false;
   return daemonServiceMatchesPort(port, environment);
 }
+function pidIsInManagedDaemonUnit(pid, readCgroup = defaultReadProcCgroup) {
+  const cgroup = readCgroup(pid);
+  return cgroup === null ? false : cgroup.includes("omnius-daemon.service");
+}
+function defaultReadProcCgroup(pid) {
+  try {
+    return readFileSync4(`/proc/${pid}/cgroup`, "utf8");
+  } catch {
+    return null;
+  }
+}
+async function managedDaemonServiceOwnsPort(port, dependencies = {
+  holderPids: (value) => portHolderPids(value),
+  pidInUnit: (pid) => pidIsInManagedDaemonUnit(pid)
+}) {
+  const holders = await dependencies.holderPids(port);
+  if (holders === null) return false;
+  const uniqueHolders = [...new Set(holders.filter((pid) => pid > 0 && pid !== process.pid))];
+  if (uniqueHolders.length === 0) return true;
+  return uniqueHolders.every((pid) => dependencies.pidInUnit(pid));
+}
 function systemdQuote(value) {
   return /[\s"\\]/.test(value) ? `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"` : value;
 }
@@ -293985,6 +294006,11 @@ async function restartDaemon(port, expectedVersion) {
   const p = port ?? getDaemonPort();
   const managed = await managedDaemonServiceMatchesPort(p);
   if (managed) {
+    if (!await managedDaemonServiceOwnsPort(p)) {
+      const reclaimed = await reclaimOwnedDaemonListener(p);
+      if (!reclaimed.ok) return false;
+      await reclaimStaleDaemonEndpointClaim(p);
+    }
     const restarted = await runUserSystemctl(["restart", "omnius-daemon.service"]);
     if (restarted.ok && (await waitForDaemonReady(p, expectedVersion)).ok) return true;
     const repaired = await repairManagedDaemonUnit(p);
@@ -294130,7 +294156,7 @@ async function stopDaemonAtPort(port = getDaemonPort()) {
 async function quiesceDaemonForUpdate(port = getDaemonPort()) {
   if (await managedDaemonServiceMatchesPort(port)) {
     const stopped = await runUserSystemctl(["stop", "omnius-daemon.service"]);
-    return stopped.ok && await waitForDaemonStopped(port);
+    if (stopped.ok && await waitForDaemonStopped(port)) return true;
   }
   if (!await isDaemonRunning(port)) {
     return daemonPortIsFree(port);

package/npm-shrinkwrap.json

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

package/package.json

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