claude-codex-wechat 0.1.16 → 0.1.18

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
 ```
@@ -64,26 +64,24 @@ pnpm add -g claude-codex-wechat
 安装后按以下顺序跑通：
 
 ```bash
-# 1. 生成默认配置
-claude-codex-wechat init
-
-# 2. 编辑 ~/.claude-codex-wechat/config.json，填入微信 token / accountId
-#    （配置说明见下方「配置」一节）
-
-# 3. 检查环境（配置、前端产物、claude/codex 是否就绪）
-claude-codex-wechat doctor
-
-# 4. 后台启动（首次会自动注册为系统服务并守护运行）
+# 1. 后台启动（首次会自动注册为系统服务并守护运行；
+#    首次启动自动生成 relay 接入凭据、自动连接默认中转，无需手动配置）
 claude-codex-wechat start
 
-# 5. 查看状态 / 日志
+# 2. 打开管理页，用微信扫码登录完成绑定
+#    http://127.0.0.1:8787
+
+# 3. 查看状态 / 日志
 claude-codex-wechat status
 claude-codex-wechat logs
+
+# 可选：检查环境（配置、前端产物、claude/codex 是否就绪）
+claude-codex-wechat doctor
 ```
 
 启动后：
 
-- 管理页：`http://127.0.0.1:8787`
+- 管理页：`http://127.0.0.1:8787`（在此扫码登录微信）
 - 微信侧即可直接给机器人发消息，驱动本机 `Claude Code` / `Codex CLI` 会话
 
 停止 / 重启 / 卸载：
@@ -119,8 +117,6 @@ pnpm install
   - 打印 / 实时跟随日志
 - `claude-codex-wechat doctor`
   - 检查配置、前端产物、`claude`/`codex` 可执行文件
-- `claude-codex-wechat init`
-  - 写默认配置到 `~/.claude-codex-wechat/config.json`
 - `claude-codex-wechat uninstall`
   - 卸载后台服务
 - `claude-codex-wechat print-config`
