phewsh 0.15.6 → 0.15.9

package/commands/session.js

@@ -331,9 +331,12 @@ async function main() {
   await ui.brandReveal();
 
   if (config?.apiKey && !config.apiKey.startsWith('sk-')) {
-    console.log(`  ${ember('!')} ${sage('Stored API key looks invalid — ignoring it.')} ${slate('/key to replace')}`);
+    // Persist the cleanup so this never nags again — an unusable key
+    // (not sk-…) helps nobody, and harness routes need no key at all.
+    console.log(`  ${ember('!')} ${sage('Cleared an unusable stored API key.')} ${slate('harness routes need none — /key to add one')}`);
     console.log('');
     config.apiKey = null;
+    try { saveConfig(config); } catch { /* read-only home — in-memory clear still holds */ }
     route = resolveRoute(config, harnesses);
   }
 
@@ -774,7 +777,10 @@ async function main() {
             const lineCount = text.split('\n').length;
             if (lineCount > 1 || text.length > 200) {
               pasteCounter++;
-              const tag = `[paste #${pasteCounter}: ${text.length.toLocaleString('en-US')} chars, ${lineCount} lines]`;
+              const chars = text.length.toLocaleString('en-US');
+              const tag = lineCount > 1
+                ? `[paste #${pasteCounter}: ${chars} chars, ${lineCount} lines]`
+                : `[paste #${pasteCounter}: ${chars} chars]`;
               pendingPastes.set(tag, text);
               lastPaste = text;
               rl.write(tag);
@@ -825,11 +831,18 @@ async function main() {
           return;
         }
         // Re-render so token coloring tracks edits — including the keystroke
-        // where the token stops matching and must un-color.
-        const cur = rl.line || '';
-        const special = cur[0] === '/' || cur[0] === '@';
-        if (special || wasSpecialInput) rl._refreshLine();
-        wasSpecialInput = special;
+        // where the token stops matching and must un-color. Deferred one tick:
+        // this is a prependListener, so readline hasn't appended the just-typed
+        // char yet; without the defer, rl.line is stale by one and /model only
+        // ever evaluates as /mode.
+        setImmediate(() => {
+          try {
+            const cur = rl.line || '';
+            const special = cur[0] === '/' || cur[0] === '@';
+            if (special || wasSpecialInput) rl._refreshLine();
+            wasSpecialInput = special;
+          } catch { /* never break input */ }
+        });
       } catch { /* never break input */ }
     };
     process.stdin.prependListener('keypress', phewshKeypress);

package/lib/harnesses.js

@@ -20,7 +20,7 @@ const { execSync, spawn } = require('child_process');
 // list of its own, so it can never go stale. Harnesses without a known
 // model flag ignore the preference and use their own config.
 const HARNESSES = {
-  'claude-code': { bin: 'claude',       label: 'Claude Code',  role: 'writes code',          auth: 'Claude subscription / Console', models: true, modelHints: ['sonnet', 'opus', 'haiku', 'fable'], args: (p, m) => ['-p', p, '--output-format', 'text', ...(m ? ['--model', m] : [])] },
+  'claude-code': { bin: 'claude',       label: 'Claude Code',  role: 'writes code',          auth: 'Claude subscription / Console', models: true, modelHints: ['sonnet', 'opus', 'haiku'], streamFormat: 'claude-json', args: (p, m) => ['-p', p, '--output-format', 'stream-json', '--include-partial-messages', '--verbose', ...(m ? ['--model', m] : [])] },
   'codex':       { bin: 'codex',        label: 'Codex CLI',    role: 'reasons & reviews',    auth: 'ChatGPT plan',                  models: true, args: (p, m) => ['exec', '--skip-git-repo-check', ...(m ? ['-m', m] : []), p] },
   'gemini':      { bin: 'gemini',       label: 'Gemini CLI',   role: "another model's take", auth: 'Google login',                  models: true, args: (p, m) => ['-p', p, ...(m ? ['-m', m] : [])] },
   'cursor':      { bin: 'cursor-agent', label: 'Cursor Agent', role: 'edits files',          auth: 'Cursor account',                models: true, args: (p, m) => ['-p', p, '--output-format', 'text', ...(m ? ['--model', m] : [])] },
@@ -87,6 +87,17 @@ function runViaHarness(id, systemPrompt, userPrompt, opts = {}) {
   const prompt = systemPrompt ? `${systemPrompt}\n\n---\n\n${userPrompt}` : userPrompt;
   const model = h.models ? opts.model : undefined;
 
+  // Spinner during the wait, and live token streaming where the harness
+  // supports it — no path is ever a dead blank screen. quiet (council) parses
+  // silently so parallel runs don't interleave into soup.
+  // Output is written whenever this isn't a quiet (council) run. The spinner
+  // additionally needs a TTY — piped/test contexts get the text, no spinner.
+  const show = !opts.quiet;
+  let spin = null;
+  if (show && process.stdout.isTTY) {
+    try { spin = require('./ui').spinner('thinking'); } catch { spin = null; }
+  }
+
   return new Promise((resolve, reject) => {
     const child = spawn(h.bin, h.args(prompt, model), { stdio: ['pipe', 'pipe', 'pipe'] });
     ACTIVE_CHILDREN.add(child);
@@ -94,20 +105,73 @@ function runViaHarness(id, systemPrompt, userPrompt, opts = {}) {
     // Some harnesses (codex exec, gemini) wait for stdin EOF before running.
     child.stdin.end();
 
-    let stdout = '';
     let stderr = '';
-    // quiet: collect without streaming — parallel runs (council) would
-    // interleave live output into soup.
-    if (!opts.quiet) process.stdout.write('\n');
-    child.stdout.on('data', (d) => { if (!opts.quiet) process.stdout.write(d); stdout += d.toString(); });
+    let assembled = '';        // text shown to the user and returned
+    let resultFallback = '';   // claude's final `result` field — never-blank guard
+    let jsonBuf = '';
+    let firstByte = false;
+
+    function emit(text) {
+      if (!text) return;
+      if (!firstByte) {
+        firstByte = true;
+        if (spin) { spin.stop(); spin = null; }
+        if (show) process.stdout.write('\n');
+      }
+      assembled += text;
+      if (show) process.stdout.write(text);
+    }
+
+    child.stdout.on('data', (d) => {
+      if (h.streamFormat === 'claude-json') {
+        // Newline-delimited JSON: each line is one event. text_delta events
+        // carry the live tokens; the final `result` is the fallback.
+        jsonBuf += d.toString();
+        let nl;
+        while ((nl = jsonBuf.indexOf('\n')) !== -1) {
+          const line = jsonBuf.slice(0, nl).trim();
+          jsonBuf = jsonBuf.slice(nl + 1);
+          if (!line) continue;
+          let obj;
+          // A complete line that isn't JSON is real output (plain-text error,
+          // or a non-streaming stub) — show it rather than swallow it.
+          try { obj = JSON.parse(line); } catch { emit(line + '\n'); continue; }
+          if (obj.type === 'stream_event'
+              && obj.event?.type === 'content_block_delta'
+              && obj.event.delta?.type === 'text_delta') {
+            emit(obj.event.delta.text);
+          } else if (obj.type === 'result' && typeof obj.result === 'string') {
+            resultFallback = obj.result;
+          }
+        }
+      } else {
+        emit(d.toString());
+      }
+    });
     child.stderr.on('data', (d) => { stderr += d.toString(); });
     child.on('close', (code) => {
-      if (!opts.quiet) process.stdout.write('\n');
+      if (spin) { spin.stop(); spin = null; }
+      if (h.streamFormat === 'claude-json' && jsonBuf.trim()) {
+        try {
+          const obj = JSON.parse(jsonBuf.trim());
+          if (obj.type === 'result' && typeof obj.result === 'string') resultFallback = obj.result;
+        } catch { /* partial trailing line */ }
+      }
+      // Streaming produced nothing but the result has text → show it. Never blank.
+      let finalText = assembled;
+      if (!assembled.trim() && resultFallback) {
+        finalText = resultFallback;
+        if (show) process.stdout.write('\n' + resultFallback);
+      }
+      if (show) process.stdout.write('\n');
       if (child._phewshCancelled) return reject(new Error(`${h.label} cancelled`));
-      if (code === 0) resolve(stdout);
+      if (code === 0) resolve(finalText);
       else reject(new Error(`${h.label} exited ${code}${stderr ? `\n  ${stderr.trim().split('\n').slice(-3).join('\n  ')}` : ''}`));
     });
-    child.on('error', (e) => reject(new Error(`Could not run ${h.bin}: ${e.message}`)));
+    child.on('error', (e) => {
+      if (spin) { spin.stop(); spin = null; }
+      reject(new Error(`Could not run ${h.bin}: ${e.message}`));
+    });
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phewsh",
-  "version": "0.15.6",
+  "version": "0.15.9",
   "description": "Turn intent into action. Structure your thinking, execute your next step.",
   "bin": {
     "phewsh": "bin/phewsh.js"