@agentplate/cli 1.2.0 → 1.4.0

package/src/commands/watch.test.ts

@@ -0,0 +1,136 @@
+/**
+ * `agentplate watch` tests. Real initialized temp project + real (mock) turns,
+ * driven deterministically via `--once`. Asserts which idle agents get advanced.
+ */
+
+import { afterEach, beforeEach, describe, expect, test } from "bun:test";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import {
+	AGENTPLATE_DIR,
+	CONFIG_FILE,
+	DEFAULT_CONFIG,
+	serializeConfig,
+	setProjectRootOverride,
+} from "../config.ts";
+import { createMailClient } from "../mail/client.ts";
+import { sessionsDbPath } from "../paths.ts";
+import { createSessionStore } from "../sessions/store.ts";
+import type { AgentSession } from "../types.ts";
+import { createWatchCommand } from "./watch.ts";
+
+let root: string;
+let worktree: string;
+
+function seedSession(over: Partial<AgentSession>): void {
+	const store = createSessionStore(sessionsDbPath(root));
+	const now = new Date().toISOString();
+	try {
+		store.upsertSession({
+			id: `session-${crypto.randomUUID()}`,
+			agentName: "builder-1",
+			capability: "builder",
+			taskId: "task-1",
+			runId: "run-1",
+			worktreePath: worktree,
+			branchName: "agentplate/builder-1",
+			state: "idle",
+			parentAgent: "lead-1",
+			depth: 1,
+			pid: null,
+			runtimeSessionId: "sess-prior",
+			startedAt: now,
+			lastActivity: now,
+			...over,
+		});
+	} finally {
+		store.close();
+	}
+}
+
+function sendMailTo(agent: string): void {
+	const mail = createMailClient(root);
+	try {
+		mail.send({ from: "lead-1", to: agent, subject: "ping", body: "continue", type: "status" });
+	} finally {
+		mail.close();
+	}
+}
+
+/** Run `watch --once --json` and return the parsed summary. */
+async function watchOnce(): Promise<{ driven: number; turns: Array<{ agent: string }> }> {
+	const original = process.stdout.write.bind(process.stdout);
+	let out = "";
+	process.stdout.write = (chunk: string | Uint8Array): boolean => {
+		out += typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8");
+		return true;
+	};
+	try {
+		await createWatchCommand().parseAsync(["--once", "--json"], { from: "user" });
+	} finally {
+		process.stdout.write = original;
+	}
+	// jsonOutput wraps the payload in the standard { ok, data } envelope.
+	return JSON.parse(out.trim()).data;
+}
+
+beforeEach(() => {
+	root = mkdtempSync(join(tmpdir(), "agentplate-watch-"));
+	worktree = mkdtempSync(join(tmpdir(), "agentplate-watch-wt-"));
+	mkdirSync(join(root, AGENTPLATE_DIR), { recursive: true });
+	const config = structuredClone(DEFAULT_CONFIG);
+	config.runtime.default = "mock";
+	writeFileSync(join(root, AGENTPLATE_DIR, CONFIG_FILE), serializeConfig(config), "utf8");
+	setProjectRootOverride(root);
+	process.env.AGENTPLATE_MOCK_CMD = "true";
+});
+
+afterEach(() => {
+	setProjectRootOverride(null);
+	rmSync(root, { recursive: true, force: true });
+	rmSync(worktree, { recursive: true, force: true });
+	process.env.AGENTPLATE_MOCK_CMD = undefined;
+});
+
+describe("agentplate watch --once", () => {
+	test("drives an idle agent that has unread mail", async () => {
+		seedSession({ agentName: "builder-1", state: "idle" });
+		sendMailTo("builder-1");
+		const out = await watchOnce();
+		expect(out.driven).toBe(1);
+		expect(out.turns[0]?.agent).toBe("builder-1");
+	});
+
+	test("skips an idle agent with no unread mail", async () => {
+		seedSession({ agentName: "builder-1", state: "idle" });
+		const out = await watchOnce();
+		expect(out.driven).toBe(0);
+	});
+
+	test("never drives a terminal agent, even with mail", async () => {
+		seedSession({ agentName: "builder-1", state: "completed" });
+		sendMailTo("builder-1");
+		const out = await watchOnce();
+		expect(out.driven).toBe(0);
+	});
+
+	test("drives only the idle-with-mail agents in a mixed fleet", async () => {
+		seedSession({ agentName: "has-mail", state: "idle" });
+		seedSession({ agentName: "no-mail", state: "idle" });
+		sendMailTo("has-mail");
+		const out = await watchOnce();
+		expect(out.driven).toBe(1);
+		expect(out.turns.map((t) => t.agent)).toEqual(["has-mail"]);
+	});
+
+	test("drives multiple idle-with-mail agents in one pass (concurrent)", async () => {
+		for (const a of ["a1", "a2", "a3"]) {
+			seedSession({ agentName: a, state: "idle" });
+			sendMailTo(a);
+		}
+		const out = await watchOnce();
+		expect(out.driven).toBe(3);
+		expect(out.turns.map((t) => t.agent).sort()).toEqual(["a1", "a2", "a3"]);
+	});
+});

