@trim21/personal-pi-extensions 0.0.262 → 0.0.268

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.0.262",
+  "version": "0.0.268",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [
@@ -42,6 +42,7 @@
     "eslint": "^10.8.1",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-erasable-syntax-only": "0.4.2",
+    "eslint-plugin-import-x": "^4.17.1",
     "eslint-plugin-promise": "7.3.0",
     "eslint-plugin-simple-import-sort": "14.0.0",
     "eslint-plugin-unicorn": "73.0.0",
@@ -70,7 +71,7 @@
     ]
   },
   "lint-staged": {
-    "*.{ts,tsx,js,jsx}": [
+    "*.{ts,tsx,js,jsx,mjs}": [
       "eslint --fix",
       "prettier --write"
     ],

package/src/bwrap/core.ts

@@ -1,7 +1,5 @@
-import type { ChildProcess } from "node:child_process";
-import { spawn } from "node:child_process";
-import { constants } from "node:fs";
-import { closeSync, existsSync, openSync, readFileSync } from "node:fs";
+import { type ChildProcess, spawn } from "node:child_process";
+import { closeSync, constants, existsSync, openSync, readFileSync } from "node:fs";
 import { access as fsAccess } from "node:fs/promises";
 import { delimiter, join } from "node:path";
 import { fileURLToPath } from "node:url";

package/src/bwrap/dcg-scan.ts

@@ -0,0 +1,127 @@
+/**
+ * dcg-scan —— 可选的 dcg（Destructive Command Guard）扫描建议层。
+ *
+ * 系统安装了 dcg 时，在 full-access 人工审批弹窗里附加一段破坏性命令
+ * 扫描建议，作为人工 review 的参考；dcg 未安装、调用失败或超时时静默
+ * 跳过，不影响审批流程。dcg 输出只作建议文本，不参与任何执行决策。
+ */
+import { spawn } from "node:child_process";
+
+/** `dcg test --format json` 输出中我们关心的字段。 */
+interface DcgTestOutput {
+  decision?: "allow" | "deny" | "indeterminate";
+  severity?: "critical" | "high" | "medium" | "low";
+  rule_id?: string;
+  reason?: string;
+}
+
+/** dcg 扫描建议（纯文本，外部字段已转义，可直接拼进弹窗 description）。 */
+export interface DcgSuggestion {
+  kind: "danger" | "clean";
+  text: string;
+}
+
+/** dcg 扫描结果：正常判定 / 未安装（静默跳过）/ 扫描失败（应提示用户）。 */
+export type DcgScanOutcome =
+  | { kind: "suggestion"; suggestion: DcgSuggestion }
+  | { kind: "not-installed" }
+  | { kind: "failed"; detail: string };
+
+/** dcg 扫描的超时预算：超时视为无建议，不让审批弹窗被拖住。 */
+const DCG_SCAN_TIMEOUT_MS = 2000;
+
+function escapeHtml(text: string): string {
+  return text
+    .replaceAll("&", "&")
+    .replaceAll("<", "&lt;")
+    .replaceAll(">", "&gt;")
+    .replaceAll('"', "&quot;");
+}
+
+/**
+ * 对命令做 dcg 扫描。返回三种结果：
+ * - `suggestion`：正常判定，携带建议文本
+ * - `not-installed`：dcg 未安装（调用方静默跳过）
+ * - `failed`：dcg 已安装但扫描失败（退出码异常/超时/输出不可解析），
+ *   调用方应通过 `ui.notify` 提示用户
+ */
+export async function dcgSuggestion(command: string): Promise<DcgScanOutcome> {
+  let stdout: string;
+  try {
+    stdout = await runDcgScan(command);
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") return { kind: "not-installed" };
+    return { kind: "failed", detail: error instanceof Error ? error.message : String(error) };
+  }
+
+  let output: DcgTestOutput;
+  try {
+    output = JSON.parse(stdout) as DcgTestOutput;
+  } catch {
+    return { kind: "failed", detail: "无法解析 dcg 输出" };
+  }
+
+  if (output.decision === "deny") {
+    const details = [
+      output.rule_id ? `rule: ${escapeHtml(output.rule_id)}` : undefined,
+      output.severity ? `severity: ${escapeHtml(output.severity)}` : undefined,
+    ]
+      .filter(Boolean)
+      .join(", ");
+    const reason = output.reason ? escapeHtml(output.reason) : "检测到破坏性命令模式";
+    return {
+      kind: "suggestion",
+      suggestion: {
+        kind: "danger",
+        text: `dcg 建议拦截: ${reason}${details ? ` (${details})` : ""}`,
+      },
+    };
+  }
+  if (output.decision === "allow") {
+    return {
+      kind: "suggestion",
+      suggestion: { kind: "clean", text: "dcg 未检测到破坏性命令模式" },
+    };
+  }
+  // indeterminate / 缺字段：dcg 未能给出可用判定
+  return {
+    kind: "failed",
+    detail: `dcg 未返回可用判定 (decision=${output.decision ?? "missing"})`,
+  };
+}
+
+function runDcgScan(command: string): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const proc = spawn("dcg", ["test", "--stdin", "--format", "json"], {
+      stdio: ["pipe", "pipe", "pipe"],
+    });
+    let stdout = "";
+    let settled = false;
+    const timeoutId = setTimeout(() => {
+      proc.kill("SIGKILL");
+      settle(new Error("dcg scan timed out"));
+    }, DCG_SCAN_TIMEOUT_MS);
+    const settle = (error?: Error) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timeoutId);
+      if (error) reject(error);
+      else resolve(stdout);
+    };
+    proc.stdout.setEncoding("utf8");
+    proc.stdout.on("data", (chunk: string) => {
+      stdout += chunk;
+    });
+    proc.on("error", (error: NodeJS.ErrnoException) => {
+      // ENOENT = dcg 未安装：静默跳过
+      settle(error);
+    });
+    proc.on("close", (code) => {
+      // dcg 的退出码是决策结果（deny 时非 0），不是失败标志：只要 stdout
+      // 有内容就交给上层解析；真正出错时（参数错误等）stdout 为空。
+      if (code === 0 || stdout.length > 0) settle();
+      else settle(new Error(`dcg exited with code ${String(code)}`));
+    });
+    proc.stdin.end(command);
+  });
+}

