omnius 1.0.600 → 1.0.601

package/dist/index.js

@@ -678140,6 +678140,8 @@ ${AGENTS_END}`;
 var daemon_exports = {};
 __export(daemon_exports, {
   claimDaemonEndpoint: () => claimDaemonEndpoint,
+  daemonPortFromServiceEnvironment: () => daemonPortFromServiceEnvironment,
+  daemonServiceMatchesPort: () => daemonServiceMatchesPort,
   ensureDaemon: () => ensureDaemon,
   ensureDaemonVersion: () => ensureDaemonVersion,
   forceKillDaemon: () => forceKillDaemon,
@@ -678155,7 +678157,8 @@ __export(daemon_exports, {
   releaseDaemonEndpointForCurrentProcess: () => releaseDaemonEndpointForCurrentProcess,
   restartDaemon: () => restartDaemon,
   startDaemon: () => startDaemon,
-  stopDaemon: () => stopDaemon
+  stopDaemon: () => stopDaemon,
+  stopDaemonAtPort: () => stopDaemonAtPort
 });
 import { spawn as spawn28 } from "node:child_process";
 import { existsSync as existsSync116, readFileSync as readFileSync94, writeFileSync as writeFileSync60, mkdirSync as mkdirSync69, unlinkSync as unlinkSync22, openSync as openSync4, closeSync as closeSync4, writeSync as writeSync3, statSync as statSync46, renameSync as renameSync17 } from "node:fs";
@@ -678279,7 +678282,9 @@ async function isDaemonRunning(port) {
     const resp = await fetch(`http://127.0.0.1:${p2}/health`, {
       signal: AbortSignal.timeout(2e3)
     });
-    return resp.ok;
+    if (!resp.ok) return false;
+    const health = await resp.json();
+    return health.status === "ok" && (typeof health.boot_version === "string" || typeof health.version === "string");
   } catch {
     return false;
   }
@@ -678345,12 +678350,49 @@ async function runUserSystemctl(args, timeout2 = 2e4) {
     return { available: false, ok: false };
   }
 }
+async function readUserSystemctl(args, timeout2 = 5e3) {
+  try {
+    const { spawnSync: spawnSync11 } = await import("node:child_process");
+    const result = spawnSync11("systemctl", ["--user", ...args], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+      timeout: timeout2
+    });
+    return result.status === 0 ? result.stdout.trim() : null;
+  } catch {
+    return null;
+  }
+}
 async function hasManagedDaemonService() {
   const enabled2 = await runUserSystemctl(["is-enabled", "omnius-daemon.service"], 5e3);
   if (enabled2.ok) return true;
   const active = await runUserSystemctl(["is-active", "omnius-daemon.service"], 5e3);
   return active.ok;
 }
