@trim21/personal-pi-extensions 0.0.323 → 0.0.329

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.0.323",
+  "version": "0.0.329",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [
@@ -41,7 +41,7 @@
     "@vitest/coverage-v8": "^4.1.10",
     "eslint": "^10.8.1",
     "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-erasable-syntax-only": "0.4.2",
+    "eslint-plugin-erasable-syntax-only": "0.6.0",
     "eslint-plugin-import-x": "^4.17.1",
     "eslint-plugin-promise": "7.3.0",
     "eslint-plugin-simple-import-sort": "14.0.0",

package/src/aft/tools.ts

@@ -6,7 +6,7 @@
  */
 
 import { homedir } from "node:os";
-import { isAbsolute, join, resolve } from "node:path";
+import { isAbsolute, join, relative, resolve } from "node:path";
 
 import {
   type AftProjectTransport,
@@ -32,6 +32,19 @@ export function resolvePathArg(cwd: string, input: string): string {
   return isAbsolute(input) ? input : resolve(cwd, input);
 }
 
+/** 人类可读的显示路径：cwd 内用 `./…`，home 内用 `~/…`，否则原样绝对路径。 */
+export function formatDisplayPath(cwd: string, filePath: string): string {
+  const relToCwd = relative(cwd, filePath);
+  if (relToCwd !== "" && !relToCwd.startsWith("..") && !isAbsolute(relToCwd)) {
+    return `./${relToCwd}`;
+  }
+  const relToHome = relative(homedir(), filePath);
+  if (relToHome !== "" && !relToHome.startsWith("..") && !isAbsolute(relToHome)) {
+    return `~/${relToHome}`;
+  }
+  return filePath;
+}
+
 export interface AftToolContext {
   cwd: string;
   pool: AftTransportPool;
@@ -222,6 +235,8 @@ export function registerZoomTool(pi: ExtensionAPI, ctx: AftToolContext): void {
       if (contextLines !== undefined) rawArgs.contextLines = contextLines;
       if (coerceBoolean(params.callgraph)) rawArgs.callgraph = true;
 
+      const subtitle = buildZoomSubtitle(extCtx.cwd, params);
+
       const { text, response } = await callAftTool(bridgeFor(ctx), "zoom", rawArgs, extCtx);
       const truncated = response.truncated === true;
       return {
@@ -229,6 +244,8 @@ export function registerZoomTool(pi: ExtensionAPI, ctx: AftToolContext): void {
         details: {
           truncated,
           pendant: {
+            title: "aft_zoom",
+            subtitle,
             markdown: buildPendantMarkdown({
               title: "aft_zoom",
               input: params,
@@ -243,6 +260,37 @@ export function registerZoomTool(pi: ExtensionAPI, ctx: AftToolContext): void {
   });
 }
 
+/** 构建 aft_zoom pendant 的 subtitle：`path="…" symbol="…"`，url 模式为 `url="…"`。 */
+export function buildZoomSubtitle(
+  cwd: string,
+  params: Type.Static<typeof ZoomParams>,
+): string | undefined {
+  const isEmpty = (v: unknown): boolean =>
+    v === undefined || v === null || v === "" || (Array.isArray(v) && v.length === 0);
+
+  const parts: string[] = [];
+  const targets = params.targets;
+  if (Array.isArray(targets)) {
+    for (const t of targets) {
+      parts.push(
+        `path="${formatDisplayPath(cwd, resolvePathArg(cwd, t.path))}" symbol="${t.symbol}"`,
+      );
+    }
+  } else if (targets) {
+    parts.push(
+      `path="${formatDisplayPath(cwd, resolvePathArg(cwd, targets.path))}" symbol="${targets.symbol}"`,
+    );
+  } else if (!isEmpty(params.url)) {
+    parts.push(`url="${params.url}"`);
+  } else if (params.path) {
+    const symbols = params.symbols;
+    const symbolStr = Array.isArray(symbols) ? symbols.join(", ") : symbols;
+    const pathPart = `path="${formatDisplayPath(cwd, resolvePathArg(cwd, params.path))}"`;
+    parts.push(symbolStr ? `${pathPart} symbol="${symbolStr}"` : pathPart);
+  }
+  return parts.length > 0 ? parts.join(" ") : undefined;
+}
+
 const CALLGRAPH_OPS = [
   "call_tree",
   "callers",

package/src/bwrap/approval-rules.ts

@@ -209,21 +209,23 @@ export async function commandPatternsFor(command: string): Promise<string[]> {
 }
 
 /**
- * 对命令（含所有嵌套命令）求值：任一命令命中规则即生效，规则后写优先
- * （findLast，对齐 opencode PermissionV2）。返回 allow/deny；无规则命中
- * 返回 undefined（交给人审）。
+ * 对命令（含所有嵌套命令）求值：
+ * - deny 优先：任一命令命中 deny 规则即整体拒绝
+ * - allow 需全量：所有命令都命中 allow 规则才整体放行，否则返回
+ *   undefined（有命令未命中规则，交给人审），避免未允许的命令被同链放行带过。
+ * 规则内后写优先（findLast，对齐 opencode PermissionV2）。
  */
-export function evaluateBashApproval(
+export async function evaluateBashApproval(
   command: string,
   rules: readonly ApprovalRule[],
 ): Promise<ApprovalAction | undefined> {
-  return commandPatternsFor(command).then((patterns) => {
-    if (patterns.length === 0) return;
-    // 规则后写优先（对齐 opencode PermissionV2 的 findLast）
-    for (const pattern of patterns) {
-      const rule = rules.findLast((r) => matchRule(pattern, r.pattern));
-      if (rule) return rule.action;
-    }
-    return;
-  });
+  const patterns = await commandPatternsFor(command);
+  if (patterns.length === 0) return;
+  let allowed = 0;
+  for (const pattern of patterns) {
+    const rule = rules.findLast((r) => matchRule(pattern, r.pattern));
+    if (rule?.action === "deny") return "deny";
+    if (rule?.action === "allow") allowed++;
+  }
+  return allowed === patterns.length ? "allow" : undefined;
 }

package/src/lib/pendant.ts

@@ -8,6 +8,14 @@
  *   列表等常驻信息用 false
  */
 export interface ToolPendant {
+  /**
+   * 面板标题
+   */
+  title?: string;
+  /**
+   * 面板副标题
+   */
+  subtitle?: string;
   markdown: string;
   /**
    * @default false