agent-relay-server 0.11.4 → 0.11.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-server",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "description": "Lightweight HTTP message relay for inter-agent communication across machines",
   "module": "src/index.ts",
   "type": "module",
@@ -32,9 +32,10 @@
     "CONTRIBUTING.md"
   ],
   "dependencies": {
-    "agent-relay-sdk": "0.2.3"
+    "agent-relay-sdk": "0.2.4"
   },
   "scripts": {
+    "prepack": "cd dashboard && npx vite build >&2",
     "postinstall": "node scripts/install-bin-shim.cjs",
     "start": "bun run src/index.ts",
     "dev": "bun --watch run src/index.ts",

package/public/index.html

@@ -123101,7 +123101,9 @@ function WorkspaceActions({ workspace, expanded, onToggleDetails }) {
 	const terminal = workspace.status === "cleaned" || workspace.status === "merged" || workspace.status === "abandoned";
 	const disabled = terminal || workspace.status === "cleanup_requested";
 	const openPath = workspace.worktreePath || workspace.sourceCwd || workspace.repoRoot;
-	const mergeable = workspace.mode === "isolated" && Boolean(workspace.worktreePath) && MERGEABLE_STATUSES.has(workspace.status);
+	const gitState = useRelayStore((s) => s.workspaceGitState[workspace.id]);
+	const landed = !!gitState && gitState.available !== false && gitState.landed === true;
+	const mergeable = workspace.mode === "isolated" && Boolean(workspace.worktreePath) && MERGEABLE_STATUSES.has(workspace.status) && !landed;
 	async function copyPath() {
 		await navigator.clipboard?.writeText(openPath);
 	}
@@ -123162,7 +123164,7 @@ function WorkspaceActions({ workspace, expanded, onToggleDetails }) {
 			/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Button, {
 				size: "icon-sm",
 				variant: "default",
-				title: "Merge & land work",
+				title: landed ? "Already merged into base — nothing to land" : "Merge & land work",
 				disabled: !mergeable,
 				onClick: () => void merge(),
 				children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(GitMerge, { className: "h-3.5 w-3.5" })
@@ -123185,10 +123187,10 @@ function WorkspaceActions({ workspace, expanded, onToggleDetails }) {
 		]
 	});
 }
-function MergePreviewHint({ workspace, ahead }) {
+function MergePreviewHint({ workspace, unmerged }) {
 	const preview = useRelayStore((s) => s.workspaceMergePreview[workspace.id]);
 	const fetchWorkspaceMergePreview = useRelayStore((s) => s.fetchWorkspaceMergePreview);
-	const eligible = ahead > 0 && MERGEABLE_STATUSES.has(workspace.status);
+	const eligible = unmerged > 0 && MERGEABLE_STATUSES.has(workspace.status);
 	(0, import_react.useEffect)(() => {
 		if (eligible && preview === void 0) fetchWorkspaceMergePreview(workspace.id);
 	}, [
@@ -123251,9 +123253,11 @@ function GitState({ workspace }) {
 		children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: "git error" }), refresh]
 	});
 	const ahead = gitState.ahead ?? 0;
+	const landed = gitState.landed === true;
+	const unmerged = landed ? 0 : gitState.unmergedAhead ?? ahead;
 	const behind = gitState.behind ?? 0;
 	const dirty = gitState.dirtyCount ?? 0;
-	const clean = ahead === 0 && dirty === 0;
+	const clean = unmerged === 0 && dirty === 0 && !landed;
 	const commit = gitState.lastCommit;
 	return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {
 		className: "space-y-0.5",
@@ -123263,10 +123267,14 @@ function GitState({ workspace }) {
 				className: "text-muted-foreground",
 				children: "no unmerged work"
 			}) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
-				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
-					className: ahead > 0 ? "flex items-center text-emerald-400" : "flex items-center text-muted-foreground",
-					title: `${ahead} commit(s) ahead of base`,
-					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArrowUp, { className: "h-3 w-3" }), ahead]
+				landed ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+					className: "flex items-center gap-0.5 text-emerald-400",
+					title: `Work already landed in ${gitState.baseRef || "base"} via squash/cherry-pick — safe to clean up`,
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(Check, { className: "h-3 w-3" }), "landed"]
+				}) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
+					className: unmerged > 0 ? "flex items-center text-emerald-400" : "flex items-center text-muted-foreground",
+					title: ahead !== unmerged ? `${unmerged} unmerged commit(s) (${ahead} ahead of base)` : `${unmerged} commit(s) ahead of base`,
+					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(ArrowUp, { className: "h-3 w-3" }), unmerged]
 				}),
 				/* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", {
 					className: behind > 0 ? "flex items-center text-amber-400" : "flex items-center text-muted-foreground",
@@ -123278,9 +123286,9 @@ function GitState({ workspace }) {
 					title: `${dirty} uncommitted change(s)`,
 					children: [/* @__PURE__ */ (0, import_jsx_runtime.jsx)(FilePen, { className: "h-3 w-3" }), dirty]
 				}),
