shoud-cli 1.0.11 → 3.0.2

package/bin/shoud.js

@@ -1,144 +1,248 @@
 #!/usr/bin/env node
-
 const { program } = require('commander');
 const chalk = require('chalk');
-const { login } = require('../src/auth/deviceFlow');
+const path = require('path');
+const fs = require('fs');
+const inquirer = require('inquirer');
+
+const { initDirs } = require('../src/utils/config');
+const { ExitCodes } = require('../src/utils/errors');
+const { printStaticBanner } = require('../src/ui/banner');
+const { login, getEmail } = require('../src/auth/deviceFlow');
+const { createJob, JobStatus } = require('../src/job/model');
+const { saveJob, loadJob, listJobs, findResumableJob } = require('../src/job/manager');
 const { executeTask } = require('../src/runtime/agentLoop');
+const { undoJob, undoLatest } = require('../src/job/undo');
+const { formatReceipt } = require('../src/job/receipt');
+const { discoverProject, formatProject } = require('../src/project/discovery');
 
-// ─── Original SHOUD Banner Art ──────────────────────────────
-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));
-
-async function renderAnimatedBanner() {
-  if (!process.stdout.isTTY) {
-    printStaticBanner();
-    return;
-  }
-
-  const colorGradients = [
-    ['#364B1D', '#5E8232', '#86B947', '#B5F96C'],
-    ['#5E8232', '#86B947', '#B5F96C', '#DDFFA8'],
-    ['#86B947', '#B5F96C', '#FFFFFF', '#B5F96C'],
-    ['#B5F96C', '#B5F96C', '#B5F96C', '#9EEB49']
-  ];
-
-  for (const colors of colorGradients) {
-    process.stdout.write('\x1B[?25l');
-    process.stdout.write('\r\x1B[K');
-    console.clear();
-    console.log();
-
-    BANNER_ART.forEach((line, index) => {
-      const color = colors[index % colors.length];
-      console.log(chalk.hex(color).bold(line));
-    });
-
-    console.log(
-      chalk.hex('#3B472E')(
-        '  ┌──────────────────────────────────────────────────────────┐\n' +
-        '  │'
-      ) +
-      chalk.hex('#B5F96C').bold('          Give your computer a job.           ') +
-      chalk.hex('#3B472E')(
-        '│\n' +
-        '  └──────────────────────────────────────────────────────────┘\n'
-      )
-    );
-
-    await SLEEP(75);
-  }
-
-  process.stdout.write('\x1B[?25h');
-}
+initDirs();
 
-// ─── 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`);
-}
-
-// ─── 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.9');
-      program.parse(process.argv);
-      return;
-    }
-    await renderAnimatedBanner();
-    await customHelp();
-    return;
+  // Intercept bare invocation
+  if (args.length === 0) {
+    return handleBareInvocation();
   }
 
   program
-    .version('1.0.9')
-    .description('SHOUD Terminal Agent');
+    .name('shoud')
+    .version('2.0.0')
+    .description('SHOUD Terminal Agent')
+    .argument('[prompt...]', 'The task you want SHOUD to execute')
+    .option('--budget <amount>', 'Budget for this job in USD', parseFloat)
+    .option('--json', 'Emit JSON output (for scripting)')
+    .option('--no-color', 'Disable colored output')
+    .action(async (promptArr, opts) => {
+      if (!promptArr || promptArr.length === 0) {
+        await handleBareInvocation();
+        return;
+      }
+      await runJob(promptArr.join(' '), opts);
+    });
 
   program
     .command('login')