@@ -140,13 +136,7 @@ pnpm install
 ~/.claude-codex-wechat/config.json
 ```
 
-推荐先初始化：
-
-```bash
-claude-codex-wechat init
-```
-
-最小配置示例：
+该文件在**首次 `start` 时自动创建**（并自动写入生成的 relay 接入凭据），正常使用无需手动编辑。以下为可选的进阶自定义示例：
 
 ```json
 {

package/dist/server/cli.js

@@ -2,7 +2,7 @@
 import { createRequire as __cjsCreateRequire } from 'node:module'; const require = __cjsCreateRequire(import.meta.url);
 
 // src/cli.ts
-import { existsSync as existsSync10, mkdirSync as mkdirSync7, readFileSync as readFileSync8, writeFileSync as writeFileSync7 } from "node:fs";
+import { existsSync as existsSync10, readFileSync as readFileSync8 } from "node:fs";
 import { dirname as dirname12, join as join12 } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -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) => {
@@ -3990,6 +3994,9 @@ var RelayTunnelProvider = class {
     running: false,
     status: "stopped"
   };
+  stopped = true;
+  reconnectAttempts = 0;
+  reconnectTimer = null;
   static defaultCreateSocket(url) {
     const socket = new WebSocket(url);
     return {
@@ -4011,13 +4018,34 @@ var RelayTunnelProvider = class {
     return { ...this.status };
   }
   async start() {
+    this.stopped = false;
+    return await this.connect();
+  }
+  async stop() {
+    this.stopped = true;
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = null;
+    }
+    this.socket?.close();
+    this.socket = null;
+    this.status = {
+      installed: true,
+      running: false,
+      status: "stopped"
+    };
+    return { ...this.status };
+  }
+  // 单次连接尝试：成功注册即 resolve。底层连接断开（close/error）时，
+  // 只要未被 stop()，就按指数退避自动重连，直到恢复。
+  connect() {
     this.status = {
       ...this.status,
       status: "starting"
     };
     const socket = this.options.createSocket(this.options.serverUrl);
     this.socket = socket;
-    return await new Promise((resolve2, reject) => {
+    return new Promise((resolve2, reject) => {
       let settled = false;
       const finishResolve = (value) => {
         if (settled) return;
@@ -4048,9 +4076,11 @@ var RelayTunnelProvider = class {
             error: message
           };
           finishReject(new Error(message));
+          this.scheduleReconnect();
           return;
         }
         if (payload?.type === "registered") {
+          this.reconnectAttempts = 0;
           const publicUrl = typeof payload?.publicUrl === "string" && payload.publicUrl ? payload.publicUrl : typeof payload?.token === "string" ? `${derivePublicBaseUrl(this.options.serverUrl)}/${payload.token}` : void 0;
           this.status = {
             installed: true,
@@ -4066,6 +4096,10 @@ var RelayTunnelProvider = class {
         }
       });
       socket.on("close", () => {
+        if (this.stopped) {
+          finishReject(new Error("relay_stopped"));
+          return;
+        }
         this.status = {
           ...this.status,
           running: false,
@@ -4073,8 +4107,13 @@ var RelayTunnelProvider = class {
           error: "relay_disconnected"
         };
         finishReject(new Error("relay_disconnected"));
+        this.scheduleReconnect();
       });
       socket.on("error", (error) => {
+        if (this.stopped) {
+          finishReject(new Error("relay_stopped"));
+          return;
+        }
         const message = error instanceof Error ? error.message : String(error);
         this.status = {
           ...this.status,
@@ -4083,18 +4122,22 @@ var RelayTunnelProvider = class {
           error: message
         };
         finishReject(error);
+        this.scheduleReconnect();
       });
     });
   }
-  async stop() {
-    this.socket?.close();
-    this.socket = null;
-    this.status = {
-      installed: true,
-      running: false,
-      status: "stopped"
-    };
-    return { ...this.status };
+  scheduleReconnect() {
+    if (this.stopped) return;
+    if (this.reconnectTimer) return;
+    const maxDelay = this.options.maxReconnectDelayMs ?? 3e4;
+    const delay3 = Math.min(maxDelay, 1e3 * 2 ** this.reconnectAttempts);
+    this.reconnectAttempts += 1;
+    this.reconnectTimer = setTimeout(() => {
+      this.reconnectTimer = null;
+      if (this.stopped) return;
+      void this.connect().catch(() => void 0);
+    }, delay3);
+    this.reconnectTimer.unref?.();
   }
   async handleRequest(payload) {
     const fetchImpl = this.options.fetchImpl ?? fetch;
@@ -4456,7 +4499,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 +4528,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 +4547,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 +4571,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 +4600,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 +4618,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 +4669,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 +4710,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 +4818,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 +4888,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) {
@@ -4789,9 +4963,6 @@ async function main() {
     case "tail":
       await cmdTail();
       return;
-    case "init":
-      cmdInit();
-      return;
     case "doctor":
       await cmdDoctor();
       return;
@@ -4857,36 +5028,10 @@ async function cmdDaemon() {
     attachFrontend: attachStaticFrontend(webRoot)
   });
 }
-function cmdInit() {
-  const configPath = process.env.BRIDGE_CONFIG ?? defaultConfigPath();
-  const dir = dirname12(configPath);
-  mkdirSync7(dir, { recursive: true });
-  if (existsSync10(configPath)) {
-    console.log(`\u914D\u7F6E\u5DF2\u5B58\u5728\uFF0C\u672A\u8986\u76D6: ${configPath}`);
-    return;
-  }
-  const template = {
-    wechat: {
-      enabled: true,
-      baseUrl: "https://ilinkai.weixin.qq.com",
-      token: "replace-with-weixin-bot-token",
-      accountId: "replace-with-weixin-account-id"
-    },
-    providers: {},
-    bridge: {
-      defaultProvider: "claude-code",
-      defaultWorkspace: process.cwd()
-    }
-  };
-  writeFileSync7(configPath, `${JSON.stringify(template, null, 2)}
-`, "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");
-}
 async function cmdDoctor() {
   const configPath = process.env.BRIDGE_CONFIG ?? defaultConfigPath();
   console.log("claude-codex-wechat doctor\n");
-  report("\u914D\u7F6E\u6587\u4EF6", existsSync10(configPath) ? configPath : `\u7F3A\u5931 (${configPath})\uFF0C\u8FD0\u884C init \u521B\u5EFA`);
+  report("\u914D\u7F6E\u6587\u4EF6", existsSync10(configPath) ? configPath : `\u7F3A\u5931 (${configPath})\uFF0C\u9996\u6B21 start \u65F6\u81EA\u52A8\u521B\u5EFA`);
   report("\u524D\u7AEF\u4EA7\u7269", existsSync10(webRoot) ? webRoot : `\u7F3A\u5931 (${webRoot})`);
   const claude = await findExecutable("claude");
   report("claude \u53EF\u6267\u884C", claude ?? "\u672A\u627E\u5230\uFF0C\u9700\u5148\u5B89\u88C5\u5E76\u767B\u5F55 Claude Code");
@@ -4903,7 +5048,7 @@ async function cmdDoctor() {
 function cmdPrintConfig() {
   const configPath = process.env.BRIDGE_CONFIG ?? defaultConfigPath();
   if (!existsSync10(configPath)) {
-    console.error(`\u914D\u7F6E\u4E0D\u5B58\u5728: ${configPath}\uFF08\u8FD0\u884C init \u521B\u5EFA\uFF09`);
+    console.error(`\u914D\u7F6E\u4E0D\u5B58\u5728: ${configPath}\uFF08\u9996\u6B21 start \u540E\u81EA\u52A8\u751F\u6210\uFF09`);
     process.exitCode = 1;
     return;
   }
@@ -4949,13 +5094,17 @@ function printUsage() {
   logs           \u6253\u5370\u6700\u8FD1\u65E5\u5FD7
   tail           \u5B9E\u65F6\u8DDF\u968F\u65E5\u5FD7
   doctor         \u68C0\u67E5\u914D\u7F6E\u3001\u524D\u7AEF\u4EA7\u7269\u4E0E claude/codex \u53EF\u6267\u884C\u6587\u4EF6
-  init           \u5728 ~/.claude-codex-wechat/ \u521B\u5EFA\u9ED8\u8BA4\u914D\u7F6E
   uninstall      \u5378\u8F7D\u540E\u53F0\u670D\u52A1
   print-config   \u6253\u5370\u5F53\u524D\u914D\u7F6E\u6587\u4EF6\u5185\u5BB9
   help           \u663E\u793A\u672C\u5E2E\u52A9
 
 \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,8 +1,13 @@
 {
   "name": "claude-codex-wechat",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "private": false,
   "type": "module",
+  "packageManager": "pnpm@11.5.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/izerui/claude-codex-wechat.git"
+  },
   "bin": {
     "claude-codex-wechat": "./dist/server/cli.js"
   },
@@ -29,7 +34,7 @@
     "build": "vite build && node scripts/build-server.mjs",
     "relay:start": "pnpm --dir relay-server start",
     "relay:test": "pnpm --dir relay-server test",
-    "prepublishOnly": "npm version patch --no-git-tag-version"
+    "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "@fastify/static": "^9.1.3",