pi-subagents 0.69.0 → 0.70.1

package/src/watchdog/tool-actions.ts

@@ -1,156 +0,0 @@
-import type { AgentToolResult } from "@earendil-works/pi-agent-core";
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { THINKING_LEVELS, type ThinkingLevel } from "../shared/model-info.ts";
-import type { Details } from "../shared/types.ts";
-import { buildWatchdogStatus } from "./register-main.ts";
-import type { MainWatchdogRuntime } from "./runtime.ts";
-import { formatWatchdogRecommendation, parseWatchdogThinkingInput, recommendStrongWatchdogModel, recommendWatchdogModel, resolveWatchdogModelInput } from "./model-selection.ts";
-import { resolveWatchdogConfig, writeWatchdogModelSettings, type WatchdogModelSettingsTarget, type WatchdogSettingsWriteScope } from "./settings.ts";
-
-interface WatchdogToolParams {
-	action?: string;
-	scope?: string;
-	target?: string;
-	agent?: string;
-	model?: string;
-	thinking?: string | false;
-	cwd?: string;
-}
-
-function result(text: string, isError = false): AgentToolResult<Details> {
-	return {
-		content: [{ type: "text", text }],
-		...(isError ? { isError: true } : {}),
-		details: { mode: "management", results: [] },
-	};
-}
-
-function messageFromError(error: unknown): string {
-	return error instanceof Error ? error.message : String(error);
-}
-
-function parseScope(raw: string | undefined): "session" | WatchdogSettingsWriteScope {
-	if (raw === undefined || raw === "session") return "session";
-	if (raw === "user" || raw === "project") return raw;
-	throw new Error("watchdog.configure scope must be 'session', 'user', or 'project'.");
-}
-
-function parseTarget(params: WatchdogToolParams): WatchdogModelSettingsTarget {
-	const target = params.target ?? "main";
-	if (target === "main") return { kind: "main" };
-	if (target === "children") return { kind: "children" };
-	if (target === "child") {
-		if (!params.agent?.trim()) throw new Error("watchdog.configure target='child' requires agent.");
-		return { kind: "child", agent: params.agent.trim() };
-	}
-	throw new Error("watchdog.configure target must be 'main', 'children', or 'child'.");
-}
-
-function parseThinking(raw: string | false | undefined): ThinkingLevel | false | null | undefined {
-	if (raw === undefined) return undefined;
-	if (raw === "inherit") return null;
-	return parseWatchdogThinkingInput(raw, "watchdog.configure thinking") ?? undefined;
-}
-
-function resolveConfiguredValue(ctx: ExtensionContext, params: WatchdogToolParams, runtime?: MainWatchdogRuntime): { model?: string | null; thinking?: ThinkingLevel | false | null; description: string } {
-	const thinking = parseThinking(params.thinking);
-	const rawModel = params.model?.trim();
-	if (!rawModel) {
-		if (thinking === undefined) throw new Error("watchdog.configure requires model, thinking, or both.");
-		return { thinking, description: `thinking ${thinking === null ? "inherit" : thinking === false ? "off" : thinking}` };
-	}
-	if (rawModel === "inherit") return { model: null, thinking: thinking ?? null, description: "inherit" };
-	if (rawModel === "recommended") {
-		const recommendation = (params.target ?? "main") === "main"
-			? recommendWatchdogModel(ctx, (runtime?.getSnapshot(ctx.cwd).config ?? resolveWatchdogConfig(ctx.cwd).config).main)
-			: recommendStrongWatchdogModel(ctx);
-		return {
-			model: recommendation.model,
-			thinking: recommendation.thinking,
-			description: `${recommendation.model}:${recommendation.thinking}`,
-		};
-	}
-	const resolved = resolveWatchdogModelInput(ctx, rawModel);
-	return {
-		model: resolved.model,
-		thinking: resolved.thinking ?? thinking,
-		description: `${resolved.model}${resolved.thinking ?? thinking ? `:${resolved.thinking ?? thinking}` : ""}`,
-	};
-}
-
-function buildRecommendationText(ctx: ExtensionContext, runtime?: MainWatchdogRuntime): string {
-	const recommendation = recommendWatchdogModel(ctx, (runtime?.getSnapshot(ctx.cwd).config ?? resolveWatchdogConfig(ctx.cwd).config).main);
-	return [
-		"Subagent watchdog recommended model",
-		recommendation.source === "configured" ? formatWatchdogRecommendation(recommendation) : `Recommended: ${recommendation.model}:${recommendation.thinking}`,
-		`Reason: ${recommendation.reason}`,
-		"Apply temporarily with subagent({ action: \"watchdog.configure\", scope: \"session\", model: \"recommended\" }).",
-		"Persist with scope: \"project\" or scope: \"user\" only when the user asks for that scope.",
-	].join("\n");
-}
-
-function buildCheckText(runtime: MainWatchdogRuntime | undefined, ctx: ExtensionContext): string {
-	if (!runtime) return "Subagent watchdog runtime is unavailable.";
-	const snapshot = runtime.getSnapshot(ctx.cwd);
-	if (!snapshot.configOk) return ["Subagent watchdog config check", "Config errors:", ...snapshot.errors.map((error) => `- ${error.message}`)].join("\n");
-	const lines = ["Subagent watchdog config check", "Config: ok"];
-	if (snapshot.config.main.model) {
-		const resolved = resolveWatchdogModelInput(ctx, snapshot.config.main.model);
-		lines.push(`Main model: ${resolved.model} auth ok`);
-	} else {
-		lines.push("Main model: current session");
-	}
-	lines.push(`LSP diagnostics: ${snapshot.lsp.enabled ? "on" : "off"} · ${snapshot.lsp.status}`);
-	try {
-		lines.push(formatWatchdogRecommendation(recommendWatchdogModel(ctx, snapshot.config.main)));
-	} catch (error) {
-		lines.push(`Watchdog recommendation unavailable: ${messageFromError(error)}`);
-	}
-	return lines.join("\n");
-}
-
-export function handleWatchdogToolAction(action: string, params: WatchdogToolParams, ctx: ExtensionContext, runtime?: MainWatchdogRuntime): AgentToolResult<Details> {
-	try {
-		if (action === "watchdog.status") {
-			if (!runtime) return result("Subagent watchdog runtime is unavailable.", true);
-			return result(buildWatchdogStatus(runtime.getSnapshot(ctx.cwd), ctx));
-		}
-		if (action === "watchdog.recommend-model") return result(buildRecommendationText(ctx, runtime));
-		if (action === "watchdog.check") return result(buildCheckText(runtime, ctx));
-		if (action !== "watchdog.configure") return result(`Unknown watchdog action: ${action}`, true);
-
-		const scope = parseScope(params.scope);
-		const target = parseTarget(params);
-		const value = resolveConfiguredValue(ctx, params, runtime);
-		if (scope === "session") {
-			if (!runtime) return result("Subagent watchdog runtime is unavailable.", true);
-			if (target.kind !== "main") return result("Session-scoped watchdog.configure currently supports target='main' only.", true);
-			runtime.setSessionModel({ model: value.model, thinking: value.thinking }, ctx.cwd);
-			return result([
-				`Subagent watchdog session model configured: ${value.description}.`,
-				"No settings files were changed.",
-				"",
-				buildWatchdogStatus(runtime.getSnapshot(ctx.cwd), ctx),
-			].join("\n"));
-		}
-
-		const settingsPath = writeWatchdogModelSettings({
-			scope,
-			cwd: ctx.cwd,
-			target,
-			model: value.model,
-			thinking: value.thinking,
-		});
-		runtime?.refreshConfig(ctx.cwd);
-		const targetLabel = target.kind === "child" ? `child ${target.agent}` : target.kind;
-		return result([
-			`Subagent watchdog ${targetLabel} model configured: ${value.description}.`,
-			`Updated: ${settingsPath}`,
-		].join("\n"));
-	} catch (error) {
-		return result(`Subagent watchdog action failed: ${messageFromError(error)}`, true);
-	}
-}
-
-export const WATCHDOG_TOOL_ACTIONS = ["watchdog.status", "watchdog.check", "watchdog.configure", "watchdog.recommend-model"] as const;
-export const WATCHDOG_THINKING_VALUES = ["inherit", ...THINKING_LEVELS] as const;

