@vitos-pizza/vitos-pizza 0.2.0 → 0.3.0

package/AGENTS.md

@@ -18,7 +18,7 @@ Declare npm pi packages in root `package.json`:
 - `bundledDependencies` — include in the distribution tarball
 - `piBundled` — list read by `sync-pi-manifest.mjs` to merge `node_modules/<pkg>/` paths into the root `pi` manifest
 
-Extension load order: topological sort of `pi.requires`, with `LOCAL_ORDER` tie-break. Default: `permission-system` → `question` → `ui-enhancements` → `agent-mode` → `subagents` → `session-title` → `keybindings`.
+Extension load order: topological sort of `pi.requires`, with `LOCAL_ORDER` tie-break. Default: `permission-system` → `settings-preset` → `question` → `ui-enhancements` → `subagents` → `websearch` → `session-title` → `keybindings` → `agent-mode` → `todoist`. (`agent-mode` requires `keybindings` so shortcut actions register after the keybindings listener is ready.)
 
 ## Agent mode
 
@@ -30,7 +30,7 @@ Vito's Pizzeria uses three centralized modes via **`@vitos-pizza/agent-mode`**:
 | `plan` | `plan` preset | Read-only; scout → planner via subagents + `question` |
 | `execute` | `yolo` preset | Minimal gates; full implementation |
 
-Switch with `/mode [agent|plan|execute]` or **`F6`** (`agent-mode.cycle`). Current mode appears in the ui-enhancements border bar (`· plan` / `· execute`).
+Switch with `/mode [agent|plan|execute]` or **`Ctrl+.`** / **`Alt+M`** (`agent-mode.cycle`). Current mode appears in the ui-enhancements border bar (`· plan` / `· execute`).
 
 ## Keyboard shortcuts
 
@@ -44,11 +44,13 @@ import { emitShortcutAction } from "@vitos-pizza/keybindings/types";
 // session_start — register handler only; keys come from vitos-shortcuts.json
 emitShortcutAction(pi.events, {
   id: "agent-mode.cycle",
-  description: "Cycle agent mode (agent → plan → execute)",
-  handler: async (ctx) => { /* ... */ },
+ description: "Cycle agent mode (agent → plan → execute)",
+ handler: async (ctx) => { /* ... */ },
 });
 ```
 
+Default binding: `ctrl+.` and `alt+m` (see `packages/keybindings/presets/shortcuts.json`). `Ctrl+.` needs a terminal with Kitty / modifyOtherKeys; `Alt+M` works in classic terminals.
+
 Key config (project overrides global overrides preset defaults):
 
 - `packages/keybindings/presets/shortcuts.json` — distribution defaults

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to vitos-pizza are documented here.
 
+## [0.3.0] - 2026-07-11
+
+### Added
+
+- **Execute-mode prompt UI** — bordered editor shows `▶ 开始实现` + free input (status bar preserved)
+- **`@vitos-pizza/settings-preset`** — seeds default Pi settings on first session when none exist
+- Mode cycle bindings: **`Ctrl+.`** and **`Alt+M`** (`agent-mode.cycle`)
+
+### Changed
+
+- Shortcut registration: actions register on `session_start` so keybindings can bind them reliably
+- Plan mode: main agent / scout / planner can use `question` when helpful; scout tools aligned to plan-friendly set (no bash/write)
+
 ## [0.2.0] - 2026-07-11
 
 ### Added

package/README.md

@@ -25,10 +25,10 @@ npm install -g --ignore-scripts @earendil-works/pi-coding-agent
 
 ```bash
 # npm (recommended)
-pi install npm:@vitos-pizza/vitos-pizza@0.2.0
+pi install npm:@vitos-pizza/vitos-pizza@0.3.0
 
 # git (pinned tag)
-pi install git:github.com/xin2017338/vitos-pizza@v0.2.0
+pi install git:github.com/xin2017338/vitos-pizza@v0.3.0
 ```
 
 From source:
@@ -148,7 +148,7 @@ Built-in **@vitos-pizza/permission-system** enforces allow / ask / deny on tools
 /mode plan                    # or agent | execute
 ```
 
