@proagentstore/cli 0.4.59 → 0.4.60

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/package.json

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