phewsh 0.15.4 → 0.15.5

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', {
@@ -733,6 +734,7 @@ async function main() {
         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) {

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.5",
   "description": "Turn intent into action. Structure your thinking, execute your next step.",
   "bin": {
     "phewsh": "bin/phewsh.js"