mitsupi 1.5.0 → 1.6.0

package/AGENTS.md

@@ -9,4 +9,4 @@
 
 ## Extensions
 
-Pi extensions live in `./pi-extensions`. When working in this repo, add or update extensions there. You can consult the `pi-mono` for reference, but do not modify code in `pi-mono`.
+Pi extensions live in `./extensions`. When working in this repo, add or update extensions there. You can consult the `pi-mono` for reference, but do not modify code in `pi-mono`.

package/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to agent-stuff are documented here.
 
 ## Unreleased
 
+## 1.6.0
+
+* Added a redesigned `btw` extension with side chat markdown rendering, tool visibility, deferred session creation, and main-context improvements.
+* Added a `/split-fork` Ghostty fork command for opening split sessions.
+* Added email-based multi-account authentication to the `google-workspace` skill.
+* Added left/right arrow key paging in the todo detail overlay. (#15)
+* Added a shared custom instructions toggle to review workflows.
+* Updated extensions for the new command and API-key APIs, including namespaced keybindings and `sourceInfo` support.
+* Improved the `multi-edit` extension with sequential same-file ordering, redundant-edit skipping, and clearer patch-mode diff output.
+* Fixed the `web-browser` skill and session-control refresh behavior after forks. (#16)
+* Fixed `intercepted-commands/python` and `intercepted-commands/python3` to avoid recursive `uv` spawn loops by resolving a uv-managed non-shim interpreter for `uv run --python`.
+
 ## 1.5.0
 
 * Added a `multi-edit` extension that replaces `edit` with support for batched `multi` edits and Codex-style `patch` payloads.

package/README.md

@@ -30,28 +30,37 @@ All skills live in the [`skills`](skills) folder:
 
 ## Pi Coding Agent Extensions
 
-Custom extensions for Pi Coding Agent are in [`pi-extensions`](pi-extensions):
-
-* [`answer.ts`](pi-extensions/answer.ts) - Interactive TUI for answering questions one by one.
-* [`context.ts`](pi-extensions/context.ts) - Context breakdown (extensions, skills, AGENTS.md/CLAUDE.md) + token usage, including loaded-skill highlighting.
-* [`control.ts`](pi-extensions/control.ts) - Session control helpers (list controllable sessions, etc.).
-* [`files.ts`](pi-extensions/files.ts) - Unified file browser with git status + session references and reveal/open/edit/diff actions.
-* [`go-to-bed.ts`](pi-extensions/go-to-bed.ts) - Late-night safety guard with explicit confirmation after midnight.
-* [`loop.ts`](pi-extensions/loop.ts) - Prompt loop for rapid iterative coding with optional auto-continue.
-* [`multi-edit.ts`](pi-extensions/multi-edit.ts) - Replaces the built-in `edit` tool with batch `multi` edits and Codex-style `patch` support, including preflight validation.
-* [`notify.ts`](pi-extensions/notify.ts) - Native desktop notifications when the agent finishes.
-* [`prompt-editor.ts`](pi-extensions/prompt-editor.ts) - In-editor prompt mode selector with persistence, history, config, and shortcuts.
-* [`review.ts`](pi-extensions/review.ts) - Code review command (working tree, PR-style diff, commits, custom instructions, optional fix loop).
-* [`session-breakdown.ts`](pi-extensions/session-breakdown.ts) - TUI for 7/30/90-day session and cost analysis with usage graph.
-* [`todos.ts`](pi-extensions/todos.ts) - Todo manager extension with file-backed storage and TUI.
-* [`uv.ts`](pi-extensions/uv.ts) - Helpers for uv-based Python workflows.
-* [`whimsical.ts`](pi-extensions/whimsical.ts) - Replaces the default thinking message with random whimsical phrases.
+Custom extensions for Pi Coding Agent are in [`extensions`](extensions):
+
+* [`answer.ts`](extensions/answer.ts) - Interactive TUI for answering questions one by one.
+* [`btw.ts`](extensions/btw.ts) - Simple `/btw` side-chat popover with optional summary injection back into the main chat on close.
+* [`context.ts`](extensions/context.ts) - Context breakdown (extensions, skills, AGENTS.md/CLAUDE.md) + token usage, including loaded-skill highlighting.
+* [`control.ts`](extensions/control.ts) - Session control helpers (list controllable sessions, etc.).
+* [`files.ts`](extensions/files.ts) - Unified file browser with git status + session references and reveal/open/edit/diff actions.
+* [`split-fork.ts`](extensions/split-fork.ts) - `/split-fork` command to branch the current session into a new pi process in a right-hand Ghostty split.
+* [`go-to-bed.ts`](extensions/go-to-bed.ts) - Late-night safety guard with explicit confirmation after midnight.
+* [`loop.ts`](extensions/loop.ts) - Prompt loop for rapid iterative coding with optional auto-continue.
+* [`multi-edit.ts`](extensions/multi-edit.ts) - Replaces the built-in `edit` tool with batch `multi` edits and Codex-style `patch` support, including preflight validation.
+* [`notify.ts`](extensions/notify.ts) - Native desktop notifications when the agent finishes.
+* [`prompt-editor.ts`](extensions/prompt-editor.ts) - In-editor prompt mode selector with persistence, history, config, and shortcuts.
+* [`review.ts`](extensions/review.ts) - Code review command (working tree, PR-style diff, commits, custom instructions, optional fix loop).
+* [`session-breakdown.ts`](extensions/session-breakdown.ts) - TUI for 7/30/90-day session and cost analysis with usage graph.
+* [`todos.ts`](extensions/todos.ts) - Todo manager extension with file-backed storage and TUI.
+* [`uv.ts`](extensions/uv.ts) - Helpers for uv-based Python workflows.
+* [`whimsical.ts`](extensions/whimsical.ts) - Replaces the default thinking message with random whimsical phrases.
 
 ## Pi Coding Agent Themes
 
-Custom themes are in [`pi-themes`](pi-themes):
+Custom themes are in [`themes`](themes):
 
-* [`nightowl.json`](pi-themes/nightowl.json) - Night Owl-inspired theme.
+* [`nightowl.json`](themes/nightowl.json) - Night Owl-inspired theme.
+
+## Distributions
+
+This repo also contains distribution packages in [`distributions`](distributions):
+
+* [`mitsupi-common`](distributions/mitsupi-common) - Minimal/default set (all resources except `anachb`, `apple-mail`, `oebb-scotty`, `openscad`, and `go-to-bed`).
+* [`mitsupi-loaded`](distributions/mitsupi-loaded) - Add-on package that provides `anachb`, `apple-mail`, `oebb-scotty`, `openscad`, and `go-to-bed`.
 
 ## Plumbing Commands
 

package/analyze-edits.py

@@ -0,0 +1,232 @@
+# /// script
+# requires-python = ">=3.12"
+# dependencies = []
+# ///
+"""Analyze edit tool invocations in pi session JSONL files.
+
+Usage: uv run analyze-edits.py <session.jsonl> [session2.jsonl ...]
+
+Reports how many times the Edit tool was invoked via each mode:
+  - single: classic path/oldText/newText
+  - multi(N): multi array with N edits
+  - single+multi(N): top-level edit + multi array (N total)
+  - patch: Codex-style patch
+
+Also breaks down by file extension.
+"""
+
+import json
+import os
+import sys
+from collections import Counter
+from dataclasses import dataclass
+from pathlib import Path
+
+
+def base_mode(mode: str) -> str:
+    if mode.startswith("multi(") or mode.startswith("single+multi("):
+        return "multi"
+    return mode
+
+
+def classify_edit(args: dict) -> tuple[str, list[str]]:
+    """Returns (mode_label, list_of_file_extensions)."""
+    has_patch = "patch" in args
+    has_multi = "multi" in args
+    has_single = "path" in args and "oldText" in args
+
+    paths: list[str] = []
+
+    if has_patch:
+        # Parse paths from patch text
+        patch_text = args["patch"]
+        for line in patch_text.split("\n"):
+            line = line.strip()
+            for prefix in ("*** Add File: ", "*** Delete File: ", "*** Update File: "):
+                if line.startswith(prefix):
+                    paths.append(line[len(prefix):])
+        return "patch", paths
+
+    multi_items = args.get("multi", [])
+
+    if has_single and has_multi:
+        paths.append(args["path"])
+        paths.extend(item.get("path", "") for item in multi_items)
+        return f"single+multi({1 + len(multi_items)})", paths
+
+    if has_multi:
+        paths.extend(item.get("path", "") for item in multi_items)
+        return f"multi({len(multi_items)})", paths
+
+    if has_single:
+        paths.append(args["path"])
+        return "single", paths
+
+    return "unknown", paths
+
+
+def get_ext(path: str) -> str:
+    ext = Path(path).suffix
+    return ext if ext else "(no ext)"
+
+
+@dataclass
+class EditCall:
+    mode: str
+    extensions: list[str]
+    failed: bool
+
+
+def analyze_session(filepath: str) -> list[EditCall]:
+    """Returns list of EditCall for each edit tool invocation."""
+    # First pass: collect edit tool calls and their IDs
+    calls: list[tuple[str, str, list[str]]] = []  # (toolCallId, mode, exts)
+    tool_call_ids: dict[str, int] = {}  # toolCallId -> index in calls
+
+    # Also collect tool results to check for errors
+    tool_results: dict[str, bool] = {}  # toolCallId -> isError
+
+    entries = []
+    with open(filepath) as f:
+        for line in f:
+            entries.append(json.loads(line))
+
+    for d in entries:
+        if d.get("type") != "message":
+            continue
+        msg = d.get("message", {})
+        role = msg.get("role")
+        if role == "assistant":
+            for c in msg.get("content", []):
+                if c.get("type") == "toolCall" and c.get("name") in ("edit", "Edit"):
+                    mode, paths = classify_edit(c.get("arguments", {}))
+                    exts = [get_ext(p) for p in paths]
+                    tc_id = c.get("id", "")
+                    idx = len(calls)
+                    calls.append((tc_id, mode, exts))
+                    tool_call_ids[tc_id] = idx
+        elif role == "toolResult":
+            tc_id = msg.get("toolCallId", "")
+            is_error = msg.get("isError", False)
+            tool_results[tc_id] = is_error
+
+    results = []
+    for tc_id, mode, exts in calls:
+        failed = tool_results.get(tc_id, False)
+        results.append(EditCall(mode=mode, extensions=exts, failed=failed))
+    return results
+
+
+def main():
+    if len(sys.argv) < 2:
+        print(__doc__.strip())
+        sys.exit(1)
+
+    all_results: list[EditCall] = []
+    session_files = []
+
+    for arg in sys.argv[1:]:
+        p = Path(arg)
+        if p.is_dir():
+            session_files.extend(sorted(p.glob("**/*.jsonl")))
+        else:
+            session_files.append(p)
+
+    for sf in session_files:
+        all_results.extend(analyze_session(str(sf)))
+
+    if not all_results:
+        print("No edit tool calls found.")
+        return
+
+    total = len(all_results)
+    total_failed = sum(1 for r in all_results if r.failed)
+
+    # Count tool calls (not individual edits) by base mode
+    mode_calls: Counter[str] = Counter()
+    mode_fails: Counter[str] = Counter()
+    # Count tool calls by (base_mode, primary_ext)
+    # For a tool call, we pick the dominant extension
+    mode_ext_calls: Counter[tuple[str, str]] = Counter()
+    mode_ext_fails: Counter[tuple[str, str]] = Counter()
+    ext_calls: Counter[str] = Counter()
+    ext_fails: Counter[str] = Counter()
+
+    for r in all_results:
+        bm = base_mode(r.mode)
+        mode_calls[bm] += 1
+        if r.failed:
+            mode_fails[bm] += 1
+
+        # For extension: count one call per unique extension touched
+        exts = set(r.extensions) if r.extensions else {"(no ext)"}
+        for ext in exts:
+            mode_ext_calls[(bm, ext)] += 1
+            ext_calls[ext] += 1
+            if r.failed:
+                mode_ext_fails[(bm, ext)] += 1
+                ext_fails[ext] += 1
+
+    print(f"{'='*60}")
+    print(f"Edit Tool Analysis ({len(session_files)} session(s))")
+    print(f"{'='*60}")
+    print(f"\nTotal edit tool calls: {total}")
+    print(f"Total failures: {total_failed} ({total_failed/total*100:.1f}%)")
+
+    print(f"\n--- By Mode (tool calls) ---")
+    for mode, count in sorted(mode_calls.items(), key=lambda x: -x[1]):
+        pct = count / total * 100
+        fails = mode_fails[mode]
+        fail_pct = fails / count * 100 if count else 0
+        print(f"  {mode:<12s} {count:>4d}  ({pct:5.1f}%)   fail: {fails:>3d} ({fail_pct:5.1f}%)")
+
+    print(f"\n--- By Extension (tool calls) ---")
+    for ext, count in sorted(ext_calls.items(), key=lambda x: -x[1]):
+        fails = ext_fails[ext]
+        fail_pct = fails / count * 100 if count else 0
+        print(f"  {ext:<12s} {count:>4d}   fail: {fails:>3d} ({fail_pct:5.1f}%)")
+
+    # Pivot table
+    all_modes = sorted(mode_calls.keys(), key=lambda m: -mode_calls[m])
+    all_exts = sorted(ext_calls.keys(), key=lambda e: -ext_calls[e])
+
+    col_w = 12
+    ext_w = max(12, *(len(e) for e in all_exts))
+
+    print(f"\n--- Extension × Mode (tool calls / failures) ---")
+    header = f"  {'extension':<{ext_w}s}" + "".join(f" {m:>{col_w}s}" for m in all_modes) + f" {'total':>{col_w}s}"
+    print(header)
+    print(f"  {'-'*(len(header)-2)}")
+    for ext in all_exts:
+        row = f"  {ext:<{ext_w}s}"
+        row_total = 0
+        row_total_f = 0
+        for m in all_modes:
+            v = mode_ext_calls.get((m, ext), 0)
+            vf = mode_ext_fails.get((m, ext), 0)
+            row_total += v
+            row_total_f += vf
+            cell = f"{v}" if vf == 0 else f"{v} ({vf}✗)"
+            row += f" {cell:>{col_w}s}"
+        cell = f"{row_total}" if row_total_f == 0 else f"{row_total} ({row_total_f}✗)"
+        row += f" {cell:>{col_w}s}"
+        print(row)
+    # totals row
+    print(f"  {'-'*(len(header)-2)}")
+    row = f"  {'TOTAL':<{ext_w}s}"
+    grand = 0
+    grand_f = 0
+    for m in all_modes:
+        v = sum(mode_ext_calls.get((m, ext), 0) for ext in all_exts)
+        vf = sum(mode_ext_fails.get((m, ext), 0) for ext in all_exts)
+        grand += v
+        grand_f += vf
+        cell = f"{v}" if vf == 0 else f"{v} ({vf}✗)"
+        row += f" {cell:>{col_w}s}"
+    cell = f"{grand}" if grand_f == 0 else f"{grand} ({grand_f}✗)"
+    row += f" {cell:>{col_w}s}"
+    print(row)
+
+
+if __name__ == "__main__":
+    main()

package/distributions/README.md

@@ -0,0 +1,8 @@
+# Distributions
+
+This folder contains publishable Pi package variants based on `mitsupi`:
+
+- `mitsupi-common`: default/minimal profile
+- `mitsupi-loaded`: add-on profile with travel/CAD extras
+
+`mitsupi-loaded` is intended to be installed together with `mitsupi-common`.

package/distributions/mitsupi-common/README.md

@@ -0,0 +1,11 @@
+# mitsupi-common
+
+Default Mitsupi distribution.
+
+Includes everything from `mitsupi` except:
+
+- `extensions/go-to-bed.ts`
+- `skills/anachb`
+- `skills/apple-mail`
+- `skills/oebb-scotty`
+- `skills/openscad`

package/distributions/mitsupi-common/package.json

@@ -0,0 +1,95 @@
+{
+  "name": "mitsupi-common",
+  "version": "1.5.0",
+  "description": "Common/default Mitsupi package without heavy travel and CAD extras",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mitsuhiko/agent-stuff.git",
+    "directory": "distributions/mitsupi-common"
+  },
+  "readme": "README.md",
+  "keywords": [
+    "pi-package",
+    "pi-extension",
+    "pi-skill",
+    "pi-theme"
+  ],
+  "pi": {
+    "extensions": [
+      "../../extensions/answer.ts",
+      "../../extensions/btw.ts",
+      "../../extensions/context.ts",
+      "../../extensions/control.ts",
+      "../../extensions/files.ts",
+      "../../extensions/loop.ts",
+      "../../extensions/multi-edit.ts",
+      "../../extensions/notify.ts",
+      "../../extensions/prompt-editor.ts",
+      "../../extensions/session-breakdown.ts",
+      "../../extensions/split-fork.ts",
+      "../../extensions/todos.ts",
+      "../../extensions/uv.ts",
+      "../../extensions/whimsical.ts",
+      "node_modules/mitsupi/extensions/answer.ts",
+      "node_modules/mitsupi/extensions/btw.ts",
+      "node_modules/mitsupi/extensions/context.ts",
+      "node_modules/mitsupi/extensions/control.ts",
+      "node_modules/mitsupi/extensions/files.ts",
+      "node_modules/mitsupi/extensions/loop.ts",
+      "node_modules/mitsupi/extensions/multi-edit.ts",
+      "node_modules/mitsupi/extensions/notify.ts",
+      "node_modules/mitsupi/extensions/prompt-editor.ts",
+      "node_modules/mitsupi/extensions/session-breakdown.ts",
+      "node_modules/mitsupi/extensions/split-fork.ts",
+      "node_modules/mitsupi/extensions/todos.ts",
+      "node_modules/mitsupi/extensions/uv.ts",
+      "node_modules/mitsupi/extensions/whimsical.ts"
+    ],
+    "skills": [
+      "../../skills/commit",
+      "../../skills/frontend-design",
+      "../../skills/ghidra",
+      "../../skills/github",
+      "../../skills/google-workspace",
+      "../../skills/librarian",
+      "../../skills/mermaid",
+      "../../skills/native-web-search",
+      "../../skills/pi-share",
+      "../../skills/sentry",
+      "../../skills/summarize",
+      "../../skills/tmux",
+      "../../skills/update-changelog",
+      "../../skills/uv",
+      "../../skills/web-browser",
+      "node_modules/mitsupi/skills/commit",
+      "node_modules/mitsupi/skills/frontend-design",
+      "node_modules/mitsupi/skills/ghidra",
+      "node_modules/mitsupi/skills/github",
+      "node_modules/mitsupi/skills/google-workspace",
+      "node_modules/mitsupi/skills/librarian",
+      "node_modules/mitsupi/skills/mermaid",
+      "node_modules/mitsupi/skills/native-web-search",
+      "node_modules/mitsupi/skills/pi-share",
+      "node_modules/mitsupi/skills/sentry",
+      "node_modules/mitsupi/skills/summarize",
+      "node_modules/mitsupi/skills/tmux",
+      "node_modules/mitsupi/skills/update-changelog",
+      "node_modules/mitsupi/skills/uv",
+      "node_modules/mitsupi/skills/web-browser"
+    ],
+    "themes": [
+      "../../themes",
+      "node_modules/mitsupi/themes"
+    ],
+    "prompts": [
+      "../../commands",
+      "node_modules/mitsupi/commands"
+    ]
+  },
+  "dependencies": {
+    "mitsupi": "^1.5.0"
+  },
+  "bundledDependencies": [
+    "mitsupi"
+  ]
+}

package/distributions/mitsupi-loaded/README.md

@@ -0,0 +1,13 @@
+# mitsupi-loaded
+
+Add-on Mitsupi distribution.
+
+Includes only:
+
+- `extensions/go-to-bed.ts`
+- `skills/anachb`
+- `skills/apple-mail`
+- `skills/oebb-scotty`
+- `skills/openscad`
+
+Install together with `mitsupi-common` to get the full setup.

package/distributions/mitsupi-loaded/package.json

@@ -0,0 +1,38 @@
+{
+  "name": "mitsupi-loaded",
+  "version": "1.5.0",
+  "description": "Add-on Mitsupi package with travel and CAD extras",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mitsuhiko/agent-stuff.git",
+    "directory": "distributions/mitsupi-loaded"
+  },
+  "readme": "README.md",
+  "keywords": [
+    "pi-package",
+    "pi-extension",
+    "pi-skill"
+  ],
+  "pi": {
+    "extensions": [
+      "../../extensions/go-to-bed.ts",
+      "node_modules/mitsupi/extensions/go-to-bed.ts"
+    ],
+    "skills": [
+      "../../skills/anachb",
+      "../../skills/apple-mail",
+      "../../skills/oebb-scotty",
+      "../../skills/openscad",
+      "node_modules/mitsupi/skills/anachb",
+      "node_modules/mitsupi/skills/apple-mail",
+      "node_modules/mitsupi/skills/oebb-scotty",
+      "node_modules/mitsupi/skills/openscad"
+    ]
+  },
+  "dependencies": {
+    "mitsupi": "^1.5.0"
+  },
+  "bundledDependencies": [
+    "mitsupi"
+  ]
+}

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

