@vitos-pizza/vitos-pizza 0.1.0 → 0.3.0

package/packages/agent-mode/src/modes.ts

@@ -1,43 +1,43 @@
-import type { PermissionPresetName } from "@vitos-pizza/permission-system/mode-api";
-import {
-	PRESETS_DIR,
-} from "@vitos-pizza/permission-system/mode-api";
-import { detectPresetMode } from "@vitos-pizza/permission-system/detect-preset-mode";
-import type { ExtensionConfig } from "@vitos-pizza/permission-system/types";
-
-export type AgentMode = "agent" | "plan" | "execute";
-
-export const AGENT_MODES: readonly AgentMode[] = [
-	"agent",
-	"plan",
-	"execute",
-] as const;
-
-export const PRESET_BY_MODE: Record<AgentMode, PermissionPresetName> = {
-	agent: "default",
-	plan: "plan",
-	execute: "yolo",
-};
-
-export const MODE_LABELS: Record<AgentMode, string> = {
-	agent: "Agent mode — balanced permissions",
-	plan: "Plan mode — read-only exploration",
-	execute: "Execute mode — minimal gates",
-};
-
-export function isAgentMode(value: string): value is AgentMode {
-	return (AGENT_MODES as readonly string[]).includes(value);
-}
-
-export function cycleAgentMode(current: AgentMode): AgentMode {
-	const index = AGENT_MODES.indexOf(current);
-	return AGENT_MODES[(index + 1) % AGENT_MODES.length];
-}
-
-export function inferAgentMode(config: ExtensionConfig): AgentMode {
-	if (config.agentMode) return config.agentMode;
-	const detected = detectPresetMode(config.permission, PRESETS_DIR);
-	if (detected === "plan") return "plan";
-	if (detected === "yolo") return "execute";
-	return "agent";
-}
+import type { PermissionPresetName } from "@vitos-pizza/permission-system/mode-api";
+import {
+	PRESETS_DIR,
+} from "@vitos-pizza/permission-system/mode-api";
+import { detectPresetMode } from "@vitos-pizza/permission-system/detect-preset-mode";
+import type { ExtensionConfig } from "@vitos-pizza/permission-system/types";
+
+export type AgentMode = "agent" | "plan" | "execute";
+
+export const AGENT_MODES: readonly AgentMode[] = [
+	"agent",
+	"plan",
+	"execute",
+] as const;
+
+export const PRESET_BY_MODE: Record<AgentMode, PermissionPresetName> = {
+	agent: "default",
+	plan: "plan",
+	execute: "yolo",
+};
+
+export const MODE_LABELS: Record<AgentMode, string> = {
+	agent: "Agent mode — balanced permissions",
+	plan: "Plan mode — read-only exploration",
+	execute: "Execute mode — minimal gates",
+};
+
+export function isAgentMode(value: string): value is AgentMode {
+	return (AGENT_MODES as readonly string[]).includes(value);
+}
+
+export function cycleAgentMode(current: AgentMode): AgentMode {
+	const index = AGENT_MODES.indexOf(current);
+	return AGENT_MODES[(index + 1) % AGENT_MODES.length];
+}
+
+export function inferAgentMode(config: ExtensionConfig): AgentMode {
+	if (config.agentMode) return config.agentMode;
+	const detected = detectPresetMode(config.permission, PRESETS_DIR);
+	if (detected === "plan") return "plan";
+	if (detected === "yolo") return "execute";
+	return "agent";
+}

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

