@oh-my-pi/pi-coding-agent 14.3.0 → 14.4.1

package/src/prompts/tools/patch.md

@@ -50,25 +50,18 @@ Returns success/failure; on failure, error message indicates:
 - **NEVER** use edit to fix indentation, whitespace, or reformat code. Formatting is a single command run once at the end (`bun fmt`, `cargo fmt`, `prettier —write`, etc.)—not N individual edits. If you see inconsistent indentation after an edit, leave it; the formatter will fix all of it in one pass.
 </critical>
 
-<example name="create">
-edit {"edits":[{"path":"hello.txt","op":"create","diff":"Hello\n"}]}
-</example>
-
-<example name="update">
-edit {"edits":[{"path":"src/app.py","op":"update","diff":"@@ def greet():\n def greet():\n-print('Hi')\n+print('Hello')\n"}]}
-</example>
-
-<example name="rename">
-edit {"edits":[{"path":"src/app.py","op":"update","rename":"src/main.py","diff":"@@\n …\n"}]}
-</example>
-
-<example name="delete">
-edit {"edits":[{"path":"obsolete.txt","op":"delete"}]}
-</example>
-
-<example name="multi-file">
-edit {"edits":[{"path":"src/types.ts","op":"update","diff":"@@\n-old\n+new\n"},{"path":"src/index.ts","op":"update","diff":"@@\n-old\n+new\n"}]}
-</example>
+<examples>
+# Create
+`edit {"edits":[{"path":"hello.txt","op":"create","diff":"Hello\n"}]}`
+# Update
+`edit {"edits":[{"path":"src/app.py","op":"update","diff":"@@ def greet():\n def greet():\n-print('Hi')\n+print('Hello')\n"}]}`
+# Rename
+`edit {"edits":[{"path":"src/app.py","op":"update","rename":"src/main.py","diff":"@@\n …\n"}]}`
+# Delete
+`edit {"edits":[{"path":"obsolete.txt","op":"delete"}]}`
+# Multi-file
+`edit {"edits":[{"path":"src/types.ts","op":"update","diff":"@@\n-old\n+new\n"},{"path":"src/index.ts","op":"update","diff":"@@\n-old\n+new\n"}]}`
+</examples>
 
 <avoid>
 - Generic anchors: `import`, `export`, `describe`, `function`, `const`

package/src/prompts/tools/python.md

@@ -44,7 +44,8 @@ User sees output like Jupyter notebook; rich displays render fully:
 - You **MUST** use `run()` for shell commands; you **MUST NOT** use raw `subprocess`
 </critical>
 
-<example name="multiple small cells">
+<examples>
+# Multiple small cells
 ```python
 cells: [
     {"title": "imports", "code": "import json\nfrom pathlib import Path"},
@@ -53,4 +54,4 @@ cells: [
     {"title": "use helper", "code": "configs = [parse_config(p) for p in Path('.').glob('*.json')]"}
 ]
 ```
-</example>
+</examples>

package/src/prompts/tools/read-chunk.md

@@ -2,7 +2,6 @@ Reads files using syntax-aware chunks. Also inspects directories, archives, SQLi
 
 <instruction>
 The chunk-aware `read` variant returns AST-scoped chunks with current checksum IDs for structural editing, and otherwise behaves like `open` for non-code content.
-
 - You **MUST** parallelize calls when exploring related files
 - For URLs, `read` fetches the page and returns clean extracted text/markdown by default (reader-mode). It handles HTML pages, GitHub issues/PRs, Stack Overflow, Wikipedia, Reddit, NPM, arXiv, RSS/Atom, JSON endpoints, PDFs, etc. You **SHOULD** reach for `read` — not a browser/puppeteer tool — for fetching and inspecting web content.
 
@@ -17,7 +16,7 @@ The chunk-aware `read` variant returns AST-scoped chunks with current checksum I
 |---|---|
 |*(omitted)*|Read full file as chunks (up to {{DEFAULT_LIMIT}} lines)|
 |`class_Foo`|Read a specific chunk|
