@oh-my-pi/pi-coding-agent 10.2.2 → 10.3.0

package/src/config/settings-schema.ts

@@ -14,7 +14,47 @@
 // Schema Definition Types
 // ═══════════════════════════════════════════════════════════════════════════
 
-export type SettingTab = "behavior" | "tools" | "bash" | "display" | "ttsr" | "status" | "lsp" | "exa";
+export type SettingTab =
+	| "display"
+	| "agent"
+	| "input"
+	| "tools"
+	| "config"
+	| "services"
+	| "bash"
+	| "lsp"
+	| "ttsr"
+	| "status";
+
+/** Tab display metadata - icon is resolved via theme.symbol() */
+export type TabMetadata = { label: string; icon: `tab.${string}` };
+
+/** Ordered list of tabs for UI rendering (status excluded - custom menu) */
+export const SETTING_TABS: SettingTab[] = [
+	"display",
+	"agent",
+	"input",
+	"tools",
+	"config",
+	"services",
+	"bash",
+	"lsp",
+	"ttsr",
+];
+
+/** Tab display metadata - icon is a symbol key from theme.ts (tab.*) */
+export const TAB_METADATA: Record<SettingTab, { label: string; icon: `tab.${string}` }> = {
+	display: { label: "Display", icon: "tab.display" },
+	agent: { label: "Agent", icon: "tab.agent" },
+	input: { label: "Input", icon: "tab.input" },
+	tools: { label: "Tools", icon: "tab.tools" },
+	config: { label: "Config", icon: "tab.config" },
+	services: { label: "Services", icon: "tab.services" },
+	bash: { label: "Bash", icon: "tab.bash" },
+	lsp: { label: "LSP", icon: "tab.lsp" },
+	ttsr: { label: "TTSR", icon: "tab.ttsr" },
+	status: { label: "Status", icon: "tab.status" },
+};
 
 /** Status line segment identifiers */
 export type StatusLineSegmentId =
