agent-sh 0.12.27 → 0.13.0

package/examples/extensions/tunnel-vision.ts

@@ -30,7 +30,7 @@
  */
 import * as fs from "node:fs";
 import * as path from "node:path";
-import type { ExtensionContext } from "agent-sh/types";
+import type { AgentContext } from "agent-sh/types";
 
 const BIND_RE = /\x1b\]9996;vt=([^;]+);BIND;([^;]*);([^\x07]*)\x07/;
 const OSC7_RE = /\x1b\]7;file:\/\/[^/]*(\/[^\x07\x1b]*)/;
@@ -137,7 +137,7 @@ function renderInjection(): string {
   return lines.join("\n");
 }
 
-export default function activate(ctx: ExtensionContext): void {
+export default function activate(ctx: AgentContext): void {
   bindingFile = path.join(ctx.getStoragePath("tunnel-vision"), "binding.json");
   loadBinding();
 
@@ -216,7 +216,7 @@ export default function activate(ctx: ExtensionContext): void {
     ctx.bus.emit("ui:info", { message: `Tunnel-vision binding to ${host} cleared.` });
   });
 
-  ctx.registerInstruction("tunnel-vision",
+  ctx.agent.registerInstruction("tunnel-vision",
 `# Tunnel-vision — driving a remote shell through pty_send
 
 When tunnel-vision is active (you'll see a "Tunnel-vision active" block in
@@ -302,7 +302,7 @@ prompt-wait to capture output.`
     });
   });
 
