@trim21/personal-pi-extensions 0.1.441 → 0.1.443

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trim21/personal-pi-extensions",
-  "version": "0.1.441",
+  "version": "0.1.443",
   "type": "module",
   "description": "Custom pi coding-agent extensions: bwrap sandbox, workspace guard, opencode edit, and more",
   "keywords": [
@@ -24,6 +24,7 @@
     "test": "vitest run",
     "test:coverage": "vitest run --coverage",
     "sandbox": "tsx bin/sandbox.ts",
+    "build:holder": "esbuild src/bwrap/holder.ts --format=esm --target=node24 --outfile=src/bwrap/holder.js",
     "prepare": "husky"
   },
   "peerDependencies": {
@@ -42,6 +43,7 @@
     "@types/turndown": "^5.0.6",
     "@typescript/native": "npm:typescript@^7.0.2",
     "@vitest/coverage-v8": "^4.1.10",
+    "esbuild": "^0.28.2",
     "eslint": "^10.8.1",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-erasable-syntax-only": "0.7.1",

package/src/bwrap/holder.js

@@ -0,0 +1,47 @@
+import { spawn } from "node:child_process";
+import { dirname } from "node:path";
+import { setTimeout as sleep } from "node:timers/promises";
+const args = process.argv.slice(2);
+const configPath = args[0];
+const mihomoPath = args[1];
+if (!configPath || !mihomoPath) {
+  process.exit(2);
+}
+function tap0Exists() {
+  return new Promise((resolve) => {
+    const child = spawn("ip", ["link", "show", "tap0"], { stdio: "ignore" });
+    child.once("exit", (code) => resolve(code === 0));
+    child.once("error", () => resolve(false));
+  });
+}
+async function waitFor(attempts, delayMs, predicate) {
+  for (let i = 0; i < attempts; i++) {
+    if (await predicate()) return true;
+    await sleep(delayMs);
+  }
+  return false;
+}
+async function main() {
+  await waitFor(100, 100, tap0Exists);
+  const mihomo = spawn(mihomoPath, ["-d", dirname(configPath), "-f", configPath], {
+    stdio: ["ignore", "inherit", "inherit"]
+  });
+  const stop = () => {
+    mihomo.kill("SIGTERM");
+  };
+  process.on("SIGTERM", () => {
+    stop();
+    process.exit(0);
+  });
+  process.on("SIGINT", () => {
+    stop();
+    process.exit(0);
+  });
+  await new Promise((resolve) => mihomo.once("exit", () => resolve()));
+}
+try {
+  await main();
+} catch (error) {
+  console.error(error);
+  process.exit(1);
+}

package/src/bwrap/network-stack.ts

@@ -44,7 +44,9 @@ export interface NetworkStackExecOptions {
 }
 
 const NAMESERVER_PATTERN = /^\s*nameserver\s+(\S+)/;
-const HOLDER_PATH = fileURLToPath(new URL("holder.ts", import.meta.url));
+// 构建产物 holder.js（esbuild 编译）：node 对 node_modules 下的 .ts 拒绝 type stripping，
+// 扩展从 npm 包加载时 holder.ts 落在 node_modules 下，直接运行会 ERR_UNSUPPORTED_NODE_MODULES_TYPE_STRIPPING
+const HOLDER_PATH = fileURLToPath(new URL("holder.js", import.meta.url));
 // ip 通常位于 /usr/sbin 或 /sbin，进程默认 PATH 不含它们；node 则依赖宿主完整 PATH
 const SBIN_PATH_SUFFIX = "/usr/local/sbin:/usr/sbin:/sbin";