@oh-my-pi/pi-coding-agent 11.0.3 → 11.2.0

package/src/modes/components/skill-message.ts

@@ -5,14 +5,12 @@ import { getMarkdownTheme, theme } from "../../modes/theme/theme";
 import type { CustomMessage, SkillPromptDetails } from "../../session/messages";
 
 export class SkillMessageComponent extends Container {
-	private message: CustomMessage<SkillPromptDetails>;
 	private box: Box;
 	private contentComponent?: Component;
 	private _expanded = false;
 
-	constructor(message: CustomMessage<SkillPromptDetails>) {
+	constructor(private readonly message: CustomMessage<SkillPromptDetails>) {
 		super();
-		this.message = message;
 		this.addChild(new Spacer(1));
 
 		this.box = new Box(1, 1, t => theme.bg("customMessageBg", t));

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

@@ -53,15 +53,13 @@ export class StatusLineSegmentEditorComponent extends Container {
 	private segments: SegmentState[];
 	private selectedIndex: number = 0;
 	private focusColumn: "left" | "right" | "disabled" = "left";
-	private callbacks: SegmentEditorCallbacks;
 
 	constructor(
 		currentLeft: StatusLineSegmentId[],
 		currentRight: StatusLineSegmentId[],
-		callbacks: SegmentEditorCallbacks,
+		private readonly callbacks: SegmentEditorCallbacks,
 	) {
 		super();
-		this.callbacks = callbacks;
 
 		// Initialize segment states
 		this.segments = [];

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

@@ -60,7 +60,6 @@ function findGitHeadPath(): string | null {
 // ═══════════════════════════════════════════════════════════════════════════
 
 export class StatusLineComponent implements Component {
-	private session: AgentSession;
 	private settings: StatusLineSettings = {};
 	private cachedBranch: string | null | undefined = undefined;
 	private gitWatcher: fs.FSWatcher | null = null;
@@ -75,8 +74,7 @@ export class StatusLineComponent implements Component {
 	private cachedGitStatus: { staged: number; unstaged: number; untracked: number } | null = null;
 	private gitStatusLastFetch = 0;
 
-	constructor(session: AgentSession) {
-		this.session = session;
+	constructor(private readonly session: AgentSession) {
 		this.settings = {
 			preset: settings.get("statusLine.preset"),
 			leftSegments: settings.get("statusLine.leftSegments"),

package/src/modes/components/todo-reminder.ts

@@ -7,16 +7,14 @@ import type { TodoItem } from "../../tools/todo-write";
  * Shows when the agent stops with incomplete todos.
  */
 export class TodoReminderComponent extends Container {
-	private todos: TodoItem[];
-	private attempt: number;
-	private maxAttempts: number;
 	private box: Box;
 
-	constructor(todos: TodoItem[], attempt: number, maxAttempts: number) {
+	constructor(
+		private readonly todos: TodoItem[],
+		private readonly attempt: number,
+		private readonly maxAttempts: number,
+	) {
 		super();
-		this.todos = todos;
-		this.attempt = attempt;
-		this.maxAttempts = maxAttempts;
 
 		this.addChild(new Spacer(1));
 

package/src/modes/components/tree-selector.ts

@@ -50,8 +50,6 @@ class TreeList implements Component {
 	private flatNodes: FlatNode[] = [];
 	private filteredNodes: FlatNode[] = [];
 	private selectedIndex = 0;
-	private currentLeafId: string | null;
-	private maxVisibleLines: number;
 	private filterMode: FilterMode = "default";
 	private searchQuery = "";
 	private toolCallMap: Map<string, ToolCallInfo> = new Map();
@@ -62,9 +60,11 @@ class TreeList implements Component {
 	public onCancel?: () => void;
 	public onLabelEdit?: (entryId: string, currentLabel: string | undefined) => void;
 
-	constructor(tree: SessionTreeNode[], currentLeafId: string | null, maxVisibleLines: number) {
-		this.currentLeafId = currentLeafId;
-		this.maxVisibleLines = maxVisibleLines;
+	constructor(
+		tree: SessionTreeNode[],
+		private readonly currentLeafId: string | null,
+		private readonly maxVisibleLines: number,
+	) {
 		this.multipleRoots = tree.length > 1;
 		this.flatNodes = this.flattenTree(tree);
 		this.buildActivePath();
@@ -745,12 +745,13 @@ class SearchLine implements Component {
 /** Label input component shown when editing a label */
 class LabelInput implements Component {
 	private input: Input;
-	private entryId: string;
 	public onSubmit?: (entryId: string, label: string | undefined) => void;
 	public onCancel?: () => void;
 
-	constructor(entryId: string, currentLabel: string | undefined) {
-		this.entryId = entryId;
+	constructor(
+		private readonly entryId: string,
+		currentLabel: string | undefined,
+	) {
 		this.input = new Input();
 		if (currentLabel) {
 			this.input.setValue(currentLabel);
@@ -789,7 +790,6 @@ export class TreeSelectorComponent extends Container {
 	private labelInput: LabelInput | null = null;
 	private labelInputContainer: Container;
 	private treeContainer: Container;
-	private onLabelChangeCallback?: (entryId: string, label: string | undefined) => void;
 
 	constructor(
 		tree: SessionTreeNode[],
@@ -797,11 +797,9 @@ export class TreeSelectorComponent extends Container {
 		terminalHeight: number,
 		onSelect: (entryId: string) => void,
 		onCancel: () => void,
-		onLabelChange?: (entryId: string, label: string | undefined) => void,
+		private readonly onLabelChangeCallback?: (entryId: string, label: string | undefined) => void,
 	) {
 		super();
-
-		this.onLabelChangeCallback = onLabelChange;
 		const maxVisibleLines = Math.max(5, Math.floor(terminalHeight / 2));
 
 		this.treeList = new TreeList(tree, currentLeafId, maxVisibleLines);

package/src/modes/components/ttsr-notification.ts

@@ -7,13 +7,11 @@ import { theme } from "../../modes/theme/theme";
  * Shows when a rule violation is detected and the stream is being rewound.
  */
 export class TtsrNotificationComponent extends Container {
-	private rules: Rule[];
 	private box: Box;
 	private _expanded = false;
 
-	constructor(rules: Rule[]) {
+	constructor(private readonly rules: Rule[]) {
 		super();
-		this.rules = rules;
 
 		this.addChild(new Spacer(1));
 

package/src/modes/components/user-message-selector.ts

@@ -12,17 +12,15 @@ interface UserMessageItem {
  * Custom user message list component with selection
  */
 class UserMessageList implements Component {
-	private messages: UserMessageItem[] = [];
 	private selectedIndex: number = 0;
 	public onSelect?: (entryId: string) => void;
 	public onCancel?: () => void;
 	private maxVisible: number = 10; // Max messages visible
 
-	constructor(messages: UserMessageItem[]) {
+	constructor(private readonly messages: UserMessageItem[]) {
 		// Store messages in chronological order (oldest to newest)
-		this.messages = messages;
 		// Start with the last (most recent) message selected
-		this.selectedIndex = Math.max(0, messages.length - 1);
+		this.selectedIndex = Math.max(0, this.messages.length - 1);
 	}
 
 	invalidate(): void {

package/src/modes/components/welcome.ts

@@ -17,25 +17,13 @@ export interface LspServerInfo {
  * Premium welcome screen with block-based OMP logo and two-column layout.
  */
 export class WelcomeComponent implements Component {
-	private version: string;
-	private modelName: string;
-	private providerName: string;
-	private recentSessions: RecentSession[];
-	private lspServers: LspServerInfo[];
-
 	constructor(
-		version: string,
-		modelName: string,
-		providerName: string,
-		recentSessions: RecentSession[] = [],
-		lspServers: LspServerInfo[] = [],
-	) {
-		this.version = version;
-		this.modelName = modelName;
-		this.providerName = providerName;
-		this.recentSessions = recentSessions;
-		this.lspServers = lspServers;
-	}
+		private readonly version: string,
+		private modelName: string,
+		private providerName: string,
+		private recentSessions: RecentSession[] = [],
+		private lspServers: LspServerInfo[] = [],
+	) {}
 
 	invalidate(): void {}
 

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

@@ -269,6 +269,7 @@ export class EventController {
 					this.ctx.streamingComponent = undefined;
 					this.ctx.streamingMessage = undefined;
 				}
+				await this.ctx.flushPendingModelSwitch();
 				this.ctx.pendingTools.clear();
 				this.ctx.ui.requestRender();
 				this.sendCompletionNotification();

package/src/modes/controllers/extension-ui-controller.ts

@@ -282,7 +282,7 @@ export class ExtensionUiController {
 				return true;
 			},
 			getThinkingLevel: () => this.ctx.session.thinkingLevel,
-			setThinkingLevel: level => this.ctx.session.setThinkingLevel(level),
+			setThinkingLevel: (level, persist) => this.ctx.session.setThinkingLevel(level, persist),
 		};
 		const contextActions: ExtensionContextActions = {
 			getModel: () => this.ctx.session.model,

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

@@ -1,16 +1,14 @@
-import { spawn } from "node:child_process";
 import * as fs from "node:fs/promises";
-import * as os from "node:os";
-import * as path from "node:path";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import { readImageFromClipboard } from "@oh-my-pi/pi-natives";
-import { $env, Snowflake } from "@oh-my-pi/pi-utils";
+import { $env } from "@oh-my-pi/pi-utils";
 import type { SettingPath, SettingValue } from "../../config/settings";
 import { settings } from "../../config/settings";
 import { theme } from "../../modes/theme/theme";
 import type { InteractiveModeContext } from "../../modes/types";
 import type { AgentSessionEvent } from "../../session/agent-session";
 import { SKILL_PROMPT_MESSAGE_TYPE, type SkillPromptDetails } from "../../session/messages";
+import { getEditorCommand, openInEditor } from "../../utils/external-editor";
 import { resizeImage } from "../../utils/image-resize";
 import { generateSessionTitle, setTerminalTitle } from "../../utils/title-generator";
 
@@ -601,7 +599,7 @@ export class InputController {
 		try {
 			const image = await readImageFromClipboard();
 			if (image) {
-				const base64Data = Buffer.from(image.data).toString("base64");
+				const base64Data = image.data.toBase64();
 				let imageData = { data: base64Data, mimeType: image.mimeType };
 				if (settings.get("images.autoResize")) {
 					try {
@@ -730,61 +728,36 @@ export class InputController {
 	}
 
 	async openExternalEditor(): Promise<void> {
-		// Determine editor (respect $VISUAL, then $EDITOR)
-		const editorCmd = $env.VISUAL || $env.EDITOR;
+		const editorCmd = getEditorCommand();
 		if (!editorCmd) {
 			this.ctx.showWarning("No editor configured. Set $VISUAL or $EDITOR environment variable.");
 			return;
 		}
 
 		const currentText = this.ctx.editor.getText();
-		const tmpFile = path.join(os.tmpdir(), `omp-editor-${Snowflake.next()}.omp.md`);
 
 		let ttyHandle: fs.FileHandle | null = null;
 		try {
-			// Write current content to temp file
-			await Bun.write(tmpFile, currentText);
-
-			// Stop TUI to release terminal
 			ttyHandle = await this.openEditorTerminalHandle();
 			this.ctx.ui.stop();
 
-			// Split by space to support editor arguments (e.g., "code --wait")
-			const [editor, ...editorArgs] = editorCmd.split(" ");
-
 			const stdio: [number | "inherit", number | "inherit", number | "inherit"] = ttyHandle
 				? [ttyHandle.fd, ttyHandle.fd, ttyHandle.fd]
 				: ["inherit", "inherit", "inherit"];
 
-			const child = spawn(editor, [...editorArgs, tmpFile], { stdio });
-			const exitCode = await new Promise<number>((resolve, reject) => {
-				child.once("exit", (code, signal) => resolve(code ?? (signal ? -1 : 0)));
-				child.once("error", error => reject(error));
-			});
-
-			// On successful exit (exitCode 0), replace editor content
-			if (exitCode === 0) {
-				const newContent = (await Bun.file(tmpFile).text()).replace(/\n$/, "");
-				this.ctx.editor.setText(newContent);
+			const result = await openInEditor(editorCmd, currentText, { extension: ".omp.md", stdio });
+			if (result !== null) {
+				this.ctx.editor.setText(result);
 			}
-			// On non-zero exit, keep original text (no action needed)
 		} catch (error) {
 			this.ctx.showWarning(
 				`Failed to open external editor: ${error instanceof Error ? error.message : String(error)}`,
 			);
 		} finally {
-			// Clean up temp file
-			try {
-				await fs.rm(tmpFile, { force: true });
-			} catch {
-				// Ignore cleanup errors
-			}
-
 			if (ttyHandle) {
 				await ttyHandle.close();
 			}
 
-			// Restart TUI
 			this.ctx.ui.start();
 			this.ctx.ui.requestRender();
 		}

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

@@ -27,7 +27,7 @@ import {
 } from "../../modes/theme/theme";
 import type { InteractiveModeContext } from "../../modes/types";
 import { SessionManager } from "../../session/session-manager";
-import { setPreferredImageProvider, setPreferredWebSearchProvider } from "../../tools";
+import { setPreferredImageProvider, setPreferredSearchProvider } from "../../tools";
 
 export class SelectorController {
 	constructor(private ctx: InteractiveModeContext) {}
@@ -180,7 +180,7 @@ export class SelectorController {
 				break;
 			case "thinkingLevel":
 			case "defaultThinkingLevel":
-				this.ctx.session.setThinkingLevel(value as ThinkingLevel);
+				this.ctx.session.setThinkingLevel(value as ThinkingLevel, true);
 				this.ctx.statusLine.invalidate();
 				this.ctx.updateEditorBorderColor();
 				break;
@@ -258,7 +258,7 @@ export class SelectorController {
 
 			// Provider settings - update runtime preferences
 			case "webSearchProvider":
-				setPreferredWebSearchProvider(value as "auto" | "exa" | "perplexity" | "anthropic");
+				setPreferredSearchProvider(value as "auto" | "exa" | "perplexity" | "anthropic");
 				break;
 			case "imageProvider":
 				setPreferredImageProvider(value as "auto" | "gemini" | "openrouter");

package/src/modes/interactive-mode.ts

@@ -136,6 +136,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	private readonly changelogMarkdown: string | undefined;
 	private planModePreviousTools: string[] | undefined;
 	private planModePreviousModel: Model | undefined;
+	private pendingModelSwitch: Model | undefined;
 	private planModeHasEntered = false;
 	public readonly lspServers:
 		| Array<{ name: string; status: "ready" | "error"; fileTypes: string[]; error?: string }>
@@ -533,6 +534,10 @@ export class InteractiveMode implements InteractiveModeContext {
 			return;
 		}
 		this.planModePreviousModel = currentModel;
+		if (this.session.isStreaming) {
+			this.pendingModelSwitch = planModel;
+			return;
+		}
 		try {
 			await this.session.setModelTemporary(planModel);
 		} catch (error) {
@@ -542,6 +547,20 @@ export class InteractiveMode implements InteractiveModeContext {
 		}
 	}
 
+	/** Apply any deferred model switch after the current stream ends. */
+	async flushPendingModelSwitch(): Promise<void> {
+		const model = this.pendingModelSwitch;
+		if (!model) return;
+		this.pendingModelSwitch = undefined;
+		try {
+			await this.session.setModelTemporary(model);
+		} catch (error) {
+			this.showWarning(
+				`Failed to switch model after streaming: ${error instanceof Error ? error.message : String(error)}`,
+			);
+		}
+	}
+
 	private async enterPlanMode(options?: {
 		planFilePath?: string;
 		workflow?: "parallel" | "iterative";
@@ -569,6 +588,9 @@ export class InteractiveMode implements InteractiveModeContext {
 			workflow: options?.workflow ?? "parallel",
 			reentry: this.planModeHasEntered,
 		});
+		if (this.session.isStreaming) {
+			await this.session.sendPlanModeContext({ deliverAs: "steer" });
+		}
 		this.planModeHasEntered = true;
 		await this.applyPlanModeModel();
 		this.updatePlanModeStatus();
@@ -585,7 +607,11 @@ export class InteractiveMode implements InteractiveModeContext {
 			await this.session.setActiveToolsByName(previousTools);
 		}
 		if (this.planModePreviousModel) {
-			await this.session.setModelTemporary(this.planModePreviousModel);
+			if (this.session.isStreaming) {
+				this.pendingModelSwitch = this.planModePreviousModel;
+			} else {
+				await this.session.setModelTemporary(this.planModePreviousModel);
+			}
 		}
 
 		this.session.setPlanModeState(undefined);

package/src/modes/rpc/rpc-client.ts

@@ -5,7 +5,7 @@
  */
 import type { AgentEvent, AgentMessage, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent } from "@oh-my-pi/pi-ai";
-import { createSanitizerStream, createSplitterStream, createTextDecoderStream, ptree } from "@oh-my-pi/pi-utils";
+import { createTextLineSplitter, ptree } from "@oh-my-pi/pi-utils";
 import type { BashResult } from "../../exec/bash-executor";
 import type { SessionStats } from "../../session/agent-session";
 import type { CompactionResult } from "../../session/compaction";
@@ -119,10 +119,7 @@ export class RpcClient {
 		});
 
 		// Process lines in background
-		const lines = this.process.stdout
-			.pipeThrough(createTextDecoderStream())
-			.pipeThrough(createSanitizerStream())
-			.pipeThrough(createSplitterStream("\n"));
+		const lines = this.process.stdout.pipeThrough(createTextLineSplitter(true));
 		this.lineReader = lines;
 		void (async () => {
 			try {

package/src/modes/rpc/rpc-mode.ts

@@ -10,7 +10,7 @@
  * - Events: AgentSessionEvent objects streamed as they occur
  * - Extension UI: Extension UI requests are emitted, client responds with extension_ui_response
  */
-import { readLines, Snowflake } from "@oh-my-pi/pi-utils";
+import { createTextLineSplitter, Snowflake } from "@oh-my-pi/pi-utils";
 import type { ExtensionUIContext, ExtensionUIDialogOptions } from "../../extensibility/extensions";
 import { type Theme, theme } from "../../modes/theme/theme";
 import type { AgentSession } from "../../session/agent-session";
@@ -633,7 +633,7 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 	}
 
 	// Listen for JSON input using Bun's stdin
-	for await (const line of readLines(Bun.stdin.stream())) {
+	for await (const line of Bun.stdin.stream().pipeThrough(createTextLineSplitter())) {
 		if (!line.trim()) continue;
 
 		const result = Bun.JSONL.parseChunk(`${line}\n`);

package/src/modes/theme/theme.ts

@@ -1221,19 +1221,15 @@ const langMap: Record<string, SymbolKey> = {
 export class Theme {
 	private fgColors: Record<ThemeColor, string>;
 	private bgColors: Record<ThemeBg, string>;
-	private mode: ColorMode;
 	private symbols: SymbolMap;
-	private symbolPreset: SymbolPreset;
 
 	constructor(
 		fgColors: Record<ThemeColor, string | number>,
 		bgColors: Record<ThemeBg, string | number>,
-		mode: ColorMode,
-		symbolPreset: SymbolPreset,
+		private readonly mode: ColorMode,
+		private readonly symbolPreset: SymbolPreset,
 		symbolOverrides: Partial<Record<SymbolKey, string>>,
 	) {
-		this.mode = mode;
-		this.symbolPreset = symbolPreset;
 		this.fgColors = {} as Record<ThemeColor, string>;
 		for (const [key, value] of Object.entries(fgColors) as [ThemeColor, string | number][]) {
 			this.fgColors[key] = fgAnsi(value, mode);

package/src/modes/types.ts

@@ -114,6 +114,7 @@ export interface InteractiveModeContext {
 	queueCompactionMessage(text: string, mode: "steer" | "followUp"): void;
 	flushCompactionQueue(options?: { willRetry?: boolean }): Promise<void>;
 	flushPendingBashComponents(): void;
+	flushPendingModelSwitch(): Promise<void>;
 	setWorkingMessage(message?: string): void;
 	applyPendingWorkingMessage(): void;
 	isKnownSlashCommand(text: string): boolean;

package/src/modes/utils/ui-helpers.ts

@@ -127,10 +127,15 @@ export class UiHelpers {
 			case "fileMention": {
 				// Render compact file mention display
 				for (const file of message.files) {
+					const suffix = file.image
+						? "(image)"
+						: file.lineCount === undefined
+							? "(unknown lines)"
+							: `(${file.lineCount} lines)`;
 					const text = `${theme.fg("dim", `${theme.tree.last} `)}${theme.fg("muted", "Read")} ${theme.fg(
 						"accent",
 						file.path,
-					)} ${theme.fg("dim", `(${file.lineCount} lines)`)}`;
+					)} ${theme.fg("dim", suffix)}`;
 					this.ctx.chatContainer.addChild(new Text(text, 0, 0));
 				}
 				break;

package/src/patch/index.ts

@@ -205,15 +205,12 @@ export class EditTool implements AgentTool<TInput> {
 	public readonly nonAbortable = true;
 	public readonly concurrency = "exclusive";
 
-	private readonly session: ToolSession;
 	private readonly allowFuzzy: boolean;
 	private readonly fuzzyThreshold: number;
 	private readonly writethrough: WritethroughCallback;
 	private readonly envEditVariant: string;
 
-	constructor(session: ToolSession) {
-		this.session = session;
-
+	constructor(private readonly session: ToolSession) {
 		const {
 			PI_EDIT_FUZZY: editFuzzy = "auto",
 			PI_EDIT_FUZZY_THRESHOLD: editFuzzyThreshold = "auto",

package/src/prompts/agents/explore.md

@@ -3,6 +3,7 @@ name: explore
 description: Fast read-only codebase scout returning compressed context for handoff
 tools: read, grep, find, bash
 model: pi/smol, haiku-4.5, haiku-4-5, gemini-flash-latest, gemini-3-flash, zai-glm-4.7, glm-4.7-flash, glm-4.5-flash, gpt-5.1-codex-mini, haiku, flash, mini
+thinking-level: minimal
 output:
   properties:
     query:

package/src/prompts/agents/frontmatter.md

@@ -1,8 +1,9 @@
 ---
+
 name: {{jsonStringify name}}
 description: {{jsonStringify description}}
 {{#if spawns}}spawns: {{jsonStringify spawns}}
 {{/if}}{{#if model}}model: {{jsonStringify model}}
-{{/if}}{{#if thinkingLevel}}thinkingLevel: {{jsonStringify thinkingLevel}}
+{{/if}}{{#if thinkingLevel}}thinking-level: {{jsonStringify thinkingLevel}}
 {{/if}}---
 {{body}}

package/src/prompts/agents/init.md

@@ -1,6 +1,7 @@
 ---
 name: init
 description: Generate AGENTS.md for current codebase
+thinking-level: medium
 ---
 
 <task>

package/src/prompts/agents/plan.md

@@ -4,6 +4,7 @@ description: Software architect for complex multi-file architectural decisions.
 tools: read, grep, find, bash
 spawns: explore
 model: pi/plan, pi/slow, gpt-5.2-codex, gpt-5.2, codex, gpt, opus-4.5, opus-4-5, gemini-3-pro
+thinking-level: high
 ---
 
 <critical>

package/src/prompts/agents/reviewer.md

@@ -4,6 +4,7 @@ description: "Code review specialist for quality/security analysis"
 tools: read, grep, find, bash, report_finding
 spawns: explore, task
 model: pi/slow, gpt-5.2-codex, gpt-5.2, codex, gpt
+thinking-level: high
 output:
   properties:
     overall_correctness:

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

@@ -5,5 +5,7 @@ Your only available action now is to call submit_result. Choose one:
 - If task is complete: call submit_result with your result data
 - If task failed or was interrupted: call submit_result with status="aborted" and describe what happened
 
+Do NOT choose aborted if you can still complete the task through exploration (using available tools or repo context). If you must abort, include what you tried and the exact blocker.
+
 Do NOT output text without a tool call. You must call submit_result to finish.
 </system-reminder>

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

@@ -27,5 +27,7 @@ For additional parent conversation context, check {{contextFile}} (`tail -100` o
 ```
 {{/if}}
 - If cannot complete, call `submit_result` exactly once with result indicating failure/abort status (use failure/notes field if available). Do not claim success.
+- Do NOT abort due to uncertainty or missing info that can be obtained via tools or repo context. Use `find`/`grep`/`read` first, then proceed with reasonable defaults if multiple options are acceptable.
+- Aborting is only acceptable when truly blocked after exhausting tools and reasonable attempts. If you abort, include what you tried and the exact blocker in the result.
 - Keep going until request is fully fulfilled. This matters.
 </critical>

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

@@ -0,0 +1,8 @@
+{{#if context}}
+<swarm_context>{{context}}</swarm_context>
+
+# Your Assignment
+{{assignment}}
+{{else}}
+{{assignment}}
+{{/if}}

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

@@ -37,10 +37,11 @@ State assumptions before non-trivial work. Format:
 ASSUMPTIONS:
 1. [assumption]
 2. [assumption]
-→ Then proceed. User will interrupt if wrong.
 ```
+Proceed without confirmation. User can interrupt if wrong.
 
 Do NOT use ask tool to confirm assumptions. State them, then act. Asking for confirmation wastes a round-trip on questions where "yes, proceed" is the obvious answer.
+Do NOT ask for file paths the user implies or you can resolve from repo context. If a file is referenced, locate and read it.
 
 Before finishing (within requested scope):
 - Can this be simpler?
@@ -154,7 +155,7 @@ Continue non-destructively; someone's work may live there.
 
 <procedure>
 ## Before action
-0. **CHECKPOINT** — multi-step/multi-file/ambiguous tasks: pause before acting:
+0. **CHECKPOINT** — multi-step/multi-file/ambiguous tasks: do a brief internal checkpoint, then continue in the same response (do not wait for user input):
    - Distinct work streams? Dependencies?
 {{#has tools "task"}}
    - Parallel via Task tool, or sequential?
@@ -169,7 +170,7 @@ Continue non-destructively; someone's work may live there.
 1. Plan if task has weight: 3–7 bullets, no more.
 2. Before each tool call: state intent in one sentence.
 3. After each tool call: interpret, decide, move; no echo.
-4. Requirements conflict/unclear: stop, name confusion, ask resolution before proceeding.
+4. Requirements conflict/unclear: if genuinely blocked **ONLY AFTER** exhausting your exploration with tools/context/files, ask.
 5. If requested change includes refactor: remove now-unused elements; note removals.
 
 ## Verification
@@ -328,6 +329,7 @@ Keep going until finished.
 - Blocked: show evidence, what tried, ask minimum question.
 - Quote only needed; rest noise.
 - Don't claim unverified correctness.
+- Do not ask when it may be obtained from available tools or repo context/files.
 - CHECKPOINT step 0 not optional.
 - Touch only requested; no incidental refactors/cleanup.
 {{#has tools "ask"}}- If files differ from expectations: ask before discarding uncommitted work.{{/has}}