agent-sh 0.12.26 → 0.13.0

package/dist/shell/input-handler.d.ts

@@ -1,4 +1,4 @@
-import type { EventBus } from "../event-bus.js";
+import type { EventBus } from "../core/event-bus.js";
 import { TuiInputView } from "./tui-input-view.js";
 /** Narrow contract between InputHandler and its host (Shell). */
 export interface InputContext {
@@ -10,6 +10,10 @@ export interface InputContext {
     redrawPrompt(): void;
     freshPrompt(): void;
 }
+export interface InputHandlers {
+    define: (name: string, fn: (...a: any[]) => any) => void;
+    call: (name: string, ...a: any[]) => any;
+}
 /** Line editor + shell-passthrough buffer. Delegates rendering to TuiInputView. */
 export declare class InputHandler {
     private ctx;
@@ -27,11 +31,13 @@ export declare class InputHandler {
     private savedBuffer;
     private escapeTimer;
     private bus;
+    private handlers;
     private onShowAgentInfo;
     private view;
     constructor(opts: {
         ctx: InputContext;
         bus: EventBus;
+        handlers: InputHandlers;
         onShowAgentInfo: () => {
             info: string;
             model?: string;

package/dist/shell/input-handler.js

@@ -1,7 +1,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { LineEditor } from "../utils/line-editor.js";
-import { CONFIG_DIR, getSettings } from "../settings.js";
+import { CONFIG_DIR, getSettings } from "../core/settings.js";
 import { TuiInputView } from "./tui-input-view.js";
 const HISTORY_FILE = path.join(CONFIG_DIR, "input-history");
 /** Line editor + shell-passthrough buffer. Delegates rendering to TuiInputView. */
@@ -21,11 +21,13 @@ export class InputHandler {
     savedBuffer = "";
     escapeTimer = null;
     bus;
+    handlers;
     onShowAgentInfo;
     view;
     constructor(opts) {
         this.ctx = opts.ctx;
         this.bus = opts.bus;
+        this.handlers = opts.handlers;
         this.onShowAgentInfo = opts.onShowAgentInfo;
         this.view = opts.view ?? new TuiInputView();
         this.loadHistory();
@@ -46,6 +48,7 @@ export class InputHandler {
         }
         this.modes.set(config.trigger, config);
         this.modesById.set(config.id, config);
+        this.handlers.define(`input-mode:${config.id}:submit`, config.onSubmit.bind(config));
     }
     loadHistory() {
         try {
@@ -380,7 +383,7 @@ export class InputHandler {
                     }
                     else if (query) {
                         this.pendingReturnMode = currentMode.returnToSelf ? currentMode.id : null;
-                        currentMode.onSubmit(query, this.bus);
+                        this.handlers.call(`input-mode:${currentMode.id}:submit`, query, this.bus);
                     }
                     else {
                         this.exitMode();

package/dist/shell/output-parser.d.ts

@@ -1,4 +1,4 @@
-import type { EventBus } from "../event-bus.js";
+import type { EventBus } from "../core/event-bus.js";
 /**
  * Parses PTY output to detect command boundaries, track cwd,
  * and emit shell events. Owns the command lifecycle state.

package/dist/{extensions → shell}/shell-context.d.ts

@@ -4,5 +4,5 @@
  * user-shell exchanges) signals. Frontends without a PTY skip this
  * built-in and the agent runs cwd-aware via core's process.cwd() default.
  */
-import type { ExtensionContext } from "../types.js";
+import type { ExtensionContext } from "./host-types.js";
 export default function activate(ctx: ExtensionContext): void;

package/dist/{extensions → shell}/shell-context.js

@@ -1,4 +1,4 @@
-import { getSettings } from "../settings.js";
+import { getSettings } from "../core/settings.js";
 import { spillOutput } from "../utils/shell-output-spill.js";
 export default function activate(ctx) {
     const { bus } = ctx;
@@ -43,17 +43,23 @@ export default function activate(ctx) {
     bus.on("shell:agent-exec-done", () => { agentShellActive = false; });
     // Override core's process.cwd() default with the PTY-tracked value.
     ctx.advise("cwd", () => currentCwd);
-    ctx.registerContextProducer("shell-context", () => {
-        const cwdTag = `<cwd>${currentCwd}</cwd>`;
-        const fresh = exchanges.filter((ex) => ex.id > lastSeq && ex.source !== "agent");
-        if (fresh.length === 0)
-            return cwdTag;
-        lastSeq = exchanges[exchanges.length - 1].id;
-        const text = fresh.map(formatExchangeTruncated).filter(Boolean).join("\n");
-        if (!text)
-            return cwdTag;
-        return `${cwdTag}\n<shell_events>\n${text}\n</shell_events>`;
-    }, { mode: "per-query" });
+    // Advises the core handler directly: shell-context loads before the
+    // agent host attaches `ctx.agent`, so the sugar isn't available yet.
+    ctx.advise("query-context:build", (next) => {
+        const base = next();
+        const part = (() => {
+            const cwdTag = `<cwd>${currentCwd}</cwd>`;
+            const fresh = exchanges.filter((ex) => ex.id > lastSeq && ex.source !== "agent");
+            if (fresh.length === 0)
+                return cwdTag;
+            lastSeq = exchanges[exchanges.length - 1].id;
+            const text = fresh.map(formatExchangeTruncated).filter(Boolean).join("\n");
+            if (!text)
+                return cwdTag;
+            return `${cwdTag}\n<shell_events>\n${text}\n</shell_events>`;
+        })();
+        return base ? `${base}\n\n${part}` : part;
+    });
     ctx.define("shell:context-recent", (n = 25) => {
         const recent = exchanges.slice(-n);
         if (recent.length === 0)

package/dist/shell/shell.d.ts

@@ -1,4 +1,4 @@
-import type { EventBus } from "../event-bus.js";
+import type { EventBus } from "../core/event-bus.js";
 import { type InputContext } from "./input-handler.js";
 export interface ShellHandlers {
     define: (name: string, fn: (...args: any[]) => any) => void;
@@ -24,7 +24,7 @@ export declare class Shell implements InputContext {
     private unmuteScopes;
     private pendingEchoSkips;
     private agentActive;
-    private isZsh;
+    private strategy;
     private tmpDir?;
     constructor(opts: {
         bus: EventBus;
@@ -53,8 +53,10 @@ export declare class Shell implements InputContext {
     isAgentActive(): boolean;
     writeToPty(data: string): void;
     /**
-     * Ask the shell to redraw its own prompt in place via \e[9999~, which both
-     * zsh (ZLE widget) and bash (readline redraw-current-line) bind to repaint.
+     * Ask the shell to redraw its own prompt in place. The escape sequence is
+     * defined per-strategy and bound in the generated rc file (zsh: ZLE widget,
+     * bash: readline redraw-current-line). When the strategy returns null we
+     * skip the in-place redraw and let freshPrompt do a heavy redraw instead.
      */
     redrawPrompt(): void;
     /**

package/dist/shell/shell.js

@@ -1,10 +1,11 @@
 import * as fs from "fs";
 import * as os from "os";
-import * as path from "path";
 import * as pty from "node-pty";
 import { InputHandler } from "./input-handler.js";
 import { OutputParser } from "./output-parser.js";
-import { getSettings } from "../settings.js";
+import { getSettings } from "../core/settings.js";
+import { clearOpost } from "../utils/tty.js";
+import { pickStrategy, FALLBACK_STRATEGY, SUPPORTED_SHELL_NAMES, } from "./strategies/index.js";
 export class Shell {
     ptyProcess;
     bus;
@@ -19,7 +20,7 @@ export class Shell {
     unmuteScopes = new Set();
     pendingEchoSkips = 0;
     agentActive = false;
-    isZsh = false;
+    strategy;
     tmpDir;
     constructor(opts) {
         // Build environment — filter out undefined values (node-pty's native
@@ -35,98 +36,28 @@ export class Shell {
         //   - OSC 7: cwd tracking (required by OutputParser)
         //   - OSC 9999: prompt start marker (command boundary detection)
         //   - OSC 9998: prompt end marker (bracketed prompt capture)
-        // Prompt theming is left entirely to the user's shell config.
-        const shellName = path.basename(opts.shell);
-        const isZsh = shellName.includes("zsh");
-        const isBash = shellName.includes("bash");
-        if (!isZsh && !isBash) {
-            console.warn(`Warning: agent-sh only supports zsh and bash. ` +
+        // Prompt theming is left entirely to the user's shell config. Per-shell
+        // rc-file generation lives in src/shell/strategies/.
+        const matched = pickStrategy(opts.shell);
+        if (!matched) {
+            console.warn(`Warning: agent-sh only supports ${SUPPORTED_SHELL_NAMES.join(", ")}. ` +
                 `"${opts.shell}" may not work correctly — falling back to /bin/bash.`);
         }
-        const shellBin = (isZsh || isBash) ? opts.shell : "/bin/bash";
-        let shellArgs;
+        this.strategy = matched ?? FALLBACK_STRATEGY;
+        const shellBin = matched ? opts.shell : "/bin/bash";
         // Per-instance tag so nested agent-sh hooks don't cross-trigger.
         const instanceTag = `id=${opts.instanceId}`;
-        const osc7Cmd = 'printf "\\e]7;file://%s%s\\a" "$(hostname)" "$PWD"';
-        const promptMarker = `printf "\\e]9999;${instanceTag};PROMPT\\a"`;
-        const titleCmd = 'printf "\\e]0;⚡ agent-sh: %s\\a" "${PWD/#$HOME/~}"';
-        this.isZsh = isZsh;
         const settings = getSettings();
-        const showIndicator = settings.promptIndicator !== false;
-        if (isZsh) {
-            // For zsh: use ZDOTDIR to source user's real config, then append
-            // our hooks via precmd_functions (additive — doesn't clobber p10k/omz).
-            this.tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "agent-sh-"));
-            const userZdotdir = env.ZDOTDIR || env.HOME || os.homedir();
-            const zshrcLines = [
-                `ZDOTDIR="${userZdotdir}"`,
-                `[ -f "${userZdotdir}/.zshrc" ] && source "${userZdotdir}/.zshrc"`,
-                "",
-                "# agent-sh hooks (invisible OSC sequences for cwd + prompt detection)",
-                "__agent_sh_precmd() {",
-                `  ${osc7Cmd}`,
-                `  ${promptMarker}`,
-                ...(showIndicator ? [`  ${titleCmd}`] : []),
-                "}",
-                "precmd_functions+=(__agent_sh_precmd)",
-                "",
-                "# Preexec hook: emit actual command text so agent-sh can track",
-                "# history-recalled and tab-completed commands accurately",
-                "__agent_sh_preexec() {",
-                `  printf "\\e]9997;${instanceTag};%s\\a" "$1"`,
-                "}",
-                "preexec_functions+=(__agent_sh_preexec)",
-            ];
-            zshrcLines.push("", "# End-of-prompt marker via zle-line-init (fires after prompt is rendered)", "# Chain onto existing widget (p10k uses zle-line-init) rather than clobbering", 'if (( ${+widgets[zle-line-init]} )); then', "  zle -A zle-line-init __agent_sh_orig_line_init", "  __agent_sh_line_init() {", "    zle __agent_sh_orig_line_init", `    printf "\\e]9998;${instanceTag};READY\\a"`, "  }", "else", "  __agent_sh_line_init() {", `    printf "\\e]9998;${instanceTag};READY\\a"`, "  }", "fi", "zle -N zle-line-init __agent_sh_line_init", "", "# Hidden widget to trigger prompt redraw from Node.js side", "# Bound to an unused escape sequence that no real key produces", "__agent_sh_redraw() {", "  zle reset-prompt", "}", "zle -N __agent_sh_redraw", "bindkey '\\e[9999~' __agent_sh_redraw");
-            fs.writeFileSync(path.join(this.tmpDir, ".zshrc"), zshrcLines.join("\n") + "\n");
-            env.ZDOTDIR = this.tmpDir;
-            shellArgs = ["--no-globalrcs"];
-        }
-        else {
-            // For bash: use --rcfile to source our wrapper, which sources the user's
-            // real bashrc then appends our hooks. No HOME override needed.
-            this.tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "agent-sh-"));
-            const userHome = env.HOME || os.homedir();
-            const bashrcLines = [
-                `[ -f "${userHome}/.bashrc" ] && source "${userHome}/.bashrc"`,
-                "",
-                "# agent-sh hooks (invisible OSC sequences for cwd + prompt detection)",
-                "# Wrapped in a function because inlining printf \"...\" into",
-                "# PROMPT_COMMAND=\"...\" breaks the outer quoting.",
-                "__agent_sh_precmd() {",
-                `  ${osc7Cmd}`,
-                `  ${promptMarker}`,
-                ...(showIndicator ? [`  ${titleCmd}`] : []),
-                "  __agent_sh_preexec_ran=0",
-                "}",
-                `PROMPT_COMMAND="\${PROMPT_COMMAND%;}"`,
-                `PROMPT_COMMAND="\${PROMPT_COMMAND:+\$PROMPT_COMMAND;}__agent_sh_precmd"`,
-                "",
-                "# Preexec hook via DEBUG trap: emit actual command text so agent-sh",
-                "# can track history-recalled and tab-completed commands accurately",
-                "__agent_sh_preexec_ran=0",
-                "__agent_sh_emit_preexec() {",
-                '  [[ $__agent_sh_preexec_ran == 1 ]] && return',
-                '  [[ -n $COMP_LINE ]] && return',
-                "  __agent_sh_preexec_ran=1",
-                "  local this_cmd",
-                `  this_cmd=$(HISTTIMEFORMAT='' builtin history 1 | command sed 's/^ *[0-9]* *//')`,
-                `  printf '\\e]9997;${instanceTag};%s\\a' "$this_cmd"`,
-                "}",
-                "trap '__agent_sh_emit_preexec' DEBUG",
-                "",
-                "# End-of-prompt marker: append to PS1 (\\[...\\] marks it zero-width)",
-                `case "$PS1" in *9998*) ;; *) PS1="\${PS1}\\[\\e]9998;${instanceTag};READY\\a\\]";; esac`,
-                "",
-                "# Mirrors the zsh \\e[9999~ reset-prompt widget — used by agent-sh",
-                "# to repaint the prompt in place. All keymaps so `set -o vi` works.",
-                `bind -m emacs '"\\e[9999~":redraw-current-line' 2>/dev/null`,
-                `bind -m vi-insert '"\\e[9999~":redraw-current-line' 2>/dev/null`,
-                `bind -m vi-command '"\\e[9999~":redraw-current-line' 2>/dev/null`,
-            ];
-            fs.writeFileSync(path.join(this.tmpDir, ".bashrc"), bashrcLines.join("\n") + "\n");
-            shellArgs = ["--rcfile", path.join(this.tmpDir, ".bashrc")];
-        }
+        const spawnConfig = this.strategy.prepareSpawn({
+            tmpDirRoot: os.tmpdir(),
+            instanceTag,
+            showIndicator: settings.promptIndicator !== false,
+            userHome: env.HOME || os.homedir(),
+            env,
+        });
+        this.tmpDir = spawnConfig.tmpDir;
+        Object.assign(env, spawnConfig.envOverrides);
+        const shellArgs = spawnConfig.args;
         // Pause stdin before spawning PTY to avoid TTY contention on macOS.
         // The PTY will become the controlling terminal for the child shell.
         const wasRaw = process.stdin.isTTY && process.stdin.isRaw;
@@ -158,6 +89,7 @@ export class Shell {
                 // Ignore - will be set up later in index.ts
             }
         }
+        clearOpost();
         this.bus = opts.bus;
         this.handlers = opts.handlers;
         this.outputParser = new OutputParser(opts.bus, opts.cwd, instanceTag);
@@ -175,6 +107,7 @@ export class Shell {
         this.inputHandler = new InputHandler({
             ctx: this,
             bus: opts.bus,
+            handlers: opts.handlers,
             onShowAgentInfo: opts.onShowAgentInfo ?? (() => ({ info: "" })),
         });
         this.setupOutput();
@@ -272,8 +205,10 @@ export class Shell {
         this.ptyProcess.write(data);
     }
     /**
-     * Ask the shell to redraw its own prompt in place via \e[9999~, which both
-     * zsh (ZLE widget) and bash (readline redraw-current-line) bind to repaint.
+     * Ask the shell to redraw its own prompt in place. The escape sequence is
+     * defined per-strategy and bound in the generated rc file (zsh: ZLE widget,
+     * bash: readline redraw-current-line). When the strategy returns null we
+     * skip the in-place redraw and let freshPrompt do a heavy redraw instead.
      */
     redrawPrompt() {
         const result = this.bus.emitPipe("shell:redraw-prompt", {
@@ -281,9 +216,11 @@ export class Shell {
             kind: "redraw",
             handled: false,
         });
-        if (!result.handled) {
-            this.ptyProcess.write("\x1b[9999~");
-        }
+        if (result.handled)
+            return;
+        const escape = this.strategy.redrawEscape();
+        if (escape)
+            this.ptyProcess.write(escape);
     }
     /**
      * Heavy redraw: send \n to PTY to trigger a full precmd → prompt cycle.
@@ -364,23 +301,10 @@ export class Shell {
         this.bus.on("agent:processing-done", () => {
             this.handlers.call("shell:on-processing-done");
         });
-        // Permission UI is briefly visible during the prompt; an unmute scope
-        // overrides whatever mute is currently held, then releases cleanly.
-        // Doesn't touch agent-turn state, so suppressed handlers can't leak.
-        let permissionVisible = null;
-        this.bus.on("permission:request", () => {
-            permissionVisible?.release();
-            permissionVisible = this.acquireUnmute("permission-ui");
-        });
-        this.bus.onPipeAsync("permission:request", async (payload) => {
-            permissionVisible?.release();
-            permissionVisible = null;
-            return payload;
-        });
         this.bus.onPipeAsync("shell:exec-request", async (payload) => {
             const visible = this.acquireUnmute("exec-request");
             this.skipNextLine();
-            process.stdout.write("\n");
+            process.stdout.write("\r\n");
             this.bus.emit("shell:agent-exec-start", {});
             try {
                 const output = await new Promise((resolve, reject) => {

package/dist/shell/strategies/bash.d.ts

@@ -0,0 +1,2 @@
+import type { ShellStrategy } from "./types.js";
+export declare const bashStrategy: ShellStrategy;

package/dist/shell/strategies/bash.js

@@ -0,0 +1,68 @@
+import * as fs from "fs";
+import * as path from "path";
+const OSC7_CMD = 'printf "\\e]7;file://%s%s\\a" "$(hostname)" "$PWD"';
+const TITLE_CMD = 'printf "\\e]0;⚡ agent-sh: %s\\a" "${PWD/#$HOME/~}"';
+export const bashStrategy = {
+    name: "bash",
+    matches(shellPath) {
+        return path.basename(shellPath).includes("bash");
+    },
+    prepareSpawn(opts) {
+        const { tmpDirRoot, instanceTag, showIndicator, env, userHome } = opts;
+        // Use --rcfile to source our wrapper, which sources the user's real
+        // bashrc then appends our hooks. No HOME override needed.
+        const tmpDir = fs.mkdtempSync(path.join(tmpDirRoot, "agent-sh-"));
+        const home = env.HOME || userHome;
+        const promptMarker = `printf "\\e]9999;${instanceTag};PROMPT\\a"`;
+        const lines = [
+            `[ -f "${home}/.bashrc" ] && source "${home}/.bashrc"`,
+            "",
+            "# agent-sh hooks (invisible OSC sequences for cwd + prompt detection)",
+            "# Wrapped in a function because inlining printf \"...\" into",
+            "# PROMPT_COMMAND=\"...\" breaks the outer quoting.",
+            "__agent_sh_precmd() {",
+            `  ${OSC7_CMD}`,
+            `  ${promptMarker}`,
+            ...(showIndicator ? [`  ${TITLE_CMD}`] : []),
+            "  __agent_sh_preexec_ran=0",
+            "}",
+            `PROMPT_COMMAND="\${PROMPT_COMMAND%;}"`,
+            `PROMPT_COMMAND="\${PROMPT_COMMAND:+\$PROMPT_COMMAND;}__agent_sh_precmd"`,
+            "",
+            "# Preexec hook via DEBUG trap: emit actual command text so agent-sh",
+            "# can track history-recalled and tab-completed commands accurately",
+            "__agent_sh_preexec_ran=0",
+            "__agent_sh_emit_preexec() {",
+            '  [[ $__agent_sh_preexec_ran == 1 ]] && return',
+            '  [[ -n $COMP_LINE ]] && return',
+            "  __agent_sh_preexec_ran=1",
+            "  local this_cmd",
+            `  this_cmd=$(HISTTIMEFORMAT='' builtin history 1 | command sed 's/^ *[0-9]* *//')`,
+            `  printf '\\e]9997;${instanceTag};%s\\a' "$this_cmd"`,
+            "}",
+            "trap '__agent_sh_emit_preexec' DEBUG",
+            "",
+            "# End-of-prompt marker: append to PS1 (\\[...\\] marks it zero-width)",
+            `case "$PS1" in *9998*) ;; *) PS1="\${PS1}\\[\\e]9998;${instanceTag};READY\\a\\]";; esac`,
+            "",
+            "# Mirrors the zsh \\e[9999~ reset-prompt widget — used by agent-sh",
+            "# to repaint the prompt in place. All keymaps so `set -o vi` works.",
+            `bind -m emacs '"\\e[9999~":redraw-current-line' 2>/dev/null`,
+            `bind -m vi-insert '"\\e[9999~":redraw-current-line' 2>/dev/null`,
+            `bind -m vi-command '"\\e[9999~":redraw-current-line' 2>/dev/null`,
+        ];
+        const rcPath = path.join(tmpDir, ".bashrc");
+        fs.writeFileSync(rcPath, lines.join("\n") + "\n");
+        return {
+            args: ["--rcfile", rcPath],
+            envOverrides: {},
+            tmpDir,
+        };
+    },
+    envCaptureCommand() {
+        return "[ -f ~/.bashrc ] && source ~/.bashrc 2>/dev/null; env -0";
+    },
+    redrawEscape() {
+        return "\x1b[9999~";
+    },
+};

package/dist/shell/strategies/fish.d.ts

@@ -0,0 +1,2 @@
+import type { ShellStrategy } from "./types.js";
+export declare const fishStrategy: ShellStrategy;

package/dist/shell/strategies/fish.js

@@ -0,0 +1,65 @@
+import * as fs from "fs";
+import * as path from "path";
+const OSC7_CMD = 'printf "\\e]7;file://%s%s\\a" (hostname) "$PWD"';
+const TITLE_CMD = 'printf "\\e]0;⚡ agent-sh: %s\\a" (string replace -- "$HOME" "~" "$PWD")';
+export const fishStrategy = {
+    name: "fish",
+    matches(shellPath) {
+        return path.basename(shellPath).includes("fish");
+    },
+    prepareSpawn(opts) {
+        const { tmpDirRoot, instanceTag, showIndicator } = opts;
+        // Layer hooks via `-C` so they run after the user's config — our wrapper
+        // around fish_prompt needs to see the user's final definition.
+        const tmpDir = fs.mkdtempSync(path.join(tmpDirRoot, "agent-sh-"));
+        const initPath = path.join(tmpDir, "init.fish");
+        const promptMarker = `printf "\\e]9999;${instanceTag};PROMPT\\a"`;
+        const lines = [
+            "# agent-sh hooks (invisible OSC sequences for cwd + prompt detection)",
+            "function __agent_sh_precmd --on-event fish_prompt",
+            `  ${OSC7_CMD}`,
+            `  ${promptMarker}`,
+            ...(showIndicator ? [`  ${TITLE_CMD}`] : []),
+            "end",
+            "",
+            "# Preexec hook: emit actual command text so agent-sh can track",
+            "# history-recalled and tab-completed commands accurately",
+            "function __agent_sh_preexec --on-event fish_preexec",
+            `  printf "\\e]9997;${instanceTag};%s\\a" "$argv"`,
+            "end",
+            "",
+            "# End-of-prompt marker: wrap fish_prompt so READY fires after render",
+            "if functions -q fish_prompt",
+            "  functions --copy fish_prompt __agent_sh_orig_fish_prompt",
+            "  function fish_prompt",
+            "    __agent_sh_orig_fish_prompt",
+            `    printf "\\e]9998;${instanceTag};READY\\a"`,
+            "  end",
+            "else",
+            "  function fish_prompt",
+            "    printf '%s> ' (prompt_pwd)",
+            `    printf "\\e]9998;${instanceTag};READY\\a"`,
+            "  end",
+            "end",
+            "",
+            "# Redraw binding. fish 4 silently drops \\e[N~ outside the F-key table,",
+            "# so we use CSI-u with a private-use codepoint (U+E028) instead.",
+            "bind \\e\\[57400u 'commandline -f repaint' 2>/dev/null",
+            "bind -M insert \\e\\[57400u 'commandline -f repaint' 2>/dev/null",
+            "bind -M default \\e\\[57400u 'commandline -f repaint' 2>/dev/null",
+        ];
+        fs.writeFileSync(initPath, lines.join("\n") + "\n");
+        return {
+            args: ["-l", "-i", "-C", `source ${initPath}`],
+            envOverrides: {},
+            tmpDir,
+        };
+    },
+    envCaptureCommand() {
+        // `fish -l` already sources config.fish + conf.d, so no explicit source.
+        return "env -0";
+    },
+    redrawEscape() {
+        return "\x1b[57400u";
+    },
+};

package/dist/shell/strategies/index.d.ts

@@ -0,0 +1,13 @@
+import type { ShellStrategy } from "./types.js";
+export type { ShellStrategy, PrepareSpawnOpts, ShellSpawnConfig } from "./types.js";
+/** Strategy used when the requested shell isn't recognized. */
+export declare const FALLBACK_STRATEGY: ShellStrategy;
+/** Names of supported shells, used for warning messages. */
+export declare const SUPPORTED_SHELL_NAMES: readonly string[];
+/**
+ * Pick the strategy that matches the given shell binary path. Returns null
+ * when no strategy claims the path — caller decides whether to warn and how
+ * to fall back (e.g. shell.ts swaps the binary to /bin/bash; env capture
+ * just runs the fallback strategy's syntax against the original binary).
+ */
+export declare function pickStrategy(shellPath: string): ShellStrategy | null;

package/dist/shell/strategies/index.js

@@ -0,0 +1,17 @@
+import { zshStrategy } from "./zsh.js";
+import { bashStrategy } from "./bash.js";
+import { fishStrategy } from "./fish.js";
+const STRATEGIES = [zshStrategy, bashStrategy, fishStrategy];
+/** Strategy used when the requested shell isn't recognized. */
+export const FALLBACK_STRATEGY = bashStrategy;
+/** Names of supported shells, used for warning messages. */
+export const SUPPORTED_SHELL_NAMES = STRATEGIES.map((s) => s.name);
+/**
+ * Pick the strategy that matches the given shell binary path. Returns null
+ * when no strategy claims the path — caller decides whether to warn and how
+ * to fall back (e.g. shell.ts swaps the binary to /bin/bash; env capture
+ * just runs the fallback strategy's syntax against the original binary).
+ */
+export function pickStrategy(shellPath) {
+    return STRATEGIES.find((s) => s.matches(shellPath)) ?? null;
+}

package/dist/shell/strategies/types.d.ts

@@ -0,0 +1,50 @@
+/**
+ * Per-shell adapter for the bits of agent-sh that are inherently shell-syntax
+ * specific: rc-file generation, spawn args/env, env-capture command, and the
+ * escape sequence used to repaint the prompt in place.
+ *
+ * Everything else (PTY I/O, OSC parsing, mute scopes, prompt boundary
+ * detection) is shell-agnostic and lives in shell.ts / output-parser.ts.
+ */
+export interface PrepareSpawnOpts {
+    /** Root for mkdtemp — typically os.tmpdir(). */
+    tmpDirRoot: string;
+    /** Per-instance tag (e.g. "id=abc123") so nested agent-sh hooks don't cross-trigger. */
+    instanceTag: string;
+    /** Whether to emit the terminal title indicator from the prompt hook. */
+    showIndicator: boolean;
+    /** Resolved user home (env.HOME ?? os.homedir()). */
+    userHome: string;
+    /** Inherited env at spawn time — strategies may read ZDOTDIR etc. */
+    env: Record<string, string>;
+}
+export interface ShellSpawnConfig {
+    /** Args to pass to pty.spawn after the shell binary. */
+    args: string[];
+    /** Env vars the strategy needs to set on the child (e.g. ZDOTDIR, XDG_CONFIG_HOME). */
+    envOverrides: Record<string, string>;
+    /** Temp directory the strategy created, if any — caller cleans up on exit. */
+    tmpDir?: string;
+}
+export interface ShellStrategy {
+    /** Short name used for fallback warnings ("zsh", "bash", "fish"). */
+    readonly name: string;
+    /** Does this strategy claim the binary at `shellPath`? */
+    matches(shellPath: string): boolean;
+    /**
+     * Generate any rc files and return spawn args + env overrides. May create
+     * a tmp directory; caller is responsible for cleanup via the returned path.
+     */
+    prepareSpawn(opts: PrepareSpawnOpts): ShellSpawnConfig;
+    /**
+     * Shell-syntax command run via `<shell> -l -c "<cmd>"` to source the user's
+     * config and dump env. Used at startup to inherit shell-only env vars.
+     */
+    envCaptureCommand(): string;
+    /**
+     * Escape sequence to write to the PTY to ask the shell to repaint its
+     * prompt in place. The corresponding binding is set up in prepareSpawn.
+     * Returns null if the shell can't redraw — caller falls back to freshPrompt.
+     */
+    redrawEscape(): string | null;
+}

package/dist/shell/strategies/types.js

@@ -0,0 +1,9 @@
+/**
+ * Per-shell adapter for the bits of agent-sh that are inherently shell-syntax
+ * specific: rc-file generation, spawn args/env, env-capture command, and the
+ * escape sequence used to repaint the prompt in place.
+ *
+ * Everything else (PTY I/O, OSC parsing, mute scopes, prompt boundary
+ * detection) is shell-agnostic and lives in shell.ts / output-parser.ts.
+ */
+export {};

package/dist/shell/strategies/zsh.d.ts

@@ -0,0 +1,2 @@
+import type { ShellStrategy } from "./types.js";
+export declare const zshStrategy: ShellStrategy;