@@ -1,44 +1,89 @@
-export const PLAN_MODE_TOOLS = [
-	"read",
-	"grep",
-	"find",
-	"ls",
-	"question",
-	"subagent",
-	"wait",
-	"web_search",
-	"web_read",
-] as const;
-
-export const PLAN_INSTRUCTIONS = `## PLAN MODE
-
-You are in **plan** mode. Do not call write, edit, or bash on the main agent.
-
-**Planning workflow**
-- Default path: \`subagent({ chain: [{ agent: "scout", task: "..." }, { agent: "planner", task: "..." }] })\`
-- Use the \`question\` tool when requirements are unclear
-- Produce an Implementation Plan and wait for user confirmation
-- Do **not** call worker or edit code directly in this mode
-
-**To implement**, the user must switch to execute or agent mode (\`/mode execute\` or \`/mode agent\`).`;
-
-export const PLAN_MODE_MESSAGE = `[PLAN MODE ACTIVE]
-
-You are in plan mode. The main agent must NOT write, edit, or run bash.
-
-For any task that needs codebase exploration or an implementation plan, you MUST delegate to subagents:
-
-1. Call \`subagent\` with a scout → planner chain (do not only use read/grep yourself)
-2. Use \`question\` when requirements are unclear
-3. Return the planner's output and wait for user confirmation
-4. Do NOT call worker or make code changes
-
-Example:
-\`\`\`json
-{
-  "chain": [
-    { "agent": "scout", "task": "Map relevant code for this task" },
-    { "agent": "planner", "task": "Create an implementation plan from {previous}" }
-  ]
-}
-\`\`\``;
+export const PLAN_MODE_TOOLS = [
+	"read",
+	"grep",
+	"find",
+	"ls",
+	"question",
+	"subagent",
+	"wait",
+	"web_search",
+	"web_read",
+] as const;
+
+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**
+- Produce an Implementation Plan and wait for user confirmation
+- Do **not** call worker or edit code directly in this mode
+
+**When to explore**
+- Scout is **optional**. Skip it when the task is clear, scoped to known files, or the user already provided enough context
+- Call scout only when you need codebase recon (unfamiliar area, many files, unclear entry points)
+- Independent areas → parallel scouts via \`subagent({ tasks: [...] })\` to finish recon faster; then planner
+- For light lookups, the main agent may use read/grep/find/ls directly — no scout required
+
+**Delegation**
+- Enough context already → \`subagent({ agent: "planner", task: "..." })\`
+- Need recon first → \`subagent({ chain: [{ agent: "scout", task: "..." }, { agent: "planner", task: "..." }] })\`
+- Multi-area recon → parallel scouts, then planner with the combined findings
+
+**After the plan (optional)**
+When helpful, add a short **Next** footer — Cursor-style suggested actions. Skip it if the next step is already obvious.
+- 2–3 bullets max; each one line
+- Concrete verbs the user can reply with (e.g. confirm → \`/mode execute\`, tweak scope)
+- No essays, no restating the whole plan
+
+Example:
+\`\`\`
+**Next**
+- Confirm → \`/mode execute\` (or Ctrl+. / Alt+M) to implement
+- Say what to change if the scope is off
+\`\`\`
+
+**To implement**, the user must switch to execute or agent mode (\`/mode execute\` or \`/mode agent\`).`;
+
+export const PLAN_MODE_MESSAGE = `[PLAN MODE ACTIVE]
+
+You are in plan mode. The main agent must NOT write, edit, or run bash.
+
+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
+
+Planner only (no scout):
+\`\`\`json
+{ "agent": "planner", "task": "Create an implementation plan for ..." }
+\`\`\`
+
+Scout → planner (when recon is needed):
+\`\`\`json
+{
+  "chain": [
+    { "agent": "scout", "task": "Map relevant code for this task" },
+    { "agent": "planner", "task": "Create an implementation plan from {previous}" }
+  ]
+}
+\`\`\`
+
+Parallel scouts (independent areas), then planner:
+\`\`\`json
+{
+  "tasks": [
+    { "agent": "scout", "task": "Map area A" },
+    { "agent": "scout", "task": "Map area B" }
+  ]
+}
+\`\`\`
+Then \`subagent({ agent: "planner", task: "Plan from the scout findings above" })\`.`;
+
+export const PLAN_MODE_ENDED_MESSAGE = `[PLAN MODE ENDED]
+
+You left plan mode. write, edit, and bash are available again according to the current mode (agent or execute). Do not treat earlier [PLAN MODE ACTIVE] messages as still in effect.`;

package/packages/agent-mode/tsconfig.json

@@ -1,13 +1,13 @@
-{
-	"extends": "../../tsconfig.base.json",
-	"compilerOptions": {
-		"allowImportingTsExtensions": true
-	},
-	"include": [
-		"extensions/**/*.ts",
-		"src/**/*.ts",
-		"tests/**/*.ts",
-		"vitest.config.ts"
-	],
-	"exclude": ["node_modules"]
-}
+{
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"allowImportingTsExtensions": true
+	},
+	"include": [
+		"extensions/**/*.ts",
+		"src/**/*.ts",
+		"tests/**/*.ts",
+		"vitest.config.ts"
+	],
+	"exclude": ["node_modules"]
+}

package/packages/agent-mode/vitest.config.ts

@@ -1,8 +1,8 @@
-import { defineConfig } from "vitest/config";
-
-export default defineConfig({
-	test: {
-		environment: "node",
-		include: ["tests/**/*.test.ts"],
-	},
-});
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+	test: {
+		environment: "node",
+		include: ["tests/**/*.test.ts"],
+	},
+});

package/packages/keybindings/extensions/index.ts

