@tmustier/pi-agent-teams 0.2.0 → 0.3.1

package/extensions/teams/teams-panel.ts

@@ -6,6 +6,16 @@ import type { TeamTask } from "./task-store.js";
 import type { TeamConfig, TeamMember } from "./team-config.js";
 import type { TeamsStyle } from "./teams-style.js";
 import { formatMemberDisplayName, getTeamsStrings } from "./teams-style.js";
+import {
+	STATUS_COLOR,
+	STATUS_ICON,
+	formatTokens,
+	getVisibleWorkerNames,
+	padRight,
+	resolveStatus,
+	toolActivity,
+	toolVerb,
+} from "./teams-ui-shared.js";
 
 export interface InteractiveWidgetDeps {
 	getTeammates(): Map<string, TeammateRpc>;
@@ -16,89 +26,17 @@ export interface InteractiveWidgetDeps {
 	getStyle(): TeamsStyle;
 	isDelegateMode(): boolean;
 	sendMessage(name: string, message: string): Promise<void>;
-	abortComrade(name: string): void;
-	killComrade(name: string): void;
+	abortMember(name: string): void;
+	killMember(name: string): void;
 	suppressWidget(): void;
 	restoreWidget(): void;
 }
 
-// ── Status icon + color (shared with teams-widget.ts) ──
-
-const STATUS_ICON: Record<TeammateStatus, string> = {
-	streaming: "\u25c9",
-	idle: "\u25cf",
-	starting: "\u25cb",
-	stopped: "\u2717",
-	error: "\u2717",
-};
-
-const STATUS_COLOR: Record<TeammateStatus, ThemeColor> = {
-	streaming: "accent",
-	idle: "success",
-	starting: "muted",
-	stopped: "dim",
-	error: "error",
-};
-
-const TOOL_VERB: Record<string, string> = {
-	read: "reading\u2026",
-	edit: "editing\u2026",
-	write: "writing\u2026",
-	grep: "searching\u2026",
-	glob: "finding files\u2026",
-	bash: "running\u2026",
-	task: "delegating\u2026",
-	webfetch: "fetching\u2026",
-	websearch: "searching web\u2026",
-};
-
-// ── Helpers ──
-
-function padRight(str: string, targetWidth: number): string {
-	const w = visibleWidth(str);
-	return w >= targetWidth ? str : str + " ".repeat(targetWidth - w);
-}
-
-function resolveStatus(rpc: TeammateRpc | undefined, cfg: TeamMember | undefined): TeammateStatus {
-	if (rpc) return rpc.status;
-	return cfg?.status === "online" ? "idle" : "stopped";
-}
-
-function formatTokens(n: number): string {
-	if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1)}M`;
-	if (n >= 1_000) return `${(n / 1_000).toFixed(1)}k`;
-	return String(n);
-}
-
-function toolActivity(toolName: string | null): string {
-	if (!toolName) return "";
-	const key = toolName.toLowerCase();
-	return TOOL_VERB[key] ?? `${key}\u2026`;
-}
-
 function formatTimestamp(ts: number): string {
 	const d = new Date(ts);
 	return d.toLocaleTimeString("en-US", { hour12: false, hour: "2-digit", minute: "2-digit", second: "2-digit" });
 }
 
-function getComradeNames(deps: InteractiveWidgetDeps): string[] {
-	const teamConfig = deps.getTeamConfig();
-	const teammates = deps.getTeammates();
-	const tasks = deps.getTasks();
-	const leadName = teamConfig?.leadName;
-	const cfgMembers = teamConfig?.members ?? [];
-
-	const names = new Set<string>();
-	for (const name of teammates.keys()) names.add(name);
-	for (const m of cfgMembers) {
-		if (m.role === "worker" && m.status === "online") names.add(m.name);
-	}
-	for (const t of tasks) {
-		if (t.owner && t.owner !== leadName && t.status === "in_progress") names.add(t.owner);
-	}
-	return Array.from(names).sort();
-}
-
 // ── Row data (mirrors teams-widget.ts) ──
 
 interface Row {
@@ -148,7 +86,7 @@ function formatTranscriptEntry(entry: TranscriptEntry, theme: Theme, width: numb
 	}
 
 	if (entry.kind === "tool_start") {
-		const verb = TOOL_VERB[entry.toolName.toLowerCase()] ?? `${entry.toolName}\u2026`;
+		const verb = toolVerb(entry.toolName);
 		return [` ${tsStr}  ${theme.fg("warning", verb)}`];
 	}
 
@@ -173,7 +111,11 @@ function formatTranscriptEntry(entry: TranscriptEntry, theme: Theme, width: numb
 export async function openInteractiveWidget(ctx: ExtensionCommandContext, deps: InteractiveWidgetDeps): Promise<void> {
 	const style = deps.getStyle();
 	const strings = getTeamsStrings(style);
-	const names = getComradeNames(deps);
+	const names = getVisibleWorkerNames({
+		teammates: deps.getTeammates(),
+		teamConfig: deps.getTeamConfig(),
+		tasks: deps.getTasks(),
+	});
 	if (names.length === 0) {
 		ctx.ui.notify(`No ${strings.memberTitle.toLowerCase()}s to show`, "info");
 		return;
@@ -209,7 +151,7 @@ export async function openInteractiveWidget(ctx: ExtensionCommandContext, deps:
 
 				// ── Build row data (same logic as persistent widget) ──
 
-				function buildRows(): { rows: Row[]; comradeNames: string[] } {
+				function buildRows(): { rows: Row[]; memberNames: string[] } {
 					const teammates = deps.getTeammates();
 					const tracker = deps.getTracker();
 					const tasks = deps.getTasks();
@@ -238,9 +180,9 @@ export async function openInteractiveWidget(ctx: ExtensionCommandContext, deps:
 						});
 					}
 
-					// Comrades
-					const comradeNames = getComradeNames(deps);
-					for (const name of comradeNames) {
+					// Workers
+					const memberNames = getVisibleWorkerNames({ teammates, teamConfig, tasks });
+					for (const name of memberNames) {
 						const rpc = teammates.get(name);
 						const cfg = cfgByName.get(name);
 						const statusKey = resolveStatus(rpc, cfg);
@@ -261,7 +203,7 @@ export async function openInteractiveWidget(ctx: ExtensionCommandContext, deps:
 						});
 					}
 
-					return { rows, comradeNames };
+					return { rows, memberNames };
 				}
 
 				// ── Overview render (identical to persistent widget + cursor) ──
@@ -270,10 +212,10 @@ export async function openInteractiveWidget(ctx: ExtensionCommandContext, deps:
 					const tasks = deps.getTasks();
 					const tracker = deps.getTracker();
 					const delegateMode = deps.isDelegateMode();
-					const { rows, comradeNames } = buildRows();
+					const { rows, memberNames } = buildRows();
 
 					// Clamp cursor
-					if (cursorIndex >= comradeNames.length) cursorIndex = Math.max(0, comradeNames.length - 1);
+					if (cursorIndex >= memberNames.length) cursorIndex = Math.max(0, memberNames.length - 1);
 
 					const lines: string[] = [];
 
@@ -294,7 +236,7 @@ export async function openInteractiveWidget(ctx: ExtensionCommandContext, deps:
 						const totalPending = tasks.filter((t) => t.status === "pending").length;
 						const totalCompleted = tasks.filter((t) => t.status === "completed").length;
 						let totalTokensRaw = 0;
-						for (const name of comradeNames) totalTokensRaw += tracker.get(name).totalTokens;
+						for (const name of memberNames) totalTokensRaw += tracker.get(name).totalTokens;
 						const totalTokensStr = formatTokens(totalTokensRaw);
 
 						const nameColWidth = Math.max(...rows.map((r) => visibleWidth(r.displayName)));
@@ -313,7 +255,7 @@ export async function openInteractiveWidget(ctx: ExtensionCommandContext, deps:
 
 						// Render rows
 						for (const r of rows) {
-							const isSelected = !r.isChairman && comradeNames.indexOf(r.name) === cursorIndex;
+							const isSelected = !r.isChairman && memberNames.indexOf(r.name) === cursorIndex;
 							const pointer = isSelected ? theme.fg("accent", "\u25b8") : " ";
 							const icon = theme.fg(r.iconColor, r.icon);
 							const styledName = isSelected
@@ -606,7 +548,7 @@ export async function openInteractiveWidget(ctx: ExtensionCommandContext, deps:
 							}
 							if (data === "a") {
 								if (sessionName) {
-									deps.abortComrade(sessionName);
+									deps.abortMember(sessionName);
 									showNotification(`Abort sent to ${formatMemberDisplayName(style, sessionName)}`, "warning");
 								}
 								return;
@@ -614,7 +556,7 @@ export async function openInteractiveWidget(ctx: ExtensionCommandContext, deps:
 							if (data === "k") {
 								if (sessionName) {
 									const name = sessionName;
-									deps.killComrade(name);
+									deps.killMember(name);
 									showNotification(`${formatMemberDisplayName(style, name)} ${strings.killedVerb}`, "error");
 									mode = "overview";
 									sessionName = null;
@@ -626,7 +568,11 @@ export async function openInteractiveWidget(ctx: ExtensionCommandContext, deps:
 						}
 
 						// ── Overview mode ──
-						const comradeNames = getComradeNames(deps);
+						const memberNames = getVisibleWorkerNames({
+							teammates: deps.getTeammates(),
+							teamConfig: deps.getTeamConfig(),
+							tasks: deps.getTasks(),
+						});
 
 						if (matchesKey(data, "escape") || data === "q") {
 							done(undefined);
@@ -638,12 +584,12 @@ export async function openInteractiveWidget(ctx: ExtensionCommandContext, deps:
 							return;
 						}
 						if (matchesKey(data, "down")) {
-							cursorIndex = Math.min(comradeNames.length - 1, cursorIndex + 1);
+							cursorIndex = Math.min(memberNames.length - 1, cursorIndex + 1);
 							tui.requestRender();
 							return;
 						}
 						if (matchesKey(data, "enter")) {
-							const name = comradeNames[cursorIndex];
+							const name = memberNames[cursorIndex];
 							if (name) {
 								sessionName = name;
 								mode = "session";
@@ -654,7 +600,7 @@ export async function openInteractiveWidget(ctx: ExtensionCommandContext, deps:
 							return;
 						}
 						if (data === "m") {
-							const name = comradeNames[cursorIndex];
+							const name = memberNames[cursorIndex];
 							if (name) {
 								dmTarget = name;
 								mode = "dm";
@@ -664,17 +610,17 @@ export async function openInteractiveWidget(ctx: ExtensionCommandContext, deps:
 							return;
 						}
 						if (data === "a") {
-							const name = comradeNames[cursorIndex];
+							const name = memberNames[cursorIndex];
 							if (name) {
-								deps.abortComrade(name);
+								deps.abortMember(name);
 								showNotification(`Abort sent to ${formatMemberDisplayName(style, name)}`, "warning");
 							}
 							return;
 						}
 						if (data === "k") {
-							const name = comradeNames[cursorIndex];
+							const name = memberNames[cursorIndex];
 							if (name) {
-								deps.killComrade(name);
+								deps.killMember(name);
 								showNotification(`${formatMemberDisplayName(style, name)} ${strings.killedVerb}`, "error");
 								tui.requestRender();
 							}

package/extensions/teams/teams-ui-shared.ts

@@ -0,0 +1,89 @@
+import type { ThemeColor } from "@mariozechner/pi-coding-agent";
+import { visibleWidth } from "@mariozechner/pi-tui";
+import type { TeamConfig, TeamMember } from "./team-config.js";
+import type { TeamTask } from "./task-store.js";
+import type { TeammateRpc, TeammateStatus } from "./teammate-rpc.js";
+
+// Status icon and color mapping (shared by widget + interactive panel)
+export const STATUS_ICON: Record<TeammateStatus, string> = {
+	streaming: "\u25c9",
+	idle: "\u25cf",
+	starting: "\u25cb",
+	stopped: "\u2717",
+	error: "\u2717",
+};
+
+export const STATUS_COLOR: Record<TeammateStatus, ThemeColor> = {
+	streaming: "accent",
+	idle: "success",
+	starting: "muted",
+	stopped: "dim",
+	error: "error",
+};
+
+export const TOOL_VERB: Record<string, string> = {
+	read: "reading\u2026",
+	edit: "editing\u2026",
+	write: "writing\u2026",
+	grep: "searching\u2026",
+	glob: "finding files\u2026",
+	bash: "running\u2026",
+	task: "delegating\u2026",
+	webfetch: "fetching\u2026",
+	websearch: "searching web\u2026",
+};
+
+export function toolVerb(toolName: string): string {
+	const key = toolName.toLowerCase();
+	return TOOL_VERB[key] ?? `${toolName}\u2026`;
+}
+
+export function toolActivity(toolName: string | null): string {
+	if (!toolName) return "";
+	return toolVerb(toolName);
+}
+
+export function padRight(str: string, targetWidth: number): string {
+	const w = visibleWidth(str);
+	return w >= targetWidth ? str : str + " ".repeat(targetWidth - w);
+}
+
+export function resolveStatus(rpc: TeammateRpc | undefined, cfg: TeamMember | undefined): TeammateStatus {
+	if (rpc) return rpc.status;
+	return cfg?.status === "online" ? "idle" : "stopped";
+}
+
+export function formatTokens(n: number): string {
+	if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1)}M`;
+	if (n >= 1_000) return `${(n / 1_000).toFixed(1)}k`;
+	return String(n);
+}
+
+/**
+ * Compute the set of worker names that should be visible in the UI.
+ *
+ * Rule: show any worker that is:
+ * - currently spawned/known as a teammate RPC
+ * - online in team config
+ * - owning an in-progress task (even if RPC is disconnected)
+ */
+export function getVisibleWorkerNames(opts: {
+	teammates: ReadonlyMap<string, TeammateRpc>;
+	teamConfig: TeamConfig | null;
+	tasks: readonly TeamTask[];
+}): string[] {
+	const { teammates, teamConfig, tasks } = opts;
+	const leadName = teamConfig?.leadName;
+	const cfgMembers = teamConfig?.members ?? [];
+
+	const names = new Set<string>();
+	for (const name of teammates.keys()) names.add(name);
+	for (const m of cfgMembers) {
+		if (m.role === "worker" && m.status === "online") names.add(m.name);
+	}
+	for (const t of tasks) {
+		if (t.owner && t.owner !== leadName && t.status === "in_progress") names.add(t.owner);
+	}
+
+	return Array.from(names).sort();
+}

