@wu529778790/open-im 1.5.5-beta.3 → 1.5.5-beta.4

package/dist/cli.js

@@ -2,8 +2,9 @@
 import { main, needsSetup, runInteractiveSetup } from "./index.js";
 import { loadConfig } from "./config.js";
 import { checkAndUpdate } from "./check-update.js";
-import { getWebConfigUrl, runWebConfigFlow } from "./config-web.js";
-import { getServiceStatus, removePid, startBackgroundService, stopBackgroundService } from "./service-control.js";
+import { getWebConfigUrl, openWebConfigUrl, runWebConfigFlow } from "./config-web.js";
+import { getManagerStatus, startManagerProcess, stopManagerProcess } from "./manager-control.js";
+import { stopBackgroundService } from "./service-control.js";
 async function ensureConfigured(mode) {
     const forceWeb = process.env.OPEN_IM_FORCE_WEB === "1";
     if (mode !== "init" && !needsSetup()) {
@@ -30,80 +31,83 @@ async function ensureConfigured(mode) {
         return false;
     }
 }
-// ============================================================================
-// 命令处理
-// ============================================================================
 async function cmdStart() {
-    const status = getServiceStatus();
+    const status = getManagerStatus();
     if (status.running && status.pid) {
-        console.log("\n🟢 open-im 已在后台运行");
-        console.log(`   pid: ${status.pid}`);
-        console.log(`   配置页: ${getWebConfigUrl()}`);
+        console.log("\nopen-im is already running in the background.");
+        console.log(`  pid: ${status.pid}`);
+        console.log(`  config page: ${getWebConfigUrl()}`);
         return;
     }
-    removePid();
     if (!(await ensureConfigured("start"))) {
         process.exit(1);
     }
-    // 检查并自动更新到最新版本
     const { updated } = await checkAndUpdate();
     if (updated) {
         process.exit(0);
     }
     process.env.OPEN_IM_AUTO_OPEN_CONFIG_ONCE = "1";
-    const child = startBackgroundService(process.cwd());
-    delete process.env.OPEN_IM_AUTO_OPEN_CONFIG_ONCE;
-    console.log("\n🟢 open-im 已在后台启动");
-    console.log(`   pid: ${child.pid}`);
-    console.log(`   配置页: ${getWebConfigUrl()}`);
+    try {
+        const child = await startManagerProcess(process.cwd());
+        console.log("\nopen-im started in the background.");
+        console.log(`  pid: ${child.pid}`);
+        console.log(`  config page: ${getWebConfigUrl()}`);
+    }
+    finally {
+        delete process.env.OPEN_IM_AUTO_OPEN_CONFIG_ONCE;
+    }
 }
 async function cmdStop() {
-    const status = getServiceStatus();
+    const status = getManagerStatus();
     if (!status.pid) {
-        console.log("open-im 未在后台运行");
+        console.log("open-im is not running in the background.");
         return;
     }
-    const result = await stopBackgroundService();
-    console.log("\n🔴 open-im 已停止");
-    console.log(`   pid: ${result.pid}`);
+    await stopBackgroundService();
+    const result = await stopManagerProcess();
+    console.log("\nopen-im stopped.");
+    console.log(`  pid: ${result.pid}`);
 }
 async function cmdInit() {
-    console.log("\n━━━ open-im 本地控制台 ━━━\n");
+    console.log("\nopen-im local control\n");
+    const status = getManagerStatus();
+    if (status.running && status.pid) {
+        openWebConfigUrl();
+        console.log(`Config page is already running: ${getWebConfigUrl()}`);
+        return;
+    }
     const saved = await ensureConfigured("init");
     if (!saved) {
-        console.log("\n❌ 配置未完成，已取消。");
+        console.log("\nConfiguration was not completed.");
         process.exit(1);
     }
-    console.log("\n✅ 配置完成！");
-    console.log("\n现在可以运行以下命令启动服务：");
+    console.log("\nConfiguration saved.");
+    console.log("\nYou can start the app with:");
     console.log("  open-im start");
     console.log("  open-im dev");
 }
 async function cmdDev() {
     if (!(await ensureConfigured("dev"))) {
-        console.log("配置未完成，已取消启动。");
+        console.log("Configuration was not completed.");
         process.exit(1);
     }
     await main();
 }
 function showHelp(exitCode = 0) {
     console.log(`
-用法: open-im <command>
+Usage: open-im <command>
 
-命令:
-  start    后台运行服务
-  stop     停止后台服务
-  init     打开本地 Web 配置页
-  dev      前台运行（调试模式），Ctrl+C 停止
+Commands:
+  start    Run the full app in the background
+  stop     Stop the full app
+  init     Open the local web configuration page
+  dev      Run in the foreground for debugging
 
-选项:
-  -h, --help    显示此帮助信息
+Options:
+  -h, --help    Show this help message
 `);
     process.exit(exitCode);
 }
-// ============================================================================
-// 命令路由
-// ============================================================================
 const cmd = process.argv[2];
 const commands = {
     start: cmdStart,
@@ -127,6 +131,6 @@ else if (commands[cmd]) {
     });
 }
 else {
-    console.error(`未知命令: ${cmd}`);
+    console.error(`Unknown command: ${cmd}`);
     showHelp(1);
 }