@@ -11,7 +11,7 @@
  */
 
 import { complete, type Model, type Api, type UserMessage } from "@mariozechner/pi-ai";
-import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import type { ExtensionAPI, ExtensionContext, ModelRegistry } from "@mariozechner/pi-coding-agent";
 import { BorderedLoader } from "@mariozechner/pi-coding-agent";
 import {
 	type Component,
@@ -75,15 +75,12 @@ const HAIKU_MODEL_ID = "claude-haiku-4-5";
  */
 async function selectExtractionModel(
 	currentModel: Model<Api>,
-	modelRegistry: {
-		find: (provider: string, modelId: string) => Model<Api> | undefined;
-		getApiKey: (model: Model<Api>) => Promise<string | undefined>;
-	},
+	modelRegistry: ModelRegistry,
 ): Promise<Model<Api>> {
 	const codexModel = modelRegistry.find("openai-codex", CODEX_MODEL_ID);
 	if (codexModel) {
-		const apiKey = await modelRegistry.getApiKey(codexModel);
-		if (apiKey) {
+		const auth = await modelRegistry.getApiKeyAndHeaders(codexModel);
+		if (auth.ok) {
 			return codexModel;
 		}
 	}
@@ -93,8 +90,8 @@ async function selectExtractionModel(
 		return currentModel;
 	}
 
-	const apiKey = await modelRegistry.getApiKey(haikuModel);
-	if (!apiKey) {
+	const auth = await modelRegistry.getApiKeyAndHeaders(haikuModel);
+	if (!auth.ok) {
 		return currentModel;
 	}
 
@@ -457,7 +454,10 @@ export default function (pi: ExtensionAPI) {
 				loader.onAbort = () => done(null);
 
 				const doExtract = async () => {
-					const apiKey = await ctx.modelRegistry.getApiKey(extractionModel);
+					const auth = await ctx.modelRegistry.getApiKeyAndHeaders(extractionModel);
+					if (!auth.ok) {
+						throw new Error(auth.error);
+					}
 					const userMessage: UserMessage = {
 						role: "user",
 						content: [{ type: "text", text: lastAssistantText! }],
@@ -467,7 +467,7 @@ export default function (pi: ExtensionAPI) {
 					const response = await complete(
 						extractionModel,
 						{ systemPrompt: SYSTEM_PROMPT, messages: [userMessage] },
-						{ apiKey, signal: loader.signal },
+						{ apiKey: auth.apiKey, headers: auth.headers, signal: loader.signal },
 					);
 
 					if (response.stopReason === "aborted") {