santree 0.5.4 → 0.5.6

package/README.md

@@ -405,13 +405,30 @@ To preview the JSON without writing: `santree helpers session-signal install --d
 
 Verify with `santree doctor` — look for the "Session Signal Hooks" row under Claude Code.
 
+### English Tutor (Optional)
+
+When enabled, Claude Code spots grammar mistakes in your prompts and replies with a one-line correction (`original -> correction (reason)`) before doing the actual work. Mistake-free prompts are ignored. Useful if English isn't your first language and you'd like ambient feedback while you code.
+
+**Install:**
+
+```bash
+santree helpers english-tutor install
+```
+
+This adds two hooks (`UserPromptSubmit`, `SessionStart`) and a scoped `Edit` permission for the practice log to `~/.claude/settings.json`. Existing hooks and permissions are preserved.
+
+To preview the JSON without writing: `santree helpers english-tutor install --dry`
+
+Corrections are appended to `~/.config/santree/english-practice-log.md` (or `$XDG_CONFIG_HOME/santree/english-practice-log.md`). The `SessionStart` hook replays this log into context on new sessions so Claude can spot recurring patterns.
+
+Remove with `santree helpers english-tutor uninstall`.
+
 ### Environment Variables
 
 | Variable | Effect |
 |---|---|
 | `SANTREE_TRACKER` | Override the active issue tracker for a single invocation: `linear` or `github`. Takes precedence over the per-repo `_tracker.kind`. If unset, falls back to repo config → legacy `_linear.org` → auto-detect. |
 | `SANTREE_EDITOR` | Editor used by `e` (open in editor) actions in the dashboard. Defaults to `code`. Examples: `cursor`, `zed`, `code`, `nvim`. |
-| `SANTREE_MULTIPLEXER` | Terminal multiplexer used by the dashboard and `worktree create --window`. One of `tmux`, `cmux`, `none`. If unset, auto-detects from `$TMUX` / `$CMUX_SURFACE_ID`. cmux is macOS-only and limited by [manaflow-ai/cmux#1472](https://github.com/manaflow-ai/cmux/issues/1472). |
 | `SANTREE_DIFF_TOOL` | Pager used by `worktree diff` (CLI) and the dashboard diff overlay. Passed to git as `-c core.pager=<tool>` for the CLI, and used to pipe content for the overlay. Examples: `delta`, `diff-so-fancy`. Must accept a unified diff on stdin. Names are restricted to `[A-Za-z0-9_\-/.+]`. |
 | `SANTREE_THEME` | Dashboard color theme: `light`, `dark`, or `auto` (default). In `auto` mode, santree queries the terminal's background via OSC 11 and re-detects on each refresh cycle (≤30s) so theme switches propagate automatically. Set explicitly when your terminal doesn't respond to OSC 11. |
 
@@ -522,7 +539,7 @@ These are hardwired in `lib/github.ts` and `lib/ai.ts` respectively. Adding a se
 | --- | --- | --- |
 | **Issue tracker** | `santree issue switch <linear\|github>` (or `SANTREE_TRACKER` env var, or as a side effect of `santree linear auth` / `santree github auth`) | Linear (OAuth + GraphQL), GitHub Issues (via `gh` CLI). Adding a third tracker = one new directory under `lib/trackers/`. |
 | **Editor** | `SANTREE_EDITOR` env var (or `--editor` flag on `worktree open`) | `code`, `cursor`, `zed`, `nvim`, `subl`, `webstorm` — any executable that takes a path argument |
-| **Terminal multiplexer** | `SANTREE_MULTIPLEXER` env var | `tmux` (default, all platforms), `cmux` (macOS only — see [#1472](https://github.com/manaflow-ai/cmux/issues/1472)), `none`. Zellij is planned but not implemented. |
+| **Terminal multiplexer** | Auto-detected via `$TMUX` / `$CMUX_SURFACE_ID`. No config needed — each adapter's `isActive()` declares its own runtime check. | `tmux` (all platforms), `cmux` (macOS only — see [#1472](https://github.com/manaflow-ai/cmux/issues/1472)). Zellij is planned but not implemented. |
 | **Diff renderer** | `SANTREE_DIFF_TOOL` env var | `delta`, `diff-so-fancy`, or any pager that accepts a unified diff. Falls back to plain `git diff` colorization when unset. |
 | **Color theme** | `SANTREE_THEME` env var (`light`/`dark`/`auto`) | Auto-detects via OSC 11; manual override available. Re-detects every refresh so theme switches show up within 30s. |
 | **Shell integration** | `santree helpers shell-init` detects the shell | `zsh`, `bash` (templates in `shell/init.{zsh,bash}.njk`) |

package/dist/commands/dashboard.js

@@ -629,21 +629,21 @@ export default function Dashboard() {
         }
     }, [state.reviewSelectedIndex, state.flatReviews, contentHeight, state.reviewListScrollOffset]);
     // ── Mouse tracking pause ─────────────────────────────────────────
-    // The MultilineTextArea captures ESC for cancel. With SGR mouse tracking on,
-    // every click emits `\x1b[<btn;col;rowM` — Ink reads the leading ESC and fires
-    // key.escape, dismissing the overlay. Disable tracking while any overlay
-    // phase mounts a MultilineTextArea (context-input editing OR pr-create
-    // review); restore when that phase ends.
+    // With SGR mouse tracking on, every click emits `\x1b[<btn;col;rowM` —
+    // these escape sequences leak into text inputs as garbage characters
+    // (and into MultilineTextArea, the leading ESC fires key.escape).
+    // Disable tracking while any text-input overlay is mounted; restore on exit.
     useEffect(() => {
-        const needsMouseOff = (state.overlay === "context-input" && state.contextInputPhase === "editing") ||
-            (state.overlay === "pr-create" && state.prCreatePhase === "review");
+        const needsMouseOff = state.overlay === "context-input" ||
+            (state.overlay === "pr-create" && state.prCreatePhase === "review") ||
+            (state.overlay === "commit" && state.commitPhase === "awaiting-message");
         if (!needsMouseOff)
             return;
         process.stdout.write("\x1b[?1002l\x1b[?1006l");
         return () => {
             process.stdout.write("\x1b[?1002h\x1b[?1006h");
         };
-    }, [state.overlay, state.contextInputPhase, state.prCreatePhase]);
+    }, [state.overlay, state.prCreatePhase, state.commitPhase]);
     // ── Diff overlay: load file list when opened ──────────────────────
     // Resolves merge-base against the configured base branch so upstream-only
     // changes (commits on master we haven't pulled) are excluded — same semantics
@@ -1396,29 +1396,10 @@ export default function Dashboard() {
             }
             return;
         }
-        // Context-input overlay.
-        // Editing phase: MultilineTextArea owns useInput (outer is disabled
-        // via isActive below).
-        // Review phase: outer handles y/n/e/ESC.
+        // Context-input overlay: MultilineTextArea owns useInput (outer is
+        // disabled via isActive below). Submit launches directly; cancel
+        // closes the overlay.
         if (state.overlay === "context-input") {
-            if (state.contextInputPhase === "review") {
-                if (input === "y" || key.return) {
-                    const mode = state.contextInputMode;
-                    const ctx = state.contextInputValue;
-                    dispatch({ type: "CONTEXT_INPUT_DONE" });
-                    if (mode)
-                        doWork(mode, ctx);
-                    return;
-                }
-                if (input === "n" || input === "e") {
-                    dispatch({ type: "CONTEXT_INPUT_EDIT" });
-                    return;
-                }
-                if (key.escape) {
-                    dispatch({ type: "CONTEXT_INPUT_DONE" });
-                    return;
-                }
-            }
             return;
         }
         // Diff overlay
@@ -2107,7 +2088,7 @@ export default function Dashboard() {
             return;
         }
     }, {
-        isActive: (state.overlay !== "context-input" || state.contextInputPhase === "review") &&
+        isActive: state.overlay !== "context-input" &&
             (state.overlay !== "pr-create" || state.prCreatePhase !== "review") &&
             (state.overlay !== "commit" || state.commitPhase !== "awaiting-message"),
     });
@@ -2120,10 +2101,13 @@ export default function Dashboard() {
     }
     const selectedIssue = state.flatIssues[state.selectedIndex] ?? null;
     const selectedReview = state.flatReviews[state.reviewSelectedIndex] ?? null;
-    return (_jsxs(Box, { width: columns, height: rows, flexDirection: "column", children: [_jsxs(Box, { paddingX: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "santree" }), _jsxs(Text, { dimColor: true, children: ["  ", "v", version] }), updateAvailable && latestVersion ? (_jsxs(Text, { color: "yellow", children: ["  ⬆ v", latestVersion, " available — `santree update`"] })) : null, CLAUDE_VERSION ? (_jsxs(Text, { dimColor: true, children: ["  ·  claude ", CLAUDE_VERSION] })) : null, claudeUpdateAvailable && latestClaudeVersion ? (_jsxs(Text, { color: "yellow", children: ["  ⬆ ", latestClaudeVersion] })) : null, state.refreshing ? _jsx(Text, { dimColor: true, children: "  ·  refreshing…" }) : null, state.actionMessage ? (_jsxs(Text, { color: "yellow", children: ["  ·  ", state.actionMessage] })) : null] }), _jsxs(Box, { paddingX: 1, children: [_jsx(Tab, { active: state.activeTab === "issues", label: `1 Issues (${state.flatIssues.length})`, mode: theme.mode }), _jsx(Text, { children: " " }), _jsx(Tab, { active: state.activeTab === "reviews", label: `2 Reviews (${state.flatReviews.length})`, mode: theme.mode })] }), _jsxs(Box, { flexGrow: 1, borderStyle: "round", borderColor: "cyan", flexDirection: "column", children: [state.overlay === "mode-select" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 3, paddingY: 1, children: [_jsx(Text, { bold: true, children: "Select mode:" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", bold: true, children: "p" }), "  Plan"] }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", bold: true, children: "i" }), "  Implement"] }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "ESC to cancel" })] }) })) : state.overlay === "context-input" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", paddingX: 2, width: Math.min(columns - 8, 100), children: [_jsxs(Text, { bold: true, color: "cyan", children: ["Extra context for ", state.contextInputMode] }), _jsx(Text, { dimColor: true, children: "Optional \u2014 appended to the prompt before launching Claude" }), _jsx(Text, { children: " " }), state.contextInputPhase === "editing" ? (_jsxs(_Fragment, { children: [_jsx(MultilineTextArea, { value: state.contextInputValue, onChange: (v) => dispatch({ type: "CONTEXT_INPUT_CHANGE", value: v }), onSubmit: () => dispatch({ type: "CONTEXT_INPUT_REVIEW" }), onCancel: () => dispatch({ type: "CONTEXT_INPUT_DONE" }), width: Math.min(columns - 8, 100), height: 10, placeholder: "Type or paste extra context\u2026" }), _jsx(Text, { children: " " }), _jsxs(Text, { dimColor: true, children: [_jsx(Text, { color: "cyan", bold: true, children: "Ctrl+D" }), " send  ·  ", _jsx(Text, { color: "cyan", bold: true, children: "Ctrl+O" }), " editor  ·  ", _jsx(Text, { color: "cyan", bold: true, children: "Ctrl+C" }), " cancel"] })] })) : (_jsxs(_Fragment, { children: [_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "green", paddingX: 1, minHeight: 6, children: [(state.contextInputValue || "(no extra context)")
-                                                    .split("\n")
-                                                    .slice(0, 12)
-                                                    .map((line, i) => (_jsx(Text, { children: line || " " }, i))), state.contextInputValue.split("\n").length > 12 && (_jsxs(Text, { dimColor: true, children: ["\u2026+", state.contextInputValue.split("\n").length - 12, " more lines"] }))] }), _jsx(Text, { children: " " }), _jsx(Text, { bold: true, children: "Anything else to add?" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "green", bold: true, children: "y" }), " / ", _jsx(Text, { color: "green", bold: true, children: "Enter" }), "  launch   ", _jsx(Text, { color: "yellow", bold: true, children: "n" }), " / ", _jsx(Text, { color: "yellow", bold: true, children: "e" }), "  keep editing   ", _jsx(Text, { color: "red", bold: true, children: "ESC" }), "  cancel"] })] }))] }) })) : state.overlay === "base-select" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 3, paddingY: 1, children: [_jsx(Text, { bold: true, children: "Select base branch:" }), _jsx(Text, { children: " " }), state.baseSelectOptions.map((branch, idx) => {
+    return (_jsxs(Box, { width: columns, height: rows, flexDirection: "column", children: [_jsxs(Box, { paddingX: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "santree" }), _jsxs(Text, { dimColor: true, children: ["  ", "v", version] }), updateAvailable && latestVersion ? (_jsxs(Text, { color: "yellow", children: ["  ⬆ v", latestVersion, " available — `santree update`"] })) : null, CLAUDE_VERSION ? (_jsxs(Text, { dimColor: true, children: ["  ·  claude ", CLAUDE_VERSION] })) : null, claudeUpdateAvailable && latestClaudeVersion ? (_jsxs(Text, { color: "yellow", children: ["  ⬆ ", latestClaudeVersion] })) : null, state.refreshing ? _jsx(Text, { dimColor: true, children: "  ·  refreshing…" }) : null, state.actionMessage ? (_jsxs(Text, { color: "yellow", children: ["  ·  ", state.actionMessage] })) : null] }), _jsxs(Box, { paddingX: 1, children: [_jsx(Tab, { active: state.activeTab === "issues", label: `1 Issues (${state.flatIssues.length})`, mode: theme.mode }), _jsx(Text, { children: " " }), _jsx(Tab, { active: state.activeTab === "reviews", label: `2 Reviews (${state.flatReviews.length})`, mode: theme.mode })] }), _jsxs(Box, { flexGrow: 1, borderStyle: "round", borderColor: "cyan", flexDirection: "column", children: [state.overlay === "mode-select" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 3, paddingY: 1, children: [_jsx(Text, { bold: true, children: "Select mode:" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", bold: true, children: "p" }), "  Plan"] }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", bold: true, children: "i" }), "  Implement"] }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "ESC to cancel" })] }) })) : state.overlay === "context-input" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", paddingX: 2, width: Math.min(columns - 8, 100), children: [_jsxs(Text, { bold: true, color: "cyan", children: ["Extra context for ", state.contextInputMode] }), _jsx(Text, { dimColor: true, children: "Optional \u2014 appended to the prompt before launching Claude" }), _jsx(Text, { children: " " }), _jsx(MultilineTextArea, { value: state.contextInputValue, onChange: (v) => dispatch({ type: "CONTEXT_INPUT_CHANGE", value: v }), onSubmit: () => {
+                                        const mode = state.contextInputMode;
+                                        const ctx = state.contextInputValue;
+                                        dispatch({ type: "CONTEXT_INPUT_DONE" });
+                                        if (mode)
+                                            doWork(mode, ctx);
+                                    }, onCancel: () => dispatch({ type: "CONTEXT_INPUT_DONE" }), width: Math.min(columns - 8, 100), height: 10, placeholder: "Type or paste extra context\u2026" }), _jsx(Text, { children: " " }), _jsxs(Text, { dimColor: true, children: [_jsx(Text, { color: "cyan", bold: true, children: "Ctrl+D" }), " launch  ·  ", _jsx(Text, { color: "cyan", bold: true, children: "Ctrl+O" }), " editor  ·  ", _jsx(Text, { color: "cyan", bold: true, children: "Ctrl+G" }), " cancel"] })] }) })) : state.overlay === "base-select" ? (_jsx(Box, { flexGrow: 1, justifyContent: "center", alignItems: "center", children: _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 3, paddingY: 1, children: [_jsx(Text, { bold: true, children: "Select base branch:" }), _jsx(Text, { children: " " }), state.baseSelectOptions.map((branch, idx) => {
                                     const selected = idx === state.baseSelectIndex;
                                     const defaultBranch = getDefaultBranch();
                                     const label = branch === defaultBranch ? `${branch} (default)` : branch;

package/dist/commands/doctor.js

@@ -60,19 +60,19 @@ async function checkTool(name, description, required, versionCommand, hint) {
 }
 /**
  * Reports the active multiplexer (tmux/cmux/none) and verifies the underlying
- * binary is reachable. Surfaces a hint when the configured multiplexer can't run.
+ * binary is reachable. Detection is auto — each adapter's `isActive()` checks
+ * its own runtime env (`$TMUX`, `$CMUX_SURFACE_ID`).
  */
 async function checkMultiplexer() {
     const mux = getMultiplexer();
-    const explicit = process.env["SANTREE_MULTIPLEXER"]?.toLowerCase();
-    const description = `Multiplexer (active: ${mux.kind}${explicit ? `, SANTREE_MULTIPLEXER=${explicit}` : ""})`;
+    const description = `Multiplexer (active: ${mux.kind})`;
     if (mux.kind === "none") {
         return {
             name: "multiplexer",
             description,
             required: false,
             installed: false,
-            hint: "No multiplexer active. Set SANTREE_MULTIPLEXER=tmux (or cmux) and run inside one. Install: brew install tmux",
+            hint: "Run inside tmux or cmux to enable session window renaming. Install tmux: brew install tmux",
         };
     }
     if (mux.kind === "tmux") {
@@ -104,7 +104,7 @@ async function checkMultiplexer() {
             description,
             required: false,
             installed: false,
-            hint: "Install cmux.app from https://cmux.com or set SANTREE_MULTIPLEXER=tmux. cmux is macOS-only.",
+            hint: "Install cmux.app from https://cmux.com (cmux is macOS-only).",
         };
     }
     const version = await tryExec("cmux --version 2>/dev/null");
@@ -122,9 +122,7 @@ async function checkMultiplexer() {
         installed: !!ping,
         version: version || "unknown",
         path,
-        hint: !ping
-            ? "cmux app not reachable — open cmux.app or set SANTREE_MULTIPLEXER=tmux."
-            : undefined,
+        hint: !ping ? "cmux app not reachable — open cmux.app." : undefined,
     };
 }
 /**
@@ -336,6 +334,57 @@ function checkSessionSignalHooks() {
         hint: `Missing: ${missingHooks.join(", ")}. Run: santree helpers session-signal install`,
     };
 }
+/**
+ * Checks if english-tutor hooks are configured. Verifies the UserPromptSubmit
+ * and SessionStart hooks plus the scoped Edit permission for the practice log.
+ */
+function checkEnglishTutorHooks() {
+    const home = process.env.HOME || "";
+    const claudeSettingsPath = path.join(home, ".claude", "settings.json");
+    const requiredEvents = ["UserPromptSubmit", "SessionStart"];
+    const missingHooks = [];
+    let missingPermission = true;
+    const configDir = process.env.XDG_CONFIG_HOME || path.join(home, ".config");
+    const expectedPermission = `Edit(${path.join(configDir, "santree", "english-practice-log.md")})`;
+    try {
+        if (fs.existsSync(claudeSettingsPath)) {
+            const settings = JSON.parse(fs.readFileSync(claudeSettingsPath, "utf-8"));
+            const hooks = settings.hooks || {};
+            for (const event of requiredEvents) {
+                const eventHooks = hooks[event];
+                if (!Array.isArray(eventHooks)) {
+                    missingHooks.push(event);
+                    continue;
+                }
+                const found = eventHooks.some((entry) => {
+                    const innerHooks = entry.hooks || [];
+                    return innerHooks.some((h) => typeof h.command === "string" && h.command.includes("english-tutor"));
+                });
+                if (!found)
+                    missingHooks.push(event);
+            }
+            const allow = settings.permissions?.allow;
+            if (Array.isArray(allow) && allow.includes(expectedPermission)) {
+                missingPermission = false;
+            }
+        }
+        else {
+            missingHooks.push(...requiredEvents);
+        }
+    }
+    catch {
+        missingHooks.push(...requiredEvents);
+    }
+    if (missingHooks.length === 0 && !missingPermission) {
+        return { configured: true, missingHooks: [], missingPermission: false };
+    }
+    return {
+        configured: false,
+        missingHooks,
+        missingPermission,
+        hint: "Run: santree helpers english-tutor install",
+    };
+}
 /**
  * Checks if a path is gitignored (via .gitignore or .git/info/exclude).
  */
@@ -433,6 +482,14 @@ function RemoteControlRow({ status }) {
 function SessionSignalRow({ status }) {
     return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [_jsx(StatusIcon, { ok: status.configured, required: false }), _jsx(Text, { children: " " }), _jsx(Text, { bold: true, children: "Session Signal Hooks" }), _jsx(Text, { dimColor: true, children: " - Surface session state in dashboard/tmux" }), _jsx(Text, { dimColor: true, children: " (optional)" })] }), _jsx(Box, { marginLeft: 2, flexDirection: "column", children: status.configured ? (_jsx(Text, { dimColor: true, children: "All hooks configured" })) : (_jsxs(_Fragment, { children: [_jsxs(Text, { dimColor: true, children: ["Missing: ", status.missingHooks.join(", ")] }), status.hint && _jsxs(Text, { color: "yellow", children: ["\u21B3 ", status.hint] })] })) })] }));
 }
+function EnglishTutorRow({ status }) {
+    const missingParts = [];
+    if (status.missingHooks.length > 0)
+        missingParts.push(`hooks: ${status.missingHooks.join(", ")}`);
+    if (status.missingPermission)
+        missingParts.push("log Edit permission");
+    return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [_jsx(StatusIcon, { ok: status.configured, required: false }), _jsx(Text, { children: " " }), _jsx(Text, { bold: true, children: "English Tutor Hooks" }), _jsx(Text, { dimColor: true, children: " - Inline grammar corrections" }), _jsx(Text, { dimColor: true, children: " (optional)" })] }), _jsx(Box, { marginLeft: 2, flexDirection: "column", children: status.configured ? (_jsx(Text, { dimColor: true, children: "Hooks and log permission configured" })) : (_jsxs(_Fragment, { children: [_jsxs(Text, { dimColor: true, children: ["Missing: ", missingParts.join("; ") || "—"] }), status.hint && _jsxs(Text, { color: "yellow", children: ["\u21B3 ", status.hint] })] })) })] }));
+}
 function SantreeSetupRow({ status }) {
     const isOk = status.santreeFolderExists &&
         status.initShExists &&
@@ -455,6 +512,7 @@ export default function Doctor() {
     const [remoteControl, setRemoteControl] = useState(null);
     const [statusline, setStatusline] = useState(null);
     const [sessionSignal, setSessionSignal] = useState(null);
+    const [englishTutor, setEnglishTutor] = useState(null);
     const [santreeSetup, setSantreeSetup] = useState(null);
     const [loading, setLoading] = useState(true);
     useEffect(() => {
@@ -543,6 +601,7 @@ export default function Doctor() {
             setRemoteControl(checkRemoteControl());
             setStatusline(statuslineResult);
             setSessionSignal(checkSessionSignalHooks());
+            setEnglishTutor(checkEnglishTutorHooks());
             setSantreeSetup(checkSantreeSetup());
             setLoading(false);
         }
@@ -555,5 +614,5 @@ export default function Doctor() {
     const optionalMissing = tools.filter((t) => !t.required && !t.installed);
     const trackerOk = tracker?.authenticated && !tracker?.hint;
     const allRequired = requiredMissing.length === 0 && trackerOk && shellStatus?.configured;
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "Santree Doctor" }), _jsxs(Text, { dimColor: true, children: [" v", version] })] }), _jsx(Box, { marginBottom: 1, flexDirection: "column", children: _jsx(Text, { bold: true, underline: true, children: "CLI Tools" }) }), tools.map((tool) => (_jsx(ToolRow, { tool: tool }, tool.name))), _jsx(Box, { marginBottom: 1, marginTop: 1, flexDirection: "column", children: _jsx(Text, { bold: true, underline: true, children: "Integrations" }) }), tracker && _jsx(TrackerRow, { tracker: tracker }), shellStatus && _jsx(ShellRow, { configured: shellStatus.configured, shell: shellStatus.shell }), santreeSetup && _jsx(SantreeSetupRow, { status: santreeSetup }), _jsx(Box, { marginBottom: 1, marginTop: 1, flexDirection: "column", children: _jsx(Text, { bold: true, underline: true, children: "Claude Code" }) }), remoteControl && _jsx(RemoteControlRow, { status: remoteControl }), statusline && _jsx(StatuslineRow, { status: statusline }), sessionSignal && _jsx(SessionSignalRow, { status: sessionSignal }), _jsx(Box, { marginTop: 1, borderStyle: "single", borderColor: allRequired ? "green" : "yellow", paddingX: 2, children: allRequired ? (_jsx(Text, { color: "green", children: "All requirements satisfied! Santree is ready to use." })) : (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "yellow", children: [requiredMissing.length + (trackerOk ? 0 : 1) + (shellStatus?.configured ? 0 : 1), " ", "required item(s) need attention"] }), optionalMissing.length > 0 && (_jsxs(Text, { dimColor: true, children: [optionalMissing.length, " optional item(s) not installed"] }))] })) })] }));
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "Santree Doctor" }), _jsxs(Text, { dimColor: true, children: [" v", version] })] }), _jsx(Box, { marginBottom: 1, flexDirection: "column", children: _jsx(Text, { bold: true, underline: true, children: "CLI Tools" }) }), tools.map((tool) => (_jsx(ToolRow, { tool: tool }, tool.name))), _jsx(Box, { marginBottom: 1, marginTop: 1, flexDirection: "column", children: _jsx(Text, { bold: true, underline: true, children: "Integrations" }) }), tracker && _jsx(TrackerRow, { tracker: tracker }), shellStatus && _jsx(ShellRow, { configured: shellStatus.configured, shell: shellStatus.shell }), santreeSetup && _jsx(SantreeSetupRow, { status: santreeSetup }), _jsx(Box, { marginBottom: 1, marginTop: 1, flexDirection: "column", children: _jsx(Text, { bold: true, underline: true, children: "Claude Code" }) }), remoteControl && _jsx(RemoteControlRow, { status: remoteControl }), statusline && _jsx(StatuslineRow, { status: statusline }), sessionSignal && _jsx(SessionSignalRow, { status: sessionSignal }), englishTutor && _jsx(EnglishTutorRow, { status: englishTutor }), _jsx(Box, { marginTop: 1, borderStyle: "single", borderColor: allRequired ? "green" : "yellow", paddingX: 2, children: allRequired ? (_jsx(Text, { color: "green", children: "All requirements satisfied! Santree is ready to use." })) : (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "yellow", children: [requiredMissing.length + (trackerOk ? 0 : 1) + (shellStatus?.configured ? 0 : 1), " ", "required item(s) need attention"] }), optionalMissing.length > 0 && (_jsxs(Text, { dimColor: true, children: [optionalMissing.length, " optional item(s) not installed"] }))] })) })] }));
 }

package/dist/commands/helpers/english-tutor/index.d.ts

@@ -0,0 +1 @@
+export declare const description = "Nudge Claude to correct your English (Claude Code hooks)";

package/dist/commands/helpers/english-tutor/index.js

@@ -0,0 +1 @@
+export const description = "Nudge Claude to correct your English (Claude Code hooks)";

package/dist/commands/helpers/english-tutor/install.d.ts

@@ -0,0 +1,8 @@
+import { z } from "zod";
+export declare const description = "Install English-tutor hooks into Claude Code settings";
+export declare const options: z.ZodObject<{
+    dry: z.ZodOptional<z.ZodBoolean>;
+}, z.core.$strip>;
+export default function Install({ options: opts }: {
+    options: z.infer<typeof options>;
+}): null;

package/dist/commands/helpers/english-tutor/install.js

@@ -0,0 +1,24 @@
+import { useEffect, useRef } from "react";
+import { z } from "zod";
+import { getInstallSnippet, installHooks } from "../../../lib/english-tutor.js";
+export const description = "Install English-tutor hooks into Claude Code settings";
+export const options = z.object({
+    dry: z.boolean().optional().describe("Print the hooks JSON without writing"),
+});
+export default function Install({ options: opts }) {
+    const hasRun = useRef(false);
+    useEffect(() => {
+        if (hasRun.current)
+            return;
+        hasRun.current = true;
+        if (opts?.dry) {
+            process.stdout.write(JSON.stringify(getInstallSnippet(), null, 2) + "\n");
+            process.exit(0);
+        }
+        const { settingsPath, logPath } = installHooks();
+        process.stdout.write(`English-tutor hooks installed in ${settingsPath}\n`);
+        process.stdout.write(`Practice log: ${logPath}\n`);
+        process.exit(0);
+    }, []);
+    return null;
+}

package/dist/commands/helpers/english-tutor/prompt.d.ts

@@ -0,0 +1,2 @@
+export declare const description = "English-tutor instruction (UserPromptSubmit hook)";
+export default function Prompt(): null;

package/dist/commands/helpers/english-tutor/prompt.js

@@ -0,0 +1,16 @@
+import { useEffect, useRef } from "react";
+import { renderPrompt } from "../../../lib/prompts.js";
+import { getLogPath } from "../../../lib/english-tutor.js";
+export const description = "English-tutor instruction (UserPromptSubmit hook)";
+export default function Prompt() {
+    const hasRun = useRef(false);
+    useEffect(() => {
+        if (hasRun.current)
+            return;
+        hasRun.current = true;
+        const text = renderPrompt("english-tutor-prompt", { logPath: getLogPath() });
+        process.stdout.write(text);
+        process.exit(0);
+    }, []);
+    return null;
+}

package/dist/commands/helpers/english-tutor/session-start.d.ts

@@ -0,0 +1,2 @@
+export declare const description = "Replay practice log (SessionStart hook)";
+export default function SessionStart(): null;

package/dist/commands/helpers/english-tutor/session-start.js

@@ -0,0 +1,34 @@
+import * as fs from "fs";
+import { useEffect, useRef } from "react";
+import { getLogPath } from "../../../lib/english-tutor.js";
+export const description = "Replay practice log (SessionStart hook)";
+export default function SessionStart() {
+    const hasRun = useRef(false);
+    useEffect(() => {
+        if (hasRun.current)
+            return;
+        hasRun.current = true;
+        try {
+            const logPath = getLogPath();
+            if (fs.existsSync(logPath)) {
+                const contents = fs.readFileSync(logPath, "utf-8").trim();
+                const entryCount = (contents.match(/^- /gm) || []).length;
+                if (contents.length > 0) {
+                    process.stdout.write(`[ENGLISH TUTOR — PRACTICE LOG REPLAY]\n\n${contents}\n\n--- LOG END ---\n`);
+                    // Only ask for a summary once there are enough entries to be useful.
+                    // Below that threshold the log is too sparse to surface real patterns,
+                    // and a forced summary would just noise up new sessions.
+                    if (entryCount >= 3) {
+                        process.stdout.write(`\n[ENGLISH TUTOR — SESSION-START INSTRUCTION]\n` +
+                            `At the very start of your first response in this session, briefly note any RECURRING patterns from the log above (1-3 short bullets, e.g. "you frequently drop articles", "watch for 'their' vs 'there'"). Skip this entirely if no clear patterns emerge or if the user's first message is purely a coding task. Do not list every entry — only patterns.\n`);
+                    }
+                }
+            }
+        }
+        catch {
+            // hook must never block the session — silently no-op on read error
+        }
+        process.exit(0);
+    }, []);
+    return null;
+}