package/src/watchdog/turn-delta.ts

@@ -1,184 +0,0 @@
-import { SUBAGENT_WATCHDOG_WARNING_TYPE } from "./types.ts";
-
-type MessageLike = {
-	role?: string;
-	content?: unknown;
-	customType?: string;
-	toolName?: string;
-	name?: string;
-	input?: unknown;
-	args?: unknown;
-	arguments?: unknown;
-	error?: unknown;
-	isError?: boolean;
-	details?: unknown;
-	stopReason?: string;
-};
-
-export interface WatchdogTurnDeltaInput {
-	userPrompt?: string;
-	includeUserPrompt?: boolean;
-	messages?: unknown[];
-	events?: unknown[];
-	finalAssistantStop?: boolean;
-}
-
-function textFromContent(content: unknown): string {
-	if (typeof content === "string") return content;
-	if (Array.isArray(content)) {
-		return content.map((block) => {
-			if (typeof block === "string") return block;
-			if (block && typeof block === "object") {
-				const item = block as { type?: string; text?: unknown; thinking?: unknown; content?: unknown; name?: unknown; input?: unknown; args?: unknown; arguments?: unknown };
-				if (item.type === "text" && typeof item.text === "string") return item.text;
-				if (item.type === "thinking" && typeof item.thinking === "string") return ["Thinking:", item.thinking].join("\n");
-				if (item.type === "toolCall") return formatToolCall(item.name, item.input ?? item.args ?? item.arguments);
-				if (typeof item.content === "string") return item.content;
-			}
-			return "";
-		}).filter(Boolean).join("\n");
-	}
-	if (content === undefined || content === null) return "";
-	return formatValue(content);
-}
-
-function formatValue(value: unknown, indent = ""): string {
-	if (typeof value === "string") return value;
-	if (value === undefined) return "undefined";
-	if (value === null || typeof value === "number" || typeof value === "boolean") return JSON.stringify(value);
-	if (Array.isArray(value)) {
-		return value.map((item) => `${indent}- ${formatValue(item, `${indent}  `)}`).join("\n");
-	}
-	if (typeof value === "object") {
-		const lines: string[] = [];
-		for (const [key, item] of Object.entries(value as Record<string, unknown>)) {
-			if (typeof item === "string" && item.includes("\n")) lines.push(`${indent}${key}:\n${item}`);
-			else lines.push(`${indent}${key}: ${formatValue(item, `${indent}  `)}`);
-		}
-		return lines.join("\n");
-	}
-	return String(value);
-}
-
-function redactEditWriteInput(input: unknown): unknown {
-	if (Array.isArray(input)) return input.map(redactEditWriteInput);
-	if (!input || typeof input !== "object") return input;
-	const sanitized: Record<string, unknown> = {};
-	for (const [key, value] of Object.entries(input as Record<string, unknown>)) {
-		sanitized[key] = ["oldText", "newText", "content"].includes(key) && typeof value === "string"
-			? `[omitted ${value.length} chars; use tool result diff]`
-			: redactEditWriteInput(value);
-	}
-	return sanitized;
-}
-
-function formatToolArguments(name: string, input: unknown): string {
-	if (name === "edit" || name === "write") return formatValue(redactEditWriteInput(input));
-	return formatValue(input);
-}
-
-function formatToolCall(name: unknown, input: unknown): string {
-	const toolName = typeof name === "string" && name ? name : "tool";
-	return [`Tool call: ${toolName}`, "Arguments:", formatToolArguments(toolName, input ?? {})].join("\n");
-}
-
-function formatToolResult(name: string, content: unknown, details: unknown, error: unknown, isError: boolean | undefined): string {
-	const failed = isError === true || Boolean(error);
-	const lines = [`Tool result: ${name}`];
-	if (failed) lines.push(`Error: ${error ? (typeof error === "string" ? error : formatValue(error)) : "tool reported an error"}`);
-	if (!failed && details && typeof details === "object" && "diff" in details && typeof (details as { diff?: unknown }).diff === "string") {
-		lines.push("Diff:", (details as { diff: string }).diff);
-	} else {
-		const body = textFromContent(content);
-		if (body) lines.push(failed ? "Output:" : "Result:", body);
-	}
-	return lines.join("\n");
-}
-
-function messagesFromEvent(event: unknown): unknown[] {
-	if (!event || typeof event !== "object") return [];
-	const input = event as Record<string, unknown>;
-	if (input.type === "turn_end" || input.event === "turn_end") {
-		return [input.message, ...(Array.isArray(input.toolResults) ? input.toolResults : [])].filter(Boolean);
-	}
-	if (input.message) return [input.message];
-	if (input.type === "tool_execution_start" || input.event === "tool_execution_start") {
-		return [{ role: "toolCall", name: input.toolName ?? input.name, input: input.args ?? input.input }];
-	}
-	if (input.type === "tool_execution_end" || input.event === "tool_execution_end") {
-		const result = input.result && typeof input.result === "object" && !Array.isArray(input.result) ? input.result as Record<string, unknown> : undefined;
-		return [{
-			role: "toolResult",
-			toolName: input.toolName ?? input.name,
-			content: result?.content ?? input.content ?? input.result,
-			details: result?.details ?? input.details,
-			error: input.error,
-			isError: input.isError,
-		}];
-	}
-	if (input.type === "tool_result" || input.event === "tool_result") {
-		return [{ role: "toolResult", toolName: input.toolName ?? input.name, content: input.content, details: input.details, error: input.error, isError: input.isError }];
-	}
-	return [];
-}
-
-export function formatWatchdogReviewMessage(message: unknown): string | undefined {
-	if (!message || typeof message !== "object") return undefined;
-	const input = message as MessageLike;
-	if (input.role === "custom" && input.customType === SUBAGENT_WATCHDOG_WARNING_TYPE) return undefined;
-	if (input.role === "assistant") {
-		const text = textFromContent(input.content);
-		const lines = text ? ["Assistant:", text] : ["Assistant: (no text)"];
-		if (input.stopReason === "stop") lines.push("Assistant stop: stop");
-		return lines.join("\n");
-	}
-	if (input.role === "toolCall") return formatToolCall(input.name ?? input.toolName, input.input ?? input.args ?? input.arguments);
-	if (input.role === "toolResult" || input.role === "tool") {
-		return formatToolResult(input.toolName ?? input.name ?? "tool", input.content, input.details, input.error, input.isError);
-	}
-	if (input.role === "user") {
-		const text = textFromContent(input.content);
-		return text ? ["User:", text].join("\n") : undefined;
-	}
-	return undefined;
-}
-
-export function formatWatchdogTurnDelta(input: WatchdogTurnDeltaInput): string {
-	const sections: string[] = [];
-	if (input.includeUserPrompt && input.userPrompt?.trim()) sections.push(["User prompt:", input.userPrompt].join("\n"));
-	for (const message of input.messages ?? []) {
-		const section = formatWatchdogReviewMessage(message);
-		if (section) sections.push(section);
-	}
-	for (const event of input.events ?? []) {
-		for (const message of messagesFromEvent(event)) {
-			const section = formatWatchdogReviewMessage(message);
-			if (section) sections.push(section);
-		}
-	}
-	if (input.finalAssistantStop) sections.push("Final assistant stop: stop without tool call");
-	return sections.join("\n\n---\n\n");
-}
-
-/** Only completed, exactly paired native orchestration calls are activity evidence. */
-export function formatWatchdogOrchestrationActivity(event: unknown): string {
-	const turn = event as { type?: string; message?: { content?: unknown }; toolResults?: unknown[] } | undefined;
-	if (turn?.type !== "turn_end" || !Array.isArray(turn.message?.content) || !Array.isArray(turn.toolResults)) return "";
-	const sections: string[] = [];
-	for (const call of turn.message.content) {
-		if (call?.type !== "toolCall" || typeof call.id !== "string") continue;
-		const args = call.arguments;
-		if (!args || typeof args !== "object") continue;
-		const eligible = call.name === "bg_wait"
-			|| (call.name === "subagent_supervisor" && ["pending", "list", "reply"].includes(args.action))
-			|| (call.name === "subagent" && (["status", "resume", "interrupt", "steer", "stop"].includes(args.action)
-				|| (args.action === undefined && (typeof args.agent === "string" || typeof args.workflowScript === "string" || typeof args.workflowScriptPath === "string"))));
-		if (!eligible) continue;
-		const result = turn.toolResults.find((value) => {
-			const result = value as { role?: string; toolCallId?: string; toolName?: string };
-			return result?.role === "toolResult" && result.toolCallId === call.id && result.toolName === call.name;
-		});
-		if (result) sections.push(formatToolCall(call.name, args), formatWatchdogReviewMessage(result) ?? "");
-	}
-	return sections.join("\n\n");
-}

