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

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) {}
 
@@ -278,6 +288,31 @@ export class SelectorController {
 				this.ctx.session.agent.temperature = temp >= 0 ? temp : undefined;
 				break;
 			}
+			case "topP": {
+				const topP = typeof value === "number" ? value : Number(value);
+				this.ctx.session.agent.topP = topP >= 0 ? topP : undefined;
+				break;
+			}
+			case "topK": {
+				const topK = typeof value === "number" ? value : Number(value);
+				this.ctx.session.agent.topK = topK >= 0 ? topK : undefined;
+				break;
+			}
+			case "minP": {
+				const minP = typeof value === "number" ? value : Number(value);
+				this.ctx.session.agent.minP = minP >= 0 ? minP : undefined;
+				break;
+			}
+			case "presencePenalty": {
+				const presencePenalty = typeof value === "number" ? value : Number(value);
+				this.ctx.session.agent.presencePenalty = presencePenalty >= 0 ? presencePenalty : undefined;
+				break;
+			}
+			case "repetitionPenalty": {
+				const repetitionPenalty = typeof value === "number" ? value : Number(value);
+				this.ctx.session.agent.repetitionPenalty = repetitionPenalty >= 0 ? repetitionPenalty : undefined;
+				break;
+			}
 			case "statusLinePreset":
 			case "statusLineSeparator":
 			case "statusLineShowHooks":
@@ -600,6 +635,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 +649,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 +682,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 +700,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/patch/index.ts

@@ -104,8 +104,8 @@ const patchEditSchema = Type.Object({
 export type ReplaceParams = Static<typeof replaceEditSchema>;
 export type PatchParams = Static<typeof patchEditSchema>;
 
-/** Pattern matching hashline display format: `LINE#ID:CONTENT` */
-const HASHLINE_PREFIX_RE = /^\s*(?:>>>|>>)?\s*\d+#[0-9a-zA-Z]{1,16}:/;
+/** Pattern matching hashline display format prefixes: `LINE#ID:CONTENT` and `#ID:CONTENT` */
+const HASHLINE_PREFIX_RE = /^\s*(?:>>>|>>)?\s*(?:\d+\s*#\s*|#)\s*[0-9a-zA-Z]{1,16}:/;
 
 /** Pattern matching a unified-diff added-line `+` prefix (but not `++`). Does NOT match `-` to avoid corrupting Markdown list items. */
 const DIFF_PLUS_RE = /^[+](?![+])/;
@@ -118,8 +118,9 @@ const DIFF_PLUS_RE = /^[+](?![+])/;
  * output file. This strips them heuristically before application.
  */
 export function stripNewLinePrefixes(lines: string[]): string[] {
-	// Detect whether the *majority* of non-empty lines carry a prefix —
-	// if only one line out of many has a match it's likely real content.
+	// Hashline prefixes are highly specific to read output and should only be
+	// stripped when *every* non-empty line carries one.
+	// Diff '+' markers can be legitimate content less often, so keep majority mode.
 	let hashPrefixCount = 0;
 	let diffPlusCount = 0;
 	let nonEmpty = 0;
@@ -131,9 +132,8 @@ export function stripNewLinePrefixes(lines: string[]): string[] {
 	}
 	if (nonEmpty === 0) return lines;
 
-	const stripHash = hashPrefixCount > 0 && hashPrefixCount >= nonEmpty * 0.5;
+	const stripHash = hashPrefixCount > 0 && hashPrefixCount === nonEmpty;
 	const stripPlus = !stripHash && diffPlusCount > 0 && diffPlusCount >= nonEmpty * 0.5;
-
 	if (!stripHash && !stripPlus) return lines;
 
 	return lines.map(l => {
@@ -145,8 +145,7 @@ export function stripNewLinePrefixes(lines: string[]): string[] {
 
 export function hashlineParseText(edit: string[] | string | null): string[] {
 	if (edit === null) return [];
-	if (Array.isArray(edit)) return edit;
-	const lines = stripNewLinePrefixes(edit.split("\n"));
+	const lines = stripNewLinePrefixes(Array.isArray(edit) ? edit : edit.split("\n"));
 	if (lines.length === 0) return [];
 	if (lines[lines.length - 1].trim() === "") return lines.slice(0, -1);
 	return lines;

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
 

package/src/prompts/tools/hashline.md

@@ -40,7 +40,9 @@ Every edit has `op`, `pos`, and `lines`. Range replaces also have `end`. Both `p
 <rules>
 1. **Minimize scope:** You **MUST** use one logical mutation per operation.
 2. **Prefer insertion over neighbor rewrites:** You **SHOULD** anchor on structural boundaries (`}`, `]`, `},`), not interior lines.
-3. **Range end tag:** When replacing a block (e.g., an `if` body), the `end` tag **MUST** include the block's closing brace/bracket — not just the last interior line. Verify the `end` tag covers all lines being logically removed, including trailing `}`, `]`, or `)`. An off-by-one on `end` orphans a brace and breaks syntax.
+3. **Range end tag (inclusive):** `end` is inclusive and **MUST** point to the final line being replaced.
+   - If `lines` includes a closing boundary token (`}`, `]`, `)`, `);`, `},`), `end` **MUST** include the original boundary line.
+   - You **MUST NOT** set `end` to an interior line and then re-add the boundary token in `lines`; that duplicates the next surviving line.
 </rules>
 
 <recovery>
@@ -131,6 +133,48 @@ Range — add `end`:
 ```
 </example>
 
