agent-sh 0.15.4 → 0.15.5

package/dist/cli/shell-env.js

@@ -1,8 +1,48 @@
 import { spawn } from "node:child_process";
+import * as fs from "node:fs";
+import * as path from "node:path";
 import { pickStrategy, FALLBACK_STRATEGY } from "../shell/strategies/index.js";
+import { CONFIG_DIR } from "../core/settings.js";
+const CACHE_FILE = path.join(CONFIG_DIR, "cache", "shell-env.json");
+function captureSignature(shell, strategy, captureCmd) {
+    const files = strategy.envCaptureFiles?.(process.env) ?? [];
+    const stamps = files.sort().map((f) => {
+        try {
+            return [f, fs.statSync(f).mtimeMs];
+        }
+        catch {
+            return [f, 0];
+        }
+    });
+    return JSON.stringify({ shell, captureCmd, stamps });
+}
+function readCachedEnv(sig) {
+    try {
+        const raw = JSON.parse(fs.readFileSync(CACHE_FILE, "utf-8"));
+        if (raw?.sig === sig && raw.env && typeof raw.env === "object")
+            return raw.env;
+    }
+    catch { }
+    return null;
+}
+function writeCachedEnv(sig, env) {
+    try {
+        fs.mkdirSync(path.dirname(CACHE_FILE), { recursive: true });
+        fs.writeFileSync(CACHE_FILE, JSON.stringify({ sig, env }));
+    }
+    catch { }
+}
 export async function captureShellEnvAsync(shell) {
     if (process.env.AGENT_SH_SKIP_SHELL_ENV)
         return {};
+    const strategy = pickStrategy(shell) ?? FALLBACK_STRATEGY;
+    const captureCmd = strategy.envCaptureCommand();
+    const sig = captureSignature(shell, strategy, captureCmd);
+    if (!process.env.AGENT_SH_SHELL_ENV_NOCACHE) {
+        const cached = readCachedEnv(sig);
+        if (cached)
+            return cached;
+    }
     return new Promise((resolve) => {
         let settled = false;
         const done = (result) => {
@@ -12,8 +52,6 @@ export async function captureShellEnvAsync(shell) {
             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,
@@ -34,6 +72,7 @@ export async function captureShellEnvAsync(shell) {
                     if (eq > 0)
                         env[entry.slice(0, eq)] = entry.slice(eq + 1);
                 }
+                writeCachedEnv(sig, env);
                 done(env);
             });
             child.on("error", () => {

package/dist/shell/strategies/bash.js

@@ -66,6 +66,12 @@ export const bashStrategy = {
     envCaptureCommand() {
         return "[ -f ~/.bashrc ] && source ~/.bashrc 2>/dev/null; env -0";
     },
+    envCaptureFiles(env) {
+        const home = env.HOME;
+        if (!home)
+            return [];
+        return [".bashrc", ".bash_profile", ".bash_login", ".profile"].map((f) => path.join(home, f));
+    },
     redrawEscape() {
         return "\x1b[9999~";
     },

package/dist/shell/strategies/fish.js

@@ -59,6 +59,12 @@ export const fishStrategy = {
         // `fish -l` already sources config.fish + conf.d, so no explicit source.
         return "env -0";
     },
+    envCaptureFiles(env) {
+        const config = env.XDG_CONFIG_HOME || (env.HOME ? path.join(env.HOME, ".config") : undefined);
+        if (!config)
+            return [];
+        return [path.join(config, "fish", "config.fish"), path.join(config, "fish", "conf.d")];
+    },
     redrawEscape() {
         return "\x1b[57400u";
     },

package/dist/shell/strategies/types.d.ts

@@ -41,6 +41,7 @@ export interface ShellStrategy {
      * config and dump env. Used at startup to inherit shell-only env vars.
      */
     envCaptureCommand(): string;
+    envCaptureFiles?(env: Record<string, string | undefined>): string[];
     /**
      * Escape sequence to write to the PTY to ask the shell to repaint its
      * prompt in place. The corresponding binding is set up in prepareSpawn.

package/dist/shell/strategies/zsh.js

@@ -66,6 +66,12 @@ export const zshStrategy = {
     envCaptureCommand() {
         return "source ~/.zshrc 2>/dev/null; env -0";
     },
+    envCaptureFiles(env) {
+        const zdot = env.ZDOTDIR || env.HOME;
+        if (!zdot)
+            return [];
+        return [".zshenv", ".zprofile", ".zshrc", ".zlogin"].map((f) => path.join(zdot, f));
+    },
     redrawEscape() {
         return "\x1b[9999~";
     },

package/package.json

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

package/src/cli/shell-env.ts

@@ -1,8 +1,50 @@
 import { spawn } from "node:child_process";
-import { pickStrategy, FALLBACK_STRATEGY } from "../shell/strategies/index.js";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { pickStrategy, FALLBACK_STRATEGY, type ShellStrategy } from "../shell/strategies/index.js";
+import { CONFIG_DIR } from "../core/settings.js";
+
+const CACHE_FILE = path.join(CONFIG_DIR, "cache", "shell-env.json");
+
+function captureSignature(shell: string, strategy: ShellStrategy, captureCmd: string): string {
+  const files = strategy.envCaptureFiles?.(process.env) ?? [];
+  const stamps = files.sort().map((f) => {
+    try {
+      return [f, fs.statSync(f).mtimeMs];
+    } catch {
+      return [f, 0];
+    }
+  });
+  return JSON.stringify({ shell, captureCmd, stamps });
+}
+
+function readCachedEnv(sig: string): Record<string, string> | null {
+  try {
+    const raw = JSON.parse(fs.readFileSync(CACHE_FILE, "utf-8"));
+    if (raw?.sig === sig && raw.env && typeof raw.env === "object") return raw.env;
+  } catch {}
+  return null;
+}
+
+function writeCachedEnv(sig: string, env: Record<string, string>): void {
+  try {
+    fs.mkdirSync(path.dirname(CACHE_FILE), { recursive: true });
+    fs.writeFileSync(CACHE_FILE, JSON.stringify({ sig, env }));
+  } catch {}
+}
 
 export async function captureShellEnvAsync(shell: string): Promise<Record<string, string>> {
   if (process.env.AGENT_SH_SKIP_SHELL_ENV) return {};
+
+  const strategy = pickStrategy(shell) ?? FALLBACK_STRATEGY;
+  const captureCmd = strategy.envCaptureCommand();
+  const sig = captureSignature(shell, strategy, captureCmd);
+
+  if (!process.env.AGENT_SH_SHELL_ENV_NOCACHE) {
+    const cached = readCachedEnv(sig);
+    if (cached) return cached;
+  }
+
   return new Promise((resolve) => {
     let settled = false;
     const done = (result: Record<string, string>): void => {
@@ -12,9 +54,6 @@ export async function captureShellEnvAsync(shell: string): Promise<Record<string
     };
 
     try {
-      const strategy = pickStrategy(shell) ?? FALLBACK_STRATEGY;
-      const captureCmd = strategy.envCaptureCommand();
-
       const child = spawn(shell, ["-l", "-c", captureCmd], {
         stdio: ["ignore", "pipe", "ignore"],
         timeout: 5000,
@@ -36,6 +75,7 @@ export async function captureShellEnvAsync(shell: string): Promise<Record<string
           const eq = entry.indexOf("=");
           if (eq > 0) env[entry.slice(0, eq)] = entry.slice(eq + 1);
         }
+        writeCachedEnv(sig, env);
         done(env);
       });
 

package/src/shell/strategies/bash.ts

@@ -77,6 +77,12 @@ export const bashStrategy: ShellStrategy = {
     return "[ -f ~/.bashrc ] && source ~/.bashrc 2>/dev/null; env -0";
   },
 
+  envCaptureFiles(env): string[] {
+    const home = env.HOME;
+    if (!home) return [];
+    return [".bashrc", ".bash_profile", ".bash_login", ".profile"].map((f) => path.join(home, f));
+  },
+
   redrawEscape(): string {
     return "\x1b[9999~";
   },

package/src/shell/strategies/fish.ts

@@ -71,6 +71,12 @@ export const fishStrategy: ShellStrategy = {
     return "env -0";
   },
 
+  envCaptureFiles(env): string[] {
+    const config = env.XDG_CONFIG_HOME || (env.HOME ? path.join(env.HOME, ".config") : undefined);
+    if (!config) return [];
+    return [path.join(config, "fish", "config.fish"), path.join(config, "fish", "conf.d")];
+  },
+
   redrawEscape(): string {
     return "\x1b[57400u";
   },

package/src/shell/strategies/types.ts

@@ -48,6 +48,8 @@ export interface ShellStrategy {
    */
   envCaptureCommand(): string;
 
+  envCaptureFiles?(env: Record<string, string | undefined>): string[];
+
   /**
    * Escape sequence to write to the PTY to ask the shell to repaint its
    * prompt in place. The corresponding binding is set up in prepareSpawn.

package/src/shell/strategies/zsh.ts

@@ -77,6 +77,12 @@ export const zshStrategy: ShellStrategy = {
     return "source ~/.zshrc 2>/dev/null; env -0";
   },
 
+  envCaptureFiles(env): string[] {
+    const zdot = env.ZDOTDIR || env.HOME;
+    if (!zdot) return [];
+    return [".zshenv", ".zprofile", ".zshrc", ".zlogin"].map((f) => path.join(zdot, f));
+  },
+
   redrawEscape(): string {
     return "\x1b[9999~";
   },