agent-sh 0.14.1 → 0.14.3

package/examples/extensions/ashi/src/session-store.ts

@@ -39,12 +39,30 @@ export interface CompactionEntry {
   id: string;
   parentId: string;
   timestamp: number;
-  summary: string;
+  summary?: string;
   firstKeptId: string;
   tokensBefore: number;
 }
 
-export type SessionEntry = SessionHeaderEntry | MessageEntry | CompactionEntry;
+/** Omitted from buildMessages — the agent already saw it via <shell_events>
+ *  (or didn't, if private). The frontend replays it for scrollback fidelity. */
+export interface ShellExchangeEntry {
+  type: "shell-exchange";
+  id: string;
+  parentId: string;
+  timestamp: number;
+  command: string;
+  output: string;
+  exitCode: number | null;
+  cwd?: string;
+  private?: boolean;
+}
+
+export type SessionEntry =
+  | SessionHeaderEntry
+  | MessageEntry
+  | CompactionEntry
+  | ShellExchangeEntry;
 
 export interface SessionMeta {
   name?: string;
@@ -55,8 +73,63 @@ export function newEntryId(): string {
   return crypto.randomBytes(4).toString("hex");
 }
 
-/** One session = one JSONL file (entries) + sidecar files for leaf & meta.
- *  Tree is implicit via parentId pointers; entries kept in memory after load. */
+function extractText(content: unknown): string {
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) {
+    return content.map((p) => {
+      if (typeof p === "string") return p;
+      const part = p as { text?: string; content?: string };
+      return part?.text ?? part?.content ?? "";
+    }).join(" ");
+  }
+  return "";
+}
+
+function snippet(text: string, max: number): string {
+  const cleaned = String(text ?? "").replace(/\s+/g, " ").trim();
+  if (cleaned.length <= max) return cleaned || "(empty)";
+  return cleaned.slice(0, max) + "…";
+}
+
+export function summarizeMessage(m: AgentMessage): string {
+  const role = m.role ?? "?";
+  if (role === "assistant" && Array.isArray(m.tool_calls) && m.tool_calls.length > 0) {
+    const tools = m.tool_calls.map((tc) => {
+      const name = tc.function?.name ?? "tool";
+      const args = tc.function?.arguments;
+      return args ? `${name}(${snippet(args, 200)})` : name;
+    }).join(", ");
+    const text = extractText(m.content);
+    const prefix = text ? `${snippet(text, 400)} → ` : "";
+    return `assistant: ${prefix}called ${tools}`;
+  }
+  if (role === "tool") {
+    const text = typeof m.content === "string" ? m.content : extractText(m.content);
+    const isErr = /^error\b|: error\b/i.test(text.slice(0, 200));
+    return `tool result: ${snippet(text, isErr ? 1000 : 400)}`;
+  }
+  if (role === "user") {
+    return `user: ${snippet(extractText(m.content), 1000)}`;
+  }
+  return `${role}: ${snippet(extractText(m.content), 500)}`;
+}
+
+/** For displayed user text. Loops because both wrappers can stack at the head. */
+export function stripContextWrappers(content: string): string {
+  let out = content;
+  for (;;) {
+    const next = out.replace(/^\s*<(query_context|dynamic_context)>[\s\S]*?<\/\1>\s*/, "");
+    if (next === out) return out;
+    out = next;
+  }
+}
+
+export function renderEvictedSummary(evicted: AgentMessage[]): string {
+  const lines = evicted.map((m) => `- ${summarizeMessage(m)}`);
+  return `${lines.length} message(s) elided\n${lines.join("\n")}`;
+}
+
+/** Tree is implicit via parentId pointers; entries are kept in memory after load. */
 export class SessionStore {
   private entriesPath: string;
   private leafPath: string;
@@ -124,9 +197,6 @@ export class SessionStore {
     this.persistMeta();
   }
 
-  /** Append messages as a chain of MessageEntry, each parented at the
-   *  previously appended id (starting from current leaf). Returns the new
-   *  entry ids in order. */
   async appendMessages(messages: AgentMessage[]): Promise<string[]> {
     if (messages.length === 0) return [];
     this.flushHeader();
@@ -152,7 +222,33 @@ export class SessionStore {
     return newIds;
   }
 
-  async appendCompaction(summary: string, firstKeptId: string, tokensBefore: number): Promise<string> {
+  async appendShellExchange(e: {
+    command: string;
+    output: string;
+    exitCode: number | null;
+    cwd?: string;
+    private?: boolean;
+  }): Promise<string> {
+    this.flushHeader();
+    const entry: ShellExchangeEntry = {
+      type: "shell-exchange",
+      id: newEntryId(),
+      parentId: this.activeLeaf,
+      timestamp: Date.now(),
+      command: e.command,
+      output: e.output,
+      exitCode: e.exitCode,
+      ...(e.cwd !== undefined ? { cwd: e.cwd } : {}),
+      ...(e.private ? { private: true } : {}),
+    };
+    this.entries.set(entry.id, entry);
+    this.activeLeaf = entry.id;
+    await fsp.appendFile(this.entriesPath, JSON.stringify(entry) + "\n");
+    this.persistLeaf();
+    return entry.id;
+  }
+
+  async appendCompaction(firstKeptId: string, tokensBefore: number, summary?: string): Promise<string> {
     if (!this.entries.has(firstKeptId)) throw new Error(`firstKeptId unknown: ${firstKeptId}`);
     this.flushHeader();
     const e: CompactionEntry = {
@@ -160,9 +256,9 @@ export class SessionStore {
       id: newEntryId(),
       parentId: this.activeLeaf,
       timestamp: Date.now(),
-      summary,
       firstKeptId,
       tokensBefore,
+      ...(summary !== undefined ? { summary } : {}),
     };
     this.entries.set(e.id, e);
     this.activeLeaf = e.id;
@@ -171,7 +267,7 @@ export class SessionStore {
     return e.id;
   }
 
-  /** Walk parent pointers from a leaf back to the root. Returns oldest-first. */
+  /** Oldest-first walk from leaf to root. */
   getBranch(leafId: string = this.activeLeaf): SessionEntry[] {
     const out: SessionEntry[] = [];
     const seen = new Set<string>();
@@ -186,9 +282,7 @@ export class SessionStore {
     return out.reverse();
   }
 
-  /** Reconstruct the live message array for the active leaf, honoring the
-   *  latest compaction on the branch (summary + kept tail). Mirrors pi's
-   *  buildSessionContext. */
+  /** Honors the latest compaction on the branch (summary + kept tail). */
   buildMessages(leafId: string = this.activeLeaf): AgentMessage[] {
     const branch = this.getBranch(leafId);
     let compactionIdx = -1;
@@ -203,9 +297,14 @@ export class SessionStore {
     const c = branch[compactionIdx] as CompactionEntry;
     const firstKeptIdx = branch.findIndex((e) => e.id === c.firstKeptId);
     const keepFrom = firstKeptIdx >= 0 ? firstKeptIdx : 0;
+    const summary = c.summary ?? renderEvictedSummary(
+      branch.slice(0, keepFrom)
+        .filter((e): e is MessageEntry => e.type === "message")
+        .map((e) => e.message),
+    );
     const out: AgentMessage[] = [{
       role: "user",
-      content: `[Compacted conversation summary]\n${c.summary}`,
+      content: `[Compacted conversation summary]\n${summary}`,
     }];
     for (let i = keepFrom; i < branch.length; i++) {
       const e = branch[i]!;
@@ -214,12 +313,11 @@ export class SessionStore {
     return out;
   }
 
-  /** A short, human-friendly preview for picker rows. Uses the first user
-   *  message's text when available, else the session id. */
   getPreview(): string {
     for (const e of this.entries.values()) {
       if (e.type === "message" && e.message.role === "user") {
-        const txt = typeof e.message.content === "string" ? e.message.content : "";
+        const raw = typeof e.message.content === "string" ? e.message.content : "";
+        const txt = stripContextWrappers(raw);
         if (txt) return txt.slice(0, 80);
       }
     }

package/examples/extensions/ashi/src/shell-mode.ts

@@ -0,0 +1,52 @@
+export interface ChangeHandlerResult {
+  mode: boolean;
+  /** When set, caller must `editor.setText(replaceText)` to strip the `!`. */
+  replaceText?: string;
+  /** Whether the next submit (if in shell mode) is marked private. */
+  pendingPrivate: boolean;
+}
+
+/** Strips `!` (entry), `!!` (entry + private), in-mode `!` (upgrade to private).
+ *  Shell mode is sticky — exit only via the Backspace-on-empty intercept;
+ *  auto-exit on empty text would fire during pi-tui's pre-emptive onChange("")
+ *  inside Editor.submitValue() and misroute the submit. pendingPrivate is
+ *  sticky for the same reason. */
+export function deriveChangeHandlerResult(
+  mode: boolean,
+  pendingPrivate: boolean,
+  text: string,
+): ChangeHandlerResult {
+  if (!mode && text.startsWith("!!")) {
+    return { mode: true, replaceText: text.slice(2), pendingPrivate: true };
+  }
+  if (!mode && text.startsWith("!")) {
+    return { mode: true, replaceText: text.slice(1), pendingPrivate: false };
+  }
+  if (mode && text.startsWith("!")) {
+    return { mode: true, replaceText: text.slice(1), pendingPrivate: true };
+  }
+  return { mode, pendingPrivate: pendingPrivate && mode };
+}
+
+export type SubmitAction =
+  | { kind: "noop" }
+  | { kind: "shell"; line: string; private: boolean }
+  | { kind: "command"; name: string; args: string }
+  | { kind: "agent"; query: string };
+
+export function classifySubmit(
+  text: string,
+  shellMode: boolean,
+  pendingPrivate: boolean,
+): SubmitAction {
+  const query = text.trim();
+  if (!query) return { kind: "noop" };
+  if (shellMode) return { kind: "shell", line: query, private: pendingPrivate };
+  if (query.startsWith("/")) {
+    const sp = query.indexOf(" ");
+    const name = sp === -1 ? query : query.slice(0, sp);
+    const args = sp === -1 ? "" : query.slice(sp + 1).trim();
+    return { kind: "command", name, args };
+  }
+  return { kind: "agent", query };
+}

package/examples/extensions/ashi/src/status-footer.ts

@@ -1,4 +1,5 @@
-import { Container, Text } from "@earendil-works/pi-tui";
+import { basename } from "node:path";
+import { Container, Text, visibleWidth } from "@earendil-works/pi-tui";
 import { theme } from "./theme.js";
 
 interface StatusFields {
@@ -11,11 +12,13 @@ interface StatusFields {
   tokens?: number;
   compactions?: number;
   thinking?: string;
+  shellMode?: "off" | "on" | "private";
 }
 
 export class StatusFooter extends Container {
   private text: Text;
   private fields: StatusFields = {};
+  private lastWidth = 0;
 
   constructor() {
     super();
@@ -25,10 +28,41 @@ export class StatusFooter extends Container {
 
   update(patch: Partial<StatusFields>): void {
     this.fields = { ...this.fields, ...patch };
-    this.repaint();
+    this.repaint(this.lastWidth);
   }
 
-  private repaint(): void {
+  render(width: number): string[] {
+    if (width !== this.lastWidth) {
+      this.lastWidth = width;
+      this.repaint(width);
+    }
+    return super.render(width);
+  }
+
+  private repaint(width: number): void {
+    const contentWidth = width > 0 ? Math.max(1, width - 2) : 0;
+    const right = this.buildRight();
+    const rightWidth = visibleWidth(right);
+    const join = (left: string): string => {
+      if (!right) return left;
+      const leftWidth = visibleWidth(left);
+      const gap = Math.max(1, contentWidth - leftWidth - rightWidth);
+      return `${left}${" ".repeat(gap)}${right}`;
+    };
+    const full = this.buildLine("full");
+    const fullFits = contentWidth === 0
+      || visibleWidth(full) + (right ? rightWidth + 1 : 0) <= contentWidth;
+    this.text.setText(fullFits ? join(full) : join(this.buildLine("basename")));
+  }
+
+  private buildRight(): string {
+    const mode = this.fields.shellMode;
+    if (mode === "on") return theme.fg("bashMode", "▸ shell");
+    if (mode === "private") return theme.fg("bashModePrivate", "▸ shell · private");
+    return "";
+  }
+
+  private buildLine(cwdMode: "full" | "basename"): string {
     const { model, provider, contextWindow, cwd, branch, leaf, tokens, compactions, thinking } = this.fields;
     const sep = theme.fg("dim", " | ");
     const parts: string[] = [];
@@ -39,7 +73,7 @@ export class StatusFooter extends Container {
     } else if (provider) {
       parts.push(theme.fg("muted", `@${provider}`));
     }
-    if (cwd) parts.push(theme.fg("muted", shortenCwd(cwd)));
+    if (cwd) parts.push(theme.fg("muted", formatCwd(cwd, cwdMode)));
     if (branch) parts.push(theme.fg("muted", `⎇ ${branch}`));
     if (leaf != null && leaf > 0) parts.push(theme.fg("muted", `#${leaf}`));
     if (tokens != null) {
@@ -48,11 +82,12 @@ export class StatusFooter extends Container {
       parts.push(`${theme.fg("muted", tokStr)}${pct}`);
     }
     if (compactions && compactions > 0) parts.push(theme.fg("muted", `⊟ ${compactions}`));
-    this.text.setText(parts.length === 0 ? "" : parts.join(sep));
+    return parts.length === 0 ? "" : parts.join(sep);
   }
 }
 
-function shortenCwd(cwd: string): string {
+function formatCwd(cwd: string, mode: "full" | "basename"): string {
+  if (mode === "basename") return basename(cwd) || cwd;
   const home = process.env.HOME;
   if (home && cwd.startsWith(`${home}/`)) return `~/${cwd.slice(home.length + 1)}`;
   if (home && cwd === home) return "~";

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

@@ -53,7 +53,8 @@ const RAW = {
   toolDiffAdded: "green",
   toolDiffRemoved: "red",
   toolDiffContext: "gray",
-  bashMode: "green",
+  bashMode: "yellow",
+  bashModePrivate: "green",
 } as const;
 
 export type ThemeColor = keyof typeof RAW;

package/examples/extensions/ashi-compact-llm.ts

@@ -0,0 +1,93 @@
+/**
+ * Replaces ashi's default deterministic compaction summary with an
+ * LLM-generated structured one. Advises `ashi:compact:build-summary`;
+ * orchestration stays in ashi. Falls back to deterministic when the LLM
+ * is unavailable or the call fails.
+ */
+import type { AgentContext } from "agent-sh/types";
+
+interface AgentMessage {
+  role: "system" | "user" | "assistant" | "tool";
+  content?: unknown;
+  tool_calls?: { function?: { name?: string; arguments?: string } }[];
+}
+
+const SUMMARY_PROMPT = `You are compacting a coding-agent conversation so the agent can continue with limited context.
+
+Produce a Markdown summary using EXACTLY this structure:
+
+## Goal
+[What the user is trying to accomplish, one or two sentences]
+
+## Constraints & Preferences
+- [Bulleted user requirements / preferences expressed so far]
+
+## Progress
+### Done
+- [x] [Completed work]
+
+### In Progress
+- [ ] [Active work and current sub-goal]
+
+### Blocked
+- [Issues, or "None"]
+
+## Key Decisions
+- **[Decision]**: [Rationale]
+
+## Next Steps
+1. [What should happen next]
+
+## Critical Context
+- [Specific paths, names, identifiers, or data the agent must remember]
+
+Be concrete. Quote file paths, function names, error strings verbatim when relevant. Do not invent details that aren't in the conversation.`;
+
+export default function activate(ctx: AgentContext): void {
+  ctx.advise(
+    "ashi:compact:build-summary",
+    async (next: (...a: unknown[]) => unknown, evicted: AgentMessage[]) => {
+      const llm = ctx.agent?.llm;
+      if (!llm?.available) return next(evicted);
+      try {
+        const summary = await llm.ask({
+          system: SUMMARY_PROMPT,
+          query: buildQuery(evicted),
+          maxTokens: 16384,
+          reasoningEffort: "low",
+        });
+        return summary.trim();
+      } catch (e) {
+        ctx.bus.emit("ui:error", {
+          message: `ashi-compact-llm: LLM failed (${(e as Error).message}); falling back to deterministic summary`,
+        });
+        return next(evicted);
+      }
+    },
+  );
+}
+
+function buildQuery(messages: AgentMessage[]): string {
+  const lines: string[] = ["Conversation to summarize:"];
+  for (const m of messages) {
+    const text = typeof m.content === "string" ? m.content : "";
+    if (m.role === "user") lines.push(`[User]: ${text}`);
+    else if (m.role === "assistant") {
+      if (text) lines.push(`[Assistant]: ${text}`);
+      if (m.tool_calls) {
+        for (const t of m.tool_calls) {
+          const args = t.function?.arguments ?? "";
+          lines.push(`[Assistant tool call]: ${t.function?.name ?? "?"}(${truncate(args, 400)})`);
+        }
+      }
+    } else if (m.role === "tool") {
+      lines.push(`[Tool result]: ${truncate(text, 2000)}`);
+    }
+  }
+  return lines.join("\n");
+}
+
+function truncate(s: string, max: number): string {
+  if (s.length <= max) return s;
+  return s.slice(0, max) + `\n[…truncated ${s.length - max} chars…]`;
+}

package/examples/extensions/claude-code-bridge/index.ts

@@ -140,6 +140,7 @@ export default function activate(ctx: ExtensionContext): void {
                   const kind = toolKind(meta.name);
                   bus.emit("agent:tool-started", {
                     title: meta.name,
+                    name: meta.name,
                     toolCallId: meta.id,
                     kind,
                     icon: toolIcon(meta.name),
@@ -176,6 +177,7 @@ export default function activate(ctx: ExtensionContext): void {
                   const kind = toolKind(b.name);
                   bus.emit("agent:tool-started", {
                     title: b.name,
+                    name: b.name,
                     toolCallId: b.id,
                     kind,
                     icon: toolIcon(b.name),

package/examples/extensions/opencode-bridge/index.ts

@@ -147,6 +147,7 @@ export default function activate(ctx: ExtensionContext): void {
       announcedTools.add(callID);
       bus.emit("agent:tool-started", {
         title: toolName,
+        name: toolName,
         toolCallId: callID,
         kind,
         locations: toolLocations(state.input ?? {}),
@@ -290,6 +291,7 @@ export default function activate(ctx: ExtensionContext): void {
               : req.questions.map((q, i) => `${q.header || `Q${i + 1}`}: ${q.question}`).join("; ");
             bus.emit("agent:tool-started", {
               title: "question",
+              name: "question",
               toolCallId: callID,
               kind: "execute",
               displayDetail: detail,
@@ -355,6 +357,7 @@ export default function activate(ctx: ExtensionContext): void {
             const summary = opts?.note ? `denied (${opts.note})` : `denied: ${detail}`;
             bus.emit("agent:tool-started", {
               title: "permission",
+              name: "permission",
               toolCallId: callID,
               kind: "execute",
               displayDetail: detail,