@modelzen/feishu-codex-bridge 0.6.7-test.0 → 0.6.7-test.2

package/dist/cli.js

@@ -5139,7 +5139,7 @@ function openUrl(url) {
       args = [url];
   }
   try {
-    const child = spawn(cmd, args, { stdio: "ignore", detached: true });
+    const child = spawn(cmd, args, { stdio: "ignore", detached: true, windowsHide: true });
     child.on("error", () => {
     });
     child.unref();
@@ -8510,7 +8510,7 @@ function withCodexHooksFeature(text) {
 
 // src/service/update.ts
 import { existsSync as existsSync9, readFileSync as readFileSync4 } from "fs";
-import { dirname as dirname9, join as join15, resolve as resolve6 } from "path";
+import { dirname as dirname10, join as join15, resolve as resolve6 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 
 // src/service/launchd.ts
@@ -8538,9 +8538,9 @@ async function ensureLogFiles() {
   await appendFile(serviceStdoutPath(), "");
   await appendFile(serviceStderrPath(), "");
 }
-function appendServiceErr(tag, line) {
+function appendServiceErr(tag, line, filePath = serviceStderrPath()) {
   try {
-    appendFileSync(serviceStderrPath(), `[${(/* @__PURE__ */ new Date()).toISOString()}] [${tag}] ${line}
+    appendFileSync(filePath, `[${(/* @__PURE__ */ new Date()).toISOString()}] [${tag}] ${line}
 `);
   } catch {
   }
@@ -8756,7 +8756,7 @@ init_paths();
 import { spawn as spawn3, spawnSync as spawnSync2 } from "child_process";
 import { existsSync as existsSync7, openSync, readFileSync as readFileSync3, renameSync, rmSync, writeFileSync } from "fs";
 import { mkdir as mkdir9, writeFile as writeFile8 } from "fs/promises";
-import { join as join13 } from "path";
+import { dirname as dirname8, join as join13 } from "path";
 var RELAUNCH_TASK_NAME = "feishu-codex-bridge-relaunch";
 var RUN_KEY_PATH = "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run";
 var RUN_KEY_NAME = "feishu-codex-bridge";
@@ -8787,18 +8787,20 @@ function buildLauncherVbs() {
     ""
   ].join("\r\n");
 }
-function startNow(envPath) {
-  const out = openSync(serviceStdoutPath(), "a");
-  const err = openSync(serviceStderrPath(), "a");
+function startNow(opts = {}) {
+  const dir = opts.appDir ?? paths.appDir;
+  const out = openSync(join13(dir, "service.log"), "a");
+  const err = openSync(join13(dir, "service.err.log"), "a");
   const overrides = { [SERVICE_ENV_FLAG]: "1" };
-  if (envPath) overrides.PATH = envPath;
+  if (opts.envPath) overrides.PATH = opts.envPath;
+  if (opts.userProfile) overrides.USERPROFILE = opts.userProfile;
   const child = spawn3(process.execPath, [resolveCliBinPath(), "run"], {
     detached: true,
     windowsHide: true,
     stdio: ["ignore", out, err],
     env: mergeProcessEnv(process.env, overrides)
   });
-  if (child.pid) writeFileSync(servicePidFile(), String(child.pid), "utf8");
+  if (child.pid) writeFileSync(join13(dir, "service.pid"), String(child.pid), "utf8");
   child.unref();
 }
 async function installWinStartup() {
@@ -8809,7 +8811,7 @@ async function installWinStartup() {
   const reg = spawnSync2(
     "reg",
     ["add", RUN_KEY_PATH, "/v", RUN_KEY_NAME, "/t", "REG_SZ", "/d", `wscript.exe "${launcherVbsPath()}"`, "/f"],
-    { encoding: "utf8" }
+    { encoding: "utf8", windowsHide: true }
   );
   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()}`);
@@ -8818,7 +8820,7 @@ async function installWinStartup() {
   return statusWinStartup();
 }
 async function uninstallWinStartup() {
-  spawnSync2("reg", ["delete", RUN_KEY_PATH, "/v", RUN_KEY_NAME, "/f"], { stdio: "ignore" });
+  spawnSync2("reg", ["delete", RUN_KEY_PATH, "/v", RUN_KEY_NAME, "/f"], { stdio: "ignore", windowsHide: true });
   killService();
   rmSync(servicePidFile(), { force: true });
 }
@@ -8832,8 +8834,14 @@ async function restartWinStartup() {
     startNow();
     return statusWinStartup();
   }
-  writeRelaunchRequest({ oldPid, envPath: process.env.PATH ?? "", nonce: `${process.pid}-${Date.now()}` });
-  if (!spawnTreeFreeRelauncher()) {
+  const reqPath = relaunchRequestFile();
+  writeRelaunchRequest({
+    oldPid,
+    envPath: process.env.PATH ?? "",
+    userProfile: process.env.USERPROFILE ?? "",
+    nonce: `${process.pid}-${Date.now()}`
+  });
+  if (!spawnTreeFreeRelauncher(reqPath)) {
     clearRelaunchRequest();
     appendServiceErr("relaunch", `no tree-free backend (powershell/schtasks); kept old pid=${oldPid} running, did NOT restart`);
     throw new Error("\u65E0\u6CD5\u62C9\u8D77\u300C\u6811\u5916\u300D\u91CD\u542F\u8FDB\u7A0B\uFF08powershell \u4E0E schtasks \u5747\u4E0D\u53EF\u7528\uFF09\uFF1B\u5DF2\u4FDD\u7559\u65E7\u670D\u52A1\u7EE7\u7EED\u8FD0\u884C\uFF0C\u672A\u91CD\u542F\u3002");
@@ -8850,13 +8858,10 @@ function writeRelaunchRequest(req) {
 function clearRelaunchRequest() {
   rmSync(relaunchRequestFile(), { force: true });
 }
-function relaunchClaimFile() {
-  return `${relaunchRequestFile()}.claim.${process.pid}`;
-}
-function claimRelaunchRequest() {
-  const claim = relaunchClaimFile();
+function claimRelaunchRequest(reqPath) {
+  const claim = `${reqPath}.claim.${process.pid}`;
   try {
-    renameSync(relaunchRequestFile(), claim);
+    renameSync(reqPath, claim);
   } catch {
     return null;
   }
@@ -8866,6 +8871,7 @@ function claimRelaunchRequest() {
       return {
         oldPid: r.oldPid,
         envPath: typeof r.envPath === "string" ? r.envPath : "",
+        userProfile: typeof r.userProfile === "string" ? r.userProfile : "",
         nonce: String(r.nonce ?? "")
       };
     }
@@ -8873,37 +8879,49 @@ function claimRelaunchRequest() {
   }
   return null;
 }
-function clearRelaunchClaim() {
-  rmSync(relaunchClaimFile(), { force: true });
+function clearRelaunchClaim(reqPath) {
+  rmSync(`${reqPath}.claim.${process.pid}`, { force: true });
 }
-function buildRelauncherPowershell(binPath = resolveCliBinPath(), nodePath = process.execPath) {
-  const inner = `"${nodePath}" "${binPath}" __win-relaunch`;
+function buildRelauncherPowershell(reqPath, binPath = resolveCliBinPath(), nodePath = process.execPath) {
+  const inner = `"${nodePath}" "${binPath}" __win-relaunch "${reqPath}"`;
   const lit = `'${inner.replace(/'/g, "''")}'`;
-  return `$c=${lit}; try { Invoke-CimMethod -ClassName Win32_Process -MethodName Create -Arguments @{ CommandLine=$c } -ErrorAction Stop | Out-Null } catch { schtasks /create /tn ${RELAUNCH_TASK_NAME} /tr $c /sc ONCE /st 00:00 /f | Out-Null; schtasks /run /tn ${RELAUNCH_TASK_NAME} | Out-Null }`;
+  return `$c=${lit}; try { $r = Invoke-CimMethod -ClassName Win32_Process -MethodName Create -Arguments @{ CommandLine=$c } -ErrorAction Stop; Write-Output ('cim rv=' + $r.ReturnValue + ' pid=' + $r.ProcessId) } catch { Write-Output ('cim-error: ' + $_.Exception.Message); schtasks /create /tn ${RELAUNCH_TASK_NAME} /tr $c /sc ONCE /st 00:00 /f | Out-Null; $cr=$LASTEXITCODE; schtasks /run /tn ${RELAUNCH_TASK_NAME} | Out-Null; Write-Output ('schtasks create=' + $cr + ' run=' + $LASTEXITCODE) }`;
+}
+function encodePowershellCommand(script) {
+  return Buffer.from(script, "utf16le").toString("base64");
 }
 function powershellPath() {
   const root = process.env.SystemRoot || process.env.windir || "C:\\Windows";
   const p = join13(root, "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
   return existsSync7(p) ? p : null;
 }
-function spawnTreeFreeRelauncher() {
+function spawnTreeFreeRelauncher(reqPath) {
   const ps = powershellPath();
   if (ps) {
-    const errFd = openSync(serviceStderrPath(), "a");
-    const child = spawn3(
+    const r = spawnSync2(
       ps,
-      ["-NoProfile", "-NonInteractive", "-WindowStyle", "Hidden", "-Command", buildRelauncherPowershell()],
-      { detached: true, windowsHide: true, stdio: ["ignore", errFd, errFd] }
+      ["-NoProfile", "-NonInteractive", "-WindowStyle", "Hidden", "-EncodedCommand", encodePowershellCommand(buildRelauncherPowershell(reqPath))],
+      { encoding: "utf8", windowsHide: true, timeout: 2e4 }
     );
-    child.on("error", (e) => appendServiceErr("relaunch", `powershell spawn error: ${e.message}`));
-    child.unref();
-    return true;
+    const out = [
+      `exit=${r.status ?? "?"}`,
+      r.error ? `err=${r.error.message}` : "",
+      (r.stdout || "").replace(/\s+/g, " ").trim(),
+      (r.stderr || "").replace(/\s+/g, " ").trim()
+    ].filter(Boolean).join(" ");
+    appendServiceErr("relaunch", `powershell submit: ${out.slice(0, 900)}`);
+    const stdout = r.stdout || "";
+    if (!r.error && r.status === 0 && (/cim rv=0\b/.test(stdout) || /schtasks .*run=0\b/.test(stdout))) {
+      return true;
+    }
+    appendServiceErr("relaunch", "powershell did not confirm a launch; trying node-side schtasks fallback");
+    return spawnSchtasksRelauncher(reqPath);
   }
   appendServiceErr("relaunch", "powershell.exe not found; trying schtasks fallback");
-  return spawnSchtasksRelauncher();
+  return spawnSchtasksRelauncher(reqPath);
 }
-function spawnSchtasksRelauncher() {
-  const tr = `"${process.execPath}" "${resolveCliBinPath()}" __win-relaunch`;
+function spawnSchtasksRelauncher(reqPath) {
+  const tr = `"${process.execPath}" "${resolveCliBinPath()}" __win-relaunch "${reqPath}"`;
   const create = spawnSync2(
     "schtasks",
     ["/create", "/tn", RELAUNCH_TASK_NAME, "/tr", tr, "/sc", "ONCE", "/st", "00:00", "/f"],
@@ -8925,6 +8943,8 @@ function defaultTaskkill(pid) {
   return { status: r.status, stderr: (r.stderr || "").toString() };
 }
 async function runWinRelaunch(deps = {}) {
+  const reqPath = deps.requestPath ?? relaunchRequestFile();
+  const appDir2 = dirname8(reqPath);
   const claim = deps.claimRequest ?? claimRelaunchRequest;
   const clearClaim = deps.clearRequest ?? clearRelaunchClaim;
   const alive = deps.pidAlive ?? pidAlive;
@@ -8935,9 +8955,12 @@ async function runWinRelaunch(deps = {}) {
   const pollMs = deps.pollMs ?? 200;
   const now = deps.now ?? (() => Date.now());
   const ensureLogs = deps.ensureLogs ?? ensureLogFiles;
-  const logLine = deps.logLine ?? ((line) => appendServiceErr("relaunch", line));
-  await ensureLogs();
-  const req = claim();
+  const logLine = deps.logLine ?? ((line) => appendServiceErr("relaunch", line, join13(appDir2, "service.err.log")));
+  try {
+    await ensureLogs();
+  } catch {
+  }
+  const req = claim(reqPath);
   if (!req) {
     logLine("no relaunch request to claim (already handled by another relauncher, or none)");
     return;
@@ -8959,10 +8982,10 @@ async function runWinRelaunch(deps = {}) {
       return;
     }
     await sleep(300);
-    start(req.envPath);
-    logLine(`relaunched; new service.pid=${readServicePid() ?? "?"}`);
+    start({ appDir: appDir2, envPath: req.envPath, userProfile: req.userProfile });
+    logLine(`relaunched; new daemon started (appDir=${appDir2})`);
   } finally {
-    clearClaim();
+    clearClaim(reqPath);
     if (process.platform === "win32") {
       try {
         spawnSync2("schtasks", ["/delete", "/tn", RELAUNCH_TASK_NAME, "/f"], { stdio: "ignore", windowsHide: true });
@@ -9007,7 +9030,8 @@ function clearServicePid() {
 }
 function isInstalled() {
   const r = spawnSync2("reg", ["query", RUN_KEY_PATH, "/v", RUN_KEY_NAME], {
-    stdio: ["ignore", "ignore", "ignore"]
+    stdio: ["ignore", "ignore", "ignore"],
+    windowsHide: true
   });
   return r.status === 0;
 }
@@ -9041,7 +9065,7 @@ import { spawnSync as spawnSync3 } from "child_process";
 import { existsSync as existsSync8 } from "fs";
 import { mkdir as mkdir10, rm as rm4, writeFile as writeFile9 } from "fs/promises";
 import { homedir as homedir5 } from "os";
-import { dirname as dirname8, join as join14 } from "path";
+import { dirname as dirname9, join as join14 } from "path";
 var SYSTEMD_UNIT_NAME = "feishu-codex-bridge.service";
 function systemdUnitPath() {
   const base = process.env.XDG_CONFIG_HOME ?? join14(homedir5(), ".config");
@@ -9099,7 +9123,7 @@ function ensureSystemdOrThrow() {
 async function installSystemd() {
   ensureSystemdOrThrow();
   const unitPath = systemdUnitPath();
-  await mkdir10(dirname8(unitPath), { recursive: true });
+  await mkdir10(dirname9(unitPath), { recursive: true });
   await ensureLogFiles();
   await writeFile9(unitPath, buildUnit(), "utf8");
   const reload = runSystemctl(["daemon-reload"]);
@@ -9201,7 +9225,7 @@ function isServiceRunning() {
 // src/service/update.ts
 var NPM2 = "npm";
 function pkgRoot() {
-  return resolve6(dirname9(fileURLToPath4(import.meta.url)), "..");
+  return resolve6(dirname10(fileURLToPath4(import.meta.url)), "..");
 }
 function pkgJson() {
   try {
@@ -9863,9 +9887,9 @@ function buildUsageShareCard(data, opts = {}) {
 init_paths();
 import { randomUUID as randomUUID4 } from "crypto";
 import { mkdirSync as mkdirSync2, readFileSync as readFileSync5, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
-import { dirname as dirname10 } from "path";
+import { dirname as dirname11 } from "path";
 function publishWebConsole(rec, file = paths.webConsoleFile) {
-  mkdirSync2(dirname10(file), { recursive: true });
+  mkdirSync2(dirname11(file), { recursive: true });
   try {
     unlinkSync(file);
   } catch {
@@ -9905,7 +9929,7 @@ function stableWebConsoleToken(file = paths.webTokenFile) {
   }
   const token = randomUUID4();
   try {
-    mkdirSync2(dirname10(file), { recursive: true });
+    mkdirSync2(dirname11(file), { recursive: true });
     try {
       unlinkSync(file);
     } catch {
@@ -10216,7 +10240,7 @@ async function leaveChat(channel, chatId) {
 init_paths();
 import { mkdir as mkdir12, readFile as readFile11, rename as rename5, writeFile as writeFile10 } from "fs/promises";
 import { randomUUID as randomUUID5 } from "crypto";
-import { dirname as dirname11 } from "path";
+import { dirname as dirname12 } from "path";
 var FILE_VERSION3 = 2;
 var LEGACY_V1_SESSION_FIELD = "codexThreadId";
 function migrate(raw) {
@@ -10252,7 +10276,7 @@ function withLock2(fn) {
   return run;
 }
 async function write2(sessions) {
-  await mkdir12(dirname11(paths.sessionsFile), { recursive: true });
+  await mkdir12(dirname12(paths.sessionsFile), { recursive: true });
   const tmp = `${paths.sessionsFile}.tmp-${process.pid}-${randomUUID5()}`;
   const body = { version: FILE_VERSION3, sessions };
   await writeFile10(tmp, `${JSON.stringify(body, null, 2)}
@@ -10868,7 +10892,7 @@ function weaveSender(text, sender) {
 // src/bot/comments.ts
 init_logger();
 import { mkdir as mkdir14, readdir as readdir4, readFile as readFile12, writeFile as writeFile11 } from "fs/promises";
-import { dirname as dirname12, join as join19 } from "path";
+import { dirname as dirname13, join as join19 } from "path";
 var SUPPORTED_FILE_TYPES = /* @__PURE__ */ new Set(["doc", "docx", "sheet", "bitable"]);
 var REPLY_MAX_CHARS = 2e3;
 function apiErrCode(err) {
@@ -11000,7 +11024,7 @@ async function loadCommentInstructions(masterFile) {
     return existing.trim() ? existing : DEFAULT_COMMENT_INSTRUCTIONS;
   } catch {
   }
-  await mkdir14(dirname12(masterFile), { recursive: true }).catch(() => void 0);
+  await mkdir14(dirname13(masterFile), { recursive: true }).catch(() => void 0);
   await writeFile11(masterFile, DEFAULT_COMMENT_INSTRUCTIONS, "utf8").catch(() => void 0);
   return DEFAULT_COMMENT_INSTRUCTIONS;
 }
@@ -11012,7 +11036,7 @@ async function syncCommentInstructions(cwd, instructions) {
   ]);
 }
 async function saveCommentInstructions(masterFile, content) {
-  await mkdir14(dirname12(masterFile), { recursive: true });
+  await mkdir14(dirname13(masterFile), { recursive: true });
   await writeFile11(masterFile, content, "utf8");
 }
 function renderCommentInstructions(template, tenant, fileType, fileToken) {
@@ -14283,7 +14307,7 @@ init_logger();
 // src/admin/host.ts
 init_paths();
 import { readdir as readdir5, stat as stat4 } from "fs/promises";
-import { dirname as dirname13, join as join21, resolve as resolve8 } from "path";
+import { dirname as dirname14, join as join21, resolve as resolve8 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 import { arch, platform as platform2, release } from "os";
 function toDaemonStatus(opts) {
@@ -14335,7 +14359,7 @@ async function collectHostDoctor(logsDir2 = join21(paths.appDir, "logs")) {
   };
 }
 function resolveCliBinPath3() {
-  const distDir = dirname13(fileURLToPath5(import.meta.url));
+  const distDir = dirname14(fileURLToPath5(import.meta.url));
   return resolve8(distDir, "..", "bin", "feishu-codex-bridge.mjs");
 }
 function buildDaemonControlCommand(action, binPath = resolveCliBinPath3(), nodePath = process.execPath) {
@@ -18462,7 +18486,7 @@ async function runSupervisor(bots) {
 // src/core/single-instance.ts
 init_paths();
 import { mkdirSync as mkdirSync4, readFileSync as readFileSync6, statSync as statSync3, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "fs";
-import { dirname as dirname14 } from "path";
+import { dirname as dirname15 } from "path";
 var CLAIM_ATTEMPTS = 5;
 var PID_REUSE_SLACK_MS = 15e3;
 var EMPTY_LOCK_STALE_MS = 2e3;
@@ -18508,7 +18532,7 @@ function isLiveHolder(rec, appId) {
   return true;
 }
 function acquireSingleInstanceLock(appId, file = paths.processesFile) {
-  mkdirSync4(dirname14(file), { recursive: true });
+  mkdirSync4(dirname15(file), { recursive: true });
   const record = { pid: process.pid, appId, startedAt: Date.now() };
   for (let attempt = 0; attempt < CLAIM_ATTEMPTS; attempt++) {
     try {
@@ -19220,8 +19244,8 @@ program.command("web").description("\u672C\u673A Web \u63A7\u5236\u53F0\uFF08\u5
 program.command("__daemon-control <action>", { hidden: true }).action(async (action) => {
   await runDaemonControl(action);
 });
-program.command("__win-relaunch", { hidden: true }).action(async () => {
-  await runWinRelaunch();
+program.command("__win-relaunch [requestPath]", { hidden: true }).action(async (requestPath) => {
+  await runWinRelaunch({ requestPath });
 });
 var bot = program.command("bot").description("\u98DE\u4E66\u673A\u5668\u4EBA\u7BA1\u7406\uFF08\u591A\u673A\u5668\u4EBA\uFF09");
 bot.command("init [name]").description("\u6CE8\u518C\u4E00\u4E2A\u98DE\u4E66\u673A\u5668\u4EBA\u5E76\u6388\u6743\uFF08\u53EF\u9009\u77ED\u540D\uFF09").action(async (name) => {

package/package.json

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