package/src/commands/watch.ts

@@ -0,0 +1,151 @@
+/**
+ * `agentplate watch` — the mail pump that makes warm-start automatic.
+ *
+ * Each tick it finds **idle** agents (paused after a turn, awaiting mail) that now
+ * have **unread mail**, and runs each one's next turn via {@link driveAgentTurn},
+ * which **resumes** the runtime session (warm start). Detection is non-destructive
+ * (`mail.check(..., { unreadOnly })`); the turn itself injects + marks the mail
+ * read. Each pass drives eligible agents concurrently, capped at the fleet's
+ * `maxConcurrent`; a failing turn is logged and the loop continues.
+ *
+ * Modes: `--once` (single pass), `--until-idle` (loop until no active agents
+ * remain — the run drained), or the default (loop until Ctrl-C).
+ */
+
+import { existsSync, readFileSync } from "node:fs";
+import { Command } from "commander";
+import { driveAgentTurn } from "../agents/drive.ts";
+import { findProjectRoot, isInitialized, loadConfig } from "../config.ts";
+import { ValidationError } from "../errors.ts";
+import { createEventStore } from "../events/store.ts";
+import { jsonOutput } from "../json.ts";
+import { brand, muted, printInfo, printSuccess, printWarning } from "../logging/color.ts";
+import { createMailClient } from "../mail/client.ts";
+import { currentRunPath, eventsDbPath, sessionsDbPath } from "../paths.ts";
+import { createSessionStore } from "../sessions/store.ts";
+import type { AgentSession } from "../types.ts";
+
+interface WatchOptions {
+	run?: string;
+	interval?: string;
+	once?: boolean;
+	untilIdle?: boolean;
+	json?: boolean;
+}
+
+const sleep = (ms: number): Promise<void> => new Promise((resolve) => setTimeout(resolve, ms));
+
+/** Current run id from `.agentplate/current-run.txt`, or undefined (= all runs). */
+function readCurrentRun(root: string): string | undefined {
+	const path = currentRunPath(root);
+	if (!existsSync(path)) return undefined;
+	return readFileSync(path, "utf8").trim() || undefined;
+}
+
+export function createWatchCommand(): Command {
+	return new Command("watch")
+		.description("Auto-advance idle agents: run their next (resumed) turn when they have mail")
+		.option("--run <id>", "scope to a run (default: the current run)")
+		.option("--interval <ms>", "poll interval in milliseconds", "2000")
+		.option("--once", "run a single pass, then exit")
+		.option("--until-idle", "exit once no active agents remain (the run has drained)")
+		.option("--json", "output a JSON summary")
+		.action(async (opts: WatchOptions, command: Command) => {
+			const useJson = command.optsWithGlobals().json === true;
+			const root = findProjectRoot();
+			if (!isInitialized(root)) {
+				throw new ValidationError("Not initialized. Run `agentplate setup` first.");
+			}
+			const config = loadConfig(root);
+			const interval = Number(opts.interval ?? "2000");
+			if (!Number.isFinite(interval) || interval < 0) {
+				throw new ValidationError("--interval must be a non-negative number of milliseconds.");
+			}
+			const runId = opts.run ?? readCurrentRun(root);
+
+			const store = createSessionStore(sessionsDbPath(root));
+			const mail = createMailClient(root);
+			const events = createEventStore(eventsDbPath(root));
+
+			let stop = false;
+			const onSigint = (): void => {
+				stop = true;
+			};
+			process.once("SIGINT", onSigint);
+
+			let totalDriven = 0;
+			const drivenLog: Array<{ agent: string; state: string }> = [];
+			// Cap simultaneous turns at the fleet's maxConcurrent (>= 1).
+			const concurrency = Math.max(1, config.agents.maxConcurrent);
+
+			/** Drive one agent's next turn, recording the outcome. */
+			const driveOne = async (session: AgentSession): Promise<void> => {
+				try {
+					const { finalState } = await driveAgentTurn({
+						root,
+						config,
+						session,
+						store,
+						events,
+						mail,
+					});
+					totalDriven++;
+					drivenLog.push({ agent: session.agentName, state: finalState });
+					if (!useJson) printInfo(`  ${brand(session.agentName)} → ${finalState}`);
+				} catch (error) {
+					const message = error instanceof Error ? error.message : String(error);
+					if (!useJson) printWarning(`  ${session.agentName}: turn failed — ${message}`);
+				}
+			};
+
+			/**
+			 * One pass: drive every idle agent that has unread mail, up to `concurrency`
+			 * turns at a time. Returns the number driven.
+			 */
+			const pass = async (): Promise<number> => {
+				const eligible = store
+					.listSessions({ runId, state: "idle" })
+					.filter((s) => mail.check(s.agentName, { unreadOnly: true }).length > 0);
+				let next = 0;
+				const worker = async (): Promise<void> => {
+					while (!stop) {
+						const session = eligible[next++];
+						if (!session) break;
+						await driveOne(session);
+					}
+				};
+				const lanes = Math.min(concurrency, eligible.length);
+				await Promise.all(Array.from({ length: lanes }, () => worker()));
+				return eligible.length;
+			};
+
+			try {
+				if (opts.once) {
+					await pass();
+				} else {
+					if (!useJson) {
+						printInfo(
+							`Watching${runId ? ` run ${muted(runId)}` : " all runs"} (every ${interval}ms; Ctrl-C to stop)…`,
+						);
+					}
+					while (!stop) {
+						await pass();
+						if (opts.untilIdle && store.countActive(runId) === 0) break;
+						if (stop) break;
+						await sleep(interval);
+					}
+				}
+			} finally {
+				process.removeListener("SIGINT", onSigint);
+				events.close();
+				mail.close();
+				store.close();
+			}
+
+			if (useJson) {
+				jsonOutput({ runId: runId ?? null, driven: totalDriven, turns: drivenLog });
+				return;
+			}
+			printSuccess(`Watch finished — drove ${totalDriven} turn(s).`);
+		});
+}

