phewsh 0.15.4 → 0.15.6

package/commands/session.js

@@ -511,6 +511,7 @@ async function main() {
       turnInFlight = true;
       const output = await runViaHarness(harnessId, fullSystem, buildHarnessPrompt(messages, input), { model: harnessModel });
       turnInFlight = false;
+      userCancelled = false; // a SIGTERM the harness rode out must not mislabel the next turn
       messages.push({ role: 'user', content: input });
       messages.push({ role: 'assistant', content: (output || '').trim() });
       recordSessionEvent(harnessId, projectName, 'task_complete', {
@@ -647,16 +648,22 @@ async function main() {
     return estimateTokens(`${systemPrompt}\n${conversation}`);
   }
 
+  // One quiet line, Claude Code-bar style: route + model · context gauge ·
+  // mode. Hints live in /help — the rail is glanceable state, not a manual.
   function renderStatusRail() {
     if (!process.stdout.isTTY) return;
     const folder = relativeFolder(process.cwd(), os.homedir());
-    const contextLabel = intentFiles.length > 0
-      ? `${intentFiles.length} intent file${intentFiles.length === 1 ? '' : 's'}`
-      : 'no project context';
-    const routeName = routeLabel(route, config);
-    const tokens = formatTokenCount(currentContextTokens());
-    console.log(`  ${slate(folder)} ${slate('·')} ${cream(routeName)} ${slate('·')} ${sage(contextLabel)} ${slate('·')} ${sage(`~${tokens} ctx tokens`)}`);
-    console.log(`  ${slate('/help commands · /use route · /context memory · Ctrl+O last paste · Esc cancel')}`);
+    const routeName = route?.type === 'harness' ? HARNESSES[route.id].label : routeLabel(route, config);
+    const model = route?.type === 'harness'
+      ? (harnessModel || 'default model')
+      : modelName(currentModel);
+    const tokens = currentContextTokens();
+    const pct = Math.min(99, Math.round((tokens / 200000) * 100));
+    const bar = '█'.repeat(Math.max(1, Math.round(pct / 10))) + '░'.repeat(10 - Math.max(1, Math.round(pct / 10)));
+    const modeLabel = sessionMode
+      ? Object.values(INTENT_MODES).find(m => m.id === sessionMode)?.label.toLowerCase()
+      : 'open';
+    console.log(`  ${slate(folder)} ${slate('│')} ${cream(routeName)} ${slate(model)} ${slate('│')} ${slate(bar)} ${slate(pct + '%')} ${slate('│')} ${sage('⏵ ' + modeLabel)} ${slate('(shift+tab)')}`);
   }
 
   const readlinePrompt = rl.prompt.bind(rl);
@@ -714,9 +721,72 @@ async function main() {
     };
   }
 
+  // ── Bracketed paste: like Claude Code, a paste lands in the input line as
+  // a collapsed placeholder and NEVER auto-submits — Enter sends it. The
+  // terminal marks paste boundaries (\x1b[200~ … \x1b[201~); Node's keypress
+  // decoder surfaces them as paste-start/paste-end. While pasting we detach
+  // readline so embedded newlines can't fire 'line' events.
+  const PASTE_ON = '\x1b[?2004h';
+  const PASTE_OFF = '\x1b[?2004l';
+  let pasting = false;
+  let pasteChunks = [];
+  let detachedListeners = null;
+  let pasteCounter = 0;
+  const pendingPastes = new Map();
+
+  function pasteMode(on) {
+    if (process.stdout.isTTY) process.stdout.write(on ? PASTE_ON : PASTE_OFF);
+  }
+
+  // Substitute placeholders back to the real pasted text at submit time.
+  function expandPastes(input) {
+    let out = input;
+    for (const [tag, text] of pendingPastes) {
+      if (out.includes(tag)) {
+        out = out.split(tag).join(text);
+        pendingPastes.delete(tag);
+      }
+    }
+    return out;
+  }
+
+  let wasSpecialInput = false; // recolor must also fire when the token STOPS matching
+
   if (process.stdin.isTTY) {
-    process.stdin.prependListener('keypress', (str, key) => {
+    const phewshKeypress = (str, key) => {
       try {
+        // Paste interception comes first — everything inside the paste is data.
+        if (key && key.name === 'paste-start') {
+          pasting = true;
+          pasteChunks = [];
+          detachedListeners = process.stdin.listeners('keypress').filter(l => l !== phewshKeypress);
+          for (const l of detachedListeners) process.stdin.removeListener('keypress', l);
+          return;
+        }
+        if (pasting) {
+          if (key && key.name === 'paste-end') {
+            pasting = false;
+            for (const l of detachedListeners || []) process.stdin.on('keypress', l);
+            detachedListeners = null;
+            const text = pasteChunks.join('');
+            pasteChunks = [];
+            if (!text) return;
+            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]`;
+              pendingPastes.set(tag, text);
+              lastPaste = text;
+              rl.write(tag);
+            } else {
+              rl.write(text);
+            }
+            return;
+          }
+          pasteChunks.push(str !== undefined && str !== null ? String(str) : (key && key.sequence) || '');
+          return;
+        }
+
         if (key?.ctrl && key.name === 'o' && lastPaste) {
           setImmediate(() => {
             rl.line = '';
@@ -729,10 +799,22 @@ async function main() {
           });
           return;
         }
+        // shift+tab cycles the session mode — open → build → research → decide → review
+        if (key && key.name === 'tab' && key.shift) {
+          const ids = [null, ...Object.values(INTENT_MODES).map(m => m.id)];
+          const next = ids[(ids.indexOf(sessionMode) + 1) % ids.length];
+          sessionMode = next;
+          const label = next ? Object.values(INTENT_MODES).find(m => m.id === next).label : 'Open';
+          process.stdout.write('\x1b[2K\r');
+          console.log(`  ${teal('⏵')} ${sage('mode:')} ${cream(label.toLowerCase())}${next ? slate(' — ' + 'shapes how routes respond') : slate(' — no slant')}`);
+          rl.prompt();
+          return;
+        }
         // ESC: cancel an in-flight turn, or clear the input line.
         if (key && key.name === 'escape') {
           if (turnInFlight) {
             userCancelled = true;
+            process.stdout.write('\n  \x1b[38;5;247mcancelling…\x1b[0m\n');
             if (turnAbort) turnAbort.abort();
             cancelActive();
           } else if (rl.line) {
@@ -742,17 +824,23 @@ async function main() {
           }
           return;
         }
-        // Re-render so token coloring tracks edits (and un-colors when it
-        // stops matching a known command).
+        // Re-render so token coloring tracks edits — including the keystroke
+        // where the token stops matching and must un-color.
         const cur = rl.line || '';
-        if (cur[0] === '/' || cur[0] === '@') rl._refreshLine();
+        const special = cur[0] === '/' || cur[0] === '@';
+        if (special || wasSpecialInput) rl._refreshLine();
+        wasSpecialInput = special;
       } catch { /* never break input */ }
-    });
+    };
+    process.stdin.prependListener('keypress', phewshKeypress);
+    pasteMode(true);
+    process.on('exit', () => pasteMode(false)); // never leave the terminal in paste mode
   }
 
   rl.prompt();
 
   async function handleInput(input) {
+    input = expandPastes(input);
 
     // A bare number right after a route failure picks the fallback
     if (awaitingFallback) {
@@ -1450,10 +1538,12 @@ async function main() {
           console.log('');
           console.log(`  ${teal('●')} ${sage('Handing you to the guided update')} ${slate('— exit to come back to phewsh')}`);
           console.log('');
+          pasteMode(false);
           rl.pause();
           const { spawnSync } = require('child_process');
           spawnSync(process.execPath, [path.join(__dirname, '..', 'bin', 'phewsh.js'), 'clarify'], { stdio: 'inherit' });
           rl.resume();
+          pasteMode(true);
           console.log('');
           console.log(`  ${teal('●')} ${sage('Back in phewsh.')} ${slate('/intent view to see the result — agents pick it up automatically')}`);
           console.log('');
@@ -1762,10 +1852,12 @@ async function main() {
           console.log(`  ${slate('your .intent/ context rides along via CLAUDE.md')}`);
         }
         console.log('');
+        pasteMode(false);
         rl.pause();
         const { spawnSync } = require('child_process');
         const res = spawnSync(h.bin, [], { stdio: 'inherit' });
         rl.resume();
+        pasteMode(true);
         recordSessionEvent(target, projectName, 'task_complete', {
           taskId: decisionId, success: res.status === 0, summary: `interactive ${h.label} session`,
         });

package/lib/harnesses.js

@@ -42,7 +42,17 @@ const ACTIVE_CHILDREN = new Set();
 function cancelActive() {
   let n = 0;
   for (const c of ACTIVE_CHILDREN) {
-    try { c.kill('SIGTERM'); n++; } catch { /* already gone */ }
+    try {
+      c._phewshCancelled = true; // close handler rejects even if exit is 0
+      c.kill('SIGTERM');
+      // Some harnesses (codex) ride out SIGTERM and finish anyway —
+      // escalate so esc means esc.
+      const t = setTimeout(() => {
+        try { if (c.exitCode === null) c.kill('SIGKILL'); } catch { /* gone */ }
+      }, 1200);
+      if (t.unref) t.unref();
+      n++;
+    } catch { /* already gone */ }
   }
   return n;
 }
@@ -93,6 +103,7 @@ function runViaHarness(id, systemPrompt, userPrompt, opts = {}) {
     child.stderr.on('data', (d) => { stderr += d.toString(); });
     child.on('close', (code) => {
       if (!opts.quiet) process.stdout.write('\n');
+      if (child._phewshCancelled) return reject(new Error(`${h.label} cancelled`));
       if (code === 0) resolve(stdout);
       else reject(new Error(`${h.label} exited ${code}${stderr ? `\n  ${stderr.trim().split('\n').slice(-3).join('\n  ')}` : ''}`));
     });

package/package.json

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