@trim21/personal-pi-extensions 0.0.426 → 0.0.428

package/README.md

@@ -80,8 +80,8 @@ bash 工具（opencode 风格 `bash`、Claude Code 风格 `Bash`）注册了 `da
   "writablePaths": [".", "/tmp", "~/my-projects"],
   // 额外可写路径，与默认值合并（ro-bind）
   "extraWritablePaths": ["~/.config"],
-  // tmpfs 挂载路径（避免写入磁盘）
-  "tmpfsPaths": [],
+  // 沙箱内隐藏的路径：以 / 结尾的视为目录（挂空 tmpfs），否则按文件处理（--ro-bind-try /dev/null）
+  "denyPaths": [],
   // 额外 bwrap 参数
   "extraArgs": ["--die-with-parent"],
   // 全权限执行的自动审批规则：命中规则的命令不弹确认框

package/package.json

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

package/src/bwrap/core.ts

@@ -1,8 +1,7 @@
 import { type ChildProcess, spawn } from "node:child_process";
-import { closeSync, constants, type Dirent, existsSync, openSync, readFileSync } from "node:fs";
+import { constants, type Dirent, existsSync, readFileSync } from "node:fs";
 import { access as fsAccess, readdir, stat } from "node:fs/promises";
 import { delimiter, join } from "node:path";
-import { fileURLToPath } from "node:url";
 
 import { StringEnum } from "@earendil-works/pi-ai";
 import { type BashOperations, getAgentDir, getShellConfig } from "@earendil-works/pi-coding-agent";
@@ -31,7 +30,12 @@ const bwrapConfigProperties = {
   bwrapPath: Type.Optional(Type.String()),
   writablePaths: Type.Array(Type.String()),
   extraWritablePaths: Type.Array(Type.String()),
-  tmpfsPaths: Type.Array(Type.String()),
+  denyPaths: Type.Array(
+    Type.String({
+      description:
+        "沙箱内隐藏的路径：以 / 结尾为目录（挂空 tmpfs），否则为文件（--ro-bind-try /dev/null）",
+    }),
+  ),
   extraArgs: Type.Array(Type.String()),
   networkAllowlist: Type.Array(
     Type.String({ description: "允许直连的域名 / IP / CIDR，可带 :port" }),
@@ -71,7 +75,8 @@ export interface ResolvedBwrap {
   bwrapPath?: string;
   writablePaths: string[];
   extraWritablePaths: string[];
-  tmpfsPaths: string[];
+  /** 沙箱内隐藏的路径：以 / 结尾为目录（挂空 tmpfs），否则为文件（--ro-bind-try /dev/null）。 */
+  denyPaths: string[];
   extraArgs: string[];
   /** 允许直连的域名 / IP / IP:port 白名单（非空 = 启用 sing-box 网络过滤）。 */
   networkAllowlist: string[];
@@ -85,7 +90,7 @@ const DEFAULT_CONFIG: BwrapConfig = {
   mode: "workspace-write",
   writablePaths: [".", "/tmp"],
   extraWritablePaths: [],
-  tmpfsPaths: [],
+  denyPaths: [],
   extraArgs: [],
   networkAllowlist: [],
 };
@@ -96,7 +101,7 @@ export function resolveBwrap(config: BwrapConfig): ResolvedBwrap {
     bwrapPath: config.bwrapPath,
     writablePaths: config.writablePaths ?? [".", "/tmp"],
     extraWritablePaths: config.extraWritablePaths,
-    tmpfsPaths: config.tmpfsPaths ?? [],
+    denyPaths: config.denyPaths ?? [],
     extraArgs: config.extraArgs ?? [],
     networkAllowlist: config.networkAllowlist ?? [],
     singBoxPath: config.singBoxPath,
@@ -128,7 +133,7 @@ export function resolveHeadlessBwrap(config: BwrapConfig): ResolvedBwrap {
     mode: "readonly",
     writablePaths: [],
     extraWritablePaths: [],
-    tmpfsPaths: [],
+    denyPaths: [],
     extraArgs: [],
   });
 }
@@ -139,7 +144,7 @@ function deepMerge(base: BwrapConfig, overrides: Partial<BwrapConfig>): BwrapCon
     bwrapPath: overrides.bwrapPath ?? base.bwrapPath,
     writablePaths: overrides.writablePaths ?? base.writablePaths,
     extraWritablePaths: [...base.extraWritablePaths, ...(overrides.extraWritablePaths ?? [])],
-    tmpfsPaths: overrides.tmpfsPaths ?? base.tmpfsPaths,
+    denyPaths: overrides.denyPaths ?? base.denyPaths,
     extraArgs: overrides.extraArgs ?? base.extraArgs,
     networkAllowlist: overrides.networkAllowlist ?? base.networkAllowlist,
     singBoxPath: overrides.singBoxPath ?? base.singBoxPath,
@@ -323,8 +328,14 @@ export async function buildBwrapArgs(resolved: ResolvedBwrap, cwd: string): Prom
     const absolutePath = resolveBwrapPath(path, cwd);
     args.push("--bind-try", absolutePath, absolutePath);
   }
-  for (const path of resolved.tmpfsPaths) {
-    args.push("--tmpfs", resolveBwrapPath(path, cwd));
+  // denyPaths：以 / 结尾的条目视为目录（挂空 tmpfs），否则视为文件（--ro-bind-try /dev/null 覆盖）
+  for (const path of resolved.denyPaths) {
+    const target = resolveBwrapPath(path, cwd);
+    if (path.endsWith("/")) {
+      args.push("--tmpfs", target);
+    } else {
+      args.push("--ro-bind-try", "/dev/null", target);
+    }
   }
   if (!resolved.network) args.push("--unshare-net");
   // --ro-bind-try：目录不存在（或已被删除）时自动忽略
@@ -350,22 +361,6 @@ export async function buildBwrapArgs(resolved: ResolvedBwrap, cwd: string): Prom
   return args;
 }
 
-const SECCOMP_BPF_FILE = (() => {
-  const directory = fileURLToPath(new URL(".", import.meta.url));
-  if (process.arch === "x64") return join(directory, "seccomp-x86_64.bpf");
-  if (process.arch === "arm64") return join(directory, "seccomp-aarch64.bpf");
-  return "";
-})();
-
-function getSeccompFd(): number | undefined {
-  if (!SECCOMP_BPF_FILE) return undefined;
-  try {
-    return openSync(SECCOMP_BPF_FILE, "r");
-  } catch {
-    return undefined;
-  }
-}
-
 function killChild(child: ChildProcess): void {
   if (!child.pid) return;
   try {
@@ -448,19 +443,13 @@ export function createBwrapBashOperations(
         });
       }
 
-      const seccompFd = resolved.network ? undefined : getSeccompFd();
       const child = spawn(
         findBwrap(resolved.bwrapPath),
-        seccompFd === undefined
-          ? [...baseArgs, "--", shell, "-lc", command]
-          : [...baseArgs, "--seccomp", "3", "--", shell, "-lc", command],
+        [...baseArgs, "--", shell, "-lc", command],
         {
           cwd,
           detached: true,
-          stdio:
-            seccompFd === undefined
-              ? ["ignore", "pipe", "pipe"]
-              : ["ignore", "pipe", "pipe", seccompFd],
+          stdio: ["ignore", "pipe", "pipe"],
           env,
         },
       );
@@ -481,7 +470,6 @@ export function createBwrapBashOperations(
         child.once("close", (exitCode) => {
           if (timeoutHandle) clearTimeout(timeoutHandle);
           signal?.removeEventListener("abort", onAbort);
-          if (seccompFd !== undefined) closeSync(seccompFd);
           if (signal?.aborted) reject(new Error("aborted"));
           else if (timedOut) reject(new Error(`timeout:${timeout}`));
           else resolve({ exitCode });

package/src/bwrap/runtime.ts

@@ -708,9 +708,9 @@ export class BwrapRuntime {
           const writable = runtime.writablePaths.map((path) =>
             resolveBwrapPath(path, commandCtx.cwd),
           );
-          const tmpfs = runtime.tmpfsPaths.map((path) => resolveBwrapPath(path, commandCtx.cwd));
+          const deny = runtime.denyPaths.map((path) => resolveBwrapPath(path, commandCtx.cwd));
           commandCtx.ui.notify(
-            `bwrap ${runtime.mode} ${runtime.network ? "net" : "no-net"} write:[${writable.join(", ")}] tmpfs:[${tmpfs.join(", ") || "-"}]`,
+            `bwrap ${runtime.mode} ${runtime.network ? "net" : "no-net"} write:[${writable.join(", ")}] deny:[${deny.join(", ") || "-"}]`,
             "info",
           );
         }),

package/src/claude-code/files.ts

@@ -17,6 +17,7 @@ import { Type } from "typebox";
 import { appendLspDiagnosticText } from "../lib/lsp/diagnostic.js";
 import { type LspService, registerLsp } from "../lib/lsp/lsp.js";
 import { formatSubtitlePath } from "../lib/path.js";
+import type { ToolPendant } from "../lib/pendant.ts";
 import { guardWriteAccess } from "../lib/write-guard.js";
 import {
   type ClaudeCodeState,
@@ -302,7 +303,10 @@ export function registerFileTools(
           content,
           details: {
             reads: { [key]: snapshot },
-            pendant: { subtitle: formatSubtitlePath(ctx.cwd, filePath) },
+            pendant: {
+              subtitle: formatSubtitlePath(ctx.cwd, filePath),
+              title: "Read",
+            } satisfies ToolPendant,
           },
         };
       }
@@ -354,7 +358,10 @@ export function registerFileTools(
         content: [{ type: "text", text: formatted.text }],
         details: {
           reads: { [key]: snapshot },
-          pendant: { subtitle: formatSubtitlePath(ctx.cwd, filePath) },
+          pendant: {
+            subtitle: formatSubtitlePath(ctx.cwd, filePath),
+            title: "Read",
+          } satisfies ToolPendant,
         },
       };
     },
@@ -566,7 +573,10 @@ export function registerFileTools(
         content: [{ type: "text" as const, text }],
         details: {
           ...details,
-          pendant: { subtitle: formatSubtitlePath(ctx.cwd, filePath, errorCount, warningCount) },
+          pendant: {
+            subtitle: formatSubtitlePath(ctx.cwd, filePath, errorCount, warningCount),
+            title: "Edit",
+          } satisfies ToolPendant,
         },
       };
     },