wispy-cli 2.7.15 → 2.7.17

package/bin/wispy.mjs

@@ -56,6 +56,7 @@ function hasFlag(flag) {
 
 // Parse global flags (order doesn't matter, remove from args so REPL doesn't see them)
 const globalProfile = extractFlag(["--profile", "-p"], true);
+const globalWorkstream = extractFlag(["--workstream", "-w"], true);
 const globalPersonality = extractFlag(["--personality"], true);
 const globalJsonMode = hasFlag("--json");
 if (globalJsonMode) { args.splice(args.indexOf("--json"), 1); }
@@ -86,6 +87,10 @@ const imagePaths = [];
 
 // Expose for submodules via env
 if (globalProfile) process.env.WISPY_PROFILE = globalProfile;
+// Validate workstream: ignore flag-like values (e.g. --invalid-arg)
+if (globalWorkstream && !globalWorkstream.startsWith("-")) {
+  process.env.WISPY_WORKSTREAM = globalWorkstream;
+}
 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;
@@ -757,12 +762,31 @@ if (command === "exec") {
     const disallowedTools = globalDisallowedTools || null;
     const agent = globalAgent || null;
 
+    // Load project settings and merge
+    const { findProjectSettings, mergeSettings } = await import(join(rootDir, "core/project-settings.mjs"));
+    const projectSettings = await findProjectSettings();
+    const mergedConfig = mergeSettings(
+      profileConfig,
+      projectSettings,
+      null, // profile already merged into profileConfig via loadConfigWithProfile
+      {
+        ...(personality ? { personality } : {}),
+        ...(effort ? { effort } : {}),
+        ...(maxBudgetUsd ? { maxBudgetUsd } : {}),
+        ...(globalSystemPrompt ? { systemPrompt: globalSystemPrompt } : {}),
+        ...(globalAppendSystemPrompt ? { appendSystemPrompt: globalAppendSystemPrompt } : {}),
+      }
+    );
+
     const engine = new WispyEngine({
-      personality,
-      effort,
-      maxBudgetUsd,
-      allowedTools,
-      disallowedTools,
+      ...mergedConfig,
+      personality: mergedConfig.personality ?? personality,
+      effort: mergedConfig.effort ?? effort,
+      maxBudgetUsd: mergedConfig.maxBudgetUsd ?? maxBudgetUsd,
+      allowedTools: mergedConfig.allowedTools ?? allowedTools,
+      disallowedTools: mergedConfig.disallowedTools ?? disallowedTools,
+      systemPrompt: mergedConfig.systemPrompt ?? null,
+      appendSystemPrompt: mergedConfig.appendSystemPrompt ?? null,
       workstream: process.env.WISPY_WORKSTREAM ?? "default",
     });
 
@@ -789,6 +813,7 @@ if (command === "exec") {
       personality,
       effort,
       agent,
+      sessionName: globalSessionName ?? null,
       skipSkillCapture: true,
       skipUserModel: true,
     });
@@ -976,7 +1001,8 @@ if (command === "sessions") {
     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}`);
+      const nameLabel = s.name ? ` · 📎 ${s.name}` : "";
+      console.log(`  ${s.id}${nameLabel}`);
       console.log(`    ${ts}  ·  ${s.workstream}  ·  ${s.messageCount} msgs${s.model ? `  ·  ${s.model}` : ""}`);
       if (preview) console.log(`    ${preview}`);
       console.log("");
@@ -987,7 +1013,7 @@ if (command === "sessions") {
       const choices = [
         { name: "(exit)", value: null },
         ...sessions.map(s => ({
-          name: `${s.id}  ${new Date(s.updatedAt).toLocaleString()}  "${(s.firstMessage ?? "").slice(0, 50)}"`,
+          name: `${s.id}${s.name ? ` [${s.name}]` : ""}  ${new Date(s.updatedAt).toLocaleString()}  "${(s.firstMessage ?? "").slice(0, 50)}"`,
           value: s.id,
         })),
       ];
@@ -1056,7 +1082,7 @@ if (command === "resume") {
       }
 
       const choices = sessions.map(s => ({
-        name: `${new Date(s.updatedAt).toLocaleString()}  [${s.workstream}]  ${s.messageCount}msgs  "${(s.firstMessage ?? "").slice(0, 50)}"`,
+        name: `${new Date(s.updatedAt).toLocaleString()}  [${s.workstream}]${s.name ? `  📎 ${s.name}` : ""}  ${s.messageCount}msgs  "${(s.firstMessage ?? "").slice(0, 50)}"`,
         value: s.id,
       }));
 
@@ -1105,7 +1131,7 @@ if (command === "fork") {
       }
 
       const choices = sessions.map(s => ({
-        name: `${new Date(s.updatedAt).toLocaleString()}  [${s.workstream}]  ${s.messageCount}msgs  "${(s.firstMessage ?? "").slice(0, 50)}"`,
+        name: `${new Date(s.updatedAt).toLocaleString()}  [${s.workstream}]${s.name ? `  📎 ${s.name}` : ""}  ${s.messageCount}msgs  "${(s.firstMessage ?? "").slice(0, 50)}"`,
         value: s.id,
       }));
 

package/core/engine.mjs

@@ -96,12 +96,22 @@ export class WispyEngine {
     this._workMdContent = null;
     this._workMdLoaded = false;
     this._workMdPath = null;
-    this._activeWorkstream = config.workstream
-      ?? process.env.WISPY_WORKSTREAM
-      ?? process.argv.find((a, i) => (process.argv[i-1] === "-w" || process.argv[i-1] === "--workstream"))
-      ?? "default";
+    {
+      const _ws = config.workstream
+        ?? process.env.WISPY_WORKSTREAM
+        ?? process.argv.find((a, i) => (process.argv[i-1] === "-w" || process.argv[i-1] === "--workstream"))
+        ?? "default";
+      // Sanitize: never use a flag-like value as workstream name
+      this._activeWorkstream = (_ws && !_ws.startsWith("-")) ? _ws : "default";
+    }
     // Personality: from config, or null (use default Wispy personality)
     this._personality = config.personality ?? null;
+    // System prompt overrides from config
+    this._systemPrompt = config.systemPrompt ?? null;           // full replacement
+    this._appendSystemPrompt = config.appendSystemPrompt ?? null; // append to default
+    // Project settings cache (loaded lazily)
+    this._projectSettings = null;
+    this._projectSettingsLoaded = false;
     // Agent manager
     this.agentManager = new AgentManager(config);
     // Effort level: low | medium | high | max

package/lib/commands/continuity.mjs

@@ -29,9 +29,11 @@ async function readJsonOr(filePath, fallback = null) {
 
 async function getActiveWorkstream() {
   const envWs = process.env.WISPY_WORKSTREAM;
-  if (envWs) return envWs;
+  if (envWs && !envWs.startsWith("-")) return envWs;
   const cfg = await readJsonOr(CONFIG_PATH, {});
-  return cfg.workstream ?? "default";
+  const ws = cfg.workstream ?? "default";
+  // Sanitize: never return a flag-like value (e.g. "--invalid-arg")
+  return (ws && !ws.startsWith("-")) ? ws : "default";
 }
 
 async function getProviderLabel(cfg) {

package/lib/wispy-repl.mjs

@@ -62,8 +62,10 @@ function box(lines, { padding = 1 } = {}) {
 // ---------------------------------------------------------------------------
 
 const SCRIPT_DIR = path.dirname(fileURLToPath(import.meta.url));
-const ACTIVE_WORKSTREAM = process.env.WISPY_WORKSTREAM ??
+const _rawWorkstream = process.env.WISPY_WORKSTREAM ??
   process.argv.find((a, i) => (process.argv[i-1] === "-w" || process.argv[i-1] === "--workstream")) ?? "default";
+// Validate: ignore flag-like values to avoid e.g. "--invalid-arg" becoming workstream
+const ACTIVE_WORKSTREAM = (_rawWorkstream && !_rawWorkstream.startsWith("-")) ? _rawWorkstream : "default";
 const HISTORY_FILE = path.join(CONVERSATIONS_DIR, `${ACTIVE_WORKSTREAM}.json`);
 
 async function readFileOr(filePath, fallback = null) {
@@ -327,6 +329,7 @@ ${bold("Wispy Commands:")}
   ${cyan("/search")} <keyword>  Search across workstreams
   ${cyan("/skills")}            List installed skills
   ${cyan("/sessions")}          List sessions
+  ${cyan("/name")} <name>       Give this session a display name (e.g. /name refactor-auth)
   ${cyan("/mcp")} [list|connect|disconnect|config|reload]  MCP management
   ${cyan("/remember")} <text>   Save text to main memory (MEMORY.md)
   ${cyan("/forget")} <key>      Delete a memory file
@@ -1069,6 +1072,28 @@ ${bold("Permissions & Audit (v1.1):")}
     return true;
   }
 
+  if (cmd.startsWith("/name")) {
+    const nameParts = input.split(" ").slice(1);
+    const sessionName = nameParts.join(" ").trim();
+    if (!sessionName) {
+      console.log(yellow("Usage: /name <display-name>  (e.g. /name refactor-auth)"));
+      return true;
+    }
+    // Find the active session and set its name
+    try {
+      const currentSession = engine.sessions?.list?.()?.find(Boolean);
+      if (currentSession) {
+        await engine.sessions.setName(currentSession.id, sessionName);
+        console.log(green(`📎 Session named: "${sessionName}" (${currentSession.id})`));
+      } else {
+        console.log(yellow("No active session found."));
+      }
+    } catch (err) {
+      console.log(red(`Failed to set session name: ${err.message}`));
+    }
+    return true;
+  }
+
   if (cmd === "/quit" || cmd === "/exit") {
     console.log(dim(`🌿 Bye! (${engine.providers.formatCost()})`));
     engine.destroy();
@@ -1293,6 +1318,7 @@ async function runRepl(engine) {
         noSave: true,
         dryRun: engine.dryRunMode ?? false,
         images: pendingImages,
+        sessionName: process.env.WISPY_SESSION_NAME ?? null,
         onSkillLearned: (skill) => {
           console.log(cyan(`\n💡 Learned new skill: '${skill.name}' — use /${skill.name} next time`));
         },
@@ -1476,8 +1502,29 @@ if (args[0] && operatorCommands.has(args[0])) {
   process.exit(0);
 }
 
-// Initialize engine
-const engine = new WispyEngine({ workstream: ACTIVE_WORKSTREAM });
+// Initialize engine — merge project settings + env flags
+let _engineConfig = { workstream: ACTIVE_WORKSTREAM };
+try {
+  const { findProjectSettings, mergeSettings } = await import("../core/project-settings.mjs");
+  const { loadConfigWithProfile } = await import("../core/config.mjs");
+  const projectSettings = await findProjectSettings();
+  if (projectSettings) {
+    const baseConfig = await loadConfigWithProfile(process.env.WISPY_PROFILE ?? null);
+    _engineConfig = mergeSettings(baseConfig, projectSettings, null, {
+      ...(process.env.WISPY_SYSTEM_PROMPT ? { systemPrompt: process.env.WISPY_SYSTEM_PROMPT } : {}),
+      ...(process.env.WISPY_APPEND_SYSTEM_PROMPT ? { appendSystemPrompt: process.env.WISPY_APPEND_SYSTEM_PROMPT } : {}),
+      ...(process.env.WISPY_EFFORT ? { effort: process.env.WISPY_EFFORT } : {}),
+    });
+    _engineConfig.workstream = _engineConfig.workstream ?? ACTIVE_WORKSTREAM;
+  } else {
+    // No project settings, still pick up env flags
+    if (process.env.WISPY_SYSTEM_PROMPT) _engineConfig.systemPrompt = process.env.WISPY_SYSTEM_PROMPT;
+    if (process.env.WISPY_APPEND_SYSTEM_PROMPT) _engineConfig.appendSystemPrompt = process.env.WISPY_APPEND_SYSTEM_PROMPT;
+    if (process.env.WISPY_EFFORT) _engineConfig.effort = process.env.WISPY_EFFORT;
+  }
+} catch { /* project settings are optional */ }
+
+const engine = new WispyEngine(_engineConfig);
 const initResult = await engine.init();
 
 if (!initResult) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wispy-cli",
-  "version": "2.7.15",
+  "version": "2.7.17",
   "description": "🌿 Wispy — AI workspace assistant with trustworthy execution (harness, receipts, approvals, diffs)",
   "license": "MIT",
   "author": "Minseo & Poropo",
@@ -59,7 +59,8 @@
   "scripts": {
     "test": "node --test --test-force-exit --test-timeout=15000 tests/*.test.mjs",
     "test:basic": "node --test --test-force-exit test/basic.test.mjs",
-    "test:verbose": "node --test --test-force-exit --test-timeout=15000 --test-reporter=spec tests/*.test.mjs"
+    "test:verbose": "node --test --test-force-exit --test-timeout=15000 --test-reporter=spec tests/*.test.mjs",
+    "postpublish": "npm install -g wispy-cli@latest || true"
   },
   "dependencies": {
     "@inquirer/prompts": "^8.3.2",