agent-sh 0.13.6 → 0.13.7

package/dist/cli/args.d.ts

@@ -0,0 +1,2 @@
+import type { AppConfig } from "../shell/host-types.js";
+export declare function parseArgs(argv: string[], env?: NodeJS.ProcessEnv): AppConfig;

package/dist/cli/args.js

@@ -0,0 +1,90 @@
+import { PACKAGE_VERSION } from "../utils/package-version.js";
+const HELP_TEXT = `agent-sh — a shell-first terminal where AI is one keystroke away
+
+Usage: agent-sh [options]
+       agent-sh init [--force]            Scaffold ~/.agent-sh/ (settings, examples, AGENTS.md)
+       agent-sh install <spec> [--force]  Install an extension (bundled name, file:, npm:, github:)
+       agent-sh uninstall <name>          Remove an installed extension
+       agent-sh list                      List installed extensions
+       agent-sh auth login [provider]     Store an API key for a built-in provider
+       agent-sh auth logout <provider>    Remove a stored key
+       agent-sh auth list                 Show configured providers
+
+Provider Profiles:
+  --provider <name>   Use a provider from ~/.agent-sh/settings.json
+  --model <name>      Override default model
+
+Direct LLM API:
+  --api-key <key>     API key for OpenAI-compatible provider (or set OPENAI_API_KEY)
+  --base-url <url>    Base URL for API (or set OPENAI_BASE_URL)
+
+General Options:
+  --backend <name>    Agent backend to launch (e.g. ash, pi); overrides settings.defaultBackend for this session
+  --shell <path>      Shell to use (default: $SHELL or /bin/bash)
+  -e, --extensions    Extensions to load (comma-separated, repeatable)
+  -h, --help          Show this help
+  -V, --version       Print version and exit
+
+Environment Variables:
+  OPENAI_API_KEY     API key for LLM provider
+  OPENAI_BASE_URL    Base URL override (e.g., http://localhost:11434/v1 for Ollama)
+
+Examples:
+  # Use a configured provider
+  agent-sh --provider openai
+
+  # Direct API access
+  agent-sh --api-key "$KEY" --model gpt-4o
+
+  # Local model via Ollama
+  agent-sh --base-url http://localhost:11434/v1 --model llama3
+
+Inside the shell:
+  Type normally        Commands run in your real shell
+  > <query>           Ask the AI agent (it decides how to help)
+  > /help             Show available slash commands
+  Ctrl-C              Cancel agent response (or signal shell as usual)
+`;
+export function parseArgs(argv, env = process.env) {
+    let model;
+    let extensions;
+    let provider;
+    let backend;
+    let shell = env.SHELL || "/bin/bash";
+    let apiKey = env.OPENAI_API_KEY;
+    let baseURL = env.OPENAI_BASE_URL;
+    for (let i = 0; i < argv.length; i++) {
+        const arg = argv[i];
+        if (arg === "--model" && argv[i + 1]) {
+            model = argv[++i];
+        }
+        else if (arg === "--api-key" && argv[i + 1]) {
+            apiKey = argv[++i];
+        }
+        else if (arg === "--base-url" && argv[i + 1]) {
+            baseURL = argv[++i];
+        }
+        else if (arg === "--provider" && argv[i + 1]) {
+            provider = argv[++i];
+        }
+        else if (arg === "--backend" && argv[i + 1]) {
+            backend = argv[++i];
+        }
+        else if (arg === "--shell" && argv[i + 1]) {
+            shell = argv[++i];
+        }
+        else if ((arg === "--extensions" || arg === "-e") && argv[i + 1]) {
+            const exts = argv[++i].split(",").map((s) => s.trim());
+            extensions = extensions ? [...extensions, ...exts] : exts;
+        }
+        else if (arg === "--version" || arg === "-V") {
+            console.log(PACKAGE_VERSION);
+            process.exit(0);
+        }
+        else if (arg === "--help" || arg === "-h") {
+            console.log(HELP_TEXT);
+            process.exit(0);
+        }
+    }
+    return { shell, model, extensions, apiKey, baseURL, provider, backend };
+}

package/dist/cli/index.js

@@ -1,7 +1,5 @@
 #!/usr/bin/env node
-import { spawn } from "node:child_process";
 import { activateShell, registerShellHandlers } from "../shell/index.js";
-import { pickStrategy, FALLBACK_STRATEGY } from "../shell/strategies/index.js";
 import { activateAgent } from "../agent/index.js";
 import { createCore } from "../core/index.js";
 import { palette as p } from "../utils/palette.js";
@@ -11,158 +9,9 @@ import { getSettings } from "../core/settings.js";
 import { dispatchSubcommand } from "./subcommands.js";
 import { suggestBridgeFor } from "./install.js";
 import { anyProviderConfigured } from "./auth/keys.js";