+function daemonPortFromServiceEnvironment(value2) {
+  const host = value2.match(/(?:^|\s)OMNIUS_HOST=(?:"([^"]+)"|'([^']+)'|([^\s]+))/)?.slice(1).find(Boolean);
+  const direct = value2.match(/(?:^|\s)OMNIUS_PORT=(?:"(\d+)"|'(\d+)'|(\d+))/)?.slice(1).find(Boolean);
+  const candidate = host?.match(/:(\d+)$/)?.[1] ?? direct;
+  if (!candidate) return null;
+  const port = Number(candidate);
+  return Number.isInteger(port) && port >= 1 && port <= 65535 ? port : null;
+}
+function daemonServiceMatchesPort(requestedPort, effectiveEnvironment) {
+  const effectivePort2 = daemonPortFromServiceEnvironment(effectiveEnvironment);
+  return effectivePort2 === null ? requestedPort === DEFAULT_PORT2 : effectivePort2 === requestedPort;
+}
+async function managedDaemonServiceMatchesPort(port) {
+  if (!await hasManagedDaemonService()) return false;
+  const environment = await readUserSystemctl([
+    "show",
+    "omnius-daemon.service",
+    "--property",
+    "Environment",
+    "--value"
+  ]);
+  if (environment === null) return false;
+  return daemonServiceMatchesPort(port, environment);
+}
 function systemdQuote(value2) {
   return /[\s"\\]/.test(value2) ? `"${value2.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"` : value2;
 }
@@ -678448,6 +678490,43 @@ async function waitForDaemonStopped(port, attempts = DAEMON_GRACEFUL_STOP_ATTEMP
   }
   return false;
 }
+async function reclaimStaleDaemonEndpointClaim(port) {
+  const lockFile = daemonLockFile(port);
+  const record = readDaemonLock(lockFile);
+  if (!record) return true;
+  if (!await daemonPortIsFree(port)) return true;
+  if (!processIsAlive(record.pid)) {
+    const current2 = readDaemonLock(lockFile);
+    if (current2?.pid === record.pid && current2.token === record.token) {
+      try {
+        unlinkSync22(lockFile);
+      } catch {
+      }
+    }
+    return true;
+  }
+  const lease = listProcessLeases({ includeInactive: false }).find(
+    (item) => item.status === "active" && item.pid === record.pid && item.ownerKind === "daemon" && item.ownerId === `daemon:${port}`
+  );
+  if (!lease) return false;
+  const stopped = await stopProcessLease(lease.leaseId, {
+    reason: `stale daemon endpoint claim on port ${port}`,
+    termGraceMs: 1e3
+  });
+  if (stopped.action !== "killed" && stopped.action !== "dead") return false;
+  for (let attempt = 0; attempt < 20 && processIsAlive(record.pid); attempt++) {
+    await delay3(100);
+  }
+  if (processIsAlive(record.pid)) return false;
+  const current = readDaemonLock(lockFile);
+  if (current?.pid === record.pid && current.token === record.token) {
+    try {
+      unlinkSync22(lockFile);
+    } catch {
+    }
+  }
+  return daemonPortIsFree(port);
+}
 async function reclaimOwnedDaemonListener(port = getDaemonPort(), dependencies = DEFAULT_RECLAIM_DEPENDENCIES) {
   const holders = await dependencies.holderPids(port);
   if (holders === null) {
@@ -678523,7 +678602,7 @@ async function reclaimOwnedDaemonListener(port = getDaemonPort(), dependencies =
 }
 async function restartDaemon(port, expectedVersion) {
   const p2 = port ?? getDaemonPort();
-  const managed = await hasManagedDaemonService();
+  const managed = await managedDaemonServiceMatchesPort(p2);
   if (managed) {
     const restarted = await runUserSystemctl(["restart", "omnius-daemon.service"]);
     if (restarted.ok && (await waitForDaemonReady(p2, expectedVersion)).ok) return true;
@@ -678544,6 +678623,7 @@ async function restartDaemon(port, expectedVersion) {
     const reclaimed = await reclaimOwnedDaemonListener(p2);
     if (!reclaimed.ok) return false;
   }
+  if (!await reclaimStaleDaemonEndpointClaim(p2)) return false;
   const pid = await startDaemon(p2);
   if (!pid) return false;
   return (await waitForDaemonReady(p2, expectedVersion)).ok;
@@ -678650,7 +678730,7 @@ async function startDaemon(port = getDaemonPort()) {
         projectRoot: process.cwd(),
         lifecycle: "daemon",
         persistent: true,
-        reason: `shared API daemon on port ${getDaemonPort()}`,
+        reason: `shared API daemon on port ${daemonPort}`,
         command: [daemonCommand.command, ...daemonCommand.args].join(" "),
         cwd: process.cwd()
       });
@@ -678695,6 +678775,17 @@ function stopDaemon() {
     return false;
   }
 }
+async function stopDaemonAtPort(port = getDaemonPort()) {
+  if (await managedDaemonServiceMatchesPort(port)) {
+    const stopped = await runUserSystemctl(["stop", "omnius-daemon.service"]);
+    if (stopped.ok && await waitForDaemonStopped(port)) return true;
+  }
+  const wasRunning = await isDaemonRunning(port);
+  const reclaimed = await reclaimOwnedDaemonListener(port);
+  if (!reclaimed.ok) return false;
+  const claimCleared = await reclaimStaleDaemonEndpointClaim(port);
+  return claimCleared && (wasRunning || reclaimed.action === "cleared");
+}
 async function forceKillDaemon(port) {
   const p2 = port ?? getDaemonPort();
   let killed = 0;
@@ -678804,6 +678895,9 @@ async function ensureDaemonVersion(expectedVersion = getLocalCliVersion(), port
       process.platform === "linux" && reclaimed.action === "blocked"
     );
   }
+  if (!await reclaimStaleDaemonEndpointClaim(port)) {
+    return finish(false, "failed", null, 0, process.platform === "linux");
+  }
   getDaemonPid();
   const pid = await startDaemon(port);
   if (!pid) {
@@ -678888,9 +678982,11 @@ __export(tray_exports, {
   resolveTrayEndpoint: () => resolveTrayEndpoint,
   resolveTrayLaunchCommand: () => resolveTrayLaunchCommand,
   resolveTrayPaths: () => resolveTrayPaths,
+  resolveTrayRegistrationCommand: () => resolveTrayRegistrationCommand,
   runTrayForeground: () => runTrayForeground,
   startTray: () => startTray,
   stopTray: () => stopTray,
+  trayProcessCommandLooksOwned: () => trayProcessCommandLooksOwned,
   trayRequiresRestart: () => trayRequiresRestart,
   traySupport: () => traySupport,
   trayUpdatePresentation: () => trayUpdatePresentation,
@@ -678906,6 +679002,7 @@ import {
   mkdirSync as mkdirSync70,
   openSync as openSync5,
   readFileSync as readFileSync95,
+  realpathSync,
   renameSync as renameSync18,
   unlinkSync as unlinkSync23,
   writeFileSync as writeFileSync61,
@@ -678921,7 +679018,8 @@ function trayUpdatePresentation(currentVersion, latestVersion, state = null) {
       title: `Updating to v${state.target_version} — ${state.phase.replaceAll("_", " ")}`,
       tooltip: `Operation ${state.operation_id}; progress is shared with the dashboard and CLI`,
       enabled: false,
-      targetVersion: state.target_version
+      targetVersion: state.target_version,
+      action: "update-omnius"
     };
   }
   if (state?.status === "failed" && state.target_version === latestVersion) {
@@ -678929,7 +679027,8 @@ function trayUpdatePresentation(currentVersion, latestVersion, state = null) {
       title: `Update to v${state.target_version} failed — retry`,
       tooltip: state.remediation || state.error || "Open the tray logs for update diagnostics",
       enabled: true,
-      targetVersion: state.target_version
+      targetVersion: state.target_version,
+      action: "update-omnius"
     };
   }
   if (currentVersion && latestVersion) {
@@ -678937,13 +679036,15 @@ function trayUpdatePresentation(currentVersion, latestVersion, state = null) {
       title: `Update Omnius to v${latestVersion}`,
       tooltip: `Install and verify the global package, executable, daemon, and tray (current v${currentVersion})`,
       enabled: true,
-      targetVersion: latestVersion
+      targetVersion: latestVersion,
+      action: "update-omnius"
     };
   }
   return {
-    title: currentVersion ? `Omnius v${currentVersion} is up to date` : "Check for Omnius updates",
-    tooltip: "Automatic update checks use the same cached registry result as the CLI and dashboard",
-    enabled: false
+    title: currentVersion ? `Check for Omnius updates (v${currentVersion})` : "Check for Omnius updates",
+    tooltip: "Check npm now; automatic checks continue in the background",
+    enabled: Boolean(currentVersion),
+    action: "check-update"
   };
 }
 function uidSuffix() {
@@ -678994,19 +679095,6 @@ function normalizeTrayEndpoint(value2) {
     return null;
   }
 }
-function systemdDaemonEnvironment() {
-  if (process.platform !== "linux") return "";
-  try {
-    const result = spawnSync9(
-      "systemctl",
-      ["--user", "show", SERVICE_LABEL, "--property", "Environment", "--value"],
-      { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 2e3 }
-    );
-    return result.status === 0 ? result.stdout.trim() : "";
-  } catch {
-    return "";
-  }
-}
 function endpointFromServiceEnvironment(value2) {
   const host = value2.match(/(?:^|\s)OMNIUS_HOST=(?:"([^"]+)"|'([^']+)'|([^\s]+))/)?.slice(1).find(Boolean);
   const port = value2.match(/(?:^|\s)OMNIUS_PORT=(?:"(\d+)"|'(\d+)'|(\d+))/)?.slice(1).find(Boolean);
@@ -679018,7 +679106,6 @@ function resolveTrayEndpoint(explicit) {
     process.env["OMNIUS_TRAY_ENDPOINT"],
     process.env["OMNIUS_HOST"],
     process.env["OMNIUS_PORT"],
-    endpointFromServiceEnvironment(systemdDaemonEnvironment()),
     DEFAULT_ENDPOINT
   ];
   for (const candidate of candidates) {
@@ -679158,6 +679245,30 @@ function readProcessState(path16) {
     return null;
   }
 }
+function processCommandLine(pid) {
+  try {
+    if (process.platform === "linux") {
+      return readFileSync95(`/proc/${pid}/cmdline`, "utf8").replace(/\0/g, " ");
+    }
+    if (process.platform !== "win32") {
+      return spawnSync9("ps", ["-p", String(pid), "-o", "command="], {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+        timeout: 2e3
+      }).stdout.trim();
+    }
+    return spawnSync9("wmic", ["process", "where", `ProcessId=${pid}`, "get", "CommandLine", "/value"], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+      timeout: 2e3
+    }).stdout;
+  } catch {
+    return "";
+  }
+}
+function trayProcessCommandLooksOwned(command) {
+  return /(?:^|\s)tray\s+run(?:\s|$)/i.test(command) && (/(?:^|[\\/\s])omnius(?:[\\/\s]|$)/i.test(command) || /[\\/]dist[\\/]index\.js\b|launcher\.cjs\b/i.test(command));
+}
 function writeProcessState(paths, state) {
   mkdirSync70(paths.runtimeDir, { recursive: true, mode: 448 });
   const temporary = `${paths.stateFile}.${process.pid}.tmp`;
@@ -679232,6 +679343,34 @@ function resolveTrayLaunchCommand() {
   }
   return null;
 }
+function installedOmniusLaunchCommand() {
+  try {
+    const result = spawnSync9(process.platform === "win32" ? "where" : "which", ["omnius"], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+      timeout: 2e3
+    });
+    const first2 = result.stdout?.split(/\r?\n/).map((line) => line.trim()).find(Boolean);
+    return first2 && existsSync117(first2) ? commandForEntrypoint2(realpathSync(first2)) : null;
+  } catch {
+    return null;
+  }
+}
+function resolveTrayRegistrationCommand() {
+  return installedOmniusLaunchCommand() ?? resolveTrayLaunchCommand();
+}
+function registrationIconPath(launch) {
+  const extension3 = process.platform === "win32" ? "ico" : "png";
+  const entrypoints = [...launch.args, launch.command].filter((candidate) => existsSync117(candidate));
+  for (const entrypoint of entrypoints) {
+    const real = realpathSync(entrypoint);
+    for (const packageRoot of [dirname43(real), join129(dirname43(real), "..")]) {
+      const candidate = join129(packageRoot, "assets", "tray", `omnius-online.${extension3}`);
+      if (existsSync117(candidate)) return candidate;
+    }
+  }
+  return assetPath("online");
+}
 function desktopExecQuote(value2) {
   return `"${value2.replaceAll("\\", "\\\\").replaceAll('"', '\\"').replaceAll("$", "\\$").replaceAll("`", "\\`")}"`;
 }
@@ -679285,13 +679424,13 @@ start "" /b ${argv.map(windowsCmdQuote).join(" ")}\r
   throw new Error(`Autostart is not supported on ${platform8}`);
 }
 function writeTrayAutostart(endpoint) {
-  const launch = resolveTrayLaunchCommand();
+  const launch = resolveTrayRegistrationCommand();
   if (!launch) throw new Error("Could not resolve the installed Omnius CLI entrypoint");
   const paths = resolveTrayPaths();
   mkdirSync70(dirname43(paths.autostartFile), { recursive: true });
   writeFileSync61(
     paths.autostartFile,
-    buildAutostartContent(process.platform, launch, endpoint, assetPath("online")),
+    buildAutostartContent(process.platform, launch, endpoint, registrationIconPath(launch)),
     { encoding: "utf8", mode: process.platform === "win32" ? 448 : 384 }
   );
   return paths.autostartFile;
@@ -679313,44 +679452,12 @@ function uninstallTrayAutostart() {
   unlinkSync23(paths.autostartFile);
   return true;
 }
-function runServiceControl(action) {
-  try {
-    if (process.platform === "linux") {
-      const result = spawnSync9("systemctl", ["--user", action, SERVICE_LABEL], {
-        stdio: "ignore",
-        timeout: 1e4
-      });
-      return result.status === 0;
-    }
-    if (process.platform === "darwin" && typeof process.getuid === "function") {
-      const domain = `gui/${process.getuid()}`;
-      const plist = join129(homedir40(), "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
-      if (action === "stop") {
-        return spawnSync9("launchctl", ["bootout", `${domain}/${LAUNCHD_LABEL}`], { stdio: "ignore", timeout: 1e4 }).status === 0;
-      }
-      if (action === "restart") {
-        return spawnSync9("launchctl", ["kickstart", "-k", `${domain}/${LAUNCHD_LABEL}`], { stdio: "ignore", timeout: 1e4 }).status === 0;
-      }
-      spawnSync9("launchctl", ["bootstrap", domain, plist], { stdio: "ignore", timeout: 1e4 });
-      return spawnSync9("launchctl", ["kickstart", `${domain}/${LAUNCHD_LABEL}`], { stdio: "ignore", timeout: 1e4 }).status === 0;
-    }
-    if (process.platform === "win32") {
-      const args = action === "stop" ? ["/End", "/TN", WINDOWS_TASK_NAME] : ["/Run", "/TN", WINDOWS_TASK_NAME];
-      return spawnSync9("schtasks", args, { stdio: "ignore", timeout: 1e4 }).status === 0;
-    }
-  } catch {
-  }
-  return false;
-}
 async function controlDaemon(action, endpoint) {
-  if (runServiceControl(action)) return true;
-  if (action === "stop") return stopDaemon();
-  if (action === "restart") {
-    stopDaemon();
-    await new Promise((resolve87) => setTimeout(resolve87, 500));
-  }
   const port = Number(new URL(endpoint).port);
-  return await startDaemon(Number.isInteger(port) && port > 0 ? port : void 0) !== null;
+  if (!Number.isInteger(port) || port <= 0) return false;
+  if (action === "stop") return stopDaemonAtPort(port);
+  if (action === "restart") return restartDaemon(port, getLocalCliVersion());
+  return (await ensureDaemonVersion(getLocalCliVersion(), port)).ok;
 }
 function openExternal(target) {
   try {
@@ -679394,7 +679501,7 @@ function menuForHealth(health, endpoint, registered, update2) {
     title: update2.title,
     tooltip: update2.tooltip,
     enabled: update2.enabled,
-    action: "update-omnius"
+    action: update2.action
   };
   return {
     healthItem,
@@ -679462,7 +679569,9 @@ async function startTray(explicitEndpoint) {
     if (!trayRequiresRestart(existing, endpoint, liveHealth)) {
       return { ...existing, health: liveHealth };
     }
-    await stopTray();
+    if (!await stopTray()) {
+      throw new Error(`Could not stop the existing Omnius indicator on ${existing.endpoint}`);
+    }
   }
   const support = traySupport();
   if (!support.supported) throw new Error(support.reason || "Tray is not supported on this host");
@@ -679513,16 +679622,49 @@ async function stopTray() {
     }
     return false;
   }
+  const state = readProcessState(paths.stateFile);
+  if (state?.pid !== pid || !trayProcessCommandLooksOwned(processCommandLine(pid))) {
+    return false;
+  }
   try {
     process.kill(pid, "SIGTERM");
   } catch {
     return false;
   }
   for (let i2 = 0; i2 < 30; i2++) {
-    if (!isProcessAlive2(pid)) return true;
+    if (!isProcessAlive2(pid)) {
+      try {
+        unlinkSync23(paths.pidFile);
+      } catch {
+      }
+      try {
+        unlinkSync23(paths.stateFile);
+      } catch {
+      }
+      return true;
+    }
+    await new Promise((resolve87) => setTimeout(resolve87, 100));
+  }
+  if (!trayProcessCommandLooksOwned(processCommandLine(pid))) return false;
+  try {
+    process.kill(pid, "SIGKILL");
+  } catch {
+  }
+  for (let i2 = 0; i2 < 20; i2++) {
+    if (!isProcessAlive2(pid)) {
+      try {
+        unlinkSync23(paths.pidFile);
+      } catch {
+      }
+      try {
+        unlinkSync23(paths.stateFile);
+      } catch {
+      }
+      return true;
+    }
     await new Promise((resolve87) => setTimeout(resolve87, 100));
   }
-  return !isProcessAlive2(pid);
+  return false;
 }
 async function runTrayForeground(explicitEndpoint) {
   const support = traySupport();
@@ -679619,6 +679761,7 @@ async function runTrayForeground(explicitEndpoint) {
       menuState.updateItem.title = updateView.title;
       menuState.updateItem.tooltip = updateView.tooltip;
       menuState.updateItem.enabled = updateView.enabled;
+      menuState.updateItem.action = updateView.action;
       const autostartRegistered = existsSync117(paths.autostartFile);
       const autostartChanged = menuState.autostartItem.checked !== autostartRegistered;
       if (autostartChanged) menuState.autostartItem.checked = autostartRegistered;
@@ -679687,6 +679830,22 @@ async function runTrayForeground(explicitEndpoint) {
             await tray?.sendAction({ type: "update-item", item: menuState.updateItem });
             break;
           }
+          case "check-update": {
+            const currentVersion = health.version;
+            if (!currentVersion) break;
+            availableUpdate = await checkForUpdate(currentVersion, true);
+            updateView = trayUpdatePresentation(
+              currentVersion,
+              availableUpdate?.latestVersion,
+              readUpdateState()
+            );
+            menuState.updateItem.title = updateView.title;
+            menuState.updateItem.tooltip = updateView.tooltip;
+            menuState.updateItem.enabled = updateView.enabled;
+            menuState.updateItem.action = updateView.action;
+            await tray?.sendAction({ type: "update-item", item: menuState.updateItem });
+            break;
+          }
           case "quit":
             await shutdown();
             break;
@@ -679708,7 +679867,7 @@ async function runTrayForeground(explicitEndpoint) {
     releaseTrayPid(paths);
   }
 }
-var DEFAULT_ENDPOINT, TRAY_HELPER_VERSION, POLL_INTERVAL_MS, START_WAIT_MS, SERVICE_LABEL, LAUNCHD_LABEL, WINDOWS_TASK_NAME, EXPECTED_HELPER_SHA256;
+var DEFAULT_ENDPOINT, TRAY_HELPER_VERSION, POLL_INTERVAL_MS, START_WAIT_MS, EXPECTED_HELPER_SHA256;
 var init_tray = __esm({
   "packages/cli/src/tray.ts"() {
     init_daemon();
@@ -679718,9 +679877,6 @@ var init_tray = __esm({
     TRAY_HELPER_VERSION = "2.1.4";
     POLL_INTERVAL_MS = 1e4;
     START_WAIT_MS = 5e3;
-    SERVICE_LABEL = "omnius-daemon.service";
-    LAUNCHD_LABEL = "ai.omnius.daemon";
-    WINDOWS_TASK_NAME = "OmniusDaemon";
     EXPECTED_HELPER_SHA256 = {
       aix: void 0,
       android: void 0,
@@ -679759,6 +679915,26 @@ function output(status, json = false) {
 `);
   else printStatus(status);
 }
+function endpointPort(endpoint) {
+  const port = Number(new URL(endpoint).port);
+  if (!Number.isInteger(port) || port <= 0) {
+    throw new Error(`Invalid tray daemon endpoint: ${endpoint}`);
+  }
+  return port;
+}
+async function ensureTrayDaemonOnline(endpoint) {
+  const port = endpointPort(endpoint);
+  const daemon = await ensureDaemonVersion(getLocalCliVersion(), port);
+  if (!daemon.ok) {
+    throw new Error(`Could not reconcile the Omnius daemon on port ${port}`);
+  }
+  for (let attempt = 0; attempt < 10; attempt++) {
+    const health = await pollTrayHealth(endpoint);
+    if (health.kind === "online") return;
+    await new Promise((resolve87) => setTimeout(resolve87, 200));
+  }
+  throw new Error(`Omnius daemon did not become online at ${endpoint}`);
+}
 async function trayCommand(options2) {
   const raw = options2.subCommand || "status";
   if (!SUBCOMMANDS.has(raw)) {
@@ -679767,10 +679943,12 @@ async function trayCommand(options2) {
   const subCommand = raw;
   const endpoint = resolveTrayEndpoint(options2.endpoint);
   if (subCommand === "run") {
+    await ensureTrayDaemonOnline(endpoint);
     await runTrayForeground(endpoint);
     return;
   }
   if (subCommand === "install") {
+    await ensureTrayDaemonOnline(endpoint);
     const registrationFile = installTrayAutostart(endpoint);
     const status = await startTray(endpoint);
     if (!options2.json) process.stdout.write(`Registered tray autostart: ${registrationFile}
@@ -679787,6 +679965,7 @@ async function trayCommand(options2) {
     return;
   }
   if (subCommand === "start") {
+    await ensureTrayDaemonOnline(endpoint);
     output(await startTray(endpoint), options2.json);
     return;
   }
@@ -679798,7 +679977,11 @@ async function trayCommand(options2) {
     return;
   }
   if (subCommand === "restart") {
-    await stopTray();
+    await ensureTrayDaemonOnline(endpoint);
+    const status = await getTrayStatus(endpoint);
+    if (status.running && !await stopTray()) {
+      throw new Error(`Could not stop the existing Omnius indicator on ${status.endpoint}`);
+    }
     output(await startTray(endpoint), options2.json);
     return;
   }
@@ -679808,6 +679991,7 @@ var SUBCOMMANDS;
 var init_tray2 = __esm({
   "packages/cli/src/commands/tray.ts"() {
     init_tray();
+    init_daemon();
     SUBCOMMANDS = /* @__PURE__ */ new Set([
       "install",
       "uninstall",
@@ -724624,9 +724808,18 @@ async function runIndicatorCommand(rawAction, operations = DEFAULT_OPERATIONS) {
         daemon
       };
     }
+    operations.register?.(endpoint);
     const started = await operations.start(endpoint);
+    if (!started.running || !started.ready || started.endpoint !== endpoint || started.error) {
+      return {
+        level: "error",
+        message: `Indicator did not bind to ${endpoint}. ` + formatIndicatorStatus(started, daemon),
+        status: started,
+        daemon
+      };
+    }
     const health = await waitForOnlineHealth(endpoint, operations);
-    const status = { ...started, endpoint, health };
+    const status = { ...started, health };
     const level = status.error ? "error" : status.running && status.ready && health.kind === "online" ? "info" : "error";
     return {
       level,
@@ -724648,6 +724841,7 @@ var init_indicator_command = __esm({
     init_daemon();
     DEFAULT_OPERATIONS = {
       ensureDaemon: () => ensureDaemonVersion(),
+      register: (endpoint) => installTrayAutostart(endpoint),
       start: (endpoint) => startTray(endpoint),
       status: () => getTrayStatus(),
       health: (endpoint) => pollTrayHealth(endpoint),

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "omnius",
-  "version": "1.0.600",
+  "version": "1.0.601",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "omnius",
-      "version": "1.0.600",
+      "version": "1.0.601",
       "bundleDependencies": [
         "image-to-ascii"
       ],
@@ -4084,9 +4084,9 @@
       }
     },
     "node_modules/hono": {
-      "version": "4.12.34",
-      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.34.tgz",
-      "integrity": "sha512-GqXJqY/xJkJmuloTrnV1ZEXG3fqte+VjkUqoRNZXcrUidiUOP4fMSIHHY4tsqZBK++kVyWmt/AAfSUuy57/eSA==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/hono/-/hono-4.13.0.tgz",
+      "integrity": "sha512-jhunvfHWxd7J5EFfSgH4xsYJzSe/lfqbUCxiyyeaQasUsXeEHXtzVid+7EOGByc5JnFa23SSFL3Y2RV/z1T+eQ==",
       "license": "MIT",
       "engines": {
         "node": ">=16.9.0"

package/package.json

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