paseo-follow-up 1.2.0-beta.2 → 1.2.0-beta.4

package/README.md

@@ -101,7 +101,7 @@ The content comes from a new `needs_you` tool that every root agent gets while t
 Install the beta:
 
 ```sh
-paseo plugin update follow-through --version 1.2.0-beta.2
+paseo plugin update follow-through --version 1.2.0-beta.4
 # or, for a fresh install:
 paseo plugin install npm:paseo-follow-up@beta
 ```
@@ -117,7 +117,7 @@ Betas publish to npm's `beta` dist-tag, so `paseo plugin update` without `--vers
 ## How it works
 
 - The workspace's main agent owns its PRs, tasks, questions, the spec link and the Done call. Other agents in the workspace can register PRs and check status.
-- **Auto-send** is on for every workspace tracked for the first time (1.2.0-beta.2), so review threads and red CI go to the agent without you. Workspaces tracked before keep their setting. Turn it off per workspace and each repair batch waits for your click; with it on, Follow-up sends batches itself once the agent is idle, after fresh permission and Session Guard checks.
+- **Auto-send** is on for every workspace tracked for the first time (1.2.0-beta.4), so review threads and red CI go to the agent without you. Workspaces tracked before keep their setting. Turn it off per workspace and each repair batch waits for your click; with it on, Follow-up sends batches itself once the agent is idle, after fresh permission and Session Guard checks.
 - Follow-up never merges, turns on merge when ready, requests reviewers or archives on its own. **Merge** re-checks the stack, lists any PRs underneath that would merge first, and asks again.
 - A merged PR is not the end: tasks such as production checks and open questions keep the workspace open until the main agent declares Done and everything has settled.
 - Answers go out only when you click Send. Follow-up never answers for you.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "paseo-follow-up",
   "private": false,
