@modelzen/feishu-codex-bridge 0.2.2-win → 0.2.3-win

package/dist/cli.js

@@ -3556,9 +3556,9 @@ function buildGroupSettingsCard(project) {
 }
 
 // src/service/update.ts
-import { execFile, spawn as spawn4 } from "child_process";
-import { existsSync as existsSync7, readFileSync as readFileSync2 } from "fs";
-import { dirname as dirname10, join as join11, resolve as resolve5 } from "path";
+import { execFile, spawn as spawn5 } from "child_process";
+import { existsSync as existsSync6, readFileSync as readFileSync3 } from "fs";
+import { dirname as dirname9, join as join11, resolve as resolve5 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { promisify } from "util";
 
@@ -3792,126 +3792,150 @@ function launchctlError(command, result) {
   return new Error(`${command} \u5931\u8D25\uFF08exit ${result.status ?? "unknown"}\uFF09${output ? `\uFF1A${output}` : ""}`);
 }
 
-// src/service/schtasks.ts
-import { spawnSync as spawnSync2 } from "child_process";
-import { existsSync as existsSync5 } from "fs";
-import { mkdir as mkdir7, rm as rm3, writeFile as writeFile6 } from "fs/promises";
-import { dirname as dirname8, join as join9 } from "path";
-var WINDOWS_TASK_NAME = "feishu-codex-bridge";
+// src/service/win-startup.ts
+import { spawn as spawn4, spawnSync as spawnSync2 } from "child_process";
+import { openSync, readFileSync as readFileSync2, rmSync, writeFileSync } from "fs";
+import { mkdir as mkdir7, writeFile as writeFile6 } from "fs/promises";
+import { join as join9 } from "path";
+var RUN_KEY_PATH = "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run";
+var RUN_KEY_NAME = "feishu-codex-bridge";
+var SERVICE_ENV_FLAG = "FEISHU_CODEX_BRIDGE_SERVICE";
 function launcherCmdPath() {
   return join9(paths.appDir, "service-launcher.cmd");
 }
+function launcherVbsPath() {
+  return join9(paths.appDir, "service-launcher.vbs");
+}
+function servicePidFile() {
+  return join9(paths.appDir, "service.pid");
+}
 function buildLauncherCmd() {
-  const nodePath = process.execPath;
-  const cliBinPath = resolveCliBinPath();
-  const pathEnv = process.env.PATH ?? "";
   return [
     "@echo off",
-    `set "PATH=${pathEnv}"`,
-    `"${nodePath}" "${cliBinPath}" run >> "${serviceStdoutPath()}" 2>> "${serviceStderrPath()}"`,
+    `set "PATH=${process.env.PATH ?? ""}"`,
+    `set "${SERVICE_ENV_FLAG}=1"`,
+    `"${process.execPath}" "${resolveCliBinPath()}" run >> "${serviceStdoutPath()}" 2>> "${serviceStderrPath()}"`,
     ""
   ].join("\r\n");
 }
-function runSchtasks(args) {
-  const r = spawnSync2("schtasks", args, { encoding: "utf8" });
-  return {
-    ok: r.status === 0,
-    status: r.status,
-    stdout: r.stdout ?? "",
-    stderr: r.stderr ?? ""
-  };
+function buildLauncherVbs() {
+  return [
+    "' Auto-generated by feishu-codex-bridge. Do not edit.",
+    'Set sh = CreateObject("WScript.Shell")',
+    `sh.Run "cmd /c ""${launcherCmdPath()}""", 0, False`,
+    ""
+  ].join("\r\n");
 }
-function schtasksError(command, r) {
-  const out = [r.stderr.trim(), r.stdout.trim()].filter(Boolean).join("\n");
-  return new Error(`${command} \u5931\u8D25\uFF08exit ${r.status ?? "unknown"}\uFF09${out ? `\uFF1A${out}` : ""}`);
+function startNow() {
+  const out = openSync(serviceStdoutPath(), "a");
+  const err = openSync(serviceStderrPath(), "a");
+  const child = spawn4(process.execPath, [resolveCliBinPath(), "run"], {
+    detached: true,
+    windowsHide: true,
+    stdio: ["ignore", out, err],
+    env: mergeProcessEnv(process.env, { [SERVICE_ENV_FLAG]: "1" })
+  });
+  if (child.pid) writeFileSync(servicePidFile(), String(child.pid), "utf8");
+  child.unref();
+}
+async function installWinStartup() {
+  await mkdir7(paths.appDir, { recursive: true });
+  await ensureLogFiles();
+  await writeFile6(launcherCmdPath(), buildLauncherCmd(), "utf8");
+  await writeFile6(launcherVbsPath(), buildLauncherVbs(), "utf8");
+  const reg = spawnSync2(
+    "reg",
+    ["add", RUN_KEY_PATH, "/v", RUN_KEY_NAME, "/t", "REG_SZ", "/d", `wscript.exe "${launcherVbsPath()}"`, "/f"],
+    { encoding: "utf8" }
+  );
+  if (reg.status !== 0) {
+    throw new Error(`\u5199\u5165\u767B\u5F55\u81EA\u542F\u6CE8\u518C\u8868\u9879\u5931\u8D25\uFF08exit ${reg.status ?? "unknown"}\uFF09\uFF1A${(reg.stderr || reg.stdout || "").trim()}`);
+  }
+  startNow();
+  return statusWinStartup();
+}
+async function uninstallWinStartup() {
+  spawnSync2("reg", ["delete", RUN_KEY_PATH, "/v", RUN_KEY_NAME, "/f"], { stdio: "ignore" });
+  killService();
+  rmSync(servicePidFile(), { force: true });
 }
-async function writeLauncherCmd() {
-  const cmdPath = launcherCmdPath();
-  await mkdir7(dirname8(cmdPath), { recursive: true });
+async function restartWinStartup() {
+  if (!isInstalled()) {
+    throw new Error("\u767B\u5F55\u81EA\u542F\u672A\u5B89\u88C5\uFF08\u5148\u8FD0\u884C `feishu-codex-bridge start`\uFF09\u3002");
+  }
   await ensureLogFiles();
-  await writeFile6(cmdPath, buildLauncherCmd(), "utf8");
-}
-async function installSchtask() {
-  await writeLauncherCmd();
-  const create = runSchtasks([
-    "/Create",
-    "/F",
-    "/SC",
-    "ONLOGON",
-    "/RL",
-    "LIMITED",
-    "/TN",
-    WINDOWS_TASK_NAME,
-    "/TR",
-    `"${launcherCmdPath()}"`
-  ]);
-  if (!create.ok) throw schtasksError("schtasks /Create", create);
-  const run = runSchtasks(["/Run", "/TN", WINDOWS_TASK_NAME]);
-  if (!run.ok) throw schtasksError("schtasks /Run", run);
-  return statusSchtask();
-}
-async function uninstallSchtask() {
-  runSchtasks(["/End", "/TN", WINDOWS_TASK_NAME]);
-  const del = runSchtasks(["/Delete", "/F", "/TN", WINDOWS_TASK_NAME]);
-  if (!del.ok && isTaskRegistered()) throw schtasksError("schtasks /Delete", del);
-  if (existsSync5(launcherCmdPath())) await rm3(launcherCmdPath(), { force: true });
-}
-async function restartSchtask() {
-  if (!isTaskRegistered()) {
-    throw new Error(`\u8BA1\u5212\u4EFB\u52A1\u672A\u5B89\u88C5\uFF1A${WINDOWS_TASK_NAME}\uFF08\u5148\u8FD0\u884C \`feishu-codex-bridge start\`\uFF09`);
-  }
-  runSchtasks(["/End", "/TN", WINDOWS_TASK_NAME]);
-  await waitUntilStopped();
-  const run = runSchtasks(["/Run", "/TN", WINDOWS_TASK_NAME]);
-  if (!run.ok) throw schtasksError("schtasks /Run", run);
-  return statusSchtask();
-}
-function statusSchtask() {
-  const installed = isTaskRegistered();
-  const raw = installed ? describeTask() : "";
+  killService();
+  startNow();
+  return statusWinStartup();
+}
+function statusWinStartup() {
+  const installed = isInstalled();
+  const pid = readServicePid();
+  const running = pid !== null && pidAlive(pid);
   return {
-    platformName: "Task Scheduler (Windows)",
+    platformName: "Windows \u767B\u5F55\u81EA\u542F\uFF08HKCU Run\uFF0C\u514D\u7BA1\u7406\u5458\uFF09",
     installed,
-    running: installed && /Status:\s+Running/i.test(raw),
-    servicePath: WINDOWS_TASK_NAME,
+    running,
+    servicePath: `${RUN_KEY_PATH}\\${RUN_KEY_NAME}`,
     stdoutPath: serviceStdoutPath(),
     stderrPath: serviceStderrPath(),
-    // `Process ID:` only appears in verbose output while the task is running.
-    pid: raw.match(/Process ID:\s*(\d+)/i)?.[1],
-    // `Last Result: 0` ⇒ last run succeeded. Surface it as the exit code.
-    lastExit: raw.match(/Last Result:\s*(-?\d+)/i)?.[1],
-    raw
+    pid: running && pid !== null ? String(pid) : void 0,
+    raw: ""
   };
 }
-function isTaskRegistered() {
-  const r = spawnSync2("schtasks", ["/Query", "/TN", WINDOWS_TASK_NAME], {
+function winStartupRunning() {
+  const pid = readServicePid();
+  return pid !== null && pidAlive(pid);
+}
+function recordServicePid() {
+  if (process.platform !== "win32" || !process.env[SERVICE_ENV_FLAG]) return;
+  try {
+    writeFileSync(servicePidFile(), String(process.pid), "utf8");
+  } catch {
+  }
+  process.once("exit", clearServicePid);
+}
+function clearServicePid() {
+  if (process.platform !== "win32" || !process.env[SERVICE_ENV_FLAG]) return;
+  try {
+    if (readServicePid() === process.pid) rmSync(servicePidFile(), { force: true });
+  } catch {
+  }
+}
+function isInstalled() {
+  const r = spawnSync2("reg", ["query", RUN_KEY_PATH, "/v", RUN_KEY_NAME], {
     stdio: ["ignore", "ignore", "ignore"]
   });
   return r.status === 0;
 }
-function schtaskRunning() {
-  if (!isTaskRegistered()) return false;
-  return /Status:\s+Running/i.test(describeTask());
-}
-function describeTask() {
-  const r = runSchtasks(["/Query", "/V", "/FO", "LIST", "/TN", WINDOWS_TASK_NAME]);
-  return r.stdout || r.stderr || "";
+function readServicePid() {
+  try {
+    const pid = Number.parseInt(readFileSync2(servicePidFile(), "utf8").trim(), 10);
+    return Number.isFinite(pid) ? pid : null;
+  } catch {
+    return null;
+  }
 }
-async function waitUntilStopped(timeoutMs = 5e3) {
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
-    if (!schtaskRunning()) return true;
-    await new Promise((r) => setTimeout(r, 200));
+function pidAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (err) {
+    return err.code === "EPERM";
   }
-  return false;
+}
+function killService() {
+  const pid = readServicePid();
+  if (pid === null || !pidAlive(pid)) return;
+  spawnSync2("taskkill", ["/pid", String(pid), "/T", "/F"], { stdio: "ignore" });
 }
 
 // src/service/systemd.ts
 import { spawnSync as spawnSync3 } from "child_process";
-import { existsSync as existsSync6 } from "fs";
-import { mkdir as mkdir8, rm as rm4, writeFile as writeFile7 } from "fs/promises";
+import { existsSync as existsSync5 } from "fs";
+import { mkdir as mkdir8, rm as rm3, writeFile as writeFile7 } from "fs/promises";
 import { homedir as homedir4 } from "os";
-import { dirname as dirname9, join as join10 } from "path";
+import { dirname as dirname8, join as join10 } from "path";
 var SYSTEMD_UNIT_NAME = "feishu-codex-bridge.service";
 function systemdUnitPath() {
   const base = process.env.XDG_CONFIG_HOME ?? join10(homedir4(), ".config");
@@ -3969,7 +3993,7 @@ function ensureSystemdOrThrow() {
 async function installSystemd() {
   ensureSystemdOrThrow();
   const unitPath = systemdUnitPath();
-  await mkdir8(dirname9(unitPath), { recursive: true });
+  await mkdir8(dirname8(unitPath), { recursive: true });
   await ensureLogFiles();
   await writeFile7(unitPath, buildUnit(), "utf8");
   const reload = runSystemctl(["daemon-reload"]);
@@ -3982,7 +4006,7 @@ async function uninstallSystemd() {
   if (systemdAvailable() && unitExists()) {
     runSystemctl(["disable", "--now", SYSTEMD_UNIT_NAME]);
   }
-  await rm4(systemdUnitPath(), { force: true });
+  await rm3(systemdUnitPath(), { force: true });
   if (systemdAvailable()) runSystemctl(["daemon-reload"]);
 }
 async function restartSystemd() {
@@ -4012,7 +4036,7 @@ function statusSystemd() {
   };
 }
 function unitExists() {
-  return existsSync6(systemdUnitPath());
+  return existsSync5(systemdUnitPath());
 }
 function systemdActive() {
   const r = spawnSync3("systemctl", ["--user", "is-active", SYSTEMD_UNIT_NAME], {
@@ -4038,10 +4062,10 @@ function getServiceAdapter() {
   }
   if (process.platform === "win32") {
     return {
-      install: installSchtask,
-      uninstall: uninstallSchtask,
-      status: async () => statusSchtask(),
-      restart: restartSchtask,
+      install: installWinStartup,
+      uninstall: uninstallWinStartup,
+      status: async () => statusWinStartup(),
+      restart: restartWinStartup,
       logs: tailServiceLogs
     };
   }
@@ -4061,7 +4085,7 @@ function getServiceAdapter() {
 function isServiceRunning() {
   try {
     if (process.platform === "darwin") return isLoaded();
-    if (process.platform === "win32") return schtaskRunning();
+    if (process.platform === "win32") return winStartupRunning();
     if (process.platform === "linux") return systemdActive();
   } catch {
   }
@@ -4072,11 +4096,11 @@ function isServiceRunning() {
 var execFileP = promisify(execFile);
 var NPM = process.platform === "win32" ? "npm.cmd" : "npm";
 function pkgRoot() {
-  return resolve5(dirname10(fileURLToPath4(import.meta.url)), "..");
+  return resolve5(dirname9(fileURLToPath4(import.meta.url)), "..");
 }
 function pkgJson() {
   try {
-    return JSON.parse(readFileSync2(join11(pkgRoot(), "package.json"), "utf8"));
+    return JSON.parse(readFileSync3(join11(pkgRoot(), "package.json"), "utf8"));
   } catch {
     return {};
   }
@@ -4088,7 +4112,7 @@ function packageName() {
   return pkgJson().name ?? "@modelzen/feishu-codex-bridge";
 }
 function isDevSource() {
-  return existsSync7(join11(pkgRoot(), ".git"));
+  return existsSync6(join11(pkgRoot(), ".git"));
 }
 function isNewer(a, b) {
   const pa = a.split(".").map((n) => Number.parseInt(n, 10) || 0);
@@ -4111,7 +4135,7 @@ async function latestVersion() {
 async function installLatest(opts = {}) {
   const target = `${packageName()}@latest`;
   return await new Promise((resolveP) => {
-    const child = spawn4(NPM, ["install", "-g", target], {
+    const child = spawn5(NPM, ["install", "-g", target], {
       stdio: opts.inherit ? ["ignore", "inherit", "inherit"] : ["ignore", "pipe", "pipe"]
     });
     let out = "";
@@ -4135,7 +4159,7 @@ async function restartDaemon() {
 
 // src/project/lifecycle.ts
 import { mkdir as mkdir9 } from "fs/promises";
-import { existsSync as existsSync8 } from "fs";
+import { existsSync as existsSync7 } from "fs";
 import { isAbsolute as isAbsolute2, join as join12, resolve as resolve6 } from "path";
 
 // src/project/git-info.ts
@@ -4272,7 +4296,7 @@ async function onboardGroup(channel, project) {
 async function resolveCwd(name, existingPath) {
   if (existingPath) {
     const cwd2 = isAbsolute2(existingPath) ? existingPath : resolve6(existingPath);
-    if (!existsSync8(cwd2)) throw new Error(`\u6587\u4EF6\u5939\u4E0D\u5B58\u5728\uFF1A${cwd2}`);
+    if (!existsSync7(cwd2)) throw new Error(`\u6587\u4EF6\u5939\u4E0D\u5B58\u5728\uFF1A${cwd2}`);
     return { cwd: cwd2, blank: false };
   }
   const cwd = join12(paths.projectsRootDir, name);
@@ -4344,7 +4368,7 @@ async function leaveChat(channel, chatId) {
 
 // src/bot/session-store.ts
 import { mkdir as mkdir10, readFile as readFile8, rename as rename5, writeFile as writeFile8 } from "fs/promises";
-import { dirname as dirname11 } from "path";
+import { dirname as dirname10 } from "path";
 var FILE_VERSION3 = 1;
 async function read2() {
   try {
@@ -4357,7 +4381,7 @@ async function read2() {
   }
 }
 async function write2(sessions) {
-  await mkdir10(dirname11(paths.sessionsFile), { recursive: true });
+  await mkdir10(dirname10(paths.sessionsFile), { recursive: true });
   const tmp = `${paths.sessionsFile}.tmp-${process.pid}`;
   const body = { version: FILE_VERSION3, sessions };
   await writeFile8(tmp, `${JSON.stringify(body, null, 2)}
@@ -4404,7 +4428,7 @@ async function handleDmConsole(channel, cfg, msg) {
 }
 
 // src/bot/media.ts
-import { mkdir as mkdir11, readdir as readdir2, rm as rm5, stat as stat3 } from "fs/promises";
+import { mkdir as mkdir11, readdir as readdir2, rm as rm4, stat as stat3 } from "fs/promises";
 import { join as join13 } from "path";
 var MAX_IMAGES2 = 9;
 var MEDIA_TTL_MS = 60 * 6e4;
@@ -4547,7 +4571,7 @@ async function pruneOldMedia() {
     const file = join13(paths.mediaDir, name);
     try {
       const st = await stat3(file);
-      if (st.mtimeMs < cutoff) await rm5(file, { force: true });
+      if (st.mtimeMs < cutoff) await rm4(file, { force: true });
     } catch {
     }
   }
@@ -5918,8 +5942,8 @@ async function startBridge(opts) {
 }
 
 // src/core/single-instance.ts
-import { mkdirSync as mkdirSync2, readFileSync as readFileSync3, unlinkSync, writeFileSync } from "fs";
-import { dirname as dirname12 } from "path";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync4, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
+import { dirname as dirname11 } from "path";
 var BridgeAlreadyRunningError = class extends Error {
   constructor(pid) {
     super(
@@ -5941,20 +5965,20 @@ function isAlive(pid) {
 function acquireSingleInstanceLock(appId) {
   const file = paths.processesFile;
   try {
-    const rec = JSON.parse(readFileSync3(file, "utf8"));
+    const rec = JSON.parse(readFileSync4(file, "utf8"));
     if (rec.pid && rec.pid !== process.pid && rec.appId === appId && isAlive(rec.pid)) {
       throw new BridgeAlreadyRunningError(rec.pid);
     }
   } catch (err) {
     if (err instanceof BridgeAlreadyRunningError) throw err;
   }
-  mkdirSync2(dirname12(file), { recursive: true });
+  mkdirSync2(dirname11(file), { recursive: true });
   const record = { pid: process.pid, appId, startedAt: Date.now() };
-  writeFileSync(file, `${JSON.stringify(record)}
+  writeFileSync2(file, `${JSON.stringify(record)}
 `, "utf8");
   const release = () => {
     try {
-      const rec = JSON.parse(readFileSync3(file, "utf8"));
+      const rec = JSON.parse(readFileSync4(file, "utf8"));
       if (rec.pid === process.pid) unlinkSync(file);
     } catch {
     }
@@ -5983,6 +6007,7 @@ async function runRun() {
     }
     throw err;
   }
+  recordServicePid();
   const fallbackCwd = process.env.FEISHU_CODEX_CWD || process.cwd();
   console.log("\n\u6B63\u5728\u542F\u52A8\u957F\u8FDE\u63A5 bot\u2026");
   console.log("\u79C1\u804A\u6211 `/new <\u540D>` \u5EFA\u9879\u76EE\uFF1B\u5728\u9879\u76EE\u7FA4\u91CC @\u6211 \u5E72\u6D3B\u3002Ctrl+C \u9000\u51FA\u3002\n");
@@ -6038,7 +6063,7 @@ async function runLogs(follow) {
 function installedNote() {
   switch (process.platform) {
     case "win32":
-      return "\u2713 \u540E\u53F0\u670D\u52A1\u5DF2\u5B89\u88C5\u5E76\u542F\u52A8\uFF08\u767B\u5F55\u81EA\u542F\uFF1B\u6CE8\u610F\uFF1AWindows \u8BA1\u5212\u4EFB\u52A1\u65E0\u5D29\u6E83\u81EA\u52A8\u62C9\u8D77\uFF09\u3002";
+      return "\u2713 \u540E\u53F0\u670D\u52A1\u5DF2\u5B89\u88C5\u5E76\u542F\u52A8\uFF08\u767B\u5F55\u81EA\u542F\uFF0C\u514D\u7BA1\u7406\u5458\uFF09\u3002\n  \u63D0\u793A\uFF1A\u767B\u5F55\u81EA\u542F\u5728\u4E0B\u6B21\u767B\u5F55\u751F\u6548\uFF1B\u5F53\u524D\u5DF2\u5728\u540E\u53F0\u9690\u85CF\u542F\u52A8\u3002\u6CE8\u610F Windows \u767B\u5F55\u81EA\u542F\u65E0\u5D29\u6E83\u81EA\u52A8\u62C9\u8D77\u3002";
     case "linux":
       return "\u2713 \u540E\u53F0\u670D\u52A1\u5DF2\u5B89\u88C5\u5E76\u542F\u52A8\uFF08\u767B\u5F55\u81EA\u542F\u3001\u5D29\u6E83\u81EA\u52A8\u62C9\u8D77\uFF09\u3002\n  \u63D0\u793A\uFF1A\u6CE8\u9500\u540E\u4ECD\u4FDD\u6301\u8FD0\u884C\u9700\u6267\u884C\u4E00\u6B21 `loginctl enable-linger $USER`\u3002";
     default:
@@ -6110,7 +6135,7 @@ async function runUpdate(opts = {}) {
 }
 
 // src/cli/commands/bot.ts
-import { rm as rm6 } from "fs/promises";
+import { rm as rm5 } from "fs/promises";
 async function runBotInit(name) {
   if (!ensureCodex()) {
     process.exitCode = 1;
@@ -6165,7 +6190,7 @@ async function runBotRm(name) {
   }
   const after = await removeBot(bot2.appId);
   await removeSecret(secretKeyForApp(bot2.appId));
-  await rm6(botDir(bot2.appId), { recursive: true, force: true });
+  await rm5(botDir(bot2.appId), { recursive: true, force: true });
   console.log(`\u2713 \u5DF2\u79FB\u9664\u673A\u5668\u4EBA\u300C${bot2.name}\u300D(${bot2.appId})\uFF1A\u6CE8\u518C\u8868 + \u5BC6\u94A5 + \u72B6\u6001\u76EE\u5F55(projects/sessions)\u3002`);
   if (after.bots.length === 0) {
     console.log("  \u5DF2\u65E0\u4EFB\u4F55\u673A\u5668\u4EBA\uFF0C`bot init` \u91CD\u65B0\u521B\u5EFA\u3002");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelzen/feishu-codex-bridge",
-  "version": "0.2.2-win",
+  "version": "0.2.3-win",
   "description": "Bridge Feishu/Lark messenger with local Codex via app-server (project=group, thread=session)",
   "type": "module",
   "bin": {