phewsh 0.15.0 → 0.15.1

package/commands/clarify.js

@@ -110,6 +110,17 @@ function writeViews(intentDir, pps) {
 }
 
 async function main() {
+  // ESC backs out cleanly at any point — nothing half-written, no error.
+  if (process.stdin.isTTY) {
+    readline.emitKeypressEvents(process.stdin);
+    process.stdin.on('keypress', (str, key) => {
+      if (key && key.name === 'escape') {
+        console.log('\n\n  stopped — esc. Nothing changed.\n');
+        process.exit(0);
+      }
+    });
+  }
+
   if (args.includes('--help') || args.includes('-h')) {
     console.log(`
   😮‍💨🤫  phewsh clarify

package/commands/session.js

@@ -17,7 +17,7 @@ const intentDir = () => path.join(process.cwd(), '.intent');
 const { select, refreshSession: refreshSess } = require('../lib/supabase');
 const { readPPS } = require('../lib/pps');
 const { push, pull, ensureValidToken } = require('./sync');
-const { HARNESSES, listHarnesses, runViaHarness } = require('../lib/harnesses');
+const { HARNESSES, listHarnesses, runViaHarness, cancelActive } = require('../lib/harnesses');
 const { recordDecision, labelOutcome, pendingDecisions, outcomeStats, OUTCOMES } = require('../lib/outcomes');
 const { recordSessionEvent } = require('../lib/receipts-data');
 const { recordProject, listProjects, scanForProjects, fmtAgo } = require('../lib/projects-index');
@@ -198,21 +198,28 @@ function buildHarnessPrompt(messages, input) {
   return `Conversation so far:\n\n${transcript}\n\n---\n\nUser: ${input}\n\nRespond to the last user message.`;
 }
 
-async function streamChat(apiKey, messages, systemPrompt, modelId) {
+async function streamChat(apiKey, messages, systemPrompt, modelId, opts = {}) {
   const body = { model: modelId, max_tokens: 2048, messages, stream: true };
   if (systemPrompt) body.system = systemPrompt;
 
   const spin = ui.spinner('thinking');
 
-  const response = await fetch('https://api.anthropic.com/v1/messages', {
-    method: 'POST',
-    headers: {
-      'x-api-key': apiKey,
-      'anthropic-version': '2023-06-01',
-      'content-type': 'application/json',
-    },
-    body: JSON.stringify(body),
-  });
+  let response;
+  try {
+    response = await fetch('https://api.anthropic.com/v1/messages', {
+      method: 'POST',
+      headers: {
+        'x-api-key': apiKey,
+        'anthropic-version': '2023-06-01',
+        'content-type': 'application/json',
+      },
+      body: JSON.stringify(body),
+      signal: opts.signal,
+    });
+  } catch (err) {
+    spin.stop();
+    throw err;
+  }
 
   if (!response.ok) {
     spin.stop();
@@ -491,7 +498,9 @@ async function main() {
     });
     decisionsThisSession++;
     try {
+      turnInFlight = true;
       const output = await runViaHarness(harnessId, fullSystem, buildHarnessPrompt(messages, input), { model: harnessModel });
+      turnInFlight = false;
       messages.push({ role: 'user', content: input });
       messages.push({ role: 'assistant', content: (output || '').trim() });
       recordSessionEvent(harnessId, projectName, 'task_complete', {
@@ -501,6 +510,12 @@ async function main() {
       console.log(slate(`  via ${HARNESSES[harnessId].label} · outcome? 1 kept · 2 reverted · 3 superseded · 4 failed · or keep typing`));
       return true;
     } catch (err) {
+      turnInFlight = false;
+      if (userCancelled) {
+        userCancelled = false;
+        console.log(`\n  ${slate('cancelled — esc')}`);
+        return true; // user's call, not a failure: no fallback offer
+      }
       try { labelOutcome(decisionId, 'failed'); } catch { /* keep going */ }
       recordSessionEvent(harnessId, projectName, 'task_complete', {
         taskId: decisionId, success: false, summary: input.slice(0, 140),
@@ -519,7 +534,11 @@ async function main() {
     messages.push({ role: 'user', content: input });
     console.log('');
     try {
-      const result = await streamChat(config.apiKey, messages, fullSystem, modelId(currentModel));
+      turnInFlight = true;
+      turnAbort = new AbortController();
+      const result = await streamChat(config.apiKey, messages, fullSystem, modelId(currentModel), { signal: turnAbort.signal });
+      turnInFlight = false;
+      turnAbort = null;
       messages.push({ role: 'assistant', content: result.content });
       if (result.promptTokens) totalPromptTokens += result.promptTokens;
       if (result.completionTokens) totalCompletionTokens += result.completionTokens;
@@ -537,6 +556,14 @@ async function main() {
       });
       return true;
     } catch (err) {
+      turnInFlight = false;
+      turnAbort = null;
+      if (userCancelled || err.name === 'AbortError') {
+        userCancelled = false;
+        messages.pop();
+        console.log(`\n  ${slate('cancelled — esc')}`);
+        return true; // user's call, not a failure: no fallback offer
+      }
       try { labelOutcome(decisionId, 'failed'); } catch { /* keep going */ }
       messages.pop();
       console.error(`\n  ${ember('!')} ${sage('API route failed')}${slate(' — ' + err.message.split('\n')[0])}`);
@@ -586,23 +613,65 @@ async function main() {
     historySize: 100,
   });
 
-  // Live input coloring: slash commands render teal, @mentions peach, as
-  // you type — same signal Claude Code gives. TTY-only, fail-soft: if the
-  // private readline API ever changes, input falls back to plain.
+  // Live input coloring — like Claude Code: text stays normal, and only a
+  // RECOGNIZED leading /command (or @harness) token turns teal (peach for @)
+  // so you know it registered. Arguments stay plain. TTY-only, fail-soft.
+  const KNOWN_COMMANDS = new Set([
+    'quit', 'exit', 'q', 'help', 'h', 'init', 'intent', 'clarify', 'model',
+    'models', 'council', 'all', 'provider', 'route', 'use', 'work', 'run',
+    'clear', 'status', 'key', 'login', 'export', 'push', 'pull', 'serve',
+    'sync', 'harnesses', 'fallback', 'outcomes', 'tour', 'update', 'upgrade',
+    'agents', 'context', 'gate', 'reload', 'sequence', 'setup', 'system', 'watch',
+  ]);
+  const installedIds = harnesses.filter(h => h.installed).map(h => h.id);
+  let turnAbort = null;       // AbortController while an API turn streams
+  let turnInFlight = false;   // any route — ESC cancels
+  let userCancelled = false;  // distinguishes esc from real failures
+
+  function colorizeInput(cur) {
+    const tok = cur.slice(1).split(/\s/)[0].toLowerCase();
+    if (!tok) return null;
+    if (cur[0] === '/' && KNOWN_COMMANDS.has(tok)) {
+      return `\x1b[38;5;79m/${cur.slice(1, 1 + tok.length)}\x1b[0m${cur.slice(1 + tok.length)}`;
+    }
+    if (cur[0] === '@' && installedIds.some(id => id === tok || id.startsWith(tok))) {
+      return `\x1b[38;5;216m@${cur.slice(1, 1 + tok.length)}\x1b[0m${cur.slice(1 + tok.length)}`;
+    }
+    return null;
+  }
+
   if (process.stdout.isTTY && typeof rl._writeToOutput === 'function') {
     const origWrite = rl._writeToOutput.bind(rl);
     rl._writeToOutput = function (s) {
       try {
         const cur = rl.line || '';
-        if ((cur[0] === '/' || cur[0] === '@') && typeof s === 'string' && s.includes(cur)) {
-          const c = cur[0] === '/' ? '\x1b[38;5;79m' : '\x1b[38;5;216m';
-          s = s.split(cur).join(c + cur + '\x1b[0m');
+        if (typeof s === 'string' && cur && s.includes(cur)) {
+          const colored = colorizeInput(cur);
+          if (colored) s = s.split(cur).join(colored);
         }
       } catch { /* never break input */ }
       origWrite(s);
     };
-    process.stdin.on('keypress', () => {
+  }
+
+  if (process.stdin.isTTY) {
+    process.stdin.on('keypress', (str, key) => {
       try {
+        // ESC: cancel an in-flight turn, or clear the input line.
+        if (key && key.name === 'escape') {
+          if (turnInFlight) {
+            userCancelled = true;
+            if (turnAbort) turnAbort.abort();
+            cancelActive();
+          } else if (rl.line) {
+            rl.line = '';
+            rl.cursor = 0;
+            rl._refreshLine();
+          }
+          return;
+        }
+        // Re-render so token coloring tracks edits (and un-colors when it
+        // stops matching a known command).
         const cur = rl.line || '';
         if (cur[0] === '/' || cur[0] === '@') rl._refreshLine();
       } catch { /* never break input */ }
@@ -789,6 +858,7 @@ async function main() {
         console.log(`  ${cream('session')}`);
         console.log(`    ${teal('/work')} ${slate('[harness]')} ${sage('Hand off to interactive Claude Code/Codex — outcome on return')}`);
         console.log(`    ${teal('/run')} ${slate('<prompt>')} ${sage('One-shot prompt (no history)')}`);
+        console.log(`    ${teal('esc')}          ${sage('Cancel a running turn · clear the input line')}`);
         console.log(`    ${teal('/clear')}       ${sage('Clear conversation')}`);
         console.log(`    ${teal('/status')}      ${sage('Session stats')}`);
         console.log(`    ${teal('/quit')}        ${sage('Exit')}`);
@@ -1136,11 +1206,24 @@ async function main() {
         ui.divider('line');
         if (route?.type === 'harness') {
           const h = HARNESSES[route.id];
-          console.log(`  ${b(cream('Models'))} ${sage('— ' + h.label + ' owns its own model list')}`);
+          console.log(`  ${b(cream('Models'))} ${sage('— via ' + h.label)}`);
           ui.divider('line');
-          console.log(`  ${sage('Current preference:')} ${cream(harnessModel || h.label + ' default')}`);
-          console.log(`  ${sage('Set one with')} ${cream('/model <anything ' + h.label + ' accepts>')} ${slate('— it validates, not phewsh')}`);
-          console.log(`  ${slate('shortcuts that work for Claude Code: sonnet · opus · haiku · fable · any full model id')}`);
+          if (h.modelHints) {
+            // Aliases the harness resolves to its own current versions —
+            // stable names, so this list can't go stale.
+            console.log(`    ${cream('default'.padEnd(12))} ${sage(h.label + "'s own default")}${!harnessModel ? ` ${teal('●')}` : ''}`);
+            h.modelHints.forEach(m => {
+              const active = harnessModel === m ? ` ${teal('●')}` : '';
+              console.log(`    ${cream(m.padEnd(12))} ${sage('latest ' + m.charAt(0).toUpperCase() + m.slice(1))}${active}`);
+            });
+            if (harnessModel && !h.modelHints.includes(harnessModel)) {
+              console.log(`    ${cream(harnessModel.padEnd(12))} ${sage('(pass-through)')} ${teal('●')}`);
+            }
+            console.log(`\n  ${sage('Switch:')} ${cream('/model <name>')} ${slate('— any full model id also works; ' + h.label + ' validates')}`);
+          } else {
+            console.log(`  ${sage('Current preference:')} ${cream(harnessModel || h.label + ' default')}`);
+            console.log(`  ${sage(h.label + ' owns its model list —')} ${cream('/model <anything it accepts>')} ${slate('passes through; it validates')}`);
+          }
           console.log('');
           rl.prompt();
           return;
@@ -1230,6 +1313,15 @@ async function main() {
         const artifacts = ['vision', 'plan', 'next', 'status'];
         const intentDir = path.join(process.cwd(), '.intent');
 
+        // Full markdown render — **bold**, *italic*, `code`, [links] become
+        // terminal formatting, not literal symbols. `base` keeps the line's
+        // color after each inline reset.
+        const inlineMd = (t, base) => t
+          .replace(/\*\*([^*]+)\*\*/g, (_, x) => `\x1b[1m\x1b[38;5;230m${x}\x1b[0m${base}`)
+          .replace(/(^|\W)\*([^*\n]+)\*(?=\W|$)/g, (_, p, x) => `${p}\x1b[3m${x}\x1b[23m`)
+          .replace(/`([^`]+)`/g, (_, x) => `\x1b[38;5;79m${x}\x1b[0m${base}`)
+          .replace(/\[([^\]]+)\]\(([^)]+)\)/g, (_, x, u) => `\x1b[4m\x1b[38;5;79m${x}\x1b[0m${base} \x1b[2m(${u})\x1b[22m`);
+        const C = { sage: '\x1b[38;5;151m', slate: '\x1b[38;5;247m' };
         const renderMd = (raw) => {
           let body = raw;
           if (body.startsWith('---')) {
@@ -1237,11 +1329,12 @@ async function main() {
             if (end !== -1) body = body.slice(end + 4);
           }
           return body.trim().split('\n').map(l => {
-            if (/^#{1,2}\s/.test(l)) return `  ${b(teal(l.replace(/^#+\s*/, '')))}`;
-            if (/^#{3,}\s/.test(l)) return `  ${cream(l.replace(/^#+\s*/, ''))}`;
-            if (/^\s*[-*]\s/.test(l)) return `    ${teal('·')} ${sage(l.replace(/^\s*[-*]\s*/, ''))}`;
-            if (/^\s*\d+\.\s/.test(l)) return `    ${sage(l.trim())}`;
-            return `  ${slate(l)}`;
+            if (/^#{1,2}\s/.test(l)) return `\n  ${b(teal(inlineMd(l.replace(/^#+\s*/, ''), '')))}`;
+            if (/^#{3,}\s/.test(l)) return `  ${cream(inlineMd(l.replace(/^#+\s*/, ''), ''))}`;
+            if (/^\s*[-*]\s/.test(l)) return `    ${teal('·')} ${C.sage}${inlineMd(l.replace(/^\s*[-*]\s*/, ''), C.sage)}\x1b[0m`;
+            if (/^\s*\d+\.\s/.test(l)) return `    ${C.sage}${inlineMd(l.trim(), C.sage)}\x1b[0m`;
+            if (/^---+\s*$/.test(l)) return `  ${slate('─'.repeat(40))}`;
+            return `  ${C.slate}${inlineMd(l, C.slate)}\x1b[0m`;
           }).join('\n');
         };
 
@@ -1353,9 +1446,17 @@ async function main() {
         console.log(`  ${slate(members.map(m => m.label).join(' · '))}`);
 
         const prompt = buildHarnessPrompt(messages, cmdArg);
+        turnInFlight = true;
         const settled = await Promise.allSettled(members.map(m =>
           runViaHarness(m.id, councilSystem, prompt, { quiet: true })
         ));
+        turnInFlight = false;
+        if (userCancelled) {
+          userCancelled = false;
+          console.log(`\n  ${slate('council cancelled — esc')}\n`);
+          rl.prompt();
+          return;
+        }
 
         const answers = [];
         settled.forEach((r, i) => {

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, 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', 'fable'], args: (p, m) => ['-p', p, '--output-format', 'text', ...(m ? ['--model', m] : [])] },
   'codex':       { bin: 'codex',        label: 'Codex CLI',    role: 'reasons & reviews',    auth: 'ChatGPT plan',                  models: true, args: (p, m) => ['exec', ...(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] : [])] },
@@ -36,6 +36,17 @@ const HARNESSES = {
   'droid':       { bin: 'droid',        label: 'Droid',        role: 'agentic coding',       auth: 'Factory account',               args: (p) => ['exec', p] },
 };
 
+// In-flight harness children — so ESC in the session can cancel a turn.
+const ACTIVE_CHILDREN = new Set();
+
+function cancelActive() {
+  let n = 0;
+  for (const c of ACTIVE_CHILDREN) {
+    try { c.kill('SIGTERM'); n++; } catch { /* already gone */ }
+  }
+  return n;
+}
+
 function isInstalled(id) {
   const h = HARNESSES[id];
   if (!h) return false;
@@ -68,6 +79,8 @@ function runViaHarness(id, systemPrompt, userPrompt, opts = {}) {
 
   return new Promise((resolve, reject) => {
     const child = spawn(h.bin, h.args(prompt, model), { stdio: ['pipe', 'pipe', 'pipe'] });
+    ACTIVE_CHILDREN.add(child);
+    child.on('close', () => ACTIVE_CHILDREN.delete(child));
     // Some harnesses (codex exec, gemini) wait for stdin EOF before running.
     child.stdin.end();
 
@@ -87,4 +100,4 @@ function runViaHarness(id, systemPrompt, userPrompt, opts = {}) {
   });
 }
 
-module.exports = { HARNESSES, isInstalled, detectInstalled, listHarnesses, runViaHarness };
+module.exports = { HARNESSES, isInstalled, detectInstalled, listHarnesses, runViaHarness, cancelActive };

package/package.json

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