@trim21/personal-pi-extensions 0.0.225 → 0.0.230

package/README.md

@@ -6,17 +6,16 @@
 
 ## 扩展概览
 
-| 扩展                                          | 描述                                                   |
-| --------------------------------------------- | ------------------------------------------------------ |
-| [bwrap](#bwrap)                               | 基于 bubblewrap 的 OS 级沙箱，提供文件系统和网络隔离   |
-| [workspace-guard](#workspace-guard)           | 限制文件写入在 workspace 内，外部写入需用户审批        |
-| [opencode-edit](#opencode-edit)               | 替换内置 edit 工具，使用 opencode 的 schema 和匹配引擎 |
-| [bash-default-timeout](#bash-default-timeout) | 为 bash 工具设置默认超时（180 秒）                     |
-| [vision-agent](#vision-agent)                 | 视觉代理：主模型不支持视觉时，spawn 子 agent 识别图片  |
-| [session-name](#session-name)                 | 首个 user prompt 自动生成会话名，模型命名 + 启发式兜底 |
-| [todowrite](#todowrite)                       | opencode 风格的任务列表工具，完整列表替换语义          |
-| [question](#question)                         | opencode 风格的提问工具，阻塞式询问用户选择            |
-| [talk](#talk)                                 | session 间消息传递，SQLite 邮箱 + 双向 ask 时间戳仲裁  |
+| 扩展                            | 描述                                                    |
+| ------------------------------- | ------------------------------------------------------- |
+| [bwrap](#bwrap)                 | 基于 bubblewrap 的 OS 级沙箱，提供文件系统和网络隔离    |
+| [写保护（内置）](#写保护内置)   | 写工具内置：限制文件写入在 workspace 内，外部写入需审批 |
+| [opencode-edit](#opencode-edit) | 替换内置 edit 工具，使用 opencode 的 schema 和匹配引擎  |
+| [vision-agent](#vision-agent)   | 视觉代理：主模型不支持视觉时，spawn 子 agent 识别图片   |
+| [session-name](#session-name)   | 首个 user prompt 自动生成会话名，模型命名 + 启发式兜底  |
+| [todowrite](#todowrite)         | opencode 风格的任务列表工具，完整列表替换语义           |
+| [question](#question)           | opencode 风格的提问工具，阻塞式询问用户选择             |
+| [talk](#talk)                   | session 间消息传递，SQLite 邮箱 + 双向 ask 时间戳仲裁   |
 
 ---
 
@@ -79,32 +78,24 @@ bash 工具（opencode 风格 `bash`、Claude Code 风格 `Bash`）注册了 `da
 
 ### 使用
 
-```bash
-pi -e ./src/bwrap/index.ts
-# 或通过配置文件注册后自动加载
-```
+bwrap 已集成进 bash 工具实现（opencode 风格 `bash` 位于 `src/opencode/bash.ts`，Claude Code 风格 `Bash` 位于 `src/claude-code/shell.ts`），随对应扩展一起加载，无需单独安装。bash 工具内置默认超时 120 秒。
 
 ---
 
-## workspace-guard
+## 写保护（内置）
 
-阻止 `write` 和 `edit` 工具写入 workspace 外部的路径。读取工具（`read`、`ls`、`find`、`grep`）不受限制。
+写保护直接内置在各写工具（opencode 风格 `write`/`edit`、Claude Code 风格 `Write`/`Edit`）内部，通过 `src/lib/write-guard.ts` 的 `guardWriteAccess` 实现。读取工具（`read`、`ls`、`find`、`grep`）不受限制。
 
 - workspace 内或 `/tmp` 下的路径自动放行
-- 外部路径需通过确认对话框由用户审批,对话框内以 ```diff 代码块展示将要发生的变更预览(与 opencode-edit 共享匹配引擎,能定位时显示带行号的真实 patch,否则退化为参数 diff)
-- 无需配置
-
-### 使用
-
-```bash
-pi -e ./src/workspace-guard.ts
-```
+- 外部路径需通过确认对话框由用户审批，对话框内以 ```diff 代码块展示将要发生的变更预览（与 opencode-edit 共享匹配引擎，能定位时显示带行号的真实 patch，否则退化为参数 diff）
+- headless（无 UI）会话直接拒绝外部写入
+- 无需配置，随各写工具自动生效
 
 ---
 
 ## opencode-edit
 
-替换内置 `edit` 工具，使用 [opencode](https://github.com/anomalyco/opencode) 的 schema 和模糊匹配引擎。核心 replacer 和 `replace()` 函数直接复制自 opencode，行为与原版完全一致。匹配引擎位于 `src/opencode-edit-engine.ts`，与 workspace-guard 的审批弹窗 diff 预览共享。
+替换内置 `edit` 工具，使用 [opencode](https://github.com/anomalyco/opencode) 的 schema 和模糊匹配引擎。核心 replacer 和 `replace()` 函数直接复制自 opencode，行为与原版完全一致。匹配引擎位于 `src/opencode/edit-engine.ts`，与写保护审批弹窗（`src/lib/write-guard.ts`）的 diff 预览共享。
 
 支持的匹配策略：
 
@@ -128,18 +119,6 @@ pi -e ./src/opencode-edit.ts
 
 ---
 
-## bash-default-timeout
-
-为所有 bash 工具调用设置 180 秒默认超时。仅在模型未显式指定 `timeout` 时生效，避免长时间运行的命令无限挂起。
-
-### 使用
-
-```bash
-pi -e ./src/bash-default-timeout.ts
-```
-
----
-
 ## vision-agent
 
 视觉代理扩展。主模型不支持视觉（如 DeepSeek）时自动启用 `describe_image` 工具；主模型支持视觉时自动隐藏，图片由 pi 原生透传。
@@ -362,8 +341,7 @@ pi -e ./src/talk/index.ts
 ### 命令行加载单个扩展
 
 ```bash
-pi -e ./src/bwrap/index.ts
-pi -e ./src/workspace-guard.ts
+pi -e ./src/opencode/index.ts
 ```
 
 ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.0.225",
+  "version": "0.0.230",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [
@@ -54,13 +54,10 @@
   },
   "pi": {
     "extensions": [
+      "src/opencode/index.ts",
+      "src/claude-code/index.ts",
       "src/vision-agent.ts",
       "src/session-name.ts",
-      "src/bwrap/index.ts",
-      "src/workspace-guard.ts",
-      "src/claude-code/index.ts",
-      "src/opencode/index.ts",
-      "src/bash-default-timeout.ts",
       "src/gh-readonly.ts",
       "src/spawn-agent.ts",
       "src/talk/index.ts"

package/src/bwrap/runtime.ts

@@ -7,6 +7,7 @@ import { createBashTool } from "@earendil-works/pi-coding-agent";
 import { type TObject, Type } from "typebox";
 
 import { type CommandSpec, parseCommand } from "../lib/cli.js";
+import { selectWithOptionalInput } from "../lib/ui.js";
 import {
   type BwrapMode,
   createBwrapBashOperations,
@@ -163,26 +164,27 @@ export class BwrapRuntime {
     if (policy.kind === "deny") throw new Error(policy.reason);
     const description = `Allow this command to run without sandbox?\n---\n\nReason: ${escapeHtml(reason ?? "(No reason provided by model)")}\n---\n${fenceCodeBlock(command)}`;
     while (true) {
-      const choice = await ctx.ui.select(
+      const result = await selectWithOptionalInput(
         description,
-        ["Approve once", "Block", "Block with reason"],
-        {
-          signal: ctx.signal,
-        },
+        [
+          { label: "Approve once" },
+          { label: "Block" },
+          { label: "Block with reason", inputPrompt: "Why was this denied?" },
+        ],
+        ctx.ui,
+        { signal: ctx.signal },
       );
-      if (choice === undefined) {
+      if (result === undefined) {
         ctx.abort();
         throw new Error("User denied the command execution.");
       }
-      if (choice === "Approve once") return;
-      if (choice === "Block") throw new Error("User denied unsandboxed execution.");
-      const feedback = await ctx.ui.input("Why was this denied?", undefined, {
-        signal: ctx.signal,
-      });
-      if (feedback === undefined) continue;
+      if (result.label === "Approve once") return;
+      if (result.label === "Block") throw new Error("User denied unsandboxed execution.");
+      // "Block with reason"：取消输入则重新询问；空输入同样拒绝（不带反馈文本）
+      if (result.input === undefined) continue;
       throw new Error(
-        feedback
-          ? `User denied unsandboxed execution: ${feedback}`
+        result.input
+          ? `User denied unsandboxed execution: ${result.input}`
           : "User denied unsandboxed execution.",
       );
     }

package/src/claude-code/common.ts

@@ -1,4 +1,4 @@
-import { isAbsolute, normalize } from "node:path";
+import { isAbsolute, normalize, resolve } from "node:path";
 
 export interface FileSnapshot {
   digest: string;
@@ -20,6 +20,12 @@ export function requireAbsolutePath(filePath: string, parameter = "file_path"):
   return normalize(filePath);
 }
 
+/** Resolve a search root path against the working directory. */
+export function searchRoot(path: string | undefined, cwd: string): string {
+  if (!path) return cwd;
+  return isAbsolute(path) ? path : resolve(cwd, path);
+}
+
 export function throwIfAborted(signal: AbortSignal | undefined): void {
   if (signal?.aborted) throw new Error("Operation aborted");
 }

package/src/claude-code/files.ts

@@ -12,6 +12,7 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
+import { guardWriteAccess } from "../lib/write-guard.js";
 import {
   type ClaudeCodeState,
   type FileSnapshot,
@@ -241,9 +242,18 @@ export function registerFileTools(pi: ExtensionAPI, state: ClaudeCodeState): voi
       },
       { additionalProperties: false },
     ),
-    async execute(_id, params, signal) {
+    async execute(_id, params, signal, _onUpdate, ctx) {
       throwIfAborted(signal);
       const filePath = requireAbsolutePath(params.file_path);
+      await guardWriteAccess(ctx, {
+        toolName: "Edit",
+        absolutePath: filePath,
+        change: {
+          oldText: params.old_string,
+          newText: params.new_string,
+          replaceAll: params.replace_all,
+        },
+      });
       return withFileMutationQueue(filePath, async () => {
         await requireCurrentRead(state, filePath);
         await access(filePath, constants.R_OK | constants.W_OK);
@@ -287,9 +297,14 @@ export function registerFileTools(pi: ExtensionAPI, state: ClaudeCodeState): voi
       },
       { additionalProperties: false },
     ),
-    async execute(_id, params, signal) {
+    async execute(_id, params, signal, _onUpdate, ctx) {
       throwIfAborted(signal);
       const filePath = requireAbsolutePath(params.file_path);
+      await guardWriteAccess(ctx, {
+        toolName: "Write",
+        absolutePath: filePath,
+        change: { oldText: "", newText: params.content },
+      });
       return withFileMutationQueue(filePath, async () => {
         let original: string | undefined;
         try {

package/src/claude-code/glob.ts

@@ -0,0 +1,73 @@
+/**
+ * Claude Code style `Glob` tool — fast file pattern matching.
+ *
+ * Split out of the former search.ts so spawn-agent subagents can load it
+ * independently (declare `Glob` in the frontmatter to get only this tool).
+ */
+
+import { glob as fsGlob, stat } from "node:fs/promises";
+import { resolve } from "node:path";
+
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
+
+import { searchRoot, throwIfAborted } from "./common.js";
+
+const GLOB_RESULT_LIMIT = 100;
+
+export async function globFiles(
+  pattern: string,
+  cwd: string,
+  signal?: AbortSignal,
+): Promise<string[]> {
+  throwIfAborted(signal);
+  const matches: { path: string; mtimeMs: number }[] = [];
+  for await (const match of fsGlob(pattern, { cwd, exclude: [".git/**"], withFileTypes: false })) {
+    throwIfAborted(signal);
+    const absolutePath = resolve(cwd, match);
+    try {
+      const value = await stat(absolutePath);
+      if (value.isFile()) matches.push({ path: absolutePath, mtimeMs: value.mtimeMs });
+    } catch {
+      // A concurrent filesystem change can remove a match before stat.
+    }
+  }
+  return matches
+    .toSorted((left, right) => right.mtimeMs - left.mtimeMs || left.path.localeCompare(right.path))
+    .slice(0, GLOB_RESULT_LIMIT)
+    .map((match) => match.path);
+}
+
+export function registerGlobTool(pi: ExtensionAPI): void {
+  pi.registerTool({
+    name: "Glob",
+    label: "Glob",
+    description: [
+      "Fast file pattern matching tool that works with any codebase size.",
+      'Supports glob patterns such as "**/*.js" and "src/**/*.ts".',
+      "Returns matching file paths sorted by modification time.",
+    ].join("\n"),
+    parameters: Type.Object(
+      {
+        pattern: Type.String({ description: "The glob pattern to match files against" }),
+        path: Type.Optional(
+          Type.String({
+            description:
+              "The directory to search in. If omitted, the current working directory is used.",
+          }),
+        ),
+      },
+      { additionalProperties: false },
+    ),
+    async execute(_id, params, signal, _onUpdate, ctx) {
+      const root = searchRoot(params.path, ctx.cwd);
+      const matches = await globFiles(params.pattern, root, signal);
+      return {
+        content: [
+          { type: "text", text: matches.length > 0 ? matches.join("\n") : "No files found" },
+        ],
+        details: { count: matches.length },
+      };
+    },
+  });
+}

package/src/claude-code/grep.ts

@@ -0,0 +1,161 @@
+/**
+ * Claude Code style `Grep` tool — powerful ripgrep-based search.
+ *
+ * Split out of the former search.ts so spawn-agent subagents can load it
+ * independently (declare `Grep` in the frontmatter to get only this tool).
+ */
+
+import { StringEnum } from "@earendil-works/pi-ai";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
+
+import { searchRoot, throwIfAborted } from "./common.js";
+
+const GREP_OUTPUT_MODES = ["content", "files_with_matches", "count"] as const;
+
+type GrepOutputMode = (typeof GREP_OUTPUT_MODES)[number];
+
+function truncateOutput(output: string, maxCharacters = 30_000): string {
+  if (output.length <= maxCharacters) return output;
+  return `${output.slice(0, maxCharacters)}\n\n[Output truncated at ${maxCharacters} characters]`;
+}
+
+interface GrepParameters {
+  pattern: string;
+  path?: string;
+  glob?: string;
+  output_mode?: GrepOutputMode;
+  "-B"?: number;
+  "-A"?: number;
+  "-C"?: number;
+  context?: number;
+  "-n"?: boolean;
+  "-i"?: boolean;
+  type?: string;
+  head_limit?: number;
+  offset?: number;
+  multiline?: boolean;
+}
+
+export function buildGrepArguments(params: GrepParameters, cwd: string): string[] {
+  const mode = params.output_mode ?? "files_with_matches";
+  const args = ["--color=never"];
+  switch (mode) {
+    case "files_with_matches": {
+      args.push("--files-with-matches");
+      break;
+    }
+    case "count": {
+      args.push("--count-matches");
+      break;
+    }
+    case "content": {
+      args.push("--no-heading", "--with-filename");
+      if (params["-n"] !== false) args.push("--line-number");
+      const before = params["-B"];
+      const after = params["-A"];
+      const around = params.context ?? params["-C"];
+      if (around === undefined) {
+        if (before !== undefined) args.push("--before-context", String(before));
+        if (after !== undefined) args.push("--after-context", String(after));
+      } else args.push("--context", String(around));
+
+      break;
+    }
+    // No default
+  }
+  if (params["-i"] === true) args.push("--ignore-case");
+  if (params.glob) args.push("--glob", params.glob);
+  if (params.type) args.push("--type", params.type);
+  if (params.multiline === true) args.push("--multiline", "--multiline-dotall");
+  args.push("--", params.pattern, searchRoot(params.path, cwd));
+  return args;
+}
+
+export function pageGrepOutput(output: string, offset = 0, headLimit = 0): string {
+  const lines = output ? output.replace(/\n$/, "").split("\n") : [];
+  if (offset >= lines.length && lines.length > 0) return "No entries at this offset";
+  const selected = headLimit > 0 ? lines.slice(offset, offset + headLimit) : lines.slice(offset);
+  return truncateOutput(selected.join("\n"));
+}
+
+export function registerGrepTool(pi: ExtensionAPI): void {
+  pi.registerTool({
+    name: "Grep",
+    label: "Grep",
+    description: [
+      "A powerful search tool built on ripgrep.",
+      "Supports regular expressions, file globs, file types, multiline matching, context lines, and paginated output.",
+      'output_mode defaults to "files_with_matches"; use "content" for matching lines or "count" for match counts.',
+    ].join("\n"),
+    parameters: Type.Object(
+      {
+        pattern: Type.String({ description: "The regular expression pattern to search for" }),
+        path: Type.Optional(
+          Type.String({
+            description: "File or directory to search. Defaults to the current directory.",
+          }),
+        ),
+        glob: Type.Optional(
+          Type.String({ description: 'Glob filter such as "*.js" or "*.{ts,tsx}"' }),
+        ),
+        output_mode: Type.Optional(
+          StringEnum(GREP_OUTPUT_MODES, {
+            description: "Output mode. Defaults to files_with_matches.",
+          }),
+        ),
+        "-B": Type.Optional(
+          Type.Number({ description: "Lines to show before each match in content mode" }),
+        ),
+        "-A": Type.Optional(
+          Type.Number({ description: "Lines to show after each match in content mode" }),
+        ),
+        "-C": Type.Optional(
+          Type.Number({ description: "Lines to show before and after each match" }),
+        ),
+        context: Type.Optional(
+          Type.Number({ description: "Lines to show before and after each match" }),
+        ),
+        "-n": Type.Optional(
+          Type.Boolean({ description: "Show line numbers in content mode; defaults true" }),
+        ),
+        "-i": Type.Optional(Type.Boolean({ description: "Case-insensitive search" })),
+        type: Type.Optional(
+          Type.String({ description: "ripgrep file type such as js, py, rust, or go" }),
+        ),
+        head_limit: Type.Optional(
+          Type.Number({ description: "Limit output to the first N entries after offset" }),
+        ),
+        offset: Type.Optional(Type.Number({ description: "Skip the first N output entries" })),
+        multiline: Type.Optional(
+          Type.Boolean({ description: "Allow patterns to span multiple lines" }),
+        ),
+      },
+      { additionalProperties: false },
+    ),
+    async execute(_id, params, signal, _onUpdate, ctx) {
+      if (
+        params.offset !== undefined &&
+        (!Number.isSafeInteger(params.offset) || params.offset < 0)
+      ) {
+        throw new Error("offset must be a non-negative integer");
+      }
+      if (
+        params.head_limit !== undefined &&
+        (!Number.isSafeInteger(params.head_limit) || params.head_limit < 0)
+      ) {
+        throw new Error("head_limit must be a non-negative integer");
+      }
+      const result = await pi.exec("rg", buildGrepArguments(params, ctx.cwd), { signal });
+      throwIfAborted(signal);
+      if (result.code !== 0 && result.code !== 1) {
+        throw new Error(result.stderr.trim() || `ripgrep exited with code ${result.code}`);
+      }
+      if (result.code === 1 || result.stdout === "") {
+        return { content: [{ type: "text", text: "No files found" }], details: { matches: 0 } };
+      }
+      const text = pageGrepOutput(result.stdout, params.offset ?? 0, params.head_limit ?? 0);
+      return { content: [{ type: "text", text }], details: undefined };
+    },
+  });
+}