@trim21/personal-pi-extensions 0.0.349 → 0.0.352

package/package.json

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

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/client.ts

@@ -642,8 +642,10 @@ export async function create(input: CreateInput): Promise<LspClient> {
 
         const document = files[resolvedPath];
         if (document !== undefined) {
-          // didChange：不清空既有诊断（如 clangd 只在内容变化时重发），
-          // 让服务器下一次 push/pull 自然覆盖。
+          // didChange：内容已变，旧诊断立即失效。清空缓存避免等待窗口内服务器
+          // 重算未完成时（大项目可远超窗口）聚合到过期诊断；新 push 到达即填充。
+          pushDiagnostics.delete(resolvedPath);
+          pullDiagnostics.delete(resolvedPath);
           await connection.sendNotification("workspace/didChangeWatchedFiles", {
             changes: [{ uri, type: FILE_CHANGE_CHANGED }],
           });

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/core.ts

@@ -65,6 +65,12 @@ export interface TalkCoreEvents {
   deliver(letter: Letter): boolean | Promise<boolean>;
   /** Surface a notification (e.g. a presence transition) without waking a busy agent. */
   notify(content: string): void;
+  /**
+   * The agent's talk identity (agentId) was committed to a group by join or
+   * leave. The adapter persists it onto the session branch so a fork/resume
+   * of this session keeps the same identity.
+   */
+  identityChange?(agentId: string): void;
 }
 
 export interface TalkCoreOptions {
@@ -79,6 +85,35 @@ const DELIVERY_BACKOFF_MS = 5000;
 const INITIAL_DRAIN_DELAY_MS = 1200;
 const SWEEP_INTERVAL_MS = 30 * 60 * 1000;
 
+/**
+ * custom entry type that pins an agent's talk identity to the session branch.
+ * join/leave commit the agentId here; fork/branch/resume copy the entry, and
+ * restoreTalkAgentId recovers the identity on the next session_start.
+ */
+export const TALK_JOIN_ENTRY_TYPE = "talk:join";
+
+/**
+ * Recover the talk identity (agentId) pinned to a session branch by its most
+ * recent join/leave record, or undefined when the branch never joined a group
+ * (a fresh session or one rewound before its join). Mirrors how the file tools
+ * rebuild their reads state from the current branch's history.
+ */
+export function restoreTalkAgentId(branchEntries: readonly unknown[]): string | undefined {
+  let agentId: string | undefined;
+  for (const entry of branchEntries) {
+    if (typeof entry !== "object" || entry === null) continue;
+    const { type, customType, data } = entry as {
+      type?: unknown;
+      customType?: unknown;
+      data?: unknown;
+    };
+    if (type !== "custom" || customType !== TALK_JOIN_ENTRY_TYPE) continue;
+    const recorded = (data as { agentId?: unknown } | undefined)?.agentId;
+    if (typeof recorded === "string" && recorded.length > 0) agentId = recorded;
+  }
+  return agentId;
+}
+
 /**
  * Mutual-ask arbitration: true when the peer asked first. The `ts` fields of
  * the two ask letters are fixed values inside the letters, so both sides
@@ -528,31 +563,36 @@ export class TalkCore {
     }
     const nameNote = agentName === undefined ? "" : ` You are visible as "${agentName}".`;
     const existing = await readGroup(this.storage, name);
+    let text: string;
     if (existing?.members.includes(self.agentId)) {
-      return `Already in group ${name} (${existing.members.length} member(s)). Members: ${await this.groupMemberNames(existing.members)}.${nameNote}`;
-    }
-    await this.leaveCurrentGroup();
-    if (existing) {
-      await writeGroup(this.storage, {
-        ...existing,
-        members: [...existing.members, self.agentId],
-        updatedAt: this.now(),
-      });
-      return `Joined group ${name} (${
-        existing.members.length + 1
-      } member(s)). Members: ${await this.groupMemberNames([
-        ...existing.members,
-        self.agentId,
-      ])}. You now see only co-members.${nameNote}`;
+      text = `Already in group ${name} (${existing.members.length} member(s)). Members: ${await this.groupMemberNames(existing.members)}.${nameNote}`;
+    } else {
+      await this.leaveCurrentGroup();
+      if (existing) {
+        await writeGroup(this.storage, {
+          ...existing,
+          members: [...existing.members, self.agentId],
+          updatedAt: this.now(),
+        });
+        text = `Joined group ${name} (${
+          existing.members.length + 1
+        } member(s)). Members: ${await this.groupMemberNames([
+          ...existing.members,
+          self.agentId,
+        ])}. You now see only co-members.${nameNote}`;
+      } else {
+        const now = this.now();
+        await writeGroup(this.storage, {
+          id: name,
+          members: [self.agentId],
+          createdAt: now,
+          updatedAt: now,
+        });
+        text = `Created group ${name}. Members: ${await this.groupMemberNames([self.agentId])}.${nameNote} Other agents join it with /talk-group-join ${name}.`;
+      }
     }
-    const now = this.now();
-    await writeGroup(this.storage, {
-      id: name,
-      members: [self.agentId],
-      createdAt: now,
-      updatedAt: now,
-    });
-    return `Created group ${name}. Members: ${await this.groupMemberNames([self.agentId])}.${nameNote} Other agents join it with /talk-group-join ${name}.`;
+    this.events.identityChange?.(self.agentId);
+    return text;
   }
 
   /**
@@ -574,9 +614,11 @@ export class TalkCore {
     const others = group.members.filter((m) => m !== self.agentId);
     if (others.length === 0) {
       await deleteGroup(this.storage, group.id);
+      this.events.identityChange?.(self.agentId);
       return `Left group ${group.id} (deleted — it was empty).`;
     }
     await writeGroup(this.storage, { ...group, members: others, updatedAt: this.now() });
+    this.events.identityChange?.(self.agentId);
     return `Left group ${group.id} (${others.length} member(s) remain).`;
   }
 

package/src/talk/index.ts

@@ -24,8 +24,8 @@ import { type TObject, Type } from "typebox";
 
 import { type CommandResult, type CommandSpec, parseCommand } from "../lib/cli.js";
 import { resolveHomePath } from "../lib/path.js";
-import { TalkCore } from "./core.js";
-import { formatDelivery } from "./format.js";
+import { restoreTalkAgentId, TALK_JOIN_ENTRY_TYPE, TalkCore } from "./core.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;
@@ -150,6 +142,11 @@ export default function talk(pi: ExtensionAPI) {
         // in LLM context.
         pi.appendEntry(NOTIFY_TYPE, content);
       },
+      identityChange(agentId) {
+        // Pin the identity to the session branch so a fork/resume of this
+        // session keeps the same talk address and group membership.
+        pi.appendEntry(TALK_JOIN_ENTRY_TYPE, { agentId, ts: Date.now() });
+      },
     },
   });
 
@@ -174,9 +171,12 @@ export default function talk(pi: ExtensionAPI) {
   // ── Lifecycle ──────────────────────────────────────────────────────────
 
   pi.on("session_start", (_event, ctx: ExtensionContext) => {
-    const agentId = ctx.sessionManager.getSessionId();
     const cwd = ctx.sessionManager.getCwd() ?? ctx.cwd;
     const now = Date.now();
+    // A fork/branch/resume of a session that joined a group keeps that talk
+    // identity (agentId); a fresh session gets the new session id.
+    const agentId =
+      restoreTalkAgentId(ctx.sessionManager.getBranch()) ?? ctx.sessionManager.getSessionId();
     self = {
       addr: deriveAddr(cwd, agentId),
       agentId,
@@ -475,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");