@trim21/personal-pi-extensions 0.0.242 → 0.0.243

package/README.md

@@ -17,6 +17,14 @@
 | [question](#question)           | opencode 风格的提问工具，阻塞式询问用户选择             |
 | [talk](#talk)                   | session 间消息传递，SQLite 邮箱 + 双向 ask 时间戳仲裁   |
 
+> **两套工具风格，按预期只启用其中一套**：本包同时提供 opencode 风格
+> （小写 `read`/`edit`/`write`/`bash`/`todowrite`/`question`）与 Claude Code
+> 风格（大写 `Read`/`Edit`/`Write`/`Bash`/`Grep`/`Glob`/`TodoWrite`/
+> `AskUserQuestion`）两套工具集，二者共享 bwrap 沙箱与写保护实现。两套同时
+> 启用会带来预期外的冗余：同名命令重复注册（如 `/bwrap` 出现 `/bwrap:1`
+> 后缀）、系统提示重复注入。请只启用其中一套：在 `~/.pi/agent/settings.json`
+> 的 `defaultTools` 中只列出一套，或启动时用 `--exclude-tools` 排除另一套。
+
 ---
 
 ## bwrap

package/package.json

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

package/src/bwrap/runtime.ts

@@ -320,5 +320,3 @@ export class BwrapRuntime {
 export function createBwrapRuntime(): BwrapRuntime {
   return new BwrapRuntime();
 }
-
-export const bwrapRuntime = createBwrapRuntime();

package/src/claude-code/shell.ts

@@ -4,7 +4,7 @@ import { fileURLToPath } from "node:url";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
-import { bwrapRuntime } from "../bwrap/runtime.js";
+import { type BwrapRuntime, createBwrapRuntime } from "../bwrap/runtime.js";
 import { resolveWorkdir } from "../lib/path.js";
 
 const DEFAULT_TIMEOUT_MS = 120_000;
@@ -13,8 +13,15 @@ const MAX_TIMEOUT_MS = 600_000;
 /** Bash tool guidance, kept in markdown so it reads like documentation. */
 const BASH_PROMPT = readFileSync(fileURLToPath(new URL("bash.md", import.meta.url)), "utf8").trim();
 
-export function registerShellTools(pi: ExtensionAPI): void {
-  bwrapRuntime.setup(pi);
+/**
+ * runtime 由调用方注入：扩展工厂持有一个实例（不依赖模块级全局状态），
+ * 测试可注入预置模式的实例。状态随扩展实例生命周期，session 切换重建即重置。
+ */
+export function registerShellTools(
+  pi: ExtensionAPI,
+  runtime: BwrapRuntime = createBwrapRuntime(),
+): void {
+  runtime.setup(pi);
   pi.registerTool({
     name: "Bash",
     promptSnippet: "execute command",
@@ -58,7 +65,7 @@ export function registerShellTools(pi: ExtensionAPI): void {
       const cwd = params.workdir ? await resolveWorkdir(params.workdir, ctx.cwd) : ctx.cwd;
 
       try {
-        return await bwrapRuntime.execute({
+        return await runtime.execute({
           ctx: { ...ctx, cwd },
           toolCallId: id,
           command: params.command,

package/src/opencode/bash.ts

@@ -1,14 +1,17 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
-import { bwrapRuntime } from "../bwrap/runtime.js";
+import { createBwrapRuntime } from "../bwrap/runtime.js";
 import { resolveWorkdir } from "../lib/path.js";
 
 const DEFAULT_TIMEOUT_MS = 120_000;
 const MAX_TIMEOUT_MS = 600_000;
 
 export default function opencodeBash(pi: ExtensionAPI): void {
-  bwrapRuntime.setup(pi);
+  // 每个扩展实例持有自己的 runtime：不依赖模块级全局状态，状态随扩展
+  // 实例生命周期（进程启动 / /reload / session 切换时工厂重建即重置）。
+  const runtime = createBwrapRuntime();
+  runtime.setup(pi);
   pi.registerTool({
     name: "bash",
     label: "bash",
@@ -52,7 +55,7 @@ export default function opencodeBash(pi: ExtensionAPI): void {
       const cwd = params.workdir ? await resolveWorkdir(params.workdir, ctx.cwd) : ctx.cwd;
 
       try {
-        return await bwrapRuntime.execute({
+        return await runtime.execute({
           ctx: { ...ctx, cwd },
           toolCallId: id,
           command: params.command,

package/src/spawn-agent.ts

@@ -54,9 +54,9 @@ const MAX_PROGRESS_LINES = 5;
  * built-in tool, the matching opencode extension is loaded via `-e` so the
  * subagent uses the enhanced implementation instead of the built-in one.
  *
- * The bash override also carries the bwrap sandbox: opencode/bash.ts calls
- * bwrapRuntime.setup() and runs commands through bwrapRuntime.execute(), so
- * agents that declare the bash tool get sandboxing automatically. Agents
+ * The bash override also carries the bwrap sandbox: opencode/bash.ts creates
+ * its own bwrap runtime instance and runs commands through runtime.execute(),
+ * so agents that declare the bash tool get sandboxing automatically. Agents
  * without bash need no bwrap setup (there are no commands to sandbox).
  * (Workspace write protection is embedded in the opencode write/edit tools.)
  *