phewsh 0.15.3 → 0.15.5

package/README.md

@@ -84,6 +84,17 @@ Inside the shell:
 /help       All commands
 ```
 
+The prompt includes a compact status rail with the current folder, route,
+loaded `.intent/` files, and approximate context size. Multi-line pastes and
+single-line pastes of 300+ characters collapse after submission:
+
+```text
+[pasted 1,284 chars · 12 lines · Ctrl+O to expand]
+```
+
+Press `Ctrl+O` to inspect the last submitted paste and `Esc` to clear input or
+cancel an in-flight provider turn.
+
 ## What it does
 
 Creates three structured artifacts in `.intent/`:

package/commands/session.js

@@ -22,6 +22,14 @@ const { recordDecision, labelOutcome, pendingDecisions, outcomeStats, OUTCOMES }
 const { recordSessionEvent } = require('../lib/receipts-data');
 const configFile = require('../lib/config-file');
 const { createFailureTracker, createLineDispatcher } = require('../lib/session-input');
+const {
+  echoedRows,
+  estimateTokens,
+  formatPasteSummary,
+  formatTokenCount,
+  relativeFolder,
+  shouldCollapsePaste,
+} = require('../lib/session-display');
 const { recordProject, listProjects, scanForProjects, fmtAgo } = require('../lib/projects-index');
 
 // Brand palette shortcuts
@@ -503,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', {
@@ -631,6 +640,39 @@ async function main() {
     prompt: `  ${teal('phewsh')} ${sage('>')} `,
     historySize: 100,
   });
+  const promptText = `  phewsh > `;
+  let lastPaste = null;
+
+  function currentContextTokens() {
+    const conversation = messages.map(message => message.content).join('\n');
+    return estimateTokens(`${systemPrompt}\n${conversation}`);
+  }
+
+  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 readlinePrompt = rl.prompt.bind(rl);
+  rl.prompt = function promptWithStatusRail(preserveCursor) {
+    renderStatusRail();
+    return readlinePrompt(preserveCursor);
+  };
+
+  function collapsePastedEcho(lines, input) {
+    if (!process.stdout.isTTY || !shouldCollapsePaste(lines, input)) return;
+    const rows = echoedRows(lines, promptText, process.stdout.columns || 80);
+    for (let i = 0; i < rows; i++) process.stdout.write('\x1b[1A\x1b[2K\r');
+    lastPaste = input;
+    console.log(`  ${peach(formatPasteSummary(input, lines.length))}`);
+  }
 
   // Live input coloring — like Claude Code: text stays normal, and only a
   // RECOGNIZED leading /command (or @harness) token turns teal (peach for @)
@@ -674,12 +716,25 @@ async function main() {
   }
 
   if (process.stdin.isTTY) {
-    process.stdin.on('keypress', (str, key) => {
+    process.stdin.prependListener('keypress', (str, key) => {
       try {
+        if (key?.ctrl && key.name === 'o' && lastPaste) {
+          setImmediate(() => {
+            rl.line = '';
+            rl.cursor = 0;
+            process.stdout.write('\x1b[2K\r');
+            console.log(`  ${b(cream('Last paste'))} ${slate(`(${lastPaste.length.toLocaleString('en-US')} chars)`)}`);
+            console.log(lastPaste.split('\n').map(line => `  ${line}`).join('\n'));
+            console.log('');
+            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) {
@@ -1827,6 +1882,7 @@ async function main() {
   }
 
   const lineDispatcher = createLineDispatcher(handleInput, {
+    onBatch: ({ input, lines }) => collapsePastedEcho(lines, input),
     onNoop: () => rl.prompt(),
     onError: (err) => {
       console.error(`\n  ${ember('!')} ${sage('Input failed:')} ${err.message}`);

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/lib/session-display.js

@@ -0,0 +1,54 @@
+const path = require('path');
+
+const ANSI_RE = /\x1b\[[0-9;?]*[ -/]*[@-~]/g;
+
+function visibleLength(value) {
+  return String(value || '').replace(ANSI_RE, '').length;
+}
+
+function estimateTokens(value) {
+  return Math.max(0, Math.ceil(String(value || '').length / 4));
+}
+
+function formatTokenCount(tokens) {
+  if (tokens < 1000) return String(tokens);
+  return `${(tokens / 1000).toFixed(tokens < 10000 ? 1 : 0)}k`;
+}
+
+function shouldCollapsePaste(lines, input, threshold = 300) {
+  return lines.length > 1 || input.length >= threshold;
+}
+
+function formatPasteSummary(input, lineCount) {
+  const chars = input.length.toLocaleString('en-US');
+  const lines = lineCount > 1 ? ` · ${lineCount} lines` : '';
+  return `[pasted ${chars} chars${lines} · Ctrl+O to expand]`;
+}
+
+function echoedRows(lines, prompt, columns = 80) {
+  const width = Math.max(20, columns || 80);
+  return lines.reduce((total, line, index) => {
+    const prefix = index === 0 ? visibleLength(prompt) : 0;
+    return total + Math.max(1, Math.ceil((prefix + visibleLength(line)) / width));
+  }, 0);
+}
+
+function relativeFolder(cwd, home) {
+  if (!cwd) return '';
+  const relative = home ? path.relative(home, cwd) : cwd;
+  if (home && relative && !relative.startsWith('..') && !path.isAbsolute(relative)) {
+    return `~/${relative}`;
+  }
+  if (home && relative === '') return '~';
+  return cwd;
+}
+
+module.exports = {
+  echoedRows,
+  estimateTokens,
+  formatPasteSummary,
+  formatTokenCount,
+  relativeFolder,
+  shouldCollapsePaste,
+  visibleLength,
+};

package/lib/session-input.js

@@ -1,6 +1,7 @@
 function createLineDispatcher(handleInput, {
   onError = (err) => { throw err; },
   onNoop = () => {},
+  onBatch = () => {},
   schedule = setImmediate,
 } = {}) {
   let pendingLines = [];
@@ -16,6 +17,7 @@ function createLineDispatcher(handleInput, {
       onNoop();
       return;
     }
+    onBatch({ input, lines });
     chain = chain.then(() => handleInput(input)).catch(onError);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phewsh",
-  "version": "0.15.3",
+  "version": "0.15.5",
   "description": "Turn intent into action. Structure your thinking, execute your next step.",
   "bin": {
     "phewsh": "bin/phewsh.js"
@@ -35,6 +35,9 @@
   "engines": {
     "node": ">=18.0.0"
   },
+  "scripts": {
+    "test": "node --test test/*.test.js"
+  },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.0"
   }