@ouro.bot/cli 0.1.0-alpha.646 → 0.1.0-alpha.648

package/changelog.json

@@ -1,6 +1,18 @@
 {
   "_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.648",
+      "changes": [
+        "Daemon restart state truth: stale exits from a child intentionally replaced during restart are ignored, preventing provider refresh from reporting success while a later SIGTERM from the old worker clears the replacement pid and leaves status stuck at `starting`."
+      ]
+    },
+    {
+      "version": "0.1.0-alpha.647",
+      "changes": [
+        "Provider refresh restart hardening: provider-refresh restarts now skip redundant vault config checks after credentials are already refreshed, and the Bitwarden cross-process lock wait outlasts a single `bw` child timeout so concurrent vault users survive normal holder cleanup instead of failing at the same 30s boundary."
+      ]
+    },
     {
       "version": "0.1.0-alpha.646",
       "changes": [

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

@@ -2001,14 +2001,16 @@ async function storeRuntimeConfigKey(input) {
 function readRuntimeApplyWorker(payload, agent) {
     return payload.workers.find((worker) => worker.agent === agent) ?? null;
 }
-async function applyRuntimeChangeToRunningAgent(agent, deps, onProgress) {
+async function applyRuntimeChangeToRunningAgent(agent, deps, onProgress, options = {}) {
     try {
         onProgress?.("checking whether Ouro is already running");
         const alive = await deps.checkSocketAlive(deps.socketPath);
         if (!alive)
             return "daemon is not running; next `ouro up` will load the change";
         onProgress?.(`asking Ouro to reload ${agent}`);
-        const response = await withCliTimeout(DEFAULT_AGENT_RESTART_TIMEOUT_MS, "daemon restart request timed out", () => deps.sendCommand(deps.socketPath, { kind: "agent.restart", agent }));
+        const response = await withCliTimeout(DEFAULT_AGENT_RESTART_TIMEOUT_MS, "daemon restart request timed out", () => deps.sendCommand(deps.socketPath, options.skipRestartConfigCheck
+            ? { kind: "agent.restart", agent, skipConfigCheck: true }
+            : { kind: "agent.restart", agent }));
         if (!response.ok)
             return `daemon restart skipped: ${response.error ?? response.message ?? "unknown daemon error"}`;
         const deadline = cliNowMs(deps) + DEFAULT_RUNTIME_APPLY_TIMEOUT_MS;
@@ -4716,7 +4718,7 @@ async function executeProviderRefresh(command, deps) {
         deps.writeStdout(message);
         return message;
     }
-    const reload = await runCommandProgressPhase(progress, `applying change to running ${command.agent}`, () => applyRuntimeChangeToRunningAgent(command.agent, deps, (message) => progress.updateDetail(message)), (result) => result);
+    const reload = await runCommandProgressPhase(progress, `applying change to running ${command.agent}`, () => applyRuntimeChangeToRunningAgent(command.agent, deps, (message) => progress.updateDetail(message), { skipRestartConfigCheck: true }), (result) => result);
     progress.end();
     lines.push(`running agent: ${reload}`);
     const message = lines.join("\n");

package/dist/heart/daemon/daemon.js

@@ -1177,7 +1177,10 @@ class OuroDaemon {
                 if (!managed) {
                     return { ok: false, error: `Unknown managed agent '${command.agent}'.` };
                 }
-                void this.processManager.restartAgent(command.agent).catch((error) => {
+                const restartWork = command.skipConfigCheck === true
+                    ? this.processManager.restartAgent(command.agent, { skipConfigCheck: true })
+                    : this.processManager.restartAgent(command.agent);
+                void restartWork.catch((error) => {
                     (0, runtime_1.emitNervesEvent)({
                         level: "error",
                         component: "daemon",

package/dist/heart/daemon/process-manager.js

@@ -203,7 +203,7 @@ class DaemonProcessManager {
             });
         }
     }
-    async startAgent(agent) {
+    async startAgent(agent, options = {}) {
         const state = this.requireAgent(agent);
         if (state.process || state.startInFlight)
             return;
@@ -215,7 +215,7 @@ class DaemonProcessManager {
             this.clearRestartTimer(state);
             state.stopRequested = false;
             state.snapshot.status = "starting";
-            if (this.configCheckFn) {
+            if (this.configCheckFn && options.skipConfigCheck !== true) {
                 let result;
                 try {
                     result = await this.configCheckFn(agent);
@@ -260,6 +260,10 @@ class DaemonProcessManager {
                 state.snapshot.errorReason = null;
                 state.snapshot.fixHint = null;
             }
+            if (options.skipConfigCheck === true) {
+                state.snapshot.errorReason = null;
+                state.snapshot.fixHint = null;
+            }
             const runCwd = (0, identity_1.getRepoRoot)();
             const entryScript = path.join((0, identity_1.getRepoRoot)(), "dist", state.config.entry);
             if (this.existsSyncFn && !this.existsSyncFn(entryScript)) {
@@ -392,7 +396,7 @@ class DaemonProcessManager {
             });
             /* v8 ignore stop */
             child.once("exit", (code, signal) => {
-                this.onExit(state, code, signal);
+                this.onExit(state, child, code, signal);
             });
         }
         finally {
@@ -437,7 +441,7 @@ class DaemonProcessManager {
         }
         this.notifySnapshotChange(state.snapshot);
     }
-    async restartAgent(agent) {
+    async restartAgent(agent, options = {}) {
         const state = this.requireAgent(agent);
         // Respawn-loop guard: prune timestamps outside the window, then check
         // whether we've already restarted this agent too many times in it.
@@ -519,7 +523,7 @@ class DaemonProcessManager {
             state.startAttemptedAtMs = null;
         }
         await this.stopAgent(agent);
-        await this.startAgent(agent);
+        await this.startAgent(agent, options);
     }
     async stopAll() {
         for (const state of this.agents.values()) {
@@ -575,8 +579,8 @@ class DaemonProcessManager {
     listAgentSnapshots() {
         return [...this.agents.values()].map((state) => state.snapshot);
     }
-    onExit(state, code, signal) {
-        if (!state.process)
+    onExit(state, child, code, signal) {
+        if (state.process !== child)
             return;
         state.process = null;
         state.startInFlight = false;

package/dist/repertoire/bitwarden-store.js

@@ -168,7 +168,8 @@ function isBwItemNotFoundError(error) {
 //      detection serializes across processes.
 // ---------------------------------------------------------------------------
 const BW_LOCK_FILENAME = ".ouro-bw.lock";
-const BW_LOCK_TIMEOUT_MS = 30_000;
+const BW_COMMAND_TIMEOUT_MS = 30_000;
+const BW_LOCK_TIMEOUT_MS = 75_000;
 const BW_LOCK_POLL_MS = 100;
 const BW_LOCK_DEAD_CHILD_GRACE_MS = 2_000;
 const BW_LOCK_STALE_MS = BW_LOCK_TIMEOUT_MS * 2;
@@ -344,7 +345,7 @@ function execBw(args, sessionToken, appDataDir, stdin, bwBinaryPath = "bw", extr
         ...extraEnv,
     };
     const runCommand = (lock) => new Promise((resolve, reject) => {
-        const child = (0, node_child_process_1.execFile)(bwBinaryPath, args, { timeout: 30_000, env }, (err, stdout, stderr) => {
+        const child = (0, node_child_process_1.execFile)(bwBinaryPath, args, { timeout: BW_COMMAND_TIMEOUT_MS, env }, (err, stdout, stderr) => {
             if (err) {
                 if (isBwNotInstalled(err)) {
                     reject(new Error("bw CLI not found. Install from https://bitwarden.com/help/cli/"));

package/package.json

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