+<example name="inclusive end avoids duplicate boundary">
+```ts
+{{hlinefull 70 "if (ok) {"}}
+{{hlinefull 71 "  run();"}}
+{{hlinefull 72 "}"}}
+{{hlinefull 73 "after();"}}
+```
+Bad — `end` stops before `}` while `lines` already includes `}`:
+```
+{
+  path: "…",
+  edits: [{
+    op: "replace",
+    pos: "{{hlineref 70 "if (ok) {"}}",
+    end: "{{hlineref 71 "  run();"}}",
+    lines: [
+      "if (ok) {",
+      "  runSafe();",
+      "}"
+    ]
+  }]
+}
+```
+Good — include original `}` in the replaced range when replacement keeps `}`:
+```
+{
+  path: "…",
+  edits: [{
+    op: "replace",
+    pos: "{{hlineref 70 "if (ok) {"}}",
+    end: "{{hlineref 72 "}"}}",
+    lines: [
+      "if (ok) {",
+      "  runSafe();",
+      "}"
+    ]
+  }]
+}
+```
+Also apply the same rule to `);`, `],`, and `},` closers: if replacement includes the closer token, `end` must include the original closer line.
+</example>
+
 <example name="insert between siblings">
 ```ts
 {{hlinefull 44 "  \"build\": \"bun run compile\","}}

package/src/prompts/tools/task-summary.md

@@ -20,9 +20,9 @@
 {{/unless}}
 {{/each}}
 
-{{#if patchApplySummary}}
-<patch-summary>
-{{patchApplySummary}}
-</patch-summary>
+{{#if mergeSummary}}
+<merge-summary>
+{{mergeSummary}}
+</merge-summary>
 {{/if}}
 </task-summary>

package/src/prompts/tools/task.md

@@ -16,7 +16,7 @@ Subagents lack your conversation history. Every decision, file content, and user
 - `context`: Shared background prepended to every assignment. Session-specific info only.
 - `schema`: JTD schema for expected output. Format lives here — **MUST NOT** be duplicated in assignments.
 - `tasks`: Tasks to execute in parallel.
-- `isolated`: Run in isolated git worktree; returns patches. Use when tasks edit overlapping files.
+- `isolated`: Run in isolated environment; returns patches. Use when tasks edit overlapping files.
 </parameters>
 
 <critical>

package/src/sdk.ts

@@ -1120,6 +1120,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	});
 
 	const repeatToolDescriptions = settings.get("repeatToolDescriptions");
+	const eagerTasks = settings.get("task.eager");
 	const intentField = settings.get("tools.intentTracing") || $env.PI_INTENT_TRACING === "1" ? INTENT_FIELD : undefined;
 	const rebuildSystemPrompt = async (toolNames: string[], tools: Map<string, AgentTool>): Promise<string> => {
 		toolContextStore.setToolNames(toolNames);
@@ -1135,6 +1136,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			skillsSettings: settings.getGroup("skills") as SkillsSettings,
 			appendSystemPrompt: memoryInstructions,
 			repeatToolDescriptions,
+			eagerTasks,
 			intentField,
 		});
 
@@ -1154,6 +1156,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				customPrompt: options.systemPrompt,
 				appendSystemPrompt: memoryInstructions,
 				repeatToolDescriptions,
+				eagerTasks,
 				intentField,
 			});
 		}
@@ -1278,6 +1281,11 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		interruptMode: settings.get("interruptMode") ?? "immediate",
 		thinkingBudgets: settings.getGroup("thinkingBudgets"),
 		temperature: settings.get("temperature") >= 0 ? settings.get("temperature") : undefined,
+		topP: settings.get("topP") >= 0 ? settings.get("topP") : undefined,
+		topK: settings.get("topK") >= 0 ? settings.get("topK") : undefined,
+		minP: settings.get("minP") >= 0 ? settings.get("minP") : undefined,
+		presencePenalty: settings.get("presencePenalty") >= 0 ? settings.get("presencePenalty") : undefined,
+		repetitionPenalty: settings.get("repetitionPenalty") >= 0 ? settings.get("repetitionPenalty") : undefined,
 		kimiApiFormat: settings.get("providers.kimiApiFormat") ?? "anthropic",
 		preferWebsockets: preferOpenAICodexWebsockets,
 		getToolContext: tc => toolContextStore.getContext(tc),

package/src/slash-commands/builtin-registry.ts

@@ -259,7 +259,32 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 	{
 		name: "login",
 		description: "Login with OAuth provider",
-		handle: (_command, runtime) => {
+		inlineHint: "[redirect URL]",
+		allowArgs: true,
+		handle: (command, runtime) => {
+			const manualInput = runtime.ctx.oauthManualInput;
+			const args = command.args.trim();
+			if (args.length > 0) {
+				const submitted = manualInput.submit(args);
+				if (submitted) {
+					runtime.ctx.showStatus("OAuth callback received; completing login…");
+				} else {
+					runtime.ctx.showWarning("No OAuth login is waiting for a manual callback.");
+				}
+				runtime.ctx.editor.setText("");
+				return;
+			}
+
+			if (manualInput.hasPending()) {
+				const provider = manualInput.pendingProviderId;
+				const message = provider
+					? `OAuth login already in progress for ${provider}. Paste the redirect URL with /login <url>.`
+					: "OAuth login already in progress. Paste the redirect URL with /login <url>.";
+				runtime.ctx.showWarning(message);
+				runtime.ctx.editor.setText("");
+				return;
+			}
+
 			void runtime.ctx.showOAuthSelector("login");
 			runtime.ctx.editor.setText("");
 		},

package/src/system-prompt.ts

@@ -358,6 +358,8 @@ export interface BuildSystemPromptOptions {
 	rules?: Array<{ name: string; description?: string; path: string; globs?: string[] }>;
 	/** Intent field name injected into every tool schema. If set, explains the field in the prompt. */
 	intentField?: string;
+	/** Encourage the agent to delegate via tasks unless changes are trivial. */
+	eagerTasks?: boolean;
 }
 
 /** Build the system prompt with tools, guidelines, and context */
@@ -379,6 +381,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		preloadedSkills: providedPreloadedSkills,
 		rules,
 		intentField,
+		eagerTasks = false,
 	} = options;
 	const resolvedCwd = cwd ?? getProjectDir();
 	const preloadedSkills = providedPreloadedSkills;
@@ -535,6 +538,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		cwd: resolvedCwd,
 		intentTracing: !!intentField,
 		intentField: intentField ?? "",
+		eagerTasks,
 	};
 	return renderPromptTemplate(resolvedCustomPrompt ? customSystemPromptTemplate : systemPromptTemplate, data);
 }