@nexagent-cli/cli 0.5.1 → 0.7.0

package/dist/tools/shell-exec.js

@@ -1,26 +1,21 @@
 // ============================================================
 // Tool: shell_exec — Execute shell commands in the workspace
-// Windows-safe: auto-detects cmd/PowerShell/bash
+// v0.6.0: Process tree termination, command profiles, audit logging
 // ============================================================
-import { spawn } from 'node:child_process';
+import { spawn, exec } from 'node:child_process';
 import { resolve } from 'node:path';
+import { promisify } from 'node:util';
 import { generateId, GLOBAL_SHELL_BLOCKLIST } from '@nexagent-cli/shared';
-/** Write an audit log entry for shell execution */
-function writeAuditLog(db, sessionId, action, details, status) {
-    if (!db)
-        return;
-    try {
-        const stmt = db.prepare('INSERT INTO audit_log (id, session_id, tool_name, action, details, status, created_at) VALUES (?, ?, ?, ?, ?, ?, ?)');
-        stmt.run(generateId(), sessionId, 'shell_exec', action, JSON.stringify(details), status, Date.now());
-    }
-    catch {
-        // Audit logging is best-effort; never fail the tool execution
-    }
-}
+import { writeAuditLog } from '../db/audit-log.js';
+import { loadProjectPolicy, resolveProfile, checkCommand } from '../safety/command-profile.js';
+const execAsync = promisify(exec);
+const SIGKILL_DELAY_MS = 5_000;
+const ABSOLUTE_MAX_TIMEOUT = 120_000;
+const ABSOLUTE_MAX_OUTPUT = 50_000;
 export class ShellExecTool {
     name = 'shell_exec';
-    version = '1.0.0';
-    description = 'Execute a shell command in the workspace directory. Output is captured and returned. Long-running commands time out after timeout_ms. Dangerous commands are blocked by safety checks.';
+    version = '1.1.0';
+    description = 'Execute a shell command in the workspace directory. Output is captured and returned. Long-running commands time out after timeout_ms. Dangerous commands are blocked by safety checks. Command profiles restrict which commands are allowed per project.';
     enabled = true;
     cacheable = false;
     riskLevel = 'high';
@@ -48,57 +43,107 @@ export class ShellExecTool {
         required: ['command'],
     };
     async execute(args, ctx) {
-        const { command, cwd: relCwd = '.', timeout_ms: timeout = 30_000, env: extraEnv = {}, } = args;
-        // Blocklist check (belt-and-suspenders on top of safety gate)
+        const { command, cwd: relCwd = '.', timeout_ms: userTimeout = 30_000, env: extraEnv = {}, } = args;
+        const executionId = generateId();
+        const start = Date.now();
+        const absCwd = resolve(ctx.workspaceDir, relCwd);
+        // ── 1. Load command profile ────────────────────────────────
+        const projectPolicy = await loadProjectPolicy(ctx.workspaceDir);
+        const profile = resolveProfile(undefined, projectPolicy);
+        const profileCheck = checkCommand(command, profile);
+        if (!profileCheck.allowed) {
+            writeAuditLog(ctx.db, {
+                sessionId: ctx.sessionId,
+                toolName: this.name,
+                action: 'blocked_by_profile',
+                details: { command: command.slice(0, 2000), reason: profileCheck.reason, profile: profile.name },
+                status: 'blocked',
+            });
+            throw new Error(profileCheck.reason);
+        }
+        // ── 2. Belt-and-suspenders blocklist (also in Safety Gate) ─
         for (const blocked of GLOBAL_SHELL_BLOCKLIST) {
             if (command.toLowerCase().includes(blocked.toLowerCase())) {
+                writeAuditLog(ctx.db, {
+                    sessionId: ctx.sessionId,
+                    toolName: this.name,
+                    action: 'blocked_by_global_blocklist',
+                    details: { command: command.slice(0, 2000), matched: blocked },
+                    status: 'blocked',
+                });
                 throw new Error(`Command blocked by global blocklist: "${blocked}"`);
             }
         }
+        // ── 3. Apply profile limits ────────────────────────────────
+        const effectiveTimeout = Math.min(userTimeout, profileCheck.effectiveTimeout, ABSOLUTE_MAX_TIMEOUT);
+        const effectiveMaxOutput = Math.min(profileCheck.effectiveMaxOutput, ABSOLUTE_MAX_OUTPUT);
+        // ── 4. Dry run ─────────────────────────────────────────────
         if (ctx.dryRun) {
             return {
                 success: true,
                 output: `[DRY RUN] Would execute: ${command}`,
-                data: { dryRun: true, command },
-                executionId: generateId(),
+                data: { dryRun: true, command, profile: profile.name },
+                executionId,
                 durationMs: 0,
             };
         }
-        const absCwd = resolve(ctx.workspaceDir, relCwd);
-        const executionId = generateId();
-        const start = Date.now();
-        const effectiveTout = Math.min(timeout, 120_000);
+        // ── 5. Execute with process tree control ───────────────────
         const { shell, shellFlag } = this.detectShell();
         return new Promise((resolve_p, reject) => {
+            // Unix: detached=true creates new process group for tree killing
+            // Windows: we use taskkill /T instead
+            const isUnix = process.platform !== 'win32';
             const proc = spawn(shell, [shellFlag, command], {
                 cwd: absCwd,
                 env: { ...process.env, ...extraEnv },
                 stdio: 'pipe',
+                detached: isUnix, // new process group on Unix
             });
             let stdout = '';
             let stderr = '';
+            let killed = false;
             proc.stdout?.on('data', (d) => { stdout += d.toString(); });
             proc.stderr?.on('data', (d) => { stderr += d.toString(); });
+            // ── Timeout handler with escalation ──────────────────────
             const timer = setTimeout(() => {
-                proc.kill('SIGTERM');
-                reject(new Error(`Command timed out after ${effectiveTout}ms: ${command}`));
-            }, effectiveTout);
-            proc.on('close', (code) => {
+                killed = true;
+                this.killProcessTree(proc.pid, 'SIGTERM');
+                // Escalation: SIGTERM → wait → SIGKILL
+                const killTimer = setTimeout(() => {
+                    this.killProcessTree(proc.pid, 'SIGKILL');
+                }, SIGKILL_DELAY_MS);
+                // Clean up escalation timer if process exits gracefully after SIGTERM
+                proc.on('close', () => clearTimeout(killTimer));
+            }, effectiveTimeout);
+            proc.on('close', (code, signal) => {
                 clearTimeout(timer);
                 const durationMs = Date.now() - start;
                 const combined = [stdout, stderr].filter(Boolean).join('\n--- stderr ---\n');
-                const truncated = combined.length > 20_000
-                    ? combined.slice(0, 20_000) + '\n[...output truncated at 20k chars...]'
+                const truncated = combined.length > effectiveMaxOutput
+                    ? combined.slice(0, effectiveMaxOutput) + '\n[...output truncated...]'
                     : combined;
-                const success = code === 0;
-                const status = success ? 'success' : 'failed';
-                writeAuditLog(ctx.db, ctx.sessionId, 'execute', {
-                    command: command.slice(0, 2000), // cap detail size
-                    cwd: absCwd,
-                    exitCode: code,
-                    durationMs,
-                    outputLength: combined.length,
-                }, status);
+                const wasKilledByUs = killed && (signal === 'SIGTERM' || signal === 'SIGKILL');
+                const success = code === 0 && !wasKilledByUs;
+                const status = wasKilledByUs ? 'failed' : success ? 'success' : 'failed';
+                writeAuditLog(ctx.db, {
+                    sessionId: ctx.sessionId,
+                    toolName: this.name,
+                    action: wasKilledByUs ? 'timeout_killed' : 'execute',
+                    details: {
+                        command: command.slice(0, 2000),
+                        cwd: absCwd,
+                        exitCode: code,
+                        signal,
+                        durationMs,
+                        outputLength: combined.length,
+                        profile: profile.name,
+                    },
+                    status,
+                });
+                if (wasKilledByUs) {
+                    reject(new Error(`Command timed out after ${effectiveTimeout}ms (killed with ${signal}): ${command}`));
+                    return;
+                }
                 if (code !== 0 && !stderr) {
                     reject(new Error(`Command exited with code ${code}: ${truncated}`));
                     return;
@@ -106,18 +151,25 @@ export class ShellExecTool {
                 resolve_p({
                     success,
                     output: truncated || `(no output, exit code ${code})`,
-                    data: { exitCode: code, stdout, stderr, command, durationMs },
+                    data: { exitCode: code, stdout, stderr, command, durationMs, profile: profile.name },
                     executionId,
                     durationMs,
                 });
             });
             proc.on('error', (err) => {
                 clearTimeout(timer);
-                writeAuditLog(ctx.db, ctx.sessionId, 'spawn_error', {
-                    command: command.slice(0, 2000),
-                    cwd: absCwd,
-                    error: err.message,
-                }, 'error');
+                writeAuditLog(ctx.db, {
+                    sessionId: ctx.sessionId,
+                    toolName: this.name,
+                    action: 'spawn_error',
+                    details: {
+                        command: command.slice(0, 2000),
+                        cwd: absCwd,
+                        error: err.message,
+                        profile: profile.name,
+                    },
+                    status: 'error',
+                });
                 reject(new Error(`Failed to spawn process: ${err.message}`));
             });
         });
@@ -126,6 +178,7 @@ export class ShellExecTool {
         const { command } = args;
         return `Would execute shell command: "${command}"`;
     }
+    // ── Helpers ─────────────────────────────────────────────────
     detectShell() {
         if (process.platform === 'win32') {
             // Prefer PowerShell 7, fall back to cmd
@@ -135,5 +188,36 @@ export class ShellExecTool {
         }
         return { shell: process.env['SHELL'] ?? '/bin/sh', shellFlag: '-c' };
     }
+    /** Kill a process and its children. Platform-aware. */
+    killProcessTree(pid, signal) {
+        if (!pid)
+            return;
+        if (process.platform === 'win32') {
+            // Windows: taskkill /T kills the entire tree
+            const forceFlag = signal === 'SIGKILL' ? '/F' : '';
+            exec(`taskkill ${forceFlag} /T /PID ${pid}`, (err) => {
+                if (err && !err.message.includes('not found')) {
+                    // Fallback: just kill the direct PID
+                    try {
+                        process.kill(pid, signal);
+                    }
+                    catch { /* ignore */ }
+                }
+            });
+        }
+        else {
+            // Unix: kill the process group (negative PID)
+            try {
+                process.kill(-pid, signal);
+            }
+            catch {
+                // Fallback: kill direct PID
+                try {
+                    process.kill(pid, signal);
+                }
+                catch { /* ignore */ }
+            }
+        }
+    }
 }
 //# sourceMappingURL=shell-exec.js.map

package/dist/tools/shell-exec.js.map

@@ -1 +1 @@
-{"version":3,"file":"shell-exec.js","sourceRoot":"","sources":["../../src/tools/shell-exec.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,6DAA6D;AAC7D,iDAAiD;AACjD,+DAA+D;AAE/D,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAE1E,mDAAmD;AACnD,SAAS,aAAa,CACpB,EAAW,EACX,SAAiB,EACjB,MAAc,EACd,OAAgC,EAChC,MAAc;IAEd,IAAI,CAAC,EAAE;QAAE,OAAO;IAChB,IAAI,CAAC;QACH,MAAM,IAAI,GAAI,EAA0E,CAAC,OAAO,CAC9F,qHAAqH,CACtH,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IACvG,CAAC;IAAC,MAAM,CAAC;QACP,8DAA8D;IAChE,CAAC;AACH,CAAC;AAED,MAAM,OAAO,aAAa;IACxB,IAAI,GAAU,YAAY,CAAC;IAC3B,OAAO,GAAO,OAAO,CAAC;IACtB,WAAW,GAAG,wLAAwL,CAAC;IACvM,OAAO,GAAO,IAAI,CAAC;IACnB,SAAS,GAAK,KAAK,CAAC;IACpB,SAAS,GAAK,MAAe,CAAC;IAC9B,WAAW,GAAG,CAAC,YAAY,CAAU,CAAC;IAEtC,UAAU,GAAqB;QAC7B,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,IAAI,EAAS,QAAQ;gBACrB,WAAW,EAAE,8BAA8B;aAC5C;YACD,GAAG,EAAE;gBACH,IAAI,EAAS,QAAQ;gBACrB,WAAW,EAAE,oFAAoF;aAClG;YACD,UAAU,EAAE;gBACV,IAAI,EAAS,QAAQ;gBACrB,WAAW,EAAE,uDAAuD;aACrE;YACD,GAAG,EAAE;gBACH,IAAI,EAAS,QAAQ;gBACrB,WAAW,EAAE,qDAAqD;aACnE;SACF;QACD,QAAQ,EAAE,CAAC,SAAS,CAAC;KACtB,CAAC;IAEF,KAAK,CAAC,OAAO,CAAC,IAAa,EAAE,GAAgB;QAC3C,MAAM,EACJ,OAAO,EACP,GAAG,EAAS,MAAM,GAAM,GAAG,EAC3B,UAAU,EAAE,OAAO,GAAK,MAAM,EAC9B,GAAG,EAAS,QAAQ,GAAI,EAAE,GAC3B,GAAG,IAEH,CAAC;QAEF,8DAA8D;QAC9D,KAAK,MAAM,OAAO,IAAI,sBAAsB,EAAE,CAAC;YAC7C,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;gBAC1D,MAAM,IAAI,KAAK,CAAC,yCAAyC,OAAO,GAAG,CAAC,CAAC;YACvE,CAAC;QACH,CAAC;QAED,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACf,OAAO;gBACL,OAAO,EAAM,IAAI;gBACjB,MAAM,EAAO,4BAA4B,OAAO,EAAE;gBAClD,IAAI,EAAS,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;gBACtC,WAAW,EAAE,UAAU,EAAE;gBACzB,UAAU,EAAG,CAAC;aACf,CAAC;QACJ,CAAC;QAED,MAAM,MAAM,GAAQ,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,WAAW,GAAG,UAAU,EAAE,CAAC;QACjC,MAAM,KAAK,GAAS,IAAI,CAAC,GAAG,EAAE,CAAC;QAC/B,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEjD,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAEhD,OAAO,IAAI,OAAO,CAAa,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE;YACnD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE;gBAC9C,GAAG,EAAI,MAAM;gBACb,GAAG,EAAI,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE;gBACtC,KAAK,EAAE,MAAM;aACd,CAAC,CAAC;YAEH,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,MAAM,GAAG,EAAE,CAAC;YAEhB,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,CAAS,EAAE,EAAE,GAAG,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACpE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,CAAS,EAAE,EAAE,GAAG,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAEpE,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC5B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACrB,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,aAAa,OAAO,OAAO,EAAE,CAAC,CAAC,CAAC;YAC9E,CAAC,EAAE,aAAa,CAAC,CAAC;YAElB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBACxB,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;gBACtC,MAAM,QAAQ,GAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;gBAC/E,MAAM,SAAS,GAAI,QAAQ,CAAC,MAAM,GAAG,MAAM;oBACzC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,yCAAyC;oBACvE,CAAC,CAAC,QAAQ,CAAC;gBAEb,MAAM,OAAO,GAAG,IAAI,KAAK,CAAC,CAAC;gBAC3B,MAAM,MAAM,GAAI,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;gBAC/C,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE;oBAC9C,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,kBAAkB;oBACnD,GAAG,EAAE,MAAM;oBACX,QAAQ,EAAE,IAAI;oBACd,UAAU;oBACV,YAAY,EAAE,QAAQ,CAAC,MAAM;iBAC9B,EAAE,MAAM,CAAC,CAAC;gBAEX,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;oBAC1B,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,IAAI,KAAK,SAAS,EAAE,CAAC,CAAC,CAAC;oBACpE,OAAO;gBACT,CAAC;gBAED,SAAS,CAAC;oBACR,OAAO;oBACP,MAAM,EAAO,SAAS,IAAI,yBAAyB,IAAI,GAAG;oBAC1D,IAAI,EAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE;oBACpE,WAAW;oBACX,UAAU;iBACX,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACvB,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,SAAS,EAAE,aAAa,EAAE;oBAClD,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC;oBAC/B,GAAG,EAAE,MAAM;oBACX,KAAK,EAAE,GAAG,CAAC,OAAO;iBACnB,EAAE,OAAO,CAAC,CAAC;gBACZ,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAC/D,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAa,EAAE,IAAiB;QAC3C,MAAM,EAAE,OAAO,EAAE,GAAG,IAA2B,CAAC;QAChD,OAAO,iCAAiC,OAAO,GAAG,CAAC;IACrD,CAAC;IAEO,WAAW;QACjB,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YACjC,wCAAwC;YACxC,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;gBAChC,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAG,SAAS,EAAE,UAAU,EAAE;gBAC/C,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAI,SAAS,EAAE,IAAI,EAAE,CAAC;QAC9C,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;IACvE,CAAC;CACF"}
+{"version":3,"file":"shell-exec.js","sourceRoot":"","sources":["../../src/tools/shell-exec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@nexagent-cli/cli",
-  "version": "0.5.1",
+  "version": "0.7.0",
   "description": "NexAgent — locally-runnable AI agent CLI with file editing, tools, and beautiful TUI",
   "bin": {
-    "nexagent": "./dist/index.js"
+    "nexagent": "./dist/index.js",
+    "sophie": "./dist/bin/sophie.js",
+    "amarax": "./dist/bin/amarax.js"
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -34,13 +36,13 @@
     "@anthropic-ai/sdk": "^0.29.0",
     "@google/generative-ai": "^0.19.0",
     "@inquirer/prompts": "^5.0.0",
-    "@nexagent-cli/shared": "0.5.1",
+    "@nexagent-cli/shared": "^0.7.0",
     "better-sqlite3": "^11.0.0",
     "boxen": "^8.0.0",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "cors": "^2.8.5",
-    "diff": "^7.0.0",
+    "diff": "^8.0.3",
     "dotenv": "^16.4.5",
     "express": "^4.21.0",
     "figures": "^6.1.0",
@@ -69,7 +71,7 @@
     "@types/react": "^18.3.0",
     "tsx": "^4.15.0",
     "typescript": "^5.5.0",
-    "vitest": "^2.0.0"
+    "vitest": "^4.1.8"
   },
   "engines": {
     "node": ">=22.0.0"