package/dist/commands/helpers/english-tutor/uninstall.d.ts

@@ -0,0 +1,2 @@
+export declare const description = "Remove English-tutor hooks from Claude Code settings";
+export default function Uninstall(): null;

package/dist/commands/helpers/english-tutor/uninstall.js

@@ -0,0 +1,15 @@
+import { useEffect, useRef } from "react";
+import { uninstallHooks } from "../../../lib/english-tutor.js";
+export const description = "Remove English-tutor hooks from Claude Code settings";
+export default function Uninstall() {
+    const hasRun = useRef(false);
+    useEffect(() => {
+        if (hasRun.current)
+            return;
+        hasRun.current = true;
+        const settingsPath = uninstallHooks();
+        process.stdout.write(`English-tutor hooks removed from ${settingsPath}\n`);
+        process.exit(0);
+    }, []);
+    return null;
+}

package/dist/lib/ai.js

@@ -131,9 +131,9 @@ const CMUX_CLAUDE_PATH = "/Applications/cmux.app/Contents/Resources/bin/claude";
  */
 export function resolveClaudeBinary() {
     // Inside cmux, the bundled binary is the only one wired to the active
-    // workspace. Gate on `CMUX_SURFACE_ID` (actual cmux runtime), not
-    // `SANTREE_MULTIPLEXER=cmux` — outside a live workspace the bundled
-    // binary has no auth context and exits with "Invalid API key".
+    // workspace. Gate on `CMUX_SURFACE_ID` (real cmux runtime) — outside a live
+    // workspace the bundled binary has no auth context and exits with
+    // "Invalid API key".
     if (process.env["CMUX_SURFACE_ID"] && existsSync(CMUX_CLAUDE_PATH)) {
         return CMUX_CLAUDE_PATH;
     }

package/dist/lib/dashboard/MultilineTextArea.js

@@ -162,24 +162,17 @@ export function MultilineTextArea({ value, onChange, onSubmit, onCancel, placeho
             onSubmit();
             return;
         }
-        // Ctrl+C: cancel (preferred over Esc — vim users rely on Esc muscle memory)
-        if (key.ctrl && input === "c") {
-            onCancel();
-            return;
-        }
         // Ctrl+O: escalate to $SANTREE_EDITOR / $VISUAL / $EDITOR. On save+close
-        // the buffer is replaced and the form is auto-submitted (matches git commit).
+        // the buffer is replaced and control returns to the textbox so the
+        // user can keep editing or submit with Ctrl+D.
         if (key.ctrl && input === "o") {
             const result = editExternally(value, "md");
             if (!result.ok)
                 return;
-            if (result.cancelled) {
-                onCancel();
+            if (result.cancelled)
                 return;
-            }
             onChange(result.content);
             setCursor(result.content.length);
-            onSubmit();
             return;
         }
         // Ctrl+V: paste clipboard image as a temp file reference.
@@ -189,6 +182,13 @@ export function MultilineTextArea({ value, onChange, onSubmit, onCancel, placeho
                 insertAt(cursor, `![pasted image](${imagePath})`);
             return;
         }
+        // Ctrl+G: cancel (Emacs abort). Ctrl+C can't be used because Ink's
+        // exitOnCtrlC fires at the app level before useInput sees it, exiting
+        // the dashboard. Esc is reserved for vim muscle memory (swallowed).
+        if (key.ctrl && input === "g") {
+            onCancel();
+            return;
+        }
         // Esc: swallow without cancelling (vim users hit it constantly).
         if (key.escape)
             return;

package/dist/lib/dashboard/Overlays.js

@@ -22,7 +22,7 @@ export function CommitOverlay({ width, height, branch, ticketId, gitStatus, phas
                     }), gitStatus.split("\n").length > 8 && (_jsxs(Text, { dimColor: true, children: [" +", gitStatus.split("\n").length - 8, " more"] }))] })) : null, _jsx(Text, { children: " " }), phase === "confirm-stage" && (_jsxs(Text, { children: ["Stage all changes?", " ", _jsx(Text, { color: "cyan", bold: true, children: "y" }), "/", _jsx(Text, { color: "cyan", bold: true, children: "n" })] })), phase === "awaiting-message" && (_jsxs(Box, { children: [_jsx(Text, { children: "Message: " }), _jsx(TextInput, { value: message, onChange: (v) => dispatch({ type: "COMMIT_MESSAGE", message: v }), onSubmit: onSubmit })] })), phase === "committing" && (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), " ", "Committing..."] })), phase === "pushing" && (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), " ", "Pushing..."] })), phase === "done" && (_jsx(Text, { color: "green", bold: true, children: "Committed and pushed!" })), phase === "error" && _jsx(Text, { color: "red", children: error }), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "ESC to cancel" })] }));
 }
 export function PrCreateOverlay({ width, height, branch, ticketId, phase, error, url, body, title, dispatch, }) {
-    return (_jsxs(Box, { flexDirection: "column", width: width, height: height, children: [_jsx(Text, { bold: true, color: "cyan", children: "Create Pull Request" }), _jsx(Text, { dimColor: true, children: "─".repeat(Math.min(width, 50)) }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "branch: " }), _jsx(Text, { children: branch })] }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "ticket: " }), _jsx(Text, { children: ticketId })] }), _jsx(Text, { children: " " }), phase === "choose-mode" && (_jsxs(_Fragment, { children: [_jsx(Text, { bold: true, children: "How do you want to create this PR?" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [" ", _jsx(Text, { color: "cyan", bold: true, children: "f" }), " ", "Fill \u2014 use AI to fill the PR template"] }), _jsxs(Text, { children: [" ", _jsx(Text, { color: "cyan", bold: true, children: "w" }), " ", "Web \u2014 open in browser to edit manually"] })] })), phase === "pushing" && (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), " ", "Pushing branch..."] })), phase === "filling" && (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), " ", "Filling PR template with AI..."] })), phase === "review" && (_jsxs(_Fragment, { children: [_jsx(Text, { bold: true, children: "Edit PR description" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "title: " }), _jsx(Text, { children: title })] }), _jsx(Text, { children: " " }), _jsx(MultilineTextArea, { value: body ?? "", onChange: (v) => dispatch({ type: "PR_CREATE_BODY_CHANGE", body: v }), onSubmit: () => dispatch({ type: "PR_CREATE_CONFIRM" }), onCancel: () => dispatch({ type: "PR_CREATE_CANCEL" }), width: width, height: Math.max(6, height - 10), placeholder: "(empty PR body)" }), _jsx(Text, { children: " " }), _jsxs(Text, { dimColor: true, children: [_jsx(Text, { color: "cyan", bold: true, children: "Ctrl+D" }), " send  ·  ", _jsx(Text, { color: "cyan", bold: true, children: "Ctrl+O" }), " editor  ·  ", _jsx(Text, { color: "cyan", bold: true, children: "Ctrl+C" }), " cancel"] })] })), phase === "confirm" && (_jsxs(_Fragment, { children: [_jsx(Text, { bold: true, children: "Create this PR?" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "title: " }), _jsx(Text, { children: title })] }), _jsx(Text, { children: " " }), _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "green", paddingX: 1, children: [(body ?? "")
+    return (_jsxs(Box, { flexDirection: "column", width: width, height: height, children: [_jsx(Text, { bold: true, color: "cyan", children: "Create Pull Request" }), _jsx(Text, { dimColor: true, children: "─".repeat(Math.min(width, 50)) }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "branch: " }), _jsx(Text, { children: branch })] }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "ticket: " }), _jsx(Text, { children: ticketId })] }), _jsx(Text, { children: " " }), phase === "choose-mode" && (_jsxs(_Fragment, { children: [_jsx(Text, { bold: true, children: "How do you want to create this PR?" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [" ", _jsx(Text, { color: "cyan", bold: true, children: "f" }), " ", "Fill \u2014 use AI to fill the PR template"] }), _jsxs(Text, { children: [" ", _jsx(Text, { color: "cyan", bold: true, children: "w" }), " ", "Web \u2014 open in browser to edit manually"] })] })), phase === "pushing" && (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), " ", "Pushing branch..."] })), phase === "filling" && (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), " ", "Filling PR template with AI..."] })), phase === "review" && (_jsxs(_Fragment, { children: [_jsx(Text, { bold: true, children: "Edit PR description" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "title: " }), _jsx(Text, { children: title })] }), _jsx(Text, { children: " " }), _jsx(MultilineTextArea, { value: body ?? "", onChange: (v) => dispatch({ type: "PR_CREATE_BODY_CHANGE", body: v }), onSubmit: () => dispatch({ type: "PR_CREATE_CONFIRM" }), onCancel: () => dispatch({ type: "PR_CREATE_CANCEL" }), width: width, height: Math.max(6, height - 10), placeholder: "(empty PR body)" }), _jsx(Text, { children: " " }), _jsxs(Text, { dimColor: true, children: [_jsx(Text, { color: "cyan", bold: true, children: "Ctrl+D" }), " send  ·  ", _jsx(Text, { color: "cyan", bold: true, children: "Ctrl+O" }), " editor  ·  ", _jsx(Text, { color: "cyan", bold: true, children: "Ctrl+G" }), " cancel"] })] })), phase === "confirm" && (_jsxs(_Fragment, { children: [_jsx(Text, { bold: true, children: "Create this PR?" }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "title: " }), _jsx(Text, { children: title })] }), _jsx(Text, { children: " " }), _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "green", paddingX: 1, children: [(body ?? "")
                                 .split("\n")
                                 .slice(0, Math.max(4, height - 12))
                                 .map((line, i) => (_jsx(Text, { wrap: "truncate", children: line || " " }, i))), (body ?? "").split("\n").length > Math.max(4, height - 12) && (_jsxs(Text, { dimColor: true, children: ["\u2026+", (body ?? "").split("\n").length - Math.max(4, height - 12), " more lines"] }))] }), _jsx(Text, { children: " " }), _jsxs(Text, { children: [_jsx(Text, { color: "green", bold: true, children: "y" }), " / ", _jsx(Text, { color: "green", bold: true, children: "Enter" }), "  create   ", _jsx(Text, { color: "yellow", bold: true, children: "e" }), "  keep editing   ", _jsx(Text, { color: "cyan", bold: true, children: "w" }), "  open in browser   ", _jsx(Text, { color: "red", bold: true, children: "ESC" }), "  cancel"] })] })), phase === "creating" && (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), " ", "Creating PR..."] })), phase === "done" && (_jsxs(_Fragment, { children: [_jsx(Text, { color: "green", bold: true, children: "PR created!" }), url ? _jsx(Text, { dimColor: true, children: url }) : null] })), phase === "error" && (_jsxs(_Fragment, { children: [_jsx(Text, { color: "red", children: error }), _jsx(Text, { children: " " }), _jsxs(Text, { dimColor: true, children: [_jsx(Text, { color: "cyan", bold: true, children: "w" }), " ", "open in browser ESC cancel"] })] })), phase !== "review" && phase !== "confirm" && phase !== "error" && (_jsxs(_Fragment, { children: [_jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: "ESC to cancel" })] }))] }));

