@oh-my-pi/pi-coding-agent 13.2.1 → 13.3.0

package/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 ## [Unreleased]
 
+## [13.3.0] - 2026-02-26
+
+### Breaking Changes
+
+- Renamed `task.isolation.enabled` (boolean) setting to `task.isolation.mode` (enum: `none`, `worktree`, `fuse-overlay`). Existing `true`/`false` values are auto-migrated to `worktree`/`none`.
+
+### Added
+
+- Added `PERPLEXITY_COOKIES` env var for Perplexity web search via session cookies extracted from desktop app
+- Added `fuse-overlay` isolation mode for subagents using `fuse-overlayfs` (copy-on-write overlay, no baseline patch apply needed)
+- Added `task.isolation.merge` setting (`patch` or `branch`) to control how isolated task changes are integrated back. `branch` mode commits each task to a temp branch and cherry-picks for clean commit history
+- Added `task.isolation.commits` setting (`generic` or `ai`) for commit messages on isolated task branches and nested repos. `ai` mode uses a smol model to generate conventional commit messages from diffs
+- Nested non-submodule git repos are now discovered and handled during task isolation (changes captured and applied independently from parent repo)
+- Added `task.eager` setting to encourage the agent to delegate work to subagents by default
+- Added manual OAuth login flow that lets users paste redirect URLs with /login for callback-server providers and prevents overlapping logins
+
+### Fixed
+
+- Fixed nested repo changes being lost when tasks commit inside the isolation (baseline state is now committed before task runs, so delta correctly excludes it)
+- Fixed nested repo patches conflicting when multiple tasks contribute to the same repo (baseline untracked files no longer leak into patches)
+- Nested repo changes are now committed after patch application (previously left as untracked files)
+- Failed tasks no longer create stale branches or capture garbage patches (gated on exit code)
+- Merge failures (e.g. conflicting patches) are now non-fatal — agent output is preserved with `merge failed` status instead of `failed`
+- Stale branches are cleaned up when `commitToBranch` fails
+- Commit message generator filters lock files from diffs before AI summarization
+
 ## [13.2.1] - 2026-02-24
 
 ### Fixed
@@ -11,7 +37,6 @@
 ### Changed
 
 - Extracted non-interactive environment config from `bash-interactive.ts` into shared `non-interactive-env.ts` module, applied consistently to all bash execution paths
-
 ## [13.2.0] - 2026-02-23
 ### Breaking Changes
 
@@ -34,12 +59,14 @@
 - Removed unused SSH resource cleanup functions `closeAllConnections` and `unmountAll` from session imports
 
 ## [13.1.2] - 2026-02-23
-### Breaking Changes
 
+### Breaking Changes
 - Removed `timeout` parameter from await tool—tool now waits indefinitely until jobs complete or the call is aborted
 - Renamed `job_ids` parameter to `jobs` in await tool schema
 - Removed `timedOut` field from await tool result details
 
