@oh-my-pi/pi-coding-agent 13.11.1 → 13.12.3

package/src/config/settings-schema.ts

@@ -17,45 +17,40 @@ import { THINKING_EFFORTS } from "@oh-my-pi/pi-ai";
 // ═══════════════════════════════════════════════════════════════════════════
 
 export type SettingTab =
-	| "display"
-	| "agent"
-	| "input"
+	| "appearance"
+	| "model"
+	| "interaction"
+	| "context"
+	| "editing"
 	| "tools"
-	| "config"
-	| "services"
-	| "bash"
-	| "lsp"
-	| "ttsr"
-	| "status";
+	| "tasks"
+	| "providers";
 
 /** 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) */
+/** Ordered list of tabs for UI rendering */
 export const SETTING_TABS: SettingTab[] = [
-	"display",
-	"agent",
-	"input",
+	"appearance",
+	"model",
+	"interaction",
+	"context",
+	"editing",
 	"tools",
-	"config",
-	"services",
-	"bash",
-	"lsp",
-	"ttsr",
+	"tasks",
+	"providers",
 ];
 
 /** 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" },
+	appearance: { label: "Appearance", icon: "tab.appearance" },
+	model: { label: "Model", icon: "tab.model" },
+	interaction: { label: "Interaction", icon: "tab.interaction" },
+	context: { label: "Context", icon: "tab.context" },
+	editing: { label: "Editing", icon: "tab.editing" },
 	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" },
+	tasks: { label: "Tasks", icon: "tab.tasks" },
+	providers: { label: "Providers", icon: "tab.providers" },
 };
 
 /** Status line segment identifiers */
@@ -140,1134 +135,1345 @@ type SettingDef =
 // Schema Definition
 // ═══════════════════════════════════════════════════════════════════════════
 
