pi-crew 0.1.51 → 0.2.1

package/src/runtime/task-runner/capabilities.ts

@@ -1,78 +1,78 @@
-import type { AgentConfig } from "../../agents/agent-config.ts";
-import type { CrewRuntimeKind } from "../crew-agent-runtime.ts";
-
-export interface WorkerCapabilityInventory {
-	schemaVersion: 1;
-	taskId: string;
-	role: string;
-	agent: string;
-	runtime: CrewRuntimeKind;
-	permissionMode: string;
-	tools: string[];
-	extensions: string[];
-	skills: {
-		names: string[];
-		paths: string[];
-		disabled: boolean;
-	};
-	model: {
-		requested?: string;
-		agentDefault?: string;
-		fallbacks: string[];
-		teamRole?: string;
-		step?: string;
-	};
-	inheritance: {
-		projectContext: boolean;
-		skills: boolean;
-		systemPromptMode: "replace" | "append";
-	};
-}
-
-export interface BuildWorkerCapabilityInventoryInput {
-	taskId: string;
-	role: string;
-	agent: AgentConfig;
-	runtime: CrewRuntimeKind;
-	permissionMode: string;
-	skillNames?: string[];
-	skillPaths?: string[];
-	skillsDisabled: boolean;
-	modelOverride?: string;
-	teamRoleModel?: string;
-	stepModel?: string;
-}
-
-function uniqueSorted(values: readonly string[] | undefined): string[] {
-	return [...new Set((values ?? []).map((value) => value.trim()).filter(Boolean))].sort((a, b) => a.localeCompare(b));
-}
-
-export function buildWorkerCapabilityInventory(input: BuildWorkerCapabilityInventoryInput): WorkerCapabilityInventory {
-	return {
-		schemaVersion: 1,
-		taskId: input.taskId,
-		role: input.role,
-		agent: input.agent.name,
-		runtime: input.runtime,
-		permissionMode: input.permissionMode,
-		tools: uniqueSorted(input.agent.tools),
-		extensions: uniqueSorted(input.agent.extensions),
-		skills: {
-			names: uniqueSorted(input.skillNames),
-			paths: uniqueSorted(input.skillPaths),
-			disabled: input.skillsDisabled,
-		},
-		model: {
-			requested: input.modelOverride,
-			agentDefault: input.agent.model,
-			fallbacks: uniqueSorted(input.agent.fallbackModels),
-			teamRole: input.teamRoleModel,
-			step: input.stepModel,
-		},
-		inheritance: {
-			projectContext: input.agent.inheritProjectContext === true,
-			skills: input.agent.inheritSkills === true,
-			systemPromptMode: input.agent.systemPromptMode ?? "replace",
-		},
-	};
-}
+import type { AgentConfig } from "../../agents/agent-config.ts";
+import type { CrewRuntimeKind } from "../crew-agent-runtime.ts";
+
+export interface WorkerCapabilityInventory {
+	schemaVersion: 1;
+	taskId: string;
+	role: string;
+	agent: string;
+	runtime: CrewRuntimeKind;
+	permissionMode: string;
+	tools: string[];
+	extensions: string[];
+	skills: {
+		names: string[];
+		paths: string[];
+		disabled: boolean;
+	};
+	model: {
+		requested?: string;
+		agentDefault?: string;
+		fallbacks: string[];
+		teamRole?: string;
+		step?: string;
+	};
+	inheritance: {
+		projectContext: boolean;
+		skills: boolean;
+		systemPromptMode: "replace" | "append";
+	};
+}
+
+export interface BuildWorkerCapabilityInventoryInput {
+	taskId: string;
+	role: string;
+	agent: AgentConfig;
+	runtime: CrewRuntimeKind;
+	permissionMode: string;
+	skillNames?: string[];
+	skillPaths?: string[];
+	skillsDisabled: boolean;
+	modelOverride?: string;
+	teamRoleModel?: string;
+	stepModel?: string;
+}
+
+function uniqueSorted(values: readonly string[] | undefined): string[] {
+	return [...new Set((values ?? []).map((value) => value.trim()).filter(Boolean))].sort((a, b) => a.localeCompare(b));
+}
+
+export function buildWorkerCapabilityInventory(input: BuildWorkerCapabilityInventoryInput): WorkerCapabilityInventory {
+	return {
+		schemaVersion: 1,
+		taskId: input.taskId,
+		role: input.role,
+		agent: input.agent.name,
+		runtime: input.runtime,
+		permissionMode: input.permissionMode,
+		tools: uniqueSorted(input.agent.tools),
+		extensions: uniqueSorted(input.agent.extensions),
+		skills: {
+			names: uniqueSorted(input.skillNames),
+			paths: uniqueSorted(input.skillPaths),
+			disabled: input.skillsDisabled,
+		},
+		model: {
+			requested: input.modelOverride,
+			agentDefault: input.agent.model,
+			fallbacks: uniqueSorted(input.agent.fallbackModels),
+			teamRole: input.teamRoleModel,
+			step: input.stepModel,
+		},
+		inheritance: {
+			projectContext: input.agent.inheritProjectContext === true,
+			skills: input.agent.inheritSkills === true,
+			systemPromptMode: input.agent.systemPromptMode ?? "replace",
+		},
+	};
+}