-import { PACKAGE_VERSION } from "../utils/package-version.js";
 import { clearOpost } from "../utils/tty.js";
-/**
- * Capture the user's full shell environment.
- * This picks up env vars exported in .zshrc/.bashrc that the
- * Node.js process doesn't have (e.g. when launched from an IDE).
- */
-async function captureShellEnvAsync(shell) {
-    return new Promise((resolve) => {
-        let settled = false;
-        const done = (result) => {
-            if (settled)
-                return;
-            settled = true;
-            resolve(result);
-        };
-        try {
-            const strategy = pickStrategy(shell) ?? FALLBACK_STRATEGY;
-            const captureCmd = strategy.envCaptureCommand();
-            const child = spawn(shell, ["-l", "-c", captureCmd], {
-                stdio: ["ignore", "pipe", "ignore"],
-                timeout: 5000,
-            });
-            let output = "";
-            child.stdout?.on("data", (data) => {
-                output += data.toString("utf-8");
-            });
-            child.on("close", (code) => {
-                clearTimeout(timer);
-                if (code !== 0 || !output) {
-                    done({});
-                    return;
-                }
-                const env = {};
-                for (const entry of output.split("\0")) {
-                    const eq = entry.indexOf("=");
-                    if (eq > 0)
-                        env[entry.slice(0, eq)] = entry.slice(eq + 1);
-                }
-                done(env);
-            });
-            child.on("error", () => {
-                clearTimeout(timer);
-                done({});
-            });
-            const timer = setTimeout(() => {
-                child.kill("SIGTERM");
-                done({});
-            }, 5000);
-        }
-        catch {
-            done({});
-        }
-    });
-}
-function mergeShellEnv(baseEnv, shellEnv) {
-    const merged = { ...baseEnv };
-    for (const [key, value] of Object.entries(shellEnv)) {
-        if (!(key in merged) || !merged[key]) {
-            merged[key] = value;
-        }
-    }
-    return merged;
-}
-function parseArgs(argv) {
-    let model;
-    let extensions;
-    let provider;
-    let backend;
-    let shell = process.env.SHELL || "/bin/bash";
-    let apiKey = process.env.OPENAI_API_KEY;
-    let baseURL = process.env.OPENAI_BASE_URL;
-    for (let i = 0; i < argv.length; i++) {
-        const arg = argv[i];
-        if (arg === "--model" && argv[i + 1]) {
-            model = argv[++i];
-        }
-        else if (arg === "--api-key" && argv[i + 1]) {
-            apiKey = argv[++i];
-        }
-        else if (arg === "--base-url" && argv[i + 1]) {
-            baseURL = argv[++i];
-        }
-        else if (arg === "--provider" && argv[i + 1]) {
-            provider = argv[++i];
-        }
-        else if (arg === "--backend" && argv[i + 1]) {
-            backend = argv[++i];
-        }
-        else if (arg === "--shell" && argv[i + 1]) {
-            shell = argv[++i];
-        }
-        else if ((arg === "--extensions" || arg === "-e") && argv[i + 1]) {
-            const exts = argv[++i].split(",").map(s => s.trim());
-            extensions = extensions ? [...extensions, ...exts] : exts;
-        }
-        else if (arg === "--version" || arg === "-V") {
-            console.log(PACKAGE_VERSION);
-            process.exit(0);
-        }
-        else if (arg === "--help" || arg === "-h") {
-            console.log(`agent-sh — a shell-first terminal where AI is one keystroke away
-
-Usage: agent-sh [options]
-       agent-sh init [--force]            Scaffold ~/.agent-sh/ (settings, examples, AGENTS.md)
-       agent-sh install <spec> [--force]  Install an extension (bundled name, file:, npm:, github:)
-       agent-sh uninstall <name>          Remove an installed extension
-       agent-sh list                      List installed extensions
-       agent-sh auth login [provider]     Store an API key for a built-in provider
-       agent-sh auth logout <provider>    Remove a stored key
-       agent-sh auth list                 Show configured providers
-
-Provider Profiles:
-  --provider <name>   Use a provider from ~/.agent-sh/settings.json
-  --model <name>      Override default model
-
-Direct LLM API:
-  --api-key <key>     API key for OpenAI-compatible provider (or set OPENAI_API_KEY)
-  --base-url <url>    Base URL for API (or set OPENAI_BASE_URL)
-
-General Options:
-  --backend <name>    Agent backend to launch (e.g. ash, pi); overrides settings.defaultBackend for this session
-  --shell <path>      Shell to use (default: $SHELL or /bin/bash)
-  -e, --extensions    Extensions to load (comma-separated, repeatable)
-  -h, --help          Show this help
-  -V, --version       Print version and exit
-
-Environment Variables:
-  OPENAI_API_KEY     API key for LLM provider
-  OPENAI_BASE_URL    Base URL override (e.g., http://localhost:11434/v1 for Ollama)
-
-Examples:
-  # Use a configured provider
-  agent-sh --provider openai
-
-  # Direct API access
-  agent-sh --api-key "$KEY" --model gpt-4o
-
-  # Local model via Ollama
-  agent-sh --base-url http://localhost:11434/v1 --model llama3
-
-Inside the shell:
-  Type normally        Commands run in your real shell
-  > <query>           Ask the AI agent (it decides how to help)
-  > /help             Show available slash commands
-  Ctrl-C              Cancel agent response (or signal shell as usual)
-`);
-            process.exit(0);
-        }
-    }
-    return { shell, model, extensions, apiKey, baseURL, provider, backend };
-}
+import { parseArgs } from "./args.js";
+import { captureShellEnvAsync, mergeShellEnv } from "./shell-env.js";
 async function main() {
     const rawArgs = process.argv.slice(2);
     if (await dispatchSubcommand(rawArgs))
@@ -293,6 +142,7 @@ async function main() {
             "\n  " + hint + "\n" +
             borderLine + "\n\n");
     }