package/src/config.test.ts

@@ -92,6 +92,20 @@ describe("validateConfig", () => {
 		cfg.merge.autoMerge = "always";
 		expect(() => validateConfig(cfg)).toThrow();
 	});
+
+	test("turn timeout + skip defaults are off", () => {
+		expect(DEFAULT_CONFIG.agents.turnTimeoutMinutes).toBe(0);
+		expect(DEFAULT_CONFIG.agents.skipScout).toBe(false);
+		expect(DEFAULT_CONFIG.agents.skipReview).toBe(false);
+		expect(DEFAULT_CONFIG.agents.skipGates).toBe(false);
+		expect(DEFAULT_CONFIG.agents.skipSkills).toBe(false);
+	});
+
+	test("rejects a negative turnTimeoutMinutes", () => {
+		const cfg = structuredClone(DEFAULT_CONFIG);
+		cfg.agents.turnTimeoutMinutes = -1;
+		expect(() => validateConfig(cfg)).toThrow();
+	});
 });
 
 describe("isInitialized / serializeConfig", () => {

package/src/config.ts

@@ -43,6 +43,12 @@ export const DEFAULT_CONFIG: AgentplateConfig = {
 		maxDepth: 2,
 		maxAgentsPerLead: 5,
 		idleTimeoutMinutes: 10,
+		turnTimeoutMinutes: 0,
+		skipScout: false,
+		skipReview: false,
+		skipGates: false,
+		skipSkills: false,
+		purgeOnReap: false,
 	},
 	merge: {
 		aiResolveEnabled: true,
@@ -176,6 +182,11 @@ export function validateConfig(config: AgentplateConfig): void {
 			"config.agents.idleTimeoutMinutes must be >= 0 (0 disables idle reaping)",
 		);
 	}
+	if (config.agents.turnTimeoutMinutes < 0) {
+		throw new ConfigError(
+			"config.agents.turnTimeoutMinutes must be >= 0 (0 disables the per-turn cap)",
+		);
+	}
 	const autoMergeModes: AutoMergeMode[] = ["off", "on-gates-pass", "on-complete"];
 	if (!autoMergeModes.includes(config.merge.autoMerge)) {
 		throw new ConfigError(`config.merge.autoMerge must be one of: ${autoMergeModes.join(", ")}`);

package/src/events/store.test.ts

@@ -180,4 +180,26 @@ describe("createEventStore", () => {
 		// Newest two builder events.
 		expect(limited.map((e) => e.type)).toEqual(["c", "b"]);
 	});
+
+	test("deleteByAgent removes only that agent's rows and returns the count", () => {
+		store.record({ agentName: "builder", type: "a" });
+		store.record({ agentName: "builder", type: "b" });
+		store.record({ agentName: "scout", type: "a" });
+
+		expect(store.deleteByAgent("builder")).toBe(2);
+		expect(store.list({ agentName: "builder" })).toEqual([]);
+		expect(store.list({ agentName: "scout" }).length).toBe(1);
+	});
+
+	test("deleteByAgent scoped to a run leaves the agent's other runs intact", () => {
+		store.record({ agentName: "builder", runId: "r1", type: "a" });
+		store.record({ agentName: "builder", runId: "r2", type: "b" });
+
+		expect(store.deleteByAgent("builder", "r1")).toBe(1);
+		expect(store.list({ agentName: "builder" }).map((e) => e.runId)).toEqual(["r2"]);
+	});
+
+	test("deleteByAgent on an unknown agent returns 0", () => {
+		expect(store.deleteByAgent("nobody")).toBe(0);
+	});
 });

package/src/events/store.ts

@@ -42,6 +42,12 @@ export interface ListEventsFilter {
 export interface EventStore {
 	record(event: RecordEventInput): EventRecord;
 	list(filter?: ListEventsFilter): EventRecord[];
+	/**
+	 * Delete every event logged by `agentName` (optionally scoped to one run);
+	 * returns the number of rows removed. Used when fully purging a reaped agent's
+	 * data. The log is otherwise append-only — this is the sole deletion path.
+	 */
+	deleteByAgent(agentName: string, runId?: string): number;
 	close(): void;
 }
 
@@ -193,9 +199,26 @@ export function createEventStore(dbPath: string): EventStore {
 		return rows.map(rowToRecord);
 	}
 
+	function deleteByAgent(agentName: string, runId?: string): number {
+		// Count first so we can report how many rows were removed (bun:sqlite's
+		// run() does not surface a changes count through this query API uniformly).
+		const where =
+			runId !== undefined
+				? "agent_name = $agent_name AND run_id = $run_id"
+				: "agent_name = $agent_name";
+		const params: Record<string, string> = { $agent_name: agentName };
+		if (runId !== undefined) params.$run_id = runId;
+		const countRow = db.query(`SELECT COUNT(*) AS n FROM events WHERE ${where}`).get(params) as {
+			n: number;
+		} | null;
+		const n = countRow?.n ?? 0;
+		if (n > 0) db.query(`DELETE FROM events WHERE ${where}`).run(params);
+		return n;
+	}
+
 	function close(): void {
 		db.close();
 	}
 
-	return { record, list, close };
+	return { record, list, deleteByAgent, close };
 }

package/src/index.ts

@@ -35,6 +35,7 @@ import { createStatusCommand } from "./commands/status.ts";
 import { createStopCommand } from "./commands/stop.ts";
 import { createTuiCommand } from "./commands/tui.ts";
 import { createTurnCommand } from "./commands/turn.ts";
+import { createWatchCommand } from "./commands/watch.ts";
 import { createWorktreeCommand } from "./commands/worktree.ts";
 import { setProjectRootOverride } from "./config.ts";
 import { isAgentplateError } from "./errors.ts";
@@ -98,6 +99,7 @@ function buildProgram(): Command {
 	program.addCommand(createCoordinatorCommand());
 	program.addCommand(createSlingCommand());
 	program.addCommand(createTurnCommand());
+	program.addCommand(createWatchCommand());
 	program.addCommand(createSpecCommand());
 	program.addCommand(createStatusCommand());
 	program.addCommand(createMailCommand());

package/src/merge/queue.test.ts

@@ -133,4 +133,19 @@ describe("createMergeQueue", () => {
 			queue = createMergeQueue(join(dir, "merge-queue.db"));
 		}
 	});
+
+	test("deleteByAgent removes every entry for the agent and returns the count", () => {
+		add({ agentName: "builder-1", branchName: "agent/a" });
+		add({ agentName: "builder-1", branchName: "agent/b" });
+		add({ agentName: "builder-2", branchName: "agent/c" });
+
+		expect(queue.deleteByAgent("builder-1")).toBe(2);
+		const pending = queue.listPending();
+		expect(pending).toHaveLength(1);
+		expect(pending[0]?.agentName).toBe("builder-2");
+	});
+
+	test("deleteByAgent on an unknown agent returns 0", () => {
+		expect(queue.deleteByAgent("nobody")).toBe(0);
+	});
 });

