@trim21/personal-pi-extensions 0.1.500 → 0.1.502

package/package.json

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

package/src/aft/bridge.ts

@@ -150,6 +150,9 @@ export async function createAftPool(
  * 调用 AFT 工具命令并返回 Rust 格式化好的文本。
  * 只读感知工具统一走 toolCall（server 侧 tool_call 分派）。`softCodes` 里的
  * 错误码（如 symbol_not_found）是合法否定答案，不抛错、按文本返回。
+ *
+ * `signal`：宿主取消信号，透传给 bridge 的 abortSignal——standalone transport
+ * 会在 abort 时向 Rust 发 cancel_request（subc route 忽略，靠 route 关闭取消）。
  */
 export async function callAftTool(
   bridge: AftProjectTransport,
@@ -158,12 +161,14 @@ export async function callAftTool(
   extCtx: ExtensionContext,
   options?: BridgeRequestOptions & { preview?: boolean },
   softCodes?: ReadonlySet<string>,
+  signal?: AbortSignal,
 ): Promise<{ text: string; response: Record<string, unknown> }> {
   const timeoutMs = timeoutForCommand(command);
   const sessionId = resolveSessionId(extCtx);
   const sendOptions = {
     ...(timeoutMs !== undefined && { timeoutMs }),
     ...options,
+    ...(signal !== undefined && !options?.abortSignal && { abortSignal: signal }),
   };
   const response = await bridge.toolCall(
     sessionId,

package/src/aft/tools.ts

@@ -126,7 +126,7 @@ export function registerOutlineTool(pi: ExtensionAPI, ctx: AftToolContext): void
     promptSnippet: "Output structural outline of a file/directory",
     promptGuidelines: [OUTLINE_PROMPT],
     parameters: OutlineParams,
-    async execute(_id, params, _signal, _onUpdate, extCtx) {
+    async execute(_id, params, signal, _onUpdate, extCtx) {
       const target = coerceTargetParam(params.target);
       if (typeof target !== "string" || target.length === 0) {
         throw new Error("'target' must be a single path (array targets are not supported)");
@@ -145,7 +145,15 @@ export function registerOutlineTool(pi: ExtensionAPI, ctx: AftToolContext): void
 
       const subtitle = buildOutlineSubtitle(extCtx.cwd, target);
 
-      const { text, response } = await callAftTool(bridgeFor(ctx), "outline", rawArgs, extCtx);
+      const { text, response } = await callAftTool(
+        bridgeFor(ctx),
+        "outline",
+        rawArgs,
+        extCtx,
+        undefined,
+        undefined,
+        signal,
+      );
       const truncated = response.truncated === true;
       return {
         content: [{ type: "text", text }],
@@ -201,7 +209,7 @@ export function registerZoomTool(pi: ExtensionAPI, ctx: AftToolContext): void {
     promptSnippet: "Inspect the full source of a named symbol",
     promptGuidelines: [ZOOM_PROMPT],
     parameters: ZoomParams,
-    async execute(_id, params, _signal, _onUpdate, extCtx) {
+    async execute(_id, params, signal, _onUpdate, extCtx) {
       const rawArgs = compactArgs({
         filePath: resolvePathArg(extCtx.cwd, params.path),
         symbols: params.symbols,
@@ -216,7 +224,15 @@ export function registerZoomTool(pi: ExtensionAPI, ctx: AftToolContext): void {
 
       const subtitle = buildZoomSubtitle(extCtx.cwd, params);
 
-      const { text, response } = await callAftTool(bridgeFor(ctx), "zoom", rawArgs, extCtx);
+      const { text, response } = await callAftTool(
+        bridgeFor(ctx),
+        "zoom",
+        rawArgs,
+        extCtx,
+        undefined,
+        undefined,
+        signal,
+      );
       const truncated = response.truncated === true;
       return {
         content: [{ type: "text", text }],
@@ -305,12 +321,16 @@ export async function callCallgraphWithBuildRetry(
   bridge: AftProjectTransport,
   rawArgs: Record<string, unknown>,
   extCtx: ExtensionContext,
+  signal?: AbortSignal,
   timing?: { budgetMs: number; intervalMs: number },
 ): Promise<{ text: string; response: Record<string, unknown> }> {
   const budgetMs = timing?.budgetMs ?? CALLGRAPH_BUILD_RETRY_BUDGET_MS;
   const intervalMs = timing?.intervalMs ?? CALLGRAPH_BUILD_RETRY_INTERVAL_MS;
   const deadline = Date.now() + budgetMs;
   for (;;) {
+    if (signal?.aborted) {
+      throw new Error("callgraph request aborted");
+    }
     const { text, response } = await callAftTool(
       bridge,
       "callgraph",
@@ -318,6 +338,7 @@ export async function callCallgraphWithBuildRetry(
       extCtx,
       undefined,
       CALLGRAPH_SOFT_CODES,
+      signal,
     );
     const code = typeof response.code === "string" ? response.code : "";
     if (code !== "callgraph_building" || Date.now() >= deadline) {
@@ -341,7 +362,7 @@ export function registerCallgraphTool(pi: ExtensionAPI, ctx: AftToolContext): vo
     promptSnippet: "Call graph and data-flow navigation",
     promptGuidelines: [CALLGRAPH_PROMPT],
     parameters: CallgraphParams,
-    async execute(_id, params, _signal, _onUpdate, extCtx) {
+    async execute(_id, params, signal, _onUpdate, extCtx) {
       const rawArgs = compactArgs({
         op: params.op,
         filePath: resolvePathArg(extCtx.cwd, params.path),
@@ -354,7 +375,12 @@ export function registerCallgraphTool(pi: ExtensionAPI, ctx: AftToolContext): vo
         includeUnresolved: params.includeUnresolved,
       });
 
-      const { text, response } = await callCallgraphWithBuildRetry(bridgeFor(ctx), rawArgs, extCtx);
+      const { text, response } = await callCallgraphWithBuildRetry(
+        bridgeFor(ctx),
+        rawArgs,
+        extCtx,
+        signal,
+      );
       const out =
         text ||
         formatCallgraphSections(params.op, response, PLAIN_CALLGRAPH_THEME, {
@@ -483,7 +509,7 @@ export function registerSearchTool(pi: ExtensionAPI, ctx: AftToolContext): void
     promptSnippet: "Search code by meaning or exact text",
     promptGuidelines: [SEARCH_PROMPT],
     parameters: SearchParams,
-    async execute(_id, params, _signal, onUpdate, extCtx) {
+    async execute(_id, params, signal, onUpdate, extCtx) {
       if (typeof params.query !== "string" || params.query.trim().length === 0) {
         throw new Error("'query' must be a non-empty string");
       }
@@ -506,13 +532,21 @@ export function registerSearchTool(pi: ExtensionAPI, ctx: AftToolContext): void
       let response: Record<string, unknown>;
       let text: string;
       try {
-        ({ text, response } = await callAftTool(bridge, "search", rawArgs, extCtx, {
-          // 默认 search 传输超时仅 60s，会早于索引等待（600s）触发；覆盖为等待
-          // 上限 + 常规执行预算。超时只说明响应被挤掉而非 bridge 挂死，保留
-          // 常驻的语义索引/LSP 状态。
-          transportTimeoutMs: SEMANTIC_INDEX_WAIT_TIMEOUT_MS + 60_000,
-          keepBridgeOnTimeout: true,
-        }));
+        ({ text, response } = await callAftTool(
+          bridge,
+          "search",
+          rawArgs,
+          extCtx,
+          {
+            // 默认 search 传输超时仅 60s，会早于索引等待（600s）触发；覆盖为等待
+            // 上限 + 常规执行预算。超时只说明响应被挤掉而非 bridge 挂死，保留
+            // 常驻的语义索引/LSP 状态。
+            transportTimeoutMs: SEMANTIC_INDEX_WAIT_TIMEOUT_MS + 60_000,
+            keepBridgeOnTimeout: true,
+          },
+          undefined,
+          signal,
+        ));
       } finally {
         stopProgress?.();
       }

package/src/claude-code/edit.md

@@ -4,7 +4,6 @@ Performs exact string replacements in files.
 
 Usage:
 
-- You must use your Read tool at least once in the conversation before editing. This tool will error if you attempt an edit without reading the file.
 - When editing text from Read tool output, ensure you preserve the exact indentation (tabs/spaces) as it appears AFTER the line number prefix. The line number prefix format is: line number + tab. Everything after that is the actual file content to match. Never include any part of the line number prefix in the old_string or new_string.
 - ALWAYS prefer editing existing files in the codebase. NEVER write new files unless explicitly required.
 - Only use emojis if the user explicitly requests it. Avoid adding emojis to files unless asked.

package/src/claude-code/files.ts

@@ -199,8 +199,9 @@ async function readStateKey(filePath: string): Promise<string> {
 }
 
 /**
- * 校验「已读且未变」。key 与 currentContent 由调用方提供：调用方每次工具调用
- * 只 realpath / readFile 一次，避免重复 IO。
+ * 校验「若曾读过则内容未变」。key 与 currentContent 由调用方提供：调用方每次
+ * 工具调用只 realpath / readFile 一次，避免重复 IO。从未读过时直接放行，
+ * 不强制先 Read；存在已读快照时校验文本可编辑且 digest 一致。
  */
 function requireCurrentRead(
   state: ClaudeCodeState,
@@ -209,9 +210,7 @@ function requireCurrentRead(
   currentContent: Uint8Array,
 ): void {
   const readSnapshot = state.reads.get(key);
-  if (!readSnapshot) {
-    throw new Error("File has not been read yet. Read it first before writing to it.");
-  }
+  if (!readSnapshot) return;
   if (!readSnapshot.textEditable) {
     throw new Error(`Cannot edit or overwrite a binary file with a text tool: ${filePath}`);
   }
@@ -356,7 +355,6 @@ export function registerFileTools(
     label: "Edit",
     description: [
       "Performs exact string replacements in files.",
-      "You must use Read on the file before editing it.",
       "old_string must match exactly and must be unique unless replace_all is true.",
       "This tool does not use regular expressions or fuzzy matching.",
     ].join("\n"),
@@ -572,7 +570,7 @@ export function registerFileTools(
     description: [
       "Writes a file to the local filesystem.",
       "This tool overwrites an existing file with the full content provided.",
-      "If the file exists, you must use Read first. Prefer Edit for partial changes.",
+      "Prefer Edit for partial changes.",
     ].join("\n"),
     promptSnippet: "Create or overwrite files",
     promptGuidelines: [WRITE_PROMPT],
@@ -695,8 +693,8 @@ export default function claudeCodeFileTools(pi: ExtensionAPI, options?: LspServi
   const state = createClaudeCodeState();
 
   // LSP 专属工具（lsp-rename / inspect 族）仅在 lsp.json 存在 enabled 服务器时
-  // 注册（session_start 校验后）；本工具集跟踪 read-before-write 状态，rename
-  // 落盘的文件要标记为已读并随 details 持久化（restoreFileReads 依赖 details.reads）。
+  // 注册（session_start 校验后）；本工具集维护 reads 记账，rename 落盘的文件
+  // 要标记为已读并随 details 持久化（restoreFileReads 依赖 details.reads）。
   const manager = createLspManager(
     pi,
     {

package/src/claude-code/write.md

@@ -5,7 +5,6 @@ Writes a file to the local filesystem.
 Usage:
 
 - This tool will overwrite the existing file if there is one at the provided path.
-- If this is an existing file, you MUST use the Read tool first to read the file's contents. This tool will fail if you did not read the file first.
 - Prefer the Edit tool for modifying existing files — it only sends the diff. Only use this tool to create new files or for complete rewrites.
 - NEVER create documentation files (*.md) or README files unless explicitly requested by the User.
 - Only use emojis if the user explicitly requests it. Avoid writing emojis to files unless asked.

package/src/lib/lsp/rename-tool.ts

@@ -5,9 +5,9 @@
  * 这里只负责工具注册与执行编排：按行内候选逐个探测 → canonicalizeEdit 分组
  * 消歧 → expandWorkspaceEdit 内存展开 → 审批 → 写盘 → 诊断。
  *
- * 两个工具集行为一致，唯一差异是 reads 记账：跟踪 read-before-write 状态的
- * 工具集通过 hooks.recordReads 把重命名文件标记为已读并随 details 持久化；
- * 不跟踪该状态的工具集不传 hook。
+ * 两个工具集行为一致，唯一差异是 reads 记账：跟踪已读快照的工具集通过
+ * hooks.recordReads 把重命名文件标记为已读并随 details 持久化；不跟踪
+ * 该状态的工具集不传 hook。
  */
 
 import { readFileSync } from "node:fs";