@oh-my-pi/pi-coding-agent 9.3.1 → 9.6.0

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

@@ -3,6 +3,7 @@ import type { OAuthProvider } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Input, Loader, Spacer, Text } from "@oh-my-pi/pi-tui";
 import { getAgentDbPath } from "../../config";
+import { settings } from "../../config/settings";
 import { DebugSelectorComponent } from "../../debug";
 import { disableProvider, enableProvider } from "../../discovery";
 import { AssistantMessageComponent } from "../../modes/components/assistant-message";
@@ -51,7 +52,6 @@ export class SelectorController {
 		getAvailableThemes().then(availableThemes => {
 			this.showSelector(done => {
 				const selector = new SettingsSelectorComponent(
-					this.ctx.settingsManager,
 					{
 						availableThinkingLevels: this.ctx.session.getAvailableThinkingLevels(),
 						thinkingLevel: this.ctx.session.thinkingLevel,
@@ -68,10 +68,16 @@ export class SelectorController {
 								}
 							});
 						},
-						onStatusLinePreview: settings => {
+						onStatusLinePreview: previewSettings => {
 							// Update status line with preview settings
-							const currentSettings = this.ctx.settingsManager.getStatusLineSettings();
-							this.ctx.statusLine.updateSettings({ ...currentSettings, ...settings });
+							this.ctx.statusLine.updateSettings({
+								preset: settings.get("statusLine.preset"),
+								leftSegments: settings.get("statusLine.leftSegments"),
+								rightSegments: settings.get("statusLine.rightSegments"),
+								separator: settings.get("statusLine.separator"),
+								showHookStatus: settings.get("statusLine.showHookStatus"),
+								...previewSettings,
+							});
 							this.ctx.updateEditorTopBorder();
 							this.ctx.ui.requestRender();
 						},
@@ -86,7 +92,13 @@ export class SelectorController {
 						onCancel: () => {
 							done();
 							// Restore status line to saved settings
-							this.ctx.statusLine.updateSettings(this.ctx.settingsManager.getStatusLineSettings());
+							this.ctx.statusLine.updateSettings({
+								preset: settings.get("statusLine.preset"),
+								leftSegments: settings.get("statusLine.leftSegments"),
+								rightSegments: settings.get("statusLine.rightSegments"),
+								separator: settings.get("statusLine.separator"),
+								showHookStatus: settings.get("statusLine.showHookStatus"),
+							});
 							this.ctx.updateEditorTopBorder();
 							this.ctx.ui.requestRender();
 						},
@@ -123,11 +135,7 @@ export class SelectorController {
 	 * Replaces /status with a unified view of all providers and extensions.
 	 */
 	async showExtensionsDashboard(): Promise<void> {
-		const dashboard = await ExtensionDashboard.create(
-			process.cwd(),
-			this.ctx.settingsManager,
-			this.ctx.ui.terminal.rows,
-		);
+		const dashboard = await ExtensionDashboard.create(process.cwd(), this.ctx.settings, this.ctx.ui.terminal.rows);
 		this.showSelector(done => {
 			dashboard.onClose = () => {
 				done();
@@ -142,7 +150,7 @@ export class SelectorController {
 	 * Most settings are saved directly via SettingsManager in the definitions.
 	 * This handles side effects and session-specific settings.
 	 */
-	handleSettingChange(id: string, value: string | boolean): void {
+	handleSettingChange(id: string, value: unknown): void {
 		// Discovery provider toggles
 		if (id.startsWith("discovery.")) {
 			const providerId = id.replace("discovery.", "");
@@ -232,7 +240,15 @@ export class SelectorController {
 			case "statusLineGitShowUntracked":
 			case "statusLineTimeFormat":
 			case "statusLineTimeShowSeconds": {
-				this.ctx.statusLine.updateSettings(this.ctx.settingsManager.getStatusLineSettings());
+				const statusLineSettings = {
+					preset: settings.get("statusLine.preset"),
+					leftSegments: settings.get("statusLine.leftSegments"),
+					rightSegments: settings.get("statusLine.rightSegments"),
+					separator: settings.get("statusLine.separator"),
+					showHookStatus: settings.get("statusLine.showHookStatus"),
+					segmentOptions: settings.get("statusLine.segmentOptions"),
+				};
+				this.ctx.statusLine.updateSettings(statusLineSettings);
 				this.ctx.updateEditorTopBorder();
 				this.ctx.ui.requestRender();
 				break;
@@ -256,7 +272,7 @@ export class SelectorController {
 			const selector = new ModelSelectorComponent(
 				this.ctx.ui,
 				this.ctx.session.model,
-				this.ctx.settingsManager,
+				this.ctx.settings,
 				this.ctx.session.modelRegistry,
 				this.ctx.session.scopedModels,
 				async (model, role) => {
@@ -369,7 +385,7 @@ export class SelectorController {
 					let wantsSummary = false;
 					let customInstructions: string | undefined;
 
-					const branchSummariesEnabled = this.ctx.settingsManager.getBranchSummaryEnabled();
+					const branchSummariesEnabled = settings.get("branchSummary.enabled");
 
 					while (branchSummariesEnabled) {
 						const summaryChoice = await this.ctx.showHookSelector("Summarize branch?", [

package/src/modes/interactive-mode.ts

@@ -19,7 +19,7 @@ import { isEnoent, logger, postmortem } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
 import { KeybindingsManager } from "../config/keybindings";
 import { renderPromptTemplate } from "../config/prompt-templates";
-import type { SettingsManager } from "../config/settings-manager";
+import { type Settings, settings } from "../config/settings";
 import type { ExtensionUIContext, ExtensionUIDialogOptions } from "../extensibility/extensions";
 import type { CompactOptions } from "../extensibility/extensions/types";
 import { loadSlashCommands } from "../extensibility/slash-commands";
@@ -72,7 +72,7 @@ export interface InteractiveModeOptions {
 export class InteractiveMode implements InteractiveModeContext {
 	public session: AgentSession;
 	public sessionManager: SessionManager;
-	public settingsManager: SettingsManager;
+	public settings: Settings;
 	public keybindings: KeybindingsManager;
 	public agent: AgentSession["agent"];
 	public historyStorage?: HistoryStorage;
@@ -159,7 +159,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	) {
 		this.session = session;
 		this.sessionManager = session.sessionManager;
-		this.settingsManager = session.settingsManager;
+		this.settings = session.settings;
 		this.keybindings = KeybindingsManager.inMemory();
 		this.agent = session.agent;
 		this.version = version;
@@ -168,7 +168,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.lspServers = lspServers;
 		this.mcpManager = mcpManager;
 
-		this.ui = new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor());
+		this.ui = new TUI(new ProcessTerminal(), settings.get("showHardwareCursor"));
 		setMermaidRenderCallback(() => this.ui.requestRender());
 		this.chatContainer = new Container();
 		this.pendingMessagesContainer = new Container();
@@ -193,7 +193,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.statusLine = new StatusLineComponent(session);
 		this.statusLine.setAutoCompactEnabled(session.autoCompactionEnabled);
 
-		this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
+		this.hideThinkingBlock = settings.get("hideThinkingBlock");
 
 		// Define slash commands for autocomplete
 		const slashCommands: SlashCommand[] = [
@@ -240,7 +240,7 @@ export class InteractiveMode implements InteractiveModeContext {
 
 		// Build skill commands from session.skills (if enabled)
 		const skillCommandList: SlashCommand[] = [];
-		if (this.settingsManager.getEnableSkillCommands?.()) {
+		if (settings.get("skills.enableSkillCommands")) {
 			for (const skill of this.session.skills) {
 				const commandName = `skill:${skill.name}`;
 				this.skillCommands.set(commandName, skill.filePath);
@@ -300,7 +300,7 @@ export class InteractiveMode implements InteractiveModeContext {
 				fileTypes: s.fileTypes,
 			})) ?? [];
 
-		const startupQuiet = this.settingsManager.getStartupQuiet();
+		const startupQuiet = settings.get("startup.quiet");
 
 		if (!startupQuiet) {
 			// Add welcome header
@@ -314,7 +314,7 @@ export class InteractiveMode implements InteractiveModeContext {
 			// Add changelog if provided
 			if (this.changelogMarkdown) {
 				this.ui.addChild(new DynamicBorder());
-				if (this.settingsManager.getCollapseChangelog()) {
+				if (settings.get("collapseChangelog")) {
 					const versionMatch = this.changelogMarkdown.match(/##\s+\[?(\d+\.\d+\.\d+)\]?/);
 					const latestVersion = versionMatch ? versionMatch[1] : this.version;
 					const condensedText = `Updated to v${latestVersion}. Use ${theme.bold("/changelog")} to view full changelog.`;
@@ -330,7 +330,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		}
 
 		// Set terminal title if session already has one (resumed session)
-		const existingTitle = this.sessionManager.getSessionTitle();
+		const existingTitle = this.sessionManager.getSessionName();
 		if (existingTitle) {
 			setTerminalTitle(`pi: ${existingTitle}`);
 		}
@@ -494,7 +494,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	private resolvePlanFilePath(planFilePath: string): string {
 		if (planFilePath.startsWith("plan://")) {
 			return resolvePlanUrlToPath(planFilePath, {
-				getPlansDirectory: this.settingsManager.getPlansDirectory.bind(this.settingsManager),
+				getPlansDirectory: () => this.settings.getPlansDirectory(),
 				cwd: this.sessionManager.getCwd(),
 			});
 		}

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

@@ -448,6 +448,7 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 					interruptMode: session.interruptMode,
 					sessionFile: session.sessionFile,
 					sessionId: session.sessionId,
+					sessionName: session.sessionName,
 					autoCompactionEnabled: session.autoCompactionEnabled,
 					messageCount: session.messages.length,
 					queuedMessageCount: session.queuedMessageCount,
@@ -594,6 +595,15 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 				return success(id, "get_last_assistant_text", { text });
 			}
 
+			case "set_session_name": {
+				const name = command.name.trim();
+				if (!name) {
+					return error(id, "set_session_name", "Session name cannot be empty");
+				}
+				session.setSessionName(name);
+				return success(id, "set_session_name");
+			}
+
 			// =================================================================
 			// Messages
 			// =================================================================

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

@@ -58,6 +58,7 @@ export type RpcCommand =
 	| { id?: string; type: "branch"; entryId: string }
 	| { id?: string; type: "get_branch_messages" }
 	| { id?: string; type: "get_last_assistant_text" }
+	| { id?: string; type: "set_session_name"; name: string }
 
 	// Messages
 	| { id?: string; type: "get_messages" };
@@ -76,6 +77,7 @@ export interface RpcSessionState {
 	interruptMode: "immediate" | "wait";
 	sessionFile?: string;
 	sessionId: string;
+	sessionName?: string;
 	autoCompactionEnabled: boolean;
 	messageCount: number;
 	queuedMessageCount: number;
@@ -166,6 +168,7 @@ export type RpcResponse =
 			success: true;
 			data: { text: string | null };
 	  }
+	| { id?: string; type: "response"; command: "set_session_name"; success: true }
 
 	// Messages
 	| { id?: string; type: "response"; command: "get_messages"; success: true; data: { messages: AgentMessage[] } }

package/src/modes/types.ts

@@ -2,7 +2,7 @@ import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, ImageContent, Message, UsageReport } from "@oh-my-pi/pi-ai";
 import type { Component, Container, Loader, Spacer, Text, TUI } from "@oh-my-pi/pi-tui";
 import type { KeybindingsManager } from "../config/keybindings";
-import type { SettingsManager } from "../config/settings-manager";
+import type { Settings } from "../config/settings";
 import type { ExtensionUIContext, ExtensionUIDialogOptions } from "../extensibility/extensions";
 import type { CompactOptions } from "../extensibility/extensions/types";
 import type { MCPManager } from "../mcp";
@@ -46,7 +46,7 @@ export interface InteractiveModeContext {
 	// Session access
 	session: AgentSession;
 	sessionManager: SessionManager;
-	settingsManager: SettingsManager;
+	settings: Settings;
 	keybindings: KeybindingsManager;
 	agent: AgentSession["agent"];
 	historyStorage?: HistoryStorage;

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

@@ -1,6 +1,7 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, Message } from "@oh-my-pi/pi-ai";
 import { Spacer, Text, TruncatedText } from "@oh-my-pi/pi-tui";
+import { settings } from "../../config/settings";
 import { AssistantMessageComponent } from "../../modes/components/assistant-message";
 import { BashExecutionComponent } from "../../modes/components/bash-execution";
 import { BranchSummaryMessageComponent } from "../../modes/components/branch-summary-message";
@@ -224,9 +225,9 @@ export class UiHelpers {
 						content.name,
 						content.arguments,
 						{
-							showImages: this.ctx.settingsManager.getShowImages(),
-							editFuzzyThreshold: this.ctx.settingsManager.getEditFuzzyThreshold(),
-							editAllowFuzzy: this.ctx.settingsManager.getEditFuzzyMatch(),
+							showImages: settings.get("terminal.showImages"),
+							editFuzzyThreshold: settings.get("edit.fuzzyThreshold"),
+							editAllowFuzzy: settings.get("edit.fuzzyMatch"),
 						},
 						tool,
 						this.ctx.ui,

package/src/patch/index.ts

@@ -26,7 +26,7 @@ import { outputMeta } from "../tools/output-meta";
 import { enforcePlanModeWrite, resolvePlanPath } from "../tools/plan-mode-guard";
 import { applyPatch } from "./applicator";
 import { generateDiffString, generateUnifiedDiffString, replaceText } from "./diff";
-import { DEFAULT_FUZZY_THRESHOLD, findMatch } from "./fuzzy";
+import { findMatch } from "./fuzzy";
 import { detectLineEnding, normalizeToLF, restoreLineEndings, stripBom } from "./normalize";
 import { buildNormativeUpdateInput } from "./normative";
 import { type EditToolDetails, getLspBatchRequest } from "./shared";
@@ -233,14 +233,14 @@ export class EditTool implements AgentTool<TInput> {
 				this.allowFuzzy = false;
 				break;
 			case "auto":
-				this.allowFuzzy = session.settings?.getEditFuzzyMatch() ?? true;
+				this.allowFuzzy = session.settings.get("edit.fuzzyMatch");
 				break;
 			default:
 				throw new Error(`Invalid OMP_EDIT_FUZZY: ${editFuzzy}`);
 		}
 		switch (editFuzzyThreshold) {
 			case "auto":
-				this.fuzzyThreshold = session.settings?.getEditFuzzyThreshold?.() ?? DEFAULT_FUZZY_THRESHOLD;
+				this.fuzzyThreshold = session.settings.get("edit.fuzzyThreshold");
 				break;
 			default:
 				this.fuzzyThreshold = parseFloat(editFuzzyThreshold);
@@ -251,8 +251,8 @@ export class EditTool implements AgentTool<TInput> {
 		}
 
 		const enableLsp = session.enableLsp ?? true;
-		const enableDiagnostics = enableLsp ? (session.settings?.getLspDiagnosticsOnEdit() ?? false) : false;
-		const enableFormat = enableLsp ? (session.settings?.getLspFormatOnWrite() ?? true) : false;
+		const enableDiagnostics = enableLsp && session.settings.get("lsp.diagnosticsOnEdit");
+		const enableFormat = enableLsp && session.settings.get("lsp.formatOnWrite");
 		this.writethrough = enableLsp
 			? createLspWritethrough(session.cwd, { enableFormat, enableDiagnostics })
 			: writethroughNoop;
@@ -268,11 +268,11 @@ export class EditTool implements AgentTool<TInput> {
 
 		// Auto mode: check model-specific settings
 		const activeModel = this.session.getActiveModelString?.();
-		const modelVariant = this.session.settings?.getEditVariantForModel?.(activeModel);
+		const modelVariant = this.session.settings.getEditVariantForModel(activeModel);
 		if (modelVariant === "replace") return false;
 		if (modelVariant === "patch") return true;
 
-		return this.session.settings?.getEditPatchMode?.() ?? true;
+		return this.session.settings.get("edit.patchMode");
 	}
 
 	/**

package/src/patch/normalize.ts

@@ -4,6 +4,8 @@
  * Handles line endings, BOM, whitespace, and Unicode normalization.
  */
 
+import { padding } from "@oh-my-pi/pi-tui";
+
 // ═══════════════════════════════════════════════════════════════════════════
 // Line Ending Utilities
 // ═══════════════════════════════════════════════════════════════════════════
@@ -194,7 +196,7 @@ export function convertLeadingTabsToSpaces(text: string, spacesPerTab: number):
 			if (trimmed.length === 0) return line;
 			const leading = getLeadingWhitespace(line);
 			if (!leading.includes("\t") || leading.includes(" ")) return line;
-			const converted = " ".repeat(leading.length * spacesPerTab);
+			const converted = padding(leading.length * spacesPerTab);
 			return converted + trimmed;
 		})
 		.join("\n");

package/src/prompts/system/plan-mode-active.md

@@ -18,6 +18,7 @@ Create your plan at `{{planFilePath}}`.
 {{/if}}
 
 The plan file is the ONLY file you may write or edit.
+Use `{{editToolName}}` for incremental updates; use `{{writeToolName}}` only when creating or fully replacing the plan.
 
 <important>
 Plan execution runs in a fresh context (session cleared). Make the plan file self-contained: include any requirements, decisions, key findings, and remaining todos needed to continue without prior session history.
@@ -55,8 +56,8 @@ Use `ask` to clarify:
 - Preferences for UI/UX, performance, edge cases
 
 Batch questions. Do not ask what you can answer by exploring.
-### 3. Write Incrementally
-Update the plan file as you learn. Do not wait until the end.
+### 3. Update Incrementally
+Use `{{editToolName}}` to update the plan file as you learn. Do not wait until the end.
 ### 4. Calibrate
 - Large unspecified task → multiple interview rounds
 - Smaller task → fewer or no questions
@@ -86,8 +87,8 @@ Draft approach based on exploration. Consider trade-offs briefly, then choose.
 ### Phase 3: Review
 Read critical files. Verify plan matches original request. Use `ask` to clarify remaining questions.
 
-### Phase 4: Write Plan
-Write to `{{planFilePath}}`:
+### Phase 4: Update Plan
+Update `{{planFilePath}}` (use `{{editToolName}}` for changes, `{{writeToolName}}` only if creating from scratch):
 - Recommended approach only
 - Paths of critical files to modify
 - Verification section

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

@@ -330,7 +330,6 @@ Write what you can defend.
 {{#if isCoordinator}}
 {{#has tools "task"}}
 <critical id="coordinator">
-As the coordinator, **ALWAYS prefer** delegation via Task tool for all SUBSTANTIAL work.
 Your context window is limited—especially the output. Work in discrete steps and run each step using Task tool. Avoid putting substantial work in the main context when possible. Run multiple tasks in parallel whenever possible.
 
 ## Triggers requiring Task tool

package/src/prompts/tools/bash.md

@@ -12,7 +12,7 @@ Executes a bash command in a shell session for terminal operations like git, bun
 
 <output>
 Returns stdout, stderr, and exit code from command execution.
-- Output truncated after 50KB or 2000 lines (whichever comes first); use `| head -n 50` for large output
+- Output truncated after 50KB or 2000 lines (whichever comes first); use `head` parameter to limit output
 - If output is truncated, full output is stored under $ARTIFACTS and referenced as `artifact://<id>` in metadata
 - Exit codes shown on non-zero exit; stderr captured
 </output>
@@ -24,4 +24,14 @@ Do NOT use Bash for these operations—specialized tools exist:
 - Finding files by pattern → Find tool
 - Content-addressed edits → Edit tool
 - Writing new files → Write tool
-</critical>
+</critical>
+
+<avoid>
+Do NOT pipe through `head` or `tail`—use the `head` and `tail` parameters instead:
+- `command | head -n 50` → use `head: 50` parameter
+- `command | tail -n 100` → use `tail: 100` parameter
+
+The pipe pattern breaks streaming output and prevents artifact storage.
+
+Do NOT use `2>&1`—stdout and stderr are already merged.
+</avoid>