agent-sh 0.2.0 → 0.3.1

package/dist/event-bus.d.ts

@@ -18,6 +18,8 @@ export interface ShellEvents {
     "shell:foreground-busy": {
         busy: boolean;
     };
+    "shell:agent-exec-start": Record<string, never>;
+    "shell:agent-exec-done": Record<string, never>;
     "agent:submit": {
         query: string;
     };
@@ -30,6 +32,7 @@ export interface ShellEvents {
     };
     "agent:response-chunk": {
         text: string;
+        blocks?: ContentBlock[];
     };
     "agent:response-done": {
         response: string;
@@ -114,6 +117,8 @@ export interface ShellEvents {
             }[];
         }[];
     };
+    "config:changed": Record<string, never>;
+    "config:cycle": Record<string, never>;
     "autocomplete:request": {
         buffer: string;
         items: {
@@ -122,6 +127,20 @@ export interface ShellEvents {
         }[];
     };
 }
+export type ContentBlock = {
+    type: "text";
+    text: string;
+} | {
+    type: "code-block";
+    language: string;
+    code: string;
+} | {
+    type: "image";
+    data: Buffer;
+} | {
+    type: "raw";
+    escape: string;
+};
 type Listener<T> = (payload: T) => void;
 type PipeListener<T> = (payload: T) => T;
 type AsyncPipeListener<T> = (payload: T) => T | Promise<T>;
