flowviant 0.107.0 → 0.108.0

package/bin/lib/shipMerge.mjs

@@ -61,7 +61,13 @@ export function mergeOutward({
     if (current === base) {
       const dirty = String(git(['status', '--porcelain', '--untracked-files=no'], repoRoot)).trim();
       if (dirty) {
-        throw new Error(`this repository has no remote, so the merge lands on ${base} in ${repoRoot} itself, and that checkout has uncommitted changes. Commit or stash them, then approve again.`);
+        // THE PERSON'S FIX (0.108.0): nothing on the branch is wrong, so the
+        // agent merge path reports `fix: 'person'` and the server queues no
+        // resolve turn — the agent cannot commit somebody's checkout.
+        throw Object.assign(
+          new Error(`this repository has no remote, so the merge lands on ${base} in ${repoRoot} itself, and that checkout has uncommitted changes. Commit or stash them, then approve again.`),
+          { fix: 'person' }
+        );
       }
       git(['merge', '--ff-only', merged], repoRoot);
     } else {

package/bin/lib/workAgentMerges.mjs

@@ -214,6 +214,7 @@ export function createWorkAgentMerges({
           await report({
             agentId,
             ok: false,
+            fix: 'person',
             detail: ghDown.missing
               ? 'this project merges through pull requests, and the GitHub CLI (gh) is not installed on this machine'
               : `this project merges through pull requests, and gh is not signed in here: ${ghDown.error}`,
@@ -225,6 +226,7 @@ export function createWorkAgentMerges({
           await report({
             agentId,
             ok: false,
+            fix: 'person',
             detail: `this agent is on the base branch (${prBase}) — there is nothing to open a pull request from`,
           });
           return;
@@ -271,7 +273,9 @@ export function createWorkAgentMerges({
           // token in its userinfo — so this one line is the only place on the
           // agent merge path that can leak a credential into a stored,
           // team-visible `mergeError`.
-          await report({ agentId, ok: false, detail: envScrub(ghFirstLine(e)) });
+          // A refused push is the remote or its login (no `origin`, a
+          // credential, a protected ref) — the person's to fix, not the branch.
+          await report({ agentId, ok: false, fix: 'person', detail: envScrub(ghFirstLine(e)) });
           return;
         }
         const pr = ensureOpenPr(head, prBase, { cwd: repoRoot });
@@ -279,6 +283,7 @@ export function createWorkAgentMerges({
           await report({
             agentId,
             ok: false,
+            fix: 'person',
             detail: `the open pull request for ${head} targets ${pr.wrongBase}, not ${prBase} — retarget or close it, then approve again`,
           });
           return;
@@ -344,6 +349,11 @@ export function createWorkAgentMerges({
         await report({
           agentId,
           ok: false,
+          // WHOSE FIX IT IS (0.108.0), when the merge said: a refusal about
+          // the person's side (`shipMerge.mjs`'s dirty checkout) queues no
+          // resolve turn on the server. A conflict says nothing, and the
+          // agent resolves it in its worktree as before.
+          ...(e?.fix === 'person' ? { fix: 'person' } : {}),
           detail: envScrub(String(e?.message || e)).slice(0, 2000),
         });
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flowviant",
-  "version": "0.107.0",
+  "version": "0.108.0",
   "description": "Run your own coding CLIs as build agents for Flowviant — Claude Code, Codex or Antigravity, on your own credentials. Holds your sessions, keeps a worktree per tab, and ships branches on your word.",
   "type": "module",
   "bin": {