@@ -126,7 +166,7 @@ export const SETTINGS_SCHEMA = {
 		values: ["off", "minimal", "low", "medium", "high", "xhigh"] as const,
 		default: "off",
 		ui: {
-			tab: "display",
+			tab: "agent",
 			label: "Thinking level",
 			description: "Reasoning depth for thinking-capable models",
 			submenu: true,
@@ -135,14 +175,14 @@ export const SETTINGS_SCHEMA = {
 	hideThinkingBlock: {
 		type: "boolean",
 		default: false,
-		ui: { tab: "display", label: "Hide thinking", description: "Hide thinking blocks in assistant responses" },
+		ui: { tab: "agent", label: "Hide thinking", description: "Hide thinking blocks in assistant responses" },
 	},
 	steeringMode: {
 		type: "enum",
 		values: ["all", "one-at-a-time"] as const,
 		default: "one-at-a-time",
 		ui: {
-			tab: "behavior",
+			tab: "agent",
 			label: "Steering mode",
 			description: "How to process queued messages while agent is working",
 		},
@@ -152,7 +192,7 @@ export const SETTINGS_SCHEMA = {
 		values: ["all", "one-at-a-time"] as const,
 		default: "one-at-a-time",
 		ui: {
-			tab: "behavior",
+			tab: "agent",
 			label: "Follow-up mode",
 			description: "How to drain follow-up messages after a turn completes",
 		},
@@ -161,38 +201,29 @@ export const SETTINGS_SCHEMA = {
 		type: "enum",
 		values: ["immediate", "wait"] as const,
 		default: "immediate",
-		ui: { tab: "behavior", label: "Interrupt mode", description: "When steering messages interrupt tool execution" },
+		ui: { tab: "agent", label: "Interrupt mode", description: "When steering messages interrupt tool execution" },
 	},
 	doubleEscapeAction: {
 		type: "enum",
 		values: ["branch", "tree", "none"] as const,
 		default: "tree",
 		ui: {
-			tab: "behavior",
+			tab: "input",
 			label: "Double-escape action",
 			description: "Action when pressing Escape twice with empty editor",
 		},
 	},
 	shellPath: { type: "string", default: undefined },
-	shellForceBasic: {
-		type: "boolean",
-		default: true,
-		ui: {
-			tab: "bash",
-			label: "Force basic shell",
-			description: "Use bash/sh even if your default shell is different",
-		},
-	},
 	collapseChangelog: {
 		type: "boolean",
 		default: false,
-		ui: { tab: "behavior", label: "Collapse changelog", description: "Show condensed changelog after updates" },
+		ui: { tab: "input", label: "Collapse changelog", description: "Show condensed changelog after updates" },
 	},
 	normativeRewrite: {
 		type: "boolean",
 		default: false,
 		ui: {
-			tab: "behavior",
+			tab: "agent",
 			label: "Normative rewrite",
 			description: "Rewrite tool call arguments to normalized format in session history",
 		},
@@ -201,7 +232,7 @@ export const SETTINGS_SCHEMA = {
 		type: "boolean",
 		default: false,
 		ui: {
-			tab: "tools",
+			tab: "config",
 			label: "Read line numbers",
 			description: "Prepend line numbers to read tool output by default",
 		},
@@ -225,7 +256,7 @@ export const SETTINGS_SCHEMA = {
 		type: "boolean",
 		default: true,
 		ui: {
-			tab: "behavior",
+			tab: "agent",
 			label: "Auto-compact",
 			description: "Automatically compact context when it gets too large",
 		},
@@ -241,7 +272,7 @@ export const SETTINGS_SCHEMA = {
 	"branchSummary.enabled": {
 		type: "boolean",
 		default: false,
-		ui: { tab: "behavior", label: "Branch summaries", description: "Prompt to summarize when leaving a branch" },
+		ui: { tab: "agent", label: "Branch summaries", description: "Prompt to summarize when leaving a branch" },
 	},
 	"branchSummary.reserveTokens": { type: "number", default: 16384 },
 
@@ -253,7 +284,7 @@ export const SETTINGS_SCHEMA = {
 		type: "number",
 		default: 3,
 		ui: {
-			tab: "behavior",
+			tab: "agent",
 			label: "Retry max attempts",
 			description: "Maximum retry attempts on API errors",
 			submenu: true,
@@ -264,29 +295,77 @@ export const SETTINGS_SCHEMA = {
 	// ─────────────────────────────────────────────────────────────────────────
 	// Todo completion settings
 	// ─────────────────────────────────────────────────────────────────────────
-	"todoCompletion.enabled": {
+	"todo.reminders": {
 		type: "boolean",
 		default: false,
-		ui: { tab: "behavior", label: "Todo completion", description: "Remind agent to complete todos before stopping" },
+		ui: { tab: "agent", label: "Todo reminders", description: "Remind agent to complete todos before stopping" },
 	},
-	"todoCompletion.maxReminders": {
+	"todo.reminders.max": {
 		type: "number",
 		default: 3,
 		ui: {
-			tab: "behavior",
+			tab: "agent",
 			label: "Todo max reminders",
 			description: "Maximum reminders to complete todos before giving up",
 			submenu: true,
 		},
 	},
 
+	// ─────────────────────────────────────────────────────────────────────────
+	// Optional tools
+	// ─────────────────────────────────────────────────────────────────────────
+	"todo.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "Enable Todos", description: "Enable the todo_write tool for task tracking" },
+	},
+	"find.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "Enable Find", description: "Enable the find tool for file searching" },
+	},
+	"grep.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "Enable Grep", description: "Enable the grep tool for content searching" },
+	},
+	"notebook.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "Enable Notebook", description: "Enable the notebook tool for notebook editing" },
+	},
+	"fetch.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "Enable Fetch", description: "Enable the fetch tool for URL fetching" },
+	},
+	"web_search.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "Enable Web Search", description: "Enable the web_search tool for web searching" },
+	},
+	"lsp.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "Enable LSP", description: "Enable the lsp tool for language server protocol" },
+	},
+	"calc.enabled": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "tools",
+			label: "Enable Calculator",
+			description: "Enable the calculator tool for basic calculations",
+		},
+	},
+
 	// ─────────────────────────────────────────────────────────────────────────
 	// Startup settings
 	// ─────────────────────────────────────────────────────────────────────────
 	"startup.quiet": {
 		type: "boolean",
 		default: false,
-		ui: { tab: "behavior", label: "Startup quiet", description: "Skip welcome screen and startup status messages" },
+		ui: { tab: "input", label: "Startup quiet", description: "Skip welcome screen and startup status messages" },
 	},
 
 	// ─────────────────────────────────────────────────────────────────────────
@@ -296,7 +375,7 @@ export const SETTINGS_SCHEMA = {
 		type: "enum",
 		values: ["auto", "bell", "osc99", "osc9", "off"] as const,
 		default: "auto",
-		ui: { tab: "behavior", label: "Completion notification", description: "Notify when the agent completes" },
+		ui: { tab: "input", label: "Completion notification", description: "Notify when the agent completes" },
 	},
 
 	// ─────────────────────────────────────────────────────────────────────────
@@ -306,7 +385,7 @@ export const SETTINGS_SCHEMA = {
 		type: "number",
 		default: 30,
 		ui: {
-			tab: "behavior",
+			tab: "input",
 			label: "Ask tool timeout",
 			description: "Auto-select recommended option after timeout (0 to disable)",
 			submenu: true,
@@ -316,7 +395,7 @@ export const SETTINGS_SCHEMA = {
 		type: "enum",
 		values: ["auto", "bell", "osc99", "osc9", "off"] as const,
 		default: "auto",
-		ui: { tab: "behavior", label: "Ask notification", description: "Notify when ask tool is waiting for input" },
+		ui: { tab: "input", label: "Ask notification", description: "Notify when ask tool is waiting for input" },
 	},
 
 	// ─────────────────────────────────────────────────────────────────────────
@@ -390,19 +469,29 @@ export const SETTINGS_SCHEMA = {
 		type: "enum",
 		values: ["auto", "exa", "perplexity", "anthropic"] as const,
 		default: "auto",
-		ui: { tab: "tools", label: "Web search provider", description: "Provider for web search tool", submenu: true },
+		ui: { tab: "services", label: "Web search provider", description: "Provider for web search tool", submenu: true },
 	},
 	"providers.image": {
 		type: "enum",
 		values: ["auto", "gemini", "openrouter"] as const,
 		default: "auto",
-		ui: { tab: "tools", label: "Image provider", description: "Provider for image generation tool", submenu: true },
+		ui: {
+			tab: "services",
+			label: "Image provider",
+			description: "Provider for image generation tool",
+			submenu: true,
+		},
 	},
 	"providers.kimiApiFormat": {
 		type: "enum",
 		values: ["openai", "anthropic"] as const,
 		default: "anthropic",
-		ui: { tab: "tools", label: "Kimi API format", description: "API format for Kimi Code provider", submenu: true },
+		ui: {
+			tab: "services",
+			label: "Kimi API format",
+			description: "API format for Kimi Code provider",
+			submenu: true,
+		},
 	},
 
 	// ─────────────────────────────────────────────────────────────────────────
@@ -411,32 +500,32 @@ export const SETTINGS_SCHEMA = {
 	"exa.enabled": {
 		type: "boolean",
 		default: true,
-		ui: { tab: "exa", label: "Exa enabled", description: "Master toggle for all Exa search tools" },
+		ui: { tab: "services", label: "Exa enabled", description: "Master toggle for all Exa search tools" },
 	},
 	"exa.enableSearch": {
 		type: "boolean",
 		default: true,
-		ui: { tab: "exa", label: "Exa search", description: "Basic search, deep search, code search, crawl" },
+		ui: { tab: "services", label: "Exa search", description: "Basic search, deep search, code search, crawl" },
 	},
 	"exa.enableLinkedin": {
 		type: "boolean",
 		default: false,
-		ui: { tab: "exa", label: "Exa LinkedIn", description: "Search LinkedIn for people and companies" },
+		ui: { tab: "services", label: "Exa LinkedIn", description: "Search LinkedIn for people and companies" },
 	},
 	"exa.enableCompany": {
 		type: "boolean",
 		default: false,
-		ui: { tab: "exa", label: "Exa company", description: "Comprehensive company research tool" },
+		ui: { tab: "services", label: "Exa company", description: "Comprehensive company research tool" },
 	},
 	"exa.enableResearcher": {
 		type: "boolean",
 		default: false,
-		ui: { tab: "exa", label: "Exa researcher", description: "AI-powered deep research tasks" },
+		ui: { tab: "services", label: "Exa researcher", description: "AI-powered deep research tasks" },
 	},
 	"exa.enableWebsets": {
 		type: "boolean",
 		default: false,
-		ui: { tab: "exa", label: "Exa websets", description: "Webset management and enrichment tools" },
+		ui: { tab: "services", label: "Exa websets", description: "Webset management and enrichment tools" },
 	},
 
 	// ─────────────────────────────────────────────────────────────────────────
@@ -458,15 +547,6 @@ export const SETTINGS_SCHEMA = {
 	},
 	// bashInterceptor.patterns is complex - handle separately
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Bash settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"bash.persistentShell": {
-		type: "boolean",
-		default: false,
-		ui: { tab: "bash", label: "Persistent shell", description: "Reuse shell session across commands (experimental)" },
-	},
-
 	// ─────────────────────────────────────────────────────────────────────────
 	// MCP settings
 	// ─────────────────────────────────────────────────────────────────────────
@@ -506,14 +586,14 @@ export const SETTINGS_SCHEMA = {
 		type: "enum",
 		values: ["ipy-only", "bash-only", "both"] as const,
 		default: "both",
-		ui: { tab: "tools", label: "Python tool mode", description: "How Python code is executed" },
+		ui: { tab: "config", label: "Python tool mode", description: "How Python code is executed" },
 	},
 	"python.kernelMode": {
 		type: "enum",
 		values: ["session", "per-call"] as const,
 		default: "session",
 		ui: {
-			tab: "tools",
+			tab: "config",
 			label: "Python kernel mode",
 			description: "Whether to keep IPython kernel alive across calls",
 		},
@@ -522,7 +602,7 @@ export const SETTINGS_SCHEMA = {
 		type: "boolean",
 		default: true,
 		ui: {
-			tab: "tools",
+			tab: "config",
 			label: "Python shared gateway",
 			description: "Share IPython kernel gateway across pi instances",
 		},
@@ -535,7 +615,7 @@ export const SETTINGS_SCHEMA = {
 		type: "boolean",
 		default: true,
 		ui: {
-			tab: "tools",
+			tab: "config",
 			label: "Edit fuzzy match",
 			description: "Accept high-confidence fuzzy matches for whitespace differences",
 		},
@@ -544,7 +624,7 @@ export const SETTINGS_SCHEMA = {
 		type: "number",
 		default: 0.95,
 		ui: {
-			tab: "tools",
+			tab: "config",
 			label: "Edit fuzzy threshold",
 			description: "Similarity threshold for fuzzy matches",
 			submenu: true,
@@ -553,13 +633,13 @@ export const SETTINGS_SCHEMA = {
 	"edit.patchMode": {
 		type: "boolean",
 		default: true,
-		ui: { tab: "tools", label: "Edit patch mode", description: "Use codex-style apply-patch format for edits" },
+		ui: { tab: "config", label: "Edit patch mode", description: "Use codex-style apply-patch format for edits" },
 	},
 	"edit.streamingAbort": {
 		type: "boolean",
 		default: false,
 		ui: {
-			tab: "tools",
+			tab: "config",
 			label: "Edit streaming abort",
 			description: "Abort streaming edit tool calls when patch preview fails",
 		},
@@ -822,7 +902,6 @@ export interface BashInterceptorRule {
 export interface GroupTypeMap {
 	compaction: CompactionSettings;
 	retry: RetrySettings;
-	todoCompletion: TodoCompletionSettings;
 	branchSummary: BranchSummarySettings;
 	skills: SkillsSettings;
 	commit: CommitSettings;

package/src/config/settings.ts

@@ -307,12 +307,6 @@ export class Settings {
 	 * Get shell configuration based on settings.
 	 */
 	getShellConfig() {
-		if (this.get("shellForceBasic")) {
-			const basicShell = procmgr.resolveBasicShell();
-			if (basicShell) {
-				return procmgr.getShellConfig(basicShell);
-			}
-		}
 		const shell = this.get("shellPath");
 		return procmgr.getShellConfig(shell);
 	}

package/src/cursor.ts

@@ -156,7 +156,8 @@ export class CursorExecHandlers implements ICursorExecHandlers {
 
 	async ls(args: Parameters<NonNullable<ICursorExecHandlers["ls"]>>[0]) {
 		const toolCallId = decodeToolCallId(args.toolCallId);
-		const toolResultMessage = await executeTool(this.options, "ls", toolCallId, { path: args.path });
+		// Redirect ls to read tool, which handles directories
+		const toolResultMessage = await executeTool(this.options, "read", toolCallId, { path: args.path });
 		return toolResultMessage;
 	}
 

package/src/extensibility/extensions/index.ts

@@ -56,7 +56,6 @@ export type {
 	InputEventResult,
 	KeybindingsManager,
 	LoadExtensionsResult,
-	LsToolResultEvent,
 	// Message Rendering
 	MessageRenderer,
 	MessageRenderOptions,
@@ -104,14 +103,4 @@ export type {
 	UserPythonEventResult,
 	WriteToolResultEvent,
 } from "./types";
-// Type guards
-export {
-	isBashToolResult,
-	isEditToolResult,
-	isFindToolResult,
-	isGrepToolResult,
-	isLsToolResult,
-	isReadToolResult,
-	isWriteToolResult,
-} from "./types";
 export { ExtensionToolWrapper, RegisteredToolAdapter, wrapRegisteredTool, wrapRegisteredTools } from "./wrapper";

package/src/extensibility/extensions/types.ts

@@ -28,7 +28,7 @@ import type {
 	SessionEntry,
 	SessionManager,
 } from "../../session/session-manager";
-import type { BashToolDetails, FindToolDetails, GrepToolDetails, LsToolDetails, ReadToolDetails } from "../../tools";
+import type { BashToolDetails, FindToolDetails, GrepToolDetails, ReadToolDetails } from "../../tools";
 import type { EventBus } from "../../utils/event-bus";
 
 export type { AppAction, KeybindingsManager } from "../../config/keybindings";
@@ -495,11 +495,6 @@ export interface FindToolResultEvent extends ToolResultEventBase {
 	details: FindToolDetails | undefined;
 }
 
-export interface LsToolResultEvent extends ToolResultEventBase {
-	toolName: "ls";
-	details: LsToolDetails | undefined;
-}
-
 export interface CustomToolResultEvent extends ToolResultEventBase {
 	toolName: string;
 	details: unknown;
@@ -513,32 +508,8 @@ export type ToolResultEvent =
 	| WriteToolResultEvent
 	| GrepToolResultEvent
 	| FindToolResultEvent
-	| LsToolResultEvent
 	| CustomToolResultEvent;
 
-// Type guards
-export function isBashToolResult(e: ToolResultEvent): e is BashToolResultEvent {
-	return e.toolName === "bash";
-}
-export function isReadToolResult(e: ToolResultEvent): e is ReadToolResultEvent {
-	return e.toolName === "read";
-}
-export function isEditToolResult(e: ToolResultEvent): e is EditToolResultEvent {
-	return e.toolName === "edit";
-}
-export function isWriteToolResult(e: ToolResultEvent): e is WriteToolResultEvent {
-	return e.toolName === "write";
-}
-export function isGrepToolResult(e: ToolResultEvent): e is GrepToolResultEvent {
-	return e.toolName === "grep";
-}
-export function isFindToolResult(e: ToolResultEvent): e is FindToolResultEvent {
-	return e.toolName === "find";
-}
-export function isLsToolResult(e: ToolResultEvent): e is LsToolResultEvent {
-	return e.toolName === "ls";
-}
-
 /** Union of all event types */
 export type ExtensionEvent =
 	| SessionEvent

package/src/extensibility/hooks/types.ts

@@ -20,7 +20,7 @@ import type {
 	SessionEntry,
 	SessionManager,
 } from "../../session/session-manager";
-import type { BashToolDetails, FindToolDetails, GrepToolDetails, LsToolDetails, ReadToolDetails } from "../../tools";
+import type { BashToolDetails, FindToolDetails, GrepToolDetails, ReadToolDetails } from "../../tools";
 
 // Re-export for backward compatibility
 export type { ExecOptions, ExecResult } from "../../exec/exec";
@@ -454,12 +454,6 @@ export interface FindToolResultEvent extends ToolResultEventBase {
 	details: FindToolDetails | undefined;
 }
 
-/** Tool result event for ls tool */
-export interface LsToolResultEvent extends ToolResultEventBase {
-	toolName: "ls";
-	details: LsToolDetails | undefined;
-}
-
 /** Tool result event for custom/unknown tools */
 export interface CustomToolResultEvent extends ToolResultEventBase {
 	toolName: string;
@@ -478,32 +472,8 @@ export type ToolResultEvent =
 	| WriteToolResultEvent
 	| GrepToolResultEvent
 	| FindToolResultEvent
-	| LsToolResultEvent
 	| CustomToolResultEvent;
 
-// Type guards for narrowing ToolResultEvent to specific tool types
-export function isBashToolResult(e: ToolResultEvent): e is BashToolResultEvent {
-	return e.toolName === "bash";
-}
-export function isReadToolResult(e: ToolResultEvent): e is ReadToolResultEvent {
-	return e.toolName === "read";
-}
-export function isEditToolResult(e: ToolResultEvent): e is EditToolResultEvent {
-	return e.toolName === "edit";
-}
-export function isWriteToolResult(e: ToolResultEvent): e is WriteToolResultEvent {
-	return e.toolName === "write";
-}
-export function isGrepToolResult(e: ToolResultEvent): e is GrepToolResultEvent {
-	return e.toolName === "grep";
-}
-export function isFindToolResult(e: ToolResultEvent): e is FindToolResultEvent {
-	return e.toolName === "find";
-}
-export function isLsToolResult(e: ToolResultEvent): e is LsToolResultEvent {
-	return e.toolName === "ls";
-}
-
 /**
  * Union of all hook event types.
  */

package/src/index.ts

@@ -75,13 +75,6 @@ export {
 	discoverAndLoadExtensions,
 	ExtensionRunner,
 	ExtensionRuntime,
-	isBashToolResult,
-	isEditToolResult,
-	isFindToolResult,
-	isGrepToolResult,
-	isLsToolResult,
-	isReadToolResult,
-	isWriteToolResult,
 } from "./extensibility/extensions";
 // Hook system types (legacy re-export)
 export type * from "./extensibility/hooks";
@@ -180,7 +173,6 @@ export {
 	EditTool,
 	FindTool,
 	GrepTool,
-	LsTool,
 	loadSshTool,
 	PythonTool,
 	ReadTool,
@@ -256,9 +248,6 @@ export {
 	type GrepOperations,
 	type GrepToolDetails,
 	type GrepToolOptions,
-	type LsOperations,
-	type LsToolDetails,
-	type LsToolOptions,
 	type PythonToolDetails,
 	type ReadToolDetails,
 	type TruncationOptions,