package/src/merge/queue.ts

@@ -36,6 +36,12 @@ export interface MergeQueue {
 	 * The returned object reflects its pre-removal `status` ("pending").
 	 */
 	dequeue(): MergeEntry | null;
+	/**
+	 * Delete every queue entry belonging to `agentName` regardless of status;
+	 * returns the number removed. Used when fully purging a reaped agent's data so
+	 * no stale pending merge survives the agent it came from.
+	 */
+	deleteByAgent(agentName: string): number;
 	/** Close the underlying database connection. */
 	close(): void;
 }
@@ -131,6 +137,14 @@ export function createMergeQueue(dbPath: string): MergeQueue {
 		"DELETE FROM merge_queue WHERE seq = $seq",
 	);
 
+	const countByAgentStmt = db.query<{ n: number }, { $agent: string }>(
+		"SELECT COUNT(*) AS n FROM merge_queue WHERE agent_name = $agent",
+	);
+
+	const deleteByAgentStmt = db.query<void, { $agent: string }>(
+		"DELETE FROM merge_queue WHERE agent_name = $agent",
+	);
+
 	return {
 		enqueue(entry): MergeEntry {
 			const row = insertStmt.get({
@@ -170,6 +184,12 @@ export function createMergeQueue(dbPath: string): MergeQueue {
 			return rowToEntry(row);
 		},
 
+		deleteByAgent(agentName): number {
+			const n = countByAgentStmt.get({ $agent: agentName })?.n ?? 0;
+			if (n > 0) deleteByAgentStmt.run({ $agent: agentName });
+			return n;
+		},
+
 		close(): void {
 			db.close();
 		},

package/src/runtimes/registry.test.ts

@@ -1,15 +1,29 @@
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 import { ValidationError } from "../errors.ts";
-import type { ResolvedModel } from "../types.ts";
+import type { ResolvedModel, RuntimeConfig } from "../types.ts";
 import { ClaudeRuntime } from "./claude.ts";
 import { CodexRuntime } from "./codex.ts";
 import { CursorRuntime } from "./cursor.ts";
 import { GeminiRuntime } from "./gemini.ts";
 import { MockRuntime } from "./mock.ts";
 import { OpenCodeRuntime, opencodeModel } from "./opencode.ts";
-import { getRuntime, getRuntimeNames } from "./registry.ts";
+import { getRuntime, getRuntimeNames, runtimeNameForCapability } from "./registry.ts";
 import type { AgentEvent, DirectSpawnOpts } from "./types.ts";
 
+describe("runtimeNameForCapability", () => {
+	const rt: RuntimeConfig = { default: "claude", capabilities: { scout: "codex" } };
+	test("explicit override wins over everything", () => {
+		expect(runtimeNameForCapability(rt, "scout", "gemini")).toBe("gemini");
+	});
+	test("per-capability override applies when set", () => {
+		expect(runtimeNameForCapability(rt, "scout")).toBe("codex");
+	});
+	test("falls back to the default runtime", () => {
+		expect(runtimeNameForCapability(rt, "builder")).toBe("claude");
+		expect(runtimeNameForCapability({ default: "opencode" }, "scout")).toBe("opencode");
+	});
+});
+
 // Minimal DirectSpawnOpts builder for argv-shape assertions. `cwd` and
 // `instructionPath` are required by the type but irrelevant to argv here.
 function spawnOpts(overrides: Partial<DirectSpawnOpts> = {}): DirectSpawnOpts {

package/src/runtimes/registry.ts

@@ -8,6 +8,7 @@
  */
 
 import { ValidationError } from "../errors.ts";
+import type { Capability, RuntimeConfig } from "../types.ts";
 import { ClaudeRuntime } from "./claude.ts";
 import { CodexRuntime } from "./codex.ts";
 import { CursorRuntime } from "./cursor.ts";
@@ -54,6 +55,18 @@ export function getRuntime(name?: string, fallback?: string): AgentRuntime {
 	return factory();
 }
 
+/**
+ * Resolve which runtime adapter drives a given capability: an explicit `override`
+ * wins, then a per-capability entry in `runtime.capabilities`, then the default.
+ */
+export function runtimeNameForCapability(
+	runtime: RuntimeConfig,
+	capability: Capability,
+	override?: string,
+): string {
+	return override ?? runtime.capabilities?.[capability] ?? runtime.default;
+}
+
 /**
  * Names of all registered runtimes, in registration order. Used to validate a
  * user-supplied runtime name and to render the choices in help / errors.

package/src/serve/server.ts

@@ -221,23 +221,25 @@ export function startServer(opts: ServeOptions): ServeHandle {
 	// Idle-agent reaper: terminate workers idle past the configured timeout. Runs
 	// independently of connected clients (serve running = reaping active). Disabled
 	// when idleTimeoutMinutes is 0. Config is read once at startup.
-	const idleMinutes = (() => {
+	const { idleMinutes, purgeOnReap } = (() => {
 		try {
-			return loadConfig(opts.root).agents.idleTimeoutMinutes;
+			const agents = loadConfig(opts.root).agents;
+			return { idleMinutes: agents.idleTimeoutMinutes, purgeOnReap: agents.purgeOnReap };
 		} catch {
-			return 0;
+			return { idleMinutes: 0, purgeOnReap: false };
 		}
 	})();
 	const reapTimer =
 		idleMinutes > 0
 			? setInterval(() => {
 					const store = createSessionStore(sessionsDbPath(opts.root));
-					reapIdleSessions(store, opts.root, { idleMs: idleMinutes * 60_000 })
+					reapIdleSessions(store, opts.root, { idleMs: idleMinutes * 60_000, purge: purgeOnReap })
 						.then((reaped) => {
 							if (reaped.length > 0) {
 								const names = reaped.map((r) => r.agentName).join(", ");
+								const how = purgeOnReap ? "reaped + purged" : "reaped";
 								console.error(
-									`[agentplate] reaped ${reaped.length} idle agent(s) (>${idleMinutes}m): ${names}`,
+									`[agentplate] ${how} ${reaped.length} idle agent(s) (>${idleMinutes}m): ${names}`,
 								);
 							}
 						})