-				/* @__PURE__ */ (0, import_jsx_runtime.jsx)(MergePreviewHint, {
+				!landed && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MergePreviewHint, {
 					workspace,
-					ahead
+					unmerged
 				})
 			] }), refresh]
 		}), commit && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", {

package/src/db.ts

@@ -5065,6 +5065,28 @@ export function deleteWorkspace(id: string): boolean {
   return db.prepare("DELETE FROM workspaces WHERE id = ?").run(id).changes > 0;
 }
 
+// Shared-mode rows are pure occupancy markers (no worktree on disk) that only
+// mean something while their owner is online. Deletion is normally driven by
+// the reaper's onAgentDisappeared hook, but agents also leave via clean
+// SessionEnd (setStatus offline) and via pruneOfflineAgents (raw agent delete),
+// neither of which touches workspaces — so orphaned shared rows accumulate and
+// bloat the workspace panel. This sweep is the catch-all: drop any non-cleaned
+// shared row whose owner is missing or offline, regardless of how it leaked.
+export function pruneOrphanedSharedWorkspaces(): string[] {
+  return db.transaction(() => {
+    const orphanCondition = `
+      mode = 'shared' AND status != 'cleaned' AND (
+        owner_agent_id IS NULL
+        OR owner_agent_id NOT IN (SELECT id FROM agents)
+        OR owner_agent_id IN (SELECT id FROM agents WHERE status = 'offline')
+      )`;
+    const rows = db.prepare(`SELECT id FROM workspaces WHERE ${orphanCondition}`).all() as Array<{ id: string }>;
+    if (!rows.length) return [];
+    db.prepare(`DELETE FROM workspaces WHERE ${orphanCondition}`).run();
+    return rows.map((r) => r.id);
+  })();
+}
+
 export function updateWorkspaceStatus(id: string, status: WorkspaceStatus, metadata: Record<string, unknown> = {}): WorkspaceRecord | null {
   const existing = getWorkspace(id);
   if (!existing) return null;

package/src/maintenance.ts

@@ -2,7 +2,7 @@ import { randomUUID } from "node:crypto";
 import { getArtifactStorage } from "./artifact-storage";
 import { expireStaleBusAgents } from "./bus";
 import { pruneOutbox } from "./bus-outbox";
-import { expireCommands } from "./commands-db";
+import { createCommand, expireCommands } from "./commands-db";
 import { DAY_MS, OFFLINE_PRUNE_MS, REAP_INTERVAL_MS, STALE_TTL_MS } from "./config";
 import { isAbsolute, relative, resolve } from "node:path";
 import {
@@ -14,6 +14,8 @@ import {
   listWorkspaces,
   pruneOfflineAgents,
   pruneOldMessages,
+  deleteWorkspace,
+  pruneOrphanedSharedWorkspaces,
   reapStaleAgents,
   reapStaleOrchestrators,
   releaseExpiredClaims,
@@ -44,9 +46,13 @@ const SCHEDULER_TICK_MS = 10_000;
 const OUTBOX_RETENTION_MS = Number(process.env.AGENT_RELAY_OUTBOX_RETENTION_MS) || 60 * 60 * 1000;
 const TOKEN_RECORD_RETENTION_SECONDS = Number(process.env.AGENT_RELAY_TOKEN_RECORD_RETENTION_SECONDS) || 7 * 24 * 60 * 60;
 const CONFLICT_SCAN_INTERVAL_MS = Number(process.env.AGENT_RELAY_CONFLICT_SCAN_INTERVAL_MS) || 2 * 60 * 1000;
+const WORKSPACE_RETENTION_MS = Number(process.env.AGENT_RELAY_WORKSPACE_RETENTION_MS) || DAY_MS;
+const WORKSPACE_REVIEW_TTL_MS = Number(process.env.AGENT_RELAY_WORKSPACE_REVIEW_TTL_MS) || 3 * DAY_MS;
+const WORKSPACE_GC_INTERVAL_MS = Number(process.env.AGENT_RELAY_WORKSPACE_GC_INTERVAL_MS) || 60 * 60 * 1000;
 // Live statuses worth scanning. Terminal (cleaned/merged/abandoned) and
 // in-flight (cleanup_requested) states are skipped.
 const CONFLICT_SCAN_STATUSES = new Set<WorkspaceStatus>(["active", "ready", "review_requested", "merge_planned", "conflict"]);
+const TERMINAL_WORKSPACE_STATUSES = new Set<WorkspaceStatus>(["cleaned", "merged", "abandoned"]);
 
 interface MaintenanceJobDefinition {
   id: string;
@@ -279,6 +285,17 @@ const definitions: MaintenanceJobDefinition[] = [
       return { prunedTokenJtis };
     },
   },
+  {
+    id: "workspace-orphan-sweep",
+    title: "Workspace orphan sweep",
+    description: "Delete shared-mode workspace occupancy rows whose owner agent is offline or gone.",
+    intervalMs: REAP_INTERVAL_MS,
+    runOnStart: true,
+    handler() {
+      const prunedSharedWorkspaceIds = pruneOrphanedSharedWorkspaces();
+      return { prunedSharedWorkspaceIds };
+    },
+  },
   {
     id: "workspace-conflict-scan",
     title: "Workspace conflict scan",
@@ -288,6 +305,15 @@ const definitions: MaintenanceJobDefinition[] = [
     timeoutMs: 60 * 1000,
     handler: scanWorkspaceConflicts,
   },
+  {
+    id: "workspace-gc",
+    title: "Workspace GC",
+    description: "Prune terminal workspace rows past retention, auto-abandon stale review_requested worktrees, and trigger git worktree prune on orchestrators.",
+    intervalMs: WORKSPACE_GC_INTERVAL_MS,
+    runOnStart: false,
+    timeoutMs: 60 * 1000,
+    handler: workspaceGC,
+  },
 ];
 
 function workspacePathWithinBase(path: string | undefined, baseDir: string | undefined): boolean {
@@ -387,6 +413,79 @@ async function scanWorkspaceConflicts(): Promise<Record<string, unknown>> {
   return { scanned: candidates.length, flagged, cleared, notifiedStewards };
 }
 
+async function workspaceGC(): Promise<Record<string, unknown>> {
+  const now = Date.now();
+  const cutoff = now - WORKSPACE_RETENTION_MS;
+  const reviewCutoff = now - WORKSPACE_REVIEW_TTL_MS;
+
+  // 1. Prune terminal rows past retention
+  const all = listWorkspaces();
+  const terminalIds: string[] = [];
+  for (const ws of all) {
+    if (TERMINAL_WORKSPACE_STATUSES.has(ws.status) && ws.updatedAt < cutoff) {
+      deleteWorkspace(ws.id);
+      terminalIds.push(ws.id);
+    }
+  }
+
+  // 2. Auto-abandon stale review_requested worktrees
+  const abandonedIds: string[] = [];
+  const notifiedStewards: string[] = [];
+  for (const ws of all) {
+    if (ws.status === "review_requested" && ws.updatedAt < reviewCutoff) {
+      updateWorkspaceStatus(ws.id, "abandoned", { autoAbandoned: true, abandonedReason: "review_requested TTL exceeded", abandonedAt: now });
+      abandonedIds.push(ws.id);
+      if (ws.stewardAgentId) {
+        try {
+          const msg = sendMessage({
+            from: "system",
+            to: ws.stewardAgentId,
+            kind: "system",
+            subject: "Workspace auto-abandoned",
+            body: `Workspace \`${ws.branch ?? ws.id}\` in ${ws.repoRoot} was auto-abandoned after ${Math.round(WORKSPACE_REVIEW_TTL_MS / DAY_MS)}d without steward action. Run workspace cleanup to reclaim the worktree.`,
+            payload: { kind: "workspace.auto-abandoned", workspaceId: ws.id, repoRoot: ws.repoRoot, branch: ws.branch },
+          });
+          emitNewMessage(msg);
+          notifiedStewards.push(ws.stewardAgentId);
+        } catch {
+          // Steward gone — activity event is enough.
+        }
+      }
+      createActivityEvent({
+        clientId: `workspace-gc-abandon-${ws.id}-${now}`,
+        kind: "state",
+        title: "Workspace auto-abandoned",
+        body: `${ws.branch ?? ws.id} in ${ws.repoRoot} — review_requested for ${Math.round((now - ws.updatedAt) / DAY_MS)}d`,
+        meta: ws.branch ?? ws.id,
+        icon: "ti-clock-x",
+        view: "orchestrators",
+        metadata: { source: "server", maintenanceJobId: "workspace-gc", workspaceId: ws.id },
+      });
+    }
+  }
+
+  // 3. Trigger git worktree prune on orchestrators that own isolated workspaces
+  const orchestrators = listOrchestrators().filter((orch) => orch.status === "online" && orch.agentId);
+  const reposWithWorkspaces = new Set(
+    all.filter((ws) => ws.mode === "isolated" && Boolean(ws.worktreePath)).map((ws) => ws.repoRoot),
+  );
+  const pruneCommands: string[] = [];
+  for (const repoRoot of reposWithWorkspaces) {
+    const orch = orchestrators.find((candidate) => workspacePathWithinBase(repoRoot, candidate.baseDir));
+    if (!orch?.agentId) continue;
+    const command = createCommand({
+      type: "workspace.prune",
+      source: "system",
+      target: orch.agentId,
+      params: { repoRoot, requestedBy: "workspace-gc", requestedAt: now },
+    });
+    emitCommand(command);
+    pruneCommands.push(command.id);
+  }
+
+  return { prunedTerminal: terminalIds, autoAbandoned: abandonedIds, notifiedStewards, pruneCommands };
+}
+
 let timer: Timer | null = null;
 
 export function startMaintenanceScheduler(): void {