cmdr-agent 2.4.0 → 2.5.0

package/dist/src/tools/shell/shell-executor.js

@@ -0,0 +1,238 @@
+/**
+ * Cross-platform shell executor for cmdr.
+ *
+ * Mirrors Claude Code's approach: separate BashTool + PowerShellTool with
+ * a shared shell abstraction. Detects platform, resolves the correct shell,
+ * normalizes paths, and escapes arguments safely.
+ */
+import { spawn } from 'child_process';
+import * as os from 'os';
+import * as path from 'path';
+import { existsSync } from 'fs';
+// ---------------------------------------------------------------------------
+// Platform detection
+// ---------------------------------------------------------------------------
+let _cachedPlatform;
+export function detectPlatform() {
+    if (_cachedPlatform)
+        return _cachedPlatform;
+    _cachedPlatform = os.platform() === 'win32' ? 'windows' : 'unix';
+    return _cachedPlatform;
+}
+// ---------------------------------------------------------------------------
+// Shell resolution
+// ---------------------------------------------------------------------------
+const SHELL_LOOKUP = {
+    bash: { executable: 'bash', args: ['-c'], shellType: 'bash' },
+    zsh: { executable: 'zsh', args: ['-c'], shellType: 'zsh' },
+    sh: { executable: 'sh', args: ['-c'], shellType: 'sh' },
+    powershell: { executable: 'powershell.exe', args: ['-NoProfile', '-NonInteractive', '-Command'], shellType: 'powershell' },
+    cmd: { executable: 'cmd.exe', args: ['/c'], shellType: 'cmd' },
+};
+let _cachedDefaultShell;
+/**
+ * Resolve the default shell for the current platform.
+ * On unix: prefers SHELL env, falls back to bash, then sh.
+ * On windows: prefers powershell, falls back to cmd.
+ */
+export function getDefaultShell() {
+    if (_cachedDefaultShell)
+        return _cachedDefaultShell;
+    const platform = detectPlatform();
+    if (platform === 'unix') {
+        // Prefer user's SHELL env, then bash, then sh
+        const userShell = process.env.SHELL;
+        if (userShell) {
+            const name = path.basename(userShell);
+            if (SHELL_LOOKUP[name]) {
+                _cachedDefaultShell = { ...SHELL_LOOKUP[name], executable: userShell };
+                return _cachedDefaultShell;
+            }
+        }
+        _cachedDefaultShell = SHELL_LOOKUP.bash;
+        return _cachedDefaultShell;
+    }
+    // Windows: prefer powershell if available
+    const psLocations = [
+        'C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe',
+        'C:\\Program Files\\PowerShell\\7\\pwsh.exe',
+    ];
+    for (const psPath of psLocations) {
+        if (existsSync(psPath)) {
+            _cachedDefaultShell = {
+                executable: psPath,
+                args: ['-NoProfile', '-NonInteractive', '-Command'],
+                shellType: 'powershell',
+            };
+            return _cachedDefaultShell;
+        }
+    }
+    // Fallback to cmd
+    _cachedDefaultShell = SHELL_LOOKUP.cmd;
+    return _cachedDefaultShell;
+}
+/**
+ * Get a specific shell config by type.
+ */
+export function getShell(shellType) {
+    return SHELL_LOOKUP[shellType] ?? SHELL_LOOKUP.sh;
+}
+// ---------------------------------------------------------------------------
+// Path normalization
+// ---------------------------------------------------------------------------
+/**
+ * Normalize a file path for the current platform.
+ * On Windows: converts forward slashes to backslashes.
+ * On Unix: converts backslashes to forward slashes.
+ */
+export function normalizePath(p) {
+    if (detectPlatform() === 'windows') {
+        return p.replace(/\//g, '\\');
+    }
+    return p.replace(/\\/g, '/');
+}
+// ---------------------------------------------------------------------------
+// Argument escaping
+// ---------------------------------------------------------------------------
+/**
+ * Escape a shell argument for the current platform.
+ * Prevents shell injection by properly quoting arguments.
+ */
+export function escapeArg(arg, shellType) {
+    const shell = shellType ?? getDefaultShell().shellType;
+    if (shell === 'cmd') {
+        // CMD: double-quote and escape internal quotes
+        return `"${arg.replace(/"/g, '""')}"`;
+    }
+    if (shell === 'powershell') {
+        // PowerShell: single-quote (no variable expansion)
+        return `'${arg.replace(/'/g, "''")}'`;
+    }
+    // Unix shells: single-quote (safest, no expansions)
+    return `'${arg.replace(/'/g, "'\\''")}'`;
+}
+// ---------------------------------------------------------------------------
+// Environment variable expansion
+// ---------------------------------------------------------------------------
+/**
+ * Translate environment variable references between platforms.
+ * $VAR / ${VAR} (unix) <-> %VAR% (windows cmd) / $env:VAR (powershell)
+ */
+export function translateEnvVars(command, targetShell) {
+    if (targetShell === 'cmd') {
+        // Unix → CMD: $VAR / ${VAR} → %VAR%
+        return command
+            .replace(/\$\{(\w+)\}/g, '%$1%')
+            .replace(/\$(\w+)/g, '%$1%');
+    }
+    if (targetShell === 'powershell') {
+        // Unix → PowerShell: $VAR → $env:VAR (only top-level, not already $env:)
+        return command
+            .replace(/\$\{(\w+)\}/g, '$env:$1')
+            .replace(/(?<!\w)\$(?!env:)(\w+)/g, '$env:$1');
+    }
+    // Already unix-style
+    return command;
+}
+// ---------------------------------------------------------------------------
+// Shell execution
+// ---------------------------------------------------------------------------
+const DEFAULT_TIMEOUT_MS = 30_000;
+const MAX_BUFFER_SIZE = 10 * 1024 * 1024; // 10MB
+/**
+ * Execute a command in the appropriate shell.
+ * Mirrors Claude Code's BashTool execution model with:
+ * - Platform-aware shell selection
+ * - Timeout support
+ * - AbortSignal support
+ * - Output size limiting
+ */
+export function execute(options) {
+    return new Promise((resolve) => {
+        const shellConfig = options.shell
+            ? getShell(options.shell)
+            : getDefaultShell();
+        const command = options.command;
+        const cwd = options.cwd ? normalizePath(options.cwd) : process.cwd();
+        const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+        const env = options.env
+            ? { ...process.env, ...options.env }
+            : process.env;
+        const stdoutChunks = [];
+        const stderrChunks = [];
+        let stdoutSize = 0;
+        let stderrSize = 0;
+        let timedOut = false;
+        let interrupted = false;
+        const child = spawn(shellConfig.executable, [...shellConfig.args, command], {
+            cwd,
+            env,
+            stdio: ['ignore', 'pipe', 'pipe'],
+        });
+        child.stdout?.on('data', (chunk) => {
+            stdoutSize += chunk.length;
+            if (stdoutSize <= MAX_BUFFER_SIZE) {
+                stdoutChunks.push(chunk);
+            }
+        });
+        child.stderr?.on('data', (chunk) => {
+            stderrSize += chunk.length;
+            if (stderrSize <= MAX_BUFFER_SIZE) {
+                stderrChunks.push(chunk);
+            }
+        });
+        const timer = setTimeout(() => {
+            timedOut = true;
+            child.kill('SIGKILL');
+        }, timeoutMs);
+        const onAbort = () => {
+            interrupted = true;
+            child.kill('SIGKILL');
+        };
+        options.signal?.addEventListener('abort', onAbort, { once: true });
+        child.on('close', (code) => {
+            clearTimeout(timer);
+            options.signal?.removeEventListener('abort', onAbort);
+            let stdout = Buffer.concat(stdoutChunks).toString('utf-8');
+            let stderr = Buffer.concat(stderrChunks).toString('utf-8');
+            // Truncation notice
+            if (stdoutSize > MAX_BUFFER_SIZE) {
+                stdout += `\n[stdout truncated: ${stdoutSize} bytes total, showing first ${MAX_BUFFER_SIZE}]`;
+            }
+            if (stderrSize > MAX_BUFFER_SIZE) {
+                stderr += `\n[stderr truncated: ${stderrSize} bytes total, showing first ${MAX_BUFFER_SIZE}]`;
+            }
+            resolve({
+                stdout,
+                stderr,
+                exitCode: code ?? 1,
+                timedOut,
+                interrupted,
+            });
+        });
+        child.on('error', (err) => {
+            clearTimeout(timer);
+            options.signal?.removeEventListener('abort', onAbort);
+            resolve({
+                stdout: '',
+                stderr: err.message,
+                exitCode: 1,
+                timedOut: false,
+                interrupted: false,
+            });
+        });
+    });
+}
+/**
+ * Check if a command exists on the system.
+ */
+export async function commandExists(cmd) {
+    const platform = detectPlatform();
+    const checkCmd = platform === 'windows' ? `where ${cmd}` : `which ${cmd}`;
+    const result = await execute({
+        command: checkCmd,
+        timeoutMs: 5000,
+    });
+    return result.exitCode === 0;
+}
+//# sourceMappingURL=shell-executor.js.map

package/dist/src/tools/shell/shell-executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-executor.js","sourceRoot":"","sources":["../../../../src/tools/shell/shell-executor.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmdr-agent",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Open-source multi-agent coding tool for your terminal. Powered by Ollama.",
   "type": "module",
   "bin": {