@trim21/personal-pi-extensions 0.1.597 → 0.1.599

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.1.597",
+  "version": "0.1.599",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [
@@ -37,8 +37,8 @@
   },
   "devDependencies": {
     "@earendil-works/pi-agent-core": ">=0.84.1",
-    "@earendil-works/pi-ai": "^0.84.1",
-    "@earendil-works/pi-coding-agent": "^0.84.1",
+    "@earendil-works/pi-ai": ">=0.84.1",
+    "@earendil-works/pi-coding-agent": ">=0.84.1",
     "@eslint/js": "10.0.1",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^24.13.3",
@@ -60,7 +60,7 @@
     "lint-staged": "^17.3.0",
     "prettier": "^3.9.6",
     "shlex": "^3.0.0",
-    "typebox": "1.3.1",
+    "typebox": ">=1.3.1",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
     "typescript-eslint": "^8.67.0",
     "vitest": "^5.0.0"
@@ -108,7 +108,7 @@
     "minimatch": "^10.2.6",
     "octokit": "^5.0.5",
     "turndown": "^7.2.0",
-    "undici": "^7.29.0",
+    "undici": "^8.0.0",
     "vscode-jsonrpc": "^9.0.1",
     "vscode-languageserver-types": "^3.18.0",
     "web-tree-sitter": "^0.27.0"

package/src/lib/proxy.ts

@@ -21,7 +21,7 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 
 import { Type } from "typebox";
-import { EnvHttpProxyAgent } from "undici";
+import { EnvHttpProxyAgent, fetch as undiciFetch } from "undici";
 
 import { parseWithSchema } from "./parse-with-schema.js";
 
@@ -144,17 +144,15 @@ export function proxyEnvVars(settings: HttpProxySettings): NodeJS.ProcessEnv {
  * `agent` 选项，@octokit/request 的选项里没有这个字段，也没有任何地方把它转交给
  * fetch），所以代理只能从 fetch 挂进去。
  */
-function createProxyDispatcher(
-  proxy: string,
-  noProxy: string | undefined,
-): NonNullable<RequestInit["dispatcher"]> {
-  // undici 包与 Node 全局 fetch 各带一份 Dispatcher 类型声明（@types/node 走
-  // undici-types），结构一致但 compose 重载对不上，这里只做类型层面的转换。
+function createProxyDispatcher(proxy: string, noProxy: string | undefined): EnvHttpProxyAgent {
   return new EnvHttpProxyAgent({
     httpProxy: proxy,
     httpsProxy: proxy,
+    // undici 8 起只有 https 目标默认走 CONNECT 隧道，http 目标改为 absolute-form
+    // 转发；这里保持隧道语义统一，http 与 https 一律 CONNECT。
+    proxyTunnel: true,
     ...(noProxy && { noProxy }),
-  }) as unknown as NonNullable<RequestInit["dispatcher"]>;
+  });
 }
 
 export interface HttpProxy {
@@ -162,14 +160,15 @@ export interface HttpProxy {
   readonly settings: HttpProxySettings;
   /** 要注入 gh 子进程的代理环境变量；未配置代理时为空对象。 */
   readonly env: NodeJS.ProcessEnv;
-  /** 走代理的 fetch；未配置代理时就是全局 fetch。 */
+  /** 请求用的 fetch：undici 的 fetch，配置了代理时挂上 dispatcher。 */
   readonly fetch: typeof globalThis.fetch;
 }
 
 /**
- * 读一次配置并组装代理层。缓存的是 dispatcher（连接池复用），**不是**
- * `globalThis.fetch` 本身：每次调用都取当前的全局 fetch，否则首个请求之后替换
- * `globalThis.fetch`（插桩、测试替身）就不再生效。
+ * 读一次配置并组装代理层。请求一律走 undici 自己的 fetch——undici 8 的 dispatcher
+ * 换了 handler 协议，Node 全局 fetch 挂不上它（抛 `invalid onRequestStart method`），
+ * 所以测试替身 mock undici 的 fetch 即可覆盖全部请求。缓存的是 dispatcher（连接池
+ * 复用），不是 fetch 本身。
  */
 export function createHttpProxy(
   configPath: string = proxyConfigPath(),
@@ -177,13 +176,20 @@ export function createHttpProxy(
 ): HttpProxy {
   const settings = readProxySettings(configPath, env);
   const { proxy, noProxy } = settings;
-  let dispatcher: NonNullable<RequestInit["dispatcher"]> | undefined;
+  let dispatcher: EnvHttpProxyAgent | undefined;
 
-  const fetch: typeof globalThis.fetch = (input, init) => {
-    if (!proxy) return globalThis.fetch(input, init);
+  const fetch: typeof undiciFetch = (input, init) => {
+    if (!proxy) return undiciFetch(input, init);
     dispatcher ??= createProxyDispatcher(proxy, noProxy);
-    return globalThis.fetch(input, { ...init, dispatcher });
+    return undiciFetch(input, { ...init, dispatcher });
   };
 
-  return { settings, env: proxyEnvVars(settings), fetch };
+  return {
+    settings,
+    env: proxyEnvVars(settings),
+    // undici 的 fetch 与 Node 全局 fetch（@types/node 走 undici-types）各带一份
+    // Request/Response 类型声明，结构一致但对不上；调用方只传 string | URL，
+    // 这里只做类型层面的转换。
+    fetch: fetch as typeof globalThis.fetch,
+  };
 }