flowviant 0.58.0 → 0.60.0

package/bin/lib/fleet.mjs

@@ -86,6 +86,7 @@ import {
 } from './runtimes.mjs';
 import { createWorkManager } from './work.mjs';
 import { scanLocalSessions } from './localSessions.mjs';
+import { repoState } from './repoState.mjs';
 
 async function fetchRoster(
   haveIds,
@@ -298,6 +299,62 @@ async function maybeReportLocalSessions({ repoRoot, excludeDirs }) {
   }
 }
 
+/**
+ * EVERY BRANCH AND WORKTREE ON THIS MACHINE, pushed on the same beat as
+ * presence — the answer to "is my Claude leaving a mess in here?".
+ *
+ * Same three economies as the presence report above and for the same reasons:
+ * scanned at most once a minute, not re-sent while identical (repoState orders
+ * deterministically so the string only moves when the repo does), and silent
+ * for the rest of the process once an older server 404s.
+ *
+ * ONE DIFFERENCE, deliberate: there is no re-send heartbeat window. Presence
+ * expires in the UI because a session that ENDED must stop reading as live;
+ * a branch list is not presence — a branch that existed a minute ago still
+ * exists — so re-posting an unchanged list would be a write per machine per
+ * five minutes to say nothing at all.
+ */
+const REPO_STATE_URL = FLEET_URL.replace(/\/agents\/?$/, '/repo-state');
+const REPO_STATE_SCAN_MS = 60_000;
+let repoStateUnsupported = false; // the server 404'd — quiet until restart
+let repoStateScanAt = 0;
+let repoStateSent = null; // last payload the server ACCEPTED, stringified
+async function maybeReportRepoState({ repoRoot, baseRef }) {
+  if (repoStateUnsupported) return;
+  if (Date.now() - repoStateScanAt < REPO_STATE_SCAN_MS) return;
+  repoStateScanAt = Date.now();
+  let payload;
+  try {
+    const state = repoState(repoRoot, baseRef);
+    if (!state) return; // not readable — say nothing rather than say "none"
+    payload = JSON.stringify(state);
+  } catch {
+    return; // a readout must never throw into the poll loop
+  }
+  if (payload === repoStateSent) return;
+  try {
+    const res = await fetch(REPO_STATE_URL, {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${FLEET_TOKEN}`,
+        'User-Agent': USER_AGENT,
+        'Content-Type': 'application/json',
+      },
+      signal: AbortSignal.timeout(15_000),
+      body: payload,
+    });
+    if (res.status === 404) {
+      repoStateUnsupported = true; // older server — nothing was replaced here
+      return;
+    }
+    // Only an ACCEPTED report counts: anything else forgets it so the next
+    // pass retries rather than dedup-suppressing a report nobody received.
+    repoStateSent = res.ok ? payload : null;
+  } catch {
+    repoStateSent = null;
+  }
+}
+
 /**
  * A STOP COMMANDED BY FLOWVIANT, read off the roster poll.
  *
@@ -1544,6 +1601,9 @@ export async function runFleetDaemon() {
     // the daemon's own worktrees are carved out (a session the daemon spawned
     // is already a tab, not something to offer adopting).
     void maybeReportLocalSessions({ repoRoot, excludeDirs: [baseDir] });
+    // …and the repo itself: every worktree and every branch, ours and not.
+    // Never awaited, throttled inside, and silent on an older server.
+    void maybeReportRepoState({ repoRoot, baseRef });
     // WHAT `/` CAN OFFER, on a machine no turn has taught yet. One-shot and
     // self-cancelling (it returns immediately if a turn has already reported),
     // never awaited, and it lands in the cache that the NEXT poll reads — so

package/bin/lib/repoState.mjs

@@ -0,0 +1,183 @@
+/**
+ * EVERY WORKTREE AND EVERY BRANCH ON THIS MACHINE — including the ones
+ * Flowviant did not make.
+ *
+ * WHY THIS EXISTS, in the user's words: "can we show all branches or worktrees
+ * so we know if claude is polluting the branches or worktrees or not". The
+ * Workbench already reports the branch a TAB is standing on, but only for
+ * sessions the server knows about — so a branch your Claude cut mid-turn, a
+ * worktree left behind by a crash, or anything you made yourself at the
+ * keyboard was invisible from the browser. That is the same gap the Changes
+ * block was built to close, one level up: a browser has no `git branch` to run,
+ * so the machine runs it.
+ *
+ * IT IS A RELAY, NOT A JUDGEMENT. Nothing here decides what "pollution" is —
+ * it reports what git says and marks which refs Flowviant itself created
+ * (`session/<id>`), because that is a FACT about who made them and it is the
+ * distinction the question is actually asking about. No cleanup, no warnings,
+ * no "you have too many branches": the surface counts what is there, and a
+ * person decides.
+ *
+ * BOUNDED AT THE MACHINE, like every other report in this daemon. A repo with
+ * eight hundred branches must not put eight hundred rows on the wire every
+ * minute; the newest are kept, the rest are counted, and the caller says so
+ * rather than letting a short list read as the whole repo.
+ *
+ * DETERMINISTIC ORDER, for the same reason `recordSkills` sorts: the report is
+ * dedupe-compared against the last one that was accepted, and an unstable order
+ * would post a "change" every single minute forever.
+ *
+ * NOTHING HERE THROWS. It runs inside the poll loop's best-effort tail, and a
+ * repo mid-rebase or an unborn HEAD is a field to omit, not an error to raise.
+ */
+
+import { execFileSync } from 'node:child_process';
+import { listenersIn, listenersSupported } from './listeners.mjs';
+
+/** Same cap the session diffstat uses: enough to see the shape, small enough
+ *  that one machine cannot flood a row. */
+const MAX_BRANCHES = 60;
+const MAX_WORKTREES = 40;
+
+function git(args, cwd) {
+  return execFileSync('git', args, {
+    cwd,
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'ignore'],
+    timeout: 10_000,
+    maxBuffer: 8 * 1024 * 1024,
+  }).trim();
+}
+
+/** A ref Flowviant itself cut for a tab. The ONLY thing that makes a branch
+ *  "ours", and the distinction the whole report exists to draw. */
+export function isSessionBranch(name) {
+  return /^session\//.test(name);
+}
+
+/**
+ * `git worktree list --porcelain` → rows. The porcelain form is parsed rather
+ * than the human one because the human one aligns columns with spaces and a
+ * path containing a space silently splits into the wrong fields.
+ */
+function readWorktrees(repoRoot) {
+  let out;
+  try {
+    out = git(['worktree', 'list', '--porcelain'], repoRoot);
+  } catch {
+    return null; // not a git repo, or git is unhappy — say nothing
+  }
+  const rows = [];
+  let cur = null;
+  for (const line of out.split('\n')) {
+    if (line.startsWith('worktree ')) {
+      if (cur) rows.push(cur);
+      cur = { path: line.slice(9), branch: null, detached: false, locked: false, prunable: false };
+    } else if (!cur) {
+      continue;
+    } else if (line.startsWith('branch ')) {
+      cur.branch = line.slice(7).replace(/^refs\/heads\//, '');
+    } else if (line === 'detached') {
+      cur.detached = true;
+    } else if (line.startsWith('locked')) {
+      cur.locked = true;
+    } else if (line.startsWith('prunable')) {
+      // A directory git still lists but that is gone from disk — exactly the
+      // "left behind" case somebody looking for mess wants to see.
+      cur.prunable = true;
+    }
+  }
+  if (cur) rows.push(cur);
+  return rows;
+}
+
+/**
+ * Local branches with their distance from base.
+ *
+ * `for-each-ref` does the whole thing in ONE process — a `rev-list` per branch
+ * would be sixty spawns a minute on a busy repo. `%(ahead-behind:<ref>)` needs
+ * git 2.41+; when it is missing the counts are simply absent and the surface
+ * shows names without numbers, which is still the answer to "what is here".
+ */
+function readBranches(repoRoot, baseRef) {
+  const fmt = '%(refname:short)%09%(committerdate:unix)%09%(ahead-behind:' + baseRef + ')';
+  let out;
+  try {
+    out = git(['for-each-ref', '--sort=-committerdate', `--format=${fmt}`, 'refs/heads'], repoRoot);
+  } catch {
+    // No ahead-behind on this git. Names and dates still answer most of it.
+    try {
+      out = git(
+        ['for-each-ref', '--sort=-committerdate', '--format=%(refname:short)%09%(committerdate:unix)', 'refs/heads'],
+        repoRoot
+      );
+    } catch {
+      return null;
+    }
+  }
+  const rows = [];
+  for (const line of out.split('\n')) {
+    if (!line.trim()) continue;
+    const [name, when, ab] = line.split('\t');
+    if (!name) continue;
+    const row = { name, at: Number(when) || 0, session: isSessionBranch(name) };
+    // `ahead-behind` prints "N M" — ahead of base, behind base, in that order.
+    if (ab) {
+      const [a, b] = ab.trim().split(/\s+/).map((n) => parseInt(n, 10));
+      if (Number.isFinite(a)) row.ahead = a;
+      if (Number.isFinite(b)) row.behind = b;
+    }
+    rows.push(row);
+  }
+  return rows;
+}
+
+/**
+ * The whole picture, or null if this is not a repo we can read.
+ *
+ * `truncated` is not decoration: a list silently cut at sixty reads as the
+ * whole repo, and the one question this report exists to answer is "how much is
+ * in here". Same rule the session diffstat's own `truncated` keeps.
+ */
+export function repoState(repoRoot, baseRef) {
+  const worktrees = readWorktrees(repoRoot);
+  const branches = readBranches(repoRoot, baseRef);
+  if (!worktrees && !branches) return null;
+  /**
+   * WHAT IS LISTENING IN THE CHECKOUT ITSELF.
+   *
+   * `listenersIn` has always taken any directory, and had only ever been asked
+   * about SESSION WORKTREES — so somebody running `npm run dev` in their normal
+   * checkout, which is what "just testing or playing around in dev" actually
+   * looks like, was invisible to every surface in the product. The measurement
+   * was there; nobody was pointing it at the repo.
+   *
+   * THE ATTRIBUTION RULE IS UNCHANGED, and it is the reason this widens to the
+   * repo root and no further: a port is attributed by the CWD OF THE PROCESS
+   * HOLDING THE SOCKET, so this reports servers running inside THIS PROJECT'S
+   * checkout and nothing else. Postgres on 5432 has its own cwd and does not
+   * appear here — which is the whole point, and why "just show every port on
+   * the box" is not what this does.
+   *
+   * Reported, not offered: this is a readout of what is up. Sharing one is a
+   * separate act with its own gates (see previewJobs).
+   */
+  const listening = listenersIn(repoRoot);
+  const wt = worktrees ?? [];
+  const br = branches ?? [];
+  return {
+    base: baseRef,
+    worktrees: wt.slice(0, MAX_WORKTREES),
+    worktreesTotal: wt.length,
+    // Newest first (for-each-ref already sorted), so a truncated list is the
+    // part somebody is actually working in.
+    branches: br.slice(0, MAX_BRANCHES),
+    branchesTotal: br.length,
+    sessionBranches: br.filter((b) => b.session).length,
+    listening,
+    // "Nothing is listening" and "this machine cannot look" (Windows, a failed
+    // scan) are the same empty array without this — and the second must never
+    // render as the first. Same field, same reason, as the session report.
+    listeningSupported: listenersSupported(),
+  };
+}

package/bin/lib/work.mjs

@@ -51,6 +51,10 @@ import {
 } from './prompts.mjs';
 import { materializeInto, hasMaterialized, excludeInWorktree, scrub as envScrub } from './env.mjs';
 import { detectRuntimes, canRun, recordSkills, RUNTIMES } from './runtimes.mjs';
+
+/** The place id meaning "the checkout", not a worktree. Must match the
+ *  server's REPO_PLACE — it is a wire value, not a local convention. */
+const REPO_PLACE = 'repo';
 import { isTerminalSessionLive, isAgyConversationLive } from './localSessions.mjs';
 import { worktreeDiff } from './worktreeDiff.mjs';
 import { homedir } from 'node:os';
@@ -119,8 +123,22 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
    * while that session's turn has a live CLI in it.
    */
   const workChains = new Map(); // sessionId -> settled-safe tail promise
-  const chainFor = (sessionId, fn) => {
-    const prev = workChains.get(sessionId) ?? Promise.resolve();
+  /**
+   * Serialize work by PLACE — the directory — not by session.
+   *
+   * It was keyed by session id, which was the same thing right up until a place
+   * could be shared: two sessions pointed at one worktree had independent
+   * chains, so their turns would run at the same time in the same directory and
+   * edit each other's files mid-edit. Keying on the place is what makes "two
+   * tabs in one repo" behave the way two terminal tabs in one repo behave —
+   * they take turns.
+   *
+   * The cross-PROCESS half was already right and needed no change: the turn
+   * lock is a file inside the worktree (`flowviant-turn.lock`), so two sessions
+   * sharing a place already share the lock by construction.
+   */
+  const chainFor = (placeId, fn) => {
+    const prev = workChains.get(placeId) ?? Promise.resolve();
     // `.then(fn, fn)`, like withWikiLock: one rejected link must never wedge
     // every later turn of the tab.
     const run = prev.then(fn, fn);
@@ -128,11 +146,11 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
       () => {},
       () => {}
     );
-    workChains.set(sessionId, stored);
+    workChains.set(placeId, stored);
     // Release the entry when the chain drains, so the map cannot grow for the
     // process lifetime and `workChains.has()` means "busy right now".
     stored.then(() => {
-      if (workChains.get(sessionId) === stored) workChains.delete(sessionId);
+      if (workChains.get(placeId) === stored) workChains.delete(placeId);
     });
     return run;
   };
@@ -319,6 +337,32 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
    *  network, and a teammate's push being visible within three minutes is the
    *  same promise the rest of the product makes. */
   const WORKTREE_FETCH_MS = 3 * 60_000;
+  /**
+   * WHERE EACH SESSION WORKS, learned from the turns we are handed.
+   *
+   * Every other beat — the worktree sweep, ship, the preview re-check — has to
+   * ask the SAME directory the turn ran in, and only the turn job carries
+   * `place`. Caching it here is what keeps them agreeing without a second
+   * server→daemon field: a session absent from this map has never run a turn,
+   * and its own id is the right answer for that case anyway (it is the default
+   * place, and a session with no turn has no worktree either).
+   *
+   * A tab standing in the CHECKOUT is the case this exists for: its directory
+   * is not `sessions/<id>` and never will be, so a sweep that assumed the
+   * default would measure a directory that does not exist and report nothing —
+   * which is exactly why "I still do not see a preview URL" was true of a tab
+   * opened in the checkout.
+   */
+  const sessionPlaces = new Map();
+  const placeOf = (sessionId) => sessionPlaces.get(sessionId) ?? sessionId;
+  /** The DIRECTORY a session works in. Every path that used to build
+   *  `sessions/<id>` by hand goes through here, or a tab in the checkout gets
+   *  measured against a directory that does not exist. */
+  const placeDir = (sessionId) => {
+    const place = placeOf(sessionId);
+    return place === REPO_PLACE ? repoRoot : join(baseDir, 'sessions', place);
+  };
+
   let lastWorktreeSweep = 0;
   let lastWorktreeFetch = 0;
   let sweepingWorktrees = false;
@@ -340,8 +384,11 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
     }
   };
   const sessionWorktreeReport = (sessionId) => {
-    if (!isSafePathSegment(sessionId)) return null;
-    const wt = join(baseDir, 'sessions', sessionId);
+    // The session's PLACE, not its name: a tab in the checkout is measured in
+    // the checkout, and a tab sharing another tab's worktree is measured there.
+    const place = placeOf(sessionId);
+    if (place !== REPO_PLACE && !isSafePathSegment(place)) return null;
+    const wt = placeDir(sessionId);
     const d = worktreeDiff(wt, baseRef);
     if (!d) return null;
     // WHAT IS LISTENING in this worktree, attributed by the CWD of the process
@@ -567,7 +614,7 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
       void (async () => {
         try {
           if (!(await claimPreview(sessionId))) return; // somebody else has it
-          const wt = join(baseDir, 'sessions', sessionId);
+          const wt = placeDir(sessionId);
           // RE-VALIDATE the attribution here, not just the liveness. The server
           // checked this port against a report up to a minute old; more
           // importantly, checking `listenersIn` again is what keeps the answer
@@ -755,7 +802,7 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
       void (async () => {
         try {
           if (!(await claimDevRun(sessionId))) return; // somebody else has it
-          const wt = join(baseDir, 'sessions', sessionId);
+          const wt = placeDir(sessionId);
           const r = await startDevServer({
             sessionId,
             worktree: wt,
@@ -827,7 +874,7 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
   const adoptDevRuns = (activeIds) => {
     let adopted = 0;
     for (const entry of reapOrphanDevRuns(activeIds, note)) {
-      const wt = join(baseDir, 'sessions', entry.sessionId);
+      const wt = placeDir(entry.sessionId);
       // The recorded cwd must still be this session's worktree. A recycled pid
       // pointing anywhere else is somebody else's process.
       if (entry.cwd !== wt) continue;
@@ -1159,8 +1206,34 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
    * is the point. If the directory was retired but the branch survives, the
    * worktree re-attaches to the branch and the committed work is still there.
    */
-  const sessionWtFor = (sessionId, baseAt) => {
-    if (!isSafePathSegment(sessionId)) return null;
+  /**
+   * WHERE A SESSION WORKS — its PLACE, which is a directory on a branch.
+   *
+   * A session used to BE a worktree: one tab, one directory, cut at birth and
+   * retired at close. That binding was never an isolation guarantee — a turn
+   * runs with permissions skipped, so the worktree is a starting directory and
+   * not a fence, and any agent could always `cd` into another one. The product
+   * was asserting an invariant it did not have.
+   *
+   * So a session now REFERENCES a place rather than being one. Many sessions
+   * may name the same place; a session may name the repo checkout itself; and
+   * `session/<own-id>` is simply the DEFAULT place, cut fresh at first turn,
+   * which is why an absent `place` behaves exactly as every existing tab does.
+   *
+   * `'repo'` IS NOT A DIRECTORY NAME AND MUST NOT BECOME ONE. It resolves to
+   * the checkout the daemon already serves — never created, never retired,
+   * because it is not ours to remove. The value reaching here is a server-side
+   * enum, never a browser-supplied path: `sessions.routes.ts` resolves it the
+   * same way adoption resolves a cwd, and for the same reason.
+   */
+  const placeWtFor = (placeId, baseAt) => {
+    if (placeId === REPO_PLACE) {
+      // The checkout. `fresh: false` on purpose — nothing was opened, so no
+      // caller may treat this as a newly-cut branch.
+      return { wt: repoRoot, fresh: false };
+    }
+    if (!isSafePathSegment(placeId)) return null;
+    const sessionId = placeId;
     const wt = join(baseDir, 'sessions', sessionId);
     const fresh = !existsSync(wt);
     if (fresh) {
@@ -1538,6 +1611,10 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
     }
   };
 
+  /** The pre-places name, kept so every existing caller reads unchanged: a
+   *  session's own id IS its default place. */
+  const sessionWtFor = (sessionId, baseAt) => placeWtFor(sessionId, baseAt);
+
   const retireWorkSessions = (activeIds, heldElsewhere) => {
     if (!Array.isArray(activeIds)) return;
     // Sessions ANOTHER daemon on this credential is serving. They are absent
@@ -1596,7 +1673,13 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
       // run it again while the report is merely undelivered.
       if (pendingWorkReports.has(job.id)) continue;
       workAnswering.add(job.id);
-      chainFor(job.sessionId, async () => {
+      // Serialized by PLACE: two tabs sharing a worktree take turns in it
+      // rather than editing the same files at the same time.
+      const place = job.place || job.sessionId;
+      // Remembered for every other beat — the sweep, ship, the preview
+      // re-check — so they all ask the same directory this turn runs in.
+      sessionPlaces.set(job.sessionId, place);
+      chainFor(place, async () => {
         try {
           const tries = workAttempts.get(job.id) ?? 0;
           if (tries >= MAX_WORK_TRIES) {
@@ -1711,7 +1794,10 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
           }
           // Based at the SOURCE's HEAD when adopting — the resumed
           // conversation was had against those commits, not the project base.
-          const dir = sessionWtFor(job.sessionId, adopting ? srcHead : undefined);
+          // The PLACE this tab works in — its own worktree unless the server
+          // named another. An older server sends no `place` and the default is
+          // the session's own id, which is what every tab has always done.
+          const dir = placeWtFor(place, adopting ? srcHead : undefined);
           if (!dir) {
             await settleWorkTurn(job.id, {
               ok: false,
@@ -2193,8 +2279,55 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
             return;
           }
           note(`${c.cyan('ship')} ${c.dim(`— "${job.sessionName || job.sessionId}"`)}`);
-          const branch = `session/${job.sessionId}`;
-          const wt = join(baseDir, 'sessions', job.sessionId);
+          /**
+           * WHAT IS ACTUALLY CHECKED OUT — not what we named it at birth.
+           *
+           * Ship used to compute `session/<id>` and then REFUSE if HEAD had
+           * moved: "ask it to return to its session branch, then ship again".
+           * That refusal is the thing this product says it never does — it had
+           * no reason of its own beyond bookkeeping, and in a terminal
+           * `git checkout -b` breaks nothing, which is the whole standard this
+           * surface is held to.
+           *
+           * The bug it was written for was real and is fixed properly here
+           * rather than frozen out: ship once merged the branch NAME while
+           * logging HEAD, so receipts named commits that never landed on main.
+           * That was TWO SOURCES OF TRUTH, not branch switching. There is one
+           * now, and it is the worktree's own HEAD.
+           *
+           * Resolved BEFORE the idempotency check below, and that ordering is
+           * load-bearing: `session/<id>` can still exist, stale and already an
+           * ancestor of base, while the real work sits on the branch that was
+           * checked out afterwards. Asking the old name first would answer
+           * "already merged — nothing new to ship" over unshipped commits.
+           *
+           * A directory that is gone (a retired or closed tab) cannot be asked,
+           * so the recorded name is the fallback — the one case where the name
+           * is the only thing there is.
+           */
+          // The session's PLACE — the directory it actually works in.
+          const shipPlace = placeOf(job.sessionId);
+          const wt = shipPlace === REPO_PLACE ? repoRoot : join(baseDir, 'sessions', shipPlace);
+          let branch = `session/${job.sessionId}`;
+          let detached = false;
+          if (existsSync(wt)) {
+            try {
+              branch = git(['symbolic-ref', '--short', 'HEAD'], wt);
+            } catch {
+              detached = true;
+            }
+          }
+          // THE ONE REFUSAL LEFT, and it is not policy. A detached HEAD names
+          // no branch, so there is nothing to merge and nothing to record —
+          // that is an ambiguity in git, not a rule of ours.
+          if (detached) {
+            await done({
+              ok: false,
+              error:
+                'this session is on a detached HEAD — no branch to ship. Ask it to check out a branch, then ship again',
+            });
+            return;
+          }
           let branchExists = true;
           try {
             git(['rev-parse', '--verify', '--quiet', `refs/heads/${branch}`], repoRoot);
@@ -2360,7 +2493,7 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
             ok(`${c.cyan('ship')} ${c.dim(`— ${commits.length} commit${commits.length === 1 ? '' : 's'} on main`)}`);
             return;
           }
-          const dir = sessionWtFor(job.sessionId);
+          const dir = placeWtFor(shipPlace);
           if (!dir) {
             await done({
               ok: false,
@@ -2388,23 +2521,11 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
             });
             return;
           }
-          // What is checked out here must BE the session branch. Sessions may
-          // create branches when asked — but then "ship" is ambiguous, and
-          // folding+logging HEAD while merging the stale branch NAME once
-          // shipped receipts for commits that never landed on main.
-          let head = null;
-          try {
-            head = git(['symbolic-ref', '--short', 'HEAD'], dir.wt);
-          } catch {
-            /* detached */
-          }
-          if (head !== branch) {
-            await done({
-              ok: false,
-              error: `the session is on ${head ? `branch '${head}'` : 'a detached HEAD'}, not its own '${branch}' — ask it to return to its session branch, then ship again`,
-            });
-            return;
-          }
+          // NO "return to your session branch" GUARD. `branch` was read from
+          // this worktree's HEAD above, so the fold, the tip and the receipts
+          // below all name the same thing by construction — which is what the
+          // old guard was really protecting, and it protected it by refusing
+          // instead of by measuring.
           // Fold main into the branch FIRST: conflicts land here, in the
           // session's own worktree, where the next turn can resolve them.
           try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flowviant",
-  "version": "0.58.0",
+  "version": "0.60.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": {