@@ -1,104 +1,112 @@
-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";
-import { type BindResult, bindShortcuts } from "../src/bind.ts";
-import {
-	loadShortcutConfigFiles,
-	resolveShortcutConfigPaths,
-} from "../src/config.ts";
-import { ActionRegistry } from "../src/registry.ts";
-import {
-	isShortcutAction,
-	SHORTCUTS_REGISTER,
-	type ShortcutActionEntry,
-} from "../src/types.ts";
-
-const moduleDir = dirname(fileURLToPath(import.meta.url));
-const presetPath = join(moduleDir, "..", "presets", "shortcuts.json");
-
-export interface KeybindingsState {
-	entries: ShortcutActionEntry[];
-	bindResult: BindResult;
-	configPaths: ReturnType<typeof resolveShortcutConfigPaths>;
-}
-
-function formatEntriesMessage(state: KeybindingsState): string {
-	if (state.entries.length === 0) {
-		return "No vitos shortcut actions registered yet.\n\nModules can register actions via vitos:shortcuts:register during session_start.";
-	}
-
-	const lines = ["**Action** | **Keys** | **Source**", "--- | --- | ---"];
-
-	for (const entry of state.entries) {
-		const keys =
-			entry.keys.length > 0
-				? entry.keys.map((key) => `\`${key}\``).join(", ")
-				: "_(unbound)_";
-		const source = entry.source ?? "—";
-		lines.push(`\`${entry.id}\` — ${entry.description} | ${keys} | ${source}`);
-	}
-
-	if (state.bindResult.skipped.length > 0) {
-		lines.push("");
-		lines.push("**Skipped bindings:**");
-		for (const skipped of state.bindResult.skipped) {
-			lines.push(
-				`- \`${skipped.actionId}\` \`${skipped.key}\`: ${skipped.reason}`,
-			);
-		}
-	}
-
-	lines.push("");
-	lines.push("Config files (project overrides global overrides preset):");
-	lines.push(`- preset: \`${state.configPaths.presetPath}\``);
-	lines.push(`- global: \`${state.configPaths.globalPath}\``);
-	lines.push(`- project: \`${state.configPaths.projectPath}\``);
-
-	return lines.join("\n");
-}
-
-export function registerKeybindings(pi: ExtensionAPI): {
-	registry: ActionRegistry;
-	getState: () => KeybindingsState | null;
-} {
-	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;
-
-	const rebind = (cwd: string) => {
-		const agentDir = getAgentDir();
-		const configPaths = resolveShortcutConfigPaths(presetPath, agentDir, cwd);
-		const config = loadShortcutConfigFiles(configPaths);
-		const bindResult = bindShortcuts(pi, registry, config);
-		const entries = registry.buildEntries(config.bindings);
-		state = { entries, bindResult, configPaths };
-		return state;
-	};
-
-	pi.on("session_start", async (_event, ctx) => {
-		rebind(ctx.cwd);
-	});
-
-	pi.registerCommand("vitos-shortcuts", {
-		description: "List vitos-pizza shortcut actions and key bindings",
-		handler: async (_args, ctx) => {
-			const current = rebind(ctx.cwd);
-			ctx.ui.notify(formatEntriesMessage(current), "info");
-		},
-	});
-
-	return {
-		registry,
-		getState: () => state,
-	};
-}
-
-export default function (pi: ExtensionAPI): void {
-	registerKeybindings(pi);
-}
+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";
+import { type BindResult, bindShortcuts } from "../src/bind.ts";
+import {
+	loadShortcutConfigFiles,
+	resolveShortcutConfigPaths,
+} from "../src/config.ts";
+import { ActionRegistry } from "../src/registry.ts";
+import {
+	isShortcutAction,
+	SHORTCUTS_REGISTER,
+	type ShortcutActionEntry,
+} from "../src/types.ts";
+
+const moduleDir = dirname(fileURLToPath(import.meta.url));
+const presetPath = join(moduleDir, "..", "presets", "shortcuts.json");
+
+export interface KeybindingsState {
+	entries: ShortcutActionEntry[];
+	bindResult: BindResult;
+	configPaths: ReturnType<typeof resolveShortcutConfigPaths>;
+}
+
+function formatEntriesMessage(state: KeybindingsState): string {
+	if (state.entries.length === 0) {
+		return "No vitos shortcut actions registered yet.\n\nModules can register actions via vitos:shortcuts:register during session_start.";
+	}
+
+	const lines = ["**Action** | **Keys** | **Source**", "--- | --- | ---"];
+
+	for (const entry of state.entries) {
+		const keys =
+			entry.keys.length > 0
+				? entry.keys.map((key) => `\`${key}\``).join(", ")
+				: "_(unbound)_";
+		const source = entry.source ?? "—";
+		lines.push(`\`${entry.id}\` — ${entry.description} | ${keys} | ${source}`);
+	}
+
+	if (state.bindResult.skipped.length > 0) {
+		lines.push("");
+		lines.push("**Skipped bindings:**");
+		for (const skipped of state.bindResult.skipped) {
+			lines.push(
+				`- \`${skipped.actionId}\` \`${skipped.key}\`: ${skipped.reason}`,
+			);
+		}
+	}
+
+	lines.push("");
+	lines.push("Config files (project overrides global overrides preset):");
+	lines.push(`- preset: \`${state.configPaths.presetPath}\``);
+	lines.push(`- global: \`${state.configPaths.globalPath}\``);
+	lines.push(`- project: \`${state.configPaths.projectPath}\``);
+
+	return lines.join("\n");
+}
+
+export function registerKeybindings(pi: ExtensionAPI): {
+	registry: ActionRegistry;
+	getState: () => KeybindingsState | null;
+} {
+	const registry = new ActionRegistry();
+	let state: KeybindingsState | null = null;
+	let sessionCwd: string | undefined;
+
+	const rebind = (cwd: string) => {
+		const agentDir = getAgentDir();
+		const configPaths = resolveShortcutConfigPaths(presetPath, agentDir, cwd);
+		const config = loadShortcutConfigFiles(configPaths);
+		const bindResult = bindShortcuts(pi, registry, config);
+		const entries = registry.buildEntries(config.bindings);
+		state = { entries, bindResult, configPaths };
+		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) => {
+			const current = rebind(ctx.cwd);
+			ctx.ui.notify(formatEntriesMessage(current), "info");
+		},
+	});
+
+	return {
+		registry,
+		getState: () => state,
+	};
+}
+
+export default function (pi: ExtensionAPI): void {
+	registerKeybindings(pi);
+}

