@trim21/personal-pi-extensions 0.0.351 → 0.0.353

package/package.json

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

package/src/bwrap/runtime.ts

@@ -22,7 +22,12 @@ import {
   selectCheckboxActions,
   selectWithOptionalInput,
 } from "../lib/ui.js";
-import { type ApprovalRule, commandPatternsFor, evaluateBashApproval } from "./approval-rules.js";
+import {
+  type ApprovalRule,
+  commandPatternsFor,
+  evaluateBashApproval,
+  matchRule,
+} from "./approval-rules.js";
 import {
   type BwrapMode,
   createBwrapBashOperations,
@@ -63,6 +68,19 @@ export const FULL_ACCESS_CHOICES: readonly SelectAction[] = [
   { label: DENY_WITH_REASON, inputPrompt: "Why was this denied?" },
 ];
 
+/**
+ * 全权限审批 UI 的决策结果：业务层（execute/approveFullAccess）据此
+ * 决定放行、拒绝并持久化勾选的规则，UI 层不直接产生副作用。
+ */
+export interface FullAccessUIDecision {
+  /** 用户选择的动作 label（ALLOW_ONCE / ALLOW_FOREVER / DENY / DENY_WITH_REASON）。 */
+  result: string;
+  /** 用户勾选、需持久化为 allow 规则的 pattern；未勾选时为空数组。 */
+  foreverApprovedPattern: string[];
+  /** DENY_WITH_REASON 时用户输入的理由。 */
+  reason?: string;
+}
+
 export interface BwrapExecutionRequest {
   toolCallId: string;
   command: string;
@@ -425,10 +443,66 @@ export class BwrapRuntime {
   ): Promise<void> {
     const policy = resolveEscalation({ hasUI: ctx.hasUI });
     if (policy.kind === "deny") throw new Error(policy.reason);
+    const decision = await this.approveFullAccessUI(ctx, command, reason, workdir);
+    // 关闭对话框 = 中断并拒绝，不循环重问
+    if (decision === undefined) {
+      ctx.abort();
+      throw new Error("User denied the command execution.");
+    }
+    const { result, foreverApprovedPattern } = decision;
+    switch (result) {
+      case ALLOW_ONCE: {
+        if (foreverApprovedPattern.length > 0) {
+          await this.persistAllowRule(ctx, command, foreverApprovedPattern);
+        }
+        return;
+      }
+      case ALLOW_FOREVER: {
+        await this.persistAllowRule(ctx, command, foreverApprovedPattern);
+        return;
+      }
+      case DENY: {
+        if (foreverApprovedPattern.length > 0) {
+          await this.persistAllowRule(ctx, command, foreverApprovedPattern);
+        }
+        throw new Error("User denied unsandboxed execution.");
+      }
+      case DENY_WITH_REASON: {
+        if (foreverApprovedPattern.length > 0) {
+          await this.persistAllowRule(ctx, command, foreverApprovedPattern);
+        }
+        const feedback = decision.reason?.trim() ?? "";
+        throw new Error(
+          feedback
+            ? `User denied unsandboxed execution: ${feedback}`
+            : "User denied unsandboxed execution.",
+        );
+      }
+    }
+  }
+
+  /**
+   * 全权限审批的 UI 层：弹对话框收集用户决策并返回结构化结果，副作用
+   * （abort / throw / 持久化规则）由调用方根据结果处理。
+   * 返回 undefined 表示对话框被关闭（用户取消）。
+   */
+  private async approveFullAccessUI(
+    ctx: ExtensionContext,
+    command: string,
+    reason: string | undefined,
+    workdir?: string,
+  ): Promise<FullAccessUIDecision | undefined> {
     // 弹框前解析命令的持久化规则（勾选的 pattern 会写入），在弹框里以
     // checkbox 列出：`echo 1 | head` → `echo *`、`head *`，逐项决定是否
     // allow forever，避免用户对"永久允许"持久化什么一无所知。
     const patterns = await commandPatternsFor(command);
+    // checkbox 只列出未命中 allow 规则的 pattern：已提前允许的部分自动放行，
+    // 无需再展示或重复勾选持久化（deny 命中的命令在 evaluate 阶段已被拒绝）。
+    const rules = this.resolve(ctx).approvalRules;
+    const unallowedPatterns = patterns.filter((pattern) => {
+      const rule = rules.findLast((r) => matchRule(pattern, r.pattern));
+      return rule?.action !== "allow";
+    });
     // dcg 扫描建议是可选的参考文本：未安装时静默跳过；已安装但扫描失败
     // 时 notify 提示，弹窗本身与无 dcg 时一致
     const outcome = await dcgSuggestion(command);
@@ -447,7 +521,7 @@ export class BwrapRuntime {
     if (outcome.kind === "suggestion") {
       lines.push("", outcome.suggestion.text, "---");
     }
-    if (patterns.length > 0) {
+    if (unallowedPatterns.length > 0) {
       lines.push(
         "",
         "勾选规则将持久化为允许规则（后续同模式命令自动放行），未勾选规则仅本次处理:",
@@ -468,30 +542,12 @@ export class BwrapRuntime {
         signal: ctx.signal,
       });
       // 关闭对话框 = 中断并拒绝，不循环重问
-      if (verdict === undefined) {
-        ctx.abort();
-        throw new Error("User denied the command execution.");
-      }
-      switch (verdict.label) {
-        case ALLOW_ONCE: {
-          return;
-        }
-        case ALLOW_FOREVER: {
-          await this.persistAllowRule(ctx, command, patterns);
-          return;
-        }
-        case DENY: {
-          throw new Error("User denied unsandboxed execution.");
-        }
-        case DENY_WITH_REASON: {
-          const feedback = verdict.input?.trim() ?? "";
-          throw new Error(
-            feedback
-              ? `User denied unsandboxed execution: ${feedback}`
-              : "User denied unsandboxed execution.",
-          );
-        }
-      }
+      if (verdict === undefined) return undefined;
+      return {
+        result: verdict.label,
+        foreverApprovedPattern: [],
+        reason: verdict.input,
+      };
     }
 
     // 每个识别到的 pattern 一个 checkbox：勾选 = 持久化为 allow 规则。
@@ -508,41 +564,22 @@ export class BwrapRuntime {
     ] as const satisfies readonly CheckboxAction<"allow-once" | "deny" | "deny-with-reason">[];
     const verdict = await selectCheckboxActions(
       description,
-      [...new Set(patterns)].map((pattern) => ({ label: pattern })),
+      [...new Set(unallowedPatterns)].map((pattern) => ({ label: pattern })),
       actions,
       ctx.ui,
       { signal: ctx.signal },
     );
-    // 关闭对话框 = 中断并拒绝，不循环重问
-    if (verdict === undefined) {
-      ctx.abort();
-      throw new Error("User denied the command execution.");
-    }
-    switch (verdict.action) {
-      case "allow-once": {
-        if (verdict.selected.length > 0) {
-          await this.persistAllowRule(ctx, command, verdict.selected);
-        }
-        return;
-      }
-      case "deny": {
-        if (verdict.selected.length > 0) {
-          await this.persistAllowRule(ctx, command, verdict.selected);
-        }
-        throw new Error("User denied unsandboxed execution.");
-      }
-      case "deny-with-reason": {
-        if (verdict.selected.length > 0) {
-          await this.persistAllowRule(ctx, command, verdict.selected);
-        }
-        const feedback = verdict.input?.trim() ?? "";
-        throw new Error(
-          feedback
-            ? `User denied unsandboxed execution: ${feedback}`
-            : "User denied unsandboxed execution.",
-        );
-      }
-    }
+    if (verdict === undefined) return undefined;
+    const resultByAction = {
+      "allow-once": ALLOW_ONCE,
+      deny: DENY,
+      "deny-with-reason": DENY_WITH_REASON,
+    } as const;
+    return {
+      result: resultByAction[verdict.action],
+      foreverApprovedPattern: verdict.selected,
+      reason: verdict.input,
+    };
   }
 
   /** 把命令的权限模式写入项目 bwrap.json 的 approvalRules（allow forever）。 */

package/src/claude-code/files.ts

@@ -392,6 +392,7 @@ export function registerFileTools(
           throwIfAborted(signal);
           const diagnosticText = await service.lspDiagnosticsForFile(filePath, ctx.cwd, {
             notify: (message, level) => ctx.ui.notify(message, level),
+            signal,
           });
           return [
             `The file ${filePath} has been updated successfully.`,

package/src/lib/cli-args.ts

@@ -1,35 +1,14 @@
 /**
- * Minimal command-line argument parsing for `/command` handlers.
+ * Shell-like tokenizer for `/command` handlers.
  *
  * The pi command API passes handlers a raw string (current versions) or a
- * token array (newer ones); this helper accepts either and yields
- * positionals plus flags, so handlers never care about the input shape.
- *
- * A raw string is split with shell-like rules first: whitespace separates
- * tokens, single quotes preserve everything literally, double quotes allow
- * `\"` / `\\` escapes, and a backslash outside quotes escapes the next
- * character. Unlike bash, empty tokens are dropped and an unterminated
- * quote raises a SyntaxError.
- *
- * Flags (only long form, `--name`):
- *   --name value    flag "name" = "value" (value may not start with `--`)
- *   --name=value    same
- *   --flag          boolean flag = true
- *   --              everything after is a positional
+ * token array (newer ones); `shlexSplit` turns the raw string into tokens:
+ * whitespace separates tokens, single quotes preserve everything literally,
+ * double quotes allow `\"` / `\\` escapes, and a backslash outside quotes
+ * escapes the next character. Unlike bash, empty tokens are dropped and an
+ * unterminated quote raises a SyntaxError.
  */
 
-export interface ParsedArgs {
-  /** Non-flag arguments, in order. */
-  positionals: string[];
-  /** `--name value` / `--name=value` → string; `--flag` → true. */
-  flags: Record<string, string | boolean>;
-}
-
-/** Does this token look like a long flag (`--x`, but not the bare `--`)? */
-function isFlagToken(token: string): boolean {
-  return token.startsWith("--") && token !== "--";
-}
-
 /** Shell-like tokenizer for a raw command line. Empty tokens are dropped. */
 export function shlexSplit(raw: string): string[] {
   const tokens: string[] = [];
@@ -77,40 +56,3 @@ export function shlexSplit(raw: string): string[] {
   if (cur) tokens.push(cur);
   return tokens;
 }
-
-export function parseArgs(input: string | string[]): ParsedArgs {
-  const tokens = Array.isArray(input) ? input : shlexSplit(input);
-  const positionals: string[] = [];
-  const flags: Record<string, string | boolean> = {};
-  let positionalOnly = false;
-  for (let i = 0; i < tokens.length; i++) {
-    const token = tokens[i];
-    if (positionalOnly) {
-      positionals.push(token);
-      continue;
-    }
-    if (token === "--") {
-      positionalOnly = true;
-      continue;
-    }
-    const m = /^--([a-zA-Z0-9][a-zA-Z0-9-]*)(?:=(.*))?$/.exec(token);
-    if (!m) {
-      positionals.push(token);
-      continue;
-    }
-    const name = m[1];
-    if (m[2] !== undefined) {
-      flags[name] = m[2];
-      continue;
-    }
-    // `--name value` form: consume the next token unless it is itself a flag.
-    const next = tokens[i + 1];
-    if (next !== undefined && !isFlagToken(next)) {
-      flags[name] = next;
-      i++;
-    } else {
-      flags[name] = true;
-    }
-  }
-  return { positionals, flags };
-}

package/src/lib/lsp/lsp.ts

@@ -186,6 +186,20 @@ interface LspState {
 
 export interface LspRequestOptions {
   notify?: ExtensionUIContext["notify"];
+  /** 中止时提前结束诊断等待（已中止时直接跳过诊断）。 */
+  signal?: AbortSignal;
+}
+
+/** 让 promise 在 signal 中止时提前结算；用于中断 LSP 诊断等待。 */
+async function abortable<T>(promise: Promise<T>, signal?: AbortSignal): Promise<void> {
+  if (!signal || signal.aborted) {
+    await promise;
+    return;
+  }
+  const abort = new Promise<void>((resolve) => {
+    signal.addEventListener("abort", () => resolve(), { once: true });
+  });
+  await Promise.race([promise, abort]);
 }
 
 export interface LspService {
@@ -333,7 +347,10 @@ export function createLspService(
         const after = Date.now();
         const version = await client.notify.open({ path: file });
         if (!diagnostics) return;
-        await client.waitForDiagnostics({ path: file, version, mode: diagnostics, after });
+        await abortable(
+          client.waitForDiagnostics({ path: file, version, mode: diagnostics, after }),
+          options?.signal,
+        );
       }),
     ).catch(() => {
       // 诊断等待失败不影响写操作本身
@@ -360,6 +377,7 @@ export function createLspService(
     cwd: string,
     options?: LspRequestOptions,
   ): Promise<string> {
+    if (options?.signal?.aborted) return "";
     await touchFile(file, cwd, "document", options);
     const all = await diagnostics();
     const normalized = normalize(file);

package/src/opencode/files.ts

@@ -19,7 +19,7 @@
 
 import { constants } from "node:fs";
 import { access, mkdir, open, readdir, readFile, stat, writeFile } from "node:fs/promises";
-import { basename, dirname, isAbsolute, resolve as resolvePath, sep } from "node:path";
+import { basename, dirname, extname, isAbsolute, resolve as resolvePath, sep } from "node:path";
 
 import type { ImageContent, TextContent } from "@earendil-works/pi-ai";
 import {
@@ -154,9 +154,7 @@ async function detectImageMimeTypeFromFile(filePath: string): Promise<string | n
 }
 
 function isBinaryExtension(filePath: string): boolean {
-  const dotIndex = filePath.lastIndexOf(".");
-  if (dotIndex === -1) return false;
-  return BINARY_EXTENSIONS.has(filePath.slice(dotIndex).toLowerCase());
+  return BINARY_EXTENSIONS.has(extname(filePath).toLowerCase());
 }
 
 function isBinaryFileBySample(sample: Uint8Array): boolean {
@@ -308,9 +306,7 @@ function registerReadTool(pi: ExtensionAPI, service: LspService): void {
       ),
     }),
     async execute(_toolCallId, params, signal, _onUpdate, ctx) {
-      if (signal?.aborted) {
-        throw new Error("Operation aborted");
-      }
+      signal?.throwIfAborted();
 
       const { filePath: rawPath, offset, limit } = params;
 
@@ -502,14 +498,10 @@ function registerEditTool(pi: ExtensionAPI, service: LspService): void {
         change: { oldText: oldString, newText: newString, replaceAll },
       });
 
-      const throwIfAborted = (): void => {
-        if (signal?.aborted) throw new Error("Operation aborted");
-      };
-
       const [message, details, diagnosticText] = await withFileMutationQueue(
         absolutePath,
         async () => {
-          throwIfAborted();
+          signal?.throwIfAborted();
 
           // opencode: 前置校验，先于空 oldString 分支
           if (oldString === newString) {
@@ -524,7 +516,6 @@ function registerEditTool(pi: ExtensionAPI, service: LspService): void {
             } catch {
               exists = false;
             }
-            throwIfAborted();
             if (exists) {
               throw new Error(
                 "oldString cannot be empty when editing an existing file. Provide the exact text to replace, or use write for an intentional full-file replacement.",
@@ -532,10 +523,11 @@ function registerEditTool(pi: ExtensionAPI, service: LspService): void {
             }
             // opencode: writeWithDirs 自动创建父目录；newString 开头的 BOM 原样保留
             await mkdir(dirname(absolutePath), { recursive: true });
-            throwIfAborted();
+            signal?.throwIfAborted();
             await writeFile(absolutePath, newString, "utf8");
-            throwIfAborted();
-            const diagnosticText = await service.lspDiagnosticsForFile(absolutePath, ctx.cwd);
+            const diagnosticText = await service.lspDiagnosticsForFile(absolutePath, ctx.cwd, {
+              signal,
+            });
             return [
               "Edit applied successfully.",
               { diff: "", patch: "", firstChangedLine: 0 },
@@ -546,18 +538,15 @@ function registerEditTool(pi: ExtensionAPI, service: LspService): void {
           try {
             await access(absolutePath, constants.R_OK | constants.W_OK);
           } catch (error: unknown) {
-            throwIfAborted();
             const msg =
               error instanceof Error && "code" in error && typeof error.code === "string"
                 ? `Error code: ${error.code}`
                 : String(error);
             throw new Error(`Could not edit file: ${filePath}. ${msg}.`, { cause: error });
           }
-          throwIfAborted();
 
           const buffer = await readFile(absolutePath);
           const rawContent = buffer.toString("utf8");
-          throwIfAborted();
 
           // Strip BOM then normalize line endings to LF.
           // The opencode replacers split on \n and expect only LF.
@@ -566,16 +555,16 @@ function registerEditTool(pi: ExtensionAPI, service: LspService): void {
           const normalizedContent = normalizeToLF(content);
 
           const newContent = replace(normalizedContent, oldString, newString, replaceAll);
-          throwIfAborted();
+          signal?.throwIfAborted();
 
           const finalContent = bom + restoreLineEndings(newContent, originalEnding);
           await writeFile(absolutePath, finalContent, "utf8");
-          throwIfAborted();
 
           const diffResult = generateDiffString(normalizedContent, newContent);
           const patch = generateUnifiedPatch(filePath, normalizedContent, newContent);
-          throwIfAborted();
-          const diagnosticText = await service.lspDiagnosticsForFile(absolutePath, ctx.cwd);
+          const diagnosticText = await service.lspDiagnosticsForFile(absolutePath, ctx.cwd, {
+            signal,
+          });
           return [
             "Edit applied successfully.",
             { diff: diffResult.diff, patch, firstChangedLine: diffResult.firstChangedLine },
@@ -640,14 +629,10 @@ function registerWriteTool(pi: ExtensionAPI, service: LspService): void {
       });
       const dir = dirname(absolutePath);
 
-      const throwIfAborted = () => {
-        if (signal?.aborted) throw new Error("Operation aborted");
-      };
-
       const [message, details, diagnosticText] = await withFileMutationQueue(
         absolutePath,
         async () => {
-          throwIfAborted();
+          signal?.throwIfAborted();
 
           // opencode: desiredBom = source.bom || next.bom —— 保留原文件 BOM，
           // 否则用新内容自带的 BOM
@@ -664,14 +649,14 @@ function registerWriteTool(pi: ExtensionAPI, service: LspService): void {
           } catch {
             // 文件不存在：无旧 BOM
           }
-          throwIfAborted();
           const { bom: desiredBom, text: nextText } = resolveBom(existing, content);
 
           await mkdir(dir, { recursive: true });
-          throwIfAborted();
+          signal?.throwIfAborted();
           await writeFile(absolutePath, desiredBom + nextText, "utf8");
-          throwIfAborted();
-          const diagnosticText = await service.lspDiagnosticsForFile(absolutePath, ctx.cwd);
+          const diagnosticText = await service.lspDiagnosticsForFile(absolutePath, ctx.cwd, {
+            signal,
+          });
 
           return ["Wrote file successfully.", undefined, diagnosticText] as const;
         },

package/src/talk/index.ts

@@ -25,7 +25,7 @@ import { type TObject, Type } from "typebox";
 import { type CommandResult, type CommandSpec, parseCommand } from "../lib/cli.js";
 import { resolveHomePath } from "../lib/path.js";
 import { restoreTalkAgentId, TALK_JOIN_ENTRY_TYPE, TalkCore } from "./core.js";
-import { formatDelivery } from "./format.js";
+import { age, formatDelivery } from "./format.js";
 import type { Letter } from "./mailbox.js";
 import { type AgentRecord, deriveAddr } from "./registry.js";
 import { SqliteTalkStorage } from "./storage.js";
@@ -68,14 +68,6 @@ function shortCwd(cwd: string): string {
   return sanitizeTerminal(display);
 }
 
-function relativeTime(ts: number, now: number = Date.now()): string {
-  const s = Math.max(0, Math.round((now - ts) / 1000));
-  if (s < 60) return `${s}s ago`;
-  const m = Math.round(s / 60);
-  if (m < 60) return `${m}m ago`;
-  return `${Math.round(m / 60)}h ago`;
-}
-
 /** Presentation metadata for a delivery. `details` is never sent to the LLM. */
 interface DeliveryDetails {
   id: string;
@@ -483,7 +475,7 @@ export default function talk(pi: ExtensionAPI) {
     const idTail = d.id.slice(-8);
     const chip = theme.inverse(` ${d.kind.toUpperCase()} `);
     const header = `${theme.fg("accent", theme.bold(displayName(d.from.name)))} ${theme.fg("dim", `(${shortCwd(d.from.cwd)})`)} ${chip}`;
-    const footer = theme.fg("dim", `id ${idTail} · ${d.kind} · ${relativeTime(d.ts)}`);
+    const footer = theme.fg("dim", `id ${idTail} · ${d.kind} · ${age(d.ts)}`);
     const out = [header, sanitizeTerminal(d.body), "", footer];
     // plain 组件：不引入 pi-tui，直接输出带背景色的文本行
     const text = out.join("\n");