+### Changed
+- Resolved docs index generation paths using path.resolve relative to the script directory
 ## [13.1.1] - 2026-02-23
 
 ### Fixed

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "13.2.1",
+	"version": "13.3.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -41,12 +41,12 @@
 	},
 	"dependencies": {
 		"@mozilla/readability": "^0.6",
-		"@oh-my-pi/omp-stats": "13.2.1",
-		"@oh-my-pi/pi-agent-core": "13.2.1",
-		"@oh-my-pi/pi-ai": "13.2.1",
-		"@oh-my-pi/pi-natives": "13.2.1",
-		"@oh-my-pi/pi-tui": "13.2.1",
-		"@oh-my-pi/pi-utils": "13.2.1",
+		"@oh-my-pi/omp-stats": "13.3.0",
+		"@oh-my-pi/pi-agent-core": "13.3.0",
+		"@oh-my-pi/pi-ai": "13.3.0",
+		"@oh-my-pi/pi-natives": "13.3.0",
+		"@oh-my-pi/pi-tui": "13.3.0",
+		"@oh-my-pi/pi-utils": "13.3.0",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/scripts/generate-docs-index.ts

@@ -3,8 +3,8 @@
 import { Glob } from "bun";
 import * as path from "node:path";
 
-const docsDir = new URL("../../../docs/", import.meta.url).pathname;
-const outputPath = new URL("../src/internal-urls/docs-index.generated.ts", import.meta.url).pathname;
+const docsDir = path.resolve(import.meta.dir, "../../../docs");
+const outputPath = path.resolve(import.meta.dir, "../src/internal-urls/docs-index.generated.ts");
 
 const glob = new Glob("**/*.md");
 const entries: string[] = [];

package/src/cli/args.ts

@@ -216,7 +216,8 @@ export function getExtraHelpText(): string {
   ${chalk.dim("# Search & Tools")}
   EXA_API_KEY                - Exa web search
   BRAVE_API_KEY              - Brave web search
-  PERPLEXITY_API_KEY         - Perplexity web search
+  PERPLEXITY_API_KEY         - Perplexity web search (API)
+  PERPLEXITY_COOKIES         - Perplexity web search (session cookie)
   ANTHROPIC_SEARCH_API_KEY   - Anthropic search provider
 
   ${chalk.dim("# Configuration")}

package/src/config/settings-schema.ts

@@ -544,16 +544,48 @@ export const SETTINGS_SCHEMA = {
 	// ─────────────────────────────────────────────────────────────────────────
 	// Task tool settings
 	// ─────────────────────────────────────────────────────────────────────────
-	"task.isolation.enabled": {
-		type: "boolean",
-		default: false,
+	"task.isolation.mode": {
+		type: "enum",
+		values: ["none", "worktree", "fuse-overlay"] as const,
+		default: "none",
 		ui: {
 			tab: "tools",
 			label: "Task isolation",
-			description: "Run subagents in isolated git worktrees",
+			description: "Isolation mode for subagents (none, git worktree, or fuse-overlay)",
 			submenu: true,
 		},
 	},
+	"task.isolation.merge": {
+		type: "enum",
+		values: ["patch", "branch"] as const,
+		default: "patch",
+		ui: {
+			tab: "tools",
+			label: "Task isolation merge",
+			description: "How isolated task changes are integrated (patch apply or branch merge)",
+			submenu: true,
+		},
+	},
+	"task.isolation.commits": {
+		type: "enum",
+		values: ["generic", "ai"] as const,
+		default: "generic",
+		ui: {
+			tab: "tools",
+			label: "Task isolation commits",
+			description: "Commit message style for nested repo changes (generic or AI-generated)",
+			submenu: true,
+		},
+	},
+	"task.eager": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "tools",
+			label: "Eager task delegation",
+			description: "Encourage the agent to delegate work to subagents unless changes are trivial",
+		},
+	},
 	"task.maxConcurrency": {
 		type: "number",
 		default: 32,

package/src/config/settings.ts

@@ -553,6 +553,16 @@ export class Settings {
 			}
 		}
 
+		// task.isolation.enabled (boolean) -> task.isolation.mode (enum)
+		const taskObj = raw.task as Record<string, unknown> | undefined;
+		const isolationObj = taskObj?.isolation as Record<string, unknown> | undefined;
+		if (isolationObj && "enabled" in isolationObj) {
+			if (typeof isolationObj.enabled === "boolean") {
+				isolationObj.mode = isolationObj.enabled ? "worktree" : "none";
+			}
+			delete isolationObj.enabled;
+		}
+
 		return raw;
 	}
 

package/src/discovery/claude.ts

@@ -5,7 +5,7 @@
  * Priority: 80 (tool-specific, below builtin but above shared standards)
  */
 import * as path from "node:path";
-import { tryParseJson } from "@oh-my-pi/pi-utils";
+import { hasFsCode, tryParseJson } from "@oh-my-pi/pi-utils";
 import { registerProvider } from "../capability";
 import { type ContextFile, contextFileCapability } from "../capability/context-file";
 import { type ExtensionModule, extensionModuleCapability } from "../capability/extension-module";
@@ -47,6 +47,10 @@ function getProjectClaude(ctx: LoadContext): string {
 	return path.join(ctx.cwd, CONFIG_DIR);
 }
 
+function isMissingDirectoryError(error: unknown): boolean {
+	return hasFsCode(error, "ENOENT") || hasFsCode(error, "ENOTDIR");
+}
+
 // =============================================================================
 // MCP Servers
 // =============================================================================
@@ -162,15 +166,29 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 	const userSkillsDir = path.join(getUserClaude(ctx), "skills");
 	const projectSkillsDir = path.join(getProjectClaude(ctx), "skills");
 
-	const results = await Promise.all([
+	const [userResult, projectResult] = await Promise.allSettled([
 		scanSkillsFromDir(ctx, { dir: userSkillsDir, providerId: PROVIDER_ID, level: "user" }),
 		scanSkillsFromDir(ctx, { dir: projectSkillsDir, providerId: PROVIDER_ID, level: "project" }),
 	]);
 
-	return {
-		items: results.flatMap(r => r.items),
-		warnings: results.flatMap(r => r.warnings ?? []),
-	};
+	const items: Skill[] = [];
+	const warnings: string[] = [];
+
+	if (userResult.status === "fulfilled") {
+		items.push(...userResult.value.items);
+		warnings.push(...(userResult.value.warnings ?? []));
+	} else if (!isMissingDirectoryError(userResult.reason)) {
+		warnings.push(`Failed to scan Claude user skills in ${userSkillsDir}: ${String(userResult.reason)}`);
+	}
+
+	if (projectResult.status === "fulfilled") {
+		items.push(...projectResult.value.items);
+		warnings.push(...(projectResult.value.warnings ?? []));
+	} else if (!isMissingDirectoryError(projectResult.reason)) {
+		warnings.push(`Failed to scan Claude project skills in ${projectSkillsDir}: ${String(projectResult.reason)}`);
+	}
+
+	return { items, warnings };
 }
 
 // =============================================================================

package/src/ipy/runtime.ts

@@ -72,6 +72,7 @@ const DEFAULT_ENV_DENYLIST = new Set([
 	"GEMINI_API_KEY",
 	"OPENROUTER_API_KEY",
 	"PERPLEXITY_API_KEY",
+	"PERPLEXITY_COOKIES",
 	"EXA_API_KEY",
 	"AZURE_OPENAI_API_KEY",
 	"MISTRAL_API_KEY",

package/src/mcp/config.ts

@@ -110,7 +110,7 @@ export async function loadAllMCPConfigs(cwd: string, options?: LoadMCPConfigsOpt
 	let sources: Record<string, SourceMeta> = {};
 	for (const server of servers) {
 		const config = convertToLegacyConfig(server);
-		if (config.enabled === false || (server._source.level !== "user" && disabledServers.has(server.name))) {
+		if (config.enabled === false || disabledServers.has(server.name)) {
 			continue;
 		}
 		configs[server.name] = config;

package/src/modes/components/settings-defs.ts

@@ -93,6 +93,22 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "2", label: "Double" },
 		{ value: "3", label: "Triple" },
 	],
+	// Task isolation mode
+	"task.isolation.mode": [
+		{ value: "none", label: "None", description: "No isolation" },
+		{ value: "worktree", label: "Worktree", description: "Git worktree isolation" },
+		{ value: "fuse-overlay", label: "Fuse Overlay", description: "COW overlay via fuse-overlayfs" },
+	],
+	// Task isolation merge strategy
+	"task.isolation.merge": [
+		{ value: "patch", label: "Patch", description: "Combine diffs and git apply" },
+		{ value: "branch", label: "Branch", description: "Commit per task, merge with --no-ff" },
+	],
+	// Task isolation commit messages
+	"task.isolation.commits": [
+		{ value: "generic", label: "Generic", description: "Static commit message" },
+		{ value: "ai", label: "AI", description: "AI-generated commit message from diff" },
+	],
 	// Todo max reminders
 	"todo.reminders.max": [
 		{ value: "1", label: "1 reminder" },
@@ -166,7 +182,7 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "brave", label: "Brave", description: "Requires BRAVE_API_KEY" },
 		{ value: "jina", label: "Jina", description: "Requires JINA_API_KEY" },
 		{ value: "kimi", label: "Kimi", description: "Requires MOONSHOT_SEARCH_API_KEY or MOONSHOT_API_KEY" },
-		{ value: "perplexity", label: "Perplexity", description: "Requires PERPLEXITY_API_KEY" },
+		{ value: "perplexity", label: "Perplexity", description: "Requires PERPLEXITY_COOKIES or PERPLEXITY_API_KEY" },
 		{ value: "anthropic", label: "Anthropic", description: "Uses Anthropic web search" },
 		{ value: "zai", label: "Z.AI", description: "Calls Z.AI webSearchPrime MCP" },
 		{ value: "synthetic", label: "Synthetic", description: "Requires SYNTHETIC_API_KEY" },

package/src/modes/components/status-line.ts

@@ -50,6 +50,7 @@ export class StatusLineComponent implements Component {
 	// Git status caching (1s TTL)
 	#cachedGitStatus: { staged: number; unstaged: number; untracked: number } | null = null;
 	#gitStatusLastFetch = 0;
+	#gitStatusInFlight = false;
 
 	constructor(private readonly session: AgentSession) {
 		this.#settings = {
@@ -153,11 +154,12 @@ export class StatusLineComponent implements Component {
 	}
 
 	#getGitStatus(): { staged: number; unstaged: number; untracked: number } | null {
-		const now = Date.now();
-		if (now - this.#gitStatusLastFetch < 1000) {
+		if (this.#gitStatusInFlight || Date.now() - this.#gitStatusLastFetch < 1000) {
 			return this.#cachedGitStatus;
 		}
 
+		this.#gitStatusInFlight = true;
+
 		// Fire async fetch, return cached value
 		(async () => {
 			try {
@@ -165,7 +167,6 @@ export class StatusLineComponent implements Component {
 
 				if (result.exitCode !== 0) {
 					this.#cachedGitStatus = null;
-					this.#gitStatusLastFetch = now;
 					return;
 				}
 
@@ -195,10 +196,11 @@ export class StatusLineComponent implements Component {
 				}
 
 				this.#cachedGitStatus = { staged, unstaged, untracked };
-				this.#gitStatusLastFetch = now;
 			} catch {
 				this.#cachedGitStatus = null;
-				this.#gitStatusLastFetch = now;
+			} finally {
+				this.#gitStatusLastFetch = Date.now();
+				this.#gitStatusInFlight = false;
 			}
 		})();
 

package/src/modes/controllers/mcp-command-controller.ts

@@ -739,10 +739,12 @@ export class MCPCommandController {
 
 			// Collect runtime-discovered servers not in config files
 			const configServerNames = new Set([...userServers, ...projectServers]);
+			const disabledServerNames = new Set(await readDisabledServers(userPath));
 			const discoveredServers: { name: string; source: SourceMeta }[] = [];
 			if (this.ctx.mcpManager) {
 				for (const name of this.ctx.mcpManager.getAllServerNames()) {
 					if (configServerNames.has(name)) continue;
+					if (disabledServerNames.has(name)) continue;
 					const source = this.ctx.mcpManager.getSource(name);
 					if (source) {
 						discoveredServers.push({ name, source });
@@ -754,7 +756,7 @@ export class MCPCommandController {
 				userServers.length === 0 &&
 				projectServers.length === 0 &&
 				discoveredServers.length === 0 &&
-				(userConfig.disabledServers ?? []).length === 0
+				disabledServerNames.size === 0
 			) {
 				this.#showMessage(
 					[
@@ -851,8 +853,7 @@ export class MCPCommandController {
 			}
 
 			// Show servers disabled via /mcp disable (from third-party configs)
-			const disabledServers = await readDisabledServers(userPath);
-			const relevantDisabled = disabledServers.filter(n => !configServerNames.has(n));
+			const relevantDisabled = [...disabledServerNames].filter(n => !configServerNames.has(n));
 			if (relevantDisabled.length > 0) {
 				lines.push(theme.fg("accent", "Disabled") + theme.fg("muted", " (discovered servers):"));
 				for (const name of relevantDisabled) {

package/src/modes/controllers/selector-controller.ts

@@ -31,6 +31,16 @@ import { ToolExecutionComponent } from "../components/tool-execution";
 import { TreeSelectorComponent } from "../components/tree-selector";
 import { UserMessageSelectorComponent } from "../components/user-message-selector";
 
+const CALLBACK_SERVER_PROVIDERS = new Set<OAuthProvider>([
+	"anthropic",
+	"openai-codex",
+	"gitlab-duo",
+	"google-gemini-cli",
+	"google-antigravity",
+]);
+
+const MANUAL_LOGIN_TIP = "Tip: You can complete pairing with /login <redirect URL>.";
+
 export class SelectorController {
 	constructor(private ctx: InteractiveModeContext) {}
 
@@ -600,6 +610,8 @@ export class SelectorController {
 					done();
 					if (mode === "login") {
 						this.ctx.showStatus(`Logging in to ${providerId}…`);
+						const manualInput = this.ctx.oauthManualInput;
+						const useManualInput = CALLBACK_SERVER_PROVIDERS.has(providerId as OAuthProvider);
 						try {
 							await this.ctx.session.modelRegistry.authStorage.login(providerId as OAuthProvider, {
 								onAuth: (info: { url: string; instructions?: string }) => {
@@ -612,6 +624,10 @@ export class SelectorController {
 										this.ctx.chatContainer.addChild(new Spacer(1));
 										this.ctx.chatContainer.addChild(new Text(theme.fg("warning", info.instructions), 1, 0));
 									}
+									if (useManualInput) {
+										this.ctx.chatContainer.addChild(new Spacer(1));
+										this.ctx.chatContainer.addChild(new Text(theme.fg("dim", MANUAL_LOGIN_TIP), 1, 0));
+									}
 									this.ctx.ui.requestRender();
 									this.ctx.openInBrowser(info.url);
 								},
@@ -641,6 +657,7 @@ export class SelectorController {
 									this.ctx.chatContainer.addChild(new Text(theme.fg("dim", message), 1, 0));
 									this.ctx.ui.requestRender();
 								},
+								onManualCodeInput: useManualInput ? () => manualInput.waitForInput(providerId) : undefined,
 							});
 							// Refresh models to pick up new baseUrl (e.g., github-copilot)
 							await this.ctx.session.modelRegistry.refresh();
@@ -658,6 +675,10 @@ export class SelectorController {
 							this.ctx.ui.requestRender();
 						} catch (error: unknown) {
 							this.ctx.showError(`Login failed: ${error instanceof Error ? error.message : String(error)}`);
+						} finally {
+							if (useManualInput) {
+								manualInput.clear(`Manual OAuth input cleared for ${providerId}`);
+							}
 						}
 					} else {
 						try {

package/src/modes/interactive-mode.ts

@@ -51,6 +51,7 @@ import { InputController } from "./controllers/input-controller";
 import { MCPCommandController } from "./controllers/mcp-command-controller";
 import { SelectorController } from "./controllers/selector-controller";
 import { SSHCommandController } from "./controllers/ssh-command-controller";
+import { OAuthManualInputManager } from "./oauth-manual-input";
 import { setMermaidRenderCallback } from "./theme/mermaid-cache";
 import type { Theme } from "./theme/theme";
 import { getEditorTheme, getMarkdownTheme, onThemeChange, theme } from "./theme/theme";
@@ -133,6 +134,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	lastStatusText: Text | undefined = undefined;
 	fileSlashCommands: Set<string> = new Set();
 	skillCommands: Map<string, string> = new Map();
+	oauthManualInput: OAuthManualInputManager = new OAuthManualInputManager();
 
 	#pendingSlashCommands: SlashCommand[] = [];
 	#cleanupUnsubscribe?: () => void;
@@ -674,6 +676,13 @@ export class InteractiveMode implements InteractiveModeContext {
 		const previousTools = this.#planModePreviousTools ?? this.session.getActiveToolNames();
 		await this.#exitPlanMode({ silent: true, paused: false });
 		await this.handleClearCommand();
+		// The new session has a fresh local:// root — persist the approved plan there
+		// so `local://<title>.md` resolves correctly in the execution session.
+		const newLocalPath = resolveLocalUrlToPath(options.finalPlanFilePath, {
+			getArtifactsDir: () => this.sessionManager.getArtifactsDir(),
+			getSessionId: () => this.sessionManager.getSessionId(),
+		});
+		await Bun.write(newLocalPath, planContent);
 		if (previousTools.length > 0) {
 			await this.session.setActiveToolsByName(previousTools);
 		}

package/src/modes/oauth-manual-input.ts

@@ -0,0 +1,42 @@
+type PendingInput = {
+	providerId: string;
+	resolve: (value: string) => void;
+	reject: (error: Error) => void;
+};
+
+export class OAuthManualInputManager {
+	#pending?: PendingInput;
+
+	waitForInput(providerId: string): Promise<string> {
+		if (this.#pending) {
+			this.clear("Manual OAuth input superseded by a new login");
+		}
+
+		const { promise, resolve, reject } = Promise.withResolvers<string>();
+		this.#pending = { providerId, resolve, reject };
+		return promise;
+	}
+
+	submit(input: string): boolean {
+		if (!this.#pending) return false;
+		const { resolve } = this.#pending;
+		this.#pending = undefined;
+		resolve(input);
+		return true;
+	}
+
+	clear(reason = "Manual OAuth input cleared"): void {
+		if (!this.#pending) return;
+		const { reject } = this.#pending;
+		this.#pending = undefined;
+		reject(new Error(reason));
+	}
+
+	hasPending(): boolean {
+		return Boolean(this.#pending);
+	}
+
+	get pendingProviderId(): string | undefined {
+		return this.#pending?.providerId;
+	}
+}

package/src/modes/types.ts

@@ -19,6 +19,7 @@ import type { HookSelectorComponent } from "./components/hook-selector";
 import type { PythonExecutionComponent } from "./components/python-execution";
 import type { StatusLineComponent } from "./components/status-line";
 import type { ToolExecutionHandle } from "./components/tool-execution";
+import type { OAuthManualInputManager } from "./oauth-manual-input";
 import type { Theme } from "./theme/theme";
 
 export type CompactionQueuedMessage = {
@@ -97,6 +98,7 @@ export interface InteractiveModeContext {
 	lastStatusText: Text | undefined;
 	fileSlashCommands: Set<string>;
 	skillCommands: Map<string, string>;
+	oauthManualInput: OAuthManualInputManager;
 	todoPhases: TodoPhase[];
 
 	// Lifecycle

package/src/patch/hashline.ts

@@ -444,6 +444,7 @@ export function applyHashlineEdits(
 	const originalFileLines = [...fileLines];
 	let firstChangedLine: number | undefined;
 	const noopEdits: Array<{ editIndex: number; loc: string; current: string }> = [];
+	const warnings: string[] = [];
 
 	// Pre-validate: collect all hash mismatches before mutating
 	const mismatches: HashMismatch[] = [];
@@ -580,7 +581,23 @@ export function applyHashlineEdits(
 					trackFirstChanged(edit.pos.line);
 				} else {
 					const count = edit.end.line - edit.pos.line + 1;
-					const newLines = edit.lines;
+					const newLines = [...edit.lines];
+					const trailingReplacementLine = newLines[newLines.length - 1];
+					const nextSurvivingLine = fileLines[edit.end.line];
+					if (
+						trailingReplacementLine !== undefined &&
+						trailingReplacementLine.trim().length > 0 &&
+						nextSurvivingLine !== undefined &&
+						trailingReplacementLine.trim() === nextSurvivingLine.trim() &&
+						// Safety: only correct when end-line content differs from the duplicate.
+						// If end already points to the boundary, matching next line is coincidence.
+						fileLines[edit.end.line - 1].trim() !== trailingReplacementLine.trim()
+					) {
+						newLines.pop();
+						warnings.push(
+							`Auto-corrected range replace ${edit.pos.line}#${edit.pos.hash}-${edit.end.line}#${edit.end.hash}: removed trailing replacement line "${trailingReplacementLine.trim()}" that duplicated next surviving line`,
+						);
+					}
 					fileLines.splice(edit.pos.line - 1, count, ...newLines);
 					trackFirstChanged(edit.pos.line);
 				}
@@ -639,6 +656,7 @@ export function applyHashlineEdits(
 	return {
 		lines: fileLines.join("\n"),
 		firstChangedLine,
+		...(warnings.length > 0 ? { warnings } : {}),
 		...(noopEdits.length > 0 ? { noopEdits } : {}),
 	};
 

package/src/prompts/system/commit-message-system.md

@@ -0,0 +1,2 @@
+Generate a concise git commit message from the provided diff. Use conventional commit format: `type(scope): description` where type is feat/fix/refactor/chore/test/docs and scope is optional. The description **MUST** be lowercase, imperative mood, no trailing period. Keep it under 72 characters.
+You **MUST** output ONLY the commit message, nothing else.

package/src/prompts/system/subagent-submit-reminder.md

@@ -2,10 +2,10 @@
 You stopped without calling submit_result. This is reminder {{retryCount}} of {{maxRetries}}.
 
 You **MUST** call submit_result as your only action now. Choose one:
-- If task is complete: you **MUST** call submit_result with your result data
-- If task failed or was interrupted: you **MUST** call submit_result with status="aborted" and describe what happened
+- If task is complete: call submit_result with your result in the `data` field
+- If task failed: call submit_result with an `error` field describing what happened
 
-You **MUST NOT** choose aborted if you can still complete the task through exploration (using available tools or repo context). If you abort, you **MUST** include what you tried and the exact blocker.
+You **MUST NOT** give up if you can still complete the task through exploration (using available tools or repo context). If you submit an error, you **MUST** include what you tried and the exact blocker.
 
 You **MUST NOT** output text without a tool call. You **MUST** call submit_result to finish.
 </system-reminder>

package/src/prompts/system/subagent-system-prompt.md

@@ -29,11 +29,11 @@ Your result **MUST** match this TypeScript interface:
 {{/if}}
 
 {{SECTION_SEPERATOR "Giving Up"}}
-If you cannot complete the assignment, you **MUST** call `submit_result` exactly once with `status="aborted"` and an error message describing what you tried and the exact blocker.
+If you cannot complete the assignment, you **MUST** call `submit_result` exactly once with an `error` message describing what you tried and the exact blocker.
 
-Aborting is a last resort.
-You **MUST NOT** abort due to uncertainty or missing information obtainable via tools or repo context.
-You **MUST NOT** abort due to requiring a design, you can derive that yourself, more than capable of that.
+Giving up is a last resort.
+You **MUST NOT** give up due to uncertainty or missing information obtainable via tools or repo context.
+You **MUST NOT** give up due to requiring a design, you can derive that yourself, more than capable of that.
 
 Proceed with the best approach using the most reasonable option.
 

package/src/prompts/system/system-prompt.md

@@ -159,6 +159,19 @@ Semantic questions **MUST** be answered with semantic tools.
 - What is this thing? → `lsp hover`
 {{/has}}
 
+{{#if eagerTasks}}
+<eager-tasks>
+You **SHOULD** delegate work to subagents by default. Working alone is the exception, not the rule.
+
+Use the Task tool unless the change is:
+- A single-file edit under ~30 lines
+- A direct answer or explanation with no code changes
+- A command the user asked you to run yourself
+
+For everything else — multi-file changes, refactors, new features, test additions, investigations — break the work into tasks and delegate. Err on the side of delegating. You are an orchestrator first, a coder second.
+</eager-tasks>
+{{/if}}
+
 {{#has tools "ssh"}}
 ### SSH: match commands to host shell