-  "version": "1.2.0-beta.2",
+  "version": "1.2.0-beta.4",
   "description": "Follow every workspace PR stack in Paseo, answer agent questions, batch repairs for the main agent, and see what needs you.",
   "type": "module",
   "files": [

package/server/daemon.ts

@@ -137,9 +137,11 @@ export class PaseoGateway implements Gateway {
         const candidates = agents.map(row => row.agent).filter(a => a.workspaceId === workspace.id && !a.archivedAt && !a.labels["follow-through.recovery"]);
         const roots: Agent[] = [];
         for (const agent of candidates) if (await isWorkspaceRoot(agent, findParent)) roots.push(agent);
-        const main = chooseMainAgent(roots, existing?.mainAgentId);
+        const successor = successorMainAgent(roots, existing?.mainAgentId);
+        const main = successor ?? chooseMainAgent(roots, existing?.mainAgentId);
         if (!main && !existing) continue;
-        const row: DiscoveredWorkspace = { id: workspace.id, title: workspace.name || main?.title || existing!.title, mainAgentId: existing?.mainAgentId ?? main!.id, projectId: workspace.projectId, messageAt: main?.lastUserMessageAt ?? null, enable_default_tracking: defaults.has(workspace.projectId ?? ""), contributorAgentIds: roots.filter(a => a.id !== existing?.mainAgentId && a.id !== main?.id).map(a => a.id) };
+        const owner = successor?.id ?? existing?.mainAgentId ?? main!.id;
+        const row: DiscoveredWorkspace = { id: workspace.id, title: workspace.name || main?.title || existing!.title, mainAgentId: owner, ...(successor ? { replacesMainAgentId: existing!.mainAgentId } : {}), projectId: workspace.projectId, messageAt: main?.lastUserMessageAt ?? null, enable_default_tracking: defaults.has(workspace.projectId ?? ""), contributorAgentIds: roots.filter(a => a.id !== owner && a.id !== existing?.mainAgentId && a.id !== main?.id).map(a => a.id) };
         // Preserve the designated owner even when it is no longer indexed. Other root
         // sessions can still contribute their PRs without acquiring completion authority.
         const project = catalog.projects.find(p => p.projectId === workspace.projectId);
@@ -364,3 +366,15 @@ export function chooseMainAgent(roots: Agent[], existingId?: string): Agent | un
   if (existingId) return roots.find(a => a.id === existingId);
   return [...roots].sort((a, b) => a.createdAt.localeCompare(b.createdAt) || a.id.localeCompare(b.id))[0];
 }
+
+/**
+ * The recorded main agent is closed, archived or gone while the workspace still has a live root agent: the live
+ * one takes over (the one Tom wrote to last, then the newest). A live recorded main is never replaced.
+ */
+export function successorMainAgent(roots: Agent[], existingId: string | undefined): Agent | undefined {
+  if (!existingId) return undefined;
+  const current = roots.find(a => a.id === existingId);
+  if (current && current.status !== "closed") return undefined;
+  const live = roots.filter(a => a.id !== existingId && a.status !== "closed");
+  return live.sort((a, b) => (b.lastUserMessageAt ?? "").localeCompare(a.lastUserMessageAt ?? "") || b.createdAt.localeCompare(a.createdAt) || a.id.localeCompare(b.id))[0];
+}

package/server/discovery.ts

@@ -4,7 +4,7 @@ import { mergeArtifacts } from "./spec";
 import type { State, Workspace } from "../shared/model";
 
 export type History = { candidates: string[]; goal: string | null; complete: boolean; error: string | null };
-export type DiscoveredWorkspace = { id: string; title: string; mainAgentId: string; messageAt: string | null; projectId?: string | null; enable_default_tracking?: boolean; history?: History; contributorAgentIds?: string[]; submissions?: Submission[]; artifacts?: Artifact[] };
+export type DiscoveredWorkspace = { id: string; title: string; mainAgentId: string; /** Set when mainAgentId is a live successor to this closed or gone main agent. */ replacesMainAgentId?: string; messageAt: string | null; projectId?: string | null; enable_default_tracking?: boolean; history?: History; contributorAgentIds?: string[]; submissions?: Submission[]; artifacts?: Artifact[] };
 
 export function extractHistory(items: readonly unknown[], complete = true, error: string | null = null): History {
   const candidates = new Set<string>();
@@ -42,7 +42,12 @@ export function applyDiscovery(state: State, discovered: DiscoveredWorkspace[],
       state.workspaces.push(w);
     }
     w.title = row.title;
-    // An unavailable original owner is surfaced instead of silently transferring its authority.
+    // A closed or gone main agent hands the workspace to its live successor (discovery decides; see
+    // successorMainAgent). Any other mismatch keeps the recorded owner.
+    if (row.replacesMainAgentId && row.replacesMainAgentId === w.mainAgentId && !w.archived) {
+      w.mainAgentId = row.mainAgentId; w.runtimeReason = null;
+      for (const b of w.batches) if (b.state === "pending" && b.recipientAgentId === row.replacesMainAgentId) b.recipientAgentId = null;
+    }
     if (w.mainAgentId !== row.mainAgentId || w.archived) continue;
     if (row.contributorAgentIds) w.contributorAgentIds = row.contributorAgentIds;
     if (row.enable_default_tracking && !w.enable_tracking && (!row.projectId || state.projectDefaults?.[row.projectId] !== false)) { w.enable_auto_sends = firstTracking(w); w.enable_tracking = true; }

package/server/inbox.ts

@@ -90,6 +90,8 @@ export type InboxOptions = {
   guard: () => Promise<GuardPause[] | null>;
   now?: () => number;
   graceMs?: number;
+  /** How long a turn end waits for Paseo to stop reporting "running" (F7). Tests shorten it. */
+  settleMs?: number; settleStepMs?: number;
 };
 /** Decides the brief step for one event from the entry before and after it. */
 export type BriefDecider = (prev: Entry, next: Entry, at: string) => BriefEvent | null;
@@ -128,6 +130,21 @@ export class Inbox {
   private cache: { at: number; agents: AgentInfo[]; workspaces: { id: string; name: string }[] } | null = null;
   constructor(directory: string, private o: InboxOptions) { this.store = new InboxStore(directory); }
   private now() { return this.o.now?.() ?? Date.now(); }
+  /**
+   * Paseo still reports "running" for a moment after a turn completes, so a status read at turn end would make
+   * every plain finish look like background work (F7) and flag nothing. Re-read until the agent leaves "running"
+   * or the window ends; only an agent still running after it counts as running.
+   */
+  private async settledStatus(agentId: string): Promise<string | null> {
+    const read = () => this.o.directory.agent(agentId).then(a => a?.status ?? null, () => null);
+    const step = this.o.settleStepMs ?? 500, steps = Math.max(1, Math.ceil((this.o.settleMs ?? 6_000) / step));
+    let status = await read();
+    for (let i = 0; i < steps && (status === "running" || status === "initializing"); i++) {
+      await new Promise(r => setTimeout(r, step));
+      status = await read();
+    }
+    return status;
+  }
   private iso() { return new Date(this.now()).toISOString(); }
   private async on() { try { return (await this.o.enabled()).enable_inbox; } catch { return true; } }
 
@@ -247,7 +264,7 @@ export class Inbox {
       const reply = [...items].reverse().find(i => (i as { type?: string })?.type === "assistant_message") as { text?: string } | undefined;
       // F7: needs_you kind=done means nothing for the developer, and while Paseo still shows the agent running
       // (background work) its own running state is enough. Neither flags; a decision, action or review still does.
-      const status = await this.o.directory.agent(agent.id).then(a => a?.status ?? null, () => null);
+      const status = await this.settledStatus(agent.id);
       const quiet = finishIsQuiet(stated.agent?.kind ?? null, status);
       // The ask replaces the reply's last line as the reason's detail (§4); the fallback keeps the old detail.
       const brief = await this.creator(root.rootId, turnId, "", "finished", stated, !quiet || stated.agent?.kind === "done", quiet);