@trim21/personal-pi-extensions 0.0.370 → 0.0.373

package/package.json

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

package/src/bwrap/core.ts

@@ -5,7 +5,7 @@ import { delimiter, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
 import { StringEnum } from "@earendil-works/pi-ai";
-import { type BashOperations, getAgentDir } from "@earendil-works/pi-coding-agent";
+import { type BashOperations, getAgentDir, getShellConfig } from "@earendil-works/pi-coding-agent";
 import { type Static, Type } from "typebox";
 import { Value } from "typebox/value";
 
@@ -245,6 +245,8 @@ export function createBwrapBashOperations(
   resolved: ResolvedBwrap,
   workspace: string,
 ): BashOperations {
+  // 沙箱内不透传 PATH，execvp 的默认路径可能找不到 bash（如 NixOS），故在父进程解析绝对路径
+  const shell = getShellConfig().shell;
   return {
     async exec(command, cwd, { onData, signal, timeout }) {
       await fsAccess(cwd, constants.F_OK).catch(() => {
@@ -252,6 +254,12 @@ export function createBwrapBashOperations(
       });
       if (signal?.aborted) throw new Error("aborted");
 
+      // 干净环境：不继承父进程 env/PATH，由 bash -lc 从 /etc/profile 与用户 profile 重建
+      const home = process.env.HOME;
+      if (home === undefined) {
+        throw new Error("HOME is not set; refusing to run bash in a clean environment");
+      }
+
       const seccompFd = resolved.network ? undefined : getSeccompFd();
       const baseArgs = [
         "--ro-bind",
@@ -266,8 +274,8 @@ export function createBwrapBashOperations(
       const child = spawn(
         findBwrap(resolved.bwrapPath),
         seccompFd === undefined
-          ? [...baseArgs, "--", "bash", "-c", command]
-          : [...baseArgs, "--seccomp", "3", "--", "bash", "-c", command],
+          ? [...baseArgs, "--", shell, "-lc", command]
+          : [...baseArgs, "--seccomp", "3", "--", shell, "-lc", command],
         {
           cwd,
           detached: true,
@@ -275,7 +283,12 @@ export function createBwrapBashOperations(
             seccompFd === undefined
               ? ["ignore", "pipe", "pipe"]
               : ["ignore", "pipe", "pipe", seccompFd],
-          env: process.env,
+          env: {
+            HOME: home,
+            SHELL: "/bin/bash",
+            TERM: "dumb",
+            LANG: "C.UTF-8",
+          },
         },
       );