@trim21/personal-pi-extensions 0.1.559 → 0.1.561

package/package.json

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

package/src/bwrap/runtime.ts

@@ -115,23 +115,35 @@ export class BashInterruptedError extends Error {
   readonly kind: "timeout" | "aborted";
   readonly partial: BashExecutionPartial;
   readonly sandboxHint: string | undefined;
+  /**
+   * 命令实际运行时长（毫秒）：从审批结束、命令真正开始执行算到终止，
+   * 不含审批弹窗等用户 UI 交互耗时。
+   */
+  readonly elapsedMs: number;
 
   constructor(
     kind: "timeout" | "aborted",
     message: string,
     partial: BashExecutionPartial,
     sandboxHint: string | undefined,
+    elapsedMs: number,
     cause: unknown,
   ) {
     super(message, { cause });
     this.kind = kind;
     this.partial = partial;
     this.sandboxHint = sandboxHint;
+    this.elapsedMs = elapsedMs;
     // 对齐标准错误分类：中断=AbortError（用户取消），超时=TimeoutError
     this.name = kind === "aborted" ? "AbortError" : "TimeoutError";
   }
 }
 
+/** 命令运行时长的展示文案（秒，一位小数），超时/中断状态文本共用。 */
+export function formatElapsedSeconds(elapsedMs: number): string {
+  return `${(elapsedMs / 1000).toFixed(1)} seconds`;
+}
+
 function escapeHtml(text: string): string {
   return text
     .replaceAll("&", "&")
@@ -425,6 +437,8 @@ export class BwrapRuntime {
     }
     // 命令失败时附带的沙箱状态（写边界 + 网络层级），由上层拼进错误文本
     const sandboxHint = describeSandbox(runtime, local);
+    // 计时起点放在审批之后：审批弹窗的等待时长属于用户 UI 操作，不是命令运行时间
+    const startedAt = Date.now();
     await using output = new BashOutput(request.ctx.sessionManager.getSessionId());
     const { onUpdate } = request;
 
@@ -463,6 +477,7 @@ export class BwrapRuntime {
         truncation: partial.truncation,
       };
     } catch (error) {
+      const elapsedMs = Date.now() - startedAt;
       // 超时/中断：把命令终止前已捕获的输出附在错误上（文本 + 落盘路径），
       // 展示时输出在前、状态在最后（对齐 pi 内置 bash），避免只报超时丢输出
       // 超时识别：优先 name=TimeoutError（对齐标准错误分类），
@@ -477,6 +492,7 @@ export class BwrapRuntime {
           `Command timed out after ${error.message.slice("timeout:".length)} seconds`,
           partial,
           sandboxHint,
+          elapsedMs,
           error,
         );
       }
@@ -489,6 +505,7 @@ export class BwrapRuntime {
           "Command aborted by user",
           partial,
           sandboxHint,
+          elapsedMs,
           error,
         );
       }

package/src/claude-code/shell.ts

@@ -14,6 +14,7 @@ import {
   BashInterruptedError,
   type BwrapRuntime,
   createBwrapRuntime,
+  formatElapsedSeconds,
   sandboxHintBlock,
 } from "../bwrap/runtime.js";
 import { resolveWorkdir } from "../lib/path.js";
@@ -152,9 +153,13 @@ export function registerShellTools(
             error.partial.fullOutputPath,
           );
           if (error.kind === "aborted") {
-            // 用户取消：直接返回已捕获的输出，不抛错
-            const full = text ? `${text}\n\nCommand aborted by user` : "Command aborted by user";
-            return { content: [{ type: "text", text: full }], details: undefined };
+            // 用户取消：直接返回已捕获的输出，不抛错；时长只算命令真正运行的时间，
+            // 不含审批弹窗等 UI 交互
+            const status = `Command aborted by user after ${formatElapsedSeconds(error.elapsedMs)}`;
+            return {
+              content: [{ type: "text", text: text ? `${text}\n\n${status}` : status }],
+              details: undefined,
+            };
           }
           const full = text
             ? `${text}\n\nCommand timed out after ${timeout} milliseconds`

package/src/opencode/bash.ts

@@ -8,6 +8,7 @@ import {
   BashInterruptedError,
   type BwrapRuntime,
   createBwrapRuntime,
+  formatElapsedSeconds,
   sandboxHintBlock,
 } from "../bwrap/runtime.js";
 import { resolveWorkdir } from "../lib/path.js";
