@trim21/personal-pi-extensions 0.1.690 → 0.1.691

package/src/lib/github.ts

@@ -270,21 +270,41 @@ export function normalizeRestList(items: unknown, repo: string): SearchHit[] {
 }
 
 /**
- * Error thrown when the GitHub search API rejects the request. Carries the
- * original toolcall params so the model can see the exact input.
+ * GitHub 请求失败：octokit 调用与非 JSON 的原始下载共用这一个类型，调用方据此区分
+ * 「不存在」（`isNotFound`）与真失败，不用再各自去剥错误对象上的 status。
+ *
+ * `input` 是触发该请求的工具参数；带上它，模型才能在报错里看到自己给的输入。
  */
-class GithubSearchError extends Error {
-  readonly params: SearchParams;
+export class GithubApiError extends Error {
+  /** HTTP 状态；连响应都没拿到（网络错误）时为 undefined。 */
   readonly status: number | undefined;
-
-  constructor(message: string, params: SearchParams, status?: number) {
-    super(`${message} (input: ${JSON.stringify(params)})`);
-    this.name = "GithubSearchError";
-    this.params = params;
-    this.status = status;
+  readonly input: unknown;
+
+  constructor(
+    message: string,
+    options: { status?: number; input?: unknown; cause?: unknown } = {},
+  ) {
+    const inputText =
+      options.input === undefined ? "" : ` (input: ${JSON.stringify(options.input)})`;
+    super(
+      `${message}${inputText}`,
+      options.cause === undefined ? undefined : { cause: options.cause },
+    );
+    this.name = "GithubApiError";
+    this.status = options.status;
+    this.input = options.input;
   }
 }
 
+/** 404：资源不存在或 token 没有访问权限——与网络/限流错误分开处理。 */
+export function isNotFound(error: unknown): boolean {
+  return error instanceof GithubApiError && error.status === 404;
+}
+
+const errorStatus = (error: unknown): number | undefined => (error as { status?: number }).status;
+const errorMessage = (error: unknown): string =>
+  (error as { message?: string }).message ?? String(error);
+
 function describeHttpError(status: number | undefined): string {
   if (status === 401) {
     return 'GitHub auth failed (401): token invalid or expired — run "gh auth login"';
@@ -298,12 +318,35 @@ function describeHttpError(status: number | undefined): string {
   return `GitHub API error${status === undefined ? "" : ` (HTTP ${status})`}`;
 }
 
+/** 非 2xx 的原始响应（二进制下载）转成错误：状态、URL 与 GitHub 的 message 一起给出。 */
+async function ensureOk(response: Response): Promise<Response> {
+  if (response.ok) {
+    return response;
+  }
+  let detail: string | undefined;
+  try {
+    const body = await response.text();
+    detail = (JSON.parse(body) as { message?: string }).message ?? body.slice(0, 200);
+  } catch {
+    detail = undefined;
+  }
+  throw new GithubApiError(
+    `GitHub API error (HTTP ${response.status}) at ${response.url}${detail === undefined || detail === "" ? "" : `: ${detail}`}`,
+    { status: response.status },
+  );
+}
+
 export interface GithubApi {
-  /** Run an octokit request; retries once with a fresh token on 401. */
-  call<T>(fn: (octokit: Octokit) => Promise<T>): Promise<T>;
+  /**
+   * Run an octokit request; retries once with a fresh token on 401. Failures
+   * are rethrown as `GithubApiError`; `input` (the toolcall params behind the
+   * request) is attached to that error when given.
+   */
+  call<T>(fn: (octokit: Octokit) => Promise<T>, input?: unknown): Promise<T>;
   /**
    * 用同一个 token 直接 fetch（二进制资产、源码归档这类要走原始响应体、不能经 octokit
-   * 的 JSON 解析的请求）。重定向自动跟随，401 同样丢缓存重试一次。
+   * 的 JSON 解析的请求）。重定向自动跟随，401 同样丢缓存重试一次；非 2xx 抛
+   * `GithubApiError`（状态、URL 与 GitHub 的 message 都在里面）。
    */
   rawFetch(url: string, init?: RequestInit): Promise<Response>;
 }
@@ -361,18 +404,26 @@ export function createGithubApi(options: GithubClientOptions = {}): GithubApi {
   }
 
   return {
-    async call(fn) {
+    async call(fn, input) {
       for (let attempt = 0; ; attempt += 1) {
         try {
           return await fn(await getClient());
         } catch (error) {
-          const status = (error as { status?: number }).status;
+          const status = errorStatus(error);
           if (status === 401 && attempt === 0 && client) {
             token = undefined;
             client = undefined;
             continue;
           }
-          throw error;
+          // 统一在这里成 GithubApiError：调用方（工具、诊断）拿到的是同一种错误形态，
+          // 不必各自去剥 status / message。
+          throw error instanceof GithubApiError
+            ? error
+            : new GithubApiError(`${describeHttpError(status)}: ${errorMessage(error)}`, {
+                status,
+                input,
+                cause: error,
+              });
         }
       }
     },
@@ -381,7 +432,7 @@ export function createGithubApi(options: GithubClientOptions = {}): GithubApi {
       for (let attempt = 0; ; attempt += 1) {
         const response = await rawFetchOnce(url, init);
         if (response.status !== 401 || attempt > 0) {
-          return response;
+          return ensureOk(response);
         }
         await response.body?.cancel();
       }
@@ -394,31 +445,22 @@ export interface GithubSearch {
 }
 
 /**
- * Create a search client backed by a cached octokit instance.
+ * Create a search client on top of a shared API accessor (见 `createGithubApi`)：
+ * 一个会话只应有一个 accessor，搜索 / checks / reads 共用同一份 octokit 与 token 缓存。
  */
-export function createGithubSearch(options: GithubClientOptions = {}): GithubSearch {
-  const api = createGithubApi(options);
-
+export function createGithubSearch(api: GithubApi): GithubSearch {
   return {
     async search(kind, params) {
       const limit = Math.min(Math.max(params.limit ?? 30, 1), 100);
-
-      try {
-        // `@me` 是 gh CLI 的简写，REST 搜索不认识：这里不展开，带关键词时它按字面量
-        // 进入查询串（无关键词的列表走 gh CLI，由 gh 自己展开）。
-        const q = buildSearchQuery(kind, { ...params, limit });
-        return await api.call(async (client) => {
-          const { data } = await client.rest.search.issuesAndPullRequests({
-            q,
-            per_page: limit,
-          });
-          return data.items.map((item) => normalize(parseWithSchema(searchItemSchema, item)));
+      // `@me` 是 gh CLI 的简写，REST 搜索不认识：这里不展开，它按字面量进入查询串。
+      const q = buildSearchQuery(kind, { ...params, limit });
+      return await api.call(async (client) => {
+        const { data } = await client.rest.search.issuesAndPullRequests({
+          q,
+          per_page: limit,
         });
-      } catch (error) {
-        const status = (error as { status?: number }).status;
-        const message = (error as { message?: string }).message ?? String(error);
-        throw new GithubSearchError(`${describeHttpError(status)}: ${message}`, params, status);
-      }
+        return data.items.map((item) => normalize(parseWithSchema(searchItemSchema, item)));
+      }, params);
     },
   };
 }
@@ -522,7 +564,7 @@ export interface GithubChecksClient {
 }
 
 /**
- * Create a client for PR CI checks, backed by a cached octokit instance.
+ * Create a client for PR CI checks on top of a shared API accessor.
  * Covers both check sources GitHub exposes for a commit — classic commit
  * statuses (Azure DevOps, Jenkins, ...) and check runs (GitHub Actions,
  * GitHub Apps) — so external CI is visible to the caller.
@@ -553,9 +595,7 @@ function toRunJob(job: ApiJob): RunJob {
   };
 }
 
-export function createGithubChecks(options: GithubClientOptions = {}): GithubChecksClient {
-  const api = createGithubApi(options);
-
+export function createGithubChecks(api: GithubApi): GithubChecksClient {
   return {
     async statuses(owner, repo, ref, signal) {
       const { data } = await api.call((octokit) =>

package/src/lib/model-call.ts

@@ -25,6 +25,8 @@ import {
   type UserMessage,
 } from "@earendil-works/pi-ai";
 
+import { withTimeoutSignal } from "./abort.js";
+
 /**
  * 模型注册表操作：扩展传 `ctx.modelRegistry`，测试传 mock。
  * 结构化类型（duck typing），只声明用到的两个方法。
@@ -58,12 +60,6 @@ export interface CompleteTextResult {
   usage: Usage;
 }
 
-/** 合并调用方 signal 与本地超时；调用方未传时仍然有超时兜底 */
-function withTimeout(signal: AbortSignal | undefined, ms: number): AbortSignal {
-  const timeout = AbortSignal.timeout(ms);
-  return signal ? AbortSignal.any([signal, timeout]) : timeout;
-}
-
 /**
  * 用给定模型生成正文。`registry.complete` 抛出的错误原样向上抛（含
  * `AbortError`），取消与失败的区分由调用方决定。
@@ -79,7 +75,7 @@ export async function completeText(options: CompleteTextOptions): Promise<Comple
     },
     {
       maxTokens: options.maxTokens ?? options.model.maxTokens,
-      signal: withTimeout(options.signal, options.timeoutMs),
+      signal: withTimeoutSignal(options.signal, options.timeoutMs),
     },
   );
   const text = contentText(result.content).trim();

package/src/lib/tools-config.ts

@@ -25,6 +25,8 @@ import { minimatch } from "minimatch";
 import { Type } from "typebox";
 import { Value } from "typebox/value";
 
+import { isRecord } from "./narrow.js";
+
 // ── schema ───────────────────────────────────────────────────────────────────
 
 const fileIoSchema = Type.Union([Type.Literal("claude-code"), Type.Literal("opencode")]);
@@ -88,10 +90,6 @@ export const DEFAULT_FILE_IO: FileIoToolset = "claude-code";
 
 // ── 读取与解析 ───────────────────────────────────────────────────────────────
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
 function parseFileIo(value: unknown, field: string, warnings: string[]): FileIoToolset | undefined {
   if (value === undefined) {
     return undefined;

package/src/opencode/bash.ts

@@ -1,5 +1,4 @@
 import { readFileSync } from "node:fs";
-import { readFile } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 
 import type { ExtensionAPI, TruncationResult } from "@earendil-works/pi-coding-agent";
@@ -12,53 +11,23 @@ import {
   formatElapsedSeconds,
   sandboxHintBlock,
 } from "../bwrap/runtime.js";
+import {
+  BASH_DEFAULT_TIMEOUT_MS,
+  BASH_MAX_TIMEOUT_MS,
+  bashStructuredSchema,
+  spilledOutput,
+} from "../lib/bash-tool.js";
 import { resolveWorkdir } from "../lib/path.js";
 import { createRequestPolicy } from "../lib/request-policy.js";
 import { defineStructuredTool, type ToolBus } from "../lib/tool-bus.js";
 import { registerToolsOnSessionStart } from "../lib/tool-registration.js";
 
-const DEFAULT_TIMEOUT_MS = 120_000;
-const MAX_TIMEOUT_MS = 7_200_000;
-
 /** 对齐上游 opencode 的截断提示文案（tools/BashTool/bash.ts）。 */
 const CAPTURE_TRUNCATED_NOTICE = "[output capture truncated at the in-memory safety limit]";
 
 /** Bash tool guidance, kept in markdown so it reads like documentation. */
 const BASH_PROMPT = readFileSync(fileURLToPath(new URL("bash.md", import.meta.url)), "utf8").trim();
 
-/**
- * `bash` 的结构化结果：只有退出码与完整输出——命令非零退出不是失败，所以载荷里没有成败
- * 标志，脚本直接读 `exitCode` 分支；超时/中止时 `exitCode` 为 `null`（原因在模型侧文本里）。
- */
-const bashStructuredSchema = Type.Object({
-  exitCode: Type.Union([Type.Number(), Type.Null()], {
-    description: "Exit code of the command; null when it was killed (timeout or abort)",
-  }),
-  output: Type.String({
-    description:
-      "Complete output of the command (stdout and stderr merged). Never truncated, never mixed with tool-added notices.",
-  }),
-});
-
-/**
- * 载荷里的输出：文本被截断时读回落盘的完整输出（读不到就退回那份截断文本），
- * 因此脚本拿到的永远是命令真正输出的内容。
- */
-async function fullOutput(
-  output: string,
-  truncation: TruncationResult,
-  spillPath: string | undefined,
-): Promise<string> {
-  if (spillPath === undefined || !truncation.truncated) {
-    return output;
-  }
-  try {
-    return await readFile(spillPath, "utf8");
-  } catch {
-    return output;
-  }
-}
-
 /** opencode 风格截断提示（成功、超时、中断路径共用）。 */
 function appendTruncationNotice(
   text: string,
@@ -127,9 +96,9 @@ export function registerBashTool(bus: ToolBus, pi: ExtensionAPI, runtime: BwrapR
         { additionalProperties: false },
       ),
       async execute(id, params, signal, onUpdate, ctx) {
-        const timeout = params.timeout ?? DEFAULT_TIMEOUT_MS;
-        if (!Number.isFinite(timeout) || timeout <= 0 || timeout > MAX_TIMEOUT_MS) {
-          throw new Error(`timeout must be between 1 and ${MAX_TIMEOUT_MS} milliseconds`);
+        const timeout = params.timeout ?? BASH_DEFAULT_TIMEOUT_MS;
+        if (!Number.isFinite(timeout) || timeout <= 0 || timeout > BASH_MAX_TIMEOUT_MS) {
+          throw new Error(`timeout must be between 1 and ${BASH_MAX_TIMEOUT_MS} milliseconds`);
         }
 
         const cwd = params.workdir ? await resolveWorkdir(params.workdir, ctx.cwd) : ctx.cwd;
@@ -175,7 +144,7 @@ export function registerBashTool(bus: ToolBus, pi: ExtensionAPI, runtime: BwrapR
                 ok: true as const,
                 value: {
                   exitCode: null,
-                  output: await fullOutput(
+                  output: await spilledOutput(
                     error.partial.output,
                     error.partial.truncation,
                     error.partial.fullOutputPath,
@@ -208,7 +177,7 @@ export function registerBashTool(bus: ToolBus, pi: ExtensionAPI, runtime: BwrapR
             ok: true as const,
             value: {
               exitCode: result.exitCode,
-              output: await fullOutput(result.output, result.truncation, result.fullOutputPath),
+              output: await spilledOutput(result.output, result.truncation, result.fullOutputPath),
             },
           },
         };

package/src/opencode/glob.ts

@@ -21,7 +21,7 @@ import { Type } from "typebox";
 import type { ToolBus } from "../lib/tool-bus.js";
 import { registerToolsOnSessionStart } from "../lib/tool-registration.js";
 import { didYouMean } from "./files.js";
-import { RIPGREP_RESULT_LIMIT, runRipgrep } from "./ripgrep.js";
+import { normalizeRipgrepPath, RIPGREP_RESULT_LIMIT, runRipgrep } from "./ripgrep.js";
 
 /** Tool guidance, kept in markdown so it reads like documentation. */
 const GLOB_PROMPT = readFileSync(fileURLToPath(new URL("glob.md", import.meta.url)), "utf8").trim();
@@ -30,11 +30,6 @@ export function buildGlobArgs(pattern: string): string[] {
   return ["--no-config", "--files", `--glob=${pattern}`, "--glob=!**/.git/**", "."];
 }
 
-/** rg --files 输出的路径：去掉前导 `./`，分隔符统一成 `/`。 */
-function normalizeRipgrepPath(text: string): string {
-  return text.replace(/^(?:\.[\\/])+/u, "").replaceAll("\\", "/");
-}
-
 export function renderGlobOutput(files: readonly string[], truncated: boolean): string {
   if (files.length === 0) {
     return "No files found";

package/src/opencode/grep.ts

@@ -24,7 +24,7 @@ import { parseWithSchema } from "../lib/parse-with-schema.js";
 import type { ToolBus } from "../lib/tool-bus.js";
 import { registerToolsOnSessionStart } from "../lib/tool-registration.js";
 import { didYouMean } from "./files.js";
-import { RIPGREP_RESULT_LIMIT, runRipgrep } from "./ripgrep.js";
+import { normalizeRipgrepPath, RIPGREP_RESULT_LIMIT, runRipgrep } from "./ripgrep.js";
 
 /** Tool guidance, kept in markdown so it reads like documentation. */
 const GREP_PROMPT = readFileSync(fileURLToPath(new URL("grep.md", import.meta.url)), "utf8").trim();
@@ -51,11 +51,6 @@ export interface GrepMatch {
   text: string;
 }
 
-/** rg 输出的路径：去掉前导 `./`，分隔符统一成 `/`。 */
-function normalizeRipgrepPath(text: string): string {
-  return text.replace(/^(?:\.[\\/])+/u, "").replaceAll("\\", "/");
-}
-
 /** 行文本：去掉行尾换行，超长截断（不留半个 surrogate pair）。 */
 function normalizeLineText(text: string): string {
   const line = text.replace(/[\r\n]+$/u, "");

package/src/opencode/ripgrep.ts

@@ -12,6 +12,11 @@ import { spawn } from "node:child_process";
 /** 单次搜索最多返回的结果数（上游 limit = 100）。 */
 export const RIPGREP_RESULT_LIMIT = 100;
 
+/** rg 输出的路径：去掉前导 `./`，分隔符统一成 `/`。 */
+export function normalizeRipgrepPath(text: string): string {
+  return text.replace(/^(?:\.[\\/])+/u, "").replaceAll("\\", "/");
+}
+
 /** stderr 最多保留的字节数（上游 ERROR_BYTES）。 */
 const ERROR_BYTES = 8 * 1024;
 

package/src/web/fetch.ts

@@ -21,6 +21,7 @@ import { parseHTML } from "linkedom";
 import TurndownService from "turndown";
 import { Type } from "typebox";
 
+import { withTimeoutSignal } from "../lib/abort.js";
 import { egress } from "../lib/egress.js";
 import { resolvePathArg } from "../lib/path.js";
 import { createRequestPolicy } from "../lib/request-policy.js";
@@ -120,11 +121,6 @@ export async function assertPublicHostname(
   }
 }
 
-function withTimeout(signal: AbortSignal | undefined, ms: number): AbortSignal {
-  const timeout = AbortSignal.timeout(ms);
-  return signal ? AbortSignal.any([signal, timeout]) : timeout;
-}
-
 interface FetchedPage {
   url: string;
   title: string;
@@ -150,7 +146,7 @@ async function fetchWithRedirects(
     await assertPublicHostname(current.hostname);
     const response = await fetchFn(current, {
       redirect: "manual",
-      signal: withTimeout(signal, TIMEOUT_MS),
+      signal: withTimeoutSignal(signal, TIMEOUT_MS),
       headers: { "user-agent": "Mozilla/5.0 (compatible; pi-web-fetch/1.0)" },
     });
     const location = response.headers.get("location");

package/src/web/search.ts

@@ -11,6 +11,7 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { Value } from "typebox/value";
 
+import { withTimeoutSignal } from "../lib/abort.js";
 import { egress } from "../lib/egress.js";
 import type { ToolBus } from "../lib/tool-bus.js";
 import { registerToolsOnSessionStart } from "../lib/tool-registration.js";
@@ -143,11 +144,6 @@ function mapHits(
 }
 
 /** 合并调用方 signal 与超时；调用方未传时仍有超时兜底 */
-function withTimeout(signal: AbortSignal | undefined, ms: number): AbortSignal {
-  const timeout = AbortSignal.timeout(ms);
-  return signal ? AbortSignal.any([signal, timeout]) : timeout;
-}
-
 export async function searchWeb(
   query: string,
   apiKey: string,
@@ -160,7 +156,7 @@ export async function searchWeb(
       "Content-Type": "application/json",
     },
     body: JSON.stringify(buildSearchBody(query, options)),
-    signal: withTimeout(options.signal, TIMEOUT_MS),
+    signal: withTimeoutSignal(options.signal, TIMEOUT_MS),
   });
 
   const raw = await response.text();

package/src/orphan-worker-cleaner.ts

@@ -1,38 +0,0 @@
-/**
- * orphan-worker-cleaner —— 宿主消失时让 pi SDK worker 自行退出
- *
- * VS Code 的 pi 扩展（Pendant）用 fork 启动 dist/pi-sdk-worker.cjs 承载 pi SDK。
- * 宿主进程消失时 worker 不会退出：worker 侧只把 IPC 断连当成可重试的传输错误
- * 上报，既不清理也不自杀，于是留下 ppid=1 的孤儿，连同它拉起的 language server
- * （实测单个 worker 身上挂 4 GiB 上下）一起常驻。
- *
- * 这里只做一件事：定时看一眼自己的父进程还在不在（父进程退出后会被 init 收养，
- * ppid 变成 1），不在就退出。worker 一退，它拉起的 language server 会因为 stdin
- * 关闭自行退出，language server 退出时（process.on("exit") → shutdown()）又会
- * kill 掉自己 fork 的 tsserver，整棵树随之消失 —— 所以不需要遍历或清理别的进程。
- *
- * 只对 fork 出来的 SDK worker 生效（process.channel 存在）：CLI 直跑、以及 pi
- * 内部 spawn 出来的进程都没有 IPC channel，不在此列，不会被误伤。
- */
-
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-
-/** 检查父进程是否还在的间隔 */
-export const DEFAULT_CHECK_INTERVAL_MS = 5_000;
-
-export default function orphanWorkerCleaner(pi: ExtensionAPI): void {
-  if (process.channel === undefined) {
-    return;
-  }
-  const timer = setInterval(() => {
-    if (process.ppid === 1) {
-      // eslint-disable-next-line unicorn/no-process-exit -- 宿主已经没了，worker 必须整体退出
-      process.exit(0);
-    }
-  }, DEFAULT_CHECK_INTERVAL_MS);
-  timer.unref();
-
-  pi.on("session_shutdown", () => {
-    clearInterval(timer);
-  });
-}