mitsupi 1.4.0 → 1.6.0

package/extensions/split-fork.ts

@@ -0,0 +1,130 @@
+import type { ExtensionAPI, ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import { existsSync, promises as fs } from "node:fs";
+import * as path from "node:path";
+import { randomUUID } from "node:crypto";
+
+const GHOSTTY_SPLIT_SCRIPT = `on run argv
+	set targetCwd to item 1 of argv
+	set startupInput to item 2 of argv
+	tell application "Ghostty"
+		set cfg to new surface configuration
+		set initial working directory of cfg to targetCwd
+		set initial input of cfg to startupInput
+		if (count of windows) > 0 then
+			try
+				set frontWindow to front window
+				set targetTerminal to focused terminal of selected tab of frontWindow
+				split targetTerminal direction right with configuration cfg
+			on error
+				new window with configuration cfg
+			end try
+		else
+			new window with configuration cfg
+		end if
+		activate
+	end tell
+end run`;
+
+function shellQuote(value: string): string {
+	if (value.length === 0) return "''";
+	return `'${value.replace(/'/g, `'"'"'`)}'`;
+}
+
+function getPiInvocationParts(): string[] {
+	const currentScript = process.argv[1];
+	if (currentScript && existsSync(currentScript)) {
+		return [process.execPath, currentScript];
+	}
+
+	const execName = path.basename(process.execPath).toLowerCase();
+	const isGenericRuntime = /^(node|bun)(\.exe)?$/.test(execName);
+	if (!isGenericRuntime) {
+		return [process.execPath];
+	}
+
+	return ["pi"];
+}
+
+function buildPiStartupInput(sessionFile: string | undefined, prompt: string): string {
+	const commandParts = [...getPiInvocationParts()];
+
+	if (sessionFile) {
+		commandParts.push("--session", sessionFile);
+	}
+
+	if (prompt.length > 0) {
+		commandParts.push("--", prompt);
+	}
+
+	return `${commandParts.map(shellQuote).join(" ")}\n`;
+}
+
+async function createForkedSession(ctx: ExtensionCommandContext): Promise<string | undefined> {
+	const sessionFile = ctx.sessionManager.getSessionFile();
+	if (!sessionFile) {
+		return undefined;
+	}
+
+	const sessionDir = path.dirname(sessionFile);
+	const branchEntries = ctx.sessionManager.getBranch();
+	const currentHeader = ctx.sessionManager.getHeader();
+
+	const timestamp = new Date().toISOString();
+	const fileTimestamp = timestamp.replace(/[:.]/g, "-");
+	const newSessionId = randomUUID();
+	const newSessionFile = path.join(sessionDir, `${fileTimestamp}_${newSessionId}.jsonl`);
+
+	const newHeader = {
+		type: "session",
+		version: currentHeader?.version ?? 3,
+		id: newSessionId,
+		timestamp,
+		cwd: currentHeader?.cwd ?? ctx.cwd,
+		parentSession: sessionFile,
+	};
+
+	const lines = [JSON.stringify(newHeader), ...branchEntries.map((entry) => JSON.stringify(entry))].join("\n") + "\n";
+
+	await fs.mkdir(sessionDir, { recursive: true });
+	await fs.writeFile(newSessionFile, lines, "utf8");
+
+	return newSessionFile;
+}
+
+export default function (pi: ExtensionAPI): void {
+	pi.registerCommand("split-fork", {
+		description: "Fork this session into a new pi process in a right-hand Ghostty split. Usage: /split-fork [optional prompt]",
+		handler: async (args, ctx) => {
+			if (process.platform !== "darwin") {
+				ctx.ui.notify("/split-fork currently requires macOS (Ghostty AppleScript).", "warning");
+				return;
+			}
+
+			const wasBusy = !ctx.isIdle();
+			const prompt = args.trim();
+			const forkedSessionFile = await createForkedSession(ctx);
+			const startupInput = buildPiStartupInput(forkedSessionFile, prompt);
+
+			const result = await pi.exec("osascript", ["-e", GHOSTTY_SPLIT_SCRIPT, "--", ctx.cwd, startupInput]);
+			if (result.code !== 0) {
+				const reason = result.stderr?.trim() || result.stdout?.trim() || "unknown osascript error";
+				ctx.ui.notify(`Failed to launch Ghostty split: ${reason}`, "error");
+				if (forkedSessionFile) {
+					ctx.ui.notify(`Forked session was created: ${forkedSessionFile}`, "info");
+				}
+				return;
+			}
+
+			if (forkedSessionFile) {
+				const fileName = path.basename(forkedSessionFile);
+				const suffix = prompt ? " and sent prompt" : "";
+				ctx.ui.notify(`Forked to ${fileName} in a new Ghostty split${suffix}.`, "info");
+				if (wasBusy) {
+					ctx.ui.notify("Forked from current committed state (in-flight turn continues in original session).", "info");
+				}
+			} else {
+				ctx.ui.notify("Opened a new Ghostty split (no persisted session to fork).", "warning");
+			}
+		},
+	});
+}

package/{pi-extensions → extensions}/todos.ts

@@ -48,7 +48,6 @@ import {
 	Text,
 	TUI,
 	fuzzyMatch,
-	getEditorKeybindings,
 	matchesKey,
 	truncateToWidth,
 	visibleWidth,
@@ -90,6 +89,10 @@ interface TodoSettings {
 	gcDays: number;
 }
 
+type KeybindingMatcher = {
+	matches: (keyData: string, keybindingId: string) => boolean;
+};
+
 const TodoParams = Type.Object({
 	action: StringEnum([
 		"list",
@@ -253,6 +256,7 @@ class TodoSelectorComponent extends Container implements Focusable {
 	private onCancelCallback: () => void;
 	private tui: TUI;
 	private theme: Theme;
+	private keybindings: KeybindingMatcher;
 	private headerText: Text;
 	private hintText: Text;
 	private currentSessionId?: string;
@@ -269,6 +273,7 @@ class TodoSelectorComponent extends Container implements Focusable {
 	constructor(
 		tui: TUI,
 		theme: Theme,
+		keybindings: KeybindingMatcher,
 		todos: TodoFrontMatter[],
 		onSelect: (todo: TodoFrontMatter) => void,
 		onCancel: () => void,
@@ -279,6 +284,7 @@ class TodoSelectorComponent extends Container implements Focusable {
 		super();
 		this.tui = tui;
 		this.theme = theme;
+		this.keybindings = keybindings;
 		this.currentSessionId = currentSessionId;
 		this.allTodos = todos;
 		this.filteredTodos = todos;
@@ -397,25 +403,25 @@ class TodoSelectorComponent extends Container implements Focusable {
 	}
 
 	handleInput(keyData: string): void {
-		const kb = getEditorKeybindings();
-		if (kb.matches(keyData, "selectUp")) {
+		const kb = this.keybindings;
+		if (kb.matches(keyData, "tui.select.up")) {
 			if (this.filteredTodos.length === 0) return;
 			this.selectedIndex = this.selectedIndex === 0 ? this.filteredTodos.length - 1 : this.selectedIndex - 1;
 			this.updateList();
 			return;
 		}
-		if (kb.matches(keyData, "selectDown")) {
+		if (kb.matches(keyData, "tui.select.down")) {
 			if (this.filteredTodos.length === 0) return;
 			this.selectedIndex = this.selectedIndex === this.filteredTodos.length - 1 ? 0 : this.selectedIndex + 1;
 			this.updateList();
 			return;
 		}
-		if (kb.matches(keyData, "selectConfirm")) {
+		if (kb.matches(keyData, "tui.select.confirm")) {
 			const selected = this.filteredTodos[this.selectedIndex];
 			if (selected) this.onSelectCallback(selected);
 			return;
 		}
-		if (kb.matches(keyData, "selectCancel")) {
+		if (kb.matches(keyData, "tui.select.cancel")) {
 			this.onCancelCallback();
 			return;
 		}
@@ -558,10 +564,18 @@ class TodoDetailOverlayComponent {
 	private viewHeight = 0;
 	private totalLines = 0;
 	private onAction: (action: TodoOverlayAction) => void;
+	private keybindings: KeybindingMatcher;
 
-	constructor(tui: TUI, theme: Theme, todo: TodoRecord, onAction: (action: TodoOverlayAction) => void) {
+	constructor(
+		tui: TUI,
+		theme: Theme,
+		keybindings: KeybindingMatcher,
+		todo: TodoRecord,
+		onAction: (action: TodoOverlayAction) => void,
+	) {
 		this.tui = tui;
 		this.theme = theme;
+		this.keybindings = keybindings;
 		this.todo = todo;
 		this.onAction = onAction;
 		this.markdown = new Markdown(this.getMarkdownText(), 1, 0, getMarkdownTheme());
@@ -573,28 +587,28 @@ class TodoDetailOverlayComponent {
 	}
 
 	handleInput(keyData: string): void {
-		const kb = getEditorKeybindings();
-		if (kb.matches(keyData, "selectCancel")) {
+		const kb = this.keybindings;
+		if (kb.matches(keyData, "tui.select.cancel")) {
 			this.onAction("back");
 			return;
 		}
-		if (kb.matches(keyData, "selectConfirm")) {
+		if (kb.matches(keyData, "tui.select.confirm")) {
 			this.onAction("work");
 			return;
 		}
-		if (kb.matches(keyData, "selectUp")) {
+		if (kb.matches(keyData, "tui.select.up")) {
 			this.scrollBy(-1);
 			return;
 		}
-		if (kb.matches(keyData, "selectDown")) {
+		if (kb.matches(keyData, "tui.select.down")) {
 			this.scrollBy(1);
 			return;
 		}
-		if (kb.matches(keyData, "selectPageUp")) {
+		if (kb.matches(keyData, "tui.select.pageUp") || matchesKey(keyData, Key.left)) {
 			this.scrollBy(-this.viewHeight || -1);
 			return;
 		}
-		if (kb.matches(keyData, "selectPageDown")) {
+		if (kb.matches(keyData, "tui.select.pageDown") || matchesKey(keyData, Key.right)) {
 			this.scrollBy(this.viewHeight || 1);
 			return;
 		}
@@ -685,7 +699,8 @@ class TodoDetailOverlayComponent {
 	private buildActionLine(width: number): string {
 		const work = this.theme.fg("accent", "enter") + this.theme.fg("muted", " work on todo");
 		const back = this.theme.fg("dim", "esc back");
-		const pieces = [work, back];
+		const nav = this.theme.fg("dim", "↑/↓: move. ←/→: page.");
+		const pieces = [work, back, nav];
 
 		let line = pieces.join(this.theme.fg("muted", " • "));
 		if (this.totalLines > this.viewHeight) {
@@ -1256,7 +1271,7 @@ function renderTodoDetail(theme: Theme, todo: TodoRecord, expanded: boolean): st
 }
 
 function appendExpandHint(theme: Theme, text: string): string {
-	return `${text}\n${theme.fg("dim", `(${keyHint("expandTools", "to expand")})`)}`;
+	return `${text}\n${theme.fg("dim", `(${keyHint("app.tools.expand", "to expand")})`)}`;
 }
 
 async function ensureTodoExists(filePath: string, id: string): Promise<TodoRecord | null> {
@@ -1784,21 +1799,6 @@ export default function todosExtension(pi: ExtensionAPI) {
 
 	pi.registerCommand("todos", {
 		description: "List todos from .pi/todos",
-		getArgumentCompletions: (argumentPrefix: string) => {
-			const todos = listTodosSync(getTodosDir(process.cwd()));
-			if (!todos.length) return null;
-			const matches = filterTodos(todos, argumentPrefix);
-			if (!matches.length) return null;
-			return matches.map((todo) => {
-				const title = todo.title || "(untitled)";
-				const tags = todo.tags.length ? ` • ${todo.tags.join(", ")}` : "";
-				return {
-					value: title,
-					label: `${formatTodoId(todo.id)} ${title}`,
-					description: `${todo.status || "open"}${tags}`,
-				};
-			});
-		},
 		handler: async (args, ctx) => {
 			const todosDir = getTodosDir(ctx.cwd);
 			const todos = await listTodos(todosDir);
@@ -1813,7 +1813,7 @@ export default function todosExtension(pi: ExtensionAPI) {
 
 			let nextPrompt: string | null = null;
 			let rootTui: TUI | null = null;
-			await ctx.ui.custom<void>((tui, theme, _kb, done) => {
+			await ctx.ui.custom<void>((tui, theme, keybindings, done) => {
 				rootTui = tui;
 				let selector: TodoSelectorComponent | null = null;
 				let actionMenu: TodoActionMenuComponent | null = null;
@@ -1885,8 +1885,14 @@ export default function todosExtension(pi: ExtensionAPI) {
 
 				const openTodoOverlay = async (record: TodoRecord): Promise<TodoOverlayAction> => {
 					const action = await ctx.ui.custom<TodoOverlayAction>(
-						(overlayTui, overlayTheme, _overlayKb, overlayDone) =>
-							new TodoDetailOverlayComponent(overlayTui, overlayTheme, record, overlayDone),
+						(overlayTui, overlayTheme, overlayKeybindings, overlayDone) =>
+							new TodoDetailOverlayComponent(
+								overlayTui,
+								overlayTheme,
+								overlayKeybindings,
+								record,
+								overlayDone,
+							),
 						{
 							overlay: true,
 							overlayOptions: { width: "80%", maxHeight: "80%", anchor: "center" },
@@ -2022,6 +2028,7 @@ export default function todosExtension(pi: ExtensionAPI) {
 				selector = new TodoSelectorComponent(
 					tui,
 					theme,
+					keybindings,
 					todos,
 					(todo) => {
 						void handleSelect(todo);

package/extensions/uv.ts

@@ -0,0 +1,123 @@
+/**
+ * UV Extension - Redirects Python tooling to uv equivalents
+ *
+ * This extension wraps the bash tool to prepend intercepted-commands to PATH,
+ * which contains shim scripts that intercept common Python tooling commands
+ * and redirect agents to use uv instead.
+ *
+ * Intercepted commands:
+ * - pip/pip3: Blocked with suggestions to use `uv add` or `uv run --with`
+ * - poetry: Blocked with uv equivalents (uv init, uv add, uv sync, uv run)
+ * - python/python3: Redirected through `uv run` to a real interpreter path,
+ *   with special handling to block `python -m pip`, `python -m venv`, and
+ *   `python -m py_compile`
+ *
+ * The shim scripts are located in the intercepted-commands directory and
+ * provide helpful error messages with the equivalent uv commands.
+ *
+ * Note: PATH shims are bypassable via explicit interpreter paths
+ * (for example `.venv/bin/python`). To close that gap, this extension also
+ * blocks disallowed invocations at bash spawn time.
+ */
+
+import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import { createBashTool } from "@mariozechner/pi-coding-agent";
+import { dirname, join } from "path";
+import { fileURLToPath } from "url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const interceptedCommandsPath = join(__dirname, "..", "intercepted-commands");
+
+function getBlockedCommandMessage(command: string): string | null {
+  // Match commands at the start of a shell segment (start/newline/; /&& /|| /|)
+  const pipCommandPattern = /(?:^|\n|[;|&]{1,2})\s*(?:\S+\/)?pip\s*(?:$|\s)/m;
+  const pip3CommandPattern = /(?:^|\n|[;|&]{1,2})\s*(?:\S+\/)?pip3\s*(?:$|\s)/m;
+  const poetryCommandPattern = /(?:^|\n|[;|&]{1,2})\s*(?:\S+\/)?poetry\s*(?:$|\s)/m;
+
+  // Match python invocations including explicit paths like .venv/bin/python
+  // and .venv/bin/python3.12.
+  const pythonPipPattern =
+    /(?:^|\n|[;|&]{1,2})\s*(?:\S+\/)?python(?:3(?:\.\d+)?)?\b[^\n;|&]*(?:\s-m\s*pip\b|\s-mpip\b)/m;
+  const pythonVenvPattern =
+    /(?:^|\n|[;|&]{1,2})\s*(?:\S+\/)?python(?:3(?:\.\d+)?)?\b[^\n;|&]*(?:\s-m\s*venv\b|\s-mvenv\b)/m;
+  const pythonPyCompilePattern =
+    /(?:^|\n|[;|&]{1,2})\s*(?:\S+\/)?python(?:3(?:\.\d+)?)?\b[^\n;|&]*(?:\s-m\s*py_compile\b|\s-mpy_compile\b)/m;
+
+  if (pipCommandPattern.test(command)) {
+    return [
+      "Error: pip is disabled. Use uv instead:",
+      "",
+      "  To install a package for a script: uv run --with PACKAGE python script.py",
+      "  To add a dependency to the project: uv add PACKAGE",
+      "",
+    ].join("\n");
+  }
+
+  if (pip3CommandPattern.test(command)) {
+    return [
+      "Error: pip3 is disabled. Use uv instead:",
+      "",
+      "  To install a package for a script: uv run --with PACKAGE python script.py",
+      "  To add a dependency to the project: uv add PACKAGE",
+      "",
+    ].join("\n");
+  }
+
+  if (poetryCommandPattern.test(command)) {
+    return [
+      "Error: poetry is disabled. Use uv instead:",
+      "",
+      "  To initialize a project: uv init",
+      "  To add a dependency: uv add PACKAGE",
+      "  To sync dependencies: uv sync",
+      "  To run commands: uv run COMMAND",
+      "",
+    ].join("\n");
+  }
+
+  if (pythonPipPattern.test(command)) {
+    return [
+      "Error: 'python -m pip' is disabled. Use uv instead:",
+      "",
+      "  To install a package for a script: uv run --with PACKAGE python script.py",
+      "  To add a dependency to the project: uv add PACKAGE",
+      "",
+    ].join("\n");
+  }
+
+  if (pythonVenvPattern.test(command)) {
+    return [
+      "Error: 'python -m venv' is disabled. Use uv instead:",
+      "",
+      "  To create a virtual environment: uv venv",
+      "",
+    ].join("\n");
+  }
+
+  if (pythonPyCompilePattern.test(command)) {
+    return [
+      "Error: 'python -m py_compile' is disabled because it writes .pyc files to __pycache__.",
+      "",
+      "  To verify syntax without bytecode output: uv run python -m ast path/to/file.py >/dev/null",
+      "",
+    ].join("\n");
+  }
+
+  return null;
+}
+
+export default function (pi: ExtensionAPI) {
+  const cwd = process.cwd();
+  const bashTool = createBashTool(cwd, {
+    commandPrefix: `export PATH="${interceptedCommandsPath}:$PATH"`,
+    spawnHook: (ctx) => {
+      const blockedMessage = getBlockedCommandMessage(ctx.command);
+      if (blockedMessage) {
+        throw new Error(blockedMessage);
+      }
+      return ctx;
+    },
+  });
+
+  pi.registerTool(bashTool);
+}

package/intercepted-commands/poetry

@@ -1,3 +1,10 @@
 #!/bin/bash
-echo "Error: Use uv instead of poetry (uv init, uv add, uv sync, uv run)" >&2
+
+echo "Error: poetry is disabled. Use uv instead:" >&2
+echo "" >&2
+echo "  To initialize a project: uv init" >&2
+echo "  To add a dependency: uv add PACKAGE" >&2
+echo "  To sync dependencies: uv sync" >&2
+echo "  To run commands: uv run COMMAND" >&2
+echo "" >&2
 exit 1

package/intercepted-commands/python

@@ -60,5 +60,45 @@ for arg in "$@"; do
     prev="$arg"
 done
 
-# Dispatch to uv run python
-exec uv run python "$@"
+# Resolve a Python interpreter for uv. Prefer uv-managed Python to match
+# `uv run python` defaults, while still avoiding shim recursion.
+resolve_uv_python() {
+    local shim_dir candidate candidate_dir
+    shim_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+    candidate="$(uv python find --managed-python 2>/dev/null || true)"
+    if [ -n "$candidate" ] && [ -x "$candidate" ]; then
+        candidate_dir="$(cd "$(dirname "$candidate")" && pwd)"
+        if [ "$candidate_dir" != "$shim_dir" ]; then
+            echo "$candidate"
+            return 0
+        fi
+    fi
+
+    while IFS= read -r candidate; do
+        [ -n "$candidate" ] || continue
+        candidate_dir="$(cd "$(dirname "$candidate")" && pwd)"
+        [ "$candidate_dir" = "$shim_dir" ] && continue
+        echo "$candidate"
+        return 0
+    done < <(type -aP python3 2>/dev/null)
+
+    while IFS= read -r candidate; do
+        [ -n "$candidate" ] || continue
+        candidate_dir="$(cd "$(dirname "$candidate")" && pwd)"
+        [ "$candidate_dir" = "$shim_dir" ] && continue
+        echo "$candidate"
+        return 0
+    done < <(type -aP python 2>/dev/null)
+
+    return 1
+}
+
+UV_PYTHON="$(resolve_uv_python)"
+if [ -z "$UV_PYTHON" ]; then
+    echo "Error: Unable to locate a Python interpreter outside intercepted-commands." >&2
+    exit 1
+fi
+
+# Dispatch through uv with an explicit interpreter path to avoid recursion.
+exec uv run --python "$UV_PYTHON" python "$@"

package/intercepted-commands/python3

@@ -60,5 +60,45 @@ for arg in "$@"; do
     prev="$arg"
 done
 
-# Dispatch to uv run python
-exec uv run python "$@"
+# Resolve a Python interpreter for uv. Prefer uv-managed Python to match
+# `uv run python` defaults, while still avoiding shim recursion.
+resolve_uv_python() {
+    local shim_dir candidate candidate_dir
+    shim_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+    candidate="$(uv python find --managed-python 2>/dev/null || true)"
+    if [ -n "$candidate" ] && [ -x "$candidate" ]; then
+        candidate_dir="$(cd "$(dirname "$candidate")" && pwd)"
+        if [ "$candidate_dir" != "$shim_dir" ]; then
+            echo "$candidate"
+            return 0
+        fi
+    fi
+
+    while IFS= read -r candidate; do
+        [ -n "$candidate" ] || continue
+        candidate_dir="$(cd "$(dirname "$candidate")" && pwd)"
+        [ "$candidate_dir" = "$shim_dir" ] && continue
+        echo "$candidate"
+        return 0
+    done < <(type -aP python3 2>/dev/null)
+
+    while IFS= read -r candidate; do
+        [ -n "$candidate" ] || continue
+        candidate_dir="$(cd "$(dirname "$candidate")" && pwd)"
+        [ "$candidate_dir" = "$shim_dir" ] && continue
+        echo "$candidate"
+        return 0
+    done < <(type -aP python 2>/dev/null)
+
+    return 1
+}
+
+UV_PYTHON="$(resolve_uv_python)"
+if [ -z "$UV_PYTHON" ]; then
+    echo "Error: Unable to locate a Python interpreter outside intercepted-commands." >&2
+    exit 1
+fi
+
+# Dispatch through uv with an explicit interpreter path to avoid recursion.
+exec uv run --python "$UV_PYTHON" python "$@"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mitsupi",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "Armin's pi coding agent commands, skills, extensions, and themes",
   "repository": {
     "type": "git",
@@ -16,18 +16,21 @@
   ],
   "pi": {
     "extensions": [
-      "./pi-extensions"
+      "./extensions"
     ],
     "skills": [
       "./skills"
     ],
     "themes": [
-      "./pi-themes"
+      "./themes"
     ],
     "prompts": [
       "./commands"
     ]
   },
+  "dependencies": {
+    "diff": "^8.0.2"
+  },
   "peerDependencies": {
     "@mariozechner/pi-coding-agent": "*",
     "@mariozechner/pi-ai": "*",