wispy-cli 2.7.13 → 2.7.15

package/bin/wispy.mjs

@@ -60,9 +60,42 @@ const globalPersonality = extractFlag(["--personality"], true);
 const globalJsonMode = hasFlag("--json");
 if (globalJsonMode) { args.splice(args.indexOf("--json"), 1); }
 
+// New flags: system prompt, session name, effort, agent, budget, tool allow/deny
+const globalSystemPrompt = extractFlag(["--system-prompt"], true);
+const globalAppendSystemPrompt = extractFlag(["--append-system-prompt"], true);
+const globalSessionName = extractFlag(["--name"], true);
+const globalAgent = extractFlag(["--agent"], true);
+const globalEffort = extractFlag(["--effort"], true);
+const globalMaxBudget = extractFlag(["--max-budget-usd"], true);
+const globalAllowedTools = extractFlag(["--allowedTools", "--allowed-tools"], true);
+const globalDisallowedTools = extractFlag(["--disallowedTools", "--disallowed-tools"], true);
+
+// Parse image flags: -i <path> or --image <path> (multiple allowed)
+const imagePaths = [];
+{
+  let i = 0;
+  while (i < args.length) {
+    if ((args[i] === "-i" || args[i] === "--image") && i + 1 < args.length) {
+      imagePaths.push(args[i + 1]);
+      args.splice(i, 2);
+    } else {
+      i++;
+    }
+  }
+}
+
 // Expose for submodules via env
 if (globalProfile) process.env.WISPY_PROFILE = globalProfile;
 if (globalPersonality) process.env.WISPY_PERSONALITY = globalPersonality;
+if (imagePaths.length > 0) process.env.WISPY_IMAGES = JSON.stringify(imagePaths);
+if (globalSystemPrompt) process.env.WISPY_SYSTEM_PROMPT = globalSystemPrompt;
+if (globalAppendSystemPrompt) process.env.WISPY_APPEND_SYSTEM_PROMPT = globalAppendSystemPrompt;
+if (globalSessionName) process.env.WISPY_SESSION_NAME = globalSessionName;
+if (globalAgent) process.env.WISPY_AGENT = globalAgent;
+if (globalEffort) process.env.WISPY_EFFORT = globalEffort;
+if (globalMaxBudget) process.env.WISPY_MAX_BUDGET_USD = globalMaxBudget;
+if (globalAllowedTools) process.env.WISPY_ALLOWED_TOOLS = globalAllowedTools;
+if (globalDisallowedTools) process.env.WISPY_DISALLOWED_TOOLS = globalDisallowedTools;
 
 // ── Flags ─────────────────────────────────────────────────────────────────────
 
@@ -110,21 +143,84 @@ Usage:
                                Manage HTTP/WS server
   wispy tui                    Launch full terminal UI
   wispy overview               Director view of workstreams
+  wispy sessions [--all]       List all sessions
+  wispy resume [session-id]    Resume a previous session
+  wispy resume --last          Resume the most recent session
+  wispy fork [session-id]      Fork (branch) from a session
+  wispy fork --last            Fork the most recent session
+  wispy review                 Review uncommitted changes
+  wispy review --base <branch> Review changes against branch
+  wispy review --commit <sha>  Review a specific commit
+  wispy review --json          Output review as JSON
+  wispy agents [list]          List available agents (built-in + custom)
+  wispy cost                   Show API spending report
 
 Options:
   -w, --workstream <name>      Set active workstream
   -p, --profile <name>         Use a named config profile
+  -i, --image <path>           Attach image (can use multiple times)
   --session <id>               Resume a session
+  --name <name>                Give this session a display name (e.g. --name "refactor-auth")
   --model <name>               Override AI model
   --provider <name>            Override AI provider
   --personality <name>         Set personality (pragmatic|concise|explanatory|friendly|strict)
+  --agent <name>               Use a named agent (reviewer|planner|explorer|custom)
+  --effort <level>             Effort level: low|medium|high|max (default: medium)
+  --system-prompt <prompt>     Replace the default system prompt entirely
+  --append-system-prompt <p>   Append text to the default system prompt
+  --max-budget-usd <amount>    Session budget cap in USD (e.g. 5.00)
+  --allowedTools <patterns>    Only allow specified tools (e.g. "read_file Bash(git:*)")
+  --disallowedTools <patterns> Block specified tools (e.g. "write_file delete_file")
   --json                       Output JSONL events (for exec command, CI/pipeline use)
   --help, -h                   Show this help
   --version, -v                Show version
