shoud-cli 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shoud-cli",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "SHOUD Terminal Agent: Give your computer a job.",
   "main": "bin/shoud.js",
   "bin": {
@@ -18,7 +18,7 @@
     "ora": "^5.4.1"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": "18.0.0"
   },
   "files": [
     "bin/",

package/src/tools/index.js

@@ -1,78 +1,74 @@
-const { execFileSync } = require('child_process');
+const { execSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 
-// Allowed shell commands (whitelist)
-const ALLOWED_COMMANDS = new Set([
-  'ls', 'pwd', 'cat', 'grep', 'find', 'echo',
-  'mkdir', 'rmdir', 'touch', 'head', 'tail',
-  'wc', 'sort', 'uniq', 'diff', 'patch',
-  'git' // optional, but careful
-]);
-
-// Maximum output size (1 MB)
 const MAX_OUTPUT_SIZE = 1024 * 1024;
-
-// Get the project root (current working directory where CLI was started)
 const PROJECT_ROOT = process.cwd();
 
-/**
- * Sanitize a file path to ensure it stays within the project root.
- */
+function getShell() {
+  if (os.platform() === 'win32') {
+    return 'powershell.exe';
+  }
+  return '/bin/bash';
+}
+
 function sanitizePath(inputPath) {
-  // Resolve relative paths
   const resolved = path.resolve(PROJECT_ROOT, inputPath);
-  // Ensure it starts with the project root
   if (!resolved.startsWith(PROJECT_ROOT)) {
     throw new Error('Path is outside the project directory.');
   }
   return resolved;
 }
 
-/**
- * Execute a shell command securely.
- * Only commands from the whitelist are allowed.
- */
 function executeShell(commandString) {
-  // Split command into parts (first word is the command, rest are arguments)
-  const parts = commandString.trim().split(/\s+/);
-  if (parts.length === 0) throw new Error('Empty command.');
-
-  const cmd = parts[0];
-  if (!ALLOWED_COMMANDS.has(cmd)) {
-    throw new Error(`Command "${cmd}" is not allowed.`);
+  if (!commandString || commandString.trim().length === 0) {
+    throw new Error('Empty command.');
   }
 
-  const args = parts.slice(1);
+  // ✅ On Windows, ensure PowerShell outputs text (not objects)
+  let finalCommand = commandString;
+  if (os.platform() === 'win32') {
+    // Convert simple commands to PowerShell-friendly format
+    if (commandString.trim() === 'Get-ChildItem') {
+      finalCommand = 'Get-ChildItem | Out-String -Width 4096';
+    } else if (commandString.trim() === 'dir') {
+      finalCommand = 'cmd.exe /c dir';
+    } else if (commandString.trim() === 'ls') {
+      // ls is not a native PowerShell command – use Get-ChildItem
+      finalCommand = 'Get-ChildItem | Out-String -Width 4096';
+    }
+  }
 
   try {
-    const output = execFileSync(cmd, args, {
+    const output = execSync(finalCommand, {
       cwd: PROJECT_ROOT,
       encoding: 'utf-8',
-      timeout: 30000, // 30 seconds
+      shell: getShell(),
+      timeout: 30000,
       maxBuffer: MAX_OUTPUT_SIZE,
-      stdio: 'pipe'
+      stdio: 'pipe',
     });
-    return output.trim() || 'Command executed successfully with no output.';
+    const trimmed = output.trim();
+    return trimmed || 'Command executed successfully with no output.';
   } catch (err) {
-    // If command fails, return the error message (safe to show to AI)
     if (err.stderr) {
       return `Error: ${err.stderr.trim()}`;
     }
+    // If the command fails but there's output, return it
+    if (err.stdout) {
+      return err.stdout.trim();
+    }
     throw new Error(`Command execution failed: ${err.message}`);
   }
 }
 
-/**
- * Read a file securely, ensuring it's within the project root.
- */
 function readFile(filePath) {
   const safePath = sanitizePath(filePath);
   try {
     const stats = fs.statSync(safePath);
     if (!stats.isFile()) throw new Error('Path is not a file.');
     if (stats.size > MAX_OUTPUT_SIZE) {
-      // Read only first 1 MB
       const buffer = Buffer.alloc(MAX_OUTPUT_SIZE);
       const fd = fs.openSync(safePath, 'r');
       fs.readSync(fd, buffer, 0, MAX_OUTPUT_SIZE, 0);
@@ -85,14 +81,9 @@ function readFile(filePath) {
   }
 }
 
-/**
- * Write content to a file securely (optional, but useful for agent).
- * Ensure file is within project root.
- */
 function writeFile(filePath, content) {
   const safePath = sanitizePath(filePath);
   try {
-    // Ensure directory exists
     const dir = path.dirname(safePath);
     if (!fs.existsSync(dir)) {
       fs.mkdirSync(dir, { recursive: true });
@@ -104,10 +95,6 @@ function writeFile(filePath, content) {
   }
 }
 
-/**
- * Main tool dispatcher.
- * Returns the result as a string (to be sent back to the AI).
- */
 function executeTool(toolName, input) {
   try {
     switch (toolName) {
@@ -121,7 +108,6 @@ function executeTool(toolName, input) {
         throw new Error(`Tool "${toolName}" is not supported.`);
     }
   } catch (error) {
-    // Return a generic error message to the AI (don't leak internal details)
     return `Tool execution failed: ${error.message}`;
   }
 }