wispy-cli 2.7.5 → 2.7.6

package/bin/wispy.mjs

@@ -1,123 +1,341 @@
 #!/usr/bin/env node
 
 /**
- * wispy-cli
- * Async refactored dispatcher avoids direct top-level awaits in Node modules.
+ * wispy-cli — main entry point
+ *
+ * Dispatches to the correct handler based on the first argument:
+ *   - Operator commands (setup, config, doctor, etc.) → operator CLI or inline handler
+ *   - Server commands → server manager
+ *   - Everything else → REPL (interactive chat)
+ *
+ * v2.7.x — rewired to properly route all commands.
  */
-(async () => {
-  const { fileURLToPath } = await import('url');
-  const { dirname } = await import('path');
-  const { readFile } = await import('fs/promises');
-  const baseDir = dirname(fileURLToPath(import.meta.url));
 
-  const args = process.argv.slice(2);
+import { fileURLToPath } from "node:url";
+import { dirname, join } from "node:path";
+import { readFile } from "node:fs/promises";
+import { existsSync } from "node:fs";
 
-  if (args.includes('--help')) {
-    console.log(`\nWispy CLI Help:\n\nCommands:\n  ws      - Execute WebSocket operations\n  help    - Interactive help guide\n  --help  - Show this message\n  --version - Display version\n\n`);
-    process.exit(0);
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const rootDir = join(__dirname, "..");
+
+const args = process.argv.slice(2);
+const command = args[0];
+
+// ── Flags ─────────────────────────────────────────────────────────────────────
+
+if (args.includes("--version") || command === "--version" || command === "-v") {
+  try {
+    const pkg = JSON.parse(await readFile(join(rootDir, "package.json"), "utf8"));
+    console.log(`wispy-cli v${pkg.version}`);
+  } catch {
+    console.error("Failed to read version from package.json");
   }
+  process.exit(0);
+}
 
-  async function handleCommand(command) {
-    const inquirer = (await import('inquirer')).default;
-
-    if (!command) {
-      let answers;
-      try {
-        answers = await inquirer.prompt([
-          {
-            type: 'list',
-            name: 'selectedCommand',
-            message: 'What would you like to do?',
-            choices: [
-              { name: 'Run WebSocket command - Execute and debug WebSocket operations', value: 'ws' },
-              { name: 'Get help - Learn about available commands and usage', value: 'help' },
-              { name: 'Exit - Close the interactive prompt', value: null }
-            ],
-          }
-        ]);
-      } catch (error) {
-        console.error("TTY Prompt failed. Need help? Run 'node bin/wispy.mjs --help'. Restarting interactivity...");
-        process.exit(0);
-      }
-      command = answers.selectedCommand;
+if (args.includes("--help") || command === "--help" || command === "-h" || command === "help") {
+  const pkg = JSON.parse(await readFile(join(rootDir, "package.json"), "utf8"));
+  console.log(`
+wispy-cli v${pkg.version}
+AI workspace assistant — chat, automate, and orchestrate from the terminal.
+
+Usage:
+  wispy                        Start interactive REPL
+  wispy <message>              One-shot chat
+  wispy setup                  Run first-time setup wizard
+  wispy config [show|get|set|delete|reset|path|edit]
+                               Manage configuration
+  wispy model                  Show or change AI model
+  wispy doctor                 Check system health
+  wispy trust [level|log]      Security level & audit
+  wispy ws [start-client|run-debug]
+                               WebSocket operations
+  wispy skill [list|run]       Manage learned skills
+  wispy teach <name>           Create skill from conversation
+  wispy improve <name>         Improve a skill
+  wispy where                  Show current mode (local/cloud)
+  wispy handoff [cloud|local]  Sync between environments
+  wispy server [start|stop|status]
+                               Manage HTTP/WS server
+  wispy tui                    Launch full terminal UI
+  wispy overview               Director view of workstreams
+
+Options:
+  -w, --workstream <name>      Set active workstream
+  --session <id>               Resume a session
+  --model <name>               Override AI model
+  --provider <name>            Override AI provider
+  --help, -h                   Show this help
+  --version, -v                Show version
+`);
+  process.exit(0);
+}
+
+// ── Setup (first-run wizard) ──────────────────────────────────────────────────
+
+if (command === "setup") {
+  try {
+    const { OnboardingWizard } = await import(join(rootDir, "core/onboarding.mjs"));
+    const wizard = new OnboardingWizard();
+    await wizard.run();
+  } catch (err) {
+    console.error("Setup failed:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
+// ── Config ────────────────────────────────────────────────────────────────────
+
+if (command === "config") {
+  try {
+    const { loadConfig, saveConfig, WISPY_DIR, CONFIG_PATH } = await import(join(rootDir, "core/config.mjs"));
+    const sub = args[1];
+    const config = await loadConfig();
+
+    if (!sub || sub === "show") {
+      console.log(JSON.stringify(config, null, 2));
+    } else if (sub === "path") {
+      console.log(CONFIG_PATH);
+    } else if (sub === "get") {
+      const key = args[2];
+      if (!key) { console.error("Usage: wispy config get <key>"); process.exit(1); }
+      console.log(config[key] !== undefined ? JSON.stringify(config[key], null, 2) : `Key '${key}' not found`);
+    } else if (sub === "set") {
+      const key = args[2], value = args[3];
+      if (!key || value === undefined) { console.error("Usage: wispy config set <key> <value>"); process.exit(1); }
+      try { config[key] = JSON.parse(value); } catch { config[key] = value; }
+      await saveConfig(config);
+      console.log(`Set ${key} = ${JSON.stringify(config[key])}`);
+    } else if (sub === "delete") {
+      const key = args[2];
+      if (!key) { console.error("Usage: wispy config delete <key>"); process.exit(1); }
+      delete config[key];
+      await saveConfig(config);
+      console.log(`Deleted '${key}'`);
+    } else if (sub === "reset") {
+      const { confirm } = await import("@inquirer/prompts");
+      const yes = await confirm({ message: "Reset all config to defaults?", default: false });
+      if (yes) { await saveConfig({}); console.log("Config reset to defaults."); }
+    } else if (sub === "edit") {
+      const editor = process.env.EDITOR || "nano";
+      const { execSync } = await import("node:child_process");
+      execSync(`${editor} "${CONFIG_PATH}"`, { stdio: "inherit" });
+    } else {
+      console.error(`Unknown config subcommand: ${sub}`);
+      console.log("Available: show, get, set, delete, reset, path, edit");
+      process.exit(1);
     }
+  } catch (err) {
+    console.error("Config error:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
 
-    switch (command) {
-      case "--version":
-        try {
-          const packageJson = JSON.parse(await readFile(`${baseDir}/../package.json`, 'utf8'));
-          console.log(`Wispy CLI version: ${packageJson.version}`);
-        } catch {
-          console.error('Failed to read version information from package.json.');
-        }
-        break;
-      case "ws":
-        if (!args[1]) {
-          let subcommand;
-          try {
-            const { subcommand: chosenSubcommand } = await inquirer.prompt([
-              {
-                type: 'list',
-                name: 'subcommand',
-                message: 'Choose a WebSocket subcommand:',
-                choices: [
-                  { name: 'Start WebSocket Client', value: 'start-client' },
-                  { name: 'Run WebSocket Server Debug Mode', value: 'run-debug' }
-                ]
-              }
-            ]);
-            subcommand = chosenSubcommand;
-          } catch (error) {
-            console.error('Interactive prompt was cancelled or closed. Exiting gracefully.');
-            process.exit(0);
-          }
-          args[1] = subcommand;
-        } else if (!['start-client', 'run-debug'].includes(args[1])) {
-          console.error(`Error: Unrecognized argument '${args[1]}'.`);
-          const { retry } = await inquirer.prompt([
-            {
-              type: 'confirm',
-              name: 'retry',
-              message: 'Would you like to re-enter the WebSocket command?',
-              default: true,
-            }
-          ]);
-          if (retry) return await handleCommand('ws');
-          process.exit(1);
-        }
-        const { handleWsCommand } = await import(baseDir + '/../lib/commands/ws.mjs');
-        return await handleWsCommand(args);
-      case "help":
-        if (args.length > 1) {
-          console.error(`Invalid arguments provided for 'help': ${args.slice(1).join(' ')}\n`);
-          console.log(`Usage: node bin/wispy.mjs help\n\nAvailable Commands:\n  ws   - Run WebSocket command (debug operations)\n  help - Show this message\n\nTip: Run 'node bin/wispy.mjs' with no args for interactive guidance!\n`);
-        } else {
-          console.log(`\nWispy CLI Help:\n\nCommands:\n  ws  - Run WebSocket command (e.g., 'node bin/wispy.mjs ws')\n  help - Show this help message (e.g., 'node bin/wispy.mjs --help')\n  --version - Show the CLI version (e.g., 'node bin/wispy.mjs --version')\n\nExamples:\n  $ node bin/wispy.mjs ws\n  $ node bin/wispy.mjs --help\n  $ node bin/wispy.mjs --version\n\nTip: Use no args for full interactivity.\n`);
-        }
-        break;
-      case null:
-        console.log("Goodbye!");
-        break;
-      default:
-        const { getCommandsWithSkills } = await import(baseDir + '/../lib/command-registry.mjs');
-        const validCommands = getCommandsWithSkills(null);
-        const prompt = (await import('inquirer')).default;
-        console.error(`Unknown command: ${command}`);
-        try {
-          const { choice } = await prompt.prompt([{
-            type: 'list',
-            name: 'choice',
-            message: 'Unknown command. Need help? Select a valid command:',
-            choices: validCommands.map(c => `${c.cmd} - ${c.desc}`),
-          }]);
-          const selectedCmd = choice.split(' ')[0];
-          console.log(`Executing '${selectedCmd}'...`);
-          await handleCommand(selectedCmd);
-        } catch (err) {
-          console.log('Prompt exited. No command executed. Goodbye!');
+// ── Doctor ────────────────────────────────────────────────────────────────────
+
+if (command === "doctor") {
+  try {
+    const { loadConfig, detectProvider, WISPY_DIR } = await import(join(rootDir, "core/config.mjs"));
+    const config = await loadConfig();
+    const provider = await detectProvider();
+    const pkg = JSON.parse(await readFile(join(rootDir, "package.json"), "utf8"));
+
+    console.log(`\n  wispy-cli v${pkg.version}`);
+    console.log(`  Config dir:  ${WISPY_DIR}`);
+    console.log(`  Provider:    ${provider?.provider ?? "none"}`);
+    console.log(`  Model:       ${provider?.model ?? "none"}`);
+    console.log(`  API key:     ${provider?.key ? "✓ set" : "✗ missing"}`);
+
+    // Check optional components
+    const checks = [
+      { name: "Config file", ok: existsSync(join(WISPY_DIR, "config.json")) },
+      { name: "Memory dir", ok: existsSync(join(WISPY_DIR, "memory")) },
+      { name: "Sessions dir", ok: existsSync(join(WISPY_DIR, "sessions")) },
+      { name: "MCP config", ok: existsSync(join(WISPY_DIR, "mcp.json")) },
+    ];
+    console.log("");
+    for (const c of checks) {
+      console.log(`  ${c.ok ? "✓" : "✗"} ${c.name}`);
+    }
+    console.log("");
+
+    if (!provider?.key) {
+      console.log("  Run 'wispy setup' to configure an API key.\n");
+    } else {
+      console.log("  All good!\n");
+    }
+  } catch (err) {
+    console.error("Doctor error:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
+// ── Trust ─────────────────────────────────────────────────────────────────────
+
+if (command === "trust") {
+  try {
+    const { handleTrustCommand } = await import(join(rootDir, "lib/commands/trust.mjs"));
+    await handleTrustCommand(args.slice(1));
+  } catch (err) {
+    console.error("Trust command error:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
+// ── WebSocket ─────────────────────────────────────────────────────────────────
+
+if (command === "ws") {
+  try {
+    const { handleWsCommand } = await import(join(rootDir, "lib/commands/ws.mjs"));
+    await handleWsCommand(args);
+  } catch (err) {
+    console.error("WS command error:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
+// ── Skills ────────────────────────────────────────────────────────────────────
+
+if (command === "skill" || command === "skills") {
+  try {
+    const { handleSkillCommand } = await import(join(rootDir, "lib/commands/skills-cmd.mjs"));
+    await handleSkillCommand(args.slice(1));
+  } catch (err) {
+    console.error("Skill command error:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
+if (command === "teach") {
+  try {
+    const { cmdTeach } = await import(join(rootDir, "lib/commands/skills-cmd.mjs"));
+    await cmdTeach(args[1]);
+  } catch (err) {
+    console.error("Teach error:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
+if (command === "improve") {
+  try {
+    const { cmdImproveSkill } = await import(join(rootDir, "lib/commands/skills-cmd.mjs"));
+    await cmdImproveSkill(args[1], args.slice(2).join(" "));
+  } catch (err) {
+    console.error("Improve error:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
+// ── Continuity ────────────────────────────────────────────────────────────────
+
+if (command === "where") {
+  try {
+    const { cmdWhere } = await import(join(rootDir, "lib/commands/continuity.mjs"));
+    await cmdWhere();
+  } catch (err) {
+    console.error("Where error:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
+if (command === "handoff") {
+  try {
+    const { handleContinuityCommand } = await import(join(rootDir, "lib/commands/continuity.mjs"));
+    await handleContinuityCommand(args.slice(1));
+  } catch (err) {
+    console.error("Handoff error:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
+// ── Model ─────────────────────────────────────────────────────────────────────
+
+if (command === "model") {
+  try {
+    const { loadConfig, saveConfig, detectProvider, PROVIDERS } = await import(join(rootDir, "core/config.mjs"));
+    const config = await loadConfig();
+    const detected = await detectProvider();
+
+    if (args[1]) {
+      config.model = args[1];
+      await saveConfig(config);
+      console.log(`Model set to: ${args[1]}`);
+    } else {
+      console.log(`\n  Provider: ${detected?.provider ?? "none"}`);
+      console.log(`  Model:    ${detected?.model ?? "none"}`);
+      console.log(`\n  Override: wispy model <model-name>`);
+      console.log(`  Env var:  WISPY_MODEL=<model-name>`);
+
+      if (PROVIDERS) {
+        console.log(`\n  Available providers:`);
+        for (const [key, p] of Object.entries(PROVIDERS)) {
+          console.log(`    ${key.padEnd(14)} ${p.defaultModel}`);
         }
+      }
+      console.log("");
     }
+  } catch (err) {
+    console.error("Model error:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
+// ── TUI ───────────────────────────────────────────────────────────────────────
+
+if (command === "tui") {
+  try {
+    await import(join(rootDir, "bin/wispy-tui.mjs"));
+  } catch (err) {
+    console.error("TUI launch error:", err.message);
+    process.exit(1);
   }
+  // TUI handles its own lifecycle
+}
 
-  await handleCommand(args[0]);
-})();
+// ── Overview ──────────────────────────────────────────────────────────────────
+
+if (command === "overview") {
+  // Delegate to REPL with overview flag
+  process.env.WISPY_OVERVIEW = "1";
+}
+
+// ── Server ────────────────────────────────────────────────────────────────────
+
+if (command === "server") {
+  // Delegate to REPL which has server handling built in
+  // (lib/wispy-repl.mjs handles server start/stop/status)
+}
+
+// ── Default: launch REPL ──────────────────────────────────────────────────────
+// For no args, one-shot messages, or unrecognized commands that the REPL handles
+
+if (command === "server" || command === "overview") {
+  // Already set up env flags above, fall through to REPL
+}
+
+// If we get here and it's not a recognized command above, go to REPL
+// The REPL handles: interactive chat, one-shot "wispy <message>", server, overview
+try {
+  await import(join(rootDir, "lib/wispy-repl.mjs"));
+} catch (err) {
+  if (err.code === "ERR_MODULE_NOT_FOUND") {
+    console.error(`Module not found: ${err.message}`);
+    console.error("Try running: npm install");
+  } else {
+    console.error("Failed to start wispy:", err.message);
+  }
+  process.exit(1);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wispy-cli",
-  "version": "2.7.5",
+  "version": "2.7.6",
   "description": "🌿 Wispy — AI workspace assistant with trustworthy execution (harness, receipts, approvals, diffs)",
   "license": "MIT",
   "author": "Minseo & Poropo",