@trim21/personal-pi-extensions 0.0.239 → 0.0.241

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.0.239",
+  "version": "0.0.241",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [

package/src/bwrap/core.ts

@@ -167,7 +167,13 @@ function findDefaultBwrap(): string {
 }
 
 export function findBwrap(override?: string): string {
-  return override ?? findDefaultBwrap();
+  if (override) {
+    if (!existsSync(override)) {
+      throw new Error(`bwrap not found at configured path: ${override}`);
+    }
+    return override;
+  }
+  return findDefaultBwrap();
 }
 
 export function buildBwrapArgs(resolved: ResolvedBwrap, cwd: string): string[] {

package/src/bwrap/runtime.ts

@@ -73,6 +73,7 @@ function notifyMode(
 export class BwrapRuntime {
   private resolved: ResolvedBwrap | undefined;
   private sandboxDisabled = false;
+  private bwrapUnavailable = false;
 
   setup(pi: ExtensionAPI): void {
     pi.registerFlag("no-bwrap", {
@@ -84,13 +85,18 @@ export class BwrapRuntime {
     pi.on("session_start", (_event, ctx) => {
       this.sandboxDisabled = pi.getFlag("no-bwrap") === true && ctx.hasUI;
       this.resolved = undefined;
+      this.bwrapUnavailable = false;
       const runtime = this.resolve(ctx);
       if (runtime.bwrapEnabled) {
         try {
           findBwrap(runtime.bwrapPath);
         } catch (error) {
-          this.sandboxDisabled = true;
+          // Fail closed: a missing bwrap binary must not silently degrade to an
+          // unsandboxed allow-all session. Commands are refused until the user
+          // explicitly opts out via --no-bwrap or the bwrap-allow-all command.
+          this.bwrapUnavailable = true;
           this.resolved = undefined;
+          ctx.ui.setStatus("bwrap", ctx.ui.theme.fg("error", "bwrap: unavailable"));
           ctx.ui.notify(error instanceof Error ? error.message : "bwrap not found", "error");
           return;
         }
@@ -110,10 +116,16 @@ export class BwrapRuntime {
 
     pi.on("before_agent_start", (event, ctx) => {
       const runtime = this.resolve(ctx);
-      const prompt = ctx.hasUI
-        ? `\n\n## Command Execution\nCurrent bwrap mode: **${runtime.mode}**. The bwrap runtime selects sandboxing and, when requested, user approval for unsandboxed execution.\n`
-        : "\n\n## Command Execution\nThis headless session is forced into bwrap readonly mode. Unsandboxed execution cannot be approved.\n";
-      return { systemPrompt: event.systemPrompt + prompt };
+      const modeText = ctx.hasUI
+        ? `Current bwrap mode: **${runtime.mode}**. The bwrap runtime selects sandboxing and, when requested, user approval for unsandboxed execution.`
+        : "This headless session is forced into bwrap readonly mode. Unsandboxed execution cannot be approved.";
+      const unavailableText = this.bwrapUnavailable
+        ? " bwrap is unavailable (binary not found): bash commands are refused unless the user explicitly approves unsandboxed execution."
+        : "";
+      return {
+        systemPrompt:
+          event.systemPrompt + `\n\n## Command Execution\n${modeText}${unavailableText}\n`,
+      };
     });
 
     this.registerCommands(pi);
@@ -128,10 +140,17 @@ export class BwrapRuntime {
   reset(): void {
     this.resolved = undefined;
     this.sandboxDisabled = false;
+    this.bwrapUnavailable = false;
   }
 
   async execute(request: BwrapExecutionRequest) {
     const runtime = this.resolve(request.ctx);
+    if (this.bwrapUnavailable && runtime.bwrapEnabled && request.requestFullAccess !== true) {
+      throw new Error(
+        "bwrap (bubblewrap) not found; refusing to execute commands without sandboxing. " +
+          "Install bubblewrap and restart the session, or pass --no-bwrap to disable the sandbox explicitly.",
+      );
+    }
     if (request.requestFullAccess === true && runtime.bwrapEnabled) {
       await this.approveFullAccess(request.ctx, request.command, request.requestFullAccessReason);
     }
@@ -229,6 +248,13 @@ export class BwrapRuntime {
       handler: (args, ctx) =>
         this.runCommand(pi, specs.bwrap, args, ctx, (commandCtx) => {
           const runtime = this.resolve(commandCtx);
+          if (this.bwrapUnavailable) {
+            commandCtx.ui.notify(
+              "bwrap is unavailable: binary not found. Commands are refused unless sandboxing is explicitly disabled.",
+              "error",
+            );
+            return;
+          }
           if (!runtime.bwrapEnabled) {
             commandCtx.ui.notify(`bwrap disabled (mode: ${runtime.mode})`, "info");
             return;

package/src/gh-readonly.ts

@@ -29,9 +29,10 @@
  */
 
 import { spawn } from "node:child_process";
+import { existsSync } from "node:fs";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
-import { dirname, join, resolve } from "node:path";
+import { delimiter, dirname, join, resolve } from "node:path";
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { withFileMutationQueue } from "@earendil-works/pi-coding-agent";
@@ -46,10 +47,28 @@ interface GhResult {
   combined: string;
   /** Why the process was killed, when `killed` is true. */
   reason?: "timeout" | "abort";
+  /** When the process could not be started at all (e.g. `gh` not found in PATH). */
+  spawnError?: string;
 }
 
 // ── helpers ──────────────────────────────────────────────────────────────────
 
+/**
+ * Check whether the `gh` CLI is on the system, scanning PATH like
+ * `findDefaultBwrap`. The extension registers no tools when `gh` is missing, so
+ * the model never sees GitHub tools that would fail on every call.
+ */
+export function isGhAvailable(): boolean {
+  const pathEnv = process.env.PATH ?? "";
+  for (const directory of pathEnv.split(delimiter)) {
+    if (existsSync(join(directory, "gh"))) return true;
+  }
+  for (const candidate of ["/usr/bin/gh", "/usr/local/bin/gh", "/run/current-system/sw/bin/gh"]) {
+    if (existsSync(candidate)) return true;
+  }
+  return false;
+}
+
 export function runGh(
   args: string[],
   ctx: { cwd?: string; signal?: AbortSignal; timeout?: number },
@@ -131,12 +150,22 @@ export function runGh(
       });
     });
 
-    proc.on("error", () => {
+    proc.on("error", (err: Error) => {
       if (timeoutId) clearTimeout(timeoutId);
       if (onAbort && ctx.signal) {
         ctx.signal.removeEventListener("abort", onAbort);
       }
-      resolve({ stdout, stderr, code: 1, killed, combined: combined.join(""), reason: killReason });
+      // spawn 失败（如 gh 不在 PATH → ENOENT、cwd 不存在）时进程从未启动，
+      // 没有任何 stdout/stderr；把底层错误带上，否则会退化成无信息的 "exit code 1"。
+      resolve({
+        stdout,
+        stderr,
+        code: 1,
+        killed,
+        combined: combined.join(""),
+        reason: killReason,
+        spawnError: err.message,
+      });
     });
   });
 }
@@ -162,9 +191,21 @@ export class GhError extends Error {
           ? " (command aborted)"
           : ""
       : "";
-    super(
-      `${inputText}<output>${result.combined.trim() || `exit code ${result.code}`}${killedText}<output>`,
-    );
+
+    // The process never started (e.g. `gh` not found): surface the spawn error.
+    // Otherwise show the command's own output; an empty output with a non-zero
+    // exit is explicitly marked, so a bare "exit code 1" can't be mistaken for
+    // a specific failure.
+    let outputText: string;
+    if (result.spawnError) {
+      outputText = `spawn failed: ${result.spawnError}`;
+    } else if (result.combined.trim()) {
+      outputText = result.combined.trim();
+    } else {
+      outputText = `exit code ${result.code} (no output)`;
+    }
+
+    super(`${inputText}<output>${outputText}${killedText}<output>`);
     this.name = "GhError";
     this.args = args;
     this.code = result.code;
@@ -1058,6 +1099,19 @@ export async function writeLogFile(
 // ── tools ────────────────────────────────────────────────────────────────────
 
 export default function ghReadonlyTools(pi: ExtensionAPI) {
+  // Fail fast: the `gh` CLI is the only backend for these tools. Without it the
+  // extension registers nothing and reports the problem at session start, so
+  // the user gets one clear error instead of a dozen failing tool calls.
+  if (!isGhAvailable()) {
+    pi.on("session_start", (_event, ctx) => {
+      ctx.ui.notify(
+        "gh CLI not found in PATH: GitHub read-only tools are disabled. Install GitHub CLI (https://cli.github.com/) and reload the session.",
+        "error",
+      );
+    });
+    return;
+  }
+
   // ── read-github-issue ──────────────────────────────────────────────────────
   pi.registerTool({
     name: "read-github-issue",