@trim21/personal-pi-extensions 0.1.690 → 0.1.692

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);
-  });
-}