-|`class_Foo.fn_bar#ABCD~`|Read a chunk region (body `~` / head `^`) by ID|
+|`class_Foo.fn_bar#thth~`|Read a chunk region (body `~` / head `^`) by ID|
 |`?`|List all chunk paths with IDs|
 |`L50`|Read from line 50 onward (shorthand for L50 to EOF)|
 |`L50-L120`|Read lines 50 through 120|
@@ -27,7 +26,7 @@ The chunk-aware `read` variant returns AST-scoped chunks with current checksum I
 Max {{DEFAULT_MAX_LINES}} lines per call.
 
 # Chunks
-Each anchor `@full.chunk.path#CCCC` (with `-` prefixes for nesting depth) in the output identifies a chunk. Use `full.chunk.path#CCCC` as-is to read truncated chunks.
+Each anchor `@full.chunk.path#thth` (with `-` prefixes for nesting depth) in the output identifies a chunk. Use `full.chunk.path#thth` as-is to read truncated chunks.
 If you need a canonical target list, run `read(path="file", sel="?")`. That listing shows chunk paths with IDs and is the safest structural discovery mode. Summary lines in this listing are orientation hints; follow a selector with `read(path="file", sel="chunk#ID")` or use `raw` when you need exact source.
 Line numbers in the gutter are absolute file line numbers.
 

package/src/prompts/tools/read.md

@@ -18,13 +18,13 @@ The `read` tool is multi-purpose and more capable than it looks — inspects fil
 |`L50`|Read from line 50 onward (shorthand for L50 to EOF)|
 |`L50-L120`|Read lines 50 through 120|
 |`L20-L20`|Read exactly one line|