package/packages/keybindings/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vitos-pizza/keybindings",
-	"version": "0.1.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/keybindings/src/bind.ts

@@ -1,57 +1,57 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import type { KeyId } from "@earendil-works/pi-tui";
-import type { ActionRegistry } from "./registry.ts";
-import type { MergedShortcutConfig } from "./types.ts";
-
-export interface BindResult {
-	bound: Array<{ actionId: string; key: KeyId; description: string }>;
-	skipped: Array<{ actionId: string; key: KeyId; reason: string }>;
-	unboundActions: string[];
-}
-
-export function bindShortcuts(
-	pi: Pick<ExtensionAPI, "registerShortcut">,
-	registry: ActionRegistry,
-	config: MergedShortcutConfig,
-): BindResult {
-	const result: BindResult = {
-		bound: [],
-		skipped: [],
-		unboundActions: [],
-	};
-
-	const boundKeys = new Set<string>();
-
-	for (const action of registry.list()) {
-		const binding = config.bindings.get(action.id);
-		if (!binding || binding.keys.length === 0) {
-			result.unboundActions.push(action.id);
-			continue;
-		}
-
-		for (const key of binding.keys) {
-			const normalizedKey = key.toLowerCase();
-			if (boundKeys.has(normalizedKey)) {
-				result.skipped.push({
-					actionId: action.id,
-					key,
-					reason: "duplicate key in vitos-shortcuts config",
-				});
-				continue;
-			}
-
-			pi.registerShortcut(key, {
-				description: action.description,
-				handler: action.handler,
-			});
-			boundKeys.add(normalizedKey);
-			result.bound.push({
-				actionId: action.id,
-				key,
-				description: action.description,
-			});
-		}
-	}
-
-	return result;
-}
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { KeyId } from "@earendil-works/pi-tui";
+import type { ActionRegistry } from "./registry.ts";
+import type { MergedShortcutConfig } from "./types.ts";
+
+export interface BindResult {
+	bound: Array<{ actionId: string; key: KeyId; description: string }>;
+	skipped: Array<{ actionId: string; key: KeyId; reason: string }>;
+	unboundActions: string[];
+}
+
+export function bindShortcuts(
+	pi: Pick<ExtensionAPI, "registerShortcut">,
+	registry: ActionRegistry,
+	config: MergedShortcutConfig,
+): BindResult {
+	const result: BindResult = {
+		bound: [],
+		skipped: [],
+		unboundActions: [],
+	};
+
+	const boundKeys = new Set<string>();
+
+	for (const action of registry.list()) {
+		const binding = config.bindings.get(action.id);
+		if (!binding || binding.keys.length === 0) {
+			result.unboundActions.push(action.id);
+			continue;
+		}
+
+		for (const key of binding.keys) {
+			const normalizedKey = key.toLowerCase();
+			if (boundKeys.has(normalizedKey)) {
+				result.skipped.push({
+					actionId: action.id,
+					key,
+					reason: "duplicate key in vitos-shortcuts config",
+				});
+				continue;
+			}
+
+			pi.registerShortcut(key, {
+				description: action.description,
+				handler: action.handler,
+			});
+			boundKeys.add(normalizedKey);
+			result.bound.push({
+				actionId: action.id,
+				key,
+				description: action.description,
+			});
+		}
+	}
+
+	return result;
+}