shoud-cli 1.0.7 → 1.0.10

package/bin/shoud.js

@@ -5,7 +5,7 @@ const chalk = require('chalk');
 const { login } = require('../src/auth/deviceFlow');
 const { executeTask } = require('../src/runtime/agentLoop');
 
-// ─── Exact SHOUD Banner Art (provided by user) ──────────────────────────────
+// ─── Original SHOUD Banner Art ──────────────────────────────
 const BANNER_ART = [
   "  ███████╗██╗  ██╗ ██████╗ ██╗   ██╗██████╗ ",
   "  ██╔════╝██║  ██║██╔═══██╗██║   ██║██╔══██╗",
@@ -15,13 +15,21 @@ const BANNER_ART = [
   "  ╚══════╝╚═╝  ╚═╝ ╚═════╝  ╚═════╝ ╚═════╝ "
 ];
 
+// ─── Static Banner (prints at the start of commands) ──────
+function printStaticBanner() {
+  const color = chalk.hex('#B5F96C');
+  console.log(color(BANNER_ART.join('\n')));
+  console.log(color('  ┌──────────────────────────────────────────────────────────┐'));
+  console.log(color('  │          Give your computer a job.           │'));
+  console.log(color('  └──────────────────────────────────────────────────────────┘'));
+}
+
+// ─── Animated Banner (for help) ─────────────────────────────
 const SLEEP = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
-// ─── Animated Banner ─────────────────────────────────────────────────────────
 async function renderAnimatedBanner() {
   if (!process.stdout.isTTY) {
-    console.log(chalk.hex('#B5F96C')(BANNER_ART.join('\n')));
-    console.log(chalk.hex('#B5F96C').bold('  Give your computer a job.\n'));
+    printStaticBanner();
     return;
   }
 
@@ -61,7 +69,7 @@ async function renderAnimatedBanner() {
   process.stdout.write('\x1B[?25h');
 }
 
-// ─── Custom Help ──────────────────────────────────────────────────────────────
+// ─── Custom Help ──────────────────────────────────────────────
 async function customHelp() {
   console.log(chalk.hex('#B5F96C').bold('\n  SHOUD Terminal Agent - Command Reference\n'));
   console.log(chalk.gray('  Usage: shoud [command] OR shoud "[prompt]"\n'));
@@ -78,7 +86,7 @@ async function customHelp() {
   console.log(`    ${chalk.hex('#B5F96C')('>')} shoud "Run npm test and fix any failing test cases"\n`);
 }
 
-// ─── Main ──────────────────────────────────────────────────────────────────────
+// ─── Main ──────────────────────────────────────────────────────
 async function main() {
   const args = process.argv.slice(2);
 
@@ -87,8 +95,7 @@ async function main() {
       args[0] === 'help' || args[0] === '--help' || args[0] === '-h' ||
       args[0] === '--version' || args[0] === '-v') {
     if (args[0] === '--version' || args[0] === '-v') {
-      // Let Commander handle version
-      program.version('1.0.0');
+      program.version('1.0.9');
       program.parse(process.argv);
       return;
     }
@@ -98,15 +105,18 @@ async function main() {
   }
 
   program
-    .version('1.0.0')
+    .version('1.0.9')
     .description('SHOUD Terminal Agent');
 
   program
     .command('login')
     .description('Authenticate this device with your SHOUD account')
-    .action(login);
+    .action(() => {
+      // Optionally show banner before login? We'll keep it clean.
+      login();
+    });
 
-  // Placeholder for status – you can replace with real implementation
+  // Placeholder for status
   program
     .command('status')
     .description('Check your current credit balance and active plan')
@@ -122,7 +132,10 @@ async function main() {
         return;
       }
       const taskPrompt = promptArr.join(' ');
+      // ✅ Show the static banner at the start
+      printStaticBanner();
       await executeTask(taskPrompt);
+      // No banner at the end (removed)
     });
 
   program.parse(process.argv);

package/package.json

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

package/src/tools/index.js

@@ -1,140 +1,115 @@
-#!/usr/bin/env node
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
 
-const { program } = require('commander');
-const chalk = require('chalk');
-const { login } = require('../src/auth/deviceFlow');
-const { executeTask } = require('../src/runtime/agentLoop');
+const MAX_OUTPUT_SIZE = 1024 * 1024;
+const PROJECT_ROOT = process.cwd();
 
-// ─── Original SHOUD Banner Art ──────────────────────────────
-const BANNER_ART = [
-  "  ███████╗██╗  ██╗ ██████╗ ██╗   ██╗██████╗ ",
-  "  ██╔════╝██║  ██║██╔═══██╗██║   ██║██╔══██╗",
-  "  ███████╗███████║██║   ██║██║   ██║██║  ██║",
-  "  ╚════██║██╔══██║██║   ██║██║   ██║██║  ██║",
-  "  ███████║██║  ██║╚██████╔╝╚██████╔╝██████╔╝",
-  "  ╚══════╝╚═╝  ╚═╝ ╚═════╝  ╚═════╝ ╚═════╝ "
-];
-
-// ─── Static Banner (no animation) ──────────────────────────
-function printStaticBanner() {
-  const color = chalk.hex('#B5F96C');
-  console.log(color(BANNER_ART.join('\n')));
-  console.log(color('  ┌──────────────────────────────────────────────────────────┐'));
-  console.log(color('  │          Give your computer a job.           │'));
-  console.log(color('  └──────────────────────────────────────────────────────────┘'));
+function getShell() {
+  if (os.platform() === 'win32') {
+    return 'powershell.exe';
+  }
+  return '/bin/bash';
 }
 
-// ─── Animated Banner (for help) ─────────────────────────────
-const SLEEP = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-
-async function renderAnimatedBanner() {
-  if (!process.stdout.isTTY) {
-    printStaticBanner();
-    return;
+function sanitizePath(inputPath) {
+  const resolved = path.resolve(PROJECT_ROOT, inputPath);
+  if (!resolved.startsWith(PROJECT_ROOT)) {
+    throw new Error('Path is outside the project directory.');
   }
+  return resolved;
+}
 
-  const colorGradients = [
-    ['#364B1D', '#5E8232', '#86B947', '#B5F96C'],
-    ['#5E8232', '#86B947', '#B5F96C', '#DDFFA8'],
-    ['#86B947', '#B5F96C', '#FFFFFF', '#B5F96C'],
-    ['#B5F96C', '#B5F96C', '#B5F96C', '#9EEB49']
-  ];
+/**
+ * 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.');
+  }
 
-  for (const colors of colorGradients) {
-    process.stdout.write('\x1B[?25l');
-    process.stdout.write('\r\x1B[K');
-    console.clear();
-    console.log();
+  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`;
+  }
 
-    BANNER_ART.forEach((line, index) => {
-      const color = colors[index % colors.length];
-      console.log(chalk.hex(color).bold(line));
+  try {
+    const output = execSync(finalCommand, {
+      cwd: PROJECT_ROOT,
+      encoding: 'utf-8',
+      shell: getShell(),
+      timeout: 30000,
+      maxBuffer: MAX_OUTPUT_SIZE,
+      stdio: 'pipe',
     });
-
-    console.log(
-      chalk.hex('#3B472E')(
-        '  ┌──────────────────────────────────────────────────────────┐\n' +
-        '  │'
-      ) +
-      chalk.hex('#B5F96C').bold('          Give your computer a job.           ') +
-      chalk.hex('#3B472E')(
-        '│\n' +
-        '  └──────────────────────────────────────────────────────────┘\n'
-      )
-    );
-
-    await SLEEP(75);
+    const trimmed = output.trim();
+    return trimmed || 'Command executed successfully with no output.';
+  } catch (err) {
+    // 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}`);
   }
-
-  process.stdout.write('\x1B[?25h');
 }
 
-// ─── Custom Help ──────────────────────────────────────────────
-async function customHelp() {
-  console.log(chalk.hex('#B5F96C').bold('\n  SHOUD Terminal Agent - Command Reference\n'));
-  console.log(chalk.gray('  Usage: shoud [command] OR shoud "[prompt]"\n'));
-
-  console.log(chalk.white.bold('  Commands:'));
-  console.log(`    ${chalk.hex('#B5F96C')('shoud login')}     Authenticate this device with your Google account.`);
-  console.log(`    ${chalk.hex('#B5F96C')('shoud help')}      Display this help menu.`);
-  console.log(`    ${chalk.hex('#B5F96C')('shoud status')}    Check your current credit balance and active plan.`);
-  console.log(`    ${chalk.hex('#B5F96C')('shoud --version')} Show the version number.\n`);
-
-  console.log(chalk.white.bold('  Autonomous Execution:'));
-  console.log(chalk.gray('    Wrap your instructions in quotes to trigger the agent loop.'));
-  console.log(`    ${chalk.hex('#B5F96C')('>')} shoud "Refactor the auth middleware to use JWTs"`);
-  console.log(`    ${chalk.hex('#B5F96C')('>')} shoud "Run npm test and fix any failing test cases"\n`);
+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) {
+      const buffer = Buffer.alloc(MAX_OUTPUT_SIZE);
+      const fd = fs.openSync(safePath, 'r');
+      fs.readSync(fd, buffer, 0, MAX_OUTPUT_SIZE, 0);
+      fs.closeSync(fd);
+      return buffer.toString('utf-8') + '\n... (file truncated)';
+    }
+    return fs.readFileSync(safePath, 'utf-8');
+  } catch (err) {
+    throw new Error(`Failed to read file: ${err.message}`);
+  }
 }
 
-// ─── Main ──────────────────────────────────────────────────────
-async function main() {
-  const args = process.argv.slice(2);
-
-  // Intercept help, version, and empty input
-  if (args.length === 0 ||
-      args[0] === 'help' || args[0] === '--help' || args[0] === '-h' ||
-      args[0] === '--version' || args[0] === '-v') {
-    if (args[0] === '--version' || args[0] === '-v') {
-      program.version('1.0.6');
-      program.parse(process.argv);
-      return;
+function writeFile(filePath, content) {
+  const safePath = sanitizePath(filePath);
+  try {
+    const dir = path.dirname(safePath);
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
     }
-    await renderAnimatedBanner();
-    await customHelp();
-    return;
+    fs.writeFileSync(safePath, content, 'utf-8');
+    return `File written successfully: ${filePath}`;
+  } catch (err) {
+    throw new Error(`Failed to write file: ${err.message}`);
   }
+}
 
-  program
-    .version('1.0.6')
-    .description('SHOUD Terminal Agent');
-
-  program
-    .command('login')
-    .description('Authenticate this device with your SHOUD account')
-    .action(login);
-
-  // Placeholder for status
-  program
-    .command('status')
-    .description('Check your current credit balance and active plan')
-    .action(() => {
-      console.log(chalk.yellow('  Status command not yet implemented.'));
-    });
-
-  program
-    .argument('[prompt...]', 'The task you want SHOUD to execute')
-    .action(async (promptArr) => {
-      if (!promptArr || promptArr.length === 0) {
-        console.log(chalk.gray('  Usage: shoud "fix the build errors"'));
-        return;
-      }
-      const taskPrompt = promptArr.join(' ');
-      await executeTask(taskPrompt);
-      // ✅ After task completes, show the static banner
-      printStaticBanner();
-    });
-
-  program.parse(process.argv);
+function executeTool(toolName, input) {
+  try {
+    switch (toolName) {
+      case 'execute_shell':
+        return executeShell(input.command);
+      case 'read_file':
+        return readFile(input.path);
+      case 'write_file':
+        return writeFile(input.path, input.content);
+      default:
+        throw new Error(`Tool "${toolName}" is not supported.`);
+    }
+  } catch (error) {
+    return `Tool execution failed: ${error.message}`;
+  }
 }
 
-main();
+module.exports = { executeTool };