@groeponline/pi-wishcraft 1.4.8 → 1.4.10

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [1.4.10] - 2026-08-30
+
+## [1.4.9] - 2026-08-29
+
 ## [1.4.8] - 2026-08-29
 
 ## [1.4.7] - 2026-08-28

package/bash-mode/editor.ts

@@ -279,17 +279,34 @@ export class BashModeEditor extends CustomEditor {
       }
 
       if (
-        bashMode &&
+        (bashMode || oneOffBashCommand) &&
         this.keybindingsRef.matches(data, "tui.input.submit") &&
         !this.keybindingsRef.matches(data, "tui.input.newLine")
       ) {
+        // One-off bang prompts run the text after the prefix (mirrors pi's
+        // own !/!! handling in interactive-mode.js); anything else submits
+        // verbatim. Without the strip the bang would hit bash history
+        // expansion (`!cmd` = replay a previous command) instead of `cmd`.
+        const raw = this.getExpandedText().trim();
+        const oneOff = getOneOffBashCommandContext(raw);
+        const command = oneOff ? oneOff.command.trim() : raw;
+        if (!command) {
+          // Bash-off bare `!`: fall back to pi's own submit handling, whose
+          // `if (command)` guard turns an empty command into a normal prompt
+          // (pre-interception behavior). Full bash mode keeps the return.
+          // This must run before the shell-running guard: a bare `!` while a
+          // managed shell job runs should still delegate to pi, not be
+          // swallowed by the "already running" warning.
+          if (!bashMode) {
+            super.handleInput(data);
+          }
+          return;
+        }
+
         if (this.optionsRef.isShellRunning()) {
           this.optionsRef.onNotify("Shell command already running", "warning");
           return;
         }
-
-        const command = this.getExpandedText().trim();
-        if (!command) return;
         this.clearGhostSuggestion();
         resetShellHistoryBrowse(this);
         this.optionsRef.onEditorSubmit?.();

package/bash-mode/pty-session.ts

@@ -119,6 +119,8 @@ interface RunningCommand {
   buffer: string;
   /** Trailing partial escape sequence carried across chunks. */
   escapeTail: string;
+  /** Wrapper result observed on stdout; publication waits for child close. */
+  pendingResult: PtyRunResult | null;
   resolve: (result: PtyRunResult) => void;
   settled: boolean;
 }
@@ -179,6 +181,7 @@ export class PtyShellSession {
         done,
         buffer: "",
         escapeTail: "",
+        pendingResult: null,
         resolve: (result) => {
           if (running.settled) return;
           running.settled = true;
@@ -224,9 +227,8 @@ export class PtyShellSession {
       child.stderr.on("data", (chunk: string) => this.handleChunk(String(chunk)));
       child.on("error", (error) => {
         // spawn itself failed (script removed between probe and spawn, dead
-        // SHELL path): surface the reason, then settle as a normal failure.
-        // The first script-path failure also flips the probe cache so the
-        // next command degrades to pipes instead of silently failing again.
+        // SHELL path): surface the reason, but do not publish completion until
+        // the matching child emits close. That preserves strict child ownership.
         console.warn(
           "[wishcraft] spawn failed:",
           error instanceof Error ? error.message : String(error),
@@ -234,20 +236,24 @@ export class PtyShellSession {
         if (usePty) {
           _resetScriptAvailableForTests();
         }
-        running.resolve({ exitCode: 1, cwd: this.state.cwd });
+        running.pendingResult = { exitCode: 1, cwd: this.state.cwd };
       });
       child.on("close", (code, signal) => {
-        this.child = null;
-        // No sentinel observed. An operator interrupt never lets the command
-        // complete, so it maps to 130 regardless of how `script` exits.
+        if (this.child === child) {
+          this.child = null;
+        }
+        // Completion is published only after this exact child closes, so a
+        // later run cannot have its child reference cleared by this callback.
         if (this.interrupted) {
           running.resolve({ exitCode: 130, cwd: this.state.cwd });
           return;
         }
-        running.resolve({
-          exitCode: getCloseExitCode(code, signal),
-          cwd: this.state.cwd,
-        });
+        running.resolve(
+          running.pendingResult ?? {
+            exitCode: getCloseExitCode(code, signal),
+            cwd: this.state.cwd,
+          },
+        );
       });
     });
   }
@@ -322,10 +328,10 @@ export class PtyShellSession {
         if (firstColon !== -1) {
           const exitCode = Number.parseInt(rest.slice(0, firstColon), 10);
           const cwd = rest.slice(firstColon + 1);
-          running.resolve({
+          running.pendingResult = {
             exitCode: Number.isFinite(exitCode) ? exitCode : 1,
             cwd: cwd || this.state.cwd,
-          });
+          };
           return;
         }
         continue;

package/docs/bash-mode.md

@@ -32,6 +32,8 @@ At command position, short stems first resolve from the newest successful local
 
 If the bash prompt is empty, bash mode shows the newest successful project-history ghost suggestion immediately when one exists, including right after mode entry or after the prompt is cleared again. One-off `!command` and `!!command` prompts reuse the same shell prediction pipeline, including ghost text. Right Arrow or Tab accepts ghost text into the editor, and Enter runs the current shell command. Mode entry stays quiet: there is no automatic or manual dropdown completion surface, and ghost suggestions do not run shell-native completion probes.
 
+One-off `!command` and `!!command` prompts also work when bash mode is off: Enter routes them through the managed shell with the prefix stripped, so `!cmd` runs `cmd` (in a real PTY) instead of a headless shell failing on TUI programs or hitting bash history expansion. Output lands in the transcript below the editor, not in the model conversation — pi's own `!`-prefix bash (headless, context-injected) is superseded while this extension's editor is active. Full bash mode (`ctrl+shift+b`) is only needed for running plain commands or keeping the shell session visible in the footer.
+
 ## Configuration
 
 In `~/.pi/agent/settings.json` (or under `PI_CODING_AGENT_DIR` when that environment variable is set):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@groeponline/pi-wishcraft",
-  "version": "1.4.8",
+  "version": "1.4.10",
   "description": "Operator cockpit for Pi: live powerline status, searchable skills, idea queue, sticky Bash, hooks, policy controls, and session UX.",
   "type": "module",
   "files": [