wispy-cli 2.7.2 → 2.7.3

package/bin/wispy.mjs

@@ -45,7 +45,7 @@
         const { handleWsCommand } = await import(baseDir + '/../lib/commands/ws.mjs');
         return await handleWsCommand(args);
       case "help":
-        console.log("Available commands: ws, help");
+        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\nExamples:\n  $ node bin/wispy.mjs ws\n  $ node bin/wispy.mjs --help\n\nTip: Run 'node bin/wispy.mjs' with no arguments for an interactive prompt.\n`);
         break;
       case null:
         console.log("Goodbye!");

package/lib/commands/ws.mjs

@@ -1,13 +1,5 @@
 /**
- * lib/commands/ws.mjs — Workstream CLI commands
- *
- * wispy ws                    list all workstreams with last activity
- * wispy ws new <name>         create new workstream
- * wispy ws switch <name>      switch active workstream
- * wispy ws archive <name>     archive workstream
- * wispy ws status             detailed status of all workstreams
- * wispy ws search <query>     search across all workstreams
- * wispy ws delete <name>      delete workstream
+ * lib/commands/ws.mjs — Final Workstream CLI commands
  */
 
 import { readFile, writeFile, mkdir, readdir, stat, rename, rm } from "node:fs/promises";
@@ -17,506 +9,50 @@ import os from "node:os";
 
 const WISPY_DIR = path.join(os.homedir(), ".wispy");
 const WORKSTREAMS_DIR = path.join(WISPY_DIR, "workstreams");
-const CONVERSATIONS_DIR = path.join(WISPY_DIR, "conversations");
-const MEMORY_DIR = path.join(WISPY_DIR, "memory");
-const ARCHIVE_DIR = path.join(WISPY_DIR, "archive");
-const CONFIG_PATH = path.join(WISPY_DIR, "config.json");
-
-const bold = (s) => `\x1b[1m${s}\x1b[0m`;
-const dim = (s) => `\x1b[2m${s}\x1b[0m`;
-const green = (s) => `\x1b[32m${s}\x1b[0m`;
-const cyan = (s) => `\x1b[36m${s}\x1b[0m`;
-const yellow = (s) => `\x1b[33m${s}\x1b[0m`;
 const red = (s) => `\x1b[31m${s}\x1b[0m`;
-
-async function readJsonOr(filePath, fallback = null) {
-  try {
-    return JSON.parse(await readFile(filePath, "utf8"));
-  } catch {
-    return fallback;
-  }
-}
-
-async function getConfig() {
-  return readJsonOr(CONFIG_PATH, {});
-}
-
-async function saveConfig(cfg) {
-  await mkdir(WISPY_DIR, { recursive: true });
-  await writeFile(CONFIG_PATH, JSON.stringify(cfg, null, 2) + "\n", "utf8");
-}
-
-async function getActiveWorkstream() {
-  const envWs = process.env.WISPY_WORKSTREAM;
-  if (envWs) return envWs;
-  const cfg = await getConfig();
-  return cfg.workstream ?? "default";
-}
+const yellow = (s) => `\x1b[33m${s}\x1b[0m`;
 
 /**
- * Get all workstreams by scanning conversations/ dir (legacy) and workstreams/ dir
+ * Command and argument validation map for `wispy ws`
  */
-async function listAllWorkstreams() {
-  const found = new Set(["default"]);
-  const results = [];
-
-  // Scan conversations/
-  try {
-    const files = await readdir(CONVERSATIONS_DIR);
-    for (const f of files) {
-      if (f.endsWith(".json")) found.add(f.replace(".json", ""));
-    }
-  } catch {}
-
-  // Scan workstreams/
-  try {
-    const dirs = await readdir(WORKSTREAMS_DIR);
-    for (const d of dirs) {
-      found.add(d);
-    }
-  } catch {}
-
-  const active = await getActiveWorkstream();
-
-  for (const name of found) {
-    const wsDir = path.join(WORKSTREAMS_DIR, name);
-    const convFile = path.join(CONVERSATIONS_DIR, `${name}.json`);
-    const workMd = path.join(wsDir, "work.md");
-
-    let lastActive = null;
-    let sessionCount = 0;
-
-    // Check conversation file
-    try {
-      const s = await stat(convFile);
-      lastActive = s.mtime;
-      const conv = await readJsonOr(convFile, []);
-      sessionCount = conv.filter(m => m.role === "user").length;
-    } catch {}
-
-    // Check workstream dir
-    try {
-      const s = await stat(wsDir);
-      if (!lastActive || s.mtime > lastActive) lastActive = s.mtime;
-    } catch {}
-
-    results.push({
-      name,
-      isActive: name === active,
-      lastActive,
-      sessionCount,
-      hasWorkMd: existsSync(workMd),
-      wsDir,
-      convFile,
-    });
-  }
-
-  // Sort: active first, then by last activity
-  results.sort((a, b) => {
-    if (a.isActive && !b.isActive) return -1;
-    if (!a.isActive && b.isActive) return 1;
-    const ta = a.lastActive ? a.lastActive.getTime() : 0;
-    const tb = b.lastActive ? b.lastActive.getTime() : 0;
-    return tb - ta;
-  });
-
-  return results;
-}
-
-function formatRelative(date) {
-  if (!date) return dim("never");
-  const diffMs = Date.now() - new Date(date).getTime();
-  const diffMin = Math.floor(diffMs / 60000);
-  const diffH = Math.floor(diffMin / 60);
-  const diffD = Math.floor(diffH / 24);
-  if (diffMin < 1) return green("just now");
-  if (diffMin < 60) return `${diffMin}min ago`;
-  if (diffH < 24) return `${diffH}h ago`;
-  if (diffD < 7) return `${diffD}d ago`;
-  return new Date(date).toLocaleDateString();
-}
-
-// ── Commands ─────────────────────────────────────────────────────────────────
-
-export async function cmdWsList() {
-  const workstreams = await listAllWorkstreams();
-  if (workstreams.length === 0) {
-    console.log(dim("No workstreams yet. Create one: wispy ws new <name>"));
-    return;
-  }
-
-  console.log(`\n${bold("🌿 Workstreams")}\n`);
-  for (const ws of workstreams) {
-    const marker = ws.isActive ? green("●") : "○";
-    const name = ws.isActive ? bold(green(ws.name)) : ws.name;
-    const msgs = ws.sessionCount > 0 ? dim(` · ${ws.sessionCount} msgs`) : "";
-    const last = `  ${dim(formatRelative(ws.lastActive))}`;
-    const plan = ws.hasWorkMd ? cyan(" 📋") : "";
-    console.log(`  ${marker} ${name.padEnd(25)}${last}${msgs}${plan}`);
-  }
-
-  const active = await getActiveWorkstream();
-  console.log(dim(`\n  Active: ${active}   Switch: wispy ws <name>   Create: wispy ws new <name>\n`));
-}
-
-export async function cmdWsNew(name) {
-  if (!name) {
-    console.log(yellow("Usage: wispy ws new <name>"));
-    return;
-  }
-
-  const wsDir = path.join(WORKSTREAMS_DIR, name);
-  await mkdir(wsDir, { recursive: true });
-
-  const workMd = path.join(wsDir, "work.md");
-  const workMdContent = `# ${name} Workstream
-
-## Current Work
-
-> Update this as you progress.
-
-## Goals
-
-
-## Context
-
-
-## Next Steps
-
-
-## Notes
-
-`;
-  await writeFile(workMd, workMdContent, "utf8");
-
-  // Also create conversations entry
-  await mkdir(CONVERSATIONS_DIR, { recursive: true });
-  const convFile = path.join(CONVERSATIONS_DIR, `${name}.json`);
-  if (!existsSync(convFile)) {
-    await writeFile(convFile, "[]", "utf8");
-  }
-
-  console.log(green(`✅ Created workstream: ${name}`));
-  console.log(dim(`   Dir: ${wsDir}`));
-  console.log(dim(`   Run: wispy ws switch ${name}  — to activate`));
-}
-
-export async function cmdWsSwitch(name) {
-  if (!name) {
-    console.log(yellow("Usage: wispy ws switch <name>"));
-    return;
-  }
-
-  const cfg = await getConfig();
-  cfg.workstream = name;
-  await saveConfig(cfg);
-
-  console.log(green(`✅ Active workstream: ${bold(name)}`));
-  console.log(dim(`   Start a session: wispy (or set WISPY_WORKSTREAM=${name})`));
-}
-
-export async function cmdWsArchive(name) {
-  if (!name) {
-    console.log(yellow("Usage: wispy ws archive <name>"));
-    return;
-  }
+const VALID_COMMANDS = {
+  ws: { args: 0 },
+  new: { args: 1 },
+  switch: { args: 1 },
+  archive: { args: 1 },
+  delete: { args: 1 },
+  status: { args: 0 },
+  search: { args: 1 },
+};
 
-  // Confirmation prompt
-  const { createInterface } = await import("node:readline");
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
-  const answer = await new Promise(r => rl.question(`Archive '${name}'? Sessions and memory will be moved. [Y/n] `, r));
-  rl.close();
-  if (answer.trim().toLowerCase() === "n") {
-    console.log(dim("Cancelled."));
-    return;
-  }
-
-  const archiveWsDir = path.join(ARCHIVE_DIR, name);
-  await mkdir(archiveWsDir, { recursive: true });
-
-  let moved = 0;
-
-  // Move workstream dir
-  const wsDir = path.join(WORKSTREAMS_DIR, name);
-  if (existsSync(wsDir)) {
-    await rename(wsDir, path.join(archiveWsDir, "workstream")).catch(() => {});
-    moved++;
-  }
-
-  // Move conversation
-  const convFile = path.join(CONVERSATIONS_DIR, `${name}.json`);
-  if (existsSync(convFile)) {
-    await rename(convFile, path.join(archiveWsDir, "conversation.json")).catch(() => {});
-    moved++;
-  }
-
-  if (moved === 0) {
-    console.log(yellow(`Workstream '${name}' not found or already archived.`));
-    return;
-  }
-
-  console.log(green(`📦 Archived workstream: ${name}`));
-  console.log(dim(`   Archive: ${archiveWsDir}`));
-}
-
-export async function cmdWsStatus() {
-  const workstreams = await listAllWorkstreams();
-
-  console.log(`\n${bold("🌿 Workstream Status")}\n`);
-
-  for (const ws of workstreams) {
-    const marker = ws.isActive ? green("●") : "○";
-    const name = ws.isActive ? bold(green(ws.name)) : bold(ws.name);
-    console.log(`${marker} ${name}`);
-
-    // Session count
-    console.log(`   Sessions: ${ws.sessionCount} messages`);
-
-    // Last active
-    console.log(`   Last active: ${formatRelative(ws.lastActive)}`);
-
-    // Memory files
-    const wsMemDir = path.join(ws.wsDir, "memory");
-    try {
-      const memFiles = await readdir(wsMemDir);
-      console.log(`   Memory: ${memFiles.length} files`);
-    } catch {
-      const globalMemFiles = await readdir(MEMORY_DIR).catch(() => []);
-      if (ws.isActive) console.log(`   Memory: ${globalMemFiles.length} files (global)`);
-    }
-
-    // Work.md preview
-    if (ws.hasWorkMd) {
-      try {
-        const workMdContent = await readFile(path.join(ws.wsDir, "work.md"), "utf8");
-        const lines = workMdContent.split("\n").filter(l => l.trim() && !l.startsWith("#")).slice(0, 2);
-        if (lines.length > 0) {
-          console.log(dim(`   Work: ${lines[0].replace(/^[>*\-] /, "").slice(0, 60)}`));
-        }
-      } catch {}
-    }
-
-    console.log("");
-  }
-}
-
-export async function cmdWsSearch(query) {
-  if (!query) {
-    console.log(yellow("Usage: wispy ws search <query>"));
-    return;
-  }
-
-  const workstreams = await listAllWorkstreams();
-  const lowerQuery = query.toLowerCase();
-
-  console.log(`\n${bold("🔍 Searching workstreams for:")} ${cyan(query)}\n`);
-  let totalMatches = 0;
-
-  for (const ws of workstreams) {
-    const matches = [];
-
-    // Search conversation
-    try {
-      const conv = await readJsonOr(ws.convFile, []);
-      const convMatches = conv.filter(m =>
-        (m.role === "user" || m.role === "assistant") &&
-        m.content?.toLowerCase().includes(lowerQuery)
-      );
-      for (const m of convMatches.slice(-3)) {
-        const preview = m.content.replace(/\n/g, " ").slice(0, 80);
-        matches.push(`  ${m.role === "user" ? "👤" : "🌿"} ${dim(preview + (m.content.length > 80 ? "..." : ""))}`);
-      }
-    } catch {}
-
-    // Search work.md
-    if (ws.hasWorkMd) {
-      try {
-        const content = await readFile(path.join(ws.wsDir, "work.md"), "utf8");
-        if (content.toLowerCase().includes(lowerQuery)) {
-          const lines = content.split("\n").filter(l => l.toLowerCase().includes(lowerQuery)).slice(0, 2);
-          for (const l of lines) {
-            matches.push(`  📋 ${dim(l.trim().slice(0, 80))}`);
-          }
-        }
-      } catch {}
-    }
-
-    if (matches.length > 0) {
-      const name = ws.isActive ? bold(green(ws.name)) : bold(ws.name);
-      console.log(`${name} (${matches.length} match${matches.length === 1 ? "" : "es"}):`);
-      matches.forEach(m => console.log(m));
-      console.log("");
-      totalMatches += matches.length;
-    }
-  }
-
-  if (totalMatches === 0) {
-    console.log(dim(`No matches found for "${query}"`));
-  }
-}
-
-export async function cmdWsDelete(name) {
-  if (!name) {
-    console.log(yellow("Usage: wispy ws delete <name>"));
-    return;
-  }
-
-  if (name === "default") {
-    console.log(red("Cannot delete the default workstream."));
-    return;
-  }
-
-  // Confirmation prompt
-  const { createInterface } = await import("node:readline");
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
-  const answer = await new Promise(r => rl.question(`⚠️  Are you sure? This will delete all sessions and memory for '${name}'. [y/N] `, r));
-  rl.close();
-  if (answer.trim().toLowerCase() !== "y") {
-    console.log(dim("Cancelled."));
-    return;
-  }
-
-  const wsDir = path.join(WORKSTREAMS_DIR, name);
-  const convFile = path.join(CONVERSATIONS_DIR, `${name}.json`);
-
-  let deleted = 0;
-
-  if (existsSync(wsDir)) {
-    await rm(wsDir, { recursive: true, force: true });
-    deleted++;
-  }
-
-  if (existsSync(convFile)) {
-    const { unlink } = await import("node:fs/promises");
-    await unlink(convFile).catch(() => {});
-    deleted++;
-  }
-
-  if (deleted === 0) {
-    console.log(red(`Workstream '${name}' not found.`));
-    return;
+/**
+ * Validate subcommands and arguments for `wispy ws`
+ */
+function validateWsArgs(args) {
+  if (!args.length) return null; // No args => List workstreams
+  const cmd = args[0];
+  if (!VALID_COMMANDS[cmd]) {
+    return red(`Unknown command: '${cmd}'`) + '\nValid commands: ' + Object.keys(VALID_COMMANDS).join(', ');
   }
-
-  // If it was active, reset to default
-  const cfg = await getConfig();
-  if (cfg.workstream === name) {
-    cfg.workstream = "default";
-    await saveConfig(cfg);
-    console.log(dim("  Reset active workstream to: default"));
+  const expectedArgs = VALID_COMMANDS[cmd].args;
+  if (args.length - 1 < expectedArgs) {
+    return red(`Command '${cmd}' expects ${expectedArgs} additional args.`);
   }
-
-  console.log(green(`🗑️  Deleted workstream: ${name}`));
+  return null;
 }
 
 export async function handleWsCommand(args) {
-  const sub = args[1];
-
-  if (!sub) {
-    // Interactive menu
-    try {
-      const { select, input, Separator } = await import("@inquirer/prompts");
-      const workstreams = await listAllWorkstreams();
-
-      const choices = [];
-      if (workstreams.length > 0) {
-        for (const ws of workstreams) {
-          const marker = ws.isActive ? "● " : "  ";
-          const last = formatRelative(ws.lastActive);
-          const msgs = ws.sessionCount > 0 ? ` · ${ws.sessionCount} msgs` : "";
-          choices.push({
-            name: `${marker}${ws.name}${ws.isActive ? " (active)" : ""} — ${last}${msgs}`,
-            value: { type: "switch", name: ws.name },
-            short: ws.name,
-          });
-        }
-      } else {
-        choices.push(new Separator(dim("No workstreams yet")));
-      }
-      choices.push(new Separator("──────────"));
-      choices.push({ name: "Create new workstream", value: { type: "new" }, short: "Create new" });
-      choices.push({ name: "Archive a workstream", value: { type: "archive" }, short: "Archive" });
-      choices.push({ name: "Delete a workstream", value: { type: "delete" }, short: "Delete" });
-
-      let answer;
-      try {
-        answer = await select({ message: "Workstreams:", choices });
-      } catch (e) {
-        if (e.name === "ExitPromptError") { process.exit(130); }
-        throw e;
-      }
-
-      if (answer.type === "switch") {
-        await cmdWsSwitch(answer.name);
-      } else if (answer.type === "new") {
-        let name;
-        try {
-          name = await input({ message: "New workstream name:" });
-        } catch (e) {
-          if (e.name === "ExitPromptError") return;
-          throw e;
-        }
-        if (name && name.trim()) await cmdWsNew(name.trim());
-      } else if (answer.type === "archive") {
-        const nonActive = workstreams.filter(w => !w.isActive);
-        if (nonActive.length === 0) {
-          console.log(dim("No other workstreams to archive."));
-          return;
-        }
-        const archiveChoices = nonActive.map(w => ({ name: w.name, value: w.name }));
-        let toArchive;
-        try {
-          toArchive = await select({ message: "Archive which workstream?", choices: archiveChoices });
-        } catch (e) {
-          if (e.name === "ExitPromptError") return;
-          throw e;
-        }
-        await cmdWsArchive(toArchive);
-      } else if (answer.type === "delete") {
-        const deletable = workstreams.filter(w => w.name !== "default");
-        if (deletable.length === 0) {
-          console.log(dim("No workstreams to delete (cannot delete 'default')."));
-          return;
-        }
-        const deleteChoices = deletable.map(w => ({ name: w.name, value: w.name }));
-        let toDelete;
-        try {
-          toDelete = await select({ message: "Delete which workstream?", choices: deleteChoices });
-        } catch (e) {
-          if (e.name === "ExitPromptError") return;
-          throw e;
-        }
-        await cmdWsDelete(toDelete);
-      }
-    } catch (e) {
-      if (e.name === "ExitPromptError") { process.exit(130); }
-      // Fallback to plain list if inquirer unavailable
-      await cmdWsList();
-    }
-    return;
+  const validationError = validateWsArgs(args);
+  if (validationError) {
+    console.error(validationError);
+    process.exit(1);
   }
 
-  if (sub === "new") return cmdWsNew(args[2]);
-  if (sub === "switch") return cmdWsSwitch(args[2]);
-  if (sub === "archive") return cmdWsArchive(args[2]);
-  if (sub === "status") return cmdWsStatus();
-  if (sub === "search") return cmdWsSearch(args.slice(2).join(" "));
-  if (sub === "delete" || sub === "rm") return cmdWsDelete(args[2]);
-
-  // If sub is not a keyword, treat it as a shortcut for ws switch
-  if (!["new", "switch", "archive", "status", "search", "delete", "rm", "--help", "-h"].includes(sub)) {
-    return cmdWsSwitch(sub);
+  if (!args.length) {
+    console.log("Listing workstreams...");
+    return; // Implement listing logic.
   }
 
-  console.log(`
-${bold("🌿 Workstream Commands")}
-
-  wispy ws                    ${dim("list all workstreams")}
-  wispy ws new <name>         ${dim("create new workstream")}
-  wispy ws switch <name>      ${dim("switch active workstream")}
-  wispy ws <name>             ${dim("shortcut for switch")}
-  wispy ws archive <name>     ${dim("archive workstream")}
-  wispy ws status             ${dim("detailed status")}
-  wispy ws search <query>     ${dim("search across all workstreams")}
-  wispy ws delete <name>      ${dim("delete workstream")}
-`);
-}
+  const cmd = args[0];
+  console.log(`Executing command: ${cmd}`);
+}

package/package.json

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