agent-sh 0.14.1 → 0.14.2

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,

package/examples/extensions/opencode-provider.ts

@@ -0,0 +1,252 @@
+/**
+ * opencode-provider — OpenCode Zen & Go LLM providers for agent-sh
+ *
+ * Registers two providers with runtime model discovery:
+ *   - opencode     — Zen tier (https://opencode.ai/zen/v1)
+ *   - opencode-go  — Go tier  (https://opencode.ai/zen/go/v1)
+ *
+ * Both are OpenAI-compatible endpoints. OpenCode's backend proxies
+ * all models (OpenAI, Anthropic, Google, etc.) through them — no
+ * per-model transport routing needed at the agent-sh level.
+ *
+ * ## Setup
+ *   export OPENCODE_***REDACTED***
+ *   agent-sh -e ./examples/extensions/opencode-provider.ts
+ *
+ *   # Or add to settings.json:
+ *   { "extensions": ["./examples/extensions/opencode-provider.ts"] }
+ *
+ *   # Or store via auth:
+ *   agent-sh auth login opencode
+ *
+ * ## Model discovery
+ * On startup the extension:
+ *   1. Fetches official /models endpoints (authoritative model list)
+ *   2. Merges metadata from models.dev (context windows, reasoning flags)
+ *   3. Falls back to models.dev membership → conservative defaults
+ *
+ * Usage:
+ *   /model          — tab-completes all discovered models
+ *   /provider       — switch between opencode / opencode-go
+ */
+
+import type { AgentContext } from "agent-sh/types";
+import { resolveApiKey } from "agent-sh/auth";
+
+// ── Constants ──────────────────────────────────────────────────────
+
+const ZEN_BASE_URL = "https://opencode.ai/zen/v1";
+const GO_BASE_URL = "https://opencode.ai/zen/go/v1";
+const ZEN_MODELS_ENDPOINT = `${ZEN_BASE_URL}/models`;
+const GO_MODELS_ENDPOINT = `${GO_BASE_URL}/models`;
+const MODELS_DEV_ENDPOINT = "https://models.dev/api.json";
+
+/** Conservative defaults when models.dev metadata is unavailable. */
+const DEFAULT_CONTEXT_WINDOW = 128_000;
+const DEFAULT_MAX_TOKENS = 16_384;
+
+// ── Fallback model lists (curated; kept in sync with OpenCode docs) ──
+
+// Single fallback model per tier — the live /models catalog replaces these on startup.
+const ZEN_FALLBACK_MODELS = ["claude-sonnet-4-6"];
+
+const GO_FALLBACK_MODELS = ["gpt-5.2"];
+
+// ── Types ───────────────────────────────────────────────────────────
+
+interface ModelsDevLimit {
+  context?: number;
+  output?: number;
+}
+
+interface ModelsDevModelEntry {
+  id?: string;
+  name?: string;
+  reasoning?: boolean;
+  limit?: ModelsDevLimit;
+  modalities?: { input?: readonly string[] };
+}
+
+interface ModelsDevProviderEntry {
+  models?: Record<string, ModelsDevModelEntry>;
+}
+
+type ModelsDevResponse = Record<string, ModelsDevProviderEntry>;
+
+interface OpenCodeModelListEntry {
+  id?: string;
+}
+
+interface OpenCodeModelListResponse {
+  data?: OpenCodeModelListEntry[];
+}
+
+interface ModelDef {
+  id: string;
+  reasoning: boolean;
+  contextWindow: number;
+  maxTokens: number;
+  modalities: ("text" | "image")[];
+}
+
+// ── Helpers ─────────────────────────────────────────────────────────
+
+async function fetchJson<T>(url: string): Promise<T> {
+  const res = await fetch(url, {
+    headers: { Accept: "application/json" },
+    signal: AbortSignal.timeout(15_000),
+  });
+  if (!res.ok) {
+    throw new Error(`HTTP ${res.status} from ${url}`);
+  }
+  return res.json() as T;
+}
+
+function normalizePosNum(v: unknown): number | undefined {
+  return typeof v === "number" && Number.isFinite(v) && v > 0 ? v : undefined;
+}
+
+// ── models.dev ──────────────────────────────────────────────────────
+
+async function fetchModelsDev(): Promise<ModelsDevResponse | undefined> {
+  try {
+    const payload = await fetchJson<ModelsDevResponse>(MODELS_DEV_ENDPOINT);
+    if (!payload || typeof payload !== "object" || Array.isArray(payload)) return undefined;
+    return payload;
+  } catch {
+    return undefined;
+  }
+}
+
+function getModelsDevModel(
+  provider: ModelsDevProviderEntry | undefined,
+  modelId: string,
+): ModelsDevModelEntry | undefined {
+  const direct = provider?.models?.[modelId];
+  if (direct) return direct;
+  if (!provider?.models) return undefined;
+  for (const m of Object.values(provider.models)) {
+    if (m.id === modelId) return m;
+  }
+  return undefined;
+}
+
+// ── Official /models ────────────────────────────────────────────────
+
+async function fetchOfficialModelIds(url: string): Promise<string[]> {
+  try {
+    const payload = await fetchJson<OpenCodeModelListResponse>(url);
+    if (!Array.isArray(payload.data)) throw new Error("Unexpected format");
+    const ids = new Set<string>();
+    for (const entry of payload.data) {
+      if (typeof entry.id === "string" && entry.id.trim()) {
+        ids.add(entry.id.trim());
+      }
+    }
+    return Array.from(ids);
+  } catch {
+    return [];
+  }
+}
+
+// ── Merge ───────────────────────────────────────────────────────────
+
+function resolveModel(
+  modelId: string,
+  metadata: ModelsDevModelEntry | undefined,
+): ModelDef {
+  const rawModalities = metadata?.modalities?.input;
+  const modalities: ("text" | "image")[] = Array.isArray(rawModalities)
+    ? rawModalities.filter((v): v is "text" | "image" => v === "text" || v === "image")
+    : ["text"];
+  return {
+    id: modelId,
+    reasoning: metadata?.reasoning ?? false,
+    contextWindow: normalizePosNum(metadata?.limit?.context) ?? DEFAULT_CONTEXT_WINDOW,
+    maxTokens: normalizePosNum(metadata?.limit?.output) ?? DEFAULT_MAX_TOKENS,
+    modalities,
+  };
+}
+
+// ── Reasoning params (OpenAI-compatible) ────────────────────────────
+
+function buildReasoningParams(level: string): Record<string, unknown> {
+  if (level === "off") return {};
+  return { reasoning_effort: level === "xhigh" ? "high" : level };
+}
+
+// ── Activation ──────────────────────────────────────────────────────
+
+export default function activate(ctx: AgentContext): void {
+  const apiKey =
+    process.env.OPENCODE_API_KEY ??
+    resolveApiKey("opencode").key ?? undefined;
+
+  // ── Phase 1: register both providers synchronously with fallback models ──
+
+  ctx.agent.providers.configure("opencode", { reasoningParams: buildReasoningParams });
+  ctx.agent.providers.register({
+    id: "opencode",
+    apiKey,
+    baseURL: ZEN_BASE_URL,
+    defaultModel: ZEN_FALLBACK_MODELS[0],
+    models: ZEN_FALLBACK_MODELS,
+    supportsReasoningEffort: true,
+  });
+
+  ctx.agent.providers.configure("opencode-go", { reasoningParams: buildReasoningParams });
+  ctx.agent.providers.register({
+    id: "opencode-go",
+    apiKey,
+    baseURL: GO_BASE_URL,
+    defaultModel: GO_FALLBACK_MODELS[0],
+    models: GO_FALLBACK_MODELS,
+    supportsReasoningEffort: true,
+  });
+
+  if (!apiKey) return;
+
+  // ── Phase 2: fetch live catalogs and re-register with enriched metadata ──
+
+  fetchModelsDev()
+    .then(async (modelsDev) => {
+      const zenProvider = modelsDev?.opencode;
+      const goProvider = modelsDev?.["opencode-go"];
+
+      const [zenIds, goIds] = await Promise.all([
+        fetchOfficialModelIds(ZEN_MODELS_ENDPOINT),
+        fetchOfficialModelIds(GO_MODELS_ENDPOINT),
+      ]);
+
+      const resolveModels = (
+        ids: string[],
+        provider: ModelsDevProviderEntry | undefined,
+        fallback: string[],
+      ): ModelDef[] => {
+        const source = ids.length > 0 ? ids : fallback;
+        return source.map((id) => resolveModel(id, getModelsDevModel(provider, id)));
+      };
+
+      const zenModels = resolveModels(zenIds, zenProvider, ZEN_FALLBACK_MODELS);
+      const goModels = resolveModels(goIds, goProvider, GO_FALLBACK_MODELS);
+
+      ctx.agent.providers.register({
+        id: "opencode",
+        apiKey,
+        baseURL: ZEN_BASE_URL,
+        defaultModel: zenModels[0]?.id ?? ZEN_FALLBACK_MODELS[0],
+        models: zenModels,
+        supportsReasoningEffort: true,
+      });
+
+      ctx.agent.providers.register({
+        id: "opencode-go",
+        apiKey,
+        baseURL: GO_BASE_URL,
+        defaultModel: goModels[0]?.id ?? GO_FALLBACK_MODELS[0],
+        models: goModels,
+        supportsReasoningEffort: true,
+      });
+    })
+    .catch(() => {});
+}

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

