@ouro.bot/cli 0.1.0-alpha.324 → 0.1.0-alpha.325

package/changelog.json

@@ -1,6 +1,12 @@
 {
   "_note": "This changelog is maintained as part of the PR/version-bump workflow. Agent-curated, not auto-generated. Agents read this file directly via read_file to understand what changed between versions.",
   "versions": [
+    {
+      "version": "0.1.0-alpha.325",
+      "changes": [
+        "fix(daemon): make `ouro up` run the same startup stability/status poll for already-running current daemons and successful stale-daemon restarts, so degraded workers are summarized with their repair hints instead of returning with only `daemon already running` or `restarted stale daemon`."
+      ]
+    },
     {
       "version": "0.1.0-alpha.324",
       "changes": [

package/dist/heart/daemon/cli-exec.js

@@ -83,45 +83,6 @@ const DEFAULT_DAEMON_STARTUP_STABILITY_WINDOW_MS = 1_500;
 const DEFAULT_DAEMON_STARTUP_RETRY_LIMIT = 1;
 const DEFAULT_DAEMON_STARTUP_LOG_LINES = 10;
 async function ensureDaemonRunning(deps) {
-    const alive = await deps.checkSocketAlive(deps.socketPath);
-    if (alive) {
-        const localRuntime = (0, runtime_metadata_1.getRuntimeMetadata)();
-        let runningRuntimePromise = null;
-        const fetchRunningRuntimeMetadata = async () => {
-            runningRuntimePromise ??= (async () => {
-                const status = await deps.sendCommand(deps.socketPath, { kind: "daemon.status" });
-                const payload = (0, cli_render_1.parseStatusPayload)(status.data);
-                return {
-                    version: payload?.overview.version ?? "unknown",
-                    lastUpdated: payload?.overview.lastUpdated ?? "unknown",
-                    repoRoot: payload?.overview.repoRoot ?? "unknown",
-                    configFingerprint: payload?.overview.configFingerprint ?? "unknown",
-                };
-            })();
-            return runningRuntimePromise;
-        };
-        return (0, daemon_runtime_sync_1.ensureCurrentDaemonRuntime)({
-            socketPath: deps.socketPath,
-            localVersion: localRuntime.version,
-            localLastUpdated: localRuntime.lastUpdated,
-            localRepoRoot: localRuntime.repoRoot,
-            localConfigFingerprint: localRuntime.configFingerprint,
-            fetchRunningVersion: async () => (await fetchRunningRuntimeMetadata()).version,
-            fetchRunningRuntimeMetadata,
-            stopDaemon: async () => {
-                await deps.sendCommand(deps.socketPath, { kind: "daemon.stop" });
-            },
-            cleanupStaleSocket: deps.cleanupStaleSocket,
-            startDaemonProcess: deps.startDaemonProcess,
-            checkSocketAlive: deps.checkSocketAlive,
-        });
-    }
-    const retryLimit = deps.startupRetryLimit ?? DEFAULT_DAEMON_STARTUP_RETRY_LIMIT;
-    let lastFailure = {
-        reason: "daemon failed before the startup monitor recorded a failure",
-        retryable: false,
-    };
-    let lastPid = null;
     const readLatestDaemonStartupEvent = () => {
         try {
             // The daemon writes structured events to daemon.ndjson in the first
@@ -165,6 +126,67 @@ async function ensureDaemonRunning(deps) {
         }
         return null;
     };
+    const alive = await deps.checkSocketAlive(deps.socketPath);
+    if (alive) {
+        const localRuntime = (0, runtime_metadata_1.getRuntimeMetadata)();
+        let runningRuntimePromise = null;
+        const fetchRunningRuntimeMetadata = async () => {
+            runningRuntimePromise ??= (async () => {
+                const status = await deps.sendCommand(deps.socketPath, { kind: "daemon.status" });
+                const payload = (0, cli_render_1.parseStatusPayload)(status.data);
+                return {
+                    version: payload?.overview.version ?? "unknown",
+                    lastUpdated: payload?.overview.lastUpdated ?? "unknown",
+                    repoRoot: payload?.overview.repoRoot ?? "unknown",
+                    configFingerprint: payload?.overview.configFingerprint ?? "unknown",
+                };
+            })();
+            return runningRuntimePromise;
+        };
+        const runtimeResult = await (0, daemon_runtime_sync_1.ensureCurrentDaemonRuntime)({
+            socketPath: deps.socketPath,
+            localVersion: localRuntime.version,
+            localLastUpdated: localRuntime.lastUpdated,
+            localRepoRoot: localRuntime.repoRoot,
+            localConfigFingerprint: localRuntime.configFingerprint,
+            fetchRunningVersion: async () => (await fetchRunningRuntimeMetadata()).version,
+            fetchRunningRuntimeMetadata,
+            stopDaemon: async () => {
+                await deps.sendCommand(deps.socketPath, { kind: "daemon.stop" });
+            },
+            cleanupStaleSocket: deps.cleanupStaleSocket,
+            startDaemonProcess: deps.startDaemonProcess,
+            checkSocketAlive: deps.checkSocketAlive,
+        });
+        if (!runtimeResult.verifyStartupStatus) {
+            return runtimeResult;
+        }
+        const stability = await (0, startup_tui_1.pollDaemonStartup)({
+            sendCommand: deps.sendCommand,
+            socketPath: deps.socketPath,
+            daemonPid: runtimeResult.startedPid ?? null,
+            /* v8 ignore next -- thin wrapper: raw process.stdout.write for ANSI cursor control @preserve */
+            writeRaw: (text) => process.stdout.write(text),
+            /* v8 ignore next -- thin wrapper: real Date.now() injected for testability @preserve */
+            now: () => Date.now(),
+            /* v8 ignore next -- thin wrapper: real setTimeout injected for testability @preserve */
+            sleep: (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
+            /* v8 ignore start -- daemon log tail + pid check: reads real filesystem, tested via deployment @preserve */
+            readLatestDaemonEvent: readLatestDaemonStartupEvent,
+            /* v8 ignore stop */
+        });
+        return {
+            alreadyRunning: runtimeResult.alreadyRunning,
+            message: runtimeResult.message,
+            stability,
+        };
+    }
+    const retryLimit = deps.startupRetryLimit ?? DEFAULT_DAEMON_STARTUP_RETRY_LIMIT;
+    let lastFailure = {
+        reason: "daemon failed before the startup monitor recorded a failure",
+        retryable: false,
+    };
+    let lastPid = null;
     for (let attempt = 0; attempt <= retryLimit; attempt += 1) {
         deps.reportDaemonStartupPhase?.("starting daemon...");
         deps.reportDaemonStartupPhase?.("waiting for daemon socket...");

package/dist/heart/daemon/daemon-runtime-sync.js

@@ -140,6 +140,8 @@ async function ensureCurrentDaemonRuntime(deps) {
                 message: includesVersionDrift
                     ? `restarted stale daemon from ${runningVersion} to ${deps.localVersion} (pid ${pid})${suffix}`
                     : `restarted drifted daemon (${driftSummary}) (pid ${pid})${suffix}`,
+                verifyStartupStatus: verified,
+                startedPid: started.pid ?? null,
             };
             (0, runtime_1.emitNervesEvent)({
                 component: "daemon",
@@ -213,6 +215,8 @@ async function ensureCurrentDaemonRuntime(deps) {
     const result = {
         alreadyRunning: true,
         message: `daemon already running (${deps.socketPath})`,
+        verifyStartupStatus: true,
+        startedPid: null,
     };
     (0, runtime_1.emitNervesEvent)({
         component: "daemon",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.324",
+  "version": "0.1.0-alpha.325",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "cli": "dist/heart/daemon/ouro-bot-entry.js",