shoud-cli 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shoud-cli",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "SHOUD Terminal Agent: Give your computer a job.",
   "main": "bin/shoud.js",
   "bin": {

package/src/tools/index.js

@@ -3,23 +3,16 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
-// 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();
 
-// Determine the appropriate shell
 function getShell() {
   if (os.platform() === 'win32') {
-    return 'powershell.exe'; // Use PowerShell on Windows
+    return 'powershell.exe';
   }
-  return '/bin/bash'; // Use bash on Unix (Linux/macOS)
+  return '/bin/bash';
 }
 
-/**
- * Sanitize a file path to ensure it stays within the project root.
- */
 function sanitizePath(inputPath) {
   const resolved = path.resolve(PROJECT_ROOT, inputPath);
   if (!resolved.startsWith(PROJECT_ROOT)) {
@@ -29,43 +22,53 @@ function sanitizePath(inputPath) {
 }
 
 /**
- * Execute a shell command securely.
- * No command whitelist – safety is enforced by the permission engine.
+ * Execute a shell command and return plain text output.
+ * On Windows, we use PowerShell with `Out-String` to get text.
  */
 function executeShell(commandString) {
   if (!commandString || commandString.trim().length === 0) {
     throw new Error('Empty command.');
   }
 
+  let finalCommand = commandString;
+  if (os.platform() === 'win32') {
+    // ✅ Force PowerShell to output plain text
+    // Escape double quotes in the command
+    const escaped = commandString.replace(/"/g, '`"');
+    // Wrap in a PowerShell script block and pipe to Out-String
+    finalCommand = `& { ${escaped} } | Out-String -Width 4096`;
+  }
+
   try {
-    const output = execSync(commandString, {
+    const output = execSync(finalCommand, {
       cwd: PROJECT_ROOT,
       encoding: 'utf-8',
       shell: getShell(),
-      timeout: 30000, // 30 seconds
+      timeout: 30000,
       maxBuffer: MAX_OUTPUT_SIZE,
       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 the command fails, return the error message
     if (err.stderr) {
       return `Error: ${err.stderr.trim()}`;
     }
+    if (err.stdout) {
+      // Some commands output to stdout even on failure (e.g., `dir`)
+      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);
@@ -78,9 +81,6 @@ function readFile(filePath) {
   }
 }
 
-/**
- * Write content to a file securely, ensuring it's within the project root.
- */
 function writeFile(filePath, content) {
   const safePath = sanitizePath(filePath);
   try {
@@ -95,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) {
@@ -112,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}`;
   }
 }