package/src/runtime/task-runner/live-executor.ts

@@ -69,6 +69,12 @@ export async function runLiveTask(input: RunLiveTaskInput): Promise<RunLiveTaskO
 	};
 	const attemptStartedAt = new Date();
 	const isCurrent = input.isCurrent ?? (() => input.signal?.aborted !== true);
+	// Apply agent-level maxTurns override if specified (only positive integers)
+	const agentMax = agent.maxTurns;
+	const effectiveRuntimeConfig = (agentMax != null && agentMax > 0 &&
+		(!input.runtimeConfig?.maxTurns || agentMax < input.runtimeConfig.maxTurns))
+		? { ...input.runtimeConfig, maxTurns: agentMax }
+		: input.runtimeConfig;
 	const liveResult = await runLiveSessionTask({
 		manifest,
 		task,
@@ -77,7 +83,7 @@ export async function runLiveTask(input: RunLiveTaskInput): Promise<RunLiveTaskO
 		prompt,
 		signal: input.signal,
 		transcriptPath,
-		runtimeConfig: input.runtimeConfig,
+		runtimeConfig: effectiveRuntimeConfig,
 		parentContext: input.parentContext,
 		parentModel: input.parentModel,
 		modelRegistry: input.modelRegistry,

package/src/runtime/task-runner/progress.ts

@@ -1,119 +1,119 @@
-import type { UsageState } from "../../state/types.ts";
-import type { CrewAgentProgress } from "../crew-agent-runtime.ts";
-import { emptyCrewAgentProgress } from "../crew-agent-records.ts";
-import type { ProgressEventSummary } from "../progress-event-coalescer.ts";
-import type { TeamTaskState } from "../../state/types.ts";
-
-function asRecord(value: unknown): Record<string, unknown> | undefined {
-	return value && typeof value === "object" && !Array.isArray(value) ? value as Record<string, unknown> : undefined;
-}
-
-function safeNum(v: number | undefined): number {
-	return Number.isFinite(v) ? v! : 0;
-}
-
-function textFromContent(content: unknown): string[] {
-	if (typeof content === "string") return [content];
-	if (!Array.isArray(content)) return [];
-	const text: string[] = [];
-	for (const part of content) {
-		const obj = asRecord(part);
-		if (!obj) continue;
-		if (obj.type === "text" && typeof obj.text === "string") text.push(obj.text);
-		else if (typeof obj.content === "string") text.push(obj.content);
-	}
-	return text;
-}
-
-function eventText(event: unknown): string[] {
-	const obj = asRecord(event);
-	if (!obj) return [];
-	const text: string[] = [];
-	if (typeof obj.text === "string") text.push(obj.text);
-	if (typeof obj.output === "string") text.push(obj.output);
-	text.push(...textFromContent(obj.content));
-	const message = asRecord(obj.message);
-	if (message) text.push(...textFromContent(message.content));
-	return text.filter((entry) => entry.trim());
-}
-
-function numberField(obj: Record<string, unknown>, keys: string[]): number | undefined {
-	for (const key of keys) {
-		const value = obj[key];
-		if (typeof value === "number" && Number.isFinite(value)) return value;
-	}
-	return undefined;
-}
-
-function eventUsage(event: unknown): { input?: number; output?: number; turns?: number } | undefined {
-	const obj = asRecord(event);
-	if (!obj) return undefined;
-	const direct = { input: numberField(obj, ["input", "inputTokens", "input_tokens"]), output: numberField(obj, ["output", "outputTokens", "output_tokens"]), turns: numberField(obj, ["turns", "turnCount", "turn_count"]) };
-	if (Object.values(direct).some((value) => value !== undefined)) return direct;
-	for (const key of ["usage", "tokenUsage", "tokens", "stats"]) {
-		const nested = eventUsage(obj[key]);
-		if (nested) return nested;
-	}
-	const message = asRecord(obj.message);
-	return message ? eventUsage(message.usage) : undefined;
-}
-
-function previewArgs(args: unknown): string | undefined {
-	if (!args) return undefined;
-	try {
-		const text = typeof args === "string" ? args : JSON.stringify(args);
-		return text.length > 240 ? `${text.slice(0, 240)}…` : text;
-	} catch {
-		return undefined;
-	}
-}
-
-export function applyUsageToProgress(progress: CrewAgentProgress | undefined, usage: UsageState | undefined): CrewAgentProgress | undefined {
-	if (!usage) return progress;
-	const base = progress ?? emptyCrewAgentProgress();
-	const tokens = safeNum(usage.input) + safeNum(usage.output) + safeNum(usage.cacheRead) + safeNum(usage.cacheWrite);
-	return { ...base, tokens, turns: usage.turns ?? base.turns };
-}
-
-export function shouldFlushProgressEvent(event: unknown): boolean {
-	const type = asRecord(event)?.type;
-	return type === "tool_execution_start" || type === "tool_execution_end" || type === "message_end" || type === "tool_result_end";
-}
-
-export function progressEventSummary(task: TeamTaskState, event: unknown): ProgressEventSummary {
-	const type = asRecord(event)?.type;
-	return { eventType: typeof type === "string" ? type : "event", currentTool: task.agentProgress?.currentTool, toolCount: task.agentProgress?.toolCount, tokens: task.agentProgress?.tokens, turns: task.agentProgress?.turns, activityState: task.agentProgress?.activityState, lastActivityAt: task.agentProgress?.lastActivityAt };
-}
-
-export function applyAgentProgressEvent(progress: CrewAgentProgress, event: unknown, startedAt: string | undefined): CrewAgentProgress {
-	const obj = asRecord(event);
-	const now = new Date().toISOString();
-	const next: CrewAgentProgress = { ...progress, recentTools: [...progress.recentTools], recentOutput: [...progress.recentOutput], lastActivityAt: now, activityState: "active" };
-	if (startedAt) {
-		const startMs = new Date(startedAt).getTime();
-		next.durationMs = Number.isFinite(startMs) ? Date.now() - startMs : undefined;
-	}
-	if (obj?.type === "tool_execution_start") {
-		next.toolCount += 1;
-		next.currentTool = typeof obj.toolName === "string" ? obj.toolName : typeof obj.name === "string" ? obj.name : "tool";
-		next.currentToolArgs = previewArgs(obj.args);
-		next.currentToolStartedAt = now;
-	}
-	if (obj?.type === "tool_execution_end") {
-		if (next.currentTool) next.recentTools.push({ tool: next.currentTool, args: next.currentToolArgs, endedAt: now });
-		next.currentTool = undefined;
-		next.currentToolArgs = undefined;
-		next.currentToolStartedAt = undefined;
-	}
-	if ((obj?.type === "tool_execution_error" || obj?.type === "tool_execution_failed") && next.currentTool) next.failedTool = next.currentTool;
-	const usage = eventUsage(event);
-	if (usage) {
-		next.tokens = safeNum(usage.input) + safeNum(usage.output);
-		next.turns = usage.turns ?? next.turns;
-	}
-	const text = eventText(event);
-	if (text.length > 0) next.recentOutput.push(...text.flatMap((entry) => entry.split(/\r?\n/)).filter(Boolean).slice(-10));
-	if (next.recentTools.length > 25) next.recentTools.splice(0, next.recentTools.length - 25);
-	if (next.recentOutput.length > 50) next.recentOutput.splice(0, next.recentOutput.length - 50);
-	return next;
-}
+import type { UsageState } from "../../state/types.ts";
+import type { CrewAgentProgress } from "../crew-agent-runtime.ts";
+import { emptyCrewAgentProgress } from "../crew-agent-records.ts";
+import type { ProgressEventSummary } from "../progress-event-coalescer.ts";
+import type { TeamTaskState } from "../../state/types.ts";
+
+function asRecord(value: unknown): Record<string, unknown> | undefined {
+	return value && typeof value === "object" && !Array.isArray(value) ? value as Record<string, unknown> : undefined;
+}
+
+function safeNum(v: number | undefined): number {
+	return Number.isFinite(v) ? v! : 0;
+}
+
+function textFromContent(content: unknown): string[] {
+	if (typeof content === "string") return [content];
+	if (!Array.isArray(content)) return [];
+	const text: string[] = [];
+	for (const part of content) {
+		const obj = asRecord(part);
+		if (!obj) continue;
+		if (obj.type === "text" && typeof obj.text === "string") text.push(obj.text);
+		else if (typeof obj.content === "string") text.push(obj.content);
+	}
+	return text;
+}
+
+function eventText(event: unknown): string[] {
+	const obj = asRecord(event);
+	if (!obj) return [];
+	const text: string[] = [];
+	if (typeof obj.text === "string") text.push(obj.text);
+	if (typeof obj.output === "string") text.push(obj.output);
+	text.push(...textFromContent(obj.content));
+	const message = asRecord(obj.message);
+	if (message) text.push(...textFromContent(message.content));
+	return text.filter((entry) => entry.trim());
+}
+
+function numberField(obj: Record<string, unknown>, keys: string[]): number | undefined {
+	for (const key of keys) {
+		const value = obj[key];
+		if (typeof value === "number" && Number.isFinite(value)) return value;
+	}
+	return undefined;
+}
+
+function eventUsage(event: unknown): { input?: number; output?: number; turns?: number } | undefined {
+	const obj = asRecord(event);
+	if (!obj) return undefined;
+	const direct = { input: numberField(obj, ["input", "inputTokens", "input_tokens"]), output: numberField(obj, ["output", "outputTokens", "output_tokens"]), turns: numberField(obj, ["turns", "turnCount", "turn_count"]) };
+	if (Object.values(direct).some((value) => value !== undefined)) return direct;
+	for (const key of ["usage", "tokenUsage", "tokens", "stats"]) {
+		const nested = eventUsage(obj[key]);
+		if (nested) return nested;
+	}
+	const message = asRecord(obj.message);
+	return message ? eventUsage(message.usage) : undefined;
+}
+
+function previewArgs(args: unknown): string | undefined {
+	if (!args) return undefined;
+	try {
+		const text = typeof args === "string" ? args : JSON.stringify(args);
+		return text.length > 240 ? `${text.slice(0, 240)}…` : text;
+	} catch {
+		return undefined;
+	}
+}
+
+export function applyUsageToProgress(progress: CrewAgentProgress | undefined, usage: UsageState | undefined): CrewAgentProgress | undefined {
+	if (!usage) return progress;
+	const base = progress ?? emptyCrewAgentProgress();
+	const tokens = safeNum(usage.input) + safeNum(usage.output) + safeNum(usage.cacheRead) + safeNum(usage.cacheWrite);
+	return { ...base, tokens, turns: usage.turns ?? base.turns };
+}
+
+export function shouldFlushProgressEvent(event: unknown): boolean {
+	const type = asRecord(event)?.type;
+	return type === "tool_execution_start" || type === "tool_execution_end" || type === "message_end" || type === "tool_result_end";
+}
+
+export function progressEventSummary(task: TeamTaskState, event: unknown): ProgressEventSummary {
+	const type = asRecord(event)?.type;
+	return { eventType: typeof type === "string" ? type : "event", currentTool: task.agentProgress?.currentTool, toolCount: task.agentProgress?.toolCount, tokens: task.agentProgress?.tokens, turns: task.agentProgress?.turns, activityState: task.agentProgress?.activityState, lastActivityAt: task.agentProgress?.lastActivityAt };
+}
+
+export function applyAgentProgressEvent(progress: CrewAgentProgress, event: unknown, startedAt: string | undefined): CrewAgentProgress {
+	const obj = asRecord(event);
+	const now = new Date().toISOString();
+	const next: CrewAgentProgress = { ...progress, recentTools: [...progress.recentTools], recentOutput: [...progress.recentOutput], lastActivityAt: now, activityState: "active" };
+	if (startedAt) {
+		const startMs = new Date(startedAt).getTime();
+		next.durationMs = Number.isFinite(startMs) ? Date.now() - startMs : undefined;
+	}
+	if (obj?.type === "tool_execution_start") {
+		next.toolCount += 1;
+		next.currentTool = typeof obj.toolName === "string" ? obj.toolName : typeof obj.name === "string" ? obj.name : "tool";
+		next.currentToolArgs = previewArgs(obj.args);
+		next.currentToolStartedAt = now;
+	}
+	if (obj?.type === "tool_execution_end") {
+		if (next.currentTool) next.recentTools.push({ tool: next.currentTool, args: next.currentToolArgs, endedAt: now });
+		next.currentTool = undefined;
+		next.currentToolArgs = undefined;
+		next.currentToolStartedAt = undefined;
+	}
+	if ((obj?.type === "tool_execution_error" || obj?.type === "tool_execution_failed") && next.currentTool) next.failedTool = next.currentTool;
+	const usage = eventUsage(event);
+	if (usage) {
+		next.tokens = safeNum(usage.input) + safeNum(usage.output);
+		next.turns = usage.turns ?? next.turns;
+	}
+	const text = eventText(event);
+	if (text.length > 0) next.recentOutput.push(...text.flatMap((entry) => entry.split(/\r?\n/)).filter(Boolean).slice(-10));
+	if (next.recentTools.length > 25) next.recentTools.splice(0, next.recentTools.length - 25);
+	if (next.recentOutput.length > 50) next.recentOutput.splice(0, next.recentOutput.length - 50);
+	return next;
+}

package/src/runtime/task-runner/prompt-pipeline.ts

@@ -1,64 +1,64 @@
-import * as path from "node:path";
-import type { ArtifactDescriptor } from "../../state/types.ts";
-
-export type WorkerPromptPipelineStageName =
-	| "task-packet-built"
-	| "dependency-context-collected"
-	| "skills-rendered-or-disabled"
-	| "capability-inventory-recorded"
-	| "coordination-bridge-attached"
-	| "prompt-rendered"
-	| "prompt-artifact-written";
-
-export interface WorkerPromptPipelineStage {
-	name: WorkerPromptPipelineStageName;
-	references: string[];
-	details?: Record<string, string | number | boolean>;
-}
-
-export interface WorkerPromptPipelineArtifact {
-	schemaVersion: 1;
-	taskId: string;
-	stages: WorkerPromptPipelineStage[];
-}
-
-function artifactReference(artifactsRoot: string, artifact?: ArtifactDescriptor): string | undefined {
-	if (!artifact) return undefined;
-	const root = path.resolve(artifactsRoot);
-	const target = path.resolve(artifact.path);
-	const relative = path.relative(root, target);
-	if (!relative || relative.startsWith("..") || path.isAbsolute(relative)) return undefined;
-	return relative.replaceAll("\\", "/");
-}
-
-export interface BuildWorkerPromptPipelineInput {
-	artifactsRoot: string;
-	taskId: string;
-	promptArtifact: ArtifactDescriptor;
-	inputsArtifact: ArtifactDescriptor;
-	skillArtifact?: ArtifactDescriptor;
-	capabilityArtifact: ArtifactDescriptor;
-	coordinationArtifact: ArtifactDescriptor;
-	skillInstructionCount: number;
-	skillsDisabled: boolean;
-}
-
-export function buildWorkerPromptPipeline(input: BuildWorkerPromptPipelineInput): WorkerPromptPipelineArtifact {
-	return {
-		schemaVersion: 1,
-		taskId: input.taskId,
-		stages: [
-			{ name: "task-packet-built", references: [`metadata/${input.taskId}.task-packet.json`] },
-			{ name: "dependency-context-collected", references: [artifactReference(input.artifactsRoot, input.inputsArtifact) ?? `metadata/${input.taskId}.inputs.json`] },
-			{
-				name: "skills-rendered-or-disabled",
-				references: input.skillArtifact ? [artifactReference(input.artifactsRoot, input.skillArtifact) ?? `metadata/${input.taskId}.skills.md`] : [],
-				details: { disabled: input.skillsDisabled, skillInstructionCount: input.skillInstructionCount },
-			},
-			{ name: "capability-inventory-recorded", references: [artifactReference(input.artifactsRoot, input.capabilityArtifact) ?? `metadata/${input.taskId}.capabilities.json`] },
-			{ name: "coordination-bridge-attached", references: [artifactReference(input.artifactsRoot, input.coordinationArtifact) ?? `metadata/${input.taskId}.coordination-bridge.md`] },
-			{ name: "prompt-rendered", references: [] },
-			{ name: "prompt-artifact-written", references: [artifactReference(input.artifactsRoot, input.promptArtifact) ?? `prompts/${input.taskId}.md`] },
-		],
-	};
-}
+import * as path from "node:path";
+import type { ArtifactDescriptor } from "../../state/types.ts";
+
+export type WorkerPromptPipelineStageName =
+	| "task-packet-built"
+	| "dependency-context-collected"
+	| "skills-rendered-or-disabled"
+	| "capability-inventory-recorded"
+	| "coordination-bridge-attached"
+	| "prompt-rendered"
+	| "prompt-artifact-written";
+
+export interface WorkerPromptPipelineStage {
+	name: WorkerPromptPipelineStageName;
+	references: string[];
+	details?: Record<string, string | number | boolean>;
+}
+
+export interface WorkerPromptPipelineArtifact {
+	schemaVersion: 1;
+	taskId: string;
+	stages: WorkerPromptPipelineStage[];
+}
+
+function artifactReference(artifactsRoot: string, artifact?: ArtifactDescriptor): string | undefined {
+	if (!artifact) return undefined;
+	const root = path.resolve(artifactsRoot);
+	const target = path.resolve(artifact.path);
+	const relative = path.relative(root, target);
+	if (!relative || relative.startsWith("..") || path.isAbsolute(relative)) return undefined;
+	return relative.replaceAll("\\", "/");
+}
+
+export interface BuildWorkerPromptPipelineInput {
+	artifactsRoot: string;
+	taskId: string;
+	promptArtifact: ArtifactDescriptor;
+	inputsArtifact: ArtifactDescriptor;
+	skillArtifact?: ArtifactDescriptor;
+	capabilityArtifact: ArtifactDescriptor;
+	coordinationArtifact: ArtifactDescriptor;
+	skillInstructionCount: number;
+	skillsDisabled: boolean;
+}
+
+export function buildWorkerPromptPipeline(input: BuildWorkerPromptPipelineInput): WorkerPromptPipelineArtifact {
+	return {
+		schemaVersion: 1,
+		taskId: input.taskId,
+		stages: [
+			{ name: "task-packet-built", references: [`metadata/${input.taskId}.task-packet.json`] },
+			{ name: "dependency-context-collected", references: [artifactReference(input.artifactsRoot, input.inputsArtifact) ?? `metadata/${input.taskId}.inputs.json`] },
+			{
+				name: "skills-rendered-or-disabled",
+				references: input.skillArtifact ? [artifactReference(input.artifactsRoot, input.skillArtifact) ?? `metadata/${input.taskId}.skills.md`] : [],
+				details: { disabled: input.skillsDisabled, skillInstructionCount: input.skillInstructionCount },
+			},
+			{ name: "capability-inventory-recorded", references: [artifactReference(input.artifactsRoot, input.capabilityArtifact) ?? `metadata/${input.taskId}.capabilities.json`] },
+			{ name: "coordination-bridge-attached", references: [artifactReference(input.artifactsRoot, input.coordinationArtifact) ?? `metadata/${input.taskId}.coordination-bridge.md`] },
+			{ name: "prompt-rendered", references: [] },
+			{ name: "prompt-artifact-written", references: [artifactReference(input.artifactsRoot, input.promptArtifact) ?? `prompts/${input.taskId}.md`] },
+		],
+	};
+}

package/src/runtime/task-runner/result-utils.ts

@@ -1,14 +1,14 @@
-export function cleanResultText(text: string | undefined): string | undefined {
-	const trimmed = text?.trim();
-	if (!trimmed) return undefined;
-	const doneIndex = trimmed.lastIndexOf("\nDONE\n");
-	if (doneIndex >= 0) return trimmed.slice(doneIndex + 1).trim();
-	if (trimmed === "DONE" || trimmed.startsWith("DONE\n")) return trimmed;
-	const fencedPromptIndex = trimmed.lastIndexOf("</file>");
-	if (fencedPromptIndex >= 0 && fencedPromptIndex < trimmed.length - 7) return trimmed.slice(fencedPromptIndex + 7).trim() || trimmed;
-	return trimmed;
-}
-
-export function isFinalChildEvent(event: unknown): boolean {
-	return Boolean(event && typeof event === "object" && !Array.isArray(event) && (event as Record<string, unknown>).type === "message_end");
-}
+export function cleanResultText(text: string | undefined): string | undefined {
+	const trimmed = text?.trim();
+	if (!trimmed) return undefined;
+	const doneIndex = trimmed.lastIndexOf("\nDONE\n");
+	if (doneIndex >= 0) return trimmed.slice(doneIndex + 1).trim();
+	if (trimmed === "DONE" || trimmed.startsWith("DONE\n")) return trimmed;
+	const fencedPromptIndex = trimmed.lastIndexOf("</file>");
+	if (fencedPromptIndex >= 0 && fencedPromptIndex < trimmed.length - 7) return trimmed.slice(fencedPromptIndex + 7).trim() || trimmed;
+	return trimmed;
+}
+
+export function isFinalChildEvent(event: unknown): boolean {
+	return Boolean(event && typeof event === "object" && !Array.isArray(event) && (event as Record<string, unknown>).type === "message_end");
+}