-    .description('Authenticate this device with your SHOUD account')
-    .action(() => {
-      // Optionally show banner before login? We'll keep it clean.
-      login();
+    .description('Authenticate this device')
+    .action(async () => {
+      try { await login(); process.exit(0); }
+      catch (e) { console.error(chalk.red(e.message)); process.exit(1); }
     });
 
-  // Placeholder for status
   program
     .command('status')
-    .description('Check your current credit balance and active plan')
+    .description('Show active job or last completed job')
+    .action(() => showStatus());
+
+  program
+    .command('jobs')
+    .description('List all jobs')
     .action(() => {
-      console.log(chalk.yellow('  Status command not yet implemented.'));
+      const jobs = listJobs();
+      if (!jobs.length) { console.log('No jobs found.'); return; }
+      for (const j of jobs) {
+        console.log(`  ${j.id}  ${j.status.padEnd(24)}  $${(j.spent || 0).toFixed(4)}  ${j.prompt?.slice(0, 60)}`);
+      }
     });
 
   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;
+    .command('undo [jobId]')
+    .description('Undo changes from a job (or the most recent completed job)')
+    .action(async (jobId) => {
+      try {
+        let result;
+        if (jobId) result = { job: { id: jobId }, result: undoJob(jobId) };
+        else result = undoLatest();
+        console.log(chalk.green(`\n✓ Reverted job ${result.job.id}.`));
+        if (result.result.preservedUserChanges) {
+          console.log(chalk.green('✓ Pre-existing user changes preserved.'));
+        }
+        process.exit(0);
+      } catch (e) {
+        console.error(chalk.red(`\n✗ Undo failed: ${e.message}`));
+        process.exit(1);
       }
-      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);
+  program
+    .command('receipt [jobId]')
+    .description('Show the receipt for a job')
+    .action((jobId) => {
+      const id = jobId || listJobs()[0]?.id;
+      if (!id) { console.log('No jobs found.'); return; }
+      const job = loadJob(id);
+      if (!job) { console.log(`Job ${id} not found.`); return; }
+      console.log('\n' + formatReceipt(job));
+    });
+
+  program
+    .command('project')
+    .description('Show detected project info')
+    .action(() => {
+      const p = discoverProject(process.cwd());
+      console.log(chalk.bold('\nProject info\n'));
+      console.log(formatProject(p));
+      console.log();
+    });
+
+  await program.parseAsync(process.argv);
+}
+
+async function handleBareInvocation() {
+  printStaticBanner();
+  const resumable = findResumableJob();
+
+  if (resumable) {
+    console.log(chalk.yellow(`\nInterrupted job found: ${resumable.id}`));
+    console.log(chalk.gray(`  ${resumable.prompt}`));
+    console.log(chalk.gray(`  Status: ${resumable.status}  Spent: $${(resumable.spent || 0).toFixed(4)}`));
+
+    const { action } = await inquirer.prompt([{
+      type: 'list', name: 'action',
+      message: 'What would you like to do?',
+      choices: [
+        { name: 'Resume it', value: 'resume' },
+        { name: 'View receipt', value: 'receipt' },
+        { name: 'Undo its changes', value: 'undo' },
+        { name: 'Start a new job', value: 'new' },
+        { name: 'Quit', value: 'quit' },
+      ],
+    }]);
+
+    if (action === 'resume') {
+      const job = loadJob(resumable.id);
+      job.status = JobStatus.RUNNING;
+      await executeTask(job);
+      return;
+    }
+    if (action === 'receipt') {
+      const job = loadJob(resumable.id);
+      console.log('\n' + formatReceipt(job));
+      return;
+    }
+    if (action === 'undo') {
+      try { undoJob(resumable.id); console.log(chalk.green('\n✓ Reverted.')); }
+      catch (e) { console.error(chalk.red(`✗ ${e.message}`)); }
+      return;
+    }
+    if (action === 'quit') return;
+    // 'new' falls through
+  }
+
+  // No resumable job, no prompt → print usage
+  console.log(chalk.bold('\nUsage:') + ' shoud "[prompt]"');
+  console.log(chalk.gray('   or: shoud login     (authenticate)'));
+  console.log(chalk.gray('   or: shoud jobs      (list jobs)'));
+  console.log(chalk.gray('   or: shoud undo      (revert last job)'));
+  console.log();
+  console.log(chalk.bold('Commands:'));
+  for (const c of [
+    ['shoud login', 'Authenticate this device'],
+    ['shoud status', 'Show active/last job'],
+    ['shoud jobs', 'List all jobs'],
+    ['shoud undo [id]', 'Revert changes from a job'],
+    ['shoud receipt [id]', 'Show a job receipt'],
+    ['shoud project', 'Show detected project info'],
+  ]) {
+    console.log(`  ${chalk.hex('#B5F96C')(c[0].padEnd(22))} ${chalk.gray(c[1])}`);
+  }
+  console.log();
+}
+
+async function runJob(prompt, opts) {
+  printStaticBanner();
+
+  const email = await getEmail();
+  if (!email) {
+    console.log(chalk.red('\nNot signed in. Run `shoud login` first.'));
+    process.exit(ExitCodes.AUTH_REQUIRED);
+  }
+
+  const projectRoot = process.cwd();
+  const job = createJob({
+    prompt,
+    projectRoot,
+    budget: opts.budget || 2.0,
+  });
+
+  // Pre-fill verification commands from project discovery + SHOUD.md
+  const project = discoverProject(projectRoot);
+  const { loadShoudMd } = require('../src/project/shoudMd');
+  const shoud = loadShoudMd(projectRoot);
+  job.verification.commands = shoud.verification.length ? shoud.verification : (project.verification || []);
+
+  saveJob(job);
+
+  try {
+    const finalJob = await executeTask(job);
+    let exitCode = ExitCodes.VERIFIED;
+    switch (finalJob.status) {
+      case JobStatus.VERIFIED: exitCode = ExitCodes.VERIFIED; break;
+      case JobStatus.IMPLEMENTED_NOT_VERIFIED: exitCode = ExitCodes.VERIFIED; break;
+      case JobStatus.FAILED: exitCode = ExitCodes.FAILED; break;
+      case JobStatus.BLOCKED: exitCode = ExitCodes.BLOCKED; break;
+      case JobStatus.BUDGET_EXCEEDED: exitCode = ExitCodes.BUDGET_EXCEEDED; break;
+      case JobStatus.PERMISSION_DENIED: exitCode = ExitCodes.PERMISSION_DENIED; break;
+      case JobStatus.CANCELLED: exitCode = ExitCodes.CANCELLED; break;
+      default: exitCode = ExitCodes.FAILED;
+    }
+    if (opts.json) {
+      process.stdout.write(JSON.stringify({
+        jobId: finalJob.id,
+        status: finalJob.status,
+        spent: finalJob.spent,
+        changedFiles: finalJob.changedFiles,
+        verification: finalJob.verification.results.map(r => ({ command: r.command, ok: r.ok })),
+      }, null, 2) + '\n');
+    }
+    process.exit(exitCode);
+  } catch (err) {
+    if (err.code === ExitCodes.AUTH_REQUIRED) {
+      console.error(chalk.red('\n' + err.message));
+      process.exit(ExitCodes.AUTH_REQUIRED);
+    }
+    console.error(chalk.red(`\n✗ ${err.message}`));
+    process.exit(1);
+  }
+}
+
+function showStatus() {
+  const jobs = listJobs();
+  if (!jobs.length) { console.log('No jobs yet.'); return; }
+  const active = jobs.find(j => !['verified', 'failed', 'cancelled', 'blocked', 'budget_exceeded'].includes(j.status));
+  const j = active || jobs[0];
+  console.log(chalk.bold('\nJob ' + j.id));
+  console.log(`  Prompt:  ${j.prompt}`);
+  console.log(`  Status:  ${j.status}`);
+  console.log(`  Spent:   $${(j.spent || 0).toFixed(4)}`);
+  console.log(`  Started: ${j.startedAt}`);
+  if (j.completedAt) console.log(`  Ended:   ${j.completedAt}`);
+  console.log();
 }
 
-main();
+main().catch((err) => {
+  console.error(chalk.red(`\nFatal: ${err.message}`));
+  if (process.env.SHOUD_DEBUG) console.error(err.stack);
+  process.exit(1);
+});

package/install.sh

@@ -1,18 +1,23 @@
 #!/usr/bin/env bash
 set -e
 
-echo "Installing SHOUD Agent..."
+echo "Installing SHOUD Terminal Agent v2..."
 echo "Give your computer a job."
 
-# Check if npm is installed
-if ! command -v npm &> /dev/null
-then
-    echo "Error: npm could not be found. Please install Node.js and npm first."
-    exit 1
+if ! command -v node &> /dev/null; then
+  echo "Error: Node.js >= 18 required. Install from https://nodejs.org"
+  exit 1
+fi
+
+NODE_MAJOR=$(node -p "process.versions.node.split('.')[0]")
+if [ "$NODE_MAJOR" -lt 18 ]; then
+  echo "Error: Node.js >= 18 required (found $(node -v))."
+  exit 1
 fi
 
 npm install -g shoud-cli
 
 echo ""
-echo "✓ Installation complete."
-echo "Run 'shoud login' to authenticate your device."
+echo "✓ Installed."
+echo "  Authenticate with:  shoud login"
+echo "  Run a job with:     shoud \"fix the build\""

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "shoud-cli",
-  "version": "1.0.11",
+  "version": "3.0.2",
   "description": "SHOUD Terminal Agent: Give your computer a job.",
   "main": "bin/shoud.js",
   "bin": {
     "shoud": "bin/shoud.js"
   },
   "scripts": {
-    "start": "node ./bin/shoud.js"
+    "start": "node ./bin/shoud.js",
+    "test": "node --test tests/"
   },
   "dependencies": {
     "axios": "^1.6.8",
@@ -15,21 +16,19 @@
     "commander": "^11.0.0",
     "inquirer": "^8.2.6",
     "open": "^8.4.2",
-    "ora": "^5.4.1"
+    "ora": "^5.4.1",
+    "fast-glob": "^3.3.2",
+    "ignore": "^5.3.0",
+    "diff": "^5.1.0"
   },
   "engines": {
-    "node": "18.0.0"
+    "node": ">=18.0.0"
   },
   "files": [
     "bin/",
     "src/",
     "install.sh",
-    "!**/*.test.js",
-    "!**/*.spec.js"
+    "README.md"
   ],
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/your-username/shoud-monorepo.git"
-  }
+  "license": "MIT"
 }

