@trim21/personal-pi-extensions 0.1.523 → 0.1.525

package/package.json

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

package/src/bwrap/core.ts

@@ -1,6 +1,6 @@
 import { type ChildProcess, spawn } from "node:child_process";
 import { constants, type Dirent, existsSync, readFileSync } from "node:fs";
-import { access as fsAccess, readdir, stat } from "node:fs/promises";
+import { access as fsAccess, readdir, realpath, stat } from "node:fs/promises";
 import { delimiter, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -337,20 +337,34 @@ export async function findGitDirs(root: string): Promise<string[]> {
   return found;
 }
 
+/**
+ * bwrap 创建挂载点时不跟随目标路径中的 symlink 组件（防 symlink 逃逸），
+ * 含绝对 symlink 的配置路径会以 "Can't mkdir parents ... No such file or directory" 失败。
+ * 已存在的路径先解析成真实路径（沙箱内 ro-bind 的 / 下同样可见，symlink 语义不变）；
+ * 不存在的路径保持原样，交给 --*-try 的跳过语义处理。
+ */
+async function realpathOrSelf(path: string): Promise<string> {
+  try {
+    return await realpath(path);
+  } catch {
+    return path;
+  }
+}
+
 export async function buildBwrapArgs(resolved: ResolvedBwrap, cwd: string): Promise<string[]> {
   const args = ["--new-session", "--die-with-parent", "--unshare-user", "--unshare-pid"];
   // --*-bind-try：配置的路径不存在时忽略该项而不是让整条命令失败
   for (const path of resolved.writablePaths) {
-    const absolutePath = resolveBwrapPath(path, cwd);
+    const absolutePath = await realpathOrSelf(resolveBwrapPath(path, cwd));
     args.push("--bind-try", absolutePath, absolutePath);
   }
   for (const path of resolved.extraWritablePaths) {
-    const absolutePath = resolveBwrapPath(path, cwd);
+    const absolutePath = await realpathOrSelf(resolveBwrapPath(path, cwd));
     args.push("--bind-try", absolutePath, absolutePath);
   }
   // denyPaths：以 / 结尾的条目视为目录（挂空 tmpfs），否则视为文件（--ro-bind-try /dev/null 覆盖）
   for (const path of resolved.denyPaths) {
-    const target = resolveBwrapPath(path, cwd);
+    const target = await realpathOrSelf(resolveBwrapPath(path, cwd));
     if (path.endsWith("/")) {
       args.push("--tmpfs", target);
     } else {
@@ -360,13 +374,13 @@ export async function buildBwrapArgs(resolved: ResolvedBwrap, cwd: string): Prom
   if (!resolved.network) args.push("--unshare-net");
   // --ro-bind-try：目录不存在（或已被删除）时自动忽略
   for (const name of PROTECTED_DIRS) {
-    const absolutePath = join(cwd, name);
+    const absolutePath = await realpathOrSelf(join(cwd, name));
     args.push("--ro-bind-try", absolutePath, absolutePath);
   }
   // 工作区下所有 .git 一律只读：可写 bind 之上的覆盖绑定，防止命令篡改仓库元数据。
   // 根目录本身是 git 仓库时只保护根 .git（递归扫描有成本，绝大多数情况根即唯一仓库）；
   // 根不是 git 仓库时才递归扫描嵌套仓库（如 monorepo 子仓库）。
-  const rootGit = join(cwd, ".git");
+  const rootGit = await realpathOrSelf(join(cwd, ".git"));
   let gitDirs: string[];
   try {
     await stat(rootGit);
@@ -375,7 +389,8 @@ export async function buildBwrapArgs(resolved: ResolvedBwrap, cwd: string): Prom
     gitDirs = await findGitDirs(cwd);
   }
   for (const gitDir of gitDirs) {
-    args.push("--ro-bind-try", gitDir, gitDir);
+    const realGitDir = await realpathOrSelf(gitDir);
+    args.push("--ro-bind-try", realGitDir, realGitDir);
   }
   args.push(...resolved.extraArgs);
   return args;

package/src/claude-code/bash.md

@@ -18,7 +18,7 @@ IMPORTANT: Avoid using this tool to run `find`, `grep`, `cat`, `head`, `tail`, `
 - Communication: Output text directly (NOT echo/printf)
   While the Bash tool can do similar things, it's better to use the built-in tools as they provide a better user experience and make it easier to review tool calls and give permission.
 
-- You may specify an optional timeout in milliseconds (up to 600000ms / 10 minutes). By default, your command will timeout after 120000ms (2 minutes).
+- You may specify an optional timeout in milliseconds (up to 7200000ms / 2 hours). By default, your command will timeout after 120000ms (2 minutes).
 - Prever to use workdir argument over `cd ...`
 - When issuing multiple commands:
 - If the commands are independent and can run in parallel, make multiple Bash tool calls in a single message. Example: if you need to run "git status" and "git diff", send a single message with two Bash tool calls in parallel.

package/src/claude-code/shell.ts

@@ -14,7 +14,7 @@ import { BashInterruptedError, type BwrapRuntime, createBwrapRuntime } from "../
 import { resolveWorkdir } from "../lib/path.js";
 
 const DEFAULT_TIMEOUT_MS = 120_000;
-const MAX_TIMEOUT_MS = 600_000;
+const MAX_TIMEOUT_MS = 7_200_000;
 
 /** 对齐 Claude Code formatError：错误文本超过该长度时头尾各保留一半。 */
 const MAX_ERROR_CHARS = 10_000;
@@ -89,14 +89,14 @@ export function registerShellTools(
     label: "Bash",
     description: [
       "Executes a given bash command synchronously and returns its output.",
-      "timeout is in milliseconds, defaults to 120000, and may not exceed 600000.",
+      "timeout is in milliseconds, defaults to 120000, and may not exceed 7200000.",
       "Every command runs in the foreground. Background command execution is not supported; shell jobs are waited for before the tool returns.",
     ].join("\n"),
     parameters: Type.Object(
       {
         command: Type.String({ description: "The command to execute" }),
         timeout: Type.Optional(
-          Type.Number({ description: "Optional timeout in milliseconds (max 600000)" }),
+          Type.Number({ description: "Optional timeout in milliseconds (max 7200000)" }),
         ),
         description: Type.Optional(
           Type.String({ description: "Clear, concise description of the command" }),

package/src/opencode/bash.ts

@@ -8,7 +8,7 @@ import { BashInterruptedError, type BwrapRuntime, createBwrapRuntime } from "../
 import { resolveWorkdir } from "../lib/path.js";
 
 const DEFAULT_TIMEOUT_MS = 120_000;
-const MAX_TIMEOUT_MS = 600_000;
+const MAX_TIMEOUT_MS = 7_200_000;
 
 /** 对齐上游 opencode 的截断提示文案（tools/BashTool/bash.ts）。 */
 const CAPTURE_TRUNCATED_NOTICE = "[output capture truncated at the in-memory safety limit]";
@@ -46,7 +46,7 @@ export default function opencodeBash(
     description: [
       "Executes a given bash command synchronously and returns its output.",
       "The default working directory is the current directory; use workdir to run elsewhere.",
-      "timeout is in milliseconds, defaults to 120000, and may not exceed 600000.",
+      "timeout is in milliseconds, defaults to 120000, and may not exceed 7200000.",
       "Every command runs in the foreground. Background command execution is not supported; shell jobs are waited for before the tool returns.",
     ].join("\n"),
     promptSnippet: "execute bash command",
@@ -65,8 +65,7 @@ export default function opencodeBash(
         ),
         timeout: Type.Optional(
           Type.Number({
-            description: "Optional timeout in milliseconds (max 600000)",
-            default: 600,
+            description: "Optional timeout in milliseconds (max 7200000)",
           }),
         ),
         dangerouslyDisableSandbox: Type.Optional(