@@ -141,6 +160,13 @@ export declare class EventBus {
     off<K extends keyof ShellEvents>(event: K, fn: Listener<ShellEvents[K]>): void;
     /** Emit a fire-and-forget event. */
     emit<K extends keyof ShellEvents>(event: K, payload: ShellEvents[K]): void;
+    /**
+     * Transform-then-notify: run the payload through any registered pipe
+     * listeners (transforms), then emit the final result to regular `on`
+     * listeners (renderers). This enables content pipelines where extensions
+     * modify data (e.g. render LaTeX → terminal image) before renderers see it.
+     */
+    emitTransform<K extends keyof ShellEvents>(event: K, payload: ShellEvents[K]): void;
     /** Register a transform listener for a pipeline event. */
     onPipe<K extends keyof ShellEvents>(event: K, fn: PipeListener<ShellEvents[K]>): void;
     /**

package/dist/event-bus.js

@@ -21,6 +21,16 @@ export class EventBus {
     emit(event, payload) {
         this.emitter.emit(event, payload);
     }
+    /**
+     * Transform-then-notify: run the payload through any registered pipe
+     * listeners (transforms), then emit the final result to regular `on`
+     * listeners (renderers). This enables content pipelines where extensions
+     * modify data (e.g. render LaTeX → terminal image) before renderers see it.
+     */
+    emitTransform(event, payload) {
+        const transformed = this.emitPipe(event, payload);
+        this.emitter.emit(event, transformed);
+    }
     /** Register a transform listener for a pipeline event. */
     onPipe(event, fn) {
         let listeners = this.pipeListeners.get(event);

package/dist/extension-loader.js

@@ -1,9 +1,7 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
-import * as os from "node:os";
-const CONFIG_DIR = path.join(os.homedir(), ".agent-sh");
+import { CONFIG_DIR, getSettings } from "./settings.js";
 const EXT_DIR = path.join(CONFIG_DIR, "extensions");
-const SETTINGS_PATH = path.join(CONFIG_DIR, "settings.json");
 const TS_EXTS = [".ts", ".tsx", ".mts"];
 const SCRIPT_EXTS = [".js", ".mjs", ".ts", ".tsx", ".mts"];
 let tsRegistered = false;
@@ -19,15 +17,6 @@ async function ensureTsSupport() {
         // tsx not available — TS extensions will fail with a clear error
     }
 }
-async function loadSettings() {
-    try {
-        const raw = await fs.readFile(SETTINGS_PATH, "utf-8");
-        return JSON.parse(raw);
-    }
-    catch {
-        return {};
-    }
-}
 /**
  * Load extensions from three sources (merged, deduplicated):
  *
@@ -49,8 +38,8 @@ export async function loadExtensions(ctx, cliExtensions) {
         specifiers.push(...cliExtensions);
     }
     // 2. settings.json
-    const settings = await loadSettings();
-    if (settings.extensions) {
+    const settings = getSettings();
+    if (settings.extensions.length > 0) {
         specifiers.push(...settings.extensions);
     }
     // 3. ~/.agent-sh/extensions/ directory

package/dist/extensions/shell-exec.js

@@ -22,25 +22,30 @@ import * as net from "node:net";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
+import { getSettings } from "../settings.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 export default function activate({ bus, contextManager }, opts) {
     const { socketPath } = opts;
-    // Register MCP server so ACP agents discover the user_shell tool
-    bus.onPipe("session:configure", (payload) => {
-        return {
-            ...payload,
-            mcpServers: [
-                ...payload.mcpServers,
-                {
-                    name: "agent-sh",
-                    command: process.execPath,
-                    args: [path.join(__dirname, "..", "mcp-server.js")],
-                    env: [{ name: "AGENT_SH_SOCKET", value: socketPath }],
-                },
-            ],
-        };
-    });
-    // Also set AGENT_SH_SOCKET for pi extensions that connect directly
+    // Register MCP server so ACP agents discover the bridge tools.
+    // Agents that don't support MCP (e.g. pi-acp) simply ignore it.
+    // Can be disabled via settings.json if not needed.
+    if (getSettings().enableMcp) {
+        bus.onPipe("session:configure", (payload) => {
+            return {
+                ...payload,
+                mcpServers: [
+                    ...payload.mcpServers,
+                    {
+                        name: "agent-sh",
+                        command: process.execPath,
+                        args: [path.join(__dirname, "..", "mcp-server.js")],
+                        env: [{ name: "AGENT_SH_SOCKET", value: socketPath }],
+                    },
+                ],
+            };
+        });
+    }
+    // Set AGENT_SH_SOCKET for agent extensions that connect directly
     process.env.AGENT_SH_SOCKET = socketPath;
     // Serialize shell/exec requests — only one PTY command at a time
     let execPending = Promise.resolve();
@@ -56,21 +61,19 @@ export default function activate({ bus, contextManager }, opts) {
                 return new Promise((resolve, reject) => {
                     execPending = execPending.then(async () => {
                         try {
+                            bus.emit("shell:agent-exec-start", {});
                             const result = await bus.emitPipeAsync("shell:exec-request", {
                                 command,
                                 output: "",
                                 cwd: "",
                                 done: false,
                             });
-                            // Show the command output in the TUI
-                            if (result.output) {
-                                bus.emit("agent:tool-output-chunk", { chunk: result.output });
-                            }
+                            bus.emit("shell:agent-exec-done", {});
                             resolve({ output: result.output, cwd: result.cwd });
                         }
                         catch (err) {
+                            bus.emit("shell:agent-exec-done", {});
                             const message = err instanceof Error ? err.message : String(err);
-                            bus.emit("agent:tool-output-chunk", { chunk: `Error: ${message}` });
                             reject(rpcError(-32000, message));
                         }
                     });
@@ -98,7 +101,9 @@ export default function activate({ bus, contextManager }, opts) {
                         if (!Array.isArray(ids) || ids.length === 0) {
                             throw rpcError(-32602, "Missing required parameter: ids (array of numbers)");
                         }
-                        return { result: contextManager.expand(ids.map(Number)) };
+                        const start = typeof params?.start === "number" ? params.start : undefined;
+                        const end = typeof params?.end === "number" ? params.end : undefined;
+                        return { result: contextManager.expand(ids.map(Number), start, end) };
                     }
                     case "browse":
                         return { result: contextManager.getRecentSummary() };

package/dist/extensions/tui-renderer.d.ts

@@ -1,2 +1,2 @@
 import type { ExtensionContext } from "../types.js";
-export default function activate({ bus }: ExtensionContext): void;
+export default function activate(ctx: ExtensionContext): void;