+    await core.activateBackend(config.backend);
     // 100ms sidesteps macOS SIGTTOU during fg-pgrp handoff.
     await new Promise(resolve => setTimeout(resolve, 100));
     shell = activateShell(extCtx, {
@@ -318,7 +168,6 @@ async function main() {
         },
         returnToSelf: true,
     });
-    core.activateBackend(config.backend);
     // ── Terminal lifecycle ────────────────────────────────────────
     process.on("SIGTERM", cleanup);
     process.on("SIGHUP", cleanup);

package/dist/cli/shell-env.d.ts

@@ -0,0 +1,2 @@
+export declare function captureShellEnvAsync(shell: string): Promise<Record<string, string>>;
+export declare function mergeShellEnv(baseEnv: Record<string, string>, shellEnv: Record<string, string>): Record<string, string>;

package/dist/cli/shell-env.js

@@ -0,0 +1,61 @@
+import { spawn } from "node:child_process";
+import { pickStrategy, FALLBACK_STRATEGY } from "../shell/strategies/index.js";
+export async function captureShellEnvAsync(shell) {
+    if (process.env.AGENT_SH_SKIP_SHELL_ENV)
+        return {};
+    return new Promise((resolve) => {
+        let settled = false;
+        const done = (result) => {
+            if (settled)
+                return;
+            settled = true;
+            resolve(result);
+        };
+        try {
+            const strategy = pickStrategy(shell) ?? FALLBACK_STRATEGY;
+            const captureCmd = strategy.envCaptureCommand();
+            const child = spawn(shell, ["-l", "-c", captureCmd], {
+                stdio: ["ignore", "pipe", "ignore"],
+                timeout: 5000,
+            });
+            let output = "";
+            child.stdout?.on("data", (data) => {
+                output += data.toString("utf-8");
+            });
+            child.on("close", (code) => {
+                clearTimeout(timer);
+                if (code !== 0 || !output) {
+                    done({});
+                    return;
+                }
+                const env = {};
+                for (const entry of output.split("\0")) {
+                    const eq = entry.indexOf("=");
+                    if (eq > 0)
+                        env[entry.slice(0, eq)] = entry.slice(eq + 1);
+                }
+                done(env);
+            });
+            child.on("error", () => {
+                clearTimeout(timer);
+                done({});
+            });
+            const timer = setTimeout(() => {
+                child.kill("SIGTERM");
+                done({});
+            }, 5000);
+        }
+        catch {
+            done({});
+        }
+    });
+}
+export function mergeShellEnv(baseEnv, shellEnv) {
+    const merged = { ...baseEnv };
+    for (const [key, value] of Object.entries(shellEnv)) {
+        if (!(key in merged) || !merged[key]) {
+            merged[key] = value;
+        }
+    }
+    return merged;
+}

package/dist/core/index.js

@@ -56,8 +56,9 @@ export function createCore(config) {
             bus.emit("ui:error", { message: `Unknown backend: ${name}` });
             return false;
         }
-        if (activeBackendName) {
-            backends.get(activeBackendName)?.kill();
+        for (const [otherName, otherBackend] of backends) {
+            if (otherName !== name)
+                otherBackend.kill();
         }
         await backend.start?.();
         activeBackendName = name;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-sh",
-  "version": "0.13.6",
+  "version": "0.13.7",
   "description": "A shell-first terminal where AI is one keystroke away",
   "type": "module",
   "main": "dist/core/index.js",
@@ -121,6 +121,7 @@
     "dev": "tsx src/cli/index.ts",
     "build": "tsc",
     "start": "node dist/cli/index.js",
+    "test": "npm run build && node --import tsx --test $(find tests -name '*.test.ts' -type f)",
     "prepare": "test -d dist || npm run build"
   },
   "keywords": [