-  ctx.registerTool({
+  ctx.agent.registerTool({
     name: "pty_send",
     description:
       "Run a command in the user's interactive remote shell session (tunnel-vision). " +
@@ -399,7 +399,7 @@ prompt-wait to capture output.`
     },
   });
 
-  ctx.registerContextProducer("tunnel-vision", () =>
+  ctx.agent.registerContextProducer("tunnel-vision", () =>
     binding ? renderInjection() : null,
   );
 }

package/examples/extensions/user-shell.ts

@@ -17,7 +17,7 @@ import type { ExtensionContext } from "agent-sh/types";
 import type { ToolDefinition } from "agent-sh/agent/types";
 
 export default function activate(ctx: ExtensionContext): void {
-  const { bus, registerTool, registerInstruction } = ctx;
+  const { bus } = ctx; const { registerTool, registerInstruction } = ctx.agent;
   const getCwd = () => ctx.call("cwd") as string;
 
   // ── Tool ───────────────────────────────────────────────────────

package/examples/extensions/web-access.ts

@@ -16,7 +16,7 @@
  *
  * Inspired by: https://github.com/nicobailon/pi-web-access
  */
-import type { ExtensionContext } from "agent-sh/types";
+import type { AgentContext } from "agent-sh/types";
 
 // ── Constants ────────────────────────────────────────────────────────
 
@@ -123,7 +123,7 @@ async function directFetch(url: string, timeout: number): Promise<string> {
 
 // ── Extension entry point ────────────────────────────────────────────
 
-export default function activate(ctx: ExtensionContext) {
+export default function activate(ctx: AgentContext) {
   const config = ctx.getExtensionSettings("web-access", {
     timeout: 30000,
     searchNumResults: 5,
@@ -134,7 +134,7 @@ export default function activate(ctx: ExtensionContext) {
 
   // ── System instruction ────────────────────────────────────────────
 
-  ctx.registerInstruction(
+  ctx.agent.registerInstruction(
     "You have access to web search and fetching tools. " +
     "Use `web_search` to find information on the web, then `web_fetch` to read specific pages. " +
     "Use `web_fetch` with `raw: true` for JSON APIs or plain text files.",
@@ -142,7 +142,7 @@ export default function activate(ctx: ExtensionContext) {
 
   // ── Tool: web_search (Exa MCP, free) ────────────────────────────
 
-  ctx.registerTool({
+  ctx.agent.registerTool({
     name: "web_search",
     displayName: "Web Search",
     description:
@@ -178,7 +178,7 @@ export default function activate(ctx: ExtensionContext) {
 
   // ── Tool: web_fetch ─────────────────────────────────────────────
 
-  ctx.registerTool({
+  ctx.agent.registerTool({
     name: "web_fetch",
     displayName: "Web Fetch",
     description:

package/package.json

@@ -1,34 +1,34 @@
 {
   "name": "agent-sh",
-  "version": "0.12.27",
+  "version": "0.13.0",
   "description": "A shell-first terminal where AI is one keystroke away",
   "type": "module",
-  "main": "dist/core.js",
-  "types": "dist/core.d.ts",
+  "main": "dist/core/index.js",
+  "types": "dist/core/index.d.ts",
   "bin": {
-    "agent-sh": "dist/index.js"
+    "agent-sh": "dist/cli/index.js"
   },
   "exports": {
     ".": {
-      "types": "./dist/core.d.ts",
-      "default": "./dist/core.js"
+      "types": "./dist/core/index.d.ts",
+      "default": "./dist/core/index.js"
     },
     "./core": {
-      "types": "./dist/core.d.ts",
-      "default": "./dist/core.js"
+      "types": "./dist/core/index.d.ts",
+      "default": "./dist/core/index.js"
     },
     "./utils/*": "./dist/utils/*",
     "./types": {
-      "types": "./dist/types.d.ts",
-      "default": "./dist/types.js"
+      "types": "./dist/core/index.d.ts",
+      "default": "./dist/core/index.js"
     },
     "./settings": {
-      "types": "./dist/settings.d.ts",
-      "default": "./dist/settings.js"
+      "types": "./dist/core/settings.d.ts",
+      "default": "./dist/core/settings.js"
     },
     "./extension-loader": {
-      "types": "./dist/extension-loader.d.ts",
-      "default": "./dist/extension-loader.js"
+      "types": "./dist/core/extension-loader.d.ts",
+      "default": "./dist/core/extension-loader.js"
     },
     "./extensions": {
       "types": "./dist/extensions/index.d.ts",
@@ -46,6 +46,10 @@
       "types": "./dist/utils/terminal-buffer.d.ts",
       "default": "./dist/utils/terminal-buffer.js"
     },
+    "./agent": {
+      "types": "./dist/agent/index.d.ts",
+      "default": "./dist/agent/index.js"
+    },
     "./agent/types": {
       "types": "./dist/agent/types.d.ts",
       "default": "./dist/agent/types.js"
@@ -59,8 +63,8 @@
       "default": "./dist/agent/agent-loop.js"
     },
     "./event-bus": {
-      "types": "./dist/event-bus.d.ts",
-      "default": "./dist/event-bus.js"
+      "types": "./dist/core/event-bus.d.ts",
+      "default": "./dist/core/event-bus.js"
     },
     "./utils/compositor": {
       "types": "./dist/utils/compositor.d.ts",
@@ -83,8 +87,8 @@
       "default": "./dist/agent/nuclear-form.js"
     },
     "./executor": {
-      "types": "./dist/executor.d.ts",
-      "default": "./dist/executor.js"
+      "types": "./dist/utils/executor.d.ts",
+      "default": "./dist/utils/executor.js"
     }
   },
   "files": [
@@ -93,15 +97,15 @@
     "examples/extensions/*/package.json",
     "examples/extensions/*/tsconfig.json",
     "examples/extensions/*/README.md",
-    "examples/extensions/*/src",
+    "examples/extensions/*/src/**",
     "examples/extensions/*/index.ts",
     "examples/extensions/*/index.js"
   ],
   "scripts": {
-    "dev": "tsx src/index.ts",
+    "dev": "tsx src/cli/index.ts",
     "build": "tsc",
-    "start": "node dist/index.js",
-    "prepare": "npm run build"
+    "start": "node dist/cli/index.js",
+    "prepare": "test -d dist || npm run build"
   },
   "keywords": [
     "terminal",

package/dist/extensions/agent-backend.d.ts

@@ -1,14 +0,0 @@
-/**
- * Built-in agent backend extension.
- *
- * Constructs the AgentLoop synchronously with a placeholder LlmClient,
- * so core handlers (history:append, system-prompt:build, conversation:*)
- * are defined before user extensions activate. Mode resolution is
- * deferred to `core:extensions-loaded`, giving runtime-registered
- * providers (e.g. openrouter) a chance to register before we look up
- * settings.defaultProvider. Without this deferral, a persisted
- * `defaultProvider: "openrouter"` loses to a cold-start race and the
- * backend bails silently.
- */
-import type { ExtensionContext } from "../types.js";
-export default function agentBackend(ctx: ExtensionContext): void;

package/dist/extensions/agent-backend.js

@@ -1,307 +0,0 @@
-import { AgentLoop } from "../agent/agent-loop.js";
-import { LlmClient } from "../utils/llm-client.js";
-import { resolveProvider, getProviderNames, getSettings } from "../settings.js";
-import { PACKAGE_VERSION } from "../utils/package-version.js";
-import { discoverSkills } from "../agent/skills.js";
-/** Read the user's persisted defaultModel for a provider, if any. */
-function persistedModelFor(providerName) {
-    if (!providerName)
-        return undefined;
-    return getSettings().providers?.[providerName]?.defaultModel;
-}
-function defaultReasoningBuilder(level) {
-    return level === "off" ? {} : { reasoning_effort: level };
-}
-function mergeCaps(settingsCaps, payloadCaps, modelIds) {
-    if (!settingsCaps)
-        return payloadCaps.size > 0 ? payloadCaps : undefined;
-    const out = new Map();
-    for (const id of modelIds) {
-        const s = settingsCaps.get(id);
-        const p = payloadCaps.get(id);
-        if (!s && !p)
-            continue;
-        out.set(id, {
-            reasoning: s?.reasoning ?? p?.reasoning,
-            contextWindow: s?.contextWindow ?? p?.contextWindow,
-            maxTokens: s?.maxTokens ?? p?.maxTokens,
-            echoReasoning: s?.echoReasoning ?? p?.echoReasoning,
-        });
-    }
-    return out.size > 0 ? out : undefined;
-}
-export default function agentBackend(ctx) {
-    const { bus } = ctx;
-    const config = ctx.call("config:get-shell-config") ?? {};
-    // Immutable settings snapshot; provider:register payloads merge against it.
-    const providerRegistry = new Map();
-    const settingsProviders = new Map();
-    for (const name of getProviderNames()) {
-        const p = resolveProvider(name);
-        if (p) {
-            providerRegistry.set(name, p);
-            settingsProviders.set(name, p);
-        }
-    }
-    const providerHooks = new Map();
-    // Bakes model id into the hook so AgentMode.buildReasoningParams keeps
-    // its (level) signature while the hook can branch on model.
-    const bindReasoning = (shapeId, model) => {
-        const hook = providerHooks.get(shapeId)?.reasoningParams;
-        return hook ? (level) => hook(level, model) : defaultReasoningBuilder;
-    };
-    const buildModes = () => {
-        const allModes = [];
-        for (const [id, p] of providerRegistry) {
-            if (!p.apiKey)
-                continue;
-            const shapeId = p.reasoningShape ?? id;
-            for (const model of p.models) {
-                const mc = p.modelCapabilities?.get(model);
-                allModes.push({
-                    model,
-                    provider: id,
-                    providerConfig: { apiKey: p.apiKey, baseURL: p.baseURL },
-                    contextWindow: mc?.contextWindow ?? p.contextWindow,
-                    maxTokens: mc?.maxTokens ?? (mc?.contextWindow ? Math.min(Math.floor(mc.contextWindow * 0.4), 65536) : undefined),
-                    reasoning: mc?.reasoning,
-                    supportsReasoningEffort: p.supportsReasoningEffort,
-                    echoReasoning: mc?.echoReasoning,
-                    buildReasoningParams: bindReasoning(shapeId, model),
-                });
-            }
-        }
-        return allModes;
-    };
-    // Placeholder client — reconfigured at core:extensions-loaded. Any
-    // stream() call before then fails from the OpenAI SDK; start() won't
-    // wire the loop until we've resolved, so users never hit that path.
-    const llmClient = new LlmClient({ apiKey: "not-configured", model: "not-configured" });
-    ctx.define("llm:get-client", () => llmClient);
-    ctx.define("llm:invoke", (messages, opts) => {
-        return llmClient.complete({
-            messages: messages,
-            max_tokens: opts?.maxTokens,
-            model: opts?.model,
-            reasoning_effort: opts?.reasoningEffort,
-        });
-    });
-    let modes = [];
-    let initialModeIndex = 0;
-    let resolved = false;
-    // Gates late-registration reconcile so its config:switch-model emit doesn't misroute under a non-ash backend.
-    let ashActive = false;
-    bus.onPipe("config:get-initial-modes", () => ({ modes, initialModeIndex }));
-    // AgentLoop must be constructed *before* user extensions activate,
-    // because its ctor defines handlers (history:append, etc.) that
-    // extensions like superash call synchronously during their own
-    // activate. Advise-before-define works for advisers, but plain calls
-    // would hit a no-op stub.
-    const agentLoop = new AgentLoop({
-        bus,
-        llmClient,
-        handlers: { define: ctx.define, advise: ctx.advise, call: ctx.call, list: ctx.list },
-        modes,
-        initialModeIndex,
-        compositor: ctx.compositor,
-        instanceId: ctx.instanceId,
-        history: config.history,
-    });
-    let loadedExtensionNames = [];
-    bus.on("core:extensions-loaded", ({ names }) => {
-        loadedExtensionNames = names;
-        const settings = getSettings();
-        // If the user didn't pick a default, fall back to the first registered
-        // provider (built-in load order biases to openrouter → openai).
-        const providerName = config.provider ?? settings.defaultProvider
-            ?? (providerRegistry.size > 0 ? providerRegistry.keys().next().value : undefined);
-        const activeProvider = providerName ? providerRegistry.get(providerName) ?? null : null;
-        // User's persisted defaultModel wins over the provider's declared
-        // default. Dynamic providers (openrouter) re-register with their
-        // hardcoded DEFAULT_MODELS[0] each startup, which would otherwise
-        // clobber the user's /model selection.
-        const effectiveApiKey = config.apiKey ?? activeProvider?.apiKey;
-        const effectiveBaseURL = config.baseURL ?? activeProvider?.baseURL;
-        const effectiveModel = config.model ?? persistedModelFor(providerName) ?? activeProvider?.defaultModel;
-        // No provider → don't register ash at all, so another backend (e.g.
-        // claude-code-bridge) can own activation. index.ts hard-fails only
-        // when no backend ended up registered.
-        if (!effectiveApiKey || !effectiveModel)
-            return;
-        modes = buildModes();
-        if (modes.length === 0)
-            modes = [{ model: effectiveModel }];
-        let foundIdx = modes.findIndex((m) => m.model === effectiveModel && (!activeProvider || m.provider === activeProvider.id));
-        // Persisted default may not be in the provider's curated list yet (e.g.
-        // openrouter's async catalog fetch hasn't returned). Prepend a stub so
-        // the initial config:set-modes activeIndex points at the real model —
-        // otherwise AgentLoop reconfigures llmClient back to modes[0].
-        if (foundIdx === -1 && activeProvider) {
-            modes = [
-                {
-                    model: effectiveModel,
-                    provider: activeProvider.id,
-                    providerConfig: { apiKey: effectiveApiKey, baseURL: effectiveBaseURL },
-                    supportsReasoningEffort: activeProvider.supportsReasoningEffort,
-                },
-                ...modes,
-            ];
-            foundIdx = 0;
-        }
-        initialModeIndex = Math.max(0, foundIdx);
-        llmClient.reconfigure({ apiKey: effectiveApiKey, baseURL: effectiveBaseURL, model: effectiveModel });
-        bus.emit("config:set-modes", { modes, activeIndex: initialModeIndex });
-        resolved = true;
-        bus.emit("agent:register-backend", {
-            name: "ash",
-            kill: () => {
-                ashActive = false;
-                bus.emit("command:unregister", { name: "/compact" });
-                bus.emit("command:unregister", { name: "/context" });
-                agentLoop.kill();
-            },
-            start: async () => {
-                agentLoop.wire();
-                ashActive = true;
-                bus.emit("command:register", {
-                    name: "/compact",
-                    description: "Compact conversation via the active compaction strategy",
-                    handler: () => bus.emit("agent:compact-request", {}),
-                });
-                bus.emit("command:register", {
-                    name: "/context",
-                    description: "Show context budget usage",
-                    handler: () => {
-                        const stats = bus.emitPipe("context:get-stats", {
-                            activeTokens: 0,
-                            totalTokens: 0,
-                            budgetTokens: 0,
-                        });
-                        const pct = stats.budgetTokens > 0
-                            ? Math.round((stats.activeTokens / stats.budgetTokens) * 100)
-                            : 0;
-                        bus.emit("ui:info", {
-                            message: `Active context: ~${stats.activeTokens.toLocaleString()} tokens / ${stats.budgetTokens.toLocaleString()} budget (${pct}%)`,
-                        });
-                    },
-                });
-                bus.emit("agent:info", {
-                    name: "ash",
-                    version: PACKAGE_VERSION,
-                    model: llmClient.model,
-                    provider: modes[initialModeIndex]?.provider,
-                    contextWindow: modes[initialModeIndex]?.contextWindow,
-                });
-            },
-        });
-    });
-    bus.on("provider:configure", ({ id, reasoningParams }) => {
-        const prev = providerHooks.get(id) ?? {};
-        if (reasoningParams !== undefined)
-            prev.reasoningParams = reasoningParams;
-        providerHooks.set(id, prev);
-    });
-    bus.on("provider:register", (p) => {
-        const rawModels = p.models ?? (p.defaultModel ? [p.defaultModel] : []);
-        const payloadModelIds = [];
-        const payloadCaps = new Map();
-        for (const m of rawModels) {
-            if (typeof m === "string") {
-                payloadModelIds.push(m);
-            }
-            else {
-                payloadModelIds.push(m.id);
-                payloadCaps.set(m.id, { reasoning: m.reasoning, contextWindow: m.contextWindow, maxTokens: m.maxTokens, echoReasoning: m.echoReasoning });
-            }
-        }
-        const settings = settingsProviders.get(p.id);
-        const modelIds = settings?.modelsExplicit && settings.models.length > 0 ? settings.models : payloadModelIds;
-        const mergedCaps = mergeCaps(settings?.modelCapabilities, payloadCaps, modelIds);
-        const merged = {
-            id: p.id,
-            apiKey: settings?.apiKey ?? p.apiKey,
-            baseURL: settings?.baseURL ?? p.baseURL,
-            defaultModel: settings?.defaultModel ?? p.defaultModel,
-            models: modelIds,
-            modelsExplicit: settings?.modelsExplicit ?? false,
-            contextWindow: settings?.contextWindow,
-            supportsReasoningEffort: settings?.supportsReasoningEffort ?? p.supportsReasoningEffort,
-            modelCapabilities: mergedCaps,
-            reasoningShape: settings?.reasoningShape,
-        };
-        providerRegistry.set(p.id, merged);
-        const addModes = modelIds.map((m) => {
-            const mc = mergedCaps?.get(m);
-            return {
-                model: m,
-                provider: p.id,
-                providerConfig: { apiKey: merged.apiKey ?? "", baseURL: merged.baseURL },
-                contextWindow: mc?.contextWindow,
-                maxTokens: mc?.maxTokens,
-                reasoning: mc?.reasoning,
-                supportsReasoningEffort: merged.supportsReasoningEffort,
-                echoReasoning: mc?.echoReasoning,
-                buildReasoningParams: bindReasoning(p.id, m),
-            };
-        });
-        bus.emit("config:add-modes", { modes: addModes });
-        // Late-registration reconcile: if this completes the user's persisted
-        // default (openrouter's async fetch delivers the full catalog after
-        // we've already fallen back to mode 0), quietly switch to it.
-        if (!resolved || !ashActive)
-            return;
-        const pendingProvider = getSettings().defaultProvider;
-        if (pendingProvider !== p.id)
-            return;
-        const pendingModel = persistedModelFor(pendingProvider);
-        if (pendingModel && modelIds.includes(pendingModel) && llmClient.model !== pendingModel) {
-            bus.emit("config:switch-model", { model: pendingModel });
-        }
-    });
-    bus.on("config:switch-provider", ({ provider: name }) => {
-        const p = providerRegistry.get(name);
-        if (!p) {
-            bus.emit("ui:error", { message: `Unknown provider: ${name}` });
-            return;
-        }
-        if (!p.apiKey) {
-            bus.emit("ui:error", { message: `Provider "${name}" has no API key configured` });
-            return;
-        }
-        const switchModel = p.defaultModel ?? p.models[0];
-        if (!switchModel) {
-            bus.emit("ui:error", { message: `Provider "${name}" has no models configured` });
-            return;
-        }
-        llmClient.reconfigure({ apiKey: p.apiKey, baseURL: p.baseURL, model: switchModel });
-        const newModes = p.models.map((m) => {
-            const mc = p.modelCapabilities?.get(m);
-            return {
-                model: m,
-                provider: name,
-                providerConfig: { apiKey: p.apiKey, baseURL: p.baseURL },
-                contextWindow: mc?.contextWindow ?? p.contextWindow,
-                maxTokens: mc?.maxTokens ?? (mc?.contextWindow ? Math.min(Math.floor(mc.contextWindow * 0.4), 65536) : undefined),
-                reasoning: mc?.reasoning,
-                supportsReasoningEffort: p.supportsReasoningEffort,
-                echoReasoning: mc?.echoReasoning,
-            };
-        });
-        bus.emit("config:set-modes", { modes: newModes });
-        bus.emit("agent:info", { name: "ash", version: PACKAGE_VERSION, model: switchModel, provider: name, contextWindow: p.contextWindow });
-        bus.emit("ui:info", { message: `Switched to ${name} (${switchModel})` });
-        bus.emit("config:changed", {});
-    });
-    bus.onPipe("banner:collect", (e) => {
-        if (e.activeBackend && e.activeBackend !== "ash")
-            return e;
-        if (loadedExtensionNames.length > 0) {
-            e.sections.push({ label: "Extensions", items: [...loadedExtensionNames] });
-        }
-        const skills = discoverSkills(ctx.call("cwd") ?? process.cwd());
-        if (skills.length > 0) {
-            e.sections.push({ label: "Skills", items: skills.map((s) => s.name) });
-        }
-        return e;
-    });
-}