@trim21/personal-pi-extensions 0.0.300 → 0.0.301

package/package.json

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

package/src/aft/ast-edit.ts

@@ -35,7 +35,7 @@ export interface PreviewExtract {
   truncated: boolean;
 }
 
-/** AFT preview diff 条目：`include_diff_content` 时带 before/after，>512KB 只带 truncated。 */
+/** AFT preview diff 条目：preview 模式下默认带 before/after，>512KB 只带 truncated。 */
 const previewDiffSchema = Type.Object({
   before: Type.Optional(Type.String()),
   after: Type.Optional(Type.String()),
@@ -232,12 +232,11 @@ export function registerAstEditTool(pi: ExtensionAPI, ctx: AftToolContext): void
       const rawArgs = buildWireArgs(params, filePath);
 
       // 第一步：preview（不写盘）拿所有变动文件的 before/after，供写保护审批。
-      const { response } = await callAftTool(
-        bridgeFor(ctx),
-        "edit",
-        { ...rawArgs, preview: true, include_diff_content: true },
-        extCtx,
-      );
+      // preview 必须经 options 传入（bridge 会放到 tool_call 消息顶层），
+      // 放进 arguments 会被 AFT 忽略并真的写盘。
+      const { response } = await callAftTool(bridgeFor(ctx), "edit", rawArgs, extCtx, {
+        preview: true,
+      });
       const { files: previewFiles, truncated } = extractPreviewFiles(response);
       if (truncated) {
         throw new Error("ast_edit: file too large for preview (over 512KB)");

package/src/aft/bridge.ts

@@ -7,8 +7,6 @@
  * aft-bridge 锁一致就不会走到最后的网络下载。
  */
 
-import { createRequire } from "node:module";
-
 import {
   type AftProjectTransport,
   type AftTransportPool,
@@ -22,16 +20,6 @@ import {
 } from "@cortexkit/aft-bridge";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 
-/** aft-bridge 包自身版本，作为二进制版本匹配基准。 */
-const BRIDGE_VERSION: string = (() => {
-  try {
-    const req = createRequire(import.meta.url);
-    return (req("@cortexkit/aft-bridge/package.json") as { version?: string }).version ?? "0.0.0";
-  } catch {
-    return "0.0.0";
-  }
-})();
-
 /** Pi 会话 ID：Rust 侧用它做 session 作用域（undo/checkpoint），感知工具可留空。 */
 export function resolveSessionId(extCtx: ExtensionContext): string | undefined {
   const manager = (extCtx as unknown as { sessionManager?: { getSessionId?: () => string } })
@@ -40,9 +28,14 @@ export function resolveSessionId(extCtx: ExtensionContext): string | undefined {
   return typeof id === "string" && id.length > 0 ? id : undefined;
 }
 
-/** 解析 aft 二进制；失败时抛出（调用方决定是否降级不注册工具）。 */
+/**
+ * 解析 aft 二进制；失败时抛出（调用方决定是否降级不注册工具）。
+ * 不带版本参数：findBinary 内部用 @cortexkit/aft-bridge 自身版本作为匹配基准，
+ * 与 npm 平台包（@cortexkit/aft-<platform>）精确对齐，避免手动读 package.json
+ * （其 exports 不暴露 ./package.json）。
+ */
 export async function resolveAftBinary(): Promise<string> {
-  const path = await findBinary(BRIDGE_VERSION);
+  const path = await findBinary();
   if (!path) {
     throw new Error(
       "AFT binary not found. Install via npm platform package (@cortexkit/aft-<platform>), cargo install agent-file-tools, or place `aft` on PATH.",
@@ -64,7 +57,7 @@ export async function createAftPool(cwd: string): Promise<AftPool> {
   const pool = await createAftTransportPool({
     harness: "pi",
     binaryPath,
-    poolOptions: { minVersion: BRIDGE_VERSION },
+    poolOptions: {},
     configOverrides: {
       storage_dir: resolveCortexKitStorageRoot(),
       cortexkit_user_config_path: paths.userConfigPath,
@@ -85,7 +78,7 @@ export async function callAftTool(
   command: string,
   rawArgs: Record<string, unknown>,
   extCtx: ExtensionContext,
-  options?: BridgeRequestOptions,
+  options?: BridgeRequestOptions & { preview?: boolean },
   softCodes?: ReadonlySet<string>,
 ): Promise<{ text: string; response: Record<string, unknown> }> {
   const timeoutMs = timeoutForCommand(command);

package/src/lib/lsp/lsp.ts

@@ -144,9 +144,13 @@ function containsPath(file: string, cwd: string): boolean {
 
 /**
  * 创建 LSP 服务实例。state 由闭包持有；adapters 可注入（测试传 [] 或
- * mock adapters 即可隔离真实服务器）。
+ * mock adapters 即可隔离真实服务器）。globalConfigPath 供测试注入
+ * 固定的全局配置路径，避免被本机 ~/.pi/agent/lsp.json 影响。
  */
-export function createLspService(adapters: LspServerAdapter[] = createAdapters()): LspService {
+export function createLspService(
+  adapters: LspServerAdapter[] = createAdapters(),
+  globalConfigPath?: string,
+): LspService {
   const state: LspState = {
     clients: [],
     adapters,
@@ -156,7 +160,7 @@ export function createLspService(adapters: LspServerAdapter[] = createAdapters()
 
   async function getClients(file: string, cwd: string): Promise<LspClient[]> {
     if (!containsPath(file, cwd)) return [];
-    const config = await loadLspConfig(cwd);
+    const config = await loadLspConfig(cwd, globalConfigPath);
     const timeout = timeoutOptions(config);
     const adapters = filterAdapters(state.adapters, config);
     const extension = extname(file) || file;