package/extensions/teams/teams-widget.ts

@@ -7,6 +7,15 @@ import type { TeamTask } from "./task-store.js";
 import type { TeamConfig, TeamMember } from "./team-config.js";
 import type { TeamsStyle } from "./teams-style.js";
 import { formatMemberDisplayName, getTeamsStrings } from "./teams-style.js";
+import {
+	STATUS_COLOR,
+	STATUS_ICON,
+	formatTokens,
+	getVisibleWorkerNames,
+	padRight,
+	resolveStatus,
+	toolActivity,
+} from "./teams-ui-shared.js";
 
 export interface WidgetDeps {
 	getTeammates(): Map<string, TeammateRpc>;
@@ -19,57 +28,6 @@ export interface WidgetDeps {
 
 export type WidgetFactory = (tui: TUI, theme: Theme) => Component;
 
-// Status icon and color mapping
-const STATUS_ICON: Record<TeammateStatus, string> = {
-	streaming: "\u25c9",
-	idle: "\u25cf",
-	starting: "\u25cb",
-	stopped: "\u2717",
-	error: "\u2717",
-};
-
-const STATUS_COLOR: Record<TeammateStatus, ThemeColor> = {
-	streaming: "accent",
-	idle: "success",
-	starting: "muted",
-	stopped: "dim",
-	error: "error",
-};
-
-function padRight(str: string, targetWidth: number): string {
-	const w = visibleWidth(str);
-	return w >= targetWidth ? str : str + " ".repeat(targetWidth - w);
-}
-
-function resolveStatus(rpc: TeammateRpc | undefined, cfg: TeamMember | undefined): TeammateStatus {
-	if (rpc) return rpc.status;
-	return cfg?.status === "online" ? "idle" : "stopped";
-}
-
-function formatTokens(n: number): string {
-	if (n >= 1_000_000) return `${(n / 1_000_000).toFixed(1)}M`;
-	if (n >= 1_000) return `${(n / 1_000).toFixed(1)}k`;
-	return String(n);
-}
-
-const TOOL_VERB: Record<string, string> = {
-	read: "reading\u2026",
-	edit: "editing\u2026",
-	write: "writing\u2026",
-	grep: "searching\u2026",
-	glob: "finding files\u2026",
-	bash: "running\u2026",
-	task: "delegating\u2026",
-	webfetch: "fetching\u2026",
-	websearch: "searching web\u2026",
-};
-
-function toolActivity(toolName: string | null): string {
-	if (!toolName) return "";
-	const key = toolName.toLowerCase();
-	return TOOL_VERB[key] ?? `${key}\u2026`;
-}
-
 interface WidgetRow {
 	icon: string; // raw char (before styling)
 	iconColor: ThemeColor;
@@ -77,7 +35,7 @@ interface WidgetRow {
 	statusKey: TeammateStatus;
 	pending: number;
 	completed: number;
-	tokensStr: string; // "\u2014" for chairman
+	tokensStr: string; // "—" for chairman
 	activityText: string;
 }
 
@@ -131,17 +89,8 @@ export function createTeamsWidget(deps: WidgetDeps): WidgetFactory {
 					});
 				}
 
-				// Comrade rows
-				const visibleNames = new Set<string>();
-				for (const name of teammates.keys()) visibleNames.add(name);
-				for (const m of cfgMembers) {
-					if (m.role === "worker" && m.status === "online") visibleNames.add(m.name);
-				}
-				for (const t of tasks) {
-					if (t.owner && t.owner !== leadName && t.status === "in_progress") visibleNames.add(t.owner);
-				}
-
-				if (visibleNames.size === 0 && rows.length === 0) {
+				const workerNames = getVisibleWorkerNames({ teammates, teamConfig, tasks });
+				if (workerNames.length === 0 && rows.length === 0) {
 					lines.push(
 						truncateToWidth(
 							" " + theme.fg("dim", `(no ${strings.memberTitle.toLowerCase()}s)  /team spawn <name>`),
@@ -149,8 +98,7 @@ export function createTeamsWidget(deps: WidgetDeps): WidgetFactory {
 						),
 					);
 				} else {
-					const sortedNames = Array.from(visibleNames).sort();
-					for (const name of sortedNames) {
+					for (const name of workerNames) {
 						const rpc = teammates.get(name);
 						const cfg = cfgByName.get(name);
 						const statusKey = resolveStatus(rpc, cfg);
@@ -173,7 +121,7 @@ export function createTeamsWidget(deps: WidgetDeps): WidgetFactory {
 					const totalPending = tasks.filter((t) => t.status === "pending").length;
 					const totalCompleted = tasks.filter((t) => t.status === "completed").length;
 					let totalTokensRaw = 0;
-					for (const name of sortedNames) totalTokensRaw += tracker.get(name).totalTokens;
+					for (const name of workerNames) totalTokensRaw += tracker.get(name).totalTokens;
 					const totalTokensStr = formatTokens(totalTokensRaw);
 
 					const nameColWidth = Math.max(...rows.map((r) => visibleWidth(r.displayName)));
@@ -200,7 +148,6 @@ export function createTeamsWidget(deps: WidgetDeps): WidgetFactory {
 					}
 
 					// ── Total row ──
-					const leftWidth = nameColWidth + 13;
 					const sepLine = " " + theme.fg("dim", "\u2500".repeat(Math.max(0, width - 2)));
 					lines.push(truncateToWidth(sepLine, width));
 
@@ -215,7 +162,7 @@ export function createTeamsWidget(deps: WidgetDeps): WidgetFactory {
 						"muted",
 						` \u00b7 ${tpNum} pending \u00b7 ${tcNum} complete \u00b7 ${ttokStr} tokens`,
 					);
-					// nameColWidth + 4 = " ◆ " + name;  then " " + pctLabel fills the status column
+					// nameColWidth + 4 = " ◆ " + name; then " " + pctLabel fills the status column
 					const totalRow = ` ${padRight(totalLabel, nameColWidth + 3)} ${pctLabel}${totalSuffix}`;
 					lines.push(truncateToWidth(totalRow, width));
 				}

package/extensions/teams/worker.ts

@@ -4,7 +4,7 @@ import { Type, type Static } from "@sinclair/typebox";
 import { randomUUID } from "node:crypto";
 import { popUnreadMessages, writeToMailbox } from "./mailbox.js";
 import { sanitizeName } from "./names.js";
-import { getTeamsStyleFromEnv, type TeamsStyle, formatMemberDisplayName, getTeamsStrings } from "./teams-style.js";
+import { getTeamsStyleFromEnv, type TeamsStyle, getTeamsStrings } from "./teams-style.js";
 import {
 	TEAM_MAILBOX_NS,
 	isAbortRequestMessage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmustier/pi-agent-teams",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Claude Code agent teams style workflow for Pi.",
   "license": "MIT",
   "author": "Thomas Mustier",
@@ -27,25 +27,30 @@
     ]
   },
   "scripts": {
+    "lint": "eslint 'extensions/**/*.ts' 'scripts/**/*.ts' 'scripts/**/*.mts'",
     "typecheck": "tsc -p tsconfig.strict.json",
+    "check": "npm run typecheck && npm run lint",
     "smoke-test": "tsx scripts/smoke-test.mts",
     "integration-claim-test": "tsx scripts/integration-claim-test.mts",
     "integration-todo-test": "tsx scripts/integration-todo-test.mts"
   },
   "devDependencies": {
+    "@eslint/js": "^9.39.2",
     "@mariozechner/pi-agent-core": "^0.52.8",
     "@mariozechner/pi-ai": "^0.52.8",
     "@mariozechner/pi-coding-agent": "^0.52.8",
     "@mariozechner/pi-tui": "^0.52.8",
     "@sinclair/typebox": "^0.34.48",
+    "eslint": "^9.39.2",
+    "tsx": "^4.20.5",
     "typescript": "^5.9.3",
-    "tsx": "^4.20.5"
+    "typescript-eslint": "^8.54.0"
   },
   "peerDependencies": {
+    "@mariozechner/pi-agent-core": "*",
+    "@mariozechner/pi-ai": "*",
     "@mariozechner/pi-coding-agent": "*",
     "@mariozechner/pi-tui": "*",
-    "@mariozechner/pi-ai": "*",
-    "@mariozechner/pi-agent-core": "*",
     "@sinclair/typebox": "*"
   }
 }

package/scripts/integration-claim-test.mts

@@ -10,20 +10,17 @@
  *   npx tsx scripts/integration-claim-test.mts --agents 2 --tasks 3 --timeoutSec 90
  */
 
-import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { spawn, type ChildProcess } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { fileURLToPath } from "node:url";
+import type { ChildProcess } from "node:child_process";
 
 import { ensureTeamConfig } from "../extensions/teams/team-config.js";
 import { getTeamDir } from "../extensions/teams/paths.js";
 import { createTask, listTasks, type TeamTask } from "../extensions/teams/task-store.js";
 
-function sleep(ms: number): Promise<void> {
-	return new Promise((r) => setTimeout(r, ms));
-}
+import { sleep, spawnTeamsWorkerRpc, terminateAll } from "./lib/pi-workers.js";
 
 function parseArgs(argv: readonly string[]): { agents: number; tasks: number; timeoutSec: number } {
 	let agents = 2;
@@ -63,85 +60,6 @@ function allCompleted(ts: TeamTask[]): boolean {
 	return ts.length > 0 && ts.every((t) => t.status === "completed");
 }
 
-async function terminateAll(children: ChildProcess[]): Promise<void> {
-	for (const c of children) {
-		try {
-			c.kill("SIGTERM");
-		} catch {
-			// ignore
-		}
-	}
-
-	// Give them a moment to flush + exit.
-	const deadline = Date.now() + 10_000;
-	for (const c of children) {
-		while (c.exitCode === null && Date.now() < deadline) {
-			await sleep(100);
-		}
-		if (c.exitCode === null) {
-			try {
-				c.kill("SIGKILL");
-			} catch {
-				// ignore
-			}
-		}
-	}
-}
-
-function spawnWorker(opts: {
-	repoRoot: string;
-	entryPath: string;
-	sessionsDir: string;
-	teamId: string;
-	agentName: string;
-	logDir: string;
-}): ChildProcess {
-	const { repoRoot, entryPath, sessionsDir, teamId, agentName, logDir } = opts;
-
-	fs.mkdirSync(logDir, { recursive: true });
-	fs.mkdirSync(sessionsDir, { recursive: true });
-
-	const sessionFile = path.join(sessionsDir, `${agentName}.jsonl`);
-	fs.closeSync(fs.openSync(sessionFile, "a"));
-
-	const logPath = path.join(logDir, `${agentName}.log`);
-	const out = fs.openSync(logPath, "a");
-	const err = fs.openSync(logPath, "a");
-
-	const args = [
-		"--mode",
-		"rpc",
-		"--session",
-		sessionFile,
-		"--session-dir",
-		sessionsDir,
-		"--no-extensions",
-		"-e",
-		entryPath,
-		"--append-system-prompt",
-		["You are a teammate in an automated integration test.",
-			"Keep replies extremely short.",
-			"If you are assigned or auto-claim a task that says 'Reply with: okX', respond with exactly 'okX' and nothing else.",
-		].join(" "),
-	];
-
-	return spawn("pi", args, {
-		cwd: repoRoot,
-		env: {
-			...process.env,
-			PI_TEAMS_WORKER: "1",
-			PI_TEAMS_TEAM_ID: teamId,
-			PI_TEAMS_TASK_LIST_ID: teamId,
-			PI_TEAMS_AGENT_NAME: agentName,
-			PI_TEAMS_LEAD_NAME: "team-lead",
-			PI_TEAMS_STYLE: "normal",
-			PI_TEAMS_AUTO_CLAIM: "1",
-			PI_TEAMS_PLAN_REQUIRED: "0",
-		},
-		stdio: ["ignore", out, err],
-	});
-}
-
 const { agents, tasks, timeoutSec } = parseArgs(process.argv.slice(2));
 
 if (agents < 2 || tasks < 3) {
@@ -158,6 +76,12 @@ const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(scriptDir, "..");
 const entryPath = path.join(repoRoot, "extensions", "teams", "index.ts");
 
+const systemAppend = [
+	"You are a teammate in an automated integration test.",
+	"Keep replies extremely short.",
+	"If you are assigned or auto-claim a task that says 'Reply with: okX', respond with exactly 'okX' and nothing else.",
+].join(" ");
+
 console.log(`TeamId: ${teamId}`);
 console.log(`TeamDir: ${teamDir}`);
 console.log(`Spawning ${agents} worker(s), creating ${tasks} task(s)`);
@@ -190,12 +114,18 @@ process.on("SIGTERM", () => {
 try {
 	for (let i = 1; i <= agents; i += 1) {
 		children.push(
-			spawnWorker({
-				repoRoot,
+			spawnTeamsWorkerRpc({
+				cwd: repoRoot,
 				entryPath,
 				sessionsDir,
 				teamId,
+				taskListId: teamId,
 				agentName: `agent${i}`,
+				leadName: "team-lead",
+				style: "normal",
+				autoClaim: true,
+				planRequired: false,
+				systemAppend,
 				logDir: logsDir,
 			}),
 		);