@bill10/agent-007 0.7.0 → 0.7.1000

package/VERSION

@@ -1 +1 @@
-0.7.0.0
+0.7.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bill10/agent-007",
-  "version": "0.7.0",
+  "version": "0.7.1000",
   "description": "From web terminals for your coding agents to a self-running agent company: Claude Code and Codex in parallel git worktrees, a job board they pick work from, and one agent that runs the board from a goal.",
   "license": "MIT",
   "repository": {

package/server/git.js

@@ -342,13 +342,14 @@ export async function removeWorktree(session, { discardChanges = false } = {}) {
         const local = (await gitExec(['-C', session.worktreePath, 'rev-parse', 'HEAD'])).trim();
         const upstream = (await gitExec(['-C', session.worktreePath, 'rev-parse', '@{u}'])).trim();
         fullyPushed = !!local && local === upstream;
-      } catch {
-        // No upstream, or one git cannot resolve locally — typically a branch
-        // pushed to a raw URL (`git push -u https://…`), which records the URL
-        // as branch.<name>.remote and creates no remote-tracking ref. Ask the
-        // remote itself; anything short of a matching SHA stays not-pushed.
-        fullyPushed = await matchesRemote(session);
-      }
+      } catch {}
+      // No upstream git can resolve locally (a branch pushed to a raw URL,
+      // `git push -u https://…`, records the URL as branch.<name>.remote and
+      // creates no remote-tracking ref), or one that is stale: a push from
+      // inside the worktree after a rebase or a force-with-lease can leave the
+      // shared repo's refs/remotes/origin/<branch> on an old SHA. Ask the
+      // remote itself; anything short of a matching SHA stays not-pushed.
+      if (!fullyPushed) fullyPushed = await matchesRemote(session);
     }
     if (!reason && !fullyPushed) {
       const baseBranch = await resolveBaseBranch(session.repoPath);

package/server/jobs.js

@@ -1086,6 +1086,20 @@ async function releaseOrphanedWorktree({ branchName, repoPath, worktreePath }, b
   return true;
 }
 
+// An "unpushed" orphan left by an older build (or a stale remote-tracking ref)
+// may be fully on the remote by now. Re-check each one at startup through the
+// same release path, so removeWorktree's rules decide: dirty stays, and only
+// an exact SHA match on the remote counts as pushed. A card still in progress
+// or in Review may want its agent re-adopted, so its orphan is left alone.
+export async function releasePushedOrphans(broadcast) {
+  let released = 0;
+  for (const entry of [...orphans.values()]) {
+    if (entry.reason !== 'unpushed' || findJobForBranch(entry)) continue;
+    if (await releaseOrphanedWorktree(entry, broadcast)) released++;
+  }
+  return released;
+}
+
 export function updateSettings(fields, broadcast) {
   const settings = boardSettings();
   if (typeof fields.running === 'boolean') settings.running = fields.running;

package/server.js

@@ -29,7 +29,7 @@ import { addRepo, createWorktree, removeWorktree, pruneWorktrees, scanForOrphane
 import { createSessionFromConfig } from './server/pty.js';
 import { setupWebSocket, broadcast, sessionPayload, broadcastOrphansList, verifyClient } from './server/ws.js';
 import { setupRoutes } from './server/http.js';
-import { startDispatcher, stopDispatcher, boardSettings } from './server/jobs.js';
+import { startDispatcher, stopDispatcher, boardSettings, releasePushedOrphans } from './server/jobs.js';
 import { orphans, config } from './server/state.js';
 import { sweepMcpConfigs } from './server/agent-mcp.js';
 import { withDefaultPermission, envPermissionMode, PERMISSION_MODES, ENV_PERMISSION_MODE, sessionAgentFromCommand } from './lib/jobs.js';
@@ -238,6 +238,9 @@ async function startup() {
   mkdirSync(WORKTREE_DIR, { recursive: true });
   await pruneWorktrees();
   await scanForOrphanedWorktrees(broadcast);
+  // Not awaited: each check can ask the remote, and boot must not wait on the network.
+  releasePushedOrphans(broadcast).then(n => { if (n) console.log(`  Released ${n} orphaned worktree(s) now on the remote`); })
+    .catch(err => console.error('Orphan re-check failed:', err.message));
   // The loop always runs; each tick is a no-op while settings.running is false.
   // Keeping one timer alive (instead of creating/destroying it on toggle) means
   // the Start button only has to flip a boolean, and a config restored with