-Or press **`F6`** to cycle agent → plan → execute. Use `/vitos-shortcuts` to view bindings.
+Or press **`Ctrl+.`** or **`Alt+M`** to cycle agent → plan → execute. Use `/vitos-shortcuts` to view bindings.
 
 | Mode | Permissions | Behavior |
 |------|-------------|----------|

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vitos-pizza/vitos-pizza",
-	"version": "0.2.0",
+	"version": "0.3.0",
 	"description": "Vito's Pizzeria — a Pi distribution (Garfield-approved)",
 	"publishConfig": {
 		"access": "public",
@@ -37,15 +37,17 @@
 		"typescript": "^5.8.0"
 	},
 	"dependencies": {
-		"@vitos-pizza/agent-mode": "0.2.0",
-		"@vitos-pizza/keybindings": "0.2.0",
-		"@vitos-pizza/permission-system": "0.2.0",
-		"@vitos-pizza/question": "0.2.0",
-		"@vitos-pizza/session-title": "0.2.0",
-		"@vitos-pizza/subagents": "0.2.0",
-		"@vitos-pizza/todoist": "0.2.0",
-		"@vitos-pizza/ui-enhancements": "0.2.0",
-		"@vitos-pizza/websearch": "0.2.0"
+		"typebox": "^1.1.38",
+		"@vitos-pizza/agent-mode": "0.3.0",
+		"@vitos-pizza/keybindings": "0.3.0",
+		"@vitos-pizza/permission-system": "0.3.0",
+		"@vitos-pizza/question": "0.3.0",
+		"@vitos-pizza/session-title": "0.3.0",
+		"@vitos-pizza/settings-preset": "0.3.0",
+		"@vitos-pizza/subagents": "0.3.0",
+		"@vitos-pizza/todoist": "0.3.0",
+		"@vitos-pizza/ui-enhancements": "0.3.0",
+		"@vitos-pizza/websearch": "0.3.0"
 	},
 	"bundledDependencies": [
 		"@vitos-pizza/agent-mode",
@@ -61,14 +63,15 @@
 	"pi": {
 		"extensions": [
 			"node_modules/@vitos-pizza/permission-system/extensions",
+			"node_modules/@vitos-pizza/settings-preset/extensions",
 			"node_modules/@vitos-pizza/question/extensions",
 			"node_modules/@vitos-pizza/ui-enhancements/extensions",
-			"node_modules/@vitos-pizza/agent-mode/extensions",
 			"node_modules/@vitos-pizza/subagents/extensions",
 			"node_modules/@vitos-pizza/websearch/extensions",
 			"node_modules/@vitos-pizza/session-title/extensions",
-			"node_modules/@vitos-pizza/todoist/extensions",
-			"node_modules/@vitos-pizza/keybindings/extensions"
+			"node_modules/@vitos-pizza/keybindings/extensions",
+			"node_modules/@vitos-pizza/agent-mode/extensions",
+			"node_modules/@vitos-pizza/todoist/extensions"
 		],
 		"skills": [
 			"node_modules/@vitos-pizza/subagents/skills"
@@ -78,6 +81,7 @@
 		"type": "git",
 		"url": "git+https://github.com/xin2017338/vitos-pizza.git"
 	},
+	"bundleDependencies": [],
 	"files": [
 		"packages",
 		"assets",

package/packages/agent-mode/extensions/index.ts

@@ -19,10 +19,10 @@ import {
 } from "../src/mode-events.ts";
 import {
 	AGENT_MODES,
+	type AgentMode,
 	cycleAgentMode,
 	isAgentMode,
 	MODE_LABELS,
-	type AgentMode,
 } from "../src/modes.ts";
 import {
 	PLAN_INSTRUCTIONS,
@@ -62,16 +62,18 @@ export default function (pi: ExtensionAPI): void {
 		ctx.ui.notify(`Mode: ${mode}`, "info");
 	};
 
-	emitShortcutAction(pi.events, {
-		id: "agent-mode.cycle",
-		description: "Cycle agent mode (agent → plan → execute)",
-		handler: async (shortcutCtx) => {
-			const next = cycleAgentMode(currentMode);
-			await switchMode(shortcutCtx, next);
-		},
-	});
-
 	pi.on("session_start", async (_event, ctx) => {
+		// Register during session_start so @vitos-pizza/keybindings (loads later)
+		// already listens on vitos:shortcuts:register before we emit.
+		emitShortcutAction(pi.events, {
+			id: "agent-mode.cycle",
+			description: "Cycle agent mode (agent → plan → execute)",
+			handler: async (shortcutCtx) => {
+				const next = cycleAgentMode(currentMode);
+				await switchMode(shortcutCtx, next);
+			},
+		});
+
 		const mode = ensureAgentModePersisted(ctx.cwd, { emitReload });
 		publishMode(ctx, mode);
 	});

package/packages/agent-mode/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vitos-pizza/agent-mode",
-	"version": "0.2.0",
+	"version": "0.3.0",
 	"description": "Centralized agent / plan / execute mode switching for Vito's Pizzeria",
 	"type": "module",
 	"license": "MIT",
@@ -13,15 +13,16 @@
 		"lint:fix": "biome check --write ."
 	},
 	"dependencies": {
-		"@vitos-pizza/keybindings": "0.2.0",
-		"@vitos-pizza/permission-system": "0.2.0"
+		"@vitos-pizza/keybindings": "0.3.0",
+		"@vitos-pizza/permission-system": "0.3.0"
 	},
 	"peerDependencies": {
 		"@earendil-works/pi-coding-agent": "*"
 	},
 	"pi": {
 		"requires": [
-			"@vitos-pizza/permission-system"
+			"@vitos-pizza/permission-system",
+			"@vitos-pizza/keybindings"
 		]
 	},
 	"devDependencies": {

package/packages/agent-mode/src/plan-instructions.ts

@@ -14,8 +14,12 @@ export const PLAN_INSTRUCTIONS = `## PLAN MODE
 
 You are in **plan** mode. Do not call write, edit, or bash on the main agent.
 
+**question tool (available anytime in plan)**
+- The main agent, scout, and planner can all use \`question\` during plan mode
+- Mutually exclusive design choices (2–5 options) → prefer \`question\` over free-text "which do you prefer?"
+- Use \`question\` when clarification would help; skip it when context is already enough
+
 **Planning workflow**
-- Mutually exclusive design choices (2–5 options) → always use the \`question\` tool; do not ask in free text
 - Produce an Implementation Plan and wait for user confirmation
 - Do **not** call worker or edit code directly in this mode
 
@@ -39,7 +43,7 @@ When helpful, add a short **Next** footer — Cursor-style suggested actions. Sk
 Example:
 \`\`\`
 **Next**
-- Confirm → \`/mode execute\` (or F6) to implement
+- Confirm → \`/mode execute\` (or Ctrl+. / Alt+M) to implement
 - Say what to change if the scope is off
 \`\`\`
 
@@ -49,7 +53,7 @@ export const PLAN_MODE_MESSAGE = `[PLAN MODE ACTIVE]
 
 You are in plan mode. The main agent must NOT write, edit, or run bash.
 
-1. Mutually exclusive choices → \`question\` tool (not free-text "which do you prefer?")
+1. \`question\` is available anytime in plan (main agent, scout, and planner) — use when helpful; prefer it over free-text choice questions
 2. Scout only if needed; parallel scouts (\`tasks: [...]\`) when exploring independent areas; otherwise go straight to planner
 3. Return the plan and wait; optionally a short **Next** footer (2–3 one-line actions) when helpful
 4. Do NOT call worker or make code changes

package/packages/keybindings/extensions/index.ts

@@ -64,12 +64,7 @@ export function registerKeybindings(pi: ExtensionAPI): {
 } {
 	const registry = new ActionRegistry();
 	let state: KeybindingsState | null = null;
-
-	const unsubRegister = pi.events.on(SHORTCUTS_REGISTER, (payload) => {
-		if (!isShortcutAction(payload)) return;
-		registry.register(payload);
-	});
-	void unsubRegister;
+	let sessionCwd: string | undefined;
 
 	const rebind = (cwd: string) => {
 		const agentDir = getAgentDir();
@@ -81,10 +76,23 @@ export function registerKeybindings(pi: ExtensionAPI): {
 		return state;
 	};
 
+	const unsubRegister = pi.events.on(SHORTCUTS_REGISTER, (payload) => {
+		if (!isShortcutAction(payload)) return;
+		registry.register(payload);
+		// Rebind if session already started (covers either session_start order).
+		if (sessionCwd) rebind(sessionCwd);
+	});
+	void unsubRegister;
+
 	pi.on("session_start", async (_event, ctx) => {
+		sessionCwd = ctx.cwd;
 		rebind(ctx.cwd);
 	});
 
+	pi.on("session_shutdown", () => {
+		sessionCwd = undefined;
+	});
+
 	pi.registerCommand("vitos-shortcuts", {
 		description: "List vitos-pizza shortcut actions and key bindings",
 		handler: async (_args, ctx) => {

package/packages/keybindings/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vitos-pizza/keybindings",
-	"version": "0.2.0",
+	"version": "0.3.0",
 	"description": "Centralized keyboard shortcut registry for Vito's Pizzeria Pi distribution",
 	"type": "module",
 	"license": "MIT",

package/packages/keybindings/presets/shortcuts.json

@@ -1,3 +1,3 @@
 {
-	"agent-mode.cycle": "f6"
+	"agent-mode.cycle": ["ctrl+.", "alt+m"]
 }

package/packages/permission-system/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vitos-pizza/permission-system",
-	"version": "0.2.0",
+	"version": "0.3.0",
 	"description": "Permission enforcement for Vito's Pizzeria Pi distribution",
 	"type": "module",
 	"license": "MIT",
@@ -18,7 +18,7 @@
 		"lint:fix": "biome check --write ."
 	},
 	"dependencies": {
-		"@vitos-pizza/keybindings": "0.2.0",
+		"@vitos-pizza/keybindings": "0.3.0",
 		"tree-sitter-bash": "^0.25.1",
 		"web-tree-sitter": "^0.25.10",
 		"zod": "^3.25.76"

package/packages/question/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vitos-pizza/question",
-	"version": "0.2.0",
+	"version": "0.3.0",
 	"description": "Structured ask-user question tool for Vito's Pizzeria Pi distribution",
 	"type": "module",
 	"license": "MIT",

package/packages/session-title/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vitos-pizza/session-title",
-	"version": "0.2.0",
+	"version": "0.3.0",
 	"description": "Async session auto-naming for Vito's Pizzeria Pi distribution",
 	"type": "module",
 	"license": "MIT",
@@ -11,7 +11,7 @@
 		]
 	},
 	"dependencies": {
-		"@vitos-pizza/subagents": "0.2.0"
+		"@vitos-pizza/subagents": "0.3.0"
 	},
 	"scripts": {
 		"test": "vitest run",
@@ -30,7 +30,7 @@
 	"devDependencies": {
 		"@earendil-works/pi-ai": "*",
 		"@earendil-works/pi-coding-agent": "*",
-		"@vitos-pizza/subagents": "0.2.0",
+		"@vitos-pizza/subagents": "0.3.0",
 		"typebox": "*",
 		"vitest": "^3.2.4"
 	}

package/packages/settings-preset/extensions/index.ts

@@ -0,0 +1,53 @@
+/**
+ * @vitos-pizza/settings-preset — seed default Pi settings on first session start.
+ *
+ * Follows the same non-destructive pattern as the permission-system module:
+ * only writes to project-level `.pi/settings.json` when neither global nor
+ * project settings exist, so existing user configurations are never overwritten.
+ */
+
+import { copyFileSync, existsSync, mkdirSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
+
+const moduleDir = dirname(fileURLToPath(import.meta.url));
+const presetsDir = join(moduleDir, "..", "presets");
+
+function getGlobalSettingsPath(agentDir: string): string {
+	return join(agentDir, "settings.json");
+}
+
+function getProjectSettingsPath(cwd: string): string {
+	return join(cwd, ".pi", "settings.json");
+}
+
+function ensureDefaultSettings(cwd: string, agentDir: string): void {
+	// Don't overwrite if the user already has project-level settings
+	const projectPath = getProjectSettingsPath(cwd);
+	if (existsSync(projectPath)) return;
+
+	// Don't overwrite if the user already has global settings
+	const globalPath = getGlobalSettingsPath(agentDir);
+	if (existsSync(globalPath)) return;
+
+	// Neither exists — seed the project with our preset
+	const presetPath = join(presetsDir, "settings.json");
+	if (!existsSync(presetPath)) return;
+
+	mkdirSync(dirname(projectPath), { recursive: true });
+	copyFileSync(presetPath, projectPath);
+}
+
+export default function (pi: ExtensionAPI) {
+	const agentDir = getAgentDir();
+	let seeded = false;
+
+	pi.on("session_start", async (_event, ctx) => {
+		if (seeded) return;
+		seeded = true;
+
+		ensureDefaultSettings(ctx.cwd, agentDir);
+	});
+}

package/packages/settings-preset/package.json

@@ -0,0 +1,19 @@
+{
+	"name": "@vitos-pizza/settings-preset",
+	"version": "0.3.0",
+	"description": "Default Pi settings for Vito's Pizzeria distribution — written on first session start",
+	"type": "module",
+	"license": "MIT",
+	"private": true,
+	"scripts": {
+		"typecheck": "tsc --noEmit",
+		"lint": "biome check .",
+		"lint:fix": "biome check --write ."
+	},
+	"peerDependencies": {
+		"@earendil-works/pi-coding-agent": "*"
+	},
+	"devDependencies": {
+		"@earendil-works/pi-coding-agent": "*"
+	}
+}

package/packages/settings-preset/presets/settings.json

@@ -0,0 +1,15 @@
+{
+	"quietStartup": true,
+	"hideThinkingBlock": true,
+	"session": {
+		"autoTitle": {
+			"enabled": true,
+			"fastRules": true,
+			"minCharsForLlm": 4,
+			"maxInputChars": 280,
+			"maxOutputTokens": 16,
+			"timeoutMs": 8000,
+			"maxTitleLength": 20
+		}
+	}
+}

package/packages/settings-preset/tsconfig.json

@@ -0,0 +1,11 @@
+{
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"allowImportingTsExtensions": true,
+		"types": ["node"]
+	},
+	"include": [
+		"extensions/**/*.ts"
+	],
+	"exclude": ["node_modules"]
+}

package/packages/subagents/agents/scout.md

@@ -1,7 +1,7 @@
 ---
 name: scout
 description: Fast codebase recon that returns compressed context for handoff
-tools: read, grep, find, ls, bash, write, question, web_search, web_read
+tools: read, grep, find, ls, question, web_search, web_read
 thinking: low
 systemPromptMode: replace
 ---
@@ -19,7 +19,8 @@ Focus on the minimum context another agent needs in order to act:
 
 Working rules:
 - Use `grep`, `find`, `ls`, and `read` to map the area before diving deeper.
-- Use `bash` only for non-interactive inspection commands.
+- You have the `question` tool. Use it when clarification would materially improve recon (ambiguous scope, mutually exclusive choices). Skip it when context is already enough.
+- When you do ask, prefer `question` over free-text "which do you prefer?".
 - When you cite code, use exact file paths and line ranges.
 - When running solo, summarize what you found in the final response.
 

package/packages/subagents/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vitos-pizza/subagents",
-	"version": "0.2.0",
+	"version": "0.3.0",
 	"description": "Subagent delegation for Vito's Pizzeria Pi distribution",
 	"type": "module",
 	"license": "MIT",

package/packages/subagents/skills/subagents/SKILL.md

@@ -9,15 +9,15 @@ Use the `subagent` tool to delegate work to focused child agents with isolated c
 
 ## Agent modes
 
-Vito's Pizzeria uses three modes via `/mode` or `F6`:
+Vito's Pizzeria uses three modes via `/mode` or `Ctrl+.` / `Alt+M`:
 
 | Mode | When to use |
 |------|-------------|
 | **agent** | Default balanced work |
-| **plan** | Read-only planning — planner (+ optional scout), `question` for clarification; optional short **Next** footer |
+| **plan** | Read-only planning — planner (+ optional scout); `question` available anytime when helpful; optional short **Next** footer |
 | **execute** | Full implementation after plan is approved |
 
-In **plan** mode the main agent cannot write/edit/bash. Delegate with subagents. Scout is optional — use it only when codebase recon is needed; otherwise call planner directly. When recon spans independent areas, run multiple scouts in parallel (`tasks: [...]`) then planner:
+In **plan** mode the main agent cannot write/edit/bash. Delegate with subagents. Scout is optional — use it only when codebase recon is needed; otherwise call planner directly. When recon spans independent areas, run multiple scouts in parallel (`tasks: [...]`) then planner. The main agent, scout, and planner can all use `question` during plan when clarification would help (not required if context is enough):
 
 ```
 [optional scout(s) →] planner → (user confirms) → switch to execute → worker
@@ -27,7 +27,7 @@ In **plan** mode the main agent cannot write/edit/bash. Delegate with subagents.
 
 | Agent | Use when |
 |-------|----------|
-| `scout` | Fast codebase recon; returns compressed context |
+| `scout` | Fast codebase recon; returns compressed context; may use `question` when recon needs clarification |
 | `planner` | Turn context + requirements into an implementation plan |
 | `worker` | Execute an approved plan with narrow, correct edits |
 | `title` | Generate short session titles (used by `@vitos-pizza/session-title`) |

package/packages/todoist/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vitos-pizza/todoist",
-	"version": "0.2.0",
+	"version": "0.3.0",
 	"description": "In-memory task management with TUI widget and optional Todoist MCP sync for Vito's Pizzeria Pi distribution",
 	"type": "module",
 	"license": "MIT",

package/packages/ui-enhancements/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vitos-pizza/ui-enhancements",
-	"version": "0.2.0",
+	"version": "0.3.0",
 	"description": "TUI and UI enhancements for Vito's Pizzeria Pi distribution",
 	"type": "module",
 	"license": "MIT",

package/packages/ui-enhancements/src/chrome/border-status.ts

@@ -13,6 +13,14 @@ import {
 	getAgentModeBadge,
 	registerAgentModeBadge,
 } from "./agent-mode-badge.ts";
+import {
+	EXECUTE_START_MESSAGE,
+	type ExecutePromptFocus,
+	formatExecuteActionLine,
+	formatExecuteSeparatorLine,
+	handleExecutePromptKey,
+	injectExecutePromptRows,
+} from "./execute-prompt.ts";
 import { fitBorder } from "./format-border.ts";
 import { attachResizeRecovery } from "./resize-recovery.ts";
 
@@ -31,6 +39,10 @@ function formatThinking(level: string): string {
 	return level === "off" ? "off" : level;
 }
 
+function isExecuteMode(): boolean {
+	return getAgentModeBadge()?.mode === "execute";
+}
+
 class EmptyFooter implements Component {
 	render(): string[] {
 		return [];
@@ -127,6 +139,8 @@ export function registerBorderStatusBar(
 		void refreshGit();
 
 		class BorderStatusEditor extends CustomEditor {
+			private executeFocus: ExecutePromptFocus = "action";
+
 			constructor(
 				tui: TUI,
 				theme: EditorTheme,
@@ -136,9 +150,8 @@ export function registerBorderStatusBar(
 				activeTui = tui;
 			}
 
-			render(width: number): string[] {
-				const lines = super.render(width);
-				if (lines.length < 2) return lines;
+			private applyStatusBorders(lines: string[], width: number): void {
+				if (lines.length < 2) return;
 
 				const thm = ctx.ui.theme;
 				const model = ctx.model
@@ -171,8 +184,68 @@ export function registerBorderStatusBar(
 					width,
 					borderColor,
 				);
+			}
+
+			render(width: number): string[] {
+				const execute = isExecuteMode();
+				if (!execute) {
+					this.executeFocus = "action";
+				}
+
+				const wasFocused = this.focused;
+				if (execute && this.executeFocus === "action") {
+					this.focused = false;
+				}
+
+				let lines = super.render(width);
+				this.focused = wasFocused;
+
+				if (lines.length < 2) return lines;
+
+				if (execute) {
+					const thm = ctx.ui.theme;
+					const onAction = this.executeFocus === "action";
+					lines = injectExecutePromptRows(
+						lines,
+						formatExecuteActionLine(onAction, thm, width),
+						formatExecuteSeparatorLine(thm, width),
+					);
+				}
+
+				this.applyStatusBorders(lines, width);
 				return lines;
 			}
+
+			handleInput(data: string): void {
+				if (!isExecuteMode()) {
+					this.executeFocus = "action";
+					super.handleInput(data);
+					return;
+				}
+
+				const result = handleExecutePromptKey(this.executeFocus, data, {
+					editorEmpty: this.isEditorEmpty(),
+					onFirstVisualLine: this.isOnFirstVisualLine(),
+				});
+
+				if (result.type === "setFocus") {
+					this.executeFocus = result.focus;
+					this.focused = result.focus === "editor";
+					this.tui.requestRender();
+					return;
+				}
+
+				if (result.type === "submitStart") {
+					this.setText(EXECUTE_START_MESSAGE);
+					this.submitValue();
+					this.executeFocus = "action";
+					this.focused = false;
+					this.tui.requestRender();
+					return;
+				}
+
+				super.handleInput(data);
+			}
 		}
 
 		ctx.ui.setEditorComponent(