package/dist/lib/dashboard/types.d.ts

@@ -103,7 +103,6 @@ export interface DashboardState {
     baseSelectChosen: string | null;
     contextInputValue: string;
     contextInputMode: "plan" | "implement" | null;
-    contextInputPhase: "editing" | "review";
     diffTicketId: string | null;
     diffWorktreePath: string | null;
     diffBaseBranch: string | null;
@@ -249,10 +248,6 @@ export type DashboardAction = {
 } | {
     type: "CONTEXT_INPUT_CHANGE";
     value: string;
-} | {
-    type: "CONTEXT_INPUT_REVIEW";
-} | {
-    type: "CONTEXT_INPUT_EDIT";
 } | {
     type: "CONTEXT_INPUT_DONE";
 } | {

package/dist/lib/dashboard/types.js

@@ -40,7 +40,6 @@ export const initialState = {
     baseSelectChosen: null,
     contextInputValue: "",
     contextInputMode: null,
-    contextInputPhase: "editing",
     diffTicketId: null,
     diffWorktreePath: null,
     diffBaseBranch: null,
@@ -271,21 +270,15 @@ export function reducer(state, action) {
                 overlay: "context-input",
                 contextInputMode: action.mode,
                 contextInputValue: "",
-                contextInputPhase: "editing",
             };
         case "CONTEXT_INPUT_CHANGE":
             return { ...state, contextInputValue: action.value };
-        case "CONTEXT_INPUT_REVIEW":
-            return { ...state, contextInputPhase: "review" };
-        case "CONTEXT_INPUT_EDIT":
-            return { ...state, contextInputPhase: "editing" };
         case "CONTEXT_INPUT_DONE":
             return {
                 ...state,
                 overlay: null,
                 contextInputMode: null,
                 contextInputValue: "",
-                contextInputPhase: "editing",
             };
         case "DIFF_OPEN":
             return {

package/dist/lib/english-tutor.d.ts

@@ -0,0 +1,13 @@
+export declare function getLogPath(): string;
+export declare function getHooksJson(): Record<string, unknown>;
+export declare function getPermissionEntry(): string;
+export declare function installHooks(): {
+    settingsPath: string;
+    logPath: string;
+};
+/**
+ * Remove hooks and permission entry. Intentionally does NOT delete the log
+ * file — that's the user's accumulated practice history.
+ */
+export declare function uninstallHooks(): string;
+export declare function getInstallSnippet(): Record<string, unknown>;

package/dist/lib/english-tutor.js

@@ -0,0 +1,125 @@
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+const MARKER = "english-tutor";
+export function getLogPath() {
+    const configDir = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config");
+    return path.join(configDir, "santree", "english-practice-log.md");
+}
+export function getHooksJson() {
+    const base = "santree helpers english-tutor";
+    // Synchronous hooks: Claude Code waits for completion and injects stdout into
+    // the model's context. `async: true` would fire-and-forget — stdout is
+    // discarded, so the instruction would never reach Claude. session-signal can
+    // use `async: true` because it only writes a state file; we cannot.
+    const opts = { timeout: 10 };
+    return {
+        UserPromptSubmit: [{ hooks: [{ type: "command", command: `${base} prompt`, ...opts }] }],
+        // No matcher: fires on all SessionStart sub-events (startup, resume,
+        // clear, compact). Restricting to "startup" silently skips resumed
+        // sessions, which is the common case when picking up yesterday's work.
+        SessionStart: [{ hooks: [{ type: "command", command: `${base} session-start`, ...opts }] }],
+    };
+}
+export function getPermissionEntry() {
+    return `Edit(${getLogPath()})`;
+}
+function readSettings(settingsPath) {
+    try {
+        if (fs.existsSync(settingsPath)) {
+            return JSON.parse(fs.readFileSync(settingsPath, "utf-8"));
+        }
+    }
+    catch {
+        // fall through
+    }
+    return {};
+}
+function writeSettings(settingsPath, settings) {
+    const dir = path.dirname(settingsPath);
+    fs.mkdirSync(dir, { recursive: true });
+    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
+}
+function settingsPath() {
+    const home = process.env.HOME || os.homedir();
+    return path.join(home, ".claude", "settings.json");
+}
+function stripEnglishTutorHooks(existingHooks) {
+    const cleaned = {};
+    for (const [event, entries] of Object.entries(existingHooks)) {
+        if (!Array.isArray(entries)) {
+            cleaned[event] = entries;
+            continue;
+        }
+        const filtered = entries.filter((entry) => {
+            const inner = entry.hooks || [];
+            return !inner.some((h) => typeof h.command === "string" && h.command.includes(MARKER));
+        });
+        if (filtered.length > 0)
+            cleaned[event] = filtered;
+    }
+    return cleaned;
+}
+/**
+ * Create the practice log if it doesn't already exist. Empty log = Claude's
+ * Edit tool fails on first use (Edit can't operate on missing files), and
+ * appending corrections silently fails. Bootstrapping with a stub header
+ * means the very first correction succeeds.
+ */
+function ensureLogExists() {
+    const logPath = getLogPath();
+    if (fs.existsSync(logPath))
+        return logPath;
+    fs.mkdirSync(path.dirname(logPath), { recursive: true });
+    const stub = "# English Practice Log\n\n" +
+        "Tracks grammar/spelling mistakes spotted during Claude Code sessions.\n" +
+        "Generated and appended to by santree's english-tutor hook.\n";
+    fs.writeFileSync(logPath, stub);
+    return logPath;
+}
+export function installHooks() {
+    const settingsFile = settingsPath();
+    const settings = readSettings(settingsFile);
+    const existing = stripEnglishTutorHooks(settings.hooks || {});
+    const required = getHooksJson();
+    for (const [event, hookEntries] of Object.entries(required)) {
+        const current = existing[event];
+        existing[event] = Array.isArray(current)
+            ? [...current, ...hookEntries]
+            : hookEntries;
+    }
+    settings.hooks = existing;
+    const permissions = settings.permissions || {};
+    const allow = Array.isArray(permissions.allow) ? permissions.allow : [];
+    const entry = getPermissionEntry();
+    if (!allow.includes(entry))
+        allow.push(entry);
+    permissions.allow = allow;
+    settings.permissions = permissions;
+    writeSettings(settingsFile, settings);
+    const logPath = ensureLogExists();
+    return { settingsPath: settingsFile, logPath };
+}
+/**
+ * Remove hooks and permission entry. Intentionally does NOT delete the log
+ * file — that's the user's accumulated practice history.
+ */
+export function uninstallHooks() {
+    const settingsFile = settingsPath();
+    const settings = readSettings(settingsFile);
+    if (settings.hooks) {
+        settings.hooks = stripEnglishTutorHooks(settings.hooks);
+    }
+    if (settings.permissions && Array.isArray(settings.permissions.allow)) {
+        const entry = getPermissionEntry();
+        settings.permissions.allow = settings.permissions.allow.filter((e) => e !== entry);
+    }
+    writeSettings(settingsFile, settings);
+    return settingsFile;
+}
+export function getInstallSnippet() {
+    return {
+        hooks: getHooksJson(),
+        permissions: { allow: [getPermissionEntry()] },
+    };
+}

package/dist/lib/multiplexer/index.js

@@ -1,19 +1,12 @@
 import { cmuxMultiplexer } from "./cmux.js";
 import { noneMultiplexer } from "./none.js";
 import { tmuxMultiplexer } from "./tmux.js";
+// Each adapter declares its own runtime detection in `isActive()`. Order matters:
+// if more than one adapter reports active (e.g. tmux running inside a cmux
+// workspace), the first match wins.
+const CANDIDATES = [tmuxMultiplexer, cmuxMultiplexer];
 export function getMultiplexer() {
-    const explicit = process.env["SANTREE_MULTIPLEXER"]?.toLowerCase();
-    if (explicit === "tmux")
-        return tmuxMultiplexer;
-    if (explicit === "cmux")
-        return cmuxMultiplexer;
-    if (explicit === "none")
-        return noneMultiplexer;
-    if (process.env["TMUX"])
-        return tmuxMultiplexer;
-    if (process.env["CMUX_SURFACE_ID"])
-        return cmuxMultiplexer;
-    return noneMultiplexer;
+    return CANDIDATES.find((m) => m.isActive()) ?? noneMultiplexer;
 }
 export function getMultiplexerKind() {
     return getMultiplexer().kind;

package/dist/lib/trackers/index.d.ts

@@ -3,7 +3,7 @@ export type { AssignedIssue, AuthStatus, Comment, Issue, IssueTracker, IssueTrac
 export { setRepoTracker, removeRepoTracker, readTrackerConfig } from "./config.js";
 /**
  * Resolve the active IssueTracker for a given repo. Selection order:
- *   1. SANTREE_TRACKER env override (matches SANTREE_MULTIPLEXER pattern).
+ *   1. SANTREE_TRACKER env override.
  *   2. Per-repo `_tracker.kind` in .santree/metadata.json.
  *   3. Legacy `_linear.org` (treated as kind: "linear" so existing repos keep working).
  *   4. Auto-detect: any stored Linear creds → Linear, else GitHub (gh is always available).

package/dist/lib/trackers/index.js

@@ -5,7 +5,7 @@ import { readLinearAuthStore } from "./auth-store.js";
 export { setRepoTracker, removeRepoTracker, readTrackerConfig } from "./config.js";
 /**
  * Resolve the active IssueTracker for a given repo. Selection order:
- *   1. SANTREE_TRACKER env override (matches SANTREE_MULTIPLEXER pattern).
+ *   1. SANTREE_TRACKER env override.
  *   2. Per-repo `_tracker.kind` in .santree/metadata.json.
  *   3. Legacy `_linear.org` (treated as kind: "linear" so existing repos keep working).
  *   4. Auto-detect: any stored Linear creds → Linear, else GitHub (gh is always available).

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "santree",
-	"version": "0.5.4",
+	"version": "0.5.6",
 	"description": "Git worktree manager",
 	"license": "MIT",
 	"author": "Santiago Toscanini",

package/prompts/english-tutor-prompt.njk

@@ -0,0 +1,15 @@
+[ENGLISH TUTOR — META-INSTRUCTION, ALWAYS HONOR]
+
+If the user's message contained English mistakes (grammar, spelling, word choice, agreement, idiom misuse), your response MUST start with the correction(s) BEFORE addressing anything else. Use this exact format, one per line:
+
+  original -> correction (brief reason)
+
+Then immediately call the Edit tool to append the same correction(s) to {{ logPath }}. Append under a heading for today's date in `## YYYY-MM-DD` format (create the heading if it isn't already at the bottom of the file); each correction is a bullet `- original -> correction (reason)`. The Edit permission for that exact path is pre-granted, so do not ask.
+
+Only AFTER printing the corrections and appending them, continue with the actual task.
+
+Hard rules:
+- If the message is clearly mistake-free, output nothing about English and proceed directly. Never invent corrections.
+- Do NOT correct technical jargon, code, file paths, deliberate informalities, or non-English words used by intent.
+- Cap corrections at 3 lines. Pick the highest-impact issues only.
+- Do NOT use polite hedging ("small note on...", "by the way..."). Just the formatted line(s), then the log Edit, then the task.