-|`raw`|Raw content without transformations (for URLs: untouched HTML)|
+|`raw`|Skip line-numbering / hashline / chunking; return file content as plain text. For URLs: untouched HTML.|
 
 Max {{DEFAULT_MAX_LINES}} lines per call.
 
 # Filesystem
 {{#if IS_HASHLINE_MODE}}
-- Reading from FS returns lines prefixed with anchors: `41#ZZ:def alpha():`
+- Reading from FS returns lines prefixed with anchors: `41th|def alpha():` (line number, 2-letter ID, pipe, then content)
 {{else}}
 {{#if IS_LINE_NUMBER_MODE}}
 - Reading from FS returns lines prefixed with line numbers: `41:def alpha():`

package/src/prompts/tools/ssh.md

@@ -25,20 +25,11 @@ You **MUST** build commands from the reference below
 You **MUST** verify the shell type from "Available hosts" and use matching commands.
 </critical>
 
-<example name="linux">
-Task: List /home/user files on "server1"
-Host: server1 (10.0.0.1) | linux/bash
-Command: `ls -la /home/user`
-</example>
-
-<example name="windows-cmd">
-Task: Show running processes on "winbox"
-Host: winbox (192.168.1.5) | windows/cmd
-Command: `tasklist /v`
-</example>
-
-<example name="macos">
-Task: Get system info on "macbook"
-Host: macbook (10.0.0.20) | macos/zsh
-Command: `uname -a && sw_vers`
-</example>
+<examples>
+# List files: Linux
+Host: server1 (10.0.0.1) | linux/bash. Command: `ls -la /home/user`
+# Show running processes: Windows cmd
+Host: winbox (192.168.1.5) | windows/cmd. Command: `tasklist /v`
+# Get system info: macOS
+Host: macbook (10.0.0.20) | macos/zsh. Command: `uname -a && sw_vers`
+</examples>

package/src/prompts/tools/todo-write.md

@@ -1,28 +1,53 @@
-Manages a phased task list. Each field is a verb — set the ones you need in a single call.
+Manages a phased task list through an `ops` array of flat operations.
 The next pending task is auto-promoted to `in_progress` after completing the current one.
 
 <protocol>
-## Fields
+## Shape
+
+Pass an object with an `ops` array:
+
+```ts
+{
+  ops: [
+    { op: "replace", phases: [...] },
+    { op: "start", task: "task-3" },
+    { op: "done", phase: "Implementation" },
+    { op: "rm" },
+    { op: "drop", task: "task-9" },
+    { op: "append", phase: "Implementation", items: [{ id: "task-10", label: "Run tests" }] },
+  ],
+}
+```
+
+## Operation fields
 
 |Field|Type|When to use|
 |---|---|---|
-|`phases`|Phase[]|Initial setup, or full restructure when the plan changes significantly|
-|`complete`|string[]|Mark tasks done|
-|`start`|string|Jump to a specific task out of order|
-|`abandon`|string[]|Drop tasks intentionally|
-|`remove`|string[]|Remove tasks that are no longer relevant|
-|`add_notes`|{id, notes}[]|Append runtime observations to tasks|
-|`add_tasks`|{phase, content, details?}[]|Add tasks to a phase (by name or ID)|
-|`add_phase`|{name, tasks?}|Add a new phase of work discovered mid-task|
+|`op`|string|Required. One of `replace`, `start`, `done`, `rm`, `drop`, `append`|
+|`task`|string|Task id for `start`, or a task target for `done` / `rm` / `drop`|
+|`phase`|string|Phase target for `done` / `rm` / `drop`, or append destination for `append`|
+|`items`|{id, label}[]|Required for `append`. If the phase does not exist, it is created at the end|
+|`phases`|Phase[]|Only for `replace`. Keeps initial phased setup available for harness bootstrap and full restructures|
+
+## Semantics
+- `start`: requires `task`; sets that task to `in_progress`
+- `done`: marks one task, one phase, or all tasks completed
+- `rm`: removes one task, one phase's tasks, or all tasks
+- `drop`: marks one task, one phase, or all tasks abandoned
+- `append`: appends `items` to `phase`; creates the phase if missing
+- `replace`: replaces the full todo list
+
+If `done`, `rm`, or `drop` omits both `task` and `phase`, it applies to all tasks.
 
 ## Task Anatomy
-- `content`: Short label (5-10 words). What is being done, not how.
-- `details`: File paths, implementation steps, edge cases. Shown only when the task is active.
+- `label`: Short label (5-10 words). What is being done, not how.
+- `replace` task `content` should stay short and specific.
 
 ## Rules
-- Mark tasks completed immediately after finishing — never defer
-- Complete phases in order — do not skip ahead while earlier ones are pending
-- On blockers: add a new task describing the blocker
+- Mark tasks done immediately after finishing — never defer.
+- Complete phases in order — do not skip ahead while earlier ones are pending.
+- On blockers, append a new task to the active phase.
+- Keep ids stable once introduced.
 </protocol>
 
 <conditions>
@@ -33,32 +58,20 @@ Create a todo list when:
 4. New instructions arrive mid-task — capture before proceeding
 </conditions>
 
-<example name="initial-setup">
-{phases: [
-  {name: "Investigation", tasks: [{content: "Read source"}, {content: "Map callsites"}]},
-  {name: "Implementation", tasks: [{content: "Apply fix", details: "Update parser.ts to handle edge case in line 42"}, {content: "Run tests"}]}
-]}
-</example>
-
-<example name="complete">
-{complete: ["task-2", "task-3"]}
-</example>
-
-<example name="add-notes">
-{add_notes: [{id: "task-3", notes: "Found edge case in parser — needs null check"}]}
-</example>
-
-<example name="add-task">
-{add_tasks: [{phase: "Implementation", content: "Handle retries", details: "Cap exponential backoff in retry.ts"}]}
-</example>
-
-<example name="add-phase">
-{add_phase: {name: "Cleanup", tasks: [{content: "Remove dead code"}]}}
-</example>
-
-<example name="combined">
-{complete: ["task-2"], add_notes: [{id: "task-3", notes: "Needs extra validation"}]}
-</example>
+<examples>
+# Initial setup
+`{"ops":[{"op":"replace","phases":[{"name":"Investigation","tasks":[{"content":"Read source"},{"content":"Map callsites"}]},{"name":"Implementation","tasks":[{"content":"Apply fix"},{"content":"Run tests"}]}]}]}`
+# Complete one task
+`{"ops":[{"op":"done","task":"task-2"}]}`
+# Complete a whole phase
+`{"ops":[{"op":"done","phase":"Implementation"}]}`
+# Remove all tasks
+`{"ops":[{"op":"rm"}]}`
+# Drop one task
+`{"ops":[{"op":"drop","task":"task-7"}]}`
+# Append tasks to a phase
+`{"ops":[{"op":"append","phase":"Implementation","items":[{"id":"task-8","label":"Handle retries"},{"id":"task-9","label":"Run tests"}]}]}`
+</examples>
 
 <avoid>
 - Single-step tasks — act directly

package/src/sdk.ts

@@ -128,7 +128,7 @@ import {
 	warmupLspServers,
 } from "./tools";
 import { ToolContextStore } from "./tools/context";
-import { getGeminiImageTools } from "./tools/gemini-image";
+import { getImageGenTools } from "./tools/image-gen";
 import { wrapToolWithMetaNotice } from "./tools/output-meta";
 import { queueResolveHandler } from "./tools/resolve";
 import { EventBus } from "./utils/event-bus";
@@ -209,8 +209,8 @@ export interface CreateAgentSessionOptions {
 
 	/** Output schema for structured completion (subagents) */
 	outputSchema?: unknown;
-	/** Whether to include the submit_result tool by default */
-	requireSubmitResultTool?: boolean;
+	/** Whether to include the yield tool by default */
+	requireYieldTool?: boolean;
 	/** Task recursion depth (for subagent sessions). Default: 0 */
 	taskDepth?: number;
 	/** Parent task ID prefix for nested artifact naming (e.g., "6-Extensions") */
@@ -673,7 +673,12 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	}
 
 	const imageProvider = settings.get("providers.image");
-	if (imageProvider === "auto" || imageProvider === "gemini" || imageProvider === "openrouter") {
+	if (
+		imageProvider === "auto" ||
+		imageProvider === "openai" ||
+		imageProvider === "gemini" ||
+		imageProvider === "openrouter"
+	) {
 		setPreferredImageProvider(imageProvider);
 	}
 
@@ -916,7 +921,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			skills,
 			eventBus,
 			outputSchema: options.outputSchema,
-			requireSubmitResultTool: options.requireSubmitResultTool,
+			requireYieldTool: options.requireYieldTool,
 			taskDepth: options.taskDepth ?? 0,
 			getSessionFile: () => sessionManager.getSessionFile() ?? null,
 			getPythonKernelOwnerId: () => pythonKernelOwnerId,
@@ -1047,10 +1052,10 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		}
 		toolSession.mcpManager = mcpManager;
 
-		// Add Gemini image tools if GEMINI_API_KEY (or GOOGLE_API_KEY) is available
-		const geminiImageTools = await logger.time("getGeminiImageTools", getGeminiImageTools);
-		if (geminiImageTools.length > 0) {
-			customTools.push(...(geminiImageTools as unknown as CustomTool[]));
+		// Add image tools when the active model or configured image providers can generate images.
+		const imageGenTools = await logger.time("getImageGenTools", () => getImageGenTools(modelRegistry, model));
+		if (imageGenTools.length > 0) {
+			customTools.push(...(imageGenTools as unknown as CustomTool[]));
 		}
 
 		// Add web search tools

package/src/session/agent-session.ts

@@ -525,6 +525,7 @@ export class AgentSession {
 	#obfuscator: SecretObfuscator | undefined;
 	#checkpointState: CheckpointState | undefined = undefined;
 	#pendingRewindReport: string | undefined = undefined;
+	#lastSuccessfulYieldToolCallId: string | undefined = undefined;
 	#promptGeneration = 0;
 	#providerSessionState = new Map<string, ProviderSessionState>();
 
@@ -789,6 +790,9 @@ export class AgentSession {
 				this.#toolChoiceQueue.resolve();
 			}
 		}
+		if (event.type === "tool_execution_end" && event.toolName === "yield" && !event.isError) {
+			this.#lastSuccessfulYieldToolCallId = event.toolCallId;
+		}
 		if (event.type === "turn_end" && this.#pendingRewindReport) {
 			const report = this.#pendingRewindReport;
 			this.#pendingRewindReport = undefined;
@@ -1026,7 +1030,10 @@ export class AgentSession {
 				.find((message): message is AssistantMessage => message.role === "assistant");
 			const msg = this.#lastAssistantMessage ?? fallbackAssistant;
 			this.#lastAssistantMessage = undefined;
-			if (!msg) return;
+			if (!msg) {
+				this.#lastSuccessfulYieldToolCallId = undefined;
+				return;
+			}
 
 			// Invalidate GitHub Copilot credentials on auth failure so stale tokens
 			// aren't reused on the next request
@@ -1040,8 +1047,15 @@ export class AgentSession {
 
 			if (this.#skipPostTurnMaintenanceAssistantTimestamp === msg.timestamp) {
 				this.#skipPostTurnMaintenanceAssistantTimestamp = undefined;
+				this.#lastSuccessfulYieldToolCallId = undefined;
+				return;
+			}
+
+			if (this.#assistantEndedWithSuccessfulYield(msg)) {
+				this.#lastSuccessfulYieldToolCallId = undefined;
 				return;
 			}
+			this.#lastSuccessfulYieldToolCallId = undefined;
 
 			// Check for retryable errors first (overloaded, rate limit, server errors)
 			if (this.#isRetryableError(msg)) {
@@ -3227,7 +3241,6 @@ export class AgentSession {
 				id: task.id,
 				content: task.content,
 				status: task.status,
-				notes: task.notes,
 			})),
 		}));
 	}
@@ -4230,6 +4243,16 @@ export class AgentSession {
 			}
 		}
 	}
+	#assistantEndedWithSuccessfulYield(assistantMessage: AssistantMessage): boolean {
+		const toolCallId = this.#lastSuccessfulYieldToolCallId;
+		if (!toolCallId) return false;
+		const lastToolCall = assistantMessage.content
+			.slice()
+			.reverse()
+			.find((content): content is ToolCall => content.type === "toolCall");
+		return lastToolCall?.name === "yield" && lastToolCall.id === toolCallId;
+	}
+
 	#enforceRewindBeforeYield(): boolean {
 		if (!this.#checkpointState || this.#pendingRewindReport) {
 			return false;

package/src/session/session-manager.ts

@@ -259,6 +259,8 @@ export interface SessionInfo {
 	created: Date;
 	modified: Date;
 	messageCount: number;
+	/** File size in bytes on disk; used for compact list rendering. */
+	size: number;
 	firstMessage: string;
 	allMessagesText: string;
 }
@@ -1264,7 +1266,7 @@ function extractTextFromContent(content: Message["content"]): string {
 		.join(" ");
 }
 
-const SESSION_LIST_PREFIX_BYTES = 1024;
+const SESSION_LIST_PREFIX_BYTES = 4096;
 const SESSION_LIST_PARALLEL_THRESHOLD = 64;
 const SESSION_LIST_MAX_WORKERS = 16;
 const sessionListPrefixDecoder = new TextDecoder("utf-8", { fatal: false });
@@ -1466,6 +1468,7 @@ async function collectSessionFromFile(
 			created: new Date(header.timestamp ?? ""),
 			modified: stats.mtime,
 			messageCount,
+			size: stats.size,
 			firstMessage: firstMessage || "(no messages)",
 			allMessagesText: allMessages.length > 0 ? allMessages.join(" ") : firstMessage,
 		};

package/src/task/executor.ts

@@ -18,8 +18,8 @@ import { runExtensionCompact, runExtensionSetModel } from "../extensibility/exte
 import type { Skill } from "../extensibility/skills";
 import { callTool } from "../mcp/client";
 import type { MCPManager } from "../mcp/manager";
-import submitReminderTemplate from "../prompts/system/subagent-submit-reminder.md" with { type: "text" };
 import subagentSystemPromptTemplate from "../prompts/system/subagent-system-prompt.md" with { type: "text" };
+import submitReminderTemplate from "../prompts/system/subagent-yield-reminder.md" with { type: "text" };
 import { createAgentSession, discoverAuthStorage } from "../sdk";
 import type { AgentSession, AgentSessionEvent } from "../session/agent-session";
 import type { AuthStorage } from "../session/auth-storage";
@@ -223,7 +223,7 @@ function resolveFallbackCompletion(rawOutput: string, outputSchema: unknown): {
 	return { data: candidate };
 }
 
-export interface SubmitResultItem {
+export interface YieldItem {
 	data?: unknown;
 	status?: "success" | "aborted";
 	error?: string;
@@ -235,7 +235,7 @@ interface FinalizeSubprocessOutputArgs {
 	stderr: string;
 	doneAborted: boolean;
 	signalAborted: boolean;
-	submitResultItems?: SubmitResultItem[];
+	yieldItems?: YieldItem[];
 	reportFindings?: ReviewFinding[];
 	outputSchema: unknown;
 }
@@ -244,44 +244,42 @@ interface FinalizeSubprocessOutputResult {
 	rawOutput: string;
 	exitCode: number;
 	stderr: string;
-	abortedViaSubmitResult: boolean;
-	hasSubmitResult: boolean;
+	abortedViaYield: boolean;
+	hasYield: boolean;
 }
 
-export const SUBAGENT_WARNING_NULL_SUBMIT_RESULT = "SYSTEM WARNING: Subagent called submit_result with null data.";
-export const SUBAGENT_WARNING_MISSING_SUBMIT_RESULT =
-	"SYSTEM WARNING: Subagent exited without calling submit_result tool after 3 reminders.";
+export const SUBAGENT_WARNING_NULL_YIELD = "SYSTEM WARNING: Subagent called yield with null data.";
+export const SUBAGENT_WARNING_MISSING_YIELD =
+	"SYSTEM WARNING: Subagent exited without calling yield tool after 3 reminders.";
 
 export function finalizeSubprocessOutput(args: FinalizeSubprocessOutputArgs): FinalizeSubprocessOutputResult {
 	let { rawOutput, exitCode, stderr } = args;
-	const { submitResultItems, reportFindings, doneAborted, signalAborted, outputSchema } = args;
-	let abortedViaSubmitResult = false;
-	const hasSubmitResult = Array.isArray(submitResultItems) && submitResultItems.length > 0;
-
-	if (hasSubmitResult) {
-		const lastSubmitResult = submitResultItems[submitResultItems.length - 1];
-		if (lastSubmitResult?.status === "aborted") {
-			abortedViaSubmitResult = true;
+	const { yieldItems, reportFindings, doneAborted, signalAborted, outputSchema } = args;
+	let abortedViaYield = false;
+	const hasYield = Array.isArray(yieldItems) && yieldItems.length > 0;
+
+	if (hasYield) {
+		const lastYield = yieldItems[yieldItems.length - 1];
+		if (lastYield?.status === "aborted") {
+			abortedViaYield = true;
 			exitCode = 0;
-			stderr = lastSubmitResult.error || "Subagent aborted task";
+			stderr = lastYield.error || "Subagent aborted task";
 			try {
-				rawOutput = JSON.stringify({ aborted: true, error: lastSubmitResult.error }, null, 2);
+				rawOutput = JSON.stringify({ aborted: true, error: lastYield.error }, null, 2);
 			} catch {
-				rawOutput = `{"aborted":true,"error":"${lastSubmitResult.error || "Unknown error"}"}`;
+				rawOutput = `{"aborted":true,"error":"${lastYield.error || "Unknown error"}"}`;
 			}
 		} else {
-			const submitData = lastSubmitResult?.data;
+			const submitData = lastYield?.data;
 			if (submitData === null || submitData === undefined) {
-				rawOutput = rawOutput
-					? `${SUBAGENT_WARNING_NULL_SUBMIT_RESULT}\n\n${rawOutput}`
-					: SUBAGENT_WARNING_NULL_SUBMIT_RESULT;
+				rawOutput = rawOutput ? `${SUBAGENT_WARNING_NULL_YIELD}\n\n${rawOutput}` : SUBAGENT_WARNING_NULL_YIELD;
 			} else {
 				const completeData = normalizeCompleteData(submitData, reportFindings);
 				try {
 					rawOutput = JSON.stringify(completeData, null, 2) ?? "null";
 				} catch (err) {
 					const errorMessage = err instanceof Error ? err.message : String(err);
-					rawOutput = `{"error":"Failed to serialize submit_result data: ${errorMessage}"}`;
+					rawOutput = `{"error":"Failed to serialize yield data: ${errorMessage}"}`;
 				}
 				exitCode = 0;
 				stderr = "";
@@ -307,17 +305,15 @@ export function finalizeSubprocessOutput(args: FinalizeSubprocessOutputArgs): Fi
 			stderr = "";
 		} else if (exitCode === 0) {
 			const hasRawOutput = rawOutput.trim().length > 0;
-			rawOutput = rawOutput
-				? `${SUBAGENT_WARNING_MISSING_SUBMIT_RESULT}\n\n${rawOutput}`
-				: SUBAGENT_WARNING_MISSING_SUBMIT_RESULT;
+			rawOutput = rawOutput ? `${SUBAGENT_WARNING_MISSING_YIELD}\n\n${rawOutput}` : SUBAGENT_WARNING_MISSING_YIELD;
 			if (hasOutputSchema || !hasRawOutput) {
 				exitCode = 1;
-				stderr = SUBAGENT_WARNING_MISSING_SUBMIT_RESULT;
+				stderr = SUBAGENT_WARNING_MISSING_YIELD;
 			}
 		}
 	}
 
-	return { rawOutput, exitCode, stderr, abortedViaSubmitResult, hasSubmitResult };
+	return { rawOutput, exitCode, stderr, abortedViaYield, hasYield };
 }
 
 /**
@@ -564,7 +560,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 	const abortSignal = abortController.signal;
 	let activeSession: AgentSession | null = null;
 	let unsubscribe: (() => void) | null = null;
-	let submitResultCalled = false;
+	let yieldCalled = false;
 
 	// Accumulate usage incrementally from message_end events (no memory for streaming events)
 	const accumulatedUsage = {
@@ -789,8 +785,8 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 								existing.push(data);
 							}
 							progress.extractedToolData[event.toolName] = existing;
-							if (event.toolName === "submit_result") {
-								submitResultCalled = true;
+							if (event.toolName === "yield") {
+								yieldCalled = true;
 							}
 						}
 					}
@@ -955,7 +951,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 				thinkingLevel: effectiveThinkingLevel,
 				toolNames,
 				outputSchema,
-				requireSubmitResultTool: true,
+				requireYieldTool: true,
 				contextFiles: options.contextFiles,
 				skills: options.skills,
 				promptTemplates: options.promptTemplates,
@@ -1070,7 +1066,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 				await extensionRunner.emit({ type: "session_start" });
 			}
 
-			const MAX_SUBMIT_RESULT_RETRIES = 3;
+			const MAX_YIELD_RETRIES = 3;
 			unsubscribe = session.subscribe(event => {
 				if (isAgentEvent(event)) {
 					try {
@@ -1087,15 +1083,15 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 			await session.prompt(task, { attribution: "agent" });
 			await session.waitForIdle();
 
-			const reminderToolChoice = buildNamedToolChoice("submit_result", session.model);
+			const reminderToolChoice = buildNamedToolChoice("yield", session.model);
 
 			let retryCount = 0;
-			while (!submitResultCalled && retryCount < MAX_SUBMIT_RESULT_RETRIES && !abortSignal.aborted) {
+			while (!yieldCalled && retryCount < MAX_YIELD_RETRIES && !abortSignal.aborted) {
 				try {
 					retryCount++;
 					const reminder = prompt.render(submitReminderTemplate, {
 						retryCount,
-						maxRetries: MAX_SUBMIT_RESULT_RETRIES,
+						maxRetries: MAX_YIELD_RETRIES,
 					});
 
 					await session.prompt(reminder, {
@@ -1111,7 +1107,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 			}
 
 			await session.waitForIdle();
-			if (!submitResultCalled && !abortSignal.aborted) {
+			if (!yieldCalled && !abortSignal.aborted) {
 				exitCode = 0;
 			}
 
@@ -1186,7 +1182,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 
 	// Use final output if available, otherwise accumulated output
 	let rawOutput = finalOutputChunks.length > 0 ? finalOutputChunks.join("") : outputChunks.join("");
-	const submitResultItems = progress.extractedToolData?.submit_result as SubmitResultItem[] | undefined;
+	const yieldItems = progress.extractedToolData?.yield as YieldItem[] | undefined;
 	const reportFindings = progress.extractedToolData?.report_finding as ReviewFinding[] | undefined;
 	const finalized = finalizeSubprocessOutput({
 		rawOutput,
@@ -1194,17 +1190,16 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 		stderr,
 		doneAborted: Boolean(done.aborted),
 		signalAborted: Boolean(signal?.aborted),
-		submitResultItems,
+		yieldItems,
 		reportFindings,
 		outputSchema,
 	});
 	rawOutput = finalized.rawOutput;
 	exitCode = finalized.exitCode;
 	stderr = finalized.stderr;
-	const lastSubmitResult = submitResultItems?.[submitResultItems.length - 1];
-	const submitResultAbortReason =
-		lastSubmitResult?.status === "aborted" ? lastSubmitResult.error || "Subagent aborted task" : undefined;
-	const { abortedViaSubmitResult, hasSubmitResult } = finalized;
+	const lastYield = yieldItems?.[yieldItems.length - 1];
+	const yieldAbortReason = lastYield?.status === "aborted" ? lastYield.error || "Subagent aborted task" : undefined;
+	const { abortedViaYield, hasYield } = finalized;
 	const { content: truncatedOutput, truncated } = truncateTail(rawOutput, {
 		maxBytes: MAX_OUTPUT_BYTES,
 		maxLines: MAX_OUTPUT_LINES,
@@ -1228,16 +1223,16 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 	}
 
 	// Update final progress
-	const wasAborted = abortedViaSubmitResult || (!hasSubmitResult && (done.aborted || signal?.aborted || false));
+	const wasAborted = abortedViaYield || (!hasYield && (done.aborted || signal?.aborted || false));
 	const finalAbortReason = wasAborted
-		? abortedViaSubmitResult
-			? submitResultAbortReason
+		? abortedViaYield
+			? yieldAbortReason
 			: (done.abortReason ?? (signal?.aborted ? resolveSignalAbortReason() : "Subagent aborted task"))
 		: undefined;
 	progress.status = wasAborted ? "aborted" : exitCode === 0 ? "completed" : "failed";
 	scheduleProgress(true);
 
-	// Emit lifecycle end event after finalization so submit_result status is reflected
+	// Emit lifecycle end event after finalization so yield status is reflected
 	if (options.eventBus) {
 		options.eventBus.emit(TASK_SUBAGENT_LIFECYCLE_CHANNEL, {
 			id,