agent-sh 0.15.1 → 0.15.2

package/dist/agent/agent-loop.js

@@ -528,14 +528,15 @@ export class AgentLoop {
         // Advisable so extensions can inject fallback parsers without
         // subclassing the protocol.
         h.define("tool-protocol:extract-calls", (args) => this.toolProtocol.extractToolCalls(args.text, args.streamedCalls));
-        // System prompt: static identity + behavioral instructions.
-        // Extensions can use registerInstruction() for a managed section,
-        // advise system-prompt:frontend to describe their surface high in the
-        // prompt, or advise this handler directly for full control.
+        // System prompt: static identity + behavioral instructions. Extensions can
+        // use registerInstruction() for a managed section, advise system-prompt:identity
+        // to replace the kernel identity, advise system-prompt:frontend to describe their
+        // surface high in the prompt, or advise system-prompt:build directly for full control.
+        h.define("system-prompt:identity", () => STATIC_IDENTITY);
         h.define("system-prompt:build", () => {
             // The active frontend's surface goes right after the identity; omitted if none.
             const frontend = (this.handlers.call("system-prompt:frontend") ?? "").trim();
-            const parts = [STATIC_IDENTITY];
+            const parts = [this.handlers.call("system-prompt:identity")];
             if (frontend)
                 parts.push(frontend);
             parts.push(STATIC_GUIDE);
@@ -1229,8 +1230,10 @@ export class AgentLoop {
         let reasoning = "";
         const reasoningDetailsByIndex = new Map();
         const pendingToolCalls = [];
-        // Tool protocol controls what goes in the API tools param vs dynamic context
-        const toolView = this.getTools();
+        // Tool protocol controls what goes in the API tools param vs dynamic context.
+        // agent:tools:visible is a filter point on the assembled list — distinct from
+        // getTools(), which other code (e.g. tool bridges) needs unfiltered.
+        const toolView = this.bus.emitPipe("agent:tools:visible", { tools: this.getTools() }).tools;
         const apiTools = this.toolProtocol.getApiTools(toolView);
         const toolPrompt = this.toolProtocol.getToolPrompt(toolView);
         // Dynamic context rides on the trailing message — see
@@ -1242,7 +1245,7 @@ export class AgentLoop {
         // Let extensions transform the message array (compact, summarize, filter, etc.)
         const messages = this.handlers.call("conversation:prepare", rawMessages);
         // Stream filter strips tool tags from display (inline mode only)
-        const streamFilter = this.toolProtocol.createStreamFilter(this.getTools().map((t) => t.name));
+        const streamFilter = this.toolProtocol.createStreamFilter(toolView.map((t) => t.name));
         const requestParams = {
             messages,
             tools: apiTools,

package/dist/agent/events.d.ts

@@ -30,6 +30,10 @@ declare module "../core/event-bus.js" {
         "agent:tools": {
             tools: ToolDefinition[];
         };
+        /** Filter point: the assembled tool list as the model will see it, after getTools(). */
+        "agent:tools:visible": {
+            tools: ToolDefinition[];
+        };
         "agent:instructions": {
             instructions: Array<{
                 name: string;

package/examples/extensions/ashi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guanyilun/ashi",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Ash in an interactive TUI — agent-sh's built-in agent without the shell underneath",
   "type": "module",
   "main": "dist/cli.js",

package/examples/extensions/ashi/src/chat/tool-group.ts

@@ -44,8 +44,9 @@ export class ToolGroup {
     this.repaint();
   }
 
-  toggleExpanded(): void {
-    this.expanded = !this.expanded;
+  setExpanded(expanded: boolean): void {
+    if (this.expanded === expanded) return;
+    this.expanded = expanded;
     this.repaint();
   }
 

package/examples/extensions/ashi/src/cli.ts

@@ -6,7 +6,7 @@ import { createCore } from "agent-sh/core";
 import { loadBuiltinExtensions } from "agent-sh/extensions";
 import { loadExtensions } from "agent-sh/extension-loader";
 import { activateAgent } from "agent-sh/agent";
-import { getSettings } from "agent-sh/settings";
+import { getSettings, CONFIG_DIR } from "agent-sh/settings";
 import { Shell } from "agent-sh/shell";
 import { TerminalBuffer } from "agent-sh/utils/terminal-buffer";
 import type { Terminal } from "agent-sh/shell/terminal";
@@ -37,7 +37,6 @@ import { createPiTuiRenderer } from "./renderers/pi-tui/index.js";
 import type { Renderer } from "./renderer.js";
 import { loadRendererPreference } from "./display-config.js";
 import { applyOutputMode } from "./terminal-mode.js";
-import * as os from "node:os";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -150,7 +149,7 @@ async function main(): Promise<void> {
 
   const cwd = process.cwd();
   const cwdSlug = cwd.replace(/\//g, "-").replace(/^-/, "");
-  const sessionsDir = path.join(os.homedir(), ".agent-sh", "ashi", "history", cwdSlug, "sessions");
+  const sessionsDir = path.join(CONFIG_DIR, "ashi", "history", cwdSlug, "sessions");
   const resumeId = config.continueLast
     ? MultiSessionStore.readLastSessionId(sessionsDir, { fallbackToLatest: true })
     : undefined;
@@ -265,9 +264,10 @@ async function main(): Promise<void> {
   } else {
     // New-session only: skip on resume so a restored transcript isn't prefixed
     // with this. List user/installed extensions only — built-ins are always present.
-    const userExtensions = [...new Set(loaded)];
-    if (userExtensions.length > 0) {
-      ctx.bus.emit("ui:info", { message: `extensions: ${userExtensions.join(" · ")}` });
+    const all = [...new Set(loaded)];
+    const shown = (core.bus.emitPipe("ashi:startup-extensions", { names: all }).names ?? []) as string[];
+    if (shown.length > 0) {
+      ctx.bus.emit("ui:info", { message: `extensions: ${shown.join(" · ")}` });
     }
   }
 

package/examples/extensions/ashi/src/dialogs.ts

@@ -1,4 +1,4 @@
-import type { App, Renderer } from "./renderer.js";
+import type { App, Renderer, RenderNode } from "./renderer.js";
 import { InfoLine } from "./chat/lines.js";
 
 export interface SelectChoice {
@@ -9,9 +9,11 @@ export interface SelectChoice {
 export interface SelectOpts {
   title?: string;
   items: SelectChoice[];
+  body?: string[] | ((width: number) => string[]);
 }
 export interface ConfirmOpts {
   title: string;
+  body?: string[] | ((width: number) => string[]);
 }
 
 export interface DialogGuard {
@@ -28,6 +30,16 @@ export function createDialogs(app: App, renderer: Renderer, guard: DialogGuard):
   const select = (opts: SelectOpts): Promise<string | undefined> => {
     if (guard.isOpen() || opts.items.length === 0) return Promise.resolve(undefined);
     return new Promise((resolve) => {
+      let bodyNode: RenderNode | null = null;
+      if (typeof opts.body === "function") {
+        const t = renderer.text();
+        t.setRenderFn(opts.body);
+        bodyNode = t.node;
+      } else if (opts.body && opts.body.length) {
+        const t = renderer.text();
+        t.setLines(opts.body);
+        bodyNode = t.node;
+      }
       const hint = new InfoLine(renderer, opts.title ?? "↑↓ move · enter: select · esc: cancel");
       const picker = app.createSelectList(
         opts.items.map((c) => ({ value: c.value, label: c.label, description: c.description })),
@@ -40,6 +52,7 @@ export function createDialogs(app: App, renderer: Renderer, guard: DialogGuard):
         guard.setOpen(false);
         app.footerSlot.removeChild(picker.node);
         app.footerSlot.removeChild(hint.node);
+        if (bodyNode) app.footerSlot.removeChild(bodyNode);
         app.focusInput();
         app.requestRender();
         resolve(result);
@@ -47,6 +60,7 @@ export function createDialogs(app: App, renderer: Renderer, guard: DialogGuard):
       picker.onSelect((item) => close(item.value));
       picker.onCancel(() => close());
       guard.setOpen(true);
+      if (bodyNode) app.footerSlot.addChild(bodyNode);
       app.footerSlot.addChild(hint.node);
       app.footerSlot.addChild(picker.node);
       app.setFocus(picker.node);
@@ -57,6 +71,7 @@ export function createDialogs(app: App, renderer: Renderer, guard: DialogGuard):
   const confirm = (opts: ConfirmOpts): Promise<boolean> =>
     select({
       title: opts.title,
+      body: opts.body,
       items: [
         { value: "yes", label: "Yes" },
         { value: "no", label: "No" },

package/examples/extensions/ashi/src/events.ts

@@ -12,5 +12,6 @@ declare module "agent-sh/event-bus" {
     "ashi:dock:above-input": { nodes: RenderNodes; views: RenderNode[] };
     "ashi:dock:invalidate": Record<string, never>;
     "ashi:ready": Record<string, never>;
+    "ashi:startup-extensions": { names: string[] };
   }
 }

package/examples/extensions/ashi/src/frontend.ts

@@ -36,6 +36,7 @@ import type { Capture, NestedDiff } from "./capture.js";
 import { execSync } from "node:child_process";
 import { readClipboardImage } from "./clipboard-image.js";
 import { renderDiff, detectLanguage, highlightLine } from "agent-sh/utils/diff-renderer.js";
+import { computeDiff } from "agent-sh/utils/diff.js";
 import { renderBoxFrame } from "agent-sh/utils/box-frame.js";
 
 const GROUPABLE_KINDS = new Set(["read", "search"]);
@@ -217,6 +218,17 @@ export function mountAshi(
   const dialogs = createDialogs(app, renderer, modalGuard);
   ctx.define("ui:select", (opts: SelectOpts) => dialogs.select(opts));
   ctx.define("ui:confirm", (opts: ConfirmOpts) => dialogs.confirm(opts));
+  ctx.define(
+    "ui:diff",
+    (opts: { before?: string | null; after?: string; filePath?: string; boxed?: boolean }) => {
+      const diff = computeDiff(opts.before ?? null, opts.after ?? "");
+      return buildDiffRenderer(
+        diff as Parameters<typeof buildDiffRenderer>[0],
+        opts.filePath ?? "",
+        opts.boxed !== false,
+      );
+    },
+  );
   ctx.define("ui:input", (opts: InputOpts) => inputPrompt.prompt(opts));
   ctx.define("ui:editor:get-text", () => input.getText());
   ctx.define("ui:editor:set-text", (text: string) => { input.setText(text); });
@@ -325,6 +337,14 @@ export function mountAshi(
   const activeTools = new Map<string, LiveToolEntry>();
   const groupMaxVisible = loadGroupMaxVisible();
 
+  let allExpanded = false;
+  const makeGroup = (kind: string): ToolGroup => {
+    const g = new ToolGroup(renderer, kind, groupMaxVisible);
+    g.setExpanded(allExpanded);
+    appendEntry(g.node, { t: "group", group: g });
+    return g;
+  };
+
   let openGroup: ToolGroup | null = null;
   const sealOpenGroup = (): void => {
     if (openGroup) { openGroup.seal(); openGroup = null; }
@@ -464,6 +484,7 @@ export function mountAshi(
       kind: args.kind,
       rawInput: args.rawInput,
     });
+    result.setExpanded(allExpanded);
     return { call, result, startedAt: Date.now() };
   };
 
@@ -579,8 +600,7 @@ export function mountAshi(
           const kind = TOOL_KIND[name];
           if (kind && GROUPABLE_KINDS.has(kind) && renderer.mountToolGroup) {
             const mergeable = findMergeableGroup(kind);
-            const group = mergeable
-              ?? (() => { const g = new ToolGroup(renderer, kind, groupMaxVisible); appendEntry(g.node, { t: "group", group: g }); return g; })();
+            const group = mergeable ?? makeGroup(kind);
             group.addCall(id, name, detailFromArgs(tc.function.arguments));
             if (id) toolMap.set(id, { kind: "group", group, name });
             continue;
@@ -724,8 +744,7 @@ export function mountAshi(
     if (GROUPABLE_KINDS.has(kind) && renderer.mountToolGroup) {
       const mergeable = findMergeableGroup(kind);
       if (!mergeable) sealOpenGroup();
-      const group = mergeable
-        ?? (() => { const g = new ToolGroup(renderer, kind, groupMaxVisible); appendEntry(g.node, { t: "group", group: g }); return g; })();
+      const group = mergeable ?? makeGroup(kind);
       group.addCall(id, lookupName, detail);
       openGroup = group;
       activeTools.set(id, { kind: "group", group });
@@ -1242,9 +1261,10 @@ export function mountAshi(
       return { consume: true };
     }
     if (key.matches("ctrl+o")) {
+      allExpanded = !allExpanded;
       for (const e of chatEntries) {
-        if (e.t === "group") e.group.toggleExpanded();
-        else if (e.t === "pair") e.result.toggleExpanded();
+        if (e.t === "group") e.group.setExpanded(allExpanded);
+        else if (e.t === "pair") e.result.setExpanded(allExpanded);
       }
       app.requestRender();
       return { consume: true };

package/examples/extensions/ashi/src/renderer.ts

@@ -133,7 +133,7 @@ export interface App {
 export interface ToolCallView {
   node: RenderNode;
   setStatus(opts: { exitCode: number | null; elapsedMs: number; summary?: string }): void;
-  toggleExpanded?(): void;
+  setExpanded?(expanded: boolean): void;
 }
 
 export interface ToolResultView {
@@ -142,7 +142,7 @@ export interface ToolResultView {
   /** Width-aware diff closure produced by the edit/write tool at finalize. */
   setDiffRenderer(fn: (width: number) => string[]): void;
   finalize(opts: { exitCode: number | null; summary?: string }): void;
-  toggleExpanded(): void;
+  setExpanded(expanded: boolean): void;
 }
 
 export interface ToolGroupChild {

package/examples/extensions/ashi/src/renderers/pi-tui/schema-mount.ts

@@ -136,8 +136,9 @@ class SchemaResultComponent extends Container {
     this.handle.dispatch("status", { ...opts, elapsedMs: 0 });
     HANDLES.delete(this.handle.toolCallId);
   }
-  toggleExpanded(): void {
-    this.handle.cell.env = { ...this.handle.cell.env, expanded: !this.handle.cell.env.expanded };
+  setExpanded(expanded: boolean): void {
+    if (this.handle.cell.env.expanded === expanded) return;
+    this.handle.cell.env = { ...this.handle.cell.env, expanded };
     this.repaint();
     this.handle.cell.callView?.repaint();
   }
@@ -198,6 +199,6 @@ export function mountResult<S>(model: RenderModel<S>, args: MountArgs, env: Moun
     appendChunk: (chunk) => comp.appendChunk(chunk),
     setDiffRenderer: (fn) => comp.setDiffRenderer(fn),
     finalize: (opts) => comp.finalize(opts),
-    toggleExpanded: () => comp.toggleExpanded(),
+    setExpanded: (expanded) => comp.setExpanded(expanded),
   };
 }

package/examples/extensions/ashi/src/ui.ts

@@ -10,6 +10,13 @@ export type { StatusSegment } from "./status-footer.js";
 
 export type NoticeLevel = "info" | "warn" | "error" | "success";
 
+export interface DiffOpts {
+  before?: string | null;
+  after?: string;
+  filePath?: string;
+  boxed?: boolean;
+}
+
 export interface Contribution {
   /** Re-pull this surface (call after the content it depends on changes). */
   refresh(): void;
@@ -26,6 +33,7 @@ export interface Ui {
   notify(message: string, level?: NoticeLevel): void;
   select(opts: SelectOpts): Promise<string | undefined>;
   confirm(opts: ConfirmOpts): Promise<boolean>;
+  diff(opts: DiffOpts): (width: number) => string[];
   input(opts?: InputOpts): Promise<string | undefined>;
   getEditorText(): string;
   setEditorText(text: string): void;
@@ -50,6 +58,9 @@ export function createUi(ctx: ExtensionContext): Ui {
       if (!has("ui:confirm")) return Promise.resolve(false);
       return ctx.call("ui:confirm", opts) as Promise<boolean>;
     },
+    diff(opts) {
+      return has("ui:diff") ? (ctx.call("ui:diff", opts) as (width: number) => string[]) : (() => []);
+    },
     input(opts = {}) {
       if (!has("ui:input")) return Promise.resolve(undefined);
       return ctx.call("ui:input", opts) as Promise<string | undefined>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-sh",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "A composable agent runtime — pair any frontend with any agent backend over one shared extension layer",
   "type": "module",
   "workspaces": [

package/src/agent/agent-loop.ts

@@ -623,14 +623,15 @@ export class AgentLoop implements AgentBackend {
       streamedCalls: ProtocolPendingToolCall[];
     }) => this.toolProtocol.extractToolCalls(args.text, args.streamedCalls));
 
-    // System prompt: static identity + behavioral instructions.
-    // Extensions can use registerInstruction() for a managed section,
-    // advise system-prompt:frontend to describe their surface high in the
-    // prompt, or advise this handler directly for full control.
+    // System prompt: static identity + behavioral instructions. Extensions can
+    // use registerInstruction() for a managed section, advise system-prompt:identity
+    // to replace the kernel identity, advise system-prompt:frontend to describe their
+    // surface high in the prompt, or advise system-prompt:build directly for full control.
+    h.define("system-prompt:identity", () => STATIC_IDENTITY);
     h.define("system-prompt:build", () => {
       // The active frontend's surface goes right after the identity; omitted if none.
       const frontend = ((this.handlers.call("system-prompt:frontend") as string) ?? "").trim();
-      const parts: string[] = [STATIC_IDENTITY];
+      const parts: string[] = [this.handlers.call("system-prompt:identity") as string];
       if (frontend) parts.push(frontend);
       parts.push(STATIC_GUIDE);
 
@@ -1410,8 +1411,10 @@ export class AgentLoop implements AgentBackend {
     const reasoningDetailsByIndex = new Map<number, Record<string, unknown>>();
     const pendingToolCalls: PendingToolCall[] = [];
 
-    // Tool protocol controls what goes in the API tools param vs dynamic context
-    const toolView = this.getTools();
+    // Tool protocol controls what goes in the API tools param vs dynamic context.
+    // agent:tools:visible is a filter point on the assembled list — distinct from
+    // getTools(), which other code (e.g. tool bridges) needs unfiltered.
+    const toolView = this.bus.emitPipe("agent:tools:visible", { tools: this.getTools() }).tools;
     const apiTools = this.toolProtocol.getApiTools(toolView);
     const toolPrompt = this.toolProtocol.getToolPrompt(toolView);
 
@@ -1427,7 +1430,7 @@ export class AgentLoop implements AgentBackend {
 
     // Stream filter strips tool tags from display (inline mode only)
     const streamFilter = this.toolProtocol.createStreamFilter(
-      this.getTools().map((t) => t.name),
+      toolView.map((t) => t.name),
     );
 
     const requestParams = {

package/src/agent/events.ts

@@ -29,6 +29,8 @@ declare module "../core/event-bus.js" {
 
     "agent:info": AgentIdentity;
     "agent:tools": { tools: ToolDefinition[] };
+    /** Filter point: the assembled tool list as the model will see it, after getTools(). */
+    "agent:tools:visible": { tools: ToolDefinition[] };
     "agent:instructions": { instructions: Array<{ name: string; text: string }> };
     "agent:skills": { skills: Array<{ name: string; description: string; filePath: string }> };