agent-relay-server 0.25.0 → 0.27.0

package/src/workspace-phase.ts

@@ -14,12 +14,13 @@
 // "handed off, healthy, wait" guidance, and `actionNeeded:false` is the explicit
 // anti-panic signal.
 
+import { TERMINAL_WORKSPACE_STATUS_VALUES } from "agent-relay-sdk";
 import type { WorkspaceRecord, WorkspaceStatus } from "./types";
 
 // Statuses where the worktree's lifecycle is over — landed or torn down. Single
 // home; imported by maintenance (stale reap), routes (orphan scan), and the MCP
 // initialize primer (don't brief an agent on a dead workspace). Was duplicated.
-export const TERMINAL_WORKSPACE_STATUSES = new Set<WorkspaceStatus>(["cleaned", "merged", "abandoned"]);
+export const TERMINAL_WORKSPACE_STATUSES = new Set<WorkspaceStatus>(TERMINAL_WORKSPACE_STATUS_VALUES);
 
 // The "handed off, waiting to land" statuses — an agent has finished and the
 // auto-merge-back is responsible for getting the branch onto base. SINGLE HOME:
@@ -33,6 +34,35 @@ export const TERMINAL_WORKSPACE_STATUSES = new Set<WorkspaceStatus>(["cleaned",
 // it's also where a failed auto-merge lands for a retry, see routes.ts.)
 export const READY_TO_LAND_STATUSES = new Set<WorkspaceStatus>(["ready", "review_requested"]);
 
+// Land-state shape a host reports for a worktree (subset of WorkspaceMergePreview
+// / WorkspaceGitState — the fields that decide reapability). Kept structural so
+// both the merge-preview path and a raw git-state probe satisfy it.
+export interface WorktreeReapState {
+  /** Work already in base (squash/cherry/PR-merged). Detection only under-reports. */
+  landed?: boolean;
+  /** Commits ahead of base by raw count (a squash-landed branch still shows >0). */
+  ahead?: number;
+  /** Commits ahead whose patch is NOT already in base — the squash-aware count. */
+  unmergedAhead?: number;
+  /** Uncommitted working-tree changes. */
+  dirtyCount?: number;
+}
+
+// THE reap-safety invariant (#244): a worktree may be removed only when nothing
+// would be lost — clean tree AND (no commits ahead OR the work already landed).
+// SINGLE HOME: the orphan reaper, the orphan-reclaim gate, and the host's
+// exit-time `reconcileWorkspace` "empty" check all mean the same thing; they
+// drifted into three private copies and a land-blind force-remove slipped
+// through (the recovered NUL-guard test was one keystroke from deletion).
+// Mirror `reconcileWorkspace`: landing detection can only under-report, so an
+// uncertain worktree is NEVER reapable — it gets flagged for review instead.
+export function worktreeReapable(state: WorktreeReapState | null | undefined): boolean {
+  if (!state) return false;
+  if ((state.dirtyCount ?? 0) > 0) return false;
+  if (state.landed === true) return true;
+  return (state.unmergedAhead ?? state.ahead ?? 0) === 0;
+}
+
 // How long a workspace may sit in a ready-to-land status before the directive
 // projection stops saying "healthy, just wait" and surfaces it as needs-attention
 // (#242 watchdog). A clean auto-merge runs ~every 2 min, so a handful of missed