package/dist/config-web.js

@@ -288,8 +288,8 @@ const PAGE_HTML = String.raw `<!doctype html>
           <div class="actions">
             <button id="validateButton" class="warning">Validate</button>
             <button id="saveButton" class="secondary">Save config</button>
-            <button id="startButton">Start service</button>
-            <button id="stopButton" class="danger">Stop service</button>
+            <button id="startButton">Start bridge</button>
+            <button id="stopButton" class="danger">Stop bridge</button>
           </div>
           <div class="message" id="message"></div>
         </section>
@@ -315,7 +315,7 @@ const PAGE_HTML = String.raw `<!doctype html>
       const payload = () => ({ platforms: { telegram: { enabled: el("telegram-enabled").checked, botToken: el("telegram-botToken").value, proxy: el("telegram-proxy").value, allowedUserIds: el("telegram-allowedUserIds").value }, feishu: { enabled: el("feishu-enabled").checked, appId: el("feishu-appId").value, appSecret: el("feishu-appSecret").value, allowedUserIds: el("feishu-allowedUserIds").value }, wework: { enabled: el("wework-enabled").checked, corpId: el("wework-corpId").value, secret: el("wework-secret").value, allowedUserIds: el("wework-allowedUserIds").value }, dingtalk: { enabled: el("dingtalk-enabled").checked, clientId: el("dingtalk-clientId").value, clientSecret: el("dingtalk-clientSecret").value, cardTemplateId: el("dingtalk-cardTemplateId").value, allowedUserIds: el("dingtalk-allowedUserIds").value } }, ai: { aiCommand: el("ai-aiCommand").value, claudeCliPath: el("ai-claudeCliPath").value, claudeWorkDir: el("ai-claudeWorkDir").value, claudeSkipPermissions: el("ai-claudeSkipPermissions").checked, claudeTimeoutMs: Number(el("ai-claudeTimeoutMs").value || "0"), claudeModel: el("ai-claudeModel").value, cursorCliPath: el("ai-cursorCliPath").value, codexCliPath: el("ai-codexCliPath").value, codexProxy: el("ai-codexProxy").value, hookPort: Number(el("ai-hookPort").value || "0"), logLevel: el("ai-logLevel").value, useSdkMode: el("ai-useSdkMode").checked } });
       async function request(path, options={}) { const response = await fetch(path, { headers: { "content-type": "application/json" }, ...options }); const body = await response.json(); if (!response.ok) throw new Error(body.error || "Request failed"); return body; }
       function fill(data, meta) { el("configPath").textContent = meta.configPath; el("modeBadge").textContent = "Flow: " + meta.mode; el("telegram-enabled").checked = data.platforms.telegram.enabled; el("telegram-botToken").value = data.platforms.telegram.botToken; el("telegram-proxy").value = data.platforms.telegram.proxy; el("telegram-allowedUserIds").value = data.platforms.telegram.allowedUserIds; el("feishu-enabled").checked = data.platforms.feishu.enabled; el("feishu-appId").value = data.platforms.feishu.appId; el("feishu-appSecret").value = data.platforms.feishu.appSecret; el("feishu-allowedUserIds").value = data.platforms.feishu.allowedUserIds; el("wework-enabled").checked = data.platforms.wework.enabled; el("wework-corpId").value = data.platforms.wework.corpId; el("wework-secret").value = data.platforms.wework.secret; el("wework-allowedUserIds").value = data.platforms.wework.allowedUserIds; el("dingtalk-enabled").checked = data.platforms.dingtalk.enabled; el("dingtalk-clientId").value = data.platforms.dingtalk.clientId; el("dingtalk-clientSecret").value = data.platforms.dingtalk.clientSecret; el("dingtalk-cardTemplateId").value = data.platforms.dingtalk.cardTemplateId; el("dingtalk-allowedUserIds").value = data.platforms.dingtalk.allowedUserIds; el("ai-aiCommand").value = data.ai.aiCommand; el("ai-claudeCliPath").value = data.ai.claudeCliPath; el("ai-claudeWorkDir").value = data.ai.claudeWorkDir; el("ai-claudeSkipPermissions").checked = data.ai.claudeSkipPermissions; el("ai-claudeTimeoutMs").value = String(data.ai.claudeTimeoutMs); el("ai-claudeModel").value = data.ai.claudeModel; el("ai-cursorCliPath").value = data.ai.cursorCliPath; el("ai-codexCliPath").value = data.ai.codexCliPath; el("ai-codexProxy").value = data.ai.codexProxy; el("ai-hookPort").value = String(data.ai.hookPort); el("ai-logLevel").value = data.ai.logLevel; el("ai-useSdkMode").checked = data.ai.useSdkMode; updateVisualState(); }