@@ -206,6 +206,7 @@ export default function activate(ctx: ExtensionContext): void {
             }
             bus.emit("agent:tool-started", {
               title: ev.toolName,
+              name: ev.toolName,
               toolCallId: ev.toolCallId,
               kind: kindForTool(ev.toolName),
               rawInput: ev.args,

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "agent-sh",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "description": "A shell-first terminal where AI is one keystroke away",
   "type": "module",
+  "workspaces": [
+    "examples/extensions/*"
+  ],
   "main": "dist/core/index.js",
   "types": "dist/core/index.d.ts",
   "bin": {
@@ -38,6 +41,14 @@
       "types": "./dist/shell/shell.d.ts",
       "default": "./dist/shell/shell.js"
     },
+    "./shell/strategies": {
+      "types": "./dist/shell/strategies/index.d.ts",
+      "default": "./dist/shell/strategies/index.js"
+    },
+    "./shell/terminal": {
+      "types": "./dist/shell/terminal.d.ts",
+      "default": "./dist/shell/terminal.js"
+    },
     "./utils/stream-transform": {
       "types": "./dist/utils/stream-transform.d.ts",
       "default": "./dist/utils/stream-transform.js"

package/examples/extensions/ashi/src/default-renderers.ts

@@ -1,171 +0,0 @@
-import { Container, Spacer, Text } from "@earendil-works/pi-tui";
-import type { ExtensionContext } from "agent-sh/types";
-import { theme } from "./theme.js";
-import { GROUP_ICONS } from "./components.js";
-import type { ToolCallArgs, ToolCallView } from "./hooks.js";
-
-const TOOL_ICON: Record<string, string> = {
-  read_file: GROUP_ICONS.read!,
-  read: GROUP_ICONS.read!,
-  ls: GROUP_ICONS.read!,
-  grep: GROUP_ICONS.search!,
-  glob: GROUP_ICONS.search!,
-  edit: "✎",
-  edit_file: "✎",
-  write: "✎",
-  write_file: "✎",
-};
-
-function iconPrefix(name: string): string {
-  const icon = TOOL_ICON[name] ?? "⚙";
-  return `${theme.fg("warning", icon)} `;
-}
-
-interface StatusOpts { exitCode: number | null; elapsedMs: number; summary?: string }
-
-function fmtElapsed(ms: number): string {
-  if (ms < 1000) return `${ms}ms`;
-  if (ms < 10_000) return `${(ms / 1000).toFixed(2)}s`;
-  if (ms < 60_000) return `${(ms / 1000).toFixed(1)}s`;
-  const totalSeconds = Math.floor(ms / 1000);
-  const m = Math.floor(totalSeconds / 60);
-  const s = totalSeconds % 60;
-  return `${m}m ${s}s`;
-}
-
-function parseRaw(raw: unknown): Record<string, unknown> {
-  if (typeof raw === "string") {
-    try { return JSON.parse(raw) as Record<string, unknown>; } catch { return {}; }
-  }
-  if (raw && typeof raw === "object") return raw as Record<string, unknown>;
-  return {};
-}
-
-function str(v: unknown): string | undefined {
-  return typeof v === "string" && v.length > 0 ? v : undefined;
-}
-
-function num(v: unknown): number | undefined {
-  return typeof v === "number" && Number.isFinite(v) ? v : undefined;
-}
-
-function relativize(fp: string): string {
-  const home = process.env.HOME;
-  const cwd = process.cwd();
-  if (fp.startsWith(`${cwd}/`)) return fp.slice(cwd.length + 1);
-  if (home && fp.startsWith(`${home}/`)) return `~/${fp.slice(home.length + 1)}`;
-  return fp;
-}
-
-function statusSuffix(opts?: StatusOpts): string {
-  if (!opts) return `  ${theme.fg("muted", "…")}`;
-  const ok = opts.exitCode === null || opts.exitCode === 0;
-  const mark = ok ? theme.fg("success", "✓") : theme.fg("error", "✗");
-  const elapsed = opts.elapsedMs > 0 ? ` ${theme.fg("muted", fmtElapsed(opts.elapsedMs))}` : "";
-  const sum = opts.summary ? ` ${theme.fg("muted", opts.summary)}` : "";
-  return `  ${mark}${elapsed}${sum}`;
-}
-
-/** Renders a one-line tool call header from a label producer. The label is
- *  recomputed on setStatus so the trailing status mark updates in place. */
-class LabeledCallLine extends Container implements ToolCallView {
-  private line: Text;
-  private status?: StatusOpts;
-  constructor(private label: () => string) {
-    super();
-    this.line = new Text("", 1, 0);
-    this.addChild(new Spacer(1));
-    this.addChild(this.line);
-    this.repaint();
-  }
-  setStatus(opts: StatusOpts): void {
-    this.status = opts;
-    this.repaint();
-  }
-  private repaint(): void {
-    this.line.setText(`${this.label()}${statusSuffix(this.status)}`);
-  }
-}
-
-const bold = (t: string): string => theme.bold(theme.fg("toolTitle", t));
-const accent = (t: string): string => theme.fg("accent", t);
-const muted = (t: string): string => theme.fg("muted", t);
-
-function bashLabel(args: ToolCallArgs): string {
-  const r = parseRaw(args.rawInput);
-  const command = str(r.command) ?? "…";
-  const timeout = num(r.timeout);
-  const to = timeout ? muted(` (timeout ${timeout}s)`) : "";
-  return `${bold("$")} ${accent(command)}${to}`;
-}
-
-function readLabel(args: ToolCallArgs): string {
-  const r = parseRaw(args.rawInput);
-  const path = str(r.file_path) ?? str(r.path);
-  const offset = num(r.offset);
-  const limit = num(r.limit);
-  let range = "";
-  if (offset !== undefined || limit !== undefined) {
-    const from = offset ?? 1;
-    const to = limit !== undefined ? from + limit - 1 : undefined;
-    range = theme.fg("warning", to ? `:${from}-${to}` : `:${from}`);
-  }
-  return `${iconPrefix("read")}${bold("read")} ${accent(path ? relativize(path) : "…")}${range}`;
-}
-
-function grepLabel(args: ToolCallArgs): string {
-  const r = parseRaw(args.rawInput);
-  const pattern = str(r.pattern) ?? "…";
-  const scope = relativize(str(r.path) ?? ".");
-  const glob = str(r.glob);
-  const limit = num(r.limit);
-  const extras = [glob ? `(${glob})` : "", limit !== undefined ? `limit ${limit}` : ""].filter(Boolean).join(" ");
-  const tail = extras ? muted(` ${extras}`) : "";
-  return `${iconPrefix("grep")}${bold("grep")} ${accent(`/${pattern}/`)} ${muted(`in ${scope}`)}${tail}`;
-}
-
-function globLabel(args: ToolCallArgs): string {
-  const r = parseRaw(args.rawInput);
-  const pattern = str(r.pattern) ?? "…";
-  const scope = relativize(str(r.path) ?? ".");
-  return `${iconPrefix("glob")}${bold("glob")} ${accent(pattern)} ${muted(`in ${scope}`)}`;
-}
-
-function lsLabel(args: ToolCallArgs): string {
-  const r = parseRaw(args.rawInput);
-  const p = str(r.path) ?? ".";
-  return `${iconPrefix("ls")}${bold("ls")} ${accent(relativize(p))}`;
-}
-
-function pathOnlyLabel(name: string, args: ToolCallArgs): string {
-  const r = parseRaw(args.rawInput);
-  const path = str(r.file_path) ?? str(r.path);
-  return `${iconPrefix(name)}${bold(name)} ${accent(path ? relativize(path) : "…")}`;
-}
-
-function genericLabel(args: ToolCallArgs): string {
-  const detail = args.displayDetail ? ` ${muted(args.displayDetail)}` : "";
-  return `${iconPrefix(args.name)}${bold(args.title)}${detail}`;
-}
-
-export function registerDefaultToolRenderers(ctx: ExtensionContext): void {
-  const define = (name: string, fn: (args: ToolCallArgs) => ToolCallView): void => {
-    ctx.define(`ashi:render-tool-call:${name}`, fn);
-  };
-
-  define("bash", (args) => new LabeledCallLine(() => bashLabel(args)));
-
-  define("read_file", (args) => new LabeledCallLine(() => readLabel(args)));
-  define("read", (args) => new LabeledCallLine(() => readLabel(args)));
-
-  define("grep", (args) => new LabeledCallLine(() => grepLabel(args)));
-  define("glob", (args) => new LabeledCallLine(() => globLabel(args)));
-  define("ls", (args) => new LabeledCallLine(() => lsLabel(args)));
-
-  define("edit_file", (args) => new LabeledCallLine(() => pathOnlyLabel("edit", args)));
-  define("edit", (args) => new LabeledCallLine(() => pathOnlyLabel("edit", args)));
-  define("write_file", (args) => new LabeledCallLine(() => pathOnlyLabel("write", args)));
-  define("write", (args) => new LabeledCallLine(() => pathOnlyLabel("write", args)));
-
-  define("default", (args) => new LabeledCallLine(() => genericLabel(args)));
-}