@proagentstore/cli 0.4.107 → 0.4.109

package/dist/bootstrap.js

@@ -8,7 +8,7 @@ import {
   newestPayload,
   olderThan,
   payloadAt
-} from "./chunk-JOWYSZOL.js";
+} from "./chunk-RGNU4W6B.js";
 
 // src/bootstrap.ts
 import { existsSync } from "fs";

package/dist/{chunk-JOWYSZOL.js → chunk-RGNU4W6B.js}

@@ -12,6 +12,9 @@ var KEEP = 2;
 function payloadRoot() {
   return process.env.PAGS_CLI_CACHE || join(homedir(), ".config", "proagentstore", "cli");
 }
+function isVersion(v) {
+  return typeof v === "string" && /^(\d+)\.(\d+)\.(\d+)/.test(v.trim());
+}
 function olderThan(a, b) {
   const parse = (v) => /^(\d+)\.(\d+)\.(\d+)/.exec(v.trim())?.slice(1).map(Number);
   const x = parse(a);
@@ -44,9 +47,9 @@ function cachedPayloads(root = payloadRoot()) {
 function newestPayload(payloads) {
   return payloads.reduce((best, p) => !best || olderThan(best.version, p.version) ? p : best, null);
 }
-async function latestPublishedVersion(timeoutMs = 3e4) {
+async function latestPublishedVersion(timeoutMs = 3e4, signal) {
   try {
-    const { stdout } = await run("npm", ["view", CLI_PACKAGE, "version"], { timeout: timeoutMs });
+    const { stdout } = await run("npm", ["view", CLI_PACKAGE, "version"], { timeout: timeoutMs, signal });
     return stdout.trim() || null;
   } catch {
     return null;
@@ -88,6 +91,7 @@ export {
   CLI_PACKAGE,
   BOOTSTRAP_ENV,
   NO_SELF_UPDATE_ENV,
+  isVersion,
   olderThan,
   payloadAt,
   cachedPayloads,

package/dist/index.js

@@ -3,9 +3,10 @@ import {
   BOOTSTRAP_ENV,
   CLI_PACKAGE,
   installPayload,
+  isVersion,
   latestPublishedVersion,
   olderThan
-} from "./chunk-JOWYSZOL.js";
+} from "./chunk-RGNU4W6B.js";
 
 // src/index.ts
 import { createRequire as createRequire3 } from "module";
@@ -832,7 +833,7 @@ function buildRuntimeRegistrationBody(opts, capabilities = []) {
     machineNames: machine.names
   };
 }
-async function requestRunner(method, path, opts, body) {
+async function requestRunner(method, path, opts, body, signal) {
   const headers = {
     ...runnerRequestHeaders(opts)
   };
@@ -840,7 +841,8 @@ async function requestRunner(method, path, opts, body) {
   const res = await fetch(`${runnerBaseUrl(opts.url)}${path}`, {
     method,
     headers,
-    body: body === void 0 ? void 0 : JSON.stringify(body)
+    body: body === void 0 ? void 0 : JSON.stringify(body),
+    signal
   });
   const { text, data } = await readResponse(res);
   if (!res.ok) {
@@ -849,7 +851,7 @@ async function requestRunner(method, path, opts, body) {
   }
   return data;
 }
-async function requestPags(method, path, opts, body) {
+async function requestPags(method, path, opts, body, signal) {
   const headers = {
     ...pagsHeaders(opts.pagsToken)
   };
@@ -860,7 +862,8 @@ async function requestPags(method, path, opts, body) {
   const res = await fetch(`${pagsApiBase(opts.apiBase)}${path}`, {
     method,
     headers,
-    body: body === void 0 ? void 0 : JSON.stringify(body)
+    body: body === void 0 ? void 0 : JSON.stringify(body),
+    signal
   });
   const { text, data } = await readResponse(res);
   if (!res.ok) {
@@ -1725,6 +1728,25 @@ function policyScheduleAction(previous, next, wasAuthoritative) {
   if (!wasAuthoritative || !previous.autoUpdate) return "start";
   return "keep";
 }
+function acceptPolicyResponse(local, wasAuthoritative, response) {
+  const remote = policyFromResponse(response);
+  if (!remote) return null;
+  const action = policyScheduleAction(local, remote, wasAuthoritative);
+  const ownerTransition = action === "cancel" || !local.autoUpdate;
+  return { policy: ownerTransition ? { ...local, ...remote } : { ...local, autoUpdate: remote.autoUpdate }, action };
+}
+var ResponseFence = class {
+  sent = 0;
+  accepted = 0;
+  next() {
+    return ++this.sent;
+  }
+  accepts(sentAs) {
+    if (sentAs < this.accepted) return false;
+    this.accepted = sentAs;
+    return true;
+  }
+};
 function mayAutomaticallyRestart(input) {
   return input.authoritative && input.enabled && input.workObserved && input.busy.length === 0;
 }
@@ -1732,6 +1754,21 @@ function mayAutomaticallyRestart(input) {
 // src/commands/runner/auto-update-controller.ts
 var MAX_OBSERVATIONS = 5;
 var IDLE_RETRY_MS = 15e3;
+var OBSERVATION_TIMEOUT_MS = 3e4;
+function updateVerdict(attempt, facts) {
+  const target = attempt.status === "running" || attempt.status === "restarting" ? attempt.latestVersion : void 0;
+  if (!isVersion(facts.current) || !isVersion(facts.latest)) return { kind: "unverified", reason: `the running (${facts.current}) or published (${facts.latest}) version could not be read` };
+  if (target === void 0) return { kind: "current" };
+  if (!isVersion(target)) return { kind: "unverified", reason: `the attempted update's target (${target}) could not be read` };
+  if (olderThan(facts.current, target)) return { kind: "unverified", reason: `the runner came back on ${facts.current}, not the attempted ${target}` };
+  const observed = facts.observations ?? [];
+  const answered = (source) => observed.some((o) => o.source === source && o.success);
+  if (!observed.length) return { kind: "unverified", reason: `the runner is on ${facts.current}, but no health look was taken` };
+  if (!answered("sessions") || !answered("health")) {
+    return { kind: "unverified", reason: `the runner is on ${facts.current}, but its local runtime answered only partly (sessions ${answered("sessions") ? "ok" : "failed"}, health ${answered("health") ? "ok" : "failed"})` };
+  }
+  return { kind: "verified" };
+}
 function blockerClassFor(waitingFor) {
   if (waitingFor.includes("runner-work-observation-unavailable")) return "observation_failure";
   return waitingFor.length ? "active_sessions" : "unknown";
@@ -1741,6 +1778,7 @@ var AutomaticUpdateController = class {
     this.deps = deps;
     this.setTimer = deps.setTimer ?? ((fn, ms) => setTimeout(fn, ms));
     this.clearTimer = deps.clearTimer ?? ((timer) => clearTimeout(timer));
+    this.boundTimer = deps.boundTimer ?? ((fn, ms) => setTimeout(fn, ms));
     this.now = deps.now ?? Date.now;
   }
   deps;
@@ -1757,6 +1795,7 @@ var AutomaticUpdateController = class {
   now;
   setTimer;
   clearTimer;
+  boundTimer;
   /** The controller's own record, safe to report: times, a normalized class, and observation outcomes. */
   diagnostics() {
     return { checkAt: this.checkAt, decisionAt: this.decisionAt, nextRetryDueAt: this.nextRetryDueAt, blockerClass: this.blockerClass, observations: [...this.observations] };
@@ -1774,7 +1813,7 @@ var AutomaticUpdateController = class {
     if (this.checking || this.waiting || !this.retryable()) return;
     this.checking = true;
     try {
-      if (!await this.deps.refreshPolicy() || !this.enabled()) {
+      if (!await this.bounded((signal) => this.deps.refreshPolicy(signal)) || !this.enabled()) {
         this.offline();
         return;
       }
@@ -1835,17 +1874,53 @@ var AutomaticUpdateController = class {
     this.deps.status("failure", { reason: error instanceof Error ? error.message : String(error) });
     this.schedule();
   }
+  /**
+   * One bounded piece of work (#1020): a policy refresh or a facts look. Past {@link OBSERVATION_TIMEOUT_MS} its
+   * signal is aborted (the relay drops that request's response, so a late answer can never restore authority) and
+   * this resolves null — the race has settled, so the late result cannot overwrite a newer one or reach planning,
+   * install or restart. A late rejection is absorbed rather than left unhandled.
+   */
+  async bounded(work) {
+    const abort = new AbortController();
+    let timer;
+    const expired = new Promise((resolve5) => {
+      timer = this.boundTimer(() => {
+        abort.abort();
+        resolve5(null);
+      }, OBSERVATION_TIMEOUT_MS);
+      timer.unref?.();
+    });
+    const running = work(abort.signal);
+    running.catch(() => void 0);
+    try {
+      return await Promise.race([running, expired]);
+    } finally {
+      if (timer) this.clearTimer(timer);
+    }
+  }
   async decide() {
-    const facts = await this.deps.facts();
+    const facts = await this.bounded((signal) => this.deps.facts(signal));
     this.checkAt = this.now();
+    if (!facts) {
+      this.failures++;
+      this.deps.status("failure", { reason: `The local work and registry check did not answer within ${OBSERVATION_TIMEOUT_MS / 1e3}s; it will be retried.` });
+      this.schedule();
+      return;
+    }
     if (facts.observations?.length) this.observations = [...this.observations, ...facts.observations].slice(-MAX_OBSERVATIONS);
     if (!this.enabled()) return this.offline();
     const plan = this.deps.plan(facts);
     this.decisionAt = this.now();
     this.blockerClass = plan.action === "wait" ? blockerClassFor(plan.waitingFor) : null;
     if (plan.action === "up-to-date") {
-      this.failures = 0;
-      this.deps.status("verified-success", { latestVersion: facts.latest ?? void 0, reason: void 0 });
+      const verdict = updateVerdict(this.deps.policy().value, facts);
+      if (verdict.kind === "unverified") {
+        this.failures++;
+        this.deps.status("failure", { reason: `Not verified: ${verdict.reason}.` });
+      } else {
+        this.failures = 0;
+        this.deps.status(verdict.kind === "verified" ? "verified-success" : "enabled", { latestVersion: facts.latest ?? void 0, reason: void 0 });
+      }
       this.schedule();
       return;
     }
@@ -1878,7 +1953,7 @@ var AutomaticUpdateController = class {
       void (async () => {
         this.waiting = false;
         try {
-          if (!await this.deps.refreshPolicy() || !this.enabled()) {
+          if (!await this.bounded((signal) => this.deps.refreshPolicy(signal)) || !this.enabled()) {
             this.offline();
             return;
           }
@@ -1978,20 +2053,20 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
     };
     if (autoUpdateKey) saveAutoUpdatePolicy(autoUpdateKey, autoUpdatePolicy);
   };
-  const acceptAutoUpdatePolicy = (response) => {
-    if (!autoUpdateKey) return;
-    const policy = policyFromResponse(response);
-    if (!policy) return;
-    const action = policyScheduleAction(autoUpdatePolicy, policy, autoUpdatePolicyAuthoritative);
-    autoUpdatePolicy = { ...autoUpdatePolicy, ...policy };
+  const policyFence = new ResponseFence();
+  const acceptAutoUpdatePolicy = (response, sent) => {
+    if (!autoUpdateKey || !policyFence.accepts(sent)) return;
+    const accepted = acceptPolicyResponse(autoUpdatePolicy, autoUpdatePolicyAuthoritative, response);
+    if (!accepted) return;
+    autoUpdatePolicy = accepted.policy;
     autoUpdatePolicyAuthoritative = true;
     if (autoUpdateKey) saveAutoUpdatePolicy(autoUpdateKey, autoUpdatePolicy);
-    if (action === "cancel") {
+    if (accepted.action === "cancel") {
       scheduleAutomaticUpdate(false, true);
       return;
     }
     if (refreshingAutomaticPolicy) return;
-    if (action === "start") {
+    if (accepted.action === "start") {
       scheduleAutomaticUpdate(true);
     }
   };
@@ -1999,7 +2074,8 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
   const caps = Array.isArray(capabilities.capabilities) ? capabilities.capabilities.filter((item) => typeof item === "string") : [];
   const registered = /* @__PURE__ */ new Set();
   let lastRegisterError = "";
-  const registerRuntime = async (id, forceClaim = force) => {
+  const registerRuntime = async (id, forceClaim = force, signal) => {
+    const sent = policyFence.next();
     try {
       const result = await requestPags("POST", `/v1/instances/${apiPathSegment(id)}/runtime`, opts, {
         endpointUrl: localUrl,
@@ -2017,8 +2093,9 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
           error: autoUpdatePolicy.reason,
           ...autoUpdateDiagnostics()
         }
-      });
-      acceptAutoUpdatePolicy(result);
+      }, signal);
+      if (signal?.aborted) return false;
+      acceptAutoUpdatePolicy(result, sent);
       registered.add(id);
       return true;
     } catch (e) {
@@ -2029,13 +2106,13 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
       return false;
     }
   };
-  const refreshAutomaticPolicy = async () => {
+  const refreshAutomaticPolicy = async (signal) => {
     const id = registered.values().next().value;
     if (!id) return false;
     autoUpdatePolicyAuthoritative = false;
     refreshingAutomaticPolicy = true;
     try {
-      return await registerRuntime(id) && autoUpdatePolicyAuthoritative;
+      return await registerRuntime(id, force, signal) && autoUpdatePolicyAuthoritative;
     } finally {
       refreshingAutomaticPolicy = false;
     }
@@ -2052,14 +2129,14 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
     writeLine(formatStatusLine({ registration: state, agents, reason: state === "ok" ? void 0 : lastRegisterError }));
   };
   for (const id of instanceIds) await registerRuntime(id);
-  const updateFacts = async () => {
+  const updateFacts = async (signal) => {
     const [sessionsResult, healthResult] = await Promise.allSettled([
       requestRunner("GET", "/coding/sessions", {
         url: localUrl,
         token: runnerToken,
         instanceId: instanceIds[0]
-      }),
-      requestRunner("GET", "/health", { url: localUrl, token: runnerToken, instanceId: instanceIds[0] })
+      }, void 0, signal),
+      requestRunner("GET", "/health", { url: localUrl, token: runnerToken, instanceId: instanceIds[0] }, void 0, signal)
     ]);
     const busy = sessionsResult.status === "fulfilled" && healthResult.status === "fulfilled" ? observedRunnerWork({ sessions: sessionsResult.value.sessions, work: healthResult.value.work }) : ["runner-work-observation-unavailable"];
     const sampledAt = Date.now();
@@ -2071,7 +2148,7 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
     return {
       observations,
       current: CLI_VERSION,
-      latest: await latestPublishedVersion(),
+      latest: await latestPublishedVersion(void 0, signal),
       fromSource: runsFromSource(),
       restarter: restarterFrom(process.env),
       // A restart ends browser/application work too. Give these durable names to the same
@@ -2388,6 +2465,7 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
       });
       for (const id of [...attached.keys()]) {
         try {
+          const sent = policyFence.next();
           const response = await requestPags("POST", `/v1/instances/${apiPathSegment(id)}/runtime/heartbeat`, opts, {
             runnerNode,
             machineId: machine.id,
@@ -2399,7 +2477,7 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
               ...autoUpdateDiagnostics()
             }
           });
-          acceptAutoUpdatePolicy(response);
+          acceptAutoUpdatePolicy(response, sent);
         } catch (e) {
           failure = e instanceof Error ? e.message : String(e);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proagentstore/cli",
-  "version": "0.4.107",
+  "version": "0.4.109",
   "description": "CLI for creating, publishing, and running ProAgentStore agents",
   "license": "MIT",
   "type": "module",