-      async function refreshStatus() { const data = await request("/api/service/status"); el("serviceState").textContent = data.running ? ("Service running (pid " + data.pid + ")") : "Service stopped"; el("statusMeta").textContent = data.running ? "Background bridge process is active." : "No background bridge process is active."; }
+      async function refreshStatus() { const data = await request("/api/service/status"); el("serviceState").textContent = data.running ? ("Bridge running (pid " + data.pid + ")") : "Bridge stopped"; el("statusMeta").textContent = data.running ? "Bridge worker is active." : "Bridge worker is currently stopped."; }
       async function boot() { setBusy(true); try { const data = await request("/api/config"); fill(data.payload, data.meta); await refreshStatus(); setMessage("Control surface ready.", "success"); } catch (error) { setMessage(error.message || String(error), "error"); } finally { setBusy(false); } setInterval(() => { refreshStatus().catch(() => {}); }, 5000); ids.forEach((id) => { const node = el(id); if (node) node.addEventListener("input", updateVisualState); if (node) node.addEventListener("change", updateVisualState); }); }
       async function validate() { setBusy(true); try { const data = await request("/api/config/validate", { method: "POST", body: JSON.stringify(payload()) }); setMessage(data.message, "success"); } catch (error) { setMessage(error.message || String(error), "error"); } finally { setBusy(false); } }
       async function save() { setBusy(true); try { const data = await request("/api/config/save?final=1", { method: "POST", body: JSON.stringify(payload()) }); setMessage(data.message, "success"); } catch (error) { setMessage(error.message || String(error), "error"); } finally { setBusy(false); } }