+// Typed defaults for array/record settings — named constants avoid `as` casts
+// under `as const` while still letting SettingValue infer the correct element type.
+const EMPTY_STRING_ARRAY: string[] = [];
+const EMPTY_STRING_RECORD: Record<string, string> = {};
+
 export const SETTINGS_SCHEMA = {
-	// ─────────────────────────────────────────────────────────────────────────
-	// Top-level settings
-	// ─────────────────────────────────────────────────────────────────────────
+	// ────────────────────────────────────────────────────────────────────────
+	// General settings (no UI)
+	// ────────────────────────────────────────────────────────────────────────
 	lastChangelogVersion: { type: "string", default: undefined },
+
+	shellPath: { type: "string", default: undefined },
+
+	extensions: { type: "array", default: EMPTY_STRING_ARRAY },
+
+	enabledModels: { type: "array", default: EMPTY_STRING_ARRAY },
+
+	disabledProviders: { type: "array", default: EMPTY_STRING_ARRAY },
+
+	disabledExtensions: { type: "array", default: EMPTY_STRING_ARRAY },
+
+	modelRoles: { type: "record", default: EMPTY_STRING_RECORD },
+
+	// ────────────────────────────────────────────────────────────────────────
+	// Appearance
+	// ────────────────────────────────────────────────────────────────────────
+
+	// Theme
 	"theme.dark": {
 		type: "string",
 		default: "titanium",
 		ui: {
-			tab: "display",
-			label: "Dark theme",
+			tab: "appearance",
+			label: "Dark Theme",
 			description: "Theme used when terminal has dark background",
 			submenu: true,
 		},
 	},
+
 	"theme.light": {
 		type: "string",
 		default: "light",
 		ui: {
-			tab: "display",
-			label: "Light theme",
+			tab: "appearance",
+			label: "Light Theme",
 			description: "Theme used when terminal has light background",
 			submenu: true,
 		},
 	},
+
 	symbolPreset: {
 		type: "enum",
 		values: ["unicode", "nerd", "ascii"] as const,
 		default: "unicode",
-		ui: { tab: "display", label: "Symbol preset", description: "Icon/symbol style", submenu: true },
+		ui: { tab: "appearance", label: "Symbol Preset", description: "Icon/symbol style", submenu: true },
 	},
+
 	colorBlindMode: {
 		type: "boolean",
 		default: false,
 		ui: {
-			tab: "display",
-			label: "Color blind mode",
+			tab: "appearance",
+			label: "Color-Blind Mode",
 			description: "Use blue instead of green for diff additions",
 		},
 	},
-	"display.tabWidth": {
-		type: "number",
-		default: 3,
-		ui: {
-			tab: "display",
-			label: "Tab width",
-			description: "Default number of spaces used when rendering tab characters",
-			submenu: true,
-		},
-	},
-	defaultThinkingLevel: {
+
+	// Status line
+	"statusLine.preset": {
 		type: "enum",
-		values: THINKING_EFFORTS,
-		default: "high",
+		values: ["default", "minimal", "compact", "full", "nerd", "ascii", "custom"] as const,
+		default: "default",
 		ui: {
-			tab: "agent",
-			label: "Thinking level",
-			description: "Reasoning depth for thinking-capable models",
+			tab: "appearance",
+			label: "Status Line Preset",
+			description: "Pre-built status line configurations",
 			submenu: true,
 		},
 	},
-	hideThinkingBlock: {
-		type: "boolean",
-		default: false,
-		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: "agent",
-			label: "Steering mode",
-			description: "How to process queued messages while agent is working",
-		},
-	},
-	followUpMode: {
+
+	"statusLine.separator": {
 		type: "enum",
-		values: ["all", "one-at-a-time"] as const,
-		default: "one-at-a-time",
+		values: ["powerline", "powerline-thin", "slash", "pipe", "block", "none", "ascii"] as const,
+		default: "powerline-thin",
 		ui: {
-			tab: "agent",
-			label: "Follow-up mode",
-			description: "How to drain follow-up messages after a turn completes",
+			tab: "appearance",
+			label: "Status Line Separator",
+			description: "Style of separators between segments",
+			submenu: true,
 		},
 	},
-	interruptMode: {
-		type: "enum",
-		values: ["immediate", "wait"] as const,
-		default: "immediate",
-		ui: { tab: "agent", label: "Interrupt mode", description: "When steering messages interrupt tool execution" },
-	},
-	doubleEscapeAction: {
-		type: "enum",
-		values: ["branch", "tree", "none"] as const,
-		default: "tree",
+	"tools.artifactSpillThreshold": {
+		type: "number",
+		default: 50,
 		ui: {
-			tab: "input",
-			label: "Double-escape action",
-			description: "Action when pressing Escape twice with empty editor",
+			tab: "tools",
+			label: "Artifact spill threshold (KB)",
+			description: "Tool output above this size is saved as an artifact; tail is kept inline",
+			submenu: true,
 		},
 	},
-	treeFilterMode: {
-		type: "enum",
-		values: ["default", "no-tools", "user-only", "labeled-only", "all"] as const,
-		default: "default",
+	"tools.artifactTailBytes": {
+		type: "number",
+		default: 20,
 		ui: {
-			tab: "input",
-			label: "Tree filter mode",
-			description: "Default filter mode when opening the session tree",
+			tab: "tools",
+			label: "Artifact tail size (KB)",
+			description: "Amount of tail content kept inline when output spills to artifact",
+			submenu: true,
 		},
 	},
-	shellPath: { type: "string", default: undefined },
-	collapseChangelog: {
-		type: "boolean",
-		default: false,
-		ui: { tab: "input", label: "Collapse changelog", description: "Show condensed changelog after updates" },
-	},
-	autocompleteMaxVisible: {
+	"tools.artifactTailLines": {
 		type: "number",
-		default: 5,
+		default: 500,
 		ui: {
-			tab: "input",
-			label: "Autocomplete max items",
-			description: "Max visible items in autocomplete dropdown (3-20)",
+			tab: "tools",
+			label: "Artifact tail lines",
+			description: "Maximum lines of tail content kept inline when output spills to artifact",
 			submenu: true,
 		},
 	},
-	repeatToolDescriptions: {
+
+	"statusLine.showHookStatus": {
 		type: "boolean",
-		default: false,
+		default: true,
 		ui: {
-			tab: "agent",
-			label: "Repeat tool descriptions",
-			description: "Render full tool descriptions in the system prompt instead of a tool name list",
+			tab: "appearance",
+			label: "Show Hook Status",
+			description: "Display hook status messages below status line",
 		},
 	},
-	readLineNumbers: {
+
+	"statusLine.leftSegments": { type: "array", default: [] as StatusLineSegmentId[] },
+
+	"statusLine.rightSegments": { type: "array", default: [] as StatusLineSegmentId[] },
+
+	"statusLine.segmentOptions": { type: "record", default: {} as Record<string, unknown> },
+
+	// Images and terminal
+	"terminal.showImages": {
 		type: "boolean",
-		default: false,
+		default: true,
 		ui: {
-			tab: "config",
-			label: "Read line numbers",
-			description: "Prepend line numbers to read tool output by default",
+			tab: "appearance",
+			label: "Show Inline Images",
+			description: "Render images inline in terminal",
+			condition: "hasImageProtocol",
 		},
 	},
-	readHashLines: {
+
+	"images.autoResize": {
 		type: "boolean",
 		default: true,
 		ui: {
-			tab: "config",
-			label: "Read hash lines",
-			description: "Include line hashes in read output for hashline edit mode (LINE#ID:content)",
+			tab: "appearance",
+			label: "Auto-Resize Images",
+			description: "Resize large images to 2000x2000 max for better model compatibility",
 		},
 	},
-	"read.defaultLimit": {
+
+	"images.blockImages": {
+		type: "boolean",
+		default: false,
+		ui: { tab: "appearance", label: "Block Images", description: "Prevent images from being sent to LLM providers" },
+	},
+
+	// Display rendering
+	"display.tabWidth": {
 		type: "number",
-		default: 300,
+		default: 3,
 		ui: {
-			tab: "tools",
-			label: "Read default limit",
-			description: "Default number of lines returned when agent calls read without a limit",
+			tab: "appearance",
+			label: "Tab Width",
+			description: "Default number of spaces used when rendering tab characters",
 			submenu: true,
 		},
 	},
+
+	"display.showTokenUsage": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "appearance",
+			label: "Show Token Usage",
+			description: "Show per-turn token usage on assistant messages",
+		},
+	},
+
 	showHardwareCursor: {
 		type: "boolean",
 		default: true, // will be computed based on platform if undefined
-		ui: { tab: "display", label: "Hardware cursor", description: "Show terminal cursor for IME support" },
+		ui: { tab: "appearance", label: "Show Hardware Cursor", description: "Show terminal cursor for IME support" },
 	},
+
 	clearOnShrink: {
 		type: "boolean",
 		default: false,
 		ui: {
-			tab: "display",
-			label: "Clear on shrink",
+			tab: "appearance",
+			label: "Clear on Shrink",
 			description: "Clear empty rows when content shrinks (may cause flicker)",
 		},
 	},
-	extensions: { type: "array", default: [] as string[] },
-	enabledModels: { type: "array", default: [] as string[] },
-	disabledProviders: { type: "array", default: [] as string[] },
-	disabledExtensions: { type: "array", default: [] as string[] },
-	modelRoles: { type: "record", default: {} as Record<string, string> },
-	"contextPromotion.enabled": {
-		type: "boolean",
-		default: true,
+
+	// ────────────────────────────────────────────────────────────────────────
+	// Model
+	// ────────────────────────────────────────────────────────────────────────
+
+	// Reasoning and prompts
+	defaultThinkingLevel: {
+		type: "enum",
+		values: THINKING_EFFORTS,
+		default: "high",
 		ui: {
-			tab: "agent",
-			label: "Auto-promote context",
-			description: "Promote to a larger-context model on context overflow instead of compacting",
+			tab: "model",
+			label: "Thinking Level",
+			description: "Reasoning depth for thinking-capable models",
+			submenu: true,
 		},
 	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Secrets settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"secrets.enabled": {
+	hideThinkingBlock: {
 		type: "boolean",
 		default: false,
-		ui: { tab: "config", label: "Hide secrets", description: "Obfuscate secrets before sending to AI providers" },
+		ui: { tab: "model", label: "Hide Thinking Blocks", description: "Hide thinking blocks in assistant responses" },
 	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Compaction settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"compaction.enabled": {
+	repeatToolDescriptions: {
 		type: "boolean",
-		default: true,
+		default: false,
 		ui: {
-			tab: "agent",
-			label: "Auto-compact",
-			description: "Automatically compact context when it gets too large",
+			tab: "model",
+			label: "Repeat Tool Descriptions",
+			description: "Render full tool descriptions in the system prompt instead of a tool name list",
 		},
 	},
-	"compaction.strategy": {
-		type: "enum",
-		values: ["context-full", "handoff", "off"] as const,
-		default: "context-full",
+
+	// Sampling
+	temperature: {
+		type: "number",
+		default: -1,
 		ui: {
-			tab: "agent",
-			label: "Context-full strategy",
-			description: "Choose in-place context-full maintenance, auto-handoff, or disable auto maintenance (off)",
+			tab: "model",
+			label: "Temperature",
+			description: "Sampling temperature (0 = deterministic, 1 = creative, -1 = provider default)",
 			submenu: true,
 		},
 	},
-	"compaction.thresholdPercent": {
+
+	topP: {
 		type: "number",
 		default: -1,
 		ui: {
-			tab: "agent",
-			label: "Context threshold",
-			description: "Percent threshold for context maintenance; set to Default to use legacy reserve-based behavior",
+			tab: "model",
+			label: "Top P",
+			description: "Nucleus sampling cutoff (0-1, -1 = provider default)",
 			submenu: true,
 		},
 	},
-	"compaction.handoffSaveToDisk": {
-		type: "boolean",
-		default: false,
+
+	topK: {
+		type: "number",
+		default: -1,
 		ui: {
-			tab: "agent",
-			label: "Save auto-handoff docs",
-			description: "Save generated handoff documents to markdown files for the auto-handoff flow",
+			tab: "model",
+			label: "Top K",
+			description: "Sample from top-K tokens (-1 = provider default)",
+			submenu: true,
 		},
 	},
-	"compaction.reserveTokens": { type: "number", default: 16384 },
-	"compaction.keepRecentTokens": { type: "number", default: 20000 },
-	"compaction.autoContinue": { type: "boolean", default: true },
-	"compaction.remoteEnabled": {
-		type: "boolean",
-		default: true,
+
+	minP: {
+		type: "number",
+		default: -1,
 		ui: {
-			tab: "agent",
-			label: "Remote compaction",
-			description: "Use remote compaction endpoints when available instead of local summarization",
+			tab: "model",
+			label: "Min P",
+			description: "Minimum probability threshold (0-1, -1 = provider default)",
+			submenu: true,
 		},
 	},
-	"compaction.remoteEndpoint": { type: "string", default: undefined },
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Branch summary settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"branchSummary.enabled": {
-		type: "boolean",
-		default: false,
-		ui: { tab: "agent", label: "Branch summaries", description: "Prompt to summarize when leaving a branch" },
+	presencePenalty: {
+		type: "number",
+		default: -1,
+		ui: {
+			tab: "model",
+			label: "Presence Penalty",
+			description: "Penalty for introducing already-present tokens (-1 = provider default)",
+			submenu: true,
+		},
 	},
-	"branchSummary.reserveTokens": { type: "number", default: 16384 },
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Memories settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"memories.enabled": {
-		type: "boolean",
-		default: false,
+	repetitionPenalty: {
+		type: "number",
+		default: -1,
 		ui: {
-			tab: "agent",
-			label: "Memories",
-			description: "Enable autonomous memory extraction and consolidation",
+			tab: "model",
+			label: "Repetition Penalty",
+			description: "Penalty for repeated tokens (-1 = provider default)",
+			submenu: true,
+		},
+	},
+
+	serviceTier: {
+		type: "enum",
+		values: ["none", "auto", "default", "flex", "scale", "priority"] as const,
+		default: "none",
+		ui: {
+			tab: "model",
+			label: "Service Tier",
+			description: "OpenAI processing priority (none = omit parameter)",
+			submenu: true,
 		},
 	},
-	"memories.maxRolloutsPerStartup": { type: "number", default: 64 },
-	"memories.maxRolloutAgeDays": { type: "number", default: 30 },
-	"memories.minRolloutIdleHours": { type: "number", default: 12 },
-	"memories.threadScanLimit": { type: "number", default: 300 },
-	"memories.maxRawMemoriesForGlobal": { type: "number", default: 200 },
-	"memories.stage1Concurrency": { type: "number", default: 8 },
-	"memories.stage1LeaseSeconds": { type: "number", default: 120 },
-	"memories.stage1RetryDelaySeconds": { type: "number", default: 120 },
-	"memories.phase2LeaseSeconds": { type: "number", default: 180 },
-	"memories.phase2RetryDelaySeconds": { type: "number", default: 180 },
-	"memories.phase2HeartbeatSeconds": { type: "number", default: 30 },
-	"memories.rolloutPayloadPercent": { type: "number", default: 0.7 },
-	"memories.fallbackTokenLimit": { type: "number", default: 16000 },
-	"memories.summaryInjectionTokenLimit": { type: "number", default: 5000 },
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Retry settings
-	// ─────────────────────────────────────────────────────────────────────────
+	// Retries
 	"retry.enabled": { type: "boolean", default: true },
+
 	"retry.maxRetries": {
 		type: "number",
 		default: 3,
 		ui: {
-			tab: "agent",
-			label: "Retry max attempts",
+			tab: "model",
+			label: "Retry Attempts",
 			description: "Maximum retry attempts on API errors",
 			submenu: true,
 		},
 	},
+
 	"retry.baseDelayMs": { type: "number", default: 2000 },
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Todo completion settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"todo.reminders": {
-		type: "boolean",
-		default: true,
-		ui: { tab: "agent", label: "Todo reminders", description: "Remind agent to complete todos before stopping" },
-	},
-	"todo.reminders.max": {
-		type: "number",
-		default: 3,
+	// ────────────────────────────────────────────────────────────────────────
+	// Interaction
+	// ────────────────────────────────────────────────────────────────────────
+
+	// Conversation flow
+	steeringMode: {
+		type: "enum",
+		values: ["all", "one-at-a-time"] as const,
+		default: "one-at-a-time",
 		ui: {
-			tab: "agent",
-			label: "Todo max reminders",
-			description: "Maximum reminders to complete todos before giving up",
-			submenu: true,
+			tab: "interaction",
+			label: "Steering Mode",
+			description: "How to process queued messages while agent is working",
 		},
 	},
-	"todo.eager": {
-		type: "boolean",
-		default: false,
+
+	followUpMode: {
+		type: "enum",
+		values: ["all", "one-at-a-time"] as const,
+		default: "one-at-a-time",
 		ui: {
-			tab: "agent",
-			label: "Eager todos",
-			description: "Automatically create a comprehensive todo list after the first message",
+			tab: "interaction",
+			label: "Follow-Up Mode",
+			description: "How to drain follow-up messages after a turn completes",
 		},
 	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// 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" },
-	},
-	"grep.contextBefore": {
-		type: "number",
-		default: 0,
+	interruptMode: {
+		type: "enum",
+		values: ["immediate", "wait"] as const,
+		default: "immediate",
 		ui: {
-			tab: "tools",
-			label: "Grep context before",
-			description: "Lines of context before each grep match",
-			submenu: true,
+			tab: "interaction",
+			label: "Interrupt Mode",
+			description: "When steering messages interrupt tool execution",
 		},
 	},
-	"grep.contextAfter": {
-		type: "number",
-		default: 0,
+
+	// Input and startup
+	doubleEscapeAction: {
+		type: "enum",
+		values: ["branch", "tree", "none"] as const,
+		default: "tree",
 		ui: {
-			tab: "tools",
-			label: "Grep context after",
-			description: "Lines of context after each grep match",
-			submenu: true,
+			tab: "interaction",
+			label: "Double-Escape Action",
+			description: "Action when pressing Escape twice with empty editor",
 		},
 	},
-	"astGrep.enabled": {
-		type: "boolean",
-		default: true,
-		ui: { tab: "tools", label: "Enable AST Grep", description: "Enable the ast_grep tool for structural AST search" },
-	},
-	"astEdit.enabled": {
-		type: "boolean",
-		default: true,
+
+	treeFilterMode: {
+		type: "enum",
+		values: ["default", "no-tools", "user-only", "labeled-only", "all"] as const,
+		default: "default",
 		ui: {
-			tab: "tools",
-			label: "Enable AST Edit",
-			description: "Enable the ast_edit tool for structural AST rewrites",
+			tab: "interaction",
+			label: "Session Tree Filter",
+			description: "Default filter mode when opening the session tree",
 		},
 	},
-	"renderMermaid.enabled": {
-		type: "boolean",
-		default: false,
+
+	autocompleteMaxVisible: {
+		type: "number",
+		default: 5,
 		ui: {
-			tab: "tools",
-			label: "Enable Render Mermaid",
-			description: "Enable the render_mermaid tool for Mermaid-to-ASCII rendering",
+			tab: "interaction",
+			label: "Autocomplete Items",
+			description: "Max visible items in autocomplete dropdown (3-20)",
+			submenu: true,
 		},
 	},
-	"notebook.enabled": {
-		type: "boolean",
-		default: true,
-		ui: { tab: "tools", label: "Enable Notebook", description: "Enable the notebook tool for notebook editing" },
-	},
-	"inspect_image.enabled": {
+
+	"startup.quiet": {
 		type: "boolean",
 		default: false,
 		ui: {
-			tab: "tools",
-			label: "Enable Inspect Image",
-			description: "Enable the inspect_image tool, delegating image understanding to a vision-capable model",
+			tab: "interaction",
+			label: "Quiet Startup",
+			description: "Skip welcome screen and startup status messages",
 		},
 	},
-	"checkpoint.enabled": {
+
+	collapseChangelog: {
 		type: "boolean",
 		default: false,
-		ui: {
-			tab: "tools",
-			label: "Enable Checkpoint/Rewind",
-			description: "Enable the checkpoint and rewind tools for context checkpointing",
-		},
-	},
-	"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" },
+		ui: { tab: "interaction", label: "Collapse Changelog", description: "Show condensed changelog after updates" },
 	},
-	"lsp.enabled": {
-		type: "boolean",
-		default: true,
-		ui: { tab: "tools", label: "Enable LSP", description: "Enable the lsp tool for language server protocol" },
+
+	// Notifications
+	"completion.notify": {
+		type: "enum",
+		values: ["on", "off"] as const,
+		default: "on",
+		ui: { tab: "interaction", label: "Completion Notification", description: "Notify when the agent completes" },
 	},
-	"calc.enabled": {
-		type: "boolean",
-		default: false,
+
+	"ask.timeout": {
+		type: "number",
+		default: 30,
 		ui: {
-			tab: "tools",
-			label: "Enable Calculator",
-			description: "Enable the calculator tool for basic calculations",
+			tab: "interaction",
+			label: "Ask Timeout",
+			description: "Auto-select recommended option after timeout (0 to disable)",
+			submenu: true,
 		},
 	},
-	"browser.enabled": {
-		type: "boolean",
-		default: true,
-		ui: {
-			tab: "tools",
-			label: "Enable Browser",
-			description: "Enable the browser tool (Ulixee Hero)",
-		},
+
+	"ask.notify": {
+		type: "enum",
+		values: ["on", "off"] as const,
+		default: "on",
+		ui: { tab: "interaction", label: "Ask Notification", description: "Notify when ask tool is waiting for input" },
 	},
-	"browser.headless": {
+
+	// Speech-to-text
+	"stt.enabled": {
 		type: "boolean",
-		default: true,
-		ui: {
-			tab: "tools",
-			label: "Browser headless",
-			description: "Launch browser in headless mode (disable to show browser UI)",
-		},
+		default: false,
+		ui: { tab: "interaction", label: "Speech-to-Text", description: "Enable speech-to-text input via microphone" },
 	},
-	"tools.intentTracing": {
-		type: "boolean",
-		default: true,
+
+	"stt.language": {
+		type: "string",
+		default: "en",
 		ui: {
-			tab: "tools",
-			label: "Intent tracing",
-			description: "Ask the agent to describe the intent of each tool call before executing it",
+			tab: "interaction",
+			label: "Speech Language",
+			description: "Language code for transcription (e.g., en, es, fr)",
+			submenu: true,
 		},
 	},
-	"tools.maxTimeout": {
-		type: "number",
-		default: 0,
+
+	"stt.modelName": {
+		type: "enum",
+		values: ["tiny", "tiny.en", "base", "base.en", "small", "small.en", "medium", "medium.en", "large"] as const,
+		default: "base.en",
 		ui: {
-			tab: "tools",
-			label: "Max tool timeout",
-			description: "Maximum timeout in seconds the agent can set for any tool (0 = no limit)",
+			tab: "interaction",
+			label: "Speech Model",
+			description: "Whisper model size (larger = more accurate but slower)",
 			submenu: true,
 		},
 	},
-	"async.enabled": {
+
+	// ────────────────────────────────────────────────────────────────────────
+	// Context
+	// ────────────────────────────────────────────────────────────────────────
+
+	// Context promotion
+	"contextPromotion.enabled": {
 		type: "boolean",
-		default: false,
+		default: true,
 		ui: {
-			tab: "tools",
-			label: "Async execution",
-			description: "Enable async bash commands and background task execution",
+			tab: "context",
+			label: "Auto-Promote Context",
+			description: "Promote to a larger-context model on context overflow instead of compacting",
 		},
 	},
-	"async.maxJobs": {
-		type: "number",
-		default: 100,
+
+	// Compaction
+	"compaction.enabled": {
+		type: "boolean",
+		default: true,
 		ui: {
-			tab: "tools",
-			label: "Async max jobs",
-			description: "Maximum concurrent background jobs (1-100)",
-			submenu: true,
+			tab: "context",
+			label: "Auto-Compact",
+			description: "Automatically compact context when it gets too large",
 		},
 	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Task tool settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"task.isolation.mode": {
+	"compaction.strategy": {
 		type: "enum",
-		values: ["none", "worktree", "fuse-overlay", "fuse-projfs"] as const,
-		default: "none",
+		values: ["context-full", "handoff", "off"] as const,
+		default: "context-full",
 		ui: {
-			tab: "tools",
-			label: "Task isolation",
-			description:
-				"Isolation mode for subagents (none, git worktree, fuse-overlayfs on Unix, or ProjFS on Windows via fuse-projfs; unsupported modes fall back to worktree)",
+			tab: "context",
+			label: "Compaction Strategy",
+			description: "Choose in-place context-full maintenance, auto-handoff, or disable auto maintenance (off)",
 			submenu: true,
 		},
 	},
-	"task.isolation.merge": {
-		type: "enum",
-		values: ["patch", "branch"] as const,
-		default: "patch",
+
+	"compaction.thresholdPercent": {
+		type: "number",
+		default: -1,
 		ui: {
-			tab: "tools",
-			label: "Task isolation merge",
-			description: "How isolated task changes are integrated (patch apply or branch merge)",
+			tab: "context",
+			label: "Compaction Threshold",
+			description: "Percent threshold for context maintenance; set to Default to use legacy reserve-based behavior",
 			submenu: true,
 		},
 	},
-	"task.isolation.commits": {
-		type: "enum",
-		values: ["generic", "ai"] as const,
-		default: "generic",
+	"compaction.thresholdTokens": {
+		type: "number",
+		default: -1,
 		ui: {
-			tab: "tools",
-			label: "Task isolation commits",
-			description: "Commit message style for nested repo changes (generic or AI-generated)",
+			tab: "context",
+			label: "Compaction Token Limit",
+			description: "Fixed token limit for context maintenance; overrides percentage if set",
 			submenu: true,
 		},
 	},
-	"task.eager": {
+
+	"compaction.handoffSaveToDisk": {
 		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,
-		ui: {
-			tab: "tools",
-			label: "Task max concurrency",
-			description: "Concurrent limit for subagents",
-			submenu: true,
+			tab: "context",
+			label: "Save Handoff Docs",
+			description: "Save generated handoff documents to markdown files for the auto-handoff flow",
 		},
 	},
-	"task.maxRecursionDepth": {
-		type: "number",
-		default: 2,
+
+	"compaction.remoteEnabled": {
+		type: "boolean",
+		default: true,
 		ui: {
-			tab: "tools",
-			label: "Task max recursion depth",
-			description: "How many levels deep subagents can spawn their own subagents",
-			submenu: true,
+			tab: "context",
+			label: "Remote Compaction",
+			description: "Use remote compaction endpoints when available instead of local summarization",
 		},
 	},
-	"task.disabledAgents": {
-		type: "array",
-		default: [] as string[],
-	},
-	"task.agentModelOverrides": {
-		type: "record",
-		default: {} as Record<string, string>,
-	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Startup settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"startup.quiet": {
+	"compaction.reserveTokens": { type: "number", default: 16384 },
+
+	"compaction.keepRecentTokens": { type: "number", default: 20000 },
+
+	"compaction.autoContinue": { type: "boolean", default: true },
+
+	"compaction.remoteEndpoint": { type: "string", default: undefined },
+
+	// Branch summaries
+	"branchSummary.enabled": {
 		type: "boolean",
 		default: false,
-		ui: { tab: "input", label: "Startup quiet", description: "Skip welcome screen and startup status messages" },
+		ui: { tab: "context", label: "Branch Summaries", description: "Prompt to summarize when leaving a branch" },
 	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Notification settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"completion.notify": {
-		type: "enum",
-		values: ["on", "off"] as const,
-		default: "on",
-		ui: { tab: "input", label: "Completion notification", description: "Notify when the agent completes" },
-	},
+	"branchSummary.reserveTokens": { type: "number", default: 16384 },
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Ask settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"ask.timeout": {
-		type: "number",
-		default: 30,
+	// Memories
+	"memories.enabled": {
+		type: "boolean",
+		default: false,
 		ui: {
-			tab: "input",
-			label: "Ask tool timeout",
-			description: "Auto-select recommended option after timeout (0 to disable)",
-			submenu: true,
+			tab: "context",
+			label: "Memories",
+			description: "Enable autonomous memory extraction and consolidation",
 		},
 	},
-	"ask.notify": {
-		type: "enum",
-		values: ["on", "off"] as const,
-		default: "on",
-		ui: { tab: "input", label: "Ask notification", description: "Notify when ask tool is waiting for input" },
-	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Terminal settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"terminal.showImages": {
+	"memories.maxRolloutsPerStartup": { type: "number", default: 64 },
+
+	"memories.maxRolloutAgeDays": { type: "number", default: 30 },
+
+	"memories.minRolloutIdleHours": { type: "number", default: 12 },
+
+	"memories.threadScanLimit": { type: "number", default: 300 },
+
+	"memories.maxRawMemoriesForGlobal": { type: "number", default: 200 },
+
+	"memories.stage1Concurrency": { type: "number", default: 8 },
+
+	"memories.stage1LeaseSeconds": { type: "number", default: 120 },
+
+	"memories.stage1RetryDelaySeconds": { type: "number", default: 120 },
+
+	"memories.phase2LeaseSeconds": { type: "number", default: 180 },
+
+	"memories.phase2RetryDelaySeconds": { type: "number", default: 180 },
+
+	"memories.phase2HeartbeatSeconds": { type: "number", default: 30 },
+
+	"memories.rolloutPayloadPercent": { type: "number", default: 0.7 },
+
+	"memories.fallbackTokenLimit": { type: "number", default: 16000 },
+
+	"memories.summaryInjectionTokenLimit": { type: "number", default: 5000 },
+
+	// TTSR
+	"ttsr.enabled": {
 		type: "boolean",
 		default: true,
 		ui: {
-			tab: "display",
-			label: "Show images",
-			description: "Render images inline in terminal",
-			condition: "hasImageProtocol",
+			tab: "context",
+			label: "TTSR",
+			description: "Time Traveling Stream Rules: interrupt agent when output matches patterns",
 		},
 	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Image settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"images.autoResize": {
-		type: "boolean",
-		default: true,
+	"ttsr.contextMode": {
+		type: "enum",
+		values: ["discard", "keep"] as const,
+		default: "discard",
 		ui: {
-			tab: "display",
-			label: "Auto-resize images",
-			description: "Resize large images to 2000x2000 max for better model compatibility",
+			tab: "context",
+			label: "TTSR Context Mode",
+			description: "What to do with partial output when TTSR triggers",
 		},
 	},
-	"images.blockImages": {
-		type: "boolean",
-		default: false,
-		ui: { tab: "display", label: "Block images", description: "Prevent images from being sent to LLM providers" },
-	},
-
-	// ─────────────────────────────────────────────────────────────────────────
-	// Skills settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"skills.enabled": { type: "boolean", default: true },
-	"skills.enableSkillCommands": {
-		type: "boolean",
-		default: true,
-		ui: { tab: "tools", label: "Skill commands", description: "Register skills as /skill:name commands" },
-	},
-	"skills.enableCodexUser": { type: "boolean", default: true },
-	"skills.enableClaudeUser": { type: "boolean", default: true },
-	"skills.enableClaudeProject": { type: "boolean", default: true },
-	"skills.enablePiUser": { type: "boolean", default: true },
-	"skills.enablePiProject": { type: "boolean", default: true },
-	"skills.customDirectories": { type: "array", default: [] as string[] },
-	"skills.ignoredSkills": { type: "array", default: [] as string[] },
-	"skills.includeSkills": { type: "array", default: [] as string[] },
-
-	// ─────────────────────────────────────────────────────────────────────────
-	// Commands settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"commands.enableClaudeUser": {
-		type: "boolean",
-		default: true,
-		ui: { tab: "tools", label: "Claude user commands", description: "Load commands from ~/.claude/commands/" },
-	},
-	"commands.enableClaudeProject": {
-		type: "boolean",
-		default: true,
-		ui: { tab: "tools", label: "Claude project commands", description: "Load commands from .claude/commands/" },
-	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Provider settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"providers.webSearch": {
-		type: "enum",
-		values: [
-			"auto",
-			"exa",
-			"brave",
-			"jina",
-			"kimi",
-			"zai",
-			"perplexity",
-			"anthropic",
-			"gemini",
-			"codex",
-			"tavily",
-			"kagi",
-			"synthetic",
-			"parallel",
-		] as const,
-		default: "auto",
-		ui: { tab: "services", label: "Web search provider", description: "Provider for web search tool", submenu: true },
-	},
-	"providers.codeSearch": {
+	"ttsr.interruptMode": {
 		type: "enum",
-		values: ["grep", "exa"] as const,
-		default: "grep",
+		values: ["never", "prose-only", "tool-only", "always"] as const,
+		default: "always",
 		ui: {
-			tab: "services",
-			label: "Code search provider",
-			description: "Provider for code search tool",
+			tab: "context",
+			label: "TTSR Interrupt Mode",
+			description: "When to interrupt mid-stream vs inject warning after completion",
 			submenu: true,
 		},
 	},
-	"providers.image": {
+
+	"ttsr.repeatMode": {
 		type: "enum",
-		values: ["auto", "gemini", "openrouter"] as const,
-		default: "auto",
+		values: ["once", "after-gap"] as const,
+		default: "once",
 		ui: {
-			tab: "services",
-			label: "Image provider",
-			description: "Provider for image generation tool",
-			submenu: true,
+			tab: "context",
+			label: "TTSR Repeat Mode",
+			description: "How rules can repeat: once per session or after a message gap",
 		},
 	},
-	"providers.kimiApiFormat": {
-		type: "enum",
-		values: ["openai", "anthropic"] as const,
-		default: "anthropic",
+
+	"ttsr.repeatGap": {
+		type: "number",
+		default: 10,
 		ui: {
-			tab: "services",
-			label: "Kimi API format",
-			description: "API format for Kimi Code provider",
+			tab: "context",
+			label: "TTSR Repeat Gap",
+			description: "Messages before a rule can trigger again",
 			submenu: true,
 		},
 	},
-	"providers.openaiWebsockets": {
+
+	// ────────────────────────────────────────────────────────────────────────
+	// Editing
+	// ────────────────────────────────────────────────────────────────────────
+
+	// Edit tool
+	"edit.mode": {
 		type: "enum",
-		values: ["auto", "off", "on"] as const,
-		default: "auto",
+		values: ["replace", "patch", "hashline"] as const,
+		default: "hashline",
 		ui: {
-			tab: "services",
-			label: "OpenAI websockets",
-			description: "Websocket policy for OpenAI Codex models (auto uses model defaults, on forces, off disables)",
-			submenu: true,
+			tab: "editing",
+			label: "Edit Mode",
+			description: "Select the edit tool variant (replace, patch, or hashline)",
 		},
 	},
 
-	"providers.parallelFetch": {
+	"edit.fuzzyMatch": {
 		type: "boolean",
 		default: true,
 		ui: {
-			tab: "services",
-			label: "Parallel fetch",
-			description: "Use Parallel extract API for URL fetching when credentials are available",
+			tab: "editing",
+			label: "Fuzzy Match",
+			description: "Accept high-confidence fuzzy matches for whitespace differences",
 		},
 	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Exa settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"exa.enabled": {
-		type: "boolean",
-		default: true,
-		ui: { tab: "services", label: "Exa enabled", description: "Master toggle for all Exa search tools" },
-	},
-	"exa.enableSearch": {
-		type: "boolean",
-		default: true,
-		ui: { tab: "services", label: "Exa search", description: "Basic search, deep search, code search, crawl" },
-	},
-	"exa.enableResearcher": {
-		type: "boolean",
-		default: false,
-		ui: { tab: "services", label: "Exa researcher", description: "AI-powered deep research tasks" },
+	"edit.fuzzyThreshold": {
+		type: "number",
+		default: 0.95,
+		ui: {
+			tab: "editing",
+			label: "Fuzzy Match Threshold",
+			description: "Similarity threshold for fuzzy matches",
+			submenu: true,
+		},
 	},
-	"exa.enableWebsets": {
+
+	"edit.streamingAbort": {
 		type: "boolean",
 		default: false,
-		ui: { tab: "services", label: "Exa websets", description: "Webset management and enrichment tools" },
+		ui: {
+			tab: "editing",
+			label: "Abort on Failed Preview",
+			description: "Abort streaming edit tool calls when patch preview fails",
+		},
 	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Bash interceptor settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"bashInterceptor.enabled": {
+	// Read tool
+	readLineNumbers: {
 		type: "boolean",
 		default: false,
-		ui: { tab: "bash", label: "Interceptor", description: "Block shell commands that have dedicated tools" },
-	},
-	"bashInterceptor.simpleLs": {
-		type: "boolean",
-		default: true,
 		ui: {
-			tab: "bash",
-			label: "Intercept ls",
-			description: "Intercept bare ls commands (when interceptor is enabled)",
+			tab: "editing",
+			label: "Line Numbers",
+			description: "Prepend line numbers to read tool output by default",
 		},
 	},
-	// bashInterceptor.patterns is complex - handle separately
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// MCP settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"mcp.enableProjectConfig": {
+	readHashLines: {
 		type: "boolean",
 		default: true,
-		ui: { tab: "tools", label: "MCP project config", description: "Load .mcp.json/mcp.json from project root" },
-	},
-	"mcp.notifications": {
-		type: "boolean",
-		default: false,
 		ui: {
-			tab: "tools",
-			label: "MCP update injection",
-			description: "Inject MCP resource updates into the agent conversation",
+			tab: "editing",
+			label: "Hash Lines",
+			description: "Include line hashes in read output for hashline edit mode (LINE#ID:content)",
 		},
 	},
-	"mcp.notificationDebounceMs": {
+
+	"read.defaultLimit": {
 		type: "number",
-		default: 500,
+		default: 300,
 		ui: {
-			tab: "tools",
-			label: "MCP notification debounce (ms)",
-			description: "Debounce window for MCP resource update notifications before injecting into conversation",
+			tab: "editing",
+			label: "Default Read Limit",
+			description: "Default number of lines returned when agent calls read without a limit",
+			submenu: true,
 		},
 	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// LSP settings
-	// ─────────────────────────────────────────────────────────────────────────
+	// LSP
+	"lsp.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "editing", label: "LSP", description: "Enable the lsp tool for language server protocol" },
+	},
+
 	"lsp.formatOnWrite": {
 		type: "boolean",
 		default: false,
 		ui: {
-			tab: "lsp",
-			label: "Format on write",
+			tab: "editing",
+			label: "Format on Write",
 			description: "Automatically format code files using LSP after writing",
 		},
 	},
+
 	"lsp.diagnosticsOnWrite": {
 		type: "boolean",
 		default: true,
-		ui: { tab: "lsp", label: "Diagnostics on write", description: "Return LSP diagnostics after writing code files" },
+		ui: {
+			tab: "editing",
+			label: "Diagnostics on Write",
+			description: "Return LSP diagnostics after writing code files",
+		},
 	},
+
 	"lsp.diagnosticsOnEdit": {
 		type: "boolean",
 		default: false,
-		ui: { tab: "lsp", label: "Diagnostics on edit", description: "Return LSP diagnostics after editing code files" },
+		ui: {
+			tab: "editing",
+			label: "Diagnostics on Edit",
+			description: "Return LSP diagnostics after editing code files",
+		},
+	},
+
+	// Bash interceptor
+	"bashInterceptor.enabled": {
+		type: "boolean",
+		default: false,
+		ui: { tab: "editing", label: "Bash Interceptor", description: "Block shell commands that have dedicated tools" },
+	},
+
+	"bashInterceptor.simpleLs": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "editing",
+			label: "Intercept `ls`",
+			description: "Intercept bare ls commands (when interceptor is enabled)",
+		},
 	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Python settings
-	// ─────────────────────────────────────────────────────────────────────────
+	// Python
 	"python.toolMode": {
 		type: "enum",
 		values: ["ipy-only", "bash-only", "both"] as const,
 		default: "both",
-		ui: { tab: "config", label: "Python tool mode", description: "How Python code is executed" },
+		ui: { tab: "editing", label: "Python Tool Mode", description: "How Python code is executed" },
 	},
+
 	"python.kernelMode": {
 		type: "enum",
 		values: ["session", "per-call"] as const,
 		default: "session",
 		ui: {
-			tab: "config",
-			label: "Python kernel mode",
+			tab: "editing",
+			label: "Python Kernel Mode",
 			description: "Whether to keep IPython kernel alive across calls",
 		},
 	},
+
 	"python.sharedGateway": {
 		type: "boolean",
 		default: true,
 		ui: {
-			tab: "config",
-			label: "Python shared gateway",
+			tab: "editing",
+			label: "Shared Python Gateway",
 			description: "Share IPython kernel gateway across pi instances",
 		},
 	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// STT settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"stt.enabled": {
+	// ────────────────────────────────────────────────────────────────────────
+	// Tools
+	// ────────────────────────────────────────────────────────────────────────
+
+	// Todo tool
+	"todo.enabled": {
 		type: "boolean",
-		default: false,
-		ui: { tab: "input", label: "Speech-to-text", description: "Enable speech-to-text input via microphone" },
+		default: true,
+		ui: { tab: "tools", label: "Todos", description: "Enable the todo_write tool for task tracking" },
 	},
-	"stt.language": {
-		type: "string",
-		default: "en",
-		ui: {
-			tab: "input",
-			label: "STT language",
-			description: "Language code for transcription (e.g., en, es, fr)",
-			submenu: true,
-		},
+
+	"todo.reminders": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "Todo Reminders", description: "Remind agent to complete todos before stopping" },
 	},
-	"stt.modelName": {
-		type: "enum",
-		values: ["tiny", "tiny.en", "base", "base.en", "small", "small.en", "medium", "medium.en", "large"] as const,
-		default: "base.en",
+
+	"todo.reminders.max": {
+		type: "number",
+		default: 3,
 		ui: {
-			tab: "input",
-			label: "STT model",
-			description: "Whisper model size (larger = more accurate but slower)",
+			tab: "tools",
+			label: "Todo Reminder Limit",
+			description: "Maximum reminders to complete todos before giving up",
 			submenu: true,
 		},
 	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Edit settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"edit.fuzzyMatch": {
+	"todo.eager": {
 		type: "boolean",
-		default: true,
+		default: false,
 		ui: {
-			tab: "config",
-			label: "Edit fuzzy match",
-			description: "Accept high-confidence fuzzy matches for whitespace differences",
+			tab: "tools",
+			label: "Create Todos Automatically",
+			description: "Automatically create a comprehensive todo list after the first message",
 		},
 	},
-	"edit.fuzzyThreshold": {
+
+	// Search and AST tools
+	"find.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "Find", description: "Enable the find tool for file searching" },
+	},
+
+	"grep.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "Grep", description: "Enable the grep tool for content searching" },
+	},
+
+	"grep.contextBefore": {
 		type: "number",
-		default: 0.95,
+		default: 0,
 		ui: {
-			tab: "config",
-			label: "Edit fuzzy threshold",
-			description: "Similarity threshold for fuzzy matches",
+			tab: "tools",
+			label: "Grep Context Before",
+			description: "Lines of context before each grep match",
 			submenu: true,
 		},
 	},
-	"edit.mode": {
-		type: "enum",
-		values: ["replace", "patch", "hashline"] as const,
-		default: "hashline",
+
+	"grep.contextAfter": {
+		type: "number",
+		default: 0,
 		ui: {
-			tab: "config",
-			label: "Edit mode",
-			description: "Select the edit tool variant (replace, patch, or hashline)",
+			tab: "tools",
+			label: "Grep Context After",
+			description: "Lines of context after each grep match",
+			submenu: true,
 		},
 	},
-	"edit.streamingAbort": {
+
+	"astGrep.enabled": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "tools",
+			label: "AST Grep",
+			description: "Enable the ast_grep tool for structural AST search",
+		},
+	},
+
+	"astEdit.enabled": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "tools",
+			label: "AST Edit",
+			description: "Enable the ast_edit tool for structural AST rewrites",
+		},
+	},
+
+	// Optional tools
+	"notebook.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "Notebook", description: "Enable the notebook tool for notebook editing" },
+	},
+
+	"renderMermaid.enabled": {
 		type: "boolean",
 		default: false,
 		ui: {
-			tab: "config",
-			label: "Edit streaming abort",
-			description: "Abort streaming edit tool calls when patch preview fails",
+			tab: "tools",
+			label: "Render Mermaid",
+			description: "Enable the render_mermaid tool for Mermaid-to-ASCII rendering",
 		},
 	},
-	// edit.modelVariants is complex - handle separately
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// TTSR settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"ttsr.enabled": {
+	"calc.enabled": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "tools",
+			label: "Calculator",
+			description: "Enable the calculator tool for basic calculations",
+		},
+	},
+
+	"inspect_image.enabled": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "tools",
+			label: "Inspect Image",
+			description: "Enable the inspect_image tool, delegating image understanding to a vision-capable model",
+		},
+	},
+
+	"checkpoint.enabled": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "tools",
+			label: "Checkpoint/Rewind",
+			description: "Enable the checkpoint and rewind tools for context checkpointing",
+		},
+	},
+
+	// Fetching and browser
+	"fetch.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "Fetch", description: "Enable the fetch tool for URL fetching" },
+	},
+
+	"web_search.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "Web Search", description: "Enable the web_search tool for web searching" },
+	},
+
+	"browser.enabled": {
 		type: "boolean",
 		default: true,
 		ui: {
-			tab: "ttsr",
-			label: "TTSR enabled",
-			description: "Time Traveling Stream Rules: interrupt agent when output matches patterns",
+			tab: "tools",
+			label: "Browser",
+			description: "Enable the browser tool (Ulixee Hero)",
 		},
 	},
-	"ttsr.contextMode": {
-		type: "enum",
-		values: ["discard", "keep"] as const,
-		default: "discard",
-		ui: { tab: "ttsr", label: "TTSR context mode", description: "What to do with partial output when TTSR triggers" },
+
+	"browser.headless": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "tools",
+			label: "Headless Browser",
+			description: "Launch browser in headless mode (disable to show browser UI)",
+		},
 	},
-	"ttsr.interruptMode": {
-		type: "enum",
-		values: ["never", "prose-only", "tool-only", "always"] as const,
-		default: "always",
+
+	// Tool execution
+	"tools.intentTracing": {
+		type: "boolean",
+		default: true,
 		ui: {
-			tab: "ttsr",
-			label: "TTSR interrupt mode",
-			description: "When to interrupt mid-stream vs inject warning after completion",
+			tab: "tools",
+			label: "Intent Tracing",
+			description: "Ask the agent to describe the intent of each tool call before executing it",
+		},
+	},
+
+	"tools.maxTimeout": {
+		type: "number",
+		default: 0,
+		ui: {
+			tab: "tools",
+			label: "Max Tool Timeout",
+			description: "Maximum timeout in seconds the agent can set for any tool (0 = no limit)",
 			submenu: true,
 		},
 	},
-	"ttsr.repeatMode": {
-		type: "enum",
-		values: ["once", "after-gap"] as const,
-		default: "once",
+
+	// Async jobs
+	"async.enabled": {
+		type: "boolean",
+		default: false,
 		ui: {
-			tab: "ttsr",
-			label: "TTSR repeat mode",
-			description: "How rules can repeat: once per session or after a message gap",
+			tab: "tools",
+			label: "Async Execution",
+			description: "Enable async bash commands and background task execution",
 		},
 	},
-	"ttsr.repeatGap": {
+
+	"async.maxJobs": {
 		type: "number",
-		default: 10,
+		default: 100,
 		ui: {
-			tab: "ttsr",
-			label: "TTSR repeat gap",
-			description: "Messages before a rule can trigger again",
+			tab: "tools",
+			label: "Max Async Jobs",
+			description: "Maximum concurrent background jobs (1-100)",
 			submenu: true,
 		},
 	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Commit settings (no UI - advanced)
-	// ─────────────────────────────────────────────────────────────────────────
-	"commit.mapReduceEnabled": { type: "boolean", default: true },
-	"commit.mapReduceMinFiles": { type: "number", default: 4 },
-	"commit.mapReduceMaxFileTokens": { type: "number", default: 50000 },
-	"commit.mapReduceTimeoutMs": { type: "number", default: 120000 },
-	"commit.mapReduceMaxConcurrency": { type: "number", default: 5 },
-	"commit.changelogMaxDiffChars": { type: "number", default: 120000 },
+	// MCP
+	"mcp.enableProjectConfig": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tools", label: "MCP Project Config", description: "Load .mcp.json/mcp.json from project root" },
+	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Thinking budgets (no UI - advanced)
-	// ─────────────────────────────────────────────────────────────────────────
-	"thinkingBudgets.minimal": { type: "number", default: 1024 },
-	"thinkingBudgets.low": { type: "number", default: 2048 },
-	"thinkingBudgets.medium": { type: "number", default: 8192 },
-	"thinkingBudgets.high": { type: "number", default: 16384 },
+	"mcp.notifications": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "tools",
+			label: "MCP Update Injection",
+			description: "Inject MCP resource updates into the agent conversation",
+		},
+	},
 
-	// ─────────────────────────────────────────────────────────────────────────
-	// Status line settings
-	// ─────────────────────────────────────────────────────────────────────────
-	"statusLine.preset": {
+	"mcp.notificationDebounceMs": {
+		type: "number",
+		default: 500,
+		ui: {
+			tab: "tools",
+			label: "MCP Notification Debounce",
+			description: "Debounce window for MCP resource update notifications before injecting into conversation",
+		},
+	},
+
+	// ────────────────────────────────────────────────────────────────────────
+	// Tasks
+	// ────────────────────────────────────────────────────────────────────────
+
+	// Delegation
+	"task.isolation.mode": {
 		type: "enum",
-		values: ["default", "minimal", "compact", "full", "nerd", "ascii", "custom"] as const,
-		default: "default",
-		ui: { tab: "status", label: "Preset", description: "Pre-built status line configurations", submenu: true },
+		values: ["none", "worktree", "fuse-overlay", "fuse-projfs"] as const,
+		default: "none",
+		ui: {
+			tab: "tasks",
+			label: "Isolation Mode",
+			description:
+				"Isolation mode for subagents (none, git worktree, fuse-overlayfs on Unix, or ProjFS on Windows via fuse-projfs; unsupported modes fall back to worktree)",
+			submenu: true,
+		},
 	},
-	"statusLine.separator": {
+
+	"task.isolation.merge": {
 		type: "enum",
-		values: ["powerline", "powerline-thin", "slash", "pipe", "block", "none", "ascii"] as const,
-		default: "powerline-thin",
+		values: ["patch", "branch"] as const,
+		default: "patch",
 		ui: {
-			tab: "status",
-			label: "Separator style",
-			description: "Style of separators between segments",
+			tab: "tasks",
+			label: "Isolation Merge Strategy",
+			description: "How isolated task changes are integrated (patch apply or branch merge)",
 			submenu: true,
 		},
 	},
-	"statusLine.showHookStatus": {
+
+	"task.isolation.commits": {
+		type: "enum",
+		values: ["generic", "ai"] as const,
+		default: "generic",
+		ui: {
+			tab: "tasks",
+			label: "Isolation Commit Style",
+			description: "Commit message style for nested repo changes (generic or AI-generated)",
+			submenu: true,
+		},
+	},
+
+	"task.eager": {
 		type: "boolean",
-		default: true,
+		default: false,
 		ui: {
-			tab: "status",
-			label: "Show extension status",
-			description: "Display hook status messages below status line",
+			tab: "tasks",
+			label: "Prefer Task Delegation",
+			description: "Encourage the agent to delegate work to subagents unless changes are trivial",
 		},
 	},
-	"statusLine.leftSegments": { type: "array", default: [] as StatusLineSegmentId[] },
-	"statusLine.rightSegments": { type: "array", default: [] as StatusLineSegmentId[] },
-	"statusLine.segmentOptions": { type: "record", default: {} as Record<string, unknown> },
-	temperature: {
+
+	"task.maxConcurrency": {
 		type: "number",
-		default: -1,
+		default: 32,
 		ui: {
-			tab: "agent",
-			label: "Temperature",
-			description: "Sampling temperature (0 = deterministic, 1 = creative, -1 = provider default)",
+			tab: "tasks",
+			label: "Max Concurrent Tasks",
+			description: "Concurrent limit for subagents",
 			submenu: true,
 		},
 	},
-	topP: {
+
+	"task.maxRecursionDepth": {
 		type: "number",
-		default: -1,
+		default: 2,
 		ui: {
-			tab: "agent",
-			label: "Top P",
-			description: "Nucleus sampling cutoff (0-1, -1 = provider default)",
+			tab: "tasks",
+			label: "Max Task Recursion",
+			description: "How many levels deep subagents can spawn their own subagents",
 			submenu: true,
 		},
 	},
-	topK: {
-		type: "number",
-		default: -1,
+
+	"task.disabledAgents": {
+		type: "array",
+		default: [] as string[],
+	},
+
+	"task.agentModelOverrides": {
+		type: "record",
+		default: {} as Record<string, string>,
+	},
+
+	// Skills
+	"skills.enabled": { type: "boolean", default: true },
+
+	"skills.enableSkillCommands": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tasks", label: "Skill Commands", description: "Register skills as /skill:name commands" },
+	},
+
+	"skills.enableCodexUser": { type: "boolean", default: true },
+
+	"skills.enableClaudeUser": { type: "boolean", default: true },
+
+	"skills.enableClaudeProject": { type: "boolean", default: true },
+
+	"skills.enablePiUser": { type: "boolean", default: true },
+
+	"skills.enablePiProject": { type: "boolean", default: true },
+
+	"skills.customDirectories": { type: "array", default: [] as string[] },
+
+	"skills.ignoredSkills": { type: "array", default: [] as string[] },
+
+	"skills.includeSkills": { type: "array", default: [] as string[] },
+
+	// Commands
+	"commands.enableClaudeUser": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tasks", label: "Claude User Commands", description: "Load commands from ~/.claude/commands/" },
+	},
+
+	"commands.enableClaudeProject": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "tasks", label: "Claude Project Commands", description: "Load commands from .claude/commands/" },
+	},
+
+	// ────────────────────────────────────────────────────────────────────────
+	// Providers
+	// ────────────────────────────────────────────────────────────────────────
+
+	// Secret handling
+	"secrets.enabled": {
+		type: "boolean",
+		default: false,
+		ui: { tab: "providers", label: "Hide Secrets", description: "Obfuscate secrets before sending to AI providers" },
+	},
+
+	// Provider selection
+	"providers.webSearch": {
+		type: "enum",
+		values: [
+			"auto",
+			"exa",
+			"brave",
+			"jina",
+			"kimi",
+			"zai",
+			"perplexity",
+			"anthropic",
+			"gemini",
+			"codex",
+			"tavily",
+			"kagi",
+			"synthetic",
+			"parallel",
+		] as const,
+		default: "auto",
 		ui: {
-			tab: "agent",
-			label: "Top K",
-			description: "Sample from top-K tokens (-1 = provider default)",
+			tab: "providers",
+			label: "Web Search Provider",
+			description: "Provider for web search tool",
 			submenu: true,
 		},
 	},
-	minP: {
-		type: "number",
-		default: -1,
+
+	"providers.codeSearch": {
+		type: "enum",
+		values: ["grep", "exa"] as const,
+		default: "grep",
 		ui: {
-			tab: "agent",
-			label: "Min P",
-			description: "Minimum probability threshold (0-1, -1 = provider default)",
+			tab: "providers",
+			label: "Code Search Provider",
+			description: "Provider for code search tool",
 			submenu: true,
 		},
 	},
-	presencePenalty: {
-		type: "number",
-		default: -1,
+
+	"providers.image": {
+		type: "enum",
+		values: ["auto", "gemini", "openrouter"] as const,
+		default: "auto",
 		ui: {
-			tab: "agent",
-			label: "Presence penalty",
-			description: "Penalty for introducing already-present tokens (-1 = provider default)",
+			tab: "providers",
+			label: "Image Provider",
+			description: "Provider for image generation tool",
 			submenu: true,
 		},
 	},
-	repetitionPenalty: {
-		type: "number",
-		default: -1,
+
+	"providers.kimiApiFormat": {
+		type: "enum",
+		values: ["openai", "anthropic"] as const,
+		default: "anthropic",
 		ui: {
-			tab: "agent",
-			label: "Repetition penalty",
-			description: "Penalty for repeated tokens (-1 = provider default)",
+			tab: "providers",
+			label: "Kimi API Format",
+			description: "API format for Kimi Code provider",
 			submenu: true,
 		},
 	},
-	serviceTier: {
+
+	"providers.openaiWebsockets": {
 		type: "enum",
-		values: ["none", "auto", "default", "flex", "scale", "priority"] as const,
-		default: "none",
+		values: ["auto", "off", "on"] as const,
+		default: "auto",
 		ui: {
-			tab: "agent",
-			label: "Service tier",
-			description: "OpenAI processing priority (none = omit parameter)",
+			tab: "providers",
+			label: "OpenAI WebSockets",
+			description: "Websocket policy for OpenAI Codex models (auto uses model defaults, on forces, off disables)",
 			submenu: true,
 		},
 	},
+
+	"providers.parallelFetch": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "providers",
+			label: "Parallel Fetch",
+			description: "Use Parallel extract API for URL fetching when credentials are available",
+		},
+	},
+
+	// Exa
+	"exa.enabled": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "providers", label: "Exa", description: "Master toggle for all Exa search tools" },
+	},
+
+	"exa.enableSearch": {
+		type: "boolean",
+		default: true,
+		ui: { tab: "providers", label: "Exa Search", description: "Basic search, deep search, code search, crawl" },
+	},
+
+	"exa.enableResearcher": {
+		type: "boolean",
+		default: false,
+		ui: { tab: "providers", label: "Exa Researcher", description: "AI-powered deep research tasks" },
+	},
+
+	"exa.enableWebsets": {
+		type: "boolean",
+		default: false,
+		ui: { tab: "providers", label: "Exa Websets", description: "Webset management and enrichment tools" },
+	},
+
+	// ────────────────────────────────────────────────────────────────────────
+	// Advanced settings (no UI)
+	// ────────────────────────────────────────────────────────────────────────
+	"commit.mapReduceEnabled": { type: "boolean", default: true },
+
+	"commit.mapReduceMinFiles": { type: "number", default: 4 },
+
+	"commit.mapReduceMaxFileTokens": { type: "number", default: 50000 },
+
+	"commit.mapReduceTimeoutMs": { type: "number", default: 120000 },
+
+	"commit.mapReduceMaxConcurrency": { type: "number", default: 5 },
+
+	"commit.changelogMaxDiffChars": { type: "number", default: 120000 },
+
+	"thinkingBudgets.minimal": { type: "number", default: 1024 },
+
+	"thinkingBudgets.low": { type: "number", default: 2048 },
+
+	"thinkingBudgets.medium": { type: "number", default: 8192 },
+
+	"thinkingBudgets.high": { type: "number", default: 16384 },
 } as const;
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -1352,6 +1558,7 @@ export interface CompactionSettings {
 	enabled: boolean;
 	strategy: "context-full" | "handoff" | "off";
 	thresholdPercent: number;
+	thresholdTokens: number;
 	reserveTokens: number;
 	keepRecentTokens: number;
 	handoffSaveToDisk: boolean;
@@ -1408,6 +1615,7 @@ export interface SkillsSettings {
 	customDirectories?: string[];
 	ignoredSkills?: string[];
 	includeSkills?: string[];
+	disabledExtensions?: string[];
 }
 
 export interface CommitSettings {