flowviant 0.48.0 → 0.48.1

package/bin/lib/work.mjs

@@ -259,7 +259,15 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
    * narrator: never awaited by a turn, every failure swallowed.
    */
   const WORKTREE_SWEEP_MS = 60_000;
+  /** How often the sweep refreshes `origin/<base>` before measuring. The
+   *  behind-count is the whole point of the readout — "someone pushed while you
+   *  were working" — and without a fetch it would only ever count what this
+   *  machine already happened to have. Rarer than the sweep because a fetch is
+   *  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;
   let lastWorktreeSweep = 0;
+  let lastWorktreeFetch = 0;
   let sweepingWorktrees = false;
   const postWorktrees = async (reports) => {
     if (!reports.length) return;
@@ -297,6 +305,17 @@ export function createWorkManager({ repoRoot, baseDir, baseRef, getMcpUrl, getLe
     lastWorktreeSweep = Date.now();
     void (async () => {
       try {
+        // Refresh the base before measuring, so "3 new on main" means what a
+        // person thinks it means. Throttled, best-effort, and never fatal: an
+        // offline machine reports the counts it can still compute.
+        if (Date.now() - lastWorktreeFetch >= WORKTREE_FETCH_MS) {
+          lastWorktreeFetch = Date.now();
+          try {
+            git(['fetch', 'origin', '--quiet'], repoRoot);
+          } catch {
+            /* offline, or no remote — the numbers just age */
+          }
+        }
         const reports = [];
         for (const id of activeIds.slice(0, 20)) {
           const r = sessionWorktreeReport(id);

package/bin/lib/worktreeDiff.mjs

@@ -44,8 +44,10 @@ function countLines(buf) {
 /**
  * @param {string} wt   the worktree directory
  * @param {string} baseRef  the project's base ref (e.g. `origin/main`)
- * @returns {null | {branch:string, path:string, ahead:number, dirty:boolean,
- *   additions:number, deletions:number, fileCount:number, truncated:number,
+ * @returns {null | {branch:string, path:string, ahead:number, behind:number,
+ *   baseLabel:string, baseCommits:{sha:string, subject:string, author:string}[],
+ *   dirty:boolean, additions:number, deletions:number, fileCount:number,
+ *   truncated:number,
  *   files:{path:string, added:number, deleted:number, binary?:boolean}[]}}
  */
 export function worktreeDiff(wt, baseRef) {
@@ -121,6 +123,32 @@ export function worktreeDiff(wt, baseRef) {
   } catch {
     /* leave at 0 */
   }
+  // WHAT LANDED WHILE YOU WERE WORKING. Not the branch's own history — the
+  // commits on BASE that this worktree doesn't have, which is the thing a
+  // person cannot see from inside their own session and the reason they end up
+  // rebasing onto a surprise. Freshness is the caller's job: these are only as
+  // current as the last fetch (reportWorktrees throttles one).
+  let behind = 0;
+  const baseCommits = [];
+  try {
+    behind = Number(git(['rev-list', '--count', `HEAD..${baseRef}`], wt)) || 0;
+    if (behind > 0) {
+      // %x1f is the unit separator — a subject can contain anything a person
+      // can type, tabs and pipes included, so the delimiter must be one that
+      // cannot appear in it.
+      const raw = git(
+        ['log', '-n', '3', '--format=%h%x1f%s%x1f%an', `HEAD..${baseRef}`],
+        wt
+      );
+      for (const line of raw.split('\n')) {
+        if (!line.trim()) continue;
+        const [sha, subject, author] = line.split('\x1f');
+        if (sha) baseCommits.push({ sha, subject: subject ?? '', author: author ?? '' });
+      }
+    }
+  } catch {
+    /* an unfetched or missing base — say nothing rather than "you're current" */
+  }
   let dirty = false;
   try {
     dirty = git(['status', '--porcelain'], wt) !== '';
@@ -137,6 +165,9 @@ export function worktreeDiff(wt, baseRef) {
     branch,
     path: wt,
     ahead,
+    behind,
+    baseLabel: String(baseRef).replace(/^origin\//, ''),
+    baseCommits,
     dirty,
     additions,
     deletions,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flowviant",
-  "version": "0.48.0",
+  "version": "0.48.1",
   "description": "Run your own coding CLIs as headless build agents for Flowviant — Claude Code or Codex, on your own credentials. Claims dispatched work, opens PRs, captures review evidence, and routes questions back to you.",
   "type": "module",
   "bin": {