@oh-my-pi/pi-coding-agent 6.9.69 → 8.0.0

package/src/{core/tools/task → task}/render.ts

@@ -8,8 +8,8 @@
 import path from "node:path";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Container, Text } from "@oh-my-pi/pi-tui";
-import type { Theme } from "../../../modes/interactive/theme/theme";
-import type { RenderResultOptions } from "../../custom-tools/types";
+import type { RenderResultOptions } from "$c/extensibility/custom-tools/types";
+import type { Theme } from "$c/modes/theme/theme";
 import {
 	formatBadge,
 	formatDuration,
@@ -17,14 +17,14 @@ import {
 	formatStatusIcon,
 	formatTokens,
 	truncate,
-} from "../render-utils";
+} from "$c/tools/render-utils";
 import {
 	type FindingPriority,
 	getPriorityInfo,
 	PRIORITY_LABELS,
 	type ReportFindingDetails,
 	type SubmitReviewDetails,
-} from "../review";
+} from "$c/tools/review";
 import { subprocessToolRegistry } from "./subprocess-tool-registry";
 import type { AgentProgress, SingleResult, TaskParams, TaskToolDetails } from "./types";
 
@@ -236,7 +236,7 @@ function renderOutputSection(
 		try {
 			const parsed = JSON.parse(trimmedOutput);
 
-			// Collapsed: inline format like Vars
+			// Collapsed: inline format like Args
 			if (!expanded) {
 				lines.push(`${continuePrefix}${theme.fg("dim", formatOutputInline(parsed, theme))}`);
 				return lines;
@@ -276,11 +276,25 @@ function renderOutputSection(
 	return lines;
 }
 
-function formatVarsInline(vars: Record<string, string>, theme: Theme): string {
-	const entries = Object.entries(vars);
-	if (entries.length === 0) return "Vars: none";
+function formatArgsInline(args: Record<string, string>, theme: Theme): string {
+	const entries = Object.entries(args);
+	if (entries.length === 0) return "No arguments";
+
+	// Single variable: show inline as "Key: value" without tree structure
+	if (entries.length === 1) {
+		const [key, value] = entries[0];
+		const humanKey = humanizeKey(key);
+		const displayValue = `"${truncate(value, 32, theme.format.ellipsis)}"`;
+		return `${humanKey}: ${displayValue}`;
+	}
+
 	const pairs = entries.map(([key, value]) => `${key}=${truncate(value, 24, theme.format.ellipsis)}`);
-	return `Vars: ${pairs.join(", ")}`;
+	return `Args: ${pairs.join(", ")}`;
+}
+
+/** Convert snake_case or kebab-case to Title Case */
+function humanizeKey(key: string): string {
+	return key.replace(/[-_]/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
 }
 
 function formatScalarInline(value: unknown, maxLen: number, theme: Theme): string {
@@ -336,22 +350,37 @@ function formatOutputInline(data: unknown, theme: Theme, maxWidth = 80): string
 	return `Output: ${pairs.join(", ")}`;
 }
 
-function renderVarsSection(
-	vars: Record<string, string> | undefined,
+function renderArgsSection(
+	args: Record<string, string> | undefined,
 	continuePrefix: string,
 	expanded: boolean,
 	theme: Theme,
 ): string[] {
-	if (!vars || Object.keys(vars).length === 0) return [];
+	if (!args) return [];
+	// Filter out auto-injected id and description
+	const filteredArgs = Object.fromEntries(
+		Object.entries(args).filter(([key]) => key !== "id" && key !== "description"),
+	);
+	if (Object.keys(filteredArgs).length === 0) return [];
 	const lines: string[] = [];
+	const entries = Object.entries(filteredArgs);
 
 	if (!expanded) {
-		lines.push(`${continuePrefix}${theme.fg("dim", formatVarsInline(vars, theme))}`);
+		lines.push(`${continuePrefix}${theme.fg("dim", formatArgsInline(filteredArgs, theme))}`);
+		return lines;
+	}
+
+	// Single variable: show inline as "Key: value" without tree structure
+	if (entries.length === 1) {
+		const [key, value] = entries[0];
+		const humanKey = humanizeKey(key);
+		const displayValue = `"${truncate(value, 60, theme.format.ellipsis)}"`;
+		lines.push(`${continuePrefix}${theme.fg("dim", `${humanKey}: ${displayValue}`)}`);
 		return lines;
 	}
 
-	lines.push(`${continuePrefix}${theme.fg("dim", "Vars")}`);
-	const tree = renderJsonTreeLines(vars, theme, 4, 16);
+	lines.push(`${continuePrefix}${theme.fg("dim", "Args")}`);
+	const tree = renderJsonTreeLines(filteredArgs, theme, 4, 16);
 	for (const line of tree.lines) {
 		lines.push(`${continuePrefix}  ${line}`);
 	}
@@ -380,6 +409,7 @@ export function renderCall(args: TaskParams, theme: Theme): Component {
 	const branch = theme.fg("dim", theme.tree.branch);
 	const last = theme.fg("dim", theme.tree.last);
 	const vertical = theme.fg("dim", theme.tree.vertical);
+	const showIsolated = args.isolated === true;
 
 	if (hasContext) {
 		lines.push(` ${branch} ${theme.fg("dim", "Context")}`);
@@ -387,11 +417,18 @@ export function renderCall(args: TaskParams, theme: Theme): Component {
 			const content = line ? theme.fg("muted", line) : "";
 			lines.push(` ${vertical}  ${content}`);
 		}
-		lines.push(` ${last} ${theme.fg("dim", "Tasks")}: ${theme.fg("muted", `${args.tasks.length} agents`)}`);
+		const taskPrefix = showIsolated ? branch : last;
+		lines.push(` ${taskPrefix} ${theme.fg("dim", "Tasks")}: ${theme.fg("muted", `${args.tasks.length} agents`)}`);
+		if (showIsolated) {
+			lines.push(` ${last} ${theme.fg("dim", "Isolated")}: ${theme.fg("muted", "true")}`);
+		}
 		return new Text(lines.join("\n"), 0, 0);
 	}
 
 	lines.push(`${theme.fg("dim", "Tasks")}: ${theme.fg("muted", `${args.tasks.length} agents`)}`);
+	if (showIsolated) {
+		lines.push(`${theme.fg("dim", "Isolated")}: ${theme.fg("muted", "true")}`);
+	}
 
 	return new Text(lines.join("\n"), 0, 0);
 }
@@ -418,9 +455,9 @@ function renderAgentProgress(
 				? "error"
 				: "accent";
 
-	// Main status line: taskId: description [status] · stats · ⟨agent⟩
+	// Main status line: id: description [status] · stats · ⟨agent⟩
 	const description = progress.description?.trim();
-	const titlePart = description ? `${theme.bold(progress.taskId)}: ${description}` : progress.taskId;
+	const titlePart = description ? `${theme.bold(progress.id)}: ${description}` : progress.id;
 	let statusLine = `${prefix} ${theme.fg(iconColor, icon)} ${theme.fg("accent", titlePart)}`;
 
 	// Only show badge for non-running states (spinner already indicates running)
@@ -445,7 +482,7 @@ function renderAgentProgress(
 
 	lines.push(statusLine);
 
-	lines.push(...renderVarsSection(progress.vars, continuePrefix, expanded, theme));
+	lines.push(...renderArgsSection(progress.args, continuePrefix, expanded, theme));
 
 	// Current tool (if running) or most recent completed tool
 	if (progress.status === "running") {
@@ -638,9 +675,9 @@ function renderAgentResult(result: SingleResult, isLast: boolean, expanded: bool
 	const iconColor = success ? "success" : "error";
 	const statusText = aborted ? "aborted" : success ? "done" : "failed";
 
-	// Main status line: taskId: description [status] · stats · ⟨agent⟩
+	// Main status line: id: description [status] · stats · ⟨agent⟩
 	const description = result.description?.trim();
-	const titlePart = description ? `${theme.bold(result.taskId)}: ${description}` : result.taskId;
+	const titlePart = description ? `${theme.bold(result.id)}: ${description}` : result.id;
 	let statusLine = `${prefix} ${theme.fg(iconColor, icon)} ${theme.fg("accent", titlePart)} ${formatBadge(
 		statusText,
 		iconColor,
@@ -656,7 +693,7 @@ function renderAgentResult(result: SingleResult, isLast: boolean, expanded: bool
 	}
 
 	lines.push(statusLine);
-	lines.push(...renderVarsSection(result.vars, continuePrefix, expanded, theme));
+	lines.push(...renderArgsSection(result.args, continuePrefix, expanded, theme));
 
 	// Check for review result (complete with review schema + report_finding)
 	const completeData = result.extractedToolData?.complete as Array<{ data: unknown }> | undefined;
@@ -722,6 +759,10 @@ function renderAgentResult(result: SingleResult, isLast: boolean, expanded: bool
 		lines.push(...renderOutputSection(result.output, continuePrefix, expanded, theme, 3, 12));
 	}
 
+	if (result.patchPath && !aborted && result.exitCode === 0) {
+		lines.push(`${continuePrefix}${theme.fg("dim", `Patch: ${result.patchPath}`)}`);
+	}
+
 	// Error message
 	if (result.error && !success) {
 		lines.push(`${continuePrefix}${theme.fg("error", truncate(result.error, 70, theme.format.ellipsis))}`);
@@ -739,6 +780,7 @@ export function renderResult(
 	theme: Theme,
 ): Component {
 	const { expanded, isPartial, spinnerFrame } = options;
+	const fallbackText = result.content.find((c) => c.type === "text")?.text ?? "";
 	const details = result.details;
 
 	if (!details) {
@@ -785,7 +827,22 @@ export function renderResult(
 	}
 
 	if (lines.length === 0) {
-		return new Text(theme.fg("dim", "No results"), 0, 0);
+		const text = fallbackText.trim() ? fallbackText : "No results";
+		return new Text(theme.fg("dim", truncate(text, 140, theme.format.ellipsis)), 0, 0);
+	}
+
+	if (fallbackText.trim()) {
+		const summaryLines = fallbackText.split("\n");
+		const markerIndex = summaryLines.findIndex(
+			(line) => line.includes("<system-notification>") || line.startsWith("Applied patches:"),
+		);
+		if (markerIndex >= 0) {
+			const extra = summaryLines.slice(markerIndex);
+			for (const line of extra) {
+				if (!line.trim()) continue;
+				lines.push(theme.fg("dim", line));
+			}
+		}
 	}
 
 	const indented = lines.map((line) => (line.trim() ? `   ${line}` : ""));

package/src/{core/tools/task → task}/subprocess-tool-registry.ts

@@ -8,7 +8,7 @@
  */
 
 import type { Component } from "@oh-my-pi/pi-tui";
-import type { Theme } from "../../../modes/interactive/theme/theme";
+import type { Theme } from "$c/modes/theme/theme";
 
 /** Event from subprocess tool execution (parsed from JSONL) */
 export interface SubprocessToolEvent {

package/src/task/template.ts

@@ -0,0 +1,47 @@
+import type { TaskItem } from "./types";
+
+type RenderResult = {
+	task: string;
+	args: Record<string, string>;
+	id: string;
+	description: string;
+};
+
+export function renderTemplate(template: string, task: TaskItem): RenderResult {
+	const { id, description, args } = task;
+
+	let usedPlaceholder = false;
+	const unknownArguments: string[] = [];
+	let renderedTask = template.replace(/\{\{(\w+)\}\}/g, (_match, key: string) => {
+		const value = args?.[key];
+		if (value) {
+			usedPlaceholder = true;
+			return value;
+		}
+		switch (key) {
+			case "id":
+				usedPlaceholder = true;
+				return id;
+			case "description":
+				usedPlaceholder = true;
+				return description;
+			default:
+				unknownArguments.push(key);
+				return `{{${key}}}`;
+		}
+	});
+
+	if (unknownArguments.length > 0) {
+		throw new Error(`Task "${id}" has unknown arguments: ${unknownArguments.join(", ")}`);
+	}
+
+	if (!usedPlaceholder) {
+		renderedTask += `\n----------------------\n# ${id}\n${description}`;
+	}
+	return {
+		task: renderedTask,
+		args: { id, description, ...args },
+		id,
+		description,
+	};
+}

package/src/{core/tools/task → task}/types.ts

@@ -31,9 +31,6 @@ export const MAX_OUTPUT_BYTES = getEnv("OMP_TASK_MAX_OUTPUT_BYTES", 500_000);
 /** Maximum output lines per agent */
 export const MAX_OUTPUT_LINES = getEnv("OMP_TASK_MAX_OUTPUT_LINES", 5000);
 
-/** Maximum agents to show in description */
-export const MAX_AGENTS_IN_DESCRIPTION = getEnv("OMP_TASK_MAX_AGENTS_IN_DESCRIPTION", 10);
-
 /** EventBus channel for raw subagent events */
 export const TASK_SUBAGENT_EVENT_CHANNEL = "task:subagent:event";
 
@@ -43,35 +40,28 @@ export const TASK_SUBAGENT_PROGRESS_CHANNEL = "task:subagent:progress";
 /** Single task item for parallel execution */
 export const taskItemSchema = Type.Object({
 	id: Type.String({
-		description: "Short task identifier for display (max 32 chars, CamelCase, e.g. 'SessionStore', 'WebFetchFix')",
+		description: "Task ID, CamelCase, max 32 chars",
 		maxLength: 32,
 	}),
-	description: Type.String({ description: "Short description for UI display" }),
-	vars: Type.Record(Type.String(), Type.String(), {
-		description: "Template variables to fill {{placeholders}} in context",
-	}),
+	description: Type.String({ description: "Short description for display" }),
+	args: Type.Optional(
+		Type.Record(Type.String(), Type.String(), {
+			description: "Arguments to fill {{placeholders}} in context",
+		}),
+	),
 });
 
 export type TaskItem = Static<typeof taskItemSchema>;
 
 /** Task tool parameters */
 export const taskSchema = Type.Object({
-	agent: Type.String({ description: "Agent type to use for all tasks" }),
-	context: Type.String({ description: "Template with {{placeholders}} filled by task vars" }),
-	model: Type.Optional(
-		Type.String({
-			description: "Model override for all tasks (fuzzy matching, e.g. 'sonnet', 'opus')",
-		}),
-	),
+	agent: Type.String({ description: "Agent type for all tasks" }),
+	context: Type.String({ description: "Template with {{placeholders}} for args" }),
+	isolated: Type.Optional(Type.Boolean({ description: "Run in isolated git worktree" })),
 	output: Type.Optional(
-		Type.Record(Type.String(), Type.Unknown(), {
-			description: "JTD schema for structured subagent output",
-		}),
+		Type.Record(Type.String(), Type.Unknown(), { description: "JTD schema for structured output" }),
 	),
-	tasks: Type.Array(taskItemSchema, {
-		description: "Tasks to run in parallel",
-		maxItems: MAX_PARALLEL_TASKS,
-	}),
+	tasks: Type.Array(taskItemSchema, { description: "Tasks to run in parallel", maxItems: MAX_PARALLEL_TASKS }),
 });
 
 export type TaskParams = Static<typeof taskSchema>;
@@ -117,12 +107,12 @@ export interface AgentDefinition {
 /** Progress tracking for a single agent */
 export interface AgentProgress {
 	index: number;
-	taskId: string;
+	id: string;
 	agent: string;
 	agentSource: AgentSource;
 	status: "pending" | "running" | "completed" | "failed" | "aborted";
 	task: string;
-	vars?: Record<string, string>;
+	args?: Record<string, string>;
 	description?: string;
 	currentTool?: string;
 	currentToolArgs?: string;
@@ -140,11 +130,11 @@ export interface AgentProgress {
 /** Result from a single agent execution */
 export interface SingleResult {
 	index: number;
-	taskId: string;
+	id: string;
 	agent: string;
 	agentSource: AgentSource;
 	task: string;
-	vars?: Record<string, string>;
+	args?: Record<string, string>;
 	description?: string;
 	exitCode: number;
 	output: string;
@@ -159,9 +149,11 @@ export interface SingleResult {
 	usage?: Usage;
 	/** Output path for the task result */
 	outputPath?: string;
+	/** Patch path for isolated worktree output */
+	patchPath?: string;
 	/** Data extracted by registered subprocess tool handlers (keyed by tool name) */
 	extractedToolData?: Record<string, unknown[]>;
-	/** Output metadata for Output tool integration */
+	/** Output metadata for agent:// URL integration */
 	outputMeta?: { lineCount: number; charCount: number };
 }
 

package/src/{core/tools/task → task}/worker-protocol.ts

@@ -1,7 +1,7 @@
 import type { AgentEvent, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import type { SerializedAuthStorage } from "../../auth-storage";
-import type { SerializedModelRegistry } from "../../model-registry";
-import type { Settings } from "../../settings-manager";
+import type { SerializedModelRegistry } from "$c/config/model-registry";
+import type { Settings } from "$c/config/settings-manager";
+import type { SerializedAuthStorage } from "$c/session/auth-storage";
 
 /**
  * MCP tool metadata passed from parent to worker for proxy tool creation.
@@ -22,7 +22,10 @@ export interface MCPToolMetadata {
 export interface MCPToolCallRequest {
 	type: "mcp_tool_call";
 	callId: string;
-	toolName: string;
+	/** Server name for routing to correct connection */
+	serverName: string;
+	/** Original MCP tool name (as expected by the MCP server) */
+	mcpToolName: string;
 	params: Record<string, unknown>;
 	timeoutMs?: number;
 }
@@ -84,6 +87,7 @@ export interface LspToolCallResponse {
 
 export interface SubagentWorkerStartPayload {
 	cwd: string;
+	worktree?: string;
 	task: string;
 	systemPrompt: string;
 	model?: string;

package/src/{core/tools/task → task}/worker.ts

@@ -17,18 +17,19 @@ import type { AgentEvent, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Api, Model } from "@oh-my-pi/pi-ai";
 import { logger, postmortem, untilAborted } from "@oh-my-pi/pi-utils";
 import type { TSchema } from "@sinclair/typebox";
-import lspDescription from "../../../prompts/tools/lsp.md" with { type: "text" };
-import type { AgentSessionEvent } from "../../agent-session";
-import { AuthStorage } from "../../auth-storage";
-import type { CustomTool } from "../../custom-tools/types";
-import { ModelRegistry } from "../../model-registry";
-import { parseModelPattern, parseModelString } from "../../model-resolver";
-import { renderPromptTemplate } from "../../prompt-templates";
-import { createAgentSession, discoverAuthStorage, discoverModels } from "../../sdk";
-import { SessionManager } from "../../session-manager";
-import { SettingsManager } from "../../settings-manager";
-import { type LspToolDetails, lspSchema } from "../lsp/types";
-import { getPythonToolDescription, type PythonToolDetails, type PythonToolParams, pythonSchema } from "../python";
+import { ModelRegistry } from "$c/config/model-registry";
+import { parseModelPattern, parseModelString } from "$c/config/model-resolver";
+import { renderPromptTemplate } from "$c/config/prompt-templates";
+import { SettingsManager } from "$c/config/settings-manager";
+import type { CustomTool } from "$c/extensibility/custom-tools/types";
+import { type LspToolDetails, lspSchema } from "$c/lsp/types";
+import lspDescription from "$c/prompts/tools/lsp.md" with { type: "text" };
+import { createAgentSession, discoverAuthStorage, discoverModels } from "$c/sdk";
+import type { AgentSessionEvent } from "$c/session/agent-session";
+import { AuthStorage } from "$c/session/auth-storage";
+import { SessionManager } from "$c/session/session-manager";
+import { getPythonToolDescription, type PythonToolDetails, type PythonToolParams, pythonSchema } from "$c/tools/python";
+import { ToolAbortError } from "$c/tools/tool-errors";
 import type {
 	LspToolCallResponse,
 	MCPToolCallResponse,
@@ -88,7 +89,8 @@ function generateLspCallId(): string {
 }
 
 function callMCPToolViaParent(
-	toolName: string,
+	serverName: string,
+	mcpToolName: string,
 	params: Record<string, unknown>,
 	signal?: AbortSignal,
 	timeoutMs = MCP_CALL_TIMEOUT_MS,
@@ -99,7 +101,7 @@ function callMCPToolViaParent(
 	}>();
 	const callId = generateMCPCallId();
 	if (signal?.aborted) {
-		reject(new Error("Aborted"));
+		reject(new ToolAbortError());
 		return promise;
 	}
 
@@ -118,7 +120,7 @@ function callMCPToolViaParent(
 			"abort",
 			() => {
 				cleanup();
-				reject(new Error("Aborted"));
+				reject(new ToolAbortError());
 			},
 			{ once: true },
 		);
@@ -139,7 +141,8 @@ function callMCPToolViaParent(
 	postMessageSafe({
 		type: "mcp_tool_call",
 		callId,
-		toolName,
+		serverName,
+		mcpToolName,
 		params,
 		timeoutMs,
 	} as SubagentWorkerResponse);
@@ -155,7 +158,7 @@ function callPythonToolViaParent(
 	const { promise, resolve, reject } = Promise.withResolvers<PythonToolCallResponse["result"]>();
 	const callId = generatePythonCallId();
 	if (signal?.aborted) {
-		reject(new Error("Aborted"));
+		reject(new ToolAbortError());
 		return promise;
 	}
 
@@ -185,7 +188,7 @@ function callPythonToolViaParent(
 			() => {
 				cleanup();
 				sendCancel("Aborted");
-				reject(new Error("Aborted"));
+				reject(new ToolAbortError());
 			},
 			{ once: true },
 		);
@@ -221,7 +224,7 @@ function callLspToolViaParent(
 	const { promise, resolve, reject } = Promise.withResolvers<LspToolCallResponse["result"]>();
 	const callId = generateLspCallId();
 	if (signal?.aborted) {
-		reject(new Error("Aborted"));
+		reject(new ToolAbortError());
 		return promise;
 	}
 
@@ -245,7 +248,7 @@ function callLspToolViaParent(
 			"abort",
 			() => {
 				cleanup();
-				reject(new Error("Aborted"));
+				reject(new ToolAbortError());
 			},
 			{ once: true },
 		);
@@ -334,7 +337,8 @@ function createMCPProxyTool(metadata: MCPToolMetadata): CustomTool<TSchema> {
 		execute: async (_toolCallId, params, _onUpdate, _ctx, signal) => {
 			try {
 				const result = await callMCPToolViaParent(
-					metadata.name,
+					metadata.serverName,
+					metadata.mcpToolName,
 					params as Record<string, unknown>,
 					signal,
 					metadata.timeoutMs,
@@ -363,7 +367,7 @@ function createMCPProxyTool(metadata: MCPToolMetadata): CustomTool<TSchema> {
 }
 
 function getPythonCallTimeoutMs(params: PythonToolParams): number | undefined {
-	const timeout = params.timeoutMs;
+	const timeout = params.timeout;
 	if (typeof timeout === "number" && Number.isFinite(timeout) && timeout > 0) {
 		return Math.max(1000, Math.round(timeout * 1000) + 1000);
 	}
@@ -530,7 +534,7 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 		if (signal.aborted) {
 			aborted = true;
 			exitCode = 1;
-			throw new Error("Aborted");
+			throw new ToolAbortError();
 		}
 	};
 
@@ -538,9 +542,6 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 		// Check for pre-start abort
 		checkAbort();
 
-		// Set working directory (CLI does this implicitly)
-		process.chdir(payload.cwd);
-
 		// Use serialized auth/models if provided, otherwise discover from disk
 		let authStorage: AuthStorage;
 		let modelRegistry: ModelRegistry;
@@ -574,7 +575,7 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 		// Create session manager (equivalent to CLI's --session or --no-session)
 		const sessionManager = payload.sessionFile
 			? await SessionManager.open(payload.sessionFile)
-			: SessionManager.inMemory(payload.cwd);
+			: SessionManager.inMemory(payload.worktree ?? payload.cwd);
 		checkAbort();
 
 		// Use serialized settings if provided, otherwise use empty in-memory settings
@@ -585,9 +586,12 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 		// Note: hasUI: false disables interactive features
 		const completionInstruction =
 			"When finished, call the complete tool exactly once. Do not end with a plain-text final answer.";
+		const worktreeNotice = payload.worktree
+			? `You will work under this working tree: ${payload.worktree}. CRITICAL: Do not touch the original repository; only make changes inside this worktree.`
+			: "";
 
 		const { session } = await createAgentSession({
-			cwd: payload.cwd,
+			cwd: payload.worktree ?? payload.cwd,
 			authStorage,
 			modelRegistry,
 			settingsManager,
@@ -597,7 +601,8 @@ async function runTask(runState: RunState, payload: SubagentWorkerStartPayload):
 			outputSchema: payload.outputSchema,
 			requireCompleteTool: true,
 			// Append system prompt (equivalent to CLI's --append-system-prompt)
-			systemPrompt: (defaultPrompt) => `${defaultPrompt}\n\n${payload.systemPrompt}\n\n${completionInstruction}`,
+			systemPrompt: (defaultPrompt) =>
+				`${defaultPrompt}\n\n${payload.systemPrompt}\n\n${worktreeNotice}\n\n${completionInstruction}`,
 			sessionManager,
 			hasUI: false,
 			// Pass spawn restrictions to nested tasks