@@ -400,7 +400,7 @@ export async function startWebConfigServer(options) {
             try {
                 loadConfig();
                 const started = startBackgroundService(options.cwd);
-                json(response, 200, { message: `Background service started with pid ${started.pid}.`, pid: started.pid });
+                json(response, 200, { message: `Bridge started with pid ${started.pid}.`, pid: started.pid });
                 if (!options.persistent) {
                     setTimeout(() => finishFlow("saved"), 120);
                 }
@@ -413,7 +413,7 @@ export async function startWebConfigServer(options) {
         if (request.method === "POST" && requestUrl.pathname === "/api/service/stop") {
             try {
                 const result = await stopBackgroundService();
-                json(response, 200, { message: result.pid ? `Background service stopped (pid ${result.pid}).` : "No background service was running." });
+                json(response, 200, { message: result.pid ? `Bridge stopped (pid ${result.pid}).` : "Bridge was already stopped." });
             }
             catch (error) {
                 json(response, 400, { error: error instanceof Error ? error.message : String(error) });

package/dist/index.js

@@ -3,7 +3,7 @@ import { writeFileSync, existsSync, mkdirSync, unlinkSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { loadConfig, needsSetup } from "./config.js";
 import { runInteractiveSetup, runClaudeApiSetup } from "./setup.js";
-import { openWebConfigUrl, runWebConfigFlow, startWebConfigServer } from "./config-web.js";
+import { runWebConfigFlow } from "./config-web.js";
 // 导出供 cli.ts 使用
 export { needsSetup, runInteractiveSetup };
 import { initTelegram, stopTelegram } from "./telegram/client.js";
@@ -30,7 +30,6 @@ import { initPermissionModes } from "./permission-mode/session-mode.js";
 import { createRequire } from "node:module";
 const require = createRequire(import.meta.url);
 const { version: APP_VERSION } = require("../package.json");
-const CONFIG_UI_ONCE_FILE = join(APP_HOME, ".config-ui-once");
 const log = createLogger("Main");
 async function sendLifecycleNotification(platform, message) {
     const telegramChatId = getActiveChatId("telegram");
@@ -121,20 +120,6 @@ export async function main() {
     initLogger(config.logDir, config.logLevel);
     loadActiveChats();
     initPermissionModes();
-    let configWebServer = null;
-    try {
-        configWebServer = await startWebConfigServer({ mode: "start", cwd: process.cwd(), persistent: true });
-        log.info(`Web config page available at ${configWebServer.url}`);
-        if (process.env.OPEN_IM_AUTO_OPEN_CONFIG_ONCE === "1" && !existsSync(CONFIG_UI_ONCE_FILE)) {
-            if (!existsSync(APP_HOME))
-                mkdirSync(APP_HOME, { recursive: true });
-            writeFileSync(CONFIG_UI_ONCE_FILE, "1", "utf-8");
-            openWebConfigUrl();
-        }
-    }
-    catch (error) {
-        log.warn("Failed to start web config page:", error);
-    }
     // 当配置为跳过权限时，设置 CC_SKIP_PERMISSIONS 让权限服务器自动放行
     // 否则 Cursor/Claude 请求工具权限时会卡住等待用户 /allow
     if (config.claudeSkipPermissions) {
@@ -256,7 +241,6 @@ export async function main() {
         dingtalkHandle?.stop();
         stopDingTalk();
         stopPermissionServer();
-        await configWebServer?.close().catch(() => { });
         sessionManager.destroy();
         cleanupAdapters();
         flushActiveChats();

package/dist/manager-control.d.ts

@@ -0,0 +1,17 @@
+export declare function getManagerPid(): number | null;
+export declare function removeManagerPid(): void;
+export declare function removeManagerReady(): void;
+export declare function writeManagerReady(): void;
+export declare function isManagerReady(): boolean;
+export declare function writeManagerPid(pid: number): void;
+export declare function getManagerStatus(): {
+    running: boolean;
+    pid: number | null;
+};
+export declare function startManagerProcess(cwd: string): Promise<{
+    pid: number;
+}>;
+export declare function stopManagerProcess(): Promise<{
+    pid: number | null;
+    stopped: boolean;
+}>;

package/dist/manager-control.js

@@ -0,0 +1,160 @@
+import { execFileSync, spawn } from "node:child_process";
+import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
+import { dirname, extname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { APP_HOME } from "./constants.js";
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const PID_FILE = join(APP_HOME, "open-im.pid");
+const READY_FILE = join(APP_HOME, "open-im.ready");
+function getManagerEntry() {
+    const extension = extname(fileURLToPath(import.meta.url));
+    if (extension === ".ts") {
+        return {
+            command: process.execPath,
+            args: ["--import", "tsx", join(__dirname, "manager.ts")],
+        };
+    }
+    return {
+        command: process.execPath,
+        args: [join(__dirname, "manager.js")],
+    };
+}
+function isRunning(pid) {
+    try {
+        if (process.platform === "win32") {
+            const result = execFileSync("tasklist", ["/FI", `PID eq ${pid}`, "/NH"], {
+                stdio: "pipe",
+                windowsHide: true,
+            }).toString();
+            return result.includes(String(pid));
+        }
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export function getManagerPid() {
+    if (!existsSync(PID_FILE))
+        return null;
+    try {
+        const pid = parseInt(readFileSync(PID_FILE, "utf-8").trim(), 10);
+        return Number.isNaN(pid) ? null : pid;
+    }
+    catch {
+        return null;
+    }
+}
+export function removeManagerPid() {
+    try {
+        if (existsSync(PID_FILE))
+            unlinkSync(PID_FILE);
+    }
+    catch {
+        /* ignore */
+    }
+}
+export function removeManagerReady() {
+    try {
+        if (existsSync(READY_FILE))
+            unlinkSync(READY_FILE);
+    }
+    catch {
+        /* ignore */
+    }
+}
+export function writeManagerReady() {
+    if (!existsSync(APP_HOME))
+        mkdirSync(APP_HOME, { recursive: true });
+    writeFileSync(READY_FILE, "1", "utf-8");
+}
+export function isManagerReady() {
+    return existsSync(READY_FILE);
+}
+export function writeManagerPid(pid) {
+    if (!existsSync(APP_HOME))
+        mkdirSync(APP_HOME, { recursive: true });
+    writeFileSync(PID_FILE, String(pid), "utf-8");
+}
+export function getManagerStatus() {
+    const pid = getManagerPid();
+    if (!pid)
+        return { running: false, pid: null };
+    if (!isRunning(pid)) {
+        removeManagerReady();
+        removeManagerPid();
+        return { running: false, pid: null };
+    }
+    return { running: true, pid };
+}
+export async function startManagerProcess(cwd) {
+    const current = getManagerStatus();
+    if (current.running && current.pid) {
+        if (isManagerReady()) {
+            return { pid: current.pid };
+        }
+        throw new Error("Manager process exists but is not ready yet.");
+    }
+    removeManagerReady();
+    removeManagerPid();
+    const entry = getManagerEntry();
+    const child = spawn(entry.command, entry.args, {
+        detached: true,
+        stdio: "ignore",
+        cwd,
+        env: process.env,
+        windowsHide: process.platform === "win32",
+    });
+    child.unref();
+    if (!child.pid) {
+        throw new Error("Failed to start manager process.");
+    }
+    writeManagerPid(child.pid);
+    const deadline = Date.now() + 8000;
+    while (Date.now() < deadline) {
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        if (!isRunning(child.pid)) {
+            removeManagerReady();
+            removeManagerPid();
+            throw new Error("Manager process exited before becoming ready.");
+        }
+        if (isManagerReady()) {
+            return { pid: child.pid };
+        }
+    }
+    removeManagerReady();
+    removeManagerPid();
+    try {
+        process.kill(child.pid, "SIGTERM");
+    }
+    catch {
+        /* ignore */
+    }
+    throw new Error("Manager process did not become ready in time.");
+}
+export async function stopManagerProcess() {
+    const pid = getManagerPid();
+    if (!pid) {
+        removeManagerReady();
+        return { pid: null, stopped: false };
+    }
+    if (!isRunning(pid)) {
+        removeManagerReady();
+        removeManagerPid();
+        return { pid, stopped: true };
+    }
+    try {
+        process.kill(pid, "SIGTERM");
+        await new Promise((resolve) => setTimeout(resolve, 500));
+    }
+    catch {
+        /* ignore */
+    }
+    if (isRunning(pid)) {
+        process.kill(pid, "SIGKILL");
+    }
+    removeManagerReady();
+    removeManagerPid();
+    return { pid, stopped: true };
+}

package/dist/manager.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/manager.js

@@ -0,0 +1,37 @@
+import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { APP_HOME } from "./constants.js";
+import { openWebConfigUrl, startWebConfigServer } from "./config-web.js";
+import { removeManagerPid, removeManagerReady, writeManagerReady } from "./manager-control.js";
+import { startBackgroundService, stopBackgroundService } from "./service-control.js";
+const CONFIG_UI_ONCE_FILE = join(APP_HOME, ".config-ui-once");
+async function main() {
+    const web = await startWebConfigServer({ mode: "start", cwd: process.cwd(), persistent: true });
+    startBackgroundService(process.cwd());
+    writeManagerReady();
+    if (process.env.OPEN_IM_AUTO_OPEN_CONFIG_ONCE === "1" && !existsSync(CONFIG_UI_ONCE_FILE)) {
+        if (!existsSync(APP_HOME))
+            mkdirSync(APP_HOME, { recursive: true });
+        writeFileSync(CONFIG_UI_ONCE_FILE, "1", "utf-8");
+        openWebConfigUrl();
+    }
+    const shutdown = async () => {
+        await web.close().catch(() => { });
+        await stopBackgroundService().catch(() => { });
+        removeManagerReady();
+        removeManagerPid();
+        process.exit(0);
+    };
+    process.on("SIGINT", () => shutdown().catch(() => process.exit(1)));
+    process.on("SIGTERM", () => shutdown().catch(() => process.exit(1)));
+}
+const isEntry = process.argv[1]?.replace(/\\/g, "/").endsWith("/manager.js") ||
+    process.argv[1]?.replace(/\\/g, "/").endsWith("/manager.ts");
+if (isEntry) {
+    main().catch((error) => {
+        console.error("Manager fatal error:", error);
+        removeManagerReady();
+        removeManagerPid();
+        process.exit(1);
+    });
+}

package/dist/service-control.js

@@ -4,7 +4,7 @@ import { dirname, extname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { APP_HOME, SHUTDOWN_PORT } from "./constants.js";
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const PID_FILE = join(APP_HOME, "open-im.pid");
+const PID_FILE = join(APP_HOME, "open-im-worker.pid");
 const PORT_FILE = join(APP_HOME, "open-im.port");
 function getServiceEntry() {
     const extension = extname(fileURLToPath(import.meta.url));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.5.5-beta.3",
+  "version": "1.5.5-beta.4",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, Cursor)",
   "type": "module",
   "main": "dist/index.js",