@proagentstore/cli 0.4.59 → 0.4.61

package/dist/browser-runner/coding/repo-write.js

@@ -159,10 +159,13 @@ export function switchRepoBranch(workDir, branch) {
  * `switchRepoBranch` follows and for the same reason: the cloud's picture of the tree is a read
  * taken moments earlier over a relay, and the write has to be safe against the tree as it IS.
  *
- *   dirty        refused. A fast-forward that touches a file with uncommitted edits is aborted by
- *                git anyway, but one that does not touch it silently succeeds and leaves the diff
- *                sitting on a base it was not written against. Refusing is the only answer that
- *                cannot change what somebody's uncommitted work means.
+ *   dirty        NOT refused (#804 — it was at 0.4.59). Unlike a checkout, a fast-forward carries
+ *                nothing across: an uncommitted edit to a file the incoming commits do not touch is
+ *                the same edit afterwards, and one they DO touch makes git abort before writing a
+ *                byte ("Your local changes … would be overwritten"). Untracked files likewise —
+ *                left alone, unless an incoming commit adds that path, which git refuses by name.
+ *                The check is therefore git's own, against the real history, and arrives as
+ *                `error`. Nothing here stashes, cleans or commits on the owner's behalf.
  *   off-branch   refused when `branch` is given and HEAD is elsewhere. The declared branch is the
  *                one the cloud judged stale; pulling whatever the checkout happens to be on would
  *                be acting on a verdict about a different ref.
@@ -193,26 +196,26 @@ export function fastForwardRepo(workDir, opts = {}) {
     if (abbrev === "HEAD")
         return { ...base, refused: "detached" };
     const branch = abbrev;
+    // Read, reported, never a refusal (see the doc above). A status git will not give is `null`,
+    // not `false` — "clean" is a claim, and this is the field the owner's sentence is built from.
     let dirty;
     try {
         dirty = isDirty(workDir);
     }
-    catch (e) {
-        return { ...base, branch, error: gitFailureLine(e) };
+    catch {
+        dirty = null;
     }
-    if (dirty)
-        return { ...base, branch, dirty: true, refused: "dirty" };
     if (want !== null && branch !== want)
-        return { ...base, branch, refused: "off-branch" };
+        return { ...base, branch, dirty, refused: "off-branch" };
     let upstream;
     try {
         upstream = git(workDir, ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"]).trim();
     }
     catch {
-        return { ...base, branch, refused: "no-upstream" };
+        return { ...base, branch, dirty, refused: "no-upstream" };
     }
     if (!upstream)
-        return { ...base, branch, refused: "no-upstream" };
+        return { ...base, branch, dirty, refused: "no-upstream" };
     let from;
     try {
         from = git(workDir, ["rev-parse", "HEAD"]).trim() || null;
@@ -226,9 +229,11 @@ export function fastForwardRepo(workDir, opts = {}) {
         git(workDir, gitWriteArgv("fast-forward"), { timeout: 30_000, env: networkGitEnv() });
     }
     catch (e) {
-        // `--ff-only` refused, the network failed, or auth was needed and (correctly) not prompted
-        // for. In every case git left the tree as it was; the sentence says which.
-        return { ...base, branch, upstream, from, to: from, error: gitFailureLine(e) };
+        // `--ff-only` refused, an incoming commit would overwrite a local change or an untracked
+        // path, the network failed, or auth was needed and (correctly) not prompted for. In every
+        // case git left the tree as it was; the sentence says which, and names the file when there
+        // is one.
+        return { ...base, branch, upstream, from, to: from, dirty, error: gitFailureLine(e) };
     }
     // CONFIRM, do not assume — read HEAD back and count what arrived from git, not from the
     // exit code.

package/dist/index.js

@@ -1220,6 +1220,18 @@ function shouldRegisterOnOpen(reconnect, alreadyRegistered) {
 function pendingRegistrations(attached, registered) {
   return [...attached].filter((id) => !registered.has(id));
 }
+function partitionByPin(instances, thisNode, alsoKnownAs = []) {
+  const here = [];
+  const elsewhere = [];
+  for (const inst of instances) (isEligible(inst, thisNode, alsoKnownAs) ? here : elsewhere).push(inst);
+  return { here, elsewhere };
+}
+function registrationStatus(attached, registered) {
+  const ids = [...attached];
+  const have = ids.filter((id) => registered.has(id)).length;
+  const total = ids.length;
+  return { agents: `${have}/${total}`, state: have === total ? "ok" : have === 0 ? "fail" : "partial" };
+}
 function instanceLabel(inst) {
   const short = `${inst.id.slice(0, 8)}\u2026`;
   return inst.name ? `${inst.name} (${short})` : short;
@@ -1289,14 +1301,13 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
       return false;
     }
   };
+  const attached = /* @__PURE__ */ new Map();
+  const blocked = /* @__PURE__ */ new Set();
   const reportRegistration = () => {
-    const agents = `${registered.size}/${instanceIds.length}`;
-    const state = registered.size === instanceIds.length ? "ok" : registered.size === 0 ? "fail" : "partial";
+    const { agents, state } = registrationStatus(attached.keys(), registered);
     writeLine(formatStatusLine({ registration: state, agents, reason: state === "ok" ? void 0 : lastRegisterError }));
   };
   for (const id of instanceIds) await registerRuntime(id);
-  const attached = /* @__PURE__ */ new Map();
-  const blocked = /* @__PURE__ */ new Set();
   const attach = (id, label = `${id.slice(0, 8)}\u2026`) => {
     if (attached.has(id)) return;
     const mintToken = () => requestPags("POST", `/v1/relay/${apiPathSegment(id)}/token`, { ...opts, pagsToken }, {}).then((r) => r.token);
@@ -1339,7 +1350,8 @@ async function connectViaRelay(instanceIds, localUrl, runnerToken, opts, force =
   };
   for (const id of instanceIds) attach(id, "");
   reportRegistration();
-  writeLine(registered.size === instanceIds.length ? `Runtime registered with PAGS \u2713 (${registered.size}/${instanceIds.length} agents)` : `Runtime registration incomplete: ${registered.size}/${instanceIds.length} agents \u2014 retried on each relay (re)connect${watchInstances ? " and every 20s while this runs" : ""}.`);
+  const startup = registrationStatus(attached.keys(), registered);
+  writeLine(startup.state === "ok" ? `Runtime registered with PAGS \u2713 (${startup.agents} agents)` : `Runtime registration incomplete: ${startup.agents} agents \u2014 retried on each relay (re)connect${watchInstances ? " and every 20s while this runs" : ""}.`);
   writeLine("");
   writeLine("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
   writeLine(`  \u2705 CONNECTED \u2014 WebSocket relay \xB7 ${hostname3()}`);
@@ -1717,6 +1729,7 @@ var runnerCommand = createRunnerCommand();
 // src/commands/up.ts
 import { createRequire as createRequire2 } from "module";
 import { Command as Command8 } from "commander";
+import { hostname as hostname5 } from "os";
 
 // src/tui.ts
 import chalk from "chalk";
@@ -1888,6 +1901,7 @@ var upCommand = new Command8("up").description("Start the browser runner for all
   const data = await res.json();
   const active = (data.instances || []).filter((i) => i.status === "active");
   let instances = active;
+  let elsewhere = [];
   if (opts.instance) {
     instances = instances.filter((i) => i.id === opts.instance || i.slug === opts.instance);
   } else {
@@ -1904,16 +1918,31 @@ var upCommand = new Command8("up").description("Start the browser runner for all
     writeLine("  Subscribe to an agent at https://proagentstore.online");
     process.exit(1);
   }
-  state.instances = instances.map((i) => ({ id: i.id, name: i.name || i.slug || i.id.slice(0, 8) }));
-  printStep(`Found ${instances.length} instance${instances.length === 1 ? "" : "s"}`, "ok");
-  for (const inst of state.instances) {
-    writeLine(`    ${inst.name} (${inst.id.slice(0, 8)}...)`);
-  }
   await maybeClaimMachineNames({
     token: session.token,
     apiBase: API_BASE3,
     headless: opts.headless
   }).catch(() => void 0);
+  if (!opts.instance) {
+    const split = partitionByPin(instances, hostname5(), loadMachineIdentity(hostname5()).names);
+    instances = split.here;
+    elsewhere = split.elsewhere;
+  }
+  if (instances.length === 0) {
+    printStep(`All ${elsewhere.length} of your runtime agents are pinned to other machines`, "ok");
+    for (const inst of elsewhere) writeLine(`    ${inst.name || inst.slug || inst.id.slice(0, 8)} \u2192 ${inst.config?.runnerNode}`);
+    writeLine('  They are served there. To run one from this machine, change its "Runs on" pin in the console, then `pags up` again.');
+    process.exit(0);
+  }
+  state.instances = instances.map((i) => ({ id: i.id, name: i.name || i.slug || i.id.slice(0, 8) }));
+  printStep(`Found ${instances.length} instance${instances.length === 1 ? "" : "s"}`, "ok");
+  for (const inst of state.instances) {
+    writeLine(`    ${inst.name} (${inst.id.slice(0, 8)}...)`);
+  }
+  if (elsewhere.length) {
+    printStep(`${elsewhere.length} more pinned to other machines \u2014 served there, not attached here`, "ok");
+    for (const inst of elsewhere) writeLine(`    ${inst.name || inst.slug || inst.id.slice(0, 8)} \u2192 ${inst.config?.runnerNode}`);
+  }
   state.activeInstance = instances.length === 1 ? instances[0].name || instances[0].slug || instances[0].id.slice(0, 8) : `${instances.length} agents`;
   printStep(`Connecting ${state.activeInstance}\u2026`, "wait");
   await stopRunnerProcesses();

package/package.json

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