claude-codex-wechat 0.1.16 → 0.1.17

package/README.md

@@ -47,7 +47,7 @@
 ### 作为 npm 包安装
 
 ```bash
-npm install -g claude-codex-wechat
+npm install -g claude-codex-wechat --registry=https://registry.npmmirror.com/
 # 或
 pnpm add -g claude-codex-wechat
 ```

package/dist/server/cli.js

@@ -2377,6 +2377,9 @@ function terminateChild(child, signal = "SIGTERM") {
 function defaultWorkspaceDir() {
   return join8(tmpdir(), "project");
 }
+function useShellForCli() {
+  return isWindows;
+}
 function statePath(filename) {
   return join8(tmpdir(), filename);
 }
@@ -2551,7 +2554,7 @@ function parseJsonLine(line) {
   }
 }
 function defaultClaudeStreamSpawner(call) {
-  const child = spawn2(call.command, call.args, { cwd: expandTilde(call.cwd) ?? call.cwd, stdio: ["pipe", "pipe", "pipe"] });
+  const child = spawn2(call.command, call.args, { cwd: expandTilde(call.cwd) ?? call.cwd, stdio: ["pipe", "pipe", "pipe"], shell: useShellForCli() });
   let stderr = "";
   let buffer = "";
   const queue = [];
@@ -2663,7 +2666,8 @@ var CodexAppServerClient = class {
     const command = input.command ?? "codex";
     this.child = spawn3(command, ["app-server", "--listen", "stdio://"], {
       cwd: input.cwd,
-      stdio: ["pipe", "pipe", "pipe"]
+      stdio: ["pipe", "pipe", "pipe"],
+      shell: useShellForCli()
     });
     this.child.stdout.on("data", (chunk) => this.onStdout(String(chunk)));
     this.child.stderr.on("data", () => {
@@ -3070,7 +3074,7 @@ function createDefaultProviders(input = {}) {
 import { spawn as spawn4 } from "node:child_process";
 async function defaultCommandRunner(command, args) {
   return await new Promise((resolve2) => {
-    const child = spawn4(command, args, { stdio: ["ignore", "pipe", "pipe"] });
+    const child = spawn4(command, args, { stdio: ["ignore", "pipe", "pipe"], shell: useShellForCli() });
     let stdout = "";
     let stderr = "";
     child.stdout.on("data", (chunk) => {
@@ -3106,7 +3110,7 @@ ${result.stderr}`) };
 import { spawn as spawn5 } from "node:child_process";
 async function defaultCodexCommandRunner(command, args) {
   return await new Promise((resolve2) => {
-    const child = spawn5(command, args, { stdio: ["ignore", "pipe", "pipe"] });
+    const child = spawn5(command, args, { stdio: ["ignore", "pipe", "pipe"], shell: useShellForCli() });
     let stdout = "";
     let stderr = "";
     child.stdout.on("data", (chunk) => {
@@ -4456,7 +4460,7 @@ function attachStaticFrontend(webRoot2) {
 }
 
 // src/daemon/service.ts
-import { existsSync as existsSync9, statSync } from "node:fs";
+import { existsSync as existsSync9, statSync, openSync, closeSync, watchFile } from "node:fs";
 import { mkdir as mkdir4, readFile as readFile6, rm as rm2, writeFile as writeFile5 } from "node:fs/promises";
 import { homedir as homedir8 } from "node:os";
 import { dirname as dirname11, join as join11 } from "node:path";
@@ -4485,6 +4489,9 @@ async function installService(context) {
     await runSystemctl(["--user", "enable", "--now", spec.unitName]);
     return await readServiceStatus(context);
   }
+  if (process.platform === "win32") {
+    return await startService(context);
+  }
   throw new Error("service_install_not_supported_on_this_platform");
 }
 async function startService(context) {
@@ -4501,6 +4508,15 @@ async function startService(context) {
     await runSystemctl(["--user", "start", spec.unitName]);
     return await readServiceStatus(context);
   }
+  if (process.platform === "win32") {
+    const spec = buildProcessSpec(context);
+    const existingPid = await readPidFile(spec.pidPath);
+    if (existingPid !== null && isProcessAlive(existingPid)) {
+      return await readServiceStatus(context);
+    }
+    await spawnDetachedDaemon(spec);
+    return await readServiceStatus(context);
+  }
   throw new Error("service_start_not_supported_on_this_platform");
 }
 async function stopService(context) {
@@ -4516,6 +4532,15 @@ async function stopService(context) {
     await runSystemctl(["--user", "stop", spec.unitName]).catch(() => void 0);
     return await readServiceStatus(context);
   }
+  if (process.platform === "win32") {
+    const spec = buildProcessSpec(context);
+    const pid = await readPidFile(spec.pidPath);
+    if (pid !== null && isProcessAlive(pid)) {
+      await killPid(pid).catch(() => void 0);
+    }
+    await removePidFile(spec.pidPath);
+    return await readServiceStatus(context);
+  }
   throw new Error("service_stop_not_supported_on_this_platform");
 }
 async function uninstallService(context) {
@@ -4536,6 +4561,9 @@ async function uninstallService(context) {
     }
     return await readServiceStatus(context);
   }
+  if (process.platform === "win32") {
+    return await stopService(context);
+  }
   throw new Error("service_uninstall_not_supported_on_this_platform");
 }
 async function restartService(context) {
@@ -4551,6 +4579,10 @@ async function restartService(context) {
     await runSystemctl(["--user", "restart", spec.unitName]);
     return await readServiceStatus(context);
   }
+  if (process.platform === "win32") {
+    await stopService(context);
+    return await startService(context);
+  }
   throw new Error("service_restart_not_supported_on_this_platform");
 }
 async function readServiceLogs(context, lines = 120) {
@@ -4598,6 +4630,21 @@ async function readServiceStatus(context) {
       stderrPath: spec.stderrPath
     };
   }
+  if (process.platform === "win32") {
+    const spec = buildProcessSpec(context);
+    const pid = await readPidFile(spec.pidPath);
+    const installed = pid !== null;
+    const running = pid !== null && isProcessAlive(pid);
+    return {
+      manager: "process",
+      installed,
+      running,
+      serviceFilePath: spec.pidPath,
+      label: "claude-codex-wechat",
+      stdoutPath: spec.stdoutPath,
+      stderrPath: spec.stderrPath
+    };
+  }
   throw new Error("service_status_not_supported_on_this_platform");
 }
 function buildLaunchdSpec(context) {
@@ -4624,6 +4671,17 @@ function buildSystemdUserSpec(context) {
     environment: buildServiceEnvironment(context)
   };
 }
+function buildProcessSpec(context) {
+  const stateDir = join11(homedir8(), ".claude-codex-wechat");
+  return {
+    pidPath: join11(stateDir, "service.pid"),
+    command: [context.nodePath ?? process.execPath, context.cliEntrypointPath, "__daemon"],
+    workingDirectory: homedir8(),
+    stdoutPath: join11(stateDir, "logs", "service.stdout.log"),
+    stderrPath: join11(stateDir, "logs", "service.stderr.log"),
+    environment: buildServiceEnvironment(context)
+  };
+}
 function buildServiceEnvironment(context) {
   const env = {
     PATH: process.env.PATH ?? "",
@@ -4721,6 +4779,66 @@ async function runLaunchctl(args) {
 async function runSystemctl(args) {
   await execFileAsync("systemctl", args);
 }
+function isProcessAlive(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error.code === "EPERM";
+  }
+}
+async function readPidFile(pidPath) {
+  if (!existsSync9(pidPath)) return null;
+  try {
+    const raw = (await readFile6(pidPath, "utf8")).trim();
+    const pid = Number.parseInt(raw, 10);
+    return Number.isInteger(pid) && pid > 0 ? pid : null;
+  } catch {
+    return null;
+  }
+}
+async function writePidFile(pidPath, pid) {
+  await mkdir4(dirname11(pidPath), { recursive: true });
+  await writeFile5(pidPath, `${pid}
+`, "utf8");
+}
+async function removePidFile(pidPath) {
+  await rm2(pidPath, { force: true });
+}
+async function killPid(pid) {
+  if (process.platform === "win32") {
+    await execFileAsync("taskkill", ["/PID", String(pid), "/T", "/F"]);
+    return;
+  }
+  process.kill(pid, "SIGTERM");
+}
+async function spawnDetachedDaemon(spec) {
+  await mkdir4(dirname11(spec.stdoutPath), { recursive: true });
+  const outFd = openSync(spec.stdoutPath, "a");
+  const errFd = openSync(spec.stderrPath, "a");
+  try {
+    const [command, ...args] = spec.command;
+    const child = spawn6(command, args, {
+      cwd: spec.workingDirectory,
+      // Windows 分离进程需继承完整 process.env（SystemRoot/APPDATA/PATHEXT 等），
+      // 否则子进程及其拉起的 claude/codex 会异常；spec.environment 仅作 BRIDGE_* 等覆盖层。
+      env: { ...process.env, ...spec.environment },
+      detached: true,
+      windowsHide: true,
+      stdio: ["ignore", outFd, errFd]
+    });
+    if (typeof child.pid !== "number") {
+      throw new Error("service_spawn_failed");
+    }
+    await writePidFile(spec.pidPath, child.pid);
+    child.unref();
+    return child.pid;
+  } finally {
+    closeSync(outFd);
+    closeSync(errFd);
+  }
+}
 async function ensureFileExists(path, errorCode) {
   if (!existsSync9(path)) throw new Error(errorCode);
   await readFile6(path, "utf8");
@@ -4731,29 +4849,46 @@ async function tailFile(path, lines) {
   return content.split(/\r?\n/).slice(-lines).join("\n").trim();
 }
 async function tailFiles(paths) {
-  const readers = paths.filter((path) => existsSync9(path)).map((path) => {
-    const rl = createInterface({
-      input: createReadStream(path, { encoding: "utf8", start: Math.max(0, fileSizeHint(path) - 8192) }),
-      crlfDelay: Infinity
-    });
-    rl.on("line", (line) => {
-      process.stdout.write(`[${path}] ${line}
+  const existing = paths.filter((path) => existsSync9(path));
+  for (const path of existing) {
+    const tail = await tailFile(path, 200);
+    if (tail) process.stdout.write(`[${path}]
+${tail}
 `);
+  }
+  if (process.platform === "linux" || process.platform === "darwin") {
+    const child = spawn6("tail", ["-f", ...existing], { stdio: ["ignore", "pipe", "inherit"] });
+    child.stdout.on("data", (chunk) => {
+      process.stdout.write(String(chunk));
+    });
+    await new Promise((resolve2, reject) => {
+      child.on("exit", () => resolve2());
+      child.on("error", reject);
     });
-    return rl;
-  });
-  if (process.platform !== "linux" && process.platform !== "darwin") {
     return;
   }
-  const child = spawn6("tail", ["-f", ...paths.filter((path) => existsSync9(path))], { stdio: ["ignore", "pipe", "inherit"] });
-  child.stdout.on("data", (chunk) => {
-    process.stdout.write(String(chunk));
-  });
-  await new Promise((resolve2, reject) => {
-    child.on("exit", () => resolve2());
-    child.on("error", reject);
-  }).finally(() => {
-    for (const reader of readers) reader.close();
+  const offsets = new Map(existing.map((path) => [path, fileSizeHint(path)]));
+  for (const path of existing) {
+    watchFile(path, { interval: 1e3 }, (curr) => {
+      const prevSize = offsets.get(path) ?? 0;
+      if (curr.size < prevSize) {
+        offsets.set(path, 0);
+        return;
+      }
+      if (curr.size === prevSize) return;
+      const start = prevSize;
+      offsets.set(path, curr.size);
+      const rl = createInterface({
+        input: createReadStream(path, { encoding: "utf8", start, end: curr.size - 1 }),
+        crlfDelay: Infinity
+      });
+      rl.on("line", (line) => {
+        process.stdout.write(`[${path}] ${line}
+`);
+      });
+    });
+  }
+  await new Promise(() => {
   });
 }
 function fileSizeHint(path) {
@@ -4882,6 +5017,7 @@ function cmdInit() {
 `, "utf8");
   console.log(`\u5DF2\u521B\u5EFA\u914D\u7F6E: ${configPath}`);
   console.log("\u8BF7\u586B\u5165\u5FAE\u4FE1 token / accountId \u540E\u8FD0\u884C: claude-codex-wechat start");
+  console.log("\u9996\u6B21\u542F\u52A8\u65F6\u5C06\u81EA\u52A8\u751F\u6210 relay \u63A5\u5165\u51ED\u636E\uFF08tunnel.relay.authToken\uFF09\u5E76\u5199\u56DE\u914D\u7F6E\uFF0C\u65E0\u9700\u624B\u52A8\u586B\u5199\u3002");
 }
 async function cmdDoctor() {
   const configPath = process.env.BRIDGE_CONFIG ?? defaultConfigPath();
@@ -4956,6 +5092,11 @@ function printUsage() {
 
 \u73AF\u5883\u53D8\u91CF:
   BRIDGE_PORT    \u76D1\u542C\u7AEF\u53E3\uFF08\u9ED8\u8BA4 8787\uFF09
-  BRIDGE_CONFIG  \u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84\uFF08\u9ED8\u8BA4 ~/.claude-codex-wechat/config.json\uFF09`);
+  BRIDGE_CONFIG  \u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84\uFF08\u9ED8\u8BA4 ~/.claude-codex-wechat/config.json\uFF09
+
+\u5E73\u53F0\u8BF4\u660E:
+  macOS \u7528 launchd\u3001Linux \u7528 systemd --user \u6258\u7BA1\uFF0C\u767B\u5F55\u81EA\u542F\u4E14\u5D29\u6E83\u81EA\u52A8\u91CD\u542F\u3002
+  Windows \u91C7\u7528\u540E\u53F0\u8FDB\u7A0B + PID \u6587\u4EF6\u6258\u7BA1\uFF08\u514D\u7BA1\u7406\u5458\uFF09\uFF0C\u4E0D\u968F\u5F00\u673A\u81EA\u542F\uFF0C
+  \u91CD\u542F\u7535\u8111\u540E\u9700\u91CD\u65B0\u8FD0\u884C start\u3002`);
 }
 await main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-codex-wechat",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "private": false,
   "type": "module",
   "bin": {