package/src/auth/credentials.js

@@ -0,0 +1,49 @@
+const fs = require('fs');
+const { paths } = require('../utils/config');
+
+/**
+ * Stores CLI credentials. Attempts OS keychain first, falls back to 0600 file.
+ * OS keychain support is via optional peer dependency `keytar` — if unavailable,
+ * we transparently fall back so the CLI works everywhere.
+ */
+let keytar = null;
+try { keytar = require('keytar'); } catch (_) { keytar = null; }
+
+const SERVICE = 'shoud-cli';
+const ACCOUNT = 'default';
+
+async function saveCredentials(payload) {
+  const json = JSON.stringify(payload);
+  if (keytar) {
+    try {
+      await keytar.setPassword(SERVICE, ACCOUNT, json);
+      return { storage: 'keychain' };
+    } catch (_) { /* fall through */ }
+  }
+  fs.writeFileSync(paths.SESSION_FILE, json, { encoding: 'utf-8', mode: 0o600 });
+  return { storage: 'file' };
+}
+
+async function loadCredentials() {
+  if (keytar) {
+    try {
+      const raw = await keytar.getPassword(SERVICE, ACCOUNT);
+      if (raw) return JSON.parse(raw);
+    } catch (_) {}
+  }
+  try {
+    if (fs.existsSync(paths.SESSION_FILE)) {
+      return JSON.parse(fs.readFileSync(paths.SESSION_FILE, 'utf-8'));
+    }
+  } catch (_) {}
+  return null;
+}
+
+async function clearCredentials() {
+  if (keytar) { try { await keytar.deletePassword(SERVICE, ACCOUNT); } catch (_) {} }
+  if (fs.existsSync(paths.SESSION_FILE)) {
+    try { fs.unlinkSync(paths.SESSION_FILE); } catch (_) {}
+  }
+}
+
+module.exports = { saveCredentials, loadCredentials, clearCredentials };