package/src/watchdog/types.ts

@@ -1,186 +0,0 @@
-export const SUBAGENT_WATCHDOG_WARNING_TYPE = "subagent_watchdog_warning";
-
-export const WATCHDOG_WARNING_SEVERITIES = ["concern", "blocker"] as const;
-export type WatchdogSeverity = typeof WATCHDOG_WARNING_SEVERITIES[number];
-
-export const WATCHDOG_WARNING_CATEGORIES = [
-	"correctness",
-	"missed-constraint",
-	"test-gap",
-	"unsafe-change",
-	"scope-drift",
-	"stale-fact",
-	"loop-risk",
-	"other",
-] as const;
-export type WatchdogCategory = typeof WATCHDOG_WARNING_CATEGORIES[number];
-
-export const WATCHDOG_WARNING_IMPORTANCES = ["low", "medium", "high"] as const;
-export type WatchdogImportance = typeof WATCHDOG_WARNING_IMPORTANCES[number];
-
-export const WATCHDOG_WARNING_SOURCES = ["main", "child", "lsp"] as const;
-export type WatchdogWarningSource = typeof WATCHDOG_WARNING_SOURCES[number];
-
-export const WATCHDOG_LSP_DIAGNOSTIC_SEVERITIES = ["error", "warning", "info", "hint"] as const;
-export type WatchdogLspDiagnosticSeverity = typeof WATCHDOG_LSP_DIAGNOSTIC_SEVERITIES[number];
-
-export const WATCHDOG_LSP_STATUSES = ["disabled", "ok", "skipped", "unavailable", "timeout", "failed"] as const;
-export type WatchdogLspStatus = typeof WATCHDOG_LSP_STATUSES[number];
-
-export const WATCHDOG_RUNTIME_STATUSES = ["idle", "queued", "reviewing", "waiting-at-agent-end", "stale", "failed"] as const;
-export type WatchdogRuntimeStatus = typeof WATCHDOG_RUNTIME_STATUSES[number];
-
-export const WATCHDOG_WARNING_STATES = [
-	"candidate",
-	"confirmed",
-	"displayed",
-	"stale",
-	"failed",
-	"resolved",
-	"stalemate",
-	"suppressed",
-] as const;
-export type WatchdogWarningState = typeof WATCHDOG_WARNING_STATES[number];
-
-export interface WatchdogWarning {
-	severity: WatchdogSeverity;
-	importance: WatchdogImportance;
-	summary: string;
-	evidence: string;
-	recommendedAction: string;
-	category?: WatchdogCategory;
-	source?: WatchdogWarningSource;
-	agent?: string;
-	runId?: string;
-	stale?: boolean;
-	state?: WatchdogWarningState;
-}
-
-export interface WatchdogWarningDetails extends WatchdogWarning {
-	category: WatchdogCategory;
-	source: WatchdogWarningSource;
-	identity?: string;
-	displayedAt?: string;
-	error?: string;
-	stalemateRepeats?: number;
-}
-
-export interface WatchdogWarningMessage {
-	customType: typeof SUBAGENT_WATCHDOG_WARNING_TYPE;
-	content: string;
-	display: boolean;
-	details: WatchdogWarningDetails;
-}
-
-export interface WatchdogGuidanceConfig {
-	watchdogMd: boolean;
-}
-
-export interface WatchdogScopeConfig {
-	enabled: boolean;
-}
-
-export interface WatchdogCadenceConfig {
-	everyNTools: number | null;
-}
-
-export interface WatchdogEndpointConfig {
-	enabled: boolean;
-	model?: string;
-	thinking?: string | false;
-}
-
-export interface WatchdogChildOverrideConfig {
-	enabled?: boolean;
-	model?: string;
-	thinking?: string | false;
-	cadence?: Partial<WatchdogCadenceConfig>;
-}
-
-export interface WatchdogChildrenConfig extends WatchdogEndpointConfig {
-	watchdogTailTimeoutMs: number;
-	/** Mid-run cadence for child watchdogs; defaults to the top-level cadence. */
-	cadence?: Partial<WatchdogCadenceConfig>;
-	overrides: Record<string, WatchdogChildOverrideConfig>;
-}
-
-export interface WatchdogLspConfig {
-	enabled: boolean;
-	timeoutMs: number;
-	maxFiles: number;
-	maxDiagnostics: number;
-}
-
-export interface WatchdogLspDiagnostic {
-	path: string;
-	line: number;
-	column: number;
-	severity: WatchdogLspDiagnosticSeverity;
-	source: string;
-	code?: string;
-	message: string;
-}
-
-export interface WatchdogLspResult {
-	status: WatchdogLspStatus;
-	provider?: string;
-	checkedPaths: string[];
-	skippedPaths: string[];
-	diagnostics: WatchdogLspDiagnostic[];
-	message?: string;
-}
-
-export interface WatchdogLspRuntimeSnapshot extends WatchdogLspResult {
-	enabled: boolean;
-	diagnosticCount: number;
-	freshDiagnosticCount: number;
-	updatedAt?: string;
-}
-
-export interface WatchdogRoleModelRule {
-	allow?: string[];
-	deny?: string[];
-	note?: string;
-}
-
-export interface WatchdogRulesConfig {
-	action: "warn" | "block";
-	roleModels: Record<string, WatchdogRoleModelRule>;
-}
-
-export interface ResolvedWatchdogConfig {
-	enabled: boolean;
-	/** Main-only, bounded boundary clarification; never enabled for child reviews. */
-	clarification: boolean;
-	agentEndTimeoutMs: number;
-	severityThreshold: WatchdogSeverity;
-	maxWarnings: number | null;
-	guidance: WatchdogGuidanceConfig;
-	/** Consecutive identical boundary warnings before the watchdog stops continuing the run. */
-	stalemateRepeats: number;
-	scope: WatchdogScopeConfig;
-	cadence: WatchdogCadenceConfig;
-	main: WatchdogEndpointConfig;
-	children: WatchdogChildrenConfig;
-	lsp: WatchdogLspConfig;
-	rules?: WatchdogRulesConfig;
-}
-
-export interface WatchdogSettingsError {
-	scope: "user" | "project" | "session";
-	path?: string;
-	message: string;
-}
-
-export interface WatchdogSettingsSource {
-	scope: "user" | "project" | "session";
-	path?: string;
-	exists: boolean;
-}
-
-export interface WatchdogSettingsResult {
-	ok: boolean;
-	config: ResolvedWatchdogConfig;
-	errors: WatchdogSettingsError[];
-	sources: WatchdogSettingsSource[];
-}