package/src/bwrap/runtime.ts

@@ -3,14 +3,12 @@ import { createWriteStream, existsSync, mkdirSync, readFileSync, type WriteStrea
 import { mkdir, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 
-import type {
-  AgentToolUpdateCallback,
-  ExtensionAPI,
-  ExtensionCommandContext,
-  ExtensionContext,
-} from "@earendil-works/pi-coding-agent";
 import {
+  type AgentToolUpdateCallback,
   createLocalBashOperations,
+  type ExtensionAPI,
+  type ExtensionCommandContext,
+  type ExtensionContext,
   getAgentDir,
   truncateTail,
   type TruncationResult,
@@ -31,6 +29,7 @@ import {
   type ResolvedBwrap,
   resolveHeadlessBwrap,
 } from "./core.js";
+import { dcgSuggestion } from "./dcg-scan.js";
 
 export type EscalationDecision = { kind: "dialog" } | { kind: "deny"; reason: string };
 
@@ -390,7 +389,15 @@ export class BwrapRuntime {
   ): Promise<void> {
     const policy = resolveEscalation({ hasUI: ctx.hasUI });
     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)}`;
+    // dcg 扫描建议是可选的参考文本：未安装时静默跳过；已安装但扫描失败
+    // 时 notify 提示，弹窗本身与无 dcg 时一致
+    const outcome = await dcgSuggestion(command);
+    const suggestionBlock =
+      outcome.kind === "suggestion" ? `\n${outcome.suggestion.text}\n---\n` : "";
+    if (outcome.kind === "failed") {
+      ctx.ui.notify(`dcg 扫描失败，本次无破坏性命令建议: ${outcome.detail}`, "warning");
+    }
+    const description = `Allow this command to run without sandbox?\n---\n\nReason: ${escapeHtml(reason ?? "(No reason provided by model)")}\n---\n${suggestionBlock}${fenceCodeBlock(command)}`;
 
     // 单选：允许一次 / 永久允许（写入规则）/ 拒绝 / 拒绝并附理由（弹输入框）
     const verdict = await selectWithOptionalInput(description, FULL_ACCESS_CHOICES, ctx.ui, {

package/src/claude-code/files.ts

@@ -5,8 +5,8 @@ import { dirname, extname } from "node:path";
 import { fileURLToPath } from "node:url";
 
 import type { ImageContent, TextContent } from "@earendil-works/pi-ai";
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import {
+  type ExtensionAPI,
   generateDiffString,
   generateUnifiedPatch,
   withFileMutationQueue,

package/src/claude-code/shell.ts

@@ -2,8 +2,11 @@ import { readFileSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { type BashToolDetails, formatSize } from "@earendil-works/pi-coding-agent";
+import {
+  type BashToolDetails,
+  type ExtensionAPI,
+  formatSize,
+} from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
 import { type BwrapRuntime, createBwrapRuntime } from "../bwrap/runtime.js";

package/src/gh-readonly.ts

@@ -34,8 +34,7 @@ import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { delimiter, dirname, join, resolve } from "node:path";
 
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { withFileMutationQueue } from "@earendil-works/pi-coding-agent";
+import { type ExtensionAPI, withFileMutationQueue } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { Value } from "typebox/value";
 

package/src/opencode/edit.ts

@@ -21,8 +21,8 @@ import { constants } from "node:fs";
 import { access, mkdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, isAbsolute, resolve } from "node:path";
 
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import {
+  type ExtensionAPI,
   generateDiffString,
   generateUnifiedPatch,
   withFileMutationQueue,

package/src/opencode/write.ts

@@ -24,8 +24,7 @@
 import { mkdir, open, writeFile } from "node:fs/promises";
 import { dirname, resolve as resolvePath } from "node:path";
 
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { withFileMutationQueue } from "@earendil-works/pi-coding-agent";
+import { type ExtensionAPI, withFileMutationQueue } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 
 import { guardWriteAccess } from "../lib/write-guard.js";

package/src/talk/index.ts

@@ -13,8 +13,12 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 
-import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { getAgentDir, truncateToVisualLines } from "@earendil-works/pi-coding-agent";
+import {
+  type ExtensionAPI,
+  type ExtensionContext,
+  getAgentDir,
+  truncateToVisualLines,
+} from "@earendil-works/pi-coding-agent";
 import { type TObject, Type } from "typebox";
 
 import { type CommandResult, type CommandSpec, parseCommand } from "../lib/cli.js";