@@ -114,7 +115,7 @@ export default function opencodeBash(
           const status =
             error.kind === "timeout"
               ? `Command exceeded timeout of ${timeout} ms. Retry with a larger timeout if the command is expected to take longer.`
-              : "Command aborted by user";
+              : `Command aborted by user after ${formatElapsedSeconds(error.elapsedMs)}`;
           const full = text ? `${text}\n\n${status}` : status;
           // 对齐上游 opencode：超时与中断都不抛错，输出与状态文本一起返回；
           // 超时可能是沙箱的网络限制导致的，附加沙箱状态（用户中断与沙箱无关）

package/src/opencode/files.ts

@@ -192,11 +192,17 @@ export interface LinePage {
  * - per-line truncation to MAX_LINE_LENGTH
  * - line cap via maxLines (more): keep scanning so count is the file total
  * - byte cap via maxBytes (cut): stop immediately
+ *
+ * offset 为负数时从文件末尾倒数（`offset=-2` 等价 `tail -n 2`）：流式单遍
+ * 扫描全程只保留末尾窗口，返回前把 offset 换算为正的绝对起始行号
+ * （`totalLines + offset + 1`，超出文件长度时钳到 1），行号/续读提示与
+ * 正向语义一致。
  */
 export async function readLines(
   filePath: string,
   opts: { offset: number; limit: number; maxBytes?: number },
 ): Promise<LinePage> {
+  if (opts.offset < 0) return readTailLines(filePath, opts);
   const start = opts.offset - 1;
   const maxBytes = opts.maxBytes ?? DEFAULT_MAX_BYTES;
   const raw: string[] = [];
@@ -236,6 +242,59 @@ export async function readLines(
   return { raw, count, cut, more, offset: opts.offset };
 }
 
+/**
+ * tail 语义的负 offset 实现：单遍流式扫描，环形缓冲只保留末尾 K 行
+ * （K = -offset），扫完后对窗口应用 limit 与字节上限，避免为取末尾几行
+ * 而把整个文件驻留内存。
+ */
+async function readTailLines(
+  filePath: string,
+  opts: { offset: number; limit: number; maxBytes?: number },
+): Promise<LinePage> {
+  const windowSize = -opts.offset;
+  const window: string[] = [];
+  let head = 0;
+  let count = 0;
+
+  const stream = createReadStream(filePath, { encoding: "utf8" });
+  const rl = createInterface({ input: stream, crlfDelay: Infinity });
+  try {
+    for await (const text of rl) {
+      count += 1;
+      const line =
+        text.length > MAX_LINE_LENGTH ? text.slice(0, MAX_LINE_LENGTH) + MAX_LINE_SUFFIX : text;
+      window.push(line);
+      if (window.length > windowSize) head += 1;
+    }
+  } finally {
+    rl.close();
+    stream.destroy();
+  }
+
+  const offset = Math.max(count + opts.offset + 1, 1);
+  const maxBytes = opts.maxBytes ?? DEFAULT_MAX_BYTES;
+  const raw: string[] = [];
+  let bytes = 0;
+  let cut = false;
+  let more = false;
+  for (const line of window.slice(head)) {
+    if (raw.length >= opts.limit) {
+      more = true;
+      break;
+    }
+    const size = Buffer.byteLength(line, "utf8") + (raw.length > 0 ? 1 : 0);
+    if (bytes + size > maxBytes) {
+      cut = true;
+      more = true;
+      break;
+    }
+    raw.push(line);
+    bytes += size;
+  }
+
+  return { raw, count, cut, more, offset };
+}
+
 function truncationFromPage(page: LinePage): TruncationResult {
   const content = page.raw.join("\n");
   return {
@@ -299,15 +358,17 @@ function registerReadTool(pi: ExtensionAPI, getService: () => LspService): void
   pi.registerTool({
     name: "read",
     label: "read",
-    description: `Read the contents of a file. Supports text files and images (jpg, png, gif, webp). Images are sent as attachments. For text files, output is truncated to ${DEFAULT_MAX_LINES} lines or ${DEFAULT_MAX_BYTES / 1024}KB (whichever is hit first). Use offset/limit for large files. When you need the full file, continue with offset until complete.`,
+    description: `Read the contents of a file. Supports text files and images (jpg, png, gif, webp). Images are sent as attachments. For text files, output is truncated to ${DEFAULT_MAX_LINES} lines or ${DEFAULT_MAX_BYTES / 1024}KB (whichever is hit first). Use offset/limit for large files. A negative offset counts from the end of the file (offset=-2 reads the last 2 lines). When you need the full file, continue with offset until complete.`,
     promptSnippet: "Read file contents",
-    promptGuidelines: ["Use read to examine files instead of cat or sed."],
+    promptGuidelines: [
+      "Use read to examine files instead of cat, sed, or tail. A negative offset reads from the end of the file (offset=-2 reads the last 2 lines).",
+    ],
     parameters: Type.Object({
       filePath: Type.String({ description: "The absolute path to the file or directory to read" }),
       offset: Type.Optional(
         Type.Integer({
-          minimum: 0,
-          description: "The line number to start reading from (1-indexed)",
+          description:
+            "The line number to start reading from (1-indexed; 0 is treated as 1). A negative value counts from the end of the file (offset=-2 reads the last 2 lines).",
         }),
       ),
       limit: Type.Optional(
@@ -340,9 +401,9 @@ function registerReadTool(pi: ExtensionAPI, getService: () => LspService): void
       if (fileStat.isDirectory()) {
         const entries = await formatDirectoryEntries(absolutePath);
         const limitVal = limit ?? DEFAULT_MAX_LINES;
-        // opencode: params.offset || 1（0 视为 1）
+        // opencode: params.offset || 1（0 视为 1）；负数从末尾倒数
         const offsetVal = offset || 1;
-        const start = offsetVal - 1;
+        const start = offsetVal < 0 ? Math.max(entries.length + offsetVal, 0) : offsetVal - 1;
         const sliced = entries.slice(start, start + limitVal);
         const totalEntries = entries.length;
         const truncated = start + sliced.length < totalEntries;