package/src/watchdog/warning-format.ts

@@ -1,72 +0,0 @@
-import {
-	SUBAGENT_WATCHDOG_WARNING_TYPE,
-	type WatchdogWarning,
-	type WatchdogWarningDetails,
-	type WatchdogWarningMessage,
-} from "./types.ts";
-
-function escapeXmlText(value: string): string {
-	return value
-		.replace(/&/g, "&")
-		.replace(/</g, "&lt;")
-		.replace(/>/g, "&gt;");
-}
-
-function escapeXmlAttribute(value: string): string {
-	return escapeXmlText(value).replace(/"/g, "&quot;");
-}
-
-function tag(name: string, value: string | number | boolean | undefined): string | undefined {
-	if (value === undefined) return undefined;
-	return `<${name}>${escapeXmlText(String(value))}</${name}>`;
-}
-
-export function normalizeWatchdogWarningDetails(warning: WatchdogWarning, extras: Partial<WatchdogWarningDetails> = {}): WatchdogWarningDetails {
-	return {
-		...warning,
-		category: warning.category ?? extras.category ?? "other",
-		source: warning.source ?? extras.source ?? "main",
-		...extras,
-	};
-}
-
-export function formatWatchdogWarningContent(warning: WatchdogWarning): string {
-	const details = normalizeWatchdogWarningDetails(warning);
-	const attrs = [
-		`severity="${escapeXmlAttribute(details.severity)}"`,
-		`importance="${escapeXmlAttribute(details.importance)}"`,
-		`category="${escapeXmlAttribute(details.category)}"`,
-		`source="${escapeXmlAttribute(details.source)}"`,
-		`guidance="weigh, don't blindly obey"`,
-	];
-	const optionalTags = [
-		tag("agent", details.agent),
-		tag("run_id", details.runId),
-		tag("state", details.state),
-		tag("stale", details.stale),
-	];
-	return [
-		`<subagent_watchdog ${attrs.join(" ")}>`,
-		`<summary>${escapeXmlText(details.summary)}</summary>`,
-		`<evidence>${escapeXmlText(details.evidence)}</evidence>`,
-		`<recommended_action>${escapeXmlText(details.recommendedAction)}</recommended_action>`,
-		...optionalTags.filter((line): line is string => Boolean(line)),
-		details.severity === "blocker"
-			? "<blocker_guidance>If this warning changes the outcome, produce a new self-contained final answer after addressing it.</blocker_guidance>"
-			: undefined,
-		"</subagent_watchdog>",
-	].filter((line): line is string => Boolean(line)).join("\n");
-}
-
-export function createWatchdogWarningMessage(
-	warning: WatchdogWarning,
-	options: { display?: boolean; details?: Partial<WatchdogWarningDetails> } = {},
-): WatchdogWarningMessage {
-	const details = normalizeWatchdogWarningDetails(warning, options.details);
-	return {
-		customType: SUBAGENT_WATCHDOG_WARNING_TYPE,
-		content: formatWatchdogWarningContent(details),
-		display: options.display ?? true,
-		details,
-	};
-}