@pantheon.ai/agents 0.0.17 → 0.1.0

package/dist/index.js

@@ -17034,8 +17034,9 @@ async function getPantheonBranchInfo({ projectId, branchId }) {
 	}, null);
 }
 async function executeOnPantheon({ projectId, branchId, prompt, agent }) {
+	const promptSequence = Array.isArray(prompt) ? prompt : [prompt];
 	return (await executor.execute(createProjectExploration, { projectId }, {
-		shared_prompt_sequence: [prompt],
+		shared_prompt_sequence: promptSequence,
 		num_branches: 1,
 		agent,
 		parent_branch_id: branchId
@@ -17059,8 +17060,47 @@ function getTaskWorkingBranchId(task) {
 	return ("branch_id" in task ? task.branch_id : void 0) ?? task.base_branch_id;
 }
 
+//#endregion
+//#region src/core/agent-config-utils.ts
+function normalizeRepoUrl(value) {
+	return value.trim().replace(/\/+$/, "").replace(/\.git$/, "");
+}
+function toRawGitHubContentUrl(url) {
+	if (!url.startsWith("https://github.com/")) return url;
+	return url.replace("https://github.com/", "https://raw.githubusercontent.com/").replace("/blob/", "/");
+}
+function normalizeSkills(value) {
+	if (Array.isArray(value)) return value.filter((item) => typeof item === "string");
+	if (typeof value === "string") {
+		try {
+			const parsed = JSON.parse(value);
+			if (Array.isArray(parsed)) return parsed.filter((item) => typeof item === "string");
+		} catch {}
+		return value.split(",").map((item) => item.trim()).filter((item) => item !== "");
+	}
+	return [];
+}
+function normalizeSetupScriptSlug(setupScript, fallback) {
+	if (typeof setupScript === "string" && setupScript.trim() !== "") return setupScript.trim();
+	return fallback.trim();
+}
+function buildSetupScriptStep(options) {
+	const prototypeRepoUrl = normalizeRepoUrl(options.prototypeRepoUrl);
+	const setupScriptUrl = toRawGitHubContentUrl(`${prototypeRepoUrl}/blob/main/scripts/${`setup-${options.setupScriptSlug}.sh`}`);
+	const skillsArg = JSON.stringify(options.skills.join(","));
+	return `execute shell ${setupScriptUrl} ${options.role.trim()} ${skillsArg} ${prototypeRepoUrl}`;
+}
+
 //#endregion
 //#region src/core/task-list.ts
+function buildTaskPromptSequence(config, taskPrompt) {
+	return [buildSetupScriptStep({
+		prototypeRepoUrl: config.prototype_url,
+		setupScriptSlug: normalizeSetupScriptSlug(config.setup_script, config.execute_agent),
+		role: config.role,
+		skills: normalizeSkills(config.skills)
+	}), taskPrompt];
+}
 async function startTaskListLoop(agentName, { loopInterval = 5 }, logger) {
 	logger.info("Starting task list loop...");
 	let i = 0;
@@ -17134,11 +17174,12 @@ async function startPendingTask(provider, task, logger) {
 		logger.warn("Agent configuration not found for project %s. Skip starting tasks.", taskToStart.project_id);
 		return false;
 	}
+	const promptSequence = buildTaskPromptSequence(config, taskToStart.task);
 	const taskBranch = await provider.startTask(taskToStart, async () => {
 		return await executeOnPantheon({
 			projectId: taskToStart.project_id,
 			branchId: taskToStart.base_branch_id,
-			prompt: taskToStart.task,
+			prompt: promptSequence,
 			agent: config.execute_agent
 		});
 	});
@@ -17538,17 +17579,6 @@ var WatchStepAggregator = class {
 
 //#endregion
 //#region src/core/index.ts
-function normalizeSkills(value) {
-	if (Array.isArray(value)) return value.filter((item) => typeof item === "string");
-	if (typeof value === "string") {
-		try {
-			const parsed = JSON.parse(value);
-			if (Array.isArray(parsed)) return parsed.filter((item) => typeof item === "string");
-		} catch {}
-		return value.split(",").map((item) => item.trim()).filter((item) => item !== "");
-	}
-	return [];
-}
 function buildRebootstrapDiffPrompt(options) {
 	return `You must follow these instructions":
 1. Clone the main branch from ${options.prototypeUrl} to a temporary directory (<pantheon-agents> in follow instructions references to this directory).
@@ -17635,75 +17665,21 @@ async function configAgent(name, options) {
 			}
 			options.rootBranchId = project.root_branch_id;
 		}
-		if (options.bootstrap) {
-			const { branch_id: branchId, latest_snap_id: branchLatestSnapId } = await executeOnPantheon({
-				projectId: options.projectId,
-				branchId: options.rootBranchId,
-				agent: "codex",
-				prompt: `You must follow these instructions":
-1. Clone the main branch from ${options.prototypeUrl} to a temporary directory (<pantheon-agents> in follow instructions references to this directory).
-2. Copy the <pantheon-agents>/agents/${options.role}/AGENTS.md to \`<workspace>/AGENTS.md\`.
-3. Copy the <pantheon-agents>/agents/${options.role}/skills directory to \`<workspace>/.codex/skills\` if the source directory exists.
-${options.skills.length > 0 ? `4. Copy the pantheon-agents/skills/\{${options.skills.join(",")}} directory to \`<workspace>/.codex/skills/\`` : ""}
-
-Validate <workspace>: check if files and directorys exists:
-- AGENTS.md
-- .codex/skills
-
-**You MUST NOT generate AGENTS.md and skills by yourself if clone failed.**
-
-Finally, outputs the first 5 lines of <workspace>/AGENTS.md and the skills list in <workspace>/.codex/skills
-`
-			});
-			let retried = 0;
-			const maxRetries = 3;
-			let i = 0;
-			console.log(`Bootstrap branch created: ${branchId} ${branchLatestSnapId}. Waiting for ready... [poll interval = 10s]`);
-			while (true) {
-				await new Promise((resolve) => {
-					setTimeout(resolve, 1e4);
-				});
-				const result = await getPantheonBranch({
-					branchId,
-					projectId: options.projectId,
-					getOutputIfFinished: true
-				}).then((result) => {
-					retried = 0;
-					return result;
-				}).catch((reason) => {
-					if (retried < maxRetries) {
-						retried++;
-						return { state: "others" };
-					}
-					throw new Error(`Failed to get bootstrap branch status. Retry ${retried} times. Last error: ${getErrorMessage$2(reason)}`);
-				});
-				if (result.state === "failed") {
-					console.error("Bootstrap failed: " + result.error);
-					process.exitCode = 1;
-					return;
-				}
-				if (result.state === "succeed") {
-					console.log("Bootstrap succeeded. Output is:");
-					console.log(result.output);
-					break;
-				}
-				console.log(`Bootstrap in progress... [${++i}]`);
-			}
-			await provider.setAgentConfig({
-				project_id: options.projectId,
-				base_branch_id: branchId,
-				execute_agent: options.executeAgent,
-				role: options.role,
-				skills: options.skills,
-				prototype_url: options.prototypeUrl
-			});
-		} else await provider.setAgentConfig({
+		const rootBranchId = options.rootBranchId;
+		if (!rootBranchId) {
+			console.error("Unable to resolve root branch id.");
+			process.exitCode = 1;
+			return;
+		}
+		const setupScript = normalizeSetupScriptSlug(options.setupScript, options.executeAgent);
+		await provider.setAgentConfig({
 			project_id: options.projectId,
-			base_branch_id: options.rootBranchId,
+			base_branch_id: rootBranchId,
 			execute_agent: options.executeAgent,
 			role: options.role,
 			skills: options.skills,
-			prototype_url: options.prototypeUrl
+			prototype_url: options.prototypeUrl,
+			setup_script: setupScript
 		});
 		console.log(`Agent ${name} configured successfully.`);
 	} finally {
@@ -17716,6 +17692,9 @@ async function reconfigAgentWithDeps(name, options, deps) {
 	const resolvedRole = options.role?.trim() || previousConfig.role;
 	if (options.role != null && !options.role.trim()) throw new Error("--role must be non-empty.");
 	const resolvedSkills = options.skills ?? normalizeSkills(previousConfig.skills);
+	const previousSetupScript = normalizeSetupScriptSlug(previousConfig.setup_script, previousConfig.execute_agent);
+	const resolvedSetupScript = options.setupScript?.trim() || previousSetupScript;
+	if (options.setupScript != null && !options.setupScript.trim()) throw new Error("--setup-script must be non-empty.");
 	const { branch_id: nextBaseBranchId } = await deps.executeOnPantheonFn({
 		projectId: options.projectId,
 		branchId: previousConfig.base_branch_id,
@@ -17742,7 +17721,8 @@ async function reconfigAgentWithDeps(name, options, deps) {
 		execute_agent: previousConfig.execute_agent,
 		role: resolvedRole,
 		skills: resolvedSkills,
-		prototype_url: previousConfig.prototype_url
+		prototype_url: previousConfig.prototype_url,
+		setup_script: resolvedSetupScript
 	});
 	return {
 		previousConfig,
@@ -17963,15 +17943,32 @@ function ensureEnv(keys) {
 	process.exitCode = 1;
 	return false;
 }
+function normalizeOptional(value) {
+	if (value == null) return void 0;
+	const trimmed = value.trim();
+	return trimmed === "" ? void 0 : trimmed;
+}
+function resolvePantheonProjectId(projectIdArg) {
+	return normalizeOptional(projectIdArg) ?? normalizeOptional(process.env.DEFAULT_PANTHEON_PROJECT_ID);
+}
+function resolvePantheonRootBranchId(rootBranchIdArg) {
+	return normalizeOptional(rootBranchIdArg) ?? normalizeOptional(process.env.DEFAULT_PANTHEON_ROOT_BRANCH_ID);
+}
 
 //#endregion
 //#region src/cli/commands/add-task.ts
-function createAddTaskCommand(version) {
-	return createCommand("add-task").version(version).description("Add a task to an agent").argument("<name>", "The name of the agent.").argument("<project-id>", "The project id of the agent.").argument("<task-prompt>", "The prompt of the task.").option("--parent-task-id <task-id>", "Parent task id for dependent tasks.").action(async function() {
-		const [name, projectId, taskPrompt] = this.args;
+function createAddTaskCommand(version, deps = {}) {
+	return createCommand("add-task").version(version).description("Add a task to an agent").argument("<name>", "The name of the agent.").argument("<task-prompt>", "The prompt of the task.").option("--project-id <project-id>", "The project id of the agent. Defaults to DEFAULT_PANTHEON_PROJECT_ID.").option("--parent-task-id <task-id>", "Parent task id for dependent tasks.").action(async function() {
+		const [name, taskPrompt] = this.args;
 		const options = this.opts();
+		const projectId = resolvePantheonProjectId(options.projectId);
+		if (!projectId) {
+			console.error("project-id is required (--project-id or DEFAULT_PANTHEON_PROJECT_ID).");
+			process$1.exitCode = 1;
+			return;
+		}
 		if (!ensureEnv(["DATABASE_URL"])) return;
-		await addTask(name, {
+		await (deps.addTask ?? addTask)(name, {
 			projectId,
 			prompt: taskPrompt,
 			parentTaskId: options.parentTaskId
@@ -18024,19 +18021,103 @@ function createCancelTaskCommand(version) {
 	});
 }
 
+//#endregion
+//#region src/cli/utils/parse.ts
+function parseCommaList(value) {
+	return value.split(",").map((item) => item.trim()).filter((item) => item !== "");
+}
+function parseUniqueCommaList(value) {
+	const items = parseCommaList(value);
+	const seen = /* @__PURE__ */ new Set();
+	const result = [];
+	for (const item of items) {
+		if (seen.has(item)) continue;
+		seen.add(item);
+		result.push(item);
+	}
+	return result;
+}
+function isLeapYear(year) {
+	return year % 4 === 0 && year % 100 !== 0 || year % 400 === 0;
+}
+function daysInMonth(year, month) {
+	switch (month) {
+		case 2: return isLeapYear(year) ? 29 : 28;
+		case 4:
+		case 6:
+		case 9:
+		case 11: return 30;
+		default: return 31;
+	}
+}
+function parseIsoTimestamp(value) {
+	const invalid = (detail) => ({
+		ok: false,
+		error: `Invalid timestamp: ${JSON.stringify(value)}. ` + (detail ? `${detail} ` : "") + "Expected ISO-8601 date-time with timezone, e.g. 2026-02-12T00:00:00Z."
+	});
+	const input = value.trim();
+	const match = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.(\d{1,3}))?(Z|([+-])(\d{2}):(\d{2}))$/.exec(input);
+	if (!match) return invalid();
+	const year = Number(match[1]);
+	const month = Number(match[2]);
+	const day = Number(match[3]);
+	const hour = Number(match[4]);
+	const minute = Number(match[5]);
+	const second = Number(match[6]);
+	const fraction = match[7];
+	if (month < 1 || month > 12) return invalid();
+	const dim = daysInMonth(year, month);
+	if (day < 1 || day > dim) return invalid("Day is out of range for month.");
+	if (hour < 0 || hour > 23) return invalid("Hour must be between 00 and 23.");
+	if (minute < 0 || minute > 59) return invalid("Minute must be between 00 and 59.");
+	if (second < 0 || second > 59) return invalid("Second must be between 00 and 59.");
+	const millis = fraction ? Number(fraction.padEnd(3, "0")) : 0;
+	if (!Number.isInteger(millis) || millis < 0 || millis > 999) return invalid("Fractional seconds must have 1-3 digits.");
+	const timezone = match[8];
+	let offsetMinutes = 0;
+	if (timezone !== "Z") {
+		const sign = match[9];
+		const offsetHours = Number(match[10]);
+		const offsetMins = Number(match[11]);
+		if (sign !== "+" && sign !== "-" || offsetHours < 0 || offsetHours > 23 || offsetMins < 0 || offsetMins > 59) return invalid("Timezone offset must be between -23:59 and +23:59.");
+		offsetMinutes = (sign === "+" ? 1 : -1) * (offsetHours * 60 + offsetMins);
+	}
+	const utcMillis = Date.UTC(year, month - 1, day, hour, minute, second, millis) - offsetMinutes * 6e4;
+	const date = new Date(utcMillis);
+	if (Number.isNaN(date.getTime())) return invalid();
+	return {
+		ok: true,
+		value: date
+	};
+}
+
 //#endregion
 //#region src/cli/commands/config.ts
+function parseSetupScriptSlug(value) {
+	const slug = value.trim();
+	if (!slug) throw new InvalidArgumentError("setup-script slug must be non-empty.");
+	return slug;
+}
 function createConfigAgentCommand(version) {
-	return createCommand("config").version(version).description("Configure agent for pantheon project").argument("<name>", "The name of the agent.").argument("<role>", "The role of the agent.").argument("<project-id>", "The project id of the agent.").option("--skills <skills>", "The skills of the agent. Multiple values are separated by comma.", (val) => val.split(",").map((s) => s.trim()).filter((s) => s !== ""), []).option("--execute-agent <agent>", "The execute agent of the agent.", "codex").option("--root-branch-id <branchId>", "The root branch id of the agent. Default to project root branch id.").option("--prototype-url <url>", "Role and skill definitions repo.", "https://github.com/pingcap-inc/pantheon-agents").option("--no-bootstrap", "Prevent bootstrap base branch for agent. Use the root branch as base branch.").action(async function() {
-		const [name, role, projectId] = this.args;
+	return createCommand("config").version(version).description("Configure agent for pantheon project").argument("<name>", "The name of the agent.").argument("<role>", "The role of the agent.").option("--project-id <project-id>", "The project id of the agent. Defaults to DEFAULT_PANTHEON_PROJECT_ID.").option("--skills <skills>", "The skills of the agent. Multiple values are separated by comma.", parseUniqueCommaList, []).option("--execute-agent <agent>", "The execute agent of the agent.", "codex").option("--root-branch-id <branchId>", "The root branch id of the agent. Defaults to DEFAULT_PANTHEON_ROOT_BRANCH_ID, then project root branch id.").option("--prototype-url <url>", "Role and skill definitions repo.", "https://github.com/pingcap-inc/pantheon-agents").option("--setup-script <slug>", "Setup script slug. CLI resolves it to setup-<slug>.sh.", parseSetupScriptSlug).action(async function() {
+		const [name, role] = this.args;
 		const options = this.opts();
+		const resolvedProjectId = resolvePantheonProjectId(options.projectId);
+		if (!resolvedProjectId) {
+			console.error("project-id is required (--project-id or DEFAULT_PANTHEON_PROJECT_ID).");
+			process$1.exitCode = 1;
+			return;
+		}
+		const resolvedRootBranchId = resolvePantheonRootBranchId(options.rootBranchId);
 		const requiredEnvVars = ["DATABASE_URL"];
-		if (options.bootstrap || !options.rootBranchId) requiredEnvVars.push("PANTHEON_API_KEY");
+		if (!resolvedRootBranchId) requiredEnvVars.push("PANTHEON_API_KEY");
 		if (!ensureEnv(requiredEnvVars)) return;
 		await configAgent(name, {
 			role,
-			projectId,
-			...options
+			projectId: resolvedProjectId,
+			...options,
+			rootBranchId: resolvedRootBranchId,
+			setupScript: options.setupScript ?? options.executeAgent
 		});
 	});
 }
@@ -18156,82 +18237,18 @@ function createLlmExplainCommand(version) {
 	});
 }
 
-//#endregion
-//#region src/cli/utils/parse.ts
-function parseCommaList(value) {
-	return value.split(",").map((item) => item.trim()).filter((item) => item !== "");
-}
-function parseUniqueCommaList(value) {
-	const items = parseCommaList(value);
-	const seen = /* @__PURE__ */ new Set();
-	const result = [];
-	for (const item of items) {
-		if (seen.has(item)) continue;
-		seen.add(item);
-		result.push(item);
-	}
-	return result;
-}
-function isLeapYear(year) {
-	return year % 4 === 0 && year % 100 !== 0 || year % 400 === 0;
-}
-function daysInMonth(year, month) {
-	switch (month) {
-		case 2: return isLeapYear(year) ? 29 : 28;
-		case 4:
-		case 6:
-		case 9:
-		case 11: return 30;
-		default: return 31;
-	}
-}
-function parseIsoTimestamp(value) {
-	const invalid = (detail) => ({
-		ok: false,
-		error: `Invalid timestamp: ${JSON.stringify(value)}. ` + (detail ? `${detail} ` : "") + "Expected ISO-8601 date-time with timezone, e.g. 2026-02-12T00:00:00Z."
-	});
-	const input = value.trim();
-	const match = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.(\d{1,3}))?(Z|([+-])(\d{2}):(\d{2}))$/.exec(input);
-	if (!match) return invalid();
-	const year = Number(match[1]);
-	const month = Number(match[2]);
-	const day = Number(match[3]);
-	const hour = Number(match[4]);
-	const minute = Number(match[5]);
-	const second = Number(match[6]);
-	const fraction = match[7];
-	if (month < 1 || month > 12) return invalid();
-	const dim = daysInMonth(year, month);
-	if (day < 1 || day > dim) return invalid("Day is out of range for month.");
-	if (hour < 0 || hour > 23) return invalid("Hour must be between 00 and 23.");
-	if (minute < 0 || minute > 59) return invalid("Minute must be between 00 and 59.");
-	if (second < 0 || second > 59) return invalid("Second must be between 00 and 59.");
-	const millis = fraction ? Number(fraction.padEnd(3, "0")) : 0;
-	if (!Number.isInteger(millis) || millis < 0 || millis > 999) return invalid("Fractional seconds must have 1-3 digits.");
-	const timezone = match[8];
-	let offsetMinutes = 0;
-	if (timezone !== "Z") {
-		const sign = match[9];
-		const offsetHours = Number(match[10]);
-		const offsetMins = Number(match[11]);
-		if (sign !== "+" && sign !== "-" || offsetHours < 0 || offsetHours > 23 || offsetMins < 0 || offsetMins > 59) return invalid("Timezone offset must be between -23:59 and +23:59.");
-		offsetMinutes = (sign === "+" ? 1 : -1) * (offsetHours * 60 + offsetMins);
-	}
-	const utcMillis = Date.UTC(year, month - 1, day, hour, minute, second, millis) - offsetMinutes * 6e4;
-	const date = new Date(utcMillis);
-	if (Number.isNaN(date.getTime())) return invalid();
-	return {
-		ok: true,
-		value: date
-	};
-}
-
 //#endregion
 //#region src/cli/commands/reconfig.ts
 function createReconfigAgentCommand(version) {
-	return createCommand("reconfig").version(version).description("Re-bootstrap an existing agent configuration for a project").argument("<name>", "The name of the agent.").argument("<project-id>", "The project id of the agent.").option("--role <role>", "Override role for the agent.").option("--skills <skills>", "Override skills for the agent (comma-separated, replaces existing list).", parseUniqueCommaList).action(async function() {
-		const [name, projectId] = this.args;
+	return createCommand("reconfig").version(version).description("Re-bootstrap an existing agent configuration for a project").argument("<name>", "The name of the agent.").option("--project-id <project-id>", "The project id of the agent. Defaults to DEFAULT_PANTHEON_PROJECT_ID.").option("--role <role>", "Override role for the agent.").option("--skills <skills>", "Override skills for the agent (comma-separated, replaces existing list).", parseUniqueCommaList).action(async function() {
+		const [name] = this.args;
 		const options = this.opts();
+		const projectId = resolvePantheonProjectId(options.projectId);
+		if (!projectId) {
+			console.error("project-id is required (--project-id or DEFAULT_PANTHEON_PROJECT_ID).");
+			process$1.exitCode = 1;
+			return;
+		}
 		if (!ensureEnv(["DATABASE_URL", "PANTHEON_API_KEY"])) return;
 		const resolvedRole = options.role?.trim();
 		if (options.role != null && !resolvedRole) {
@@ -20843,6 +20860,7 @@ function agentConfigToDTO(config) {
 		role: config.role,
 		skills: config.skills,
 		prototype_url: config.prototype_url,
+		setup_script: config.setup_script,
 		execute_agent: config.execute_agent
 	};
 }
@@ -20856,67 +20874,16 @@ function assertPantheonApiKeyConfigured() {
 		message: "Missing PANTHEON_API_KEY. This endpoint requires Pantheon API access."
 	});
 }
-async function getBranchOutputOrThrow(options) {
-	let state;
-	try {
-		state = await options.getPantheonBranchFn({
-			projectId: options.projectId,
-			branchId: options.branchId,
-			getOutputIfFinished: true,
-			manifestingAsSucceed: true
-		});
-	} catch (error) {
-		throw new ApiError({
-			status: 502,
-			code: "pantheon_api_error",
-			message: `Failed to fetch Pantheon branch output for ${options.branchId}.`,
-			details: {
-				project_id: options.projectId,
-				branch_id: options.branchId,
-				error: getErrorMessage$2(error)
-			}
-		});
-	}
-	if (state.state === "succeed") return state.output ?? "";
-	if (state.state === "failed") throw new ApiError({
-		status: 502,
-		code: "pantheon_branch_failed",
-		message: `Pantheon branch ${options.branchId} failed.`,
-		details: {
-			project_id: options.projectId,
-			branch_id: options.branchId,
-			error: state.error
-		}
-	});
-	throw new ApiError({
-		status: 502,
-		code: "pantheon_branch_not_ready",
-		message: `Pantheon branch ${options.branchId} is not finished yet.`,
-		details: {
-			project_id: options.projectId,
-			branch_id: options.branchId
-		}
-	});
-}
-async function getAgentConfigWithBootstrapOutput(options) {
-	assertPantheonApiKeyConfigured();
+async function getAgentConfig(options) {
 	const config = await options.provider.getAgentConfig(options.projectId);
 	if (!config) throw new ApiError({
 		status: 404,
 		code: "config_not_found",
 		message: `No config found for agent ${options.agent} and project ${options.projectId}.`
 	});
-	const bootstrapOutput = await getBranchOutputOrThrow({
-		projectId: config.project_id,
-		branchId: config.base_branch_id,
-		getPantheonBranchFn: options.getPantheonBranchFn ?? getPantheonBranch
-	});
-	return {
-		config: agentConfigToDTO(config),
-		bootstrap_output: bootstrapOutput
-	};
+	return { config: agentConfigToDTO(config) };
 }
-async function reconfigAgentConfigWithBootstrapOutput(options) {
+async function reconfigAgentConfig(options) {
 	assertPantheonApiKeyConfigured();
 	const getPantheonBranchFn = options.getPantheonBranchFn ?? getPantheonBranch;
 	const wrappedGetPantheonBranch = (args) => getPantheonBranchFn({
@@ -20941,7 +20908,7 @@ async function reconfigAgentConfigWithBootstrapOutput(options) {
 			code: "config_not_found",
 			message
 		});
-		if (message === "--role must be non-empty.") throw new ApiError({
+		if (message === "--role must be non-empty." || message === "--setup-script must be non-empty.") throw new ApiError({
 			status: 400,
 			code: "validation_error",
 			message
@@ -20966,8 +20933,7 @@ async function reconfigAgentConfigWithBootstrapOutput(options) {
 	});
 	return {
 		previous_config: agentConfigToDTO(result.previousConfig),
-		config: agentConfigToDTO(updated),
-		bootstrap_output: result.bootstrapOutput
+		config: agentConfigToDTO(updated)
 	};
 }
 
@@ -21011,7 +20977,8 @@ const createTaskBodySchema = z$1.object({
 });
 const reconfigBodySchema = z$1.object({
 	role: z$1.string().trim().min(1).optional(),
-	skills: z$1.array(z$1.string().trim().min(1)).optional()
+	skills: z$1.array(z$1.string().trim().min(1)).optional(),
+	setup_script: z$1.string().trim().min(1).optional()
 });
 function getAgentParam(value) {
 	if (typeof value !== "string" || value.trim().length === 0) throw new ApiError({
@@ -21046,7 +21013,7 @@ function createApiRouter(options) {
 	}));
 	router.get("/agents/:agent/configs/:project_id", asyncHandler(async (req, res) => {
 		const agent = getAgentParam(req.params.agent);
-		const result = await getAgentConfigWithBootstrapOutput({
+		const result = await getAgentConfig({
 			agent,
 			projectId: getProjectIdParam(req.params.project_id),
 			provider: new TaskListTidbProvider(agent, logger, { db })
@@ -21058,12 +21025,13 @@ function createApiRouter(options) {
 		const projectId = getProjectIdParam(req.params.project_id);
 		const body = reconfigBodySchema.parse(req.body);
 		const provider = new TaskListTidbProvider(agent, logger, { db });
-		const result = await reconfigAgentConfigWithBootstrapOutput({
+		const result = await reconfigAgentConfig({
 			agent,
 			reconfig: {
 				projectId,
 				role: body.role,
-				skills: body.skills
+				skills: body.skills,
+				setupScript: body.setup_script
 			},
 			provider
 		});
@@ -30958,7 +30926,7 @@ function createAgentsMcpServer(options) {
 		};
 	});
 	server.registerTool("configs.get", {
-		description: "Get an agent's config for a project, including the bootstrap branch output.",
+		description: "Get an agent's config for a project.",
 		inputSchema: {
 			agent: z$1.string().min(1),
 			project_id: z$1.string().min(1)
@@ -30969,7 +30937,7 @@ function createAgentsMcpServer(options) {
 				type: "text",
 				text: "OK"
 			}],
-			structuredContent: await getAgentConfigWithBootstrapOutput({
+			structuredContent: await getAgentConfig({
 				agent,
 				projectId: project_id,
 				provider: new TaskListTidbProvider(agent, options.logger, { db: options.db })
@@ -30982,21 +30950,23 @@ function createAgentsMcpServer(options) {
 			agent: z$1.string().min(1),
 			project_id: z$1.string().min(1),
 			role: z$1.string().trim().min(1).optional(),
-			skills: z$1.array(z$1.string().trim().min(1)).optional()
+			skills: z$1.array(z$1.string().trim().min(1)).optional(),
+			setup_script: z$1.string().trim().min(1).optional()
 		}
-	}, async ({ agent, project_id, role, skills }) => {
+	}, async ({ agent, project_id, role, skills, setup_script }) => {
 		const provider = new TaskListTidbProvider(agent, options.logger, { db: options.db });
 		return {
 			content: [{
 				type: "text",
 				text: "OK"
 			}],
-			structuredContent: await reconfigAgentConfigWithBootstrapOutput({
+			structuredContent: await reconfigAgentConfig({
 				agent,
 				reconfig: {
 					projectId: project_id,
 					role,
-					skills
+					skills,
+					setupScript: setup_script
 				},
 				provider
 			})
@@ -31121,9 +31091,10 @@ function createServerCommand(version) {
 //#endregion
 //#region src/cli/commands/show-config.ts
 function createShowConfigCommand(version) {
-	return createCommand("show-config").version(version).description("Show agent config for a project").argument("<name>", "The name of the agent.").argument("[project-id]", "The project id.").option("--json", "Output config as JSON.").action(async function() {
-		const [name, projectId] = this.args;
+	return createCommand("show-config").version(version).description("Show agent config for a project").argument("<name>", "The name of the agent.").option("--project-id <project-id>", "The project id. Defaults to DEFAULT_PANTHEON_PROJECT_ID.").option("--json", "Output config as JSON.").action(async function() {
+		const [name] = this.args;
 		const options = this.opts();
+		const projectId = resolvePantheonProjectId(options.projectId);
 		if (!ensureEnv(["DATABASE_URL"])) return;
 		if (projectId) {
 			const config = await showAgentConfig(name, projectId);
@@ -31143,6 +31114,7 @@ function createShowConfigCommand(version) {
 				role: config.role,
 				execute_agent: config.execute_agent,
 				prototype_url: config.prototype_url,
+				setup_script: config.setup_script,
 				skills: Array.isArray(config.skills) ? config.skills.join(", ") : String(config.skills)
 			}]);
 			return;
@@ -31164,6 +31136,7 @@ function createShowConfigCommand(version) {
 			role: config.role,
 			execute_agent: config.execute_agent,
 			prototype_url: config.prototype_url,
+			setup_script: config.setup_script,
 			skills: Array.isArray(config.skills) ? config.skills.join(", ") : String(config.skills)
 		})));
 	});
@@ -31370,8 +31343,8 @@ const mcpToolCallItemSchema = z$1.object({
 	result: z$1.object({
 		content: z$1.array(z$1.any()),
 		structured_content: z$1.any()
-	}).optional(),
-	error: z$1.object({ message: z$1.string() }).optional(),
+	}).nullable().transform((v) => v ?? void 0).optional(),
+	error: z$1.object({ message: z$1.string() }).nullable().transform((v) => v ?? void 0).optional(),
 	status: z$1.enum([
 		"in_progress",
 		"completed",
@@ -31760,16 +31733,40 @@ function createCodexNormalizer(options = {}) {
 
 //#endregion
 //#region ../agent-stream-parser/src/claude.ts
-const topLevelSchema = z$1.object({ type: z$1.string() }).passthrough();
-const streamEventSchema = z$1.object({
-	type: z$1.string(),
-	index: z$1.number().optional()
-}).passthrough();
+function toContentBlockEnvelope(value) {
+	if (!isRecord(value) || typeof value.type !== "string") return null;
+	return {
+		type: value.type,
+		text: typeof value.text === "string" ? value.text : void 0,
+		id: typeof value.id === "string" ? value.id : void 0,
+		name: typeof value.name === "string" ? value.name : void 0,
+		input: value.input
+	};
+}
+function toToolResultEnvelope(value) {
+	if (!isRecord(value) || value.type !== "tool_result") return null;
+	return {
+		type: "tool_result",
+		tool_use_id: typeof value.tool_use_id === "string" ? value.tool_use_id : void 0,
+		content: value.content,
+		is_error: typeof value.is_error === "boolean" ? value.is_error : void 0
+	};
+}
+function getMessageContentBlocks(value) {
+	if (!isRecord(value) || !Array.isArray(value.content)) return [];
+	return value.content;
+}
+function isToolUseLikeType(type) {
+	return type === "tool_use" || type === "mcp_tool_use" || type === "server_tool_use";
+}
 function createClaudeCodeNormalizer(options = {}) {
 	const includeMetaEvents = options.includeMetaEvents ?? false;
 	const textBlocks = /* @__PURE__ */ new Map();
 	const toolBlocks = /* @__PURE__ */ new Map();
-	let sawStreamEvents = false;
+	const assistantTextBlocks = /* @__PURE__ */ new Map();
+	const knownToolCallIds = /* @__PURE__ */ new Set();
+	let currentAssistantMessageId;
+	let assistantFallbackMessageSeq = 0;
 	function maybeMeta(event) {
 		if (!includeMetaEvents) return [];
 		return [{
@@ -31777,145 +31774,50 @@ function createClaudeCodeNormalizer(options = {}) {
 			data: event
 		}];
 	}
-	function ensureTextBlock(index) {
-		const existing = textBlocks.get(index);
-		if (existing?.open) return [];
-		const id = existing?.id ?? `claude-text-${index}`;
-		textBlocks.set(index, {
-			id,
-			open: true
-		});
-		return [{
-			type: "text-start",
-			id
-		}];
-	}
-	function ensureToolBlock(index, block) {
-		const existing = toolBlocks.get(index);
-		if (existing?.open) return [];
-		const toolCallId = block?.id ?? existing?.toolCallId ?? `claude-tool-${index}`;
-		const toolName = block?.name ?? existing?.toolName ?? "tool";
-		toolBlocks.set(index, {
-			toolCallId,
-			toolName,
-			json: "",
-			open: true
-		});
-		return [{
-			type: "tool-input-start",
-			toolCallId,
-			toolName,
-			dynamic: true
-		}];
-	}
-	function handleStreamEvent(event) {
-		if (!isRecord(event) || typeof event.type !== "string") return [];
+	function handleAssistantMessage(message) {
+		const resolvedMessageId = getAssistantMessageId(message);
+		if (!resolvedMessageId) return [];
 		const out = [];
-		const index = typeof event.index === "number" ? event.index : void 0;
-		switch (event.type) {
-			case "content_block_start": {
-				if (index == null) return [];
-				const block = event.content_block;
-				if (!isRecord(block) || typeof block.type !== "string") return [];
-				sawStreamEvents = true;
-				if (block.type === "text") out.push(...ensureTextBlock(index));
-				else if (block.type === "tool_use") out.push(...ensureToolBlock(index, {
-					id: typeof block.id === "string" ? block.id : void 0,
-					name: typeof block.name === "string" ? block.name : void 0
-				}));
-				return out;
-			}
-			case "content_block_delta": {
-				if (index == null) return [];
-				const delta = event.delta;
-				if (!isRecord(delta) || typeof delta.type !== "string") return [];
-				sawStreamEvents = true;
-				if (delta.type === "text_delta") {
-					const text = typeof delta.text === "string" ? delta.text : "";
-					if (!text) return [];
-					out.push(...ensureTextBlock(index));
-					const id = textBlocks.get(index).id;
-					out.push({
-						type: "text-delta",
-						id,
-						delta: text
-					});
-					return out;
-				}
-				if (delta.type === "input_json_delta") {
-					const partialJson = typeof delta.partial_json === "string" ? delta.partial_json : "";
-					if (!partialJson) return [];
-					out.push(...ensureToolBlock(index));
-					const tool = toolBlocks.get(index);
-					tool.json += partialJson;
-					out.push({
-						type: "tool-input-delta",
-						toolCallId: tool.toolCallId,
-						inputTextDelta: partialJson
-					});
-					return out;
-				}
-				return [];
-			}
-			case "content_block_stop": {
-				if (index == null) return [];
-				sawStreamEvents = true;
-				const text = textBlocks.get(index);
-				if (text?.open) {
-					text.open = false;
+		if (currentAssistantMessageId && currentAssistantMessageId !== resolvedMessageId) out.push(...closeAssistantTextBlocksForMessage(currentAssistantMessageId));
+		currentAssistantMessageId = resolvedMessageId;
+		const blocks = getMessageContentBlocks(message);
+		const seenTextBlockKeys = /* @__PURE__ */ new Set();
+		blocks.forEach((block, index) => {
+			const contentBlock = toContentBlockEnvelope(block);
+			if (!contentBlock) return;
+			if (contentBlock.type === "text") {
+				const key = `${resolvedMessageId}:${index}`;
+				seenTextBlockKeys.add(key);
+				let state = assistantTextBlocks.get(key);
+				if (!state || !state.open) {
+					state = {
+						id: state?.id ?? `claude-assistant-text-${resolvedMessageId}-${index}`,
+						messageId: resolvedMessageId,
+						lastText: state?.lastText ?? "",
+						open: true
+					};
+					assistantTextBlocks.set(key, state);
 					out.push({
-						type: "text-end",
-						id: text.id
+						type: "text-start",
+						id: state.id
 					});
 				}
-				const tool = toolBlocks.get(index);
-				if (tool?.open) {
-					tool.open = false;
-					let input = tool.json ? tool.json : {};
-					if (typeof input === "string") {
-						const parsed = safeJsonParse(input);
-						if (parsed.ok) input = parsed.value;
-					}
+				const fullText = contentBlock.text ?? "";
+				const { delta, reset } = computeAppendDelta(state.lastText, fullText);
+				if (delta) {
 					out.push({
-						type: "tool-input-available",
-						toolCallId: tool.toolCallId,
-						toolName: tool.toolName,
-						input,
-						dynamic: true
+						type: "text-delta",
+						id: state.id,
+						delta
 					});
+					state.lastText = reset ? fullText : state.lastText + delta;
 				}
-				return out;
-			}
-			default: return [];
-		}
-	}
-	function handleAssistantMessage(message) {
-		if (sawStreamEvents) return [];
-		const blocks = Array.isArray(message.content) ? message.content : [];
-		const out = [];
-		blocks.forEach((block, index) => {
-			if (!isRecord(block) || typeof block.type !== "string") return;
-			if (block.type === "text") {
-				const id = `claude-assistant-text-${index}`;
-				const text = typeof block.text === "string" ? block.text : "";
-				out.push({
-					type: "text-start",
-					id
-				});
-				if (text) out.push({
-					type: "text-delta",
-					id,
-					delta: text
-				});
-				out.push({
-					type: "text-end",
-					id
-				});
 			}
-			if (block.type === "tool_use") {
-				const toolCallId = typeof block.id === "string" ? block.id : `claude-assistant-tool-${index}`;
-				const toolName = typeof block.name === "string" ? block.name : "tool";
-				const input = block.input;
+			if (isToolUseLikeType(contentBlock.type)) {
+				const toolCallId = contentBlock.id ?? `claude-assistant-tool-${index}`;
+				const toolName = contentBlock.name ?? "tool";
+				const input = isRecord(contentBlock.input) ? contentBlock.input : contentBlock.input;
+				knownToolCallIds.add(toolCallId);
 				out.push({
 					type: "tool-input-available",
 					toolCallId,
@@ -31925,6 +31827,33 @@ function createClaudeCodeNormalizer(options = {}) {
 				});
 			}
 		});
+		for (const [key, state] of assistantTextBlocks) {
+			if (state.messageId !== resolvedMessageId) continue;
+			if (!state.open) continue;
+			if (seenTextBlockKeys.has(key)) continue;
+			state.open = false;
+			out.push({
+				type: "text-end",
+				id: state.id
+			});
+		}
+		return out;
+	}
+	function getAssistantMessageId(message) {
+		if (isRecord(message) && typeof message.id === "string") return message.id;
+		assistantFallbackMessageSeq += 1;
+		return `claude-assistant-fallback-${assistantFallbackMessageSeq}`;
+	}
+	function closeAssistantTextBlocksForMessage(messageId) {
+		const out = [];
+		for (const state of assistantTextBlocks.values()) {
+			if (state.messageId !== messageId || !state.open) continue;
+			state.open = false;
+			out.push({
+				type: "text-end",
+				id: state.id
+			});
+		}
 		return out;
 	}
 	function formatToolResultOutput(content, toolUseResult) {
@@ -31948,14 +31877,26 @@ function createClaudeCodeNormalizer(options = {}) {
 		return "Tool execution failed";
 	}
 	function handleUserMessage(message, toolUseResult) {
-		const blocks = Array.isArray(message.content) ? message.content : [];
+		const blocks = getMessageContentBlocks(message);
 		const out = [];
 		blocks.forEach((block, index) => {
-			if (!isRecord(block) || block.type !== "tool_result") return;
-			const toolCallId = typeof block.tool_use_id === "string" ? block.tool_use_id : `claude-tool-result-${index}`;
-			const content = block.content;
+			const toolResult = toToolResultEnvelope(block);
+			if (!toolResult) return;
+			const toolCallId = toolResult.tool_use_id ?? `claude-tool-result-${index}`;
+			const content = toolResult.content;
 			const interrupted = isRecord(toolUseResult) && toolUseResult.interrupted === true;
-			if (block.is_error === true || interrupted) {
+			const isError = toolResult.is_error === true || interrupted;
+			if (!knownToolCallIds.has(toolCallId)) {
+				knownToolCallIds.add(toolCallId);
+				out.push({
+					type: "tool-input-available",
+					toolCallId,
+					toolName: "tool",
+					input: {},
+					dynamic: true
+				});
+			}
+			if (isError) {
 				out.push({
 					type: "tool-output-error",
 					toolCallId,
@@ -31974,12 +31915,11 @@ function createClaudeCodeNormalizer(options = {}) {
 		return out;
 	}
 	function push(chunk) {
-		const parsed = topLevelSchema.safeParse(chunk);
-		if (!parsed.success) return {
+		if (!isRecord(chunk) || typeof chunk.type !== "string") return {
 			recognized: false,
 			chunks: []
 		};
-		const msg = parsed.data;
+		const msg = chunk;
 		const out = [];
 		switch (msg.type) {
 			case "system": {
@@ -32003,39 +31943,28 @@ function createClaudeCodeNormalizer(options = {}) {
 					chunks: out
 				};
 			}
-			case "stream_event": {
-				const event = streamEventSchema.safeParse(msg.event);
-				if (!event.success) return {
-					recognized: false,
-					chunks: []
-				};
-				return {
-					recognized: true,
-					chunks: handleStreamEvent(event.data)
-				};
-			}
-			case "assistant": {
-				const message = msg.message;
-				if (!isRecord(message)) return {
+			case "stream_event": return {
+				recognized: true,
+				chunks: []
+			};
+			case "assistant":
+				if (!isRecord(msg.message)) return {
 					recognized: false,
 					chunks: []
 				};
 				return {
 					recognized: true,
-					chunks: handleAssistantMessage(message)
+					chunks: handleAssistantMessage(msg.message)
 				};
-			}
-			case "user": {
-				const message = msg.message;
-				if (!isRecord(message)) return {
+			case "user":
+				if (!isRecord(msg.message)) return {
 					recognized: false,
 					chunks: []
 				};
 				return {
 					recognized: true,
-					chunks: handleUserMessage(message, msg.tool_use_result)
+					chunks: handleUserMessage(msg.message, msg.tool_use_result)
 				};
-			}
 			case "result": return {
 				recognized: true,
 				chunks: maybeMeta({
@@ -32071,6 +32000,14 @@ function createClaudeCodeNormalizer(options = {}) {
 				dynamic: true
 			});
 		}
+		for (const state of assistantTextBlocks.values()) {
+			if (!state.open) continue;
+			state.open = false;
+			out.push({
+				type: "text-end",
+				id: state.id
+			});
+		}
 		return out;
 	}
 	return {
@@ -32198,7 +32135,7 @@ function commandBasename(value) {
 	const lastSlash = value.lastIndexOf("/");
 	return lastSlash === -1 ? value : value.slice(lastSlash + 1);
 }
-function parseShellEntries(line) {
+function parseShellEntries$1(line) {
 	try {
 		return parse(line);
 	} catch {
@@ -32241,7 +32178,7 @@ function pickLastNonOptionArg(tokens) {
 	return values.length > 0 ? values[values.length - 1] : void 0;
 }
 function parseExploredItem(line) {
-	const entries = parseShellEntries(normalizeCommand(line));
+	const entries = parseShellEntries$1(normalizeCommand(line));
 	if (!entries) return void 0;
 	const tokens = takeMainTokens(entries);
 	if (tokens.length === 0) return void 0;
@@ -32320,128 +32257,8 @@ function formatCommandExecutionDisplayCommand(command) {
 }
 
 //#endregion
-//#region src/cli/commands/watch.ts
-const PANTHEON_BASE_URL = "https://pantheon-ai.tidb.ai";
-function parseListWidth(value) {
-	const width = Number(value);
-	if (!Number.isInteger(width) || width <= 0) throw new InvalidArgumentError("list-width requires a positive integer, e.g. 32");
-	return width;
-}
-function ensureEnvOrExit(keys) {
-	const missing = keys.filter((key) => !process.env[key]);
-	if (missing.length === 0) return;
-	for (const key of missing) console.error(`${key} environment variable is not set.`);
-	process.exit(1);
-}
-function toStreamSourceFromExecuteAgent(executeAgent) {
-	if (!executeAgent) return void 0;
-	const normalized = executeAgent.toLowerCase();
-	if (normalized.includes("claude")) return "claude-code";
-	if (normalized.includes("codex")) return "codex";
-}
-function detectStreamSourceFromRawPayload(payload) {
-	if (payload.includes("\"type\":\"thread.") || payload.includes("\"type\":\"turn.") || payload.includes("\"type\":\"item.")) return "codex";
-	if (payload.includes("\"type\":\"message_start\"") || payload.includes("\"type\":\"message_delta\"") || payload.includes("\"type\":\"message_stop\"") || payload.includes("\"type\":\"content_block_start\"") || payload.includes("\"type\":\"content_block_delta\"") || payload.includes("\"type\":\"content_block_stop\"")) return "claude-code";
-}
-async function getAgentExecuteAgentMap(db, targets) {
-	const agents = Array.from(new Set(targets.map((t) => t.agent)));
-	if (agents.length === 0) return /* @__PURE__ */ new Map();
-	const configs = await db.selectFrom("agent_project_config").select([
-		"agent",
-		"project_id",
-		"execute_agent"
-	]).where("agent", "in", agents).execute();
-	const map = /* @__PURE__ */ new Map();
-	for (const row of configs) map.set(`${row.agent}|${row.project_id}`, row.execute_agent);
-	return map;
-}
-async function loadTasksByIds(db, ids) {
-	if (ids.length === 0) return [];
-	const rows = await db.selectFrom("task").selectAll().where("id", "in", ids).execute();
-	const out = [];
-	for (const row of rows) {
-		const parsed = taskItemSchema.safeParse(row);
-		if (!parsed.success) {
-			console.error(`Failed to parse task row id=${row.id} agent=${row.agent} status=${row.status}: ${parsed.error.message}`);
-			continue;
-		}
-		out.push({
-			agent: row.agent,
-			task: parsed.data
-		});
-	}
-	return out;
-}
-async function loadTasksForAgent(db, agent) {
-	const rows = await db.selectFrom("task").selectAll().where("agent", "=", agent).execute();
-	const out = [];
-	for (const row of rows) {
-		const parsed = taskItemSchema.safeParse(row);
-		if (!parsed.success) continue;
-		out.push(parsed.data);
-	}
-	return out;
-}
-async function loadAllTasks(db, limit) {
-	const rows = await db.selectFrom("task").selectAll().orderBy("queued_at", "desc").limit(limit).execute();
-	const out = [];
-	for (const row of rows) {
-		const parsed = taskItemSchema.safeParse(row);
-		if (!parsed.success) continue;
-		out.push({
-			agent: row.agent,
-			task: parsed.data
-		});
-	}
-	return out;
-}
-async function resolveWatchTargets(options) {
-	const warnings = [];
-	let selected = [];
-	if (options.taskIds.length > 0) {
-		const uniqueTaskIds = Array.from(new Set(options.taskIds));
-		const found = await loadTasksByIds(options.db, uniqueTaskIds);
-		const foundIds = new Set(found.map((t) => t.task.id));
-		const missing = uniqueTaskIds.filter((id) => !foundIds.has(id));
-		if (missing.length > 0) warnings.push(`Requested task IDs not found: ${missing.join(", ")}`);
-		const byId = new Map(found.map((t) => [t.task.id, t]));
-		selected = uniqueTaskIds.map((id) => byId.get(id)).filter(Boolean);
-		if (selected.length === 0) warnings.push("No requested tasks found; falling back to default selection.");
-	} else if (options.agentNames.length > 0) {
-		const uniqueAgents = Array.from(new Set(options.agentNames));
-		if (uniqueAgents.length === 1) {
-			selected = selectSingleAgentWatchTasks(await loadTasksForAgent(options.db, uniqueAgents[0]), { finishedLimit: 3 }).map((task) => ({
-				agent: uniqueAgents[0],
-				task
-			}));
-			if (selected.length === 0) warnings.push(`No tasks found for agent ${uniqueAgents[0]}; falling back to default selection.`);
-		} else {
-			selected = selectMultiAgentWatchTasks(await Promise.all(uniqueAgents.map(async (agent) => {
-				return (await loadTasksForAgent(options.db, agent)).map((task) => ({
-					agent,
-					task
-				}));
-			})).then((groups) => groups.flat()), uniqueAgents);
-			const foundAgents = new Set(selected.map((t) => t.agent));
-			const missing = uniqueAgents.filter((agent) => !foundAgents.has(agent));
-			if (missing.length > 0) warnings.push(`No tasks found for agent(s): ${missing.join(", ")}`);
-			if (selected.length === 0) warnings.push("No requested agent tasks found; falling back to default selection.");
-		}
-	} else warnings.push("No targets specified; selecting up to 3 agents automatically.");
-	if (selected.length === 0) selected = selectFallbackWatchTasks(await loadAllTasks(options.db, 500), { agentLimit: 3 });
-	const executeAgentMap = await getAgentExecuteAgentMap(options.db, selected);
-	return {
-		targets: selected.map((entry) => ({
-			...entry,
-			executeAgent: executeAgentMap.get(`${entry.agent}|${entry.task.project_id}`)
-		})),
-		warnings
-	};
-}
-function makeStreamUrl(streamId) {
-	return `${PANTHEON_BASE_URL}/ai_stream_proxy/v2/streams/${encodeURIComponent(streamId)}/stream?format=opaque-stream-json`;
-}
-const ANSI = {
+//#region src/cli/commands/watch/log-output.ts
+const ANSI$1 = {
 	reset: "\x1B[0m",
 	bold: "\x1B[1m",
 	dim: "\x1B[2m",
@@ -32451,67 +32268,280 @@ const ANSI = {
 	cyan: "\x1B[36m",
 	gray: "\x1B[90m"
 };
-function useAnsiStyles() {
-	if (!process.stdout.isTTY) return false;
-	if (process.env.NO_COLOR != null) return false;
-	return true;
-}
-function sgrWrap(text, code, enabled) {
-	return enabled ? `${code}${text}${ANSI.reset}` : text;
+function sgrWrap$1(text, code, enabled) {
+	return enabled ? `${code}${text}${ANSI$1.reset}` : text;
 }
-function bold(text, enabled) {
-	return sgrWrap(text, ANSI.bold, enabled);
+function bold$1(text, enabled) {
+	return sgrWrap$1(text, ANSI$1.bold, enabled);
 }
 function dim(text, enabled) {
-	return sgrWrap(text, ANSI.dim, enabled);
+	return sgrWrap$1(text, ANSI$1.dim, enabled);
 }
 function gray(text, enabled) {
-	return sgrWrap(text, ANSI.gray, enabled);
+	return sgrWrap$1(text, ANSI$1.gray, enabled);
 }
 function red(text, enabled) {
-	return sgrWrap(text, ANSI.red, enabled);
+	return sgrWrap$1(text, ANSI$1.red, enabled);
 }
 function green(text, enabled) {
-	return sgrWrap(text, ANSI.green, enabled);
+	return sgrWrap$1(text, ANSI$1.green, enabled);
 }
 function yellow(text, enabled) {
-	return sgrWrap(text, ANSI.yellow, enabled);
+	return sgrWrap$1(text, ANSI$1.yellow, enabled);
 }
 function cyan(text, enabled) {
-	return sgrWrap(text, ANSI.cyan, enabled);
+	return sgrWrap$1(text, ANSI$1.cyan, enabled);
 }
-function dimGray(text, enabled) {
-	return sgrWrap(text, `${ANSI.dim}${ANSI.gray}`, enabled);
+function dimGray$1(text, enabled) {
+	return sgrWrap$1(text, `${ANSI$1.dim}${ANSI$1.gray}`, enabled);
 }
 function kv(label, value, style) {
 	return `${dim(`${label}:`, style)} ${value}`;
 }
+function getCommandExecutionRawCommand(tool) {
+	const title = typeof tool.title === "string" ? tool.title : "";
+	const inputCommand = typeof tool.input?.command === "string" ? tool.input.command : "";
+	return title || inputCommand || void 0;
+}
 function getCommandExecutionDisplayCommand(tool) {
 	const raw = getCommandExecutionRawCommand(tool);
 	if (!raw) return void 0;
 	return formatCommandExecutionDisplayCommand(raw) || void 0;
 }
-function colorizeCommandProgram(display, style) {
-	const match = display.match(/^(\s*)(\S+)([\s\S]*)$/);
-	if (!match) return display;
-	const [, leading, program, rest] = match;
-	return `${leading}${cyan(program ?? "", style)}${rest ?? ""}`;
+function isCommandLikeTool(toolName) {
+	if (!toolName) return false;
+	return toolName === "command_execution" || toolName.toLowerCase() === "bash";
+}
+function isClaudeExplorationTool(toolName) {
+	if (!toolName) return false;
+	const normalized = toolName.toLowerCase();
+	return normalized === "read" || normalized === "glob" || normalized === "grep";
+}
+function isWriteTool(toolName) {
+	if (!toolName) return false;
+	return toolName.toLowerCase() === "write";
+}
+function isEditTool(toolName) {
+	if (!toolName) return false;
+	return toolName.toLowerCase() === "edit";
+}
+function toRecord(value) {
+	return typeof value === "object" && value !== null ? value : void 0;
+}
+function toStringValue(value) {
+	return typeof value === "string" ? value : void 0;
+}
+function toStringOrUndefined(value) {
+	return typeof value === "string" && value.trim().length > 0 ? value : void 0;
+}
+function extractWritePath(input) {
+	const record = toRecord(input);
+	if (!record) return void 0;
+	return toStringOrUndefined(record.file_path) ?? toStringOrUndefined(record.path) ?? toStringOrUndefined(record.filePath) ?? toStringOrUndefined(record.filepath) ?? toStringOrUndefined(record.filename);
+}
+function countContentLines(content) {
+	const normalized = content.replaceAll("\r\n", "\n");
+	if (!normalized) return 0;
+	const lines = normalized.split("\n");
+	if (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
+	return lines.length;
+}
+function extractWriteAddedLineCount(input) {
+	const record = toRecord(input);
+	if (!record) return void 0;
+	const content = toStringValue(record.content);
+	if (content == null) return void 0;
+	return countContentLines(content);
+}
+function extractEditAddedLineCount(input) {
+	const record = toRecord(input);
+	if (!record) return void 0;
+	const oldText = toStringValue(record.old_string) ?? toStringValue(record.oldString) ?? "";
+	const newText = toStringValue(record.new_string) ?? toStringValue(record.newString);
+	if (newText == null) return void 0;
+	const oldLines = countContentLines(oldText);
+	const newLines = countContentLines(newText);
+	return Math.max(0, newLines - oldLines);
+}
+function formatWriteToolLabel(tool, style) {
+	const renderedName = bold$1(tool.toolName ?? "Write", style);
+	const path = extractWritePath(tool.input);
+	const addedLines = extractWriteAddedLineCount(tool.input);
+	const chunks = [renderedName];
+	if (path) chunks.push(path);
+	if (addedLines != null) {
+		const unit = addedLines === 1 ? "line" : "lines";
+		chunks.push(`(${green(`+${addedLines} ${unit}`, style)})`);
+	}
+	if (!path && addedLines == null && tool.title) chunks.push(`: ${tool.title}`);
+	return chunks.join(" ");
+}
+function formatEditToolLabel(tool, style) {
+	const renderedName = bold$1(tool.toolName ?? "Edit", style);
+	const path = extractWritePath(tool.input);
+	const addedLines = extractEditAddedLineCount(tool.input);
+	const chunks = [renderedName];
+	if (path) chunks.push(path);
+	if (addedLines != null) {
+		const unit = addedLines === 1 ? "line" : "lines";
+		chunks.push(`(${green(`+${addedLines} ${unit}`, style)})`);
+	}
+	if (!path && addedLines == null && tool.title) chunks.push(`: ${tool.title}`);
+	return chunks.join(" ");
+}
+function stripOuterQuotes(token) {
+	if (token.length < 2) return token;
+	const first = token[0];
+	const last = token[token.length - 1];
+	if (first === "'" && last === "'" || first === "\"" && last === "\"") return token.slice(1, -1);
+	return token;
 }
-function getCommandExecutionRawCommand(tool) {
-	const title = typeof tool.title === "string" ? tool.title : "";
-	const inputCommand = typeof tool.input?.command === "string" ? tool.input.command : "";
-	return title || inputCommand || void 0;
+function isEnvAssignmentToken(token) {
+	const normalized = stripOuterQuotes(token);
+	const equalsAt = normalized.indexOf("=");
+	if (equalsAt <= 0) return false;
+	const key = normalized.slice(0, equalsAt);
+	return /^[A-Za-z_][A-Za-z0-9_]*$/.test(key);
+}
+function isExecPrefixToken(token) {
+	const normalized = stripOuterQuotes(token);
+	return normalized === "env" || normalized === "sudo" || normalized === "builtin" || normalized === "time" || normalized === "nohup";
+}
+function parseShellEntries(line) {
+	try {
+		return parse(line);
+	} catch {
+		return;
+	}
+}
+function colorizeExecToken(token, style) {
+	if (!token) return token;
+	const core = token;
+	if (!core) return token;
+	const lastSlash = core.lastIndexOf("/");
+	if (lastSlash === -1 || lastSlash === core.length - 1) return bold$1(core, style);
+	return `${core.slice(0, lastSlash + 1)}${bold$1(core.slice(lastSlash + 1), style)}`;
+}
+function isShellOperatorEntry(entry) {
+	return typeof entry === "object" && entry != null && "op" in entry && typeof entry.op === "string";
+}
+function isShellCommentEntry(entry) {
+	return typeof entry === "object" && entry != null && "comment" in entry && typeof entry.comment === "string";
+}
+function renderShellToken(rawToken, styledToken) {
+	if (rawToken.length === 0) return `""`;
+	if (!/\s/.test(rawToken)) return styledToken;
+	return `"${styledToken.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"")}"`;
+}
+function findCommandSubstitutionEnd(text, openAt) {
+	let depth = 1;
+	let i = openAt;
+	let escaped = false;
+	while (i < text.length) {
+		const ch = text[i] ?? "";
+		if (escaped) {
+			escaped = false;
+			i += 1;
+			continue;
+		}
+		if (ch === "\\") {
+			escaped = true;
+			i += 1;
+			continue;
+		}
+		if (ch === "$" && text[i + 1] === "(") {
+			depth += 1;
+			i += 2;
+			continue;
+		}
+		if (ch === ")") {
+			depth -= 1;
+			if (depth === 0) return i;
+		}
+		i += 1;
+	}
+	return -1;
+}
+function colorizeCommandSubstitutions(token, style) {
+	if (!token.includes("$(")) return token;
+	let out = "";
+	let i = 0;
+	let cursor = 0;
+	while (i < token.length) {
+		if (token[i] === "$" && token[i + 1] === "(") {
+			out += token.slice(cursor, i);
+			const closeAt = findCommandSubstitutionEnd(token, i + 2);
+			if (closeAt < 0) {
+				out += token.slice(i);
+				return out;
+			}
+			const innerColorized = colorizeCommandLine(token.slice(i + 2, closeAt), style);
+			out += `$(${innerColorized})`;
+			i = closeAt + 1;
+			cursor = i;
+			continue;
+		}
+		i += 1;
+	}
+	out += token.slice(cursor);
+	return out;
+}
+const SEGMENT_BREAK_OPERATORS = new Set([
+	"|",
+	"|&",
+	"||",
+	"&&",
+	";",
+	"&"
+]);
+const GRAY_CONNECTORS = new Set([
+	"|",
+	"|&",
+	"||",
+	"&&"
+]);
+function colorizeCommandLine(line, style) {
+	if (!line) return line;
+	const entries = parseShellEntries(line);
+	if (!entries || entries.length === 0) return line;
+	const rendered = [];
+	let shouldHighlightExec = true;
+	for (const entry of entries) {
+		if (typeof entry === "string") {
+			const token = entry;
+			const isExecToken = shouldHighlightExec && !isEnvAssignmentToken(token) && !isExecPrefixToken(token);
+			let styledToken = token;
+			if (isExecToken) {
+				styledToken = colorizeExecToken(token, style);
+				shouldHighlightExec = false;
+			} else styledToken = colorizeCommandSubstitutions(token, style);
+			rendered.push(renderShellToken(token, styledToken));
+			continue;
+		}
+		if (isShellCommentEntry(entry)) {
+			rendered.push(`#${entry.comment}`);
+			break;
+		}
+		if (!isShellOperatorEntry(entry)) continue;
+		rendered.push(GRAY_CONNECTORS.has(entry.op) ? gray(entry.op, style) : entry.op);
+		if (SEGMENT_BREAK_OPERATORS.has(entry.op)) shouldHighlightExec = true;
+	}
+	return rendered.join(" ");
+}
+function colorizeCommandProgram(display, style) {
+	return display.replaceAll("\r\n", "\n").split("\n").map((line) => colorizeCommandLine(line, style)).join("\n");
 }
 function formatToolLabel(tool, style) {
 	const name = tool.toolName ?? "<tool>";
-	if (name === "command_execution") {
+	if (isWriteTool(tool.toolName)) return formatWriteToolLabel(tool, style);
+	if (isEditTool(tool.toolName)) return formatEditToolLabel(tool, style);
+	if (isCommandLikeTool(tool.toolName)) {
 		const rawCommand = getCommandExecutionRawCommand(tool);
 		const exploredLines = rawCommand ? getExploredCommandLines(rawCommand) : void 0;
 		if (exploredLines && exploredLines.length > 1) return cyan(exploredLines[0] ?? "Explored", style);
-		const display = getCommandExecutionDisplayCommand(tool) ?? "(unknown command)";
-		return `${bold("$", style)} ${colorizeCommandProgram(display, style)}`;
+		return colorizeCommandProgram(getCommandExecutionDisplayCommand(tool) ?? "(unknown command)", style);
 	}
-	const renderedName = bold(name, style);
+	const renderedName = bold$1(name, style);
 	if (!tool.title) return renderedName;
 	return `${renderedName}: ${tool.title}`;
 }
@@ -32542,12 +32572,37 @@ function formatToolStatusIcon(status, style) {
 	}
 }
 function getExploredSubCommandLines(tool) {
-	if (tool.toolName !== "command_execution") return void 0;
-	const rawCommand = getCommandExecutionRawCommand(tool);
-	if (!rawCommand) return void 0;
-	const exploredLines = getExploredCommandLines(rawCommand);
-	if (!exploredLines || exploredLines.length <= 1) return void 0;
-	return exploredLines.slice(1);
+	if (isCommandLikeTool(tool.toolName)) {
+		const rawCommand = getCommandExecutionRawCommand(tool);
+		if (!rawCommand) return void 0;
+		const exploredLines = getExploredCommandLines(rawCommand);
+		if (!exploredLines || exploredLines.length <= 1) return void 0;
+		return exploredLines.slice(1);
+	}
+	if (!isClaudeExplorationTool(tool.toolName)) return void 0;
+	const input = toRecord(tool.input) ?? {};
+	const toolName = (tool.toolName ?? "").toLowerCase();
+	if (toolName === "read") {
+		const path = toStringOrUndefined(input.file_path) ?? toStringOrUndefined(input.path) ?? toStringOrUndefined(input.filePath);
+		if (!path) return ["Read"];
+		return [`Read ${path}`];
+	}
+	if (toolName === "glob") {
+		const pattern = toStringOrUndefined(input.pattern);
+		const path = toStringOrUndefined(input.path);
+		if (path && pattern) return [`List ${path} (glob: ${pattern})`];
+		if (path) return [`List ${path}`];
+		if (pattern) return [`List (glob: ${pattern})`];
+		return ["List"];
+	}
+	if (toolName === "grep") {
+		const pattern = toStringOrUndefined(input.pattern);
+		const path = toStringOrUndefined(input.path);
+		if (pattern && path) return [`Search ${pattern} in ${path}`];
+		if (pattern) return [`Search ${pattern}`];
+		if (path) return [`Search in ${path}`];
+		return ["Search"];
+	}
 }
 function formatExploredSubCommandLine(line, style) {
 	if (line.startsWith("Search ")) {
@@ -32556,7 +32611,7 @@ function formatExploredSubCommandLine(line, style) {
 		if (at !== -1) {
 			const terms = payload.slice(0, at);
 			const file = payload.slice(at + 4);
-			return `${cyan("Search", style)} ${terms} ${dimGray("in", style)} ${file}`;
+			return `${cyan("Search", style)} ${terms} ${dimGray$1("in", style)} ${file}`;
 		}
 		return `${cyan("Search", style)} ${payload}`;
 	}
@@ -32568,7 +32623,7 @@ function formatExploredSubCommandLine(line, style) {
 function toDisplayLines(text) {
 	return text.replaceAll("\r\n", "\n").split("\n");
 }
-function wrapRawLineToWidth(line, width) {
+function wrapRawLineToWidth$1(line, width) {
 	if (width <= 0) return [line];
 	if (line.length === 0) return [""];
 	const out = [];
@@ -32595,21 +32650,33 @@ function trimCommandOutputTopBottom(lines) {
 		lines[lines.length - 1]
 	];
 }
+function getCommandLikeOutputText(output) {
+	const value = output;
+	const aggregated = typeof value?.aggregated_output === "string" ? value.aggregated_output : "";
+	if (aggregated) return aggregated;
+	const nestedToolResult = value?.tool_use_result;
+	const stdout = typeof nestedToolResult?.stdout === "string" ? nestedToolResult.stdout : typeof value?.stdout === "string" ? value.stdout : "";
+	const stderr = typeof nestedToolResult?.stderr === "string" ? nestedToolResult.stderr : typeof value?.stderr === "string" ? value.stderr : "";
+	if (stdout || stderr) {
+		if (stdout && stderr) return `${stdout}${stdout.endsWith("\n") ? "" : "\n"}${stderr}`;
+		return stdout || stderr;
+	}
+	if (typeof value?.content === "string") return value.content;
+}
 function formatToolResultPreviewLines(tool, options) {
 	if (tool.status === "in_progress") return [];
 	if (options.maxLines <= 0) return [];
-	if (tool.toolName === "command_execution") {
+	if (isCommandLikeTool(tool.toolName)) {
 		const rawCommand = getCommandExecutionRawCommand(tool);
 		if (rawCommand && isExploredCommandExecution(rawCommand)) return [];
 	}
 	if (tool.status === "failed") {
 		const lines = toDisplayLines(tool.errorText ?? "(no error text)");
-		return trimLinesWithEllipsis(tool.toolName === "command_execution" ? trimCommandOutputTopBottom(lines) : lines, options.maxLines);
+		return trimLinesWithEllipsis(isCommandLikeTool(tool.toolName) ? trimCommandOutputTopBottom(lines) : lines, options.maxLines);
 	}
 	if (tool.output == null) return ["(none)"];
-	if (tool.toolName === "command_execution") {
-		const output = tool.output;
-		const allLines = toDisplayLines((typeof output?.aggregated_output === "string" ? output.aggregated_output : "").trimEnd());
+	if (isCommandLikeTool(tool.toolName)) {
+		const allLines = toDisplayLines((getCommandLikeOutputText(tool.output) ?? "").trimEnd());
 		if (!allLines.some((line) => line.length > 0)) return ["(none)"];
 		return trimLinesWithEllipsis(trimCommandOutputTopBottom(allLines), options.maxLines);
 	}
@@ -32621,7 +32688,124 @@ function formatToolResultPreviewLines(tool, options) {
 		breakLength: Math.max(20, options.widthHint)
 	})), options.maxLines);
 }
+function formatWatchLogLines(options) {
+	const blocks = [];
+	const reasoningWrapWidth = Math.max(1, options.widthHint);
+	const messageWrapWidth = Math.max(1, options.widthHint);
+	const toolById = new Map(options.snapshot.toolActions.map((tool) => [tool.toolCallId, tool]));
+	function pushBlock(order, lines) {
+		if (lines.length === 0) return;
+		blocks.push({
+			order: order ?? Number.MAX_SAFE_INTEGER,
+			lines
+		});
+	}
+	for (let timelineIndex = 0; timelineIndex < options.snapshot.timeline.length; timelineIndex++) {
+		const entry = options.snapshot.timeline[timelineIndex];
+		if (entry.kind === "reasoning") {
+			const reasoningBlock = [];
+			const hasTrailingLineFeed = entry.text.endsWith("\n");
+			const rawReasoningLines = toDisplayLines(entry.text);
+			for (const rawLine of rawReasoningLines) wrapRawLineToWidth$1(rawLine, reasoningWrapWidth).forEach((chunk) => reasoningBlock.push(gray(chunk, options.style)));
+			if (!hasTrailingLineFeed) reasoningBlock.push("");
+			pushBlock(entry.order, reasoningBlock);
+			continue;
+		}
+		if (entry.kind === "message") {
+			const messageBlock = [];
+			const rawMessageLines = toDisplayLines(entry.text);
+			for (const rawLine of rawMessageLines) wrapRawLineToWidth$1(rawLine, messageWrapWidth).forEach((chunk) => messageBlock.push(chunk));
+			pushBlock(entry.order, messageBlock);
+			continue;
+		}
+		if (entry.kind === "warning") {
+			pushBlock(entry.order, [kv("warning", yellow(entry.message, options.style), options.style)]);
+			continue;
+		}
+		const tool = toolById.get(entry.toolCallId);
+		if (!tool) continue;
+		const exploredSubLines = getExploredSubCommandLines(tool);
+		if (exploredSubLines != null) {
+			const groupedTools = [tool];
+			const groupedSubLines = [...exploredSubLines];
+			let lookahead = timelineIndex + 1;
+			while (lookahead < options.snapshot.timeline.length) {
+				const next = options.snapshot.timeline[lookahead];
+				if (next.kind !== "tool") break;
+				const nextTool = toolById.get(next.toolCallId);
+				if (!nextTool) break;
+				const nextSubLines = getExploredSubCommandLines(nextTool);
+				if (nextSubLines == null) break;
+				groupedTools.push(nextTool);
+				groupedSubLines.push(...nextSubLines);
+				lookahead += 1;
+			}
+			const groupedBlock = [`  ${[
+				formatToolStatusIcon(combineToolStatuses(groupedTools.map((groupedTool) => groupedTool.status)), options.style),
+				cyan("Explored", options.style),
+				groupedTools.length > 1 ? gray(`x${groupedTools.length}`, options.style) : void 0
+			].filter(Boolean).join(" ")}`];
+			groupedSubLines.forEach((subLine, subIndex) => groupedBlock.push(subIndex === 0 ? `      ${dimGray$1("└", options.style)} ${formatExploredSubCommandLine(subLine, options.style)}` : `        ${formatExploredSubCommandLine(subLine, options.style)}`));
+			pushBlock(entry.order, groupedBlock);
+			timelineIndex = lookahead - 1;
+			continue;
+		}
+		const toolBlock = [];
+		const summaryLines = toDisplayLines(formatToolSummaryLine(tool, options.style));
+		const summaryContinuationIndent = isCommandLikeTool(tool.toolName) ? "    " : "      ";
+		summaryLines.forEach((line, index) => toolBlock.push(index === 0 ? `  ${line}` : `${summaryContinuationIndent}${line}`));
+		if (isCommandLikeTool(tool.toolName)) formatToolResultPreviewLines(tool, {
+			maxLines: Number.POSITIVE_INFINITY,
+			widthHint: Math.max(20, options.widthHint - 10)
+		}).forEach((line, index) => toolBlock.push(index === 0 ? `      ${dimGray$1("└", options.style)} ${dimGray$1(line, options.style)}` : `        ${dimGray$1(line, options.style)}`));
+		pushBlock(entry.order, toolBlock);
+	}
+	if (options.lastError) pushBlock(void 0, [kv("error", red(options.lastError, options.style), options.style)]);
+	blocks.sort((a, b) => a.order - b.order);
+	const lines = [];
+	for (const block of blocks) {
+		if (lines.length > 0 && lines[lines.length - 1] !== "") lines.push("");
+		lines.push(...block.lines);
+	}
+	if (lines.length === 0) lines.push(gray("(waiting for formatted stream output)", options.style));
+	return lines;
+}
+
+//#endregion
+//#region src/cli/commands/watch/source.ts
+function toStreamSourceFromExecuteAgent(executeAgent) {
+	if (!executeAgent) return void 0;
+	const normalized = executeAgent.toLowerCase();
+	if (normalized.includes("claude")) return "claude-code";
+	if (normalized.includes("codex")) return "codex";
+}
+function detectStreamSourceFromRawPayload(payload) {
+	if (payload.includes("\"type\":\"thread.") || payload.includes("\"type\":\"turn.") || payload.includes("\"type\":\"item.")) return "codex";
+	if (payload.includes("\"type\":\"message_start\"") || payload.includes("\"type\":\"message_delta\"") || payload.includes("\"type\":\"message_stop\"") || payload.includes("\"type\":\"content_block_start\"") || payload.includes("\"type\":\"content_block_delta\"") || payload.includes("\"type\":\"content_block_stop\"")) return "claude-code";
+}
+function parseAgentStreamSourceOption(value) {
+	const normalized = value.trim().toLowerCase();
+	if (normalized === "codex") return "codex";
+	if (normalized === "claude-code" || normalized === "claude") return "claude-code";
+	throw new Error(`Invalid stream source: ${value}. Allowed: codex, claude-code`);
+}
+
+//#endregion
+//#region src/cli/commands/watch/stream-url.ts
+const PANTHEON_BASE_URL = "https://pantheon-ai.tidb.ai";
+function makeOpaqueStreamUrl(streamId) {
+	return `${PANTHEON_BASE_URL}/ai_stream_proxy/v2/streams/${encodeURIComponent(streamId)}/stream?format=opaque-stream-json`;
+}
+
+//#endregion
+//#region src/cli/commands/watch/tui.ts
+const ANSI_RESET = "\x1B[0m";
 const ANSI_SGR_REGEX = /\u001b\[[0-9;]*m/g;
+function useAnsiStyles() {
+	if (!process$1.stdout.isTTY) return false;
+	if (process$1.env.NO_COLOR != null) return false;
+	return true;
+}
 function visibleLength(value) {
 	return value.replaceAll(ANSI_SGR_REGEX, "").length;
 }
@@ -32649,7 +32833,142 @@ function clip(value, maxVisible) {
 	if (visibleLength(value) <= maxVisible) return value;
 	if (maxVisible === 1) return "…";
 	const sliced = sliceSgrByVisibleWidth(value, maxVisible - 1);
-	return `${sliced}…${sliced.includes("\x1B[") ? ANSI.reset : ""}`;
+	return `${sliced}…${sliced.includes("\x1B[") ? ANSI_RESET : ""}`;
+}
+
+//#endregion
+//#region src/cli/commands/watch.ts
+function parseListWidth(value) {
+	const width = Number(value);
+	if (!Number.isInteger(width) || width <= 0) throw new InvalidArgumentError("list-width requires a positive integer, e.g. 32");
+	return width;
+}
+function ensureEnvOrExit(keys) {
+	const missing = keys.filter((key) => !process.env[key]);
+	if (missing.length === 0) return;
+	for (const key of missing) console.error(`${key} environment variable is not set.`);
+	process.exit(1);
+}
+async function getAgentExecuteAgentMap(db, targets) {
+	const agents = Array.from(new Set(targets.map((t) => t.agent)));
+	if (agents.length === 0) return /* @__PURE__ */ new Map();
+	const configs = await db.selectFrom("agent_project_config").select([
+		"agent",
+		"project_id",
+		"execute_agent"
+	]).where("agent", "in", agents).execute();
+	const map = /* @__PURE__ */ new Map();
+	for (const row of configs) map.set(`${row.agent}|${row.project_id}`, row.execute_agent);
+	return map;
+}
+async function loadTasksByIds(db, ids) {
+	if (ids.length === 0) return [];
+	const rows = await db.selectFrom("task").selectAll().where("id", "in", ids).execute();
+	const out = [];
+	for (const row of rows) {
+		const parsed = taskItemSchema.safeParse(row);
+		if (!parsed.success) {
+			console.error(`Failed to parse task row id=${row.id} agent=${row.agent} status=${row.status}: ${parsed.error.message}`);
+			continue;
+		}
+		out.push({
+			agent: row.agent,
+			task: parsed.data
+		});
+	}
+	return out;
+}
+async function loadTasksForAgent(db, agent) {
+	const rows = await db.selectFrom("task").selectAll().where("agent", "=", agent).execute();
+	const out = [];
+	for (const row of rows) {
+		const parsed = taskItemSchema.safeParse(row);
+		if (!parsed.success) continue;
+		out.push(parsed.data);
+	}
+	return out;
+}
+async function loadAllTasks(db, limit) {
+	const rows = await db.selectFrom("task").selectAll().orderBy("queued_at", "desc").limit(limit).execute();
+	const out = [];
+	for (const row of rows) {
+		const parsed = taskItemSchema.safeParse(row);
+		if (!parsed.success) continue;
+		out.push({
+			agent: row.agent,
+			task: parsed.data
+		});
+	}
+	return out;
+}
+async function resolveWatchTargets(options) {
+	const warnings = [];
+	let selected = [];
+	if (options.taskIds.length > 0) {
+		const uniqueTaskIds = Array.from(new Set(options.taskIds));
+		const found = await loadTasksByIds(options.db, uniqueTaskIds);
+		const foundIds = new Set(found.map((t) => t.task.id));
+		const missing = uniqueTaskIds.filter((id) => !foundIds.has(id));
+		if (missing.length > 0) warnings.push(`Requested task IDs not found: ${missing.join(", ")}`);
+		const byId = new Map(found.map((t) => [t.task.id, t]));
+		selected = uniqueTaskIds.map((id) => byId.get(id)).filter(Boolean);
+		if (selected.length === 0) warnings.push("No requested tasks found; falling back to default selection.");
+	} else if (options.agentNames.length > 0) {
+		const uniqueAgents = Array.from(new Set(options.agentNames));
+		if (uniqueAgents.length === 1) {
+			selected = selectSingleAgentWatchTasks(await loadTasksForAgent(options.db, uniqueAgents[0]), { finishedLimit: 3 }).map((task) => ({
+				agent: uniqueAgents[0],
+				task
+			}));
+			if (selected.length === 0) warnings.push(`No tasks found for agent ${uniqueAgents[0]}; falling back to default selection.`);
+		} else {
+			selected = selectMultiAgentWatchTasks(await Promise.all(uniqueAgents.map(async (agent) => {
+				return (await loadTasksForAgent(options.db, agent)).map((task) => ({
+					agent,
+					task
+				}));
+			})).then((groups) => groups.flat()), uniqueAgents);
+			const foundAgents = new Set(selected.map((t) => t.agent));
+			const missing = uniqueAgents.filter((agent) => !foundAgents.has(agent));
+			if (missing.length > 0) warnings.push(`No tasks found for agent(s): ${missing.join(", ")}`);
+			if (selected.length === 0) warnings.push("No requested agent tasks found; falling back to default selection.");
+		}
+	} else warnings.push("No targets specified; selecting up to 3 agents automatically.");
+	if (selected.length === 0) selected = selectFallbackWatchTasks(await loadAllTasks(options.db, 500), { agentLimit: 3 });
+	const executeAgentMap = await getAgentExecuteAgentMap(options.db, selected);
+	return {
+		targets: selected.map((entry) => ({
+			...entry,
+			executeAgent: executeAgentMap.get(`${entry.agent}|${entry.task.project_id}`)
+		})),
+		warnings
+	};
+}
+const ANSI = {
+	reset: "\x1B[0m",
+	bold: "\x1B[1m",
+	dim: "\x1B[2m",
+	red: "\x1B[31m",
+	green: "\x1B[32m",
+	yellow: "\x1B[33m",
+	cyan: "\x1B[36m",
+	gray: "\x1B[90m"
+};
+function sgrWrap(text, code, enabled) {
+	return enabled ? `${code}${text}${ANSI.reset}` : text;
+}
+function bold(text, enabled) {
+	return sgrWrap(text, ANSI.bold, enabled);
+}
+function dimGray(text, enabled) {
+	return sgrWrap(text, `${ANSI.dim}${ANSI.gray}`, enabled);
+}
+function wrapRawLineToWidth(line, width) {
+	if (width <= 0) return [line];
+	if (line.length === 0) return [""];
+	const out = [];
+	for (let i = 0; i < line.length; i += width) out.push(line.slice(i, i + width));
+	return out;
 }
 const TODO_PREVIEW_MAX_ITEMS = 3;
 const TODO_PREVIEW_MAX_PENDING = 2;
@@ -32751,7 +33070,7 @@ function createWatchCommand(version) {
 				rt.streamDone = false;
 				const preferred = toStreamSourceFromExecuteAgent(rt.target.executeAgent);
 				rt.source = preferred;
-				const url = makeStreamUrl(streamId);
+				const url = makeOpaqueStreamUrl(streamId);
 				(async () => {
 					try {
 						const res = await fetch(url, {
@@ -32914,86 +33233,12 @@ function createWatchCommand(version) {
 				return runtime[selectedIndex];
 			}
 			function getFormattedLogLines(rt, options) {
-				const step = rt.aggregator.snapshot();
-				const blocks = [];
-				const reasoningWrapWidth = Math.max(1, options.widthHint);
-				const messageWrapWidth = Math.max(1, options.widthHint);
-				const toolById = new Map(step.toolActions.map((tool) => [tool.toolCallId, tool]));
-				function pushBlock(order, lines) {
-					if (lines.length === 0) return;
-					blocks.push({
-						order: order ?? Number.MAX_SAFE_INTEGER,
-						lines
-					});
-				}
-				for (let timelineIndex = 0; timelineIndex < step.timeline.length; timelineIndex++) {
-					const entry = step.timeline[timelineIndex];
-					if (entry.kind === "reasoning") {
-						const reasoningBlock = [];
-						const hasTrailingLineFeed = entry.text.endsWith("\n");
-						const rawReasoningLines = toDisplayLines(entry.text);
-						for (const rawLine of rawReasoningLines) wrapRawLineToWidth(rawLine, reasoningWrapWidth).forEach((chunk) => reasoningBlock.push(gray(chunk, options.style)));
-						if (!hasTrailingLineFeed) reasoningBlock.push("");
-						pushBlock(entry.order, reasoningBlock);
-						continue;
-					}
-					if (entry.kind === "message") {
-						const messageBlock = [];
-						const rawMessageLines = toDisplayLines(entry.text);
-						for (const rawLine of rawMessageLines) wrapRawLineToWidth(rawLine, messageWrapWidth).forEach((chunk) => messageBlock.push(chunk));
-						pushBlock(entry.order, messageBlock);
-						continue;
-					}
-					if (entry.kind === "warning") {
-						pushBlock(entry.order, [kv("warning", yellow(entry.message, options.style), options.style)]);
-						continue;
-					}
-					const tool = toolById.get(entry.toolCallId);
-					if (!tool) continue;
-					const exploredSubLines = getExploredSubCommandLines(tool);
-					if (exploredSubLines != null) {
-						const groupedTools = [tool];
-						const groupedSubLines = [...exploredSubLines];
-						let lookahead = timelineIndex + 1;
-						while (lookahead < step.timeline.length) {
-							const next = step.timeline[lookahead];
-							if (next.kind !== "tool") break;
-							const nextTool = toolById.get(next.toolCallId);
-							if (!nextTool) break;
-							const nextSubLines = getExploredSubCommandLines(nextTool);
-							if (nextSubLines == null) break;
-							groupedTools.push(nextTool);
-							groupedSubLines.push(...nextSubLines);
-							lookahead += 1;
-						}
-						const groupedBlock = [`  ${[
-							formatToolStatusIcon(combineToolStatuses(groupedTools.map((groupedTool) => groupedTool.status)), options.style),
-							cyan("Explored", options.style),
-							groupedTools.length > 1 ? gray(`x${groupedTools.length}`, options.style) : void 0
-						].filter(Boolean).join(" ")}`];
-						groupedSubLines.forEach((subLine, subIndex) => groupedBlock.push(subIndex === 0 ? `      ${dimGray("└", options.style)} ${formatExploredSubCommandLine(subLine, options.style)}` : `        ${formatExploredSubCommandLine(subLine, options.style)}`));
-						pushBlock(entry.order, groupedBlock);
-						timelineIndex = lookahead - 1;
-						continue;
-					}
-					const toolBlock = [];
-					toDisplayLines(formatToolSummaryLine(tool, options.style)).forEach((line, index) => toolBlock.push(index === 0 ? `  ${line}` : `      ${line}`));
-					if (tool.toolName === "command_execution") formatToolResultPreviewLines(tool, {
-						maxLines: Number.MAX_SAFE_INTEGER,
-						widthHint: Math.max(20, options.widthHint - 10),
-						style: options.style
-					}).forEach((line, index) => toolBlock.push(index === 0 ? `      ${dimGray("└", options.style)} ${dimGray(line, options.style)}` : `        ${dimGray(line, options.style)}`));
-					pushBlock(entry.order, toolBlock);
-				}
-				if (rt.lastError) pushBlock(void 0, [kv("error", red(rt.lastError, options.style), options.style)]);
-				blocks.sort((a, b) => a.order - b.order);
-				const lines = [];
-				for (const block of blocks) {
-					if (lines.length > 0 && lines[lines.length - 1] !== "") lines.push("");
-					lines.push(...block.lines);
-				}
-				if (lines.length === 0) lines.push(gray("(waiting for formatted stream output)", options.style));
-				return lines;
+				return formatWatchLogLines({
+					snapshot: rt.aggregator.snapshot(),
+					lastError: rt.lastError,
+					style: options.style,
+					widthHint: options.widthHint
+				});
 			}
 			function moveTaskSelection(delta) {
 				if (runtime.length === 0) return;
@@ -33189,9 +33434,251 @@ function createWatchCommand(version) {
 	});
 }
 
+//#endregion
+//#region src/cli/commands/watch-stream.ts
+function parseSourceOption(value) {
+	try {
+		return parseAgentStreamSourceOption(value);
+	} catch (error) {
+		throw new InvalidArgumentError(error instanceof Error ? error.message : String(error));
+	}
+}
+function createWatchStreamCommand(version) {
+	return createCommand("watch-stream").version(version).description("Watch a single stream and show formatted live logs.").argument("<stream-id>", "The stream id to watch.").option("--source <source>", "Force stream source (codex or claude-code).", parseSourceOption).action(async function() {
+		if (!ensureEnv(["PANTHEON_API_KEY"])) return;
+		const [streamId] = this.args;
+		const options = this.opts();
+		if (!process$1.stdout.isTTY) {
+			console.error("watch-stream requires a TTY.");
+			process$1.exit(1);
+		}
+		const aggregator = new WatchStepAggregator({ maxLogLines: Number.POSITIVE_INFINITY });
+		let source = options.source;
+		let streamEnded = false;
+		let abortedByIdleTimeout = false;
+		let lastError;
+		const abortController = new AbortController();
+		const onSigInt = () => abortController.abort();
+		process$1.on("SIGINT", onSigInt);
+		const screen = blessed.screen({
+			smartCSR: true,
+			title: "pantheon-agents watch-stream"
+		});
+		screen.key(["q", "C-c"], () => abortController.abort());
+		const pane = blessed.box({
+			parent: screen,
+			top: 0,
+			left: 0,
+			height: "100%-1",
+			width: "100%",
+			border: "line",
+			tags: false,
+			wrap: false,
+			style: { border: { fg: "cyan" } }
+		});
+		const header = blessed.box({
+			parent: pane,
+			top: 0,
+			left: 1,
+			height: 2,
+			width: "100%-2",
+			tags: false,
+			wrap: false
+		});
+		const body = blessed.box({
+			parent: pane,
+			top: 2,
+			left: 1,
+			width: "100%-2",
+			height: 1,
+			tags: false,
+			wrap: false,
+			scrollable: false
+		});
+		const footer = blessed.box({
+			parent: screen,
+			bottom: 0,
+			left: 0,
+			height: 1,
+			width: "100%",
+			tags: false,
+			wrap: false,
+			style: { fg: "gray" }
+		});
+		const viewport = {
+			autoFollow: true,
+			scrollOffset: 0
+		};
+		function getFormattedLogLines(style, widthHint) {
+			return formatWatchLogLines({
+				snapshot: aggregator.snapshot(),
+				lastError,
+				style,
+				widthHint
+			});
+		}
+		function scrollLog(delta) {
+			const bodyHeight = typeof body.height === "number" ? body.height : 0;
+			if (bodyHeight <= 0) return;
+			const bodyWidth = typeof body.width === "number" ? body.width : 80;
+			const lines = getFormattedLogLines(useAnsiStyles(), Math.max(20, bodyWidth));
+			const maxOffset = Math.max(0, lines.length - bodyHeight);
+			viewport.autoFollow = false;
+			viewport.scrollOffset = Math.max(0, Math.min(maxOffset, viewport.scrollOffset + delta));
+		}
+		function scrollToTop() {
+			viewport.autoFollow = false;
+			viewport.scrollOffset = 0;
+		}
+		function scrollToBottom() {
+			const bodyHeight = typeof body.height === "number" ? body.height : 0;
+			if (bodyHeight <= 0) return;
+			const bodyWidth = typeof body.width === "number" ? body.width : 80;
+			const lines = getFormattedLogLines(useAnsiStyles(), Math.max(20, bodyWidth));
+			const maxOffset = Math.max(0, lines.length - bodyHeight);
+			viewport.autoFollow = false;
+			viewport.scrollOffset = maxOffset;
+		}
+		function getHalfScreenScrollStep() {
+			const bodyHeight = typeof body.height === "number" ? body.height : 0;
+			return Math.max(1, Math.floor(bodyHeight / 2));
+		}
+		screen.key(["up"], () => {
+			scrollLog(-getHalfScreenScrollStep());
+		});
+		screen.key(["down"], () => {
+			scrollLog(getHalfScreenScrollStep());
+		});
+		screen.key(["g", "home"], () => {
+			scrollToTop();
+		});
+		screen.key([
+			"G",
+			"S-g",
+			"end"
+		], () => {
+			scrollToBottom();
+		});
+		screen.key(["f"], () => {
+			viewport.autoFollow = true;
+		});
+		const renderTimer = setInterval(() => {
+			const style = useAnsiStyles();
+			const columns = Math.max(40, screen.width ?? 120);
+			const rows = Math.max(8, screen.height ?? 24);
+			const contentHeight = Math.max(1, rows - 1);
+			pane.top = 0;
+			pane.left = 0;
+			pane.width = columns;
+			pane.height = contentHeight;
+			pane.setLabel(" Stream Logs ");
+			const paneInnerWidth = Math.max(1, columns - 2);
+			const paneInnerHeight = Math.max(1, contentHeight - 2);
+			const headerHeight = Math.min(2, paneInnerHeight);
+			const bodyHeight = Math.max(0, paneInnerHeight - headerHeight);
+			header.top = 0;
+			header.left = 1;
+			header.width = paneInnerWidth;
+			header.height = headerHeight;
+			const headerLines = [clip(`stream id: ${streamId}`, paneInnerWidth), clip(`source: ${source ?? "(detecting...)"} • status: ${streamEnded ? "ended" : "streaming"}${abortedByIdleTimeout ? " (idle timeout)" : ""}`, paneInnerWidth)];
+			header.setContent(headerLines.slice(0, headerHeight).join("\n"));
+			body.top = headerHeight;
+			body.left = 1;
+			body.width = paneInnerWidth;
+			body.height = bodyHeight;
+			const lines = getFormattedLogLines(style, paneInnerWidth);
+			const maxOffset = Math.max(0, lines.length - bodyHeight);
+			if (viewport.autoFollow) viewport.scrollOffset = maxOffset;
+			else viewport.scrollOffset = Math.max(0, Math.min(maxOffset, viewport.scrollOffset));
+			if (bodyHeight <= 0) body.hide();
+			else {
+				const visibleLines = lines.slice(viewport.scrollOffset, viewport.scrollOffset + bodyHeight);
+				body.setContent(visibleLines.map((line) => clip(line, paneInnerWidth)).join("\n"));
+				body.show();
+			}
+			const footerParts = [
+				"Ctrl+C to exit",
+				"q to quit",
+				"↑/↓ half-page",
+				"g/G top/bottom",
+				"f resume auto-scroll"
+			];
+			if (!viewport.autoFollow) footerParts.push("auto-scroll paused");
+			if (lastError) footerParts.push(`error: ${clip(lastError, 40)}`);
+			footer.setContent(footerParts.join(" • "));
+			screen.render();
+		}, 300);
+		const streamAbort = new AbortController();
+		(async () => {
+			try {
+				const res = await fetch(makeOpaqueStreamUrl(streamId), {
+					headers: {
+						Authorization: `Bearer ${process$1.env.PANTHEON_API_KEY}`,
+						Accept: "text/event-stream"
+					},
+					signal: streamAbort.signal
+				});
+				if (!res.ok) {
+					lastError = `stream request failed: ${res.status} ${res.statusText}`;
+					streamEnded = true;
+					return;
+				}
+				if (!res.body) {
+					lastError = "missing response body";
+					streamEnded = true;
+					return;
+				}
+				let normalizer;
+				const consumeResult = await consumeOpaqueSseStream({
+					stream: res.body,
+					signal: streamAbort.signal,
+					onWarning: (warning) => aggregator.pushUiChunk({
+						type: "data-agent-unknown",
+						data: { reason: warning }
+					}),
+					onData: (payload) => {
+						if (!normalizer) {
+							source = source ?? detectStreamSourceFromRawPayload(payload) ?? "codex";
+							normalizer = createAgentStreamNormalizer({
+								source,
+								emitStartChunk: false,
+								includeMetaEvents: true,
+								unknownChunkPolicy: "emit"
+							});
+						}
+						aggregator.pushUiChunks(normalizer.push(payload));
+					}
+				});
+				if (normalizer) aggregator.pushUiChunks(normalizer.finish());
+				streamEnded = consumeResult.ended;
+				abortedByIdleTimeout = consumeResult.abortedByIdleTimeout;
+			} catch (error) {
+				if (streamAbort.signal.aborted) {
+					streamEnded = true;
+					return;
+				}
+				lastError = error instanceof Error ? error.message : String(error);
+				streamEnded = true;
+			}
+		})();
+		try {
+			await new Promise((resolve) => {
+				const resolveOnce = () => resolve();
+				abortController.signal.addEventListener("abort", resolveOnce, { once: true });
+				if (abortController.signal.aborted) resolveOnce();
+			});
+		} finally {
+			process$1.off("SIGINT", onSigInt);
+			clearInterval(renderTimer);
+			streamAbort.abort();
+			screen.destroy();
+		}
+	});
+}
+
 //#endregion
 //#region src/cli/index.ts
-const program = new Command().name("pantheon-agents").description("Pantheon agents CLI").version(version$1).showHelpAfterError().showSuggestionAfterError().addHelpCommand().addCommand(createAddTaskCommand(version$1)).addCommand(createConfigAgentCommand(version$1)).addCommand(createDeleteTaskCommand(version$1)).addCommand(createCancelTaskCommand(version$1)).addCommand(createReconfigAgentCommand(version$1)).addCommand(createRunAgentCommand(version$1)).addCommand(createServerCommand(version$1)).addCommand(createShowConfigCommand(version$1)).addCommand(createShowTasksCommand(version$1)).addCommand(createWatchCommand(version$1)).addCommand(createLlmExplainCommand(version$1));
+const program = new Command().name("pantheon-agents").description("Pantheon agents CLI").version(version$1).showHelpAfterError().showSuggestionAfterError().addHelpCommand().addCommand(createAddTaskCommand(version$1)).addCommand(createConfigAgentCommand(version$1)).addCommand(createDeleteTaskCommand(version$1)).addCommand(createCancelTaskCommand(version$1)).addCommand(createReconfigAgentCommand(version$1)).addCommand(createRunAgentCommand(version$1)).addCommand(createServerCommand(version$1)).addCommand(createShowConfigCommand(version$1)).addCommand(createShowTasksCommand(version$1)).addCommand(createWatchCommand(version$1)).addCommand(createWatchStreamCommand(version$1)).addCommand(createLlmExplainCommand(version$1));
 async function main() {
 	if (process$1.argv.length <= 2) {
 		program.outputHelp();