+
+Project settings:
+  .wispy/settings.json         Per-project config (model, personality, tools, agents, etc.)
+                               Wispy walks up from cwd to find this file.
 `);
   process.exit(0);
 }
 
+// ── Agents ────────────────────────────────────────────────────────────────────
+
+if (command === "agents" || command === "agent") {
+  try {
+    const { loadConfig } = await import(join(rootDir, "core/config.mjs"));
+    const { AgentManager } = await import(join(rootDir, "core/agents.mjs"));
+
+    const sub = args[1];
+    const config = await loadConfig();
+    const mgr = new AgentManager(config);
+
+    if (!sub || sub === "list") {
+      console.log(mgr.formatList());
+    } else {
+      console.error(`Unknown subcommand: ${sub}`);
+      console.log("Available: list");
+      process.exit(1);
+    }
+  } catch (err) {
+    console.error("Agents error:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
+// ── Cost / Budget ──────────────────────────────────────────────────────────────
+
+if (command === "cost" || command === "budget") {
+  try {
+    const { BudgetManager } = await import(join(rootDir, "core/budget.mjs"));
+    const budget = new BudgetManager();
+    console.log(await budget.formatReport());
+  } catch (err) {
+    console.error("Cost error:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
 // ── Setup (first-run wizard) ──────────────────────────────────────────────────
 
 if (command === "setup") {
@@ -655,9 +751,18 @@ if (command === "exec") {
     if (profileConfig.model)    process.env.WISPY_MODEL = process.env.WISPY_MODEL || profileConfig.model;
 
     const personality = globalPersonality || profileConfig.personality || null;
+    const effort = globalEffort || profileConfig.effort || null;
+    const maxBudgetUsd = globalMaxBudget ? parseFloat(globalMaxBudget) : null;
+    const allowedTools = globalAllowedTools || null;
+    const disallowedTools = globalDisallowedTools || null;
+    const agent = globalAgent || null;
 
     const engine = new WispyEngine({
       personality,
+      effort,
+      maxBudgetUsd,
+      allowedTools,
+      disallowedTools,
       workstream: process.env.WISPY_WORKSTREAM ?? "default",
     });
 
@@ -673,11 +778,17 @@ if (command === "exec") {
       process.exit(1);
     }
 
+    // Apply tool allow/deny to harness
+    if (allowedTools) engine.harness.setAllowedTools(allowedTools);
+    if (disallowedTools) engine.harness.setDisallowedTools(disallowedTools);
+
     const emitter = createEmitter(globalJsonMode);
 
     const result = await engine.processMessage(null, message, {
       emitter,
       personality,
+      effort,
+      agent,
       skipSkillCapture: true,
       skipUserModel: true,
     });
@@ -833,6 +944,196 @@ if (command === "model") {
   process.exit(0);
 }
 
+// ── Review ────────────────────────────────────────────────────────────────────
+
+if (command === "review") {
+  try {
+    const { handleReviewCommand } = await import(join(rootDir, "lib/commands/review.mjs"));
+    await handleReviewCommand(args.slice(1));
+  } catch (err) {
+    console.error("Review error:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
+// ── Sessions list ─────────────────────────────────────────────────────────────
+
+if (command === "sessions") {
+  try {
+    const { SessionManager } = await import(join(rootDir, "core/session.mjs"));
+    const { select } = await import("@inquirer/prompts");
+    const mgr = new SessionManager();
+    const showAll = args.includes("--all") || args.includes("-a");
+
+    const sessions = await mgr.listSessions({ all: showAll });
+    if (sessions.length === 0) {
+      console.log("  No sessions found.");
+      process.exit(0);
+    }
+
+    console.log(`\n  Sessions (${sessions.length})${showAll ? "" : " — use --all to show all workstreams"}:\n`);
+    for (const s of sessions) {
+      const ts = new Date(s.updatedAt).toLocaleString();
+      const preview = s.firstMessage ? `  "${s.firstMessage.slice(0, 60)}${s.firstMessage.length > 60 ? "…" : ""}"` : "";
+      console.log(`  ${s.id}`);
+      console.log(`    ${ts}  ·  ${s.workstream}  ·  ${s.messageCount} msgs${s.model ? `  ·  ${s.model}` : ""}`);
+      if (preview) console.log(`    ${preview}`);
+      console.log("");
+    }
+
+    // Interactive: if TTY, offer to pick a session
+    if (process.stdout.isTTY && !args.includes("--no-interactive")) {
+      const choices = [
+        { name: "(exit)", value: null },
+        ...sessions.map(s => ({
+          name: `${s.id}  ${new Date(s.updatedAt).toLocaleString()}  "${(s.firstMessage ?? "").slice(0, 50)}"`,
+          value: s.id,
+        })),
+      ];
+
+      let selectedId;
+      try {
+        selectedId = await select({ message: "Select session:", choices });
+      } catch {
+        process.exit(0);
+      }
+
+      if (!selectedId) process.exit(0);
+
+      let action;
+      try {
+        action = await select({
+          message: `Session ${selectedId}:`,
+          choices: [
+            { name: "resume — continue this session", value: "resume" },
+            { name: "fork — start a new branch from this session", value: "fork" },
+            { name: "cancel", value: null },
+          ],
+        });
+      } catch {
+        process.exit(0);
+      }
+
+      if (!action) process.exit(0);
+
+      // Delegate to REPL with the appropriate action
+      process.env.WISPY_SESSION_ACTION = action;
+      process.env.WISPY_SESSION_ID = selectedId;
+      await import(join(rootDir, "lib/wispy-repl.mjs"));
+    }
+  } catch (err) {
+    console.error("Sessions error:", err.message);
+    process.exit(1);
+  }
+  process.exit(0);
+}
+
+// ── Resume session ────────────────────────────────────────────────────────────
+
+if (command === "resume") {
+  try {
+    const { SessionManager } = await import(join(rootDir, "core/session.mjs"));
+    const { select } = await import("@inquirer/prompts");
+    const mgr = new SessionManager();
+
+    let sessionId = args[1]; // may be undefined
+
+    if (args.includes("--last") || args[1] === "--last") {
+      // Resume most recent
+      const sessions = await mgr.listSessions({ all: true, limit: 1 });
+      if (!sessions.length) {
+        console.error("No sessions found.");
+        process.exit(1);
+      }
+      sessionId = sessions[0].id;
+    } else if (!sessionId || sessionId.startsWith("--")) {
+      // Interactive picker
+      const sessions = await mgr.listSessions({ all: true });
+      if (!sessions.length) {
+        console.error("No sessions found.");
+        process.exit(1);
+      }
+
+      const choices = sessions.map(s => ({
+        name: `${new Date(s.updatedAt).toLocaleString()}  [${s.workstream}]  ${s.messageCount}msgs  "${(s.firstMessage ?? "").slice(0, 50)}"`,
+        value: s.id,
+      }));
+
+      try {
+        sessionId = await select({ message: "Resume which session?", choices });
+      } catch {
+        process.exit(0);
+      }
+    }
+
+    if (!sessionId) process.exit(0);
+
+    console.log(`  Resuming session ${sessionId}...`);
+    process.env.WISPY_SESSION_ACTION = "resume";
+    process.env.WISPY_SESSION_ID = sessionId;
+    await import(join(rootDir, "lib/wispy-repl.mjs"));
+  } catch (err) {
+    console.error("Resume error:", err.message);
+    process.exit(1);
+  }
+  // REPL handles lifecycle
+}
+
+// ── Fork session ──────────────────────────────────────────────────────────────
+
+if (command === "fork") {
+  try {
+    const { SessionManager } = await import(join(rootDir, "core/session.mjs"));
+    const { select } = await import("@inquirer/prompts");
+    const mgr = new SessionManager();
+
+    let sessionId = args[1];
+
+    if (args.includes("--last") || args[1] === "--last") {
+      const sessions = await mgr.listSessions({ all: true, limit: 1 });
+      if (!sessions.length) {
+        console.error("No sessions found.");
+        process.exit(1);
+      }
+      sessionId = sessions[0].id;
+    } else if (!sessionId || sessionId.startsWith("--")) {
+      const sessions = await mgr.listSessions({ all: true });
+      if (!sessions.length) {
+        console.error("No sessions found.");
+        process.exit(1);
+      }
+
+      const choices = sessions.map(s => ({
+        name: `${new Date(s.updatedAt).toLocaleString()}  [${s.workstream}]  ${s.messageCount}msgs  "${(s.firstMessage ?? "").slice(0, 50)}"`,
+        value: s.id,
+      }));
+
+      try {
+        sessionId = await select({ message: "Fork which session?", choices });
+      } catch {
+        process.exit(0);
+      }
+    }
+
+    if (!sessionId) process.exit(0);
+
+    // Actually fork
+    const forked = await mgr.forkSession(sessionId);
+    console.log(`  ✓ Forked from ${sessionId}`);
+    console.log(`  New session: ${forked.id} (${forked.messages.length} messages copied)`);
+    console.log(`  Starting REPL with forked session...`);
+
+    process.env.WISPY_SESSION_ACTION = "fork";
+    process.env.WISPY_SESSION_ID = forked.id;
+    await import(join(rootDir, "lib/wispy-repl.mjs"));
+  } catch (err) {
+    console.error("Fork error:", err.message);
+    process.exit(1);
+  }
+  // REPL handles lifecycle
+}
+
 // ── TUI ───────────────────────────────────────────────────────────────────────
 
 if (command === "tui") {

package/core/agents.mjs

@@ -0,0 +1,133 @@
+/**
+ * core/agents.mjs — Custom Agent Definitions for Wispy
+ *
+ * Allows users to define named agents with custom system prompts and models,
+ * similar to Claude Code's --agents feature.
+ *
+ * Usage:
+ *   const mgr = new AgentManager(config);
+ *   const agent = mgr.get("reviewer");
+ *   // agent = { name, description, prompt, model }
+ */
+
+// ── Built-in agents ────────────────────────────────────────────────────────────
+
+export const BUILTIN_AGENTS = {
+  default: {
+    description: "General-purpose assistant",
+    prompt: null, // uses default Wispy system prompt
+    model: null,  // uses default model
+  },
+  reviewer: {
+    description: "Code reviewer — bugs, security, performance, best practices",
+    prompt: "You are a senior code reviewer. Focus on bugs, security, performance, and best practices. Be constructive and specific. Provide line-level feedback where relevant. End your review with a summary of key findings.",
+    model: null,
+  },
+  planner: {
+    description: "Project planner — breaks tasks into concrete steps",
+    prompt: "You are a project planner. Break tasks into concrete steps. Create actionable plans with clear priorities and dependencies. Use numbered lists for steps. Estimate effort where possible.",
+    model: null,
+  },
+  explorer: {
+    description: "Codebase explorer — navigates files, understands architecture",
+    prompt: "You are a codebase explorer. Navigate files, understand architecture, find patterns. Report findings clearly with file paths and code snippets. Summarize what you find at the end.",
+    model: null,
+  },
+};
+
+// ── AgentManager ───────────────────────────────────────────────────────────────
+
+export class AgentManager {
+  /**
+   * @param {object} config - Wispy config object (may have config.agents)
+   */
+  constructor(config = {}) {
+    this._agents = {};
+
+    // Load built-in agents
+    for (const [name, def] of Object.entries(BUILTIN_AGENTS)) {
+      this._agents[name] = { name, builtin: true, ...def };
+    }
+
+    // Load custom agents from config
+    if (config.agents && typeof config.agents === "object") {
+      for (const [name, def] of Object.entries(config.agents)) {
+        if (typeof def !== "object" || def === null) continue;
+        this._agents[name] = {
+          name,
+          builtin: false,
+          description: def.description ?? `Custom agent: ${name}`,
+          prompt: def.prompt ?? null,
+          model: def.model ?? null,
+        };
+      }
+    }
+  }
+
+  /**
+   * Get an agent by name. Returns null if not found.
+   * @param {string} name
+   * @returns {{ name: string, description: string, prompt: string|null, model: string|null, builtin: boolean }|null}
+   */
+  get(name) {
+    return this._agents[name] ?? null;
+  }
+
+  /**
+   * List all agents (built-in + custom).
+   * @returns {Array<{ name: string, description: string, prompt: string|null, model: string|null, builtin: boolean }>}
+   */
+  list() {
+    return Object.values(this._agents);
+  }
+
+  /**
+   * Check if an agent exists.
+   * @param {string} name
+   */
+  has(name) {
+    return name in this._agents;
+  }
+
+  /**
+   * Get all agents as a plain object.
+   */
+  getAllAgents() {
+    return { ...this._agents };
+  }
+
+  /**
+   * Format agents for CLI display.
+   */
+  formatList() {
+    const lines = [];
+    const builtins = Object.values(this._agents).filter(a => a.builtin);
+    const custom = Object.values(this._agents).filter(a => !a.builtin);
+
+    lines.push("\n  Built-in agents:\n");
+    for (const a of builtins) {
+      lines.push(`    \x1b[32m${a.name.padEnd(12)}\x1b[0m  ${a.description}`);
+      if (a.model) lines.push(`    ${" ".repeat(12)}  model: ${a.model}`);
+    }
+
+    if (custom.length > 0) {
+      lines.push("\n  Custom agents:\n");
+      for (const a of custom) {
+        lines.push(`    \x1b[33m${a.name.padEnd(12)}\x1b[0m  ${a.description}`);
+        if (a.model) lines.push(`    ${" ".repeat(12)}  model: ${a.model}`);
+        if (a.prompt) lines.push(`    ${" ".repeat(12)}  prompt: ${a.prompt.slice(0, 60)}...`);
+      }
+    } else {
+      lines.push("\n  \x1b[2mNo custom agents. Add them in ~/.wispy/config.json under \"agents\".\x1b[0m");
+    }
+
+    lines.push(
+      "\n  Usage:",
+      "    wispy --agent reviewer \"review this code\"",
+      "    wispy --agent planner \"build a todo app\"",
+      "",
+    );
+
+    return lines.join("\n");
+  }
+}