lark-bridge-mcp 2.2.8 → 2.3.1

package/dist/file-queue.d.ts

@@ -0,0 +1,12 @@
+export declare function initFileQueue(appId: string): string;
+export declare function getQueueDir(): string;
+export declare function pushToFileQueue(text: string, messageId?: string, source?: string): boolean;
+export declare function claimNextMessage(): string | null;
+export declare function pollFileQueue(timeoutMs: number, intervalMs?: number): Promise<string | null>;
+export declare function pollFileQueueBatch(timeoutMs: number, intervalMs?: number): Promise<string | null>;
+export declare function getQueueLength(): number;
+export declare function getQueueMessages(): {
+    index: number;
+    preview: string;
+}[];
+export declare function cleanupStaleMessages(): void;

package/dist/file-queue.js

@@ -0,0 +1,164 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
+import * as os from "node:os";
+const POLL_INTERVAL_MS = 400;
+const STALE_MESSAGE_MS = 5 * 60 * 1000;
+let queueDir = "";
+export function initFileQueue(appId) {
+    const suffix = appId ? appId.slice(-8) : "default";
+    queueDir = path.join(os.homedir(), ".lark-bridge-mcp", `queue-${suffix}`);
+    if (!fs.existsSync(queueDir))
+        fs.mkdirSync(queueDir, { recursive: true });
+    return queueDir;
+}
+export function getQueueDir() {
+    return queueDir;
+}
+export function pushToFileQueue(text, messageId, source) {
+    if (!queueDir || !text?.trim())
+        return false;
+    const ts = Date.now();
+    const id = messageId || `${ts}-${Math.random().toString(36).slice(2, 8)}`;
+    const safeId = id.replace(/[^a-zA-Z0-9_-]/g, "_");
+    const filename = `${ts}_${safeId}.msg`;
+    if (messageId) {
+        try {
+            const existing = fs.readdirSync(queueDir);
+            if (existing.some((f) => f.endsWith(`_${safeId}.msg`) || f.endsWith(`_${safeId}.claimed`))) {
+                return false;
+            }
+        }
+        catch { /* ignore */ }
+    }
+    try {
+        const data = JSON.stringify({ text, messageId: id, timestamp: ts, source: source || `pid-${process.pid}` });
+        const tmpPath = path.join(queueDir, filename + ".tmp");
+        const finalPath = path.join(queueDir, filename);
+        fs.writeFileSync(tmpPath, data, "utf-8");
+        fs.renameSync(tmpPath, finalPath);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export function claimNextMessage() {
+    if (!queueDir)
+        return null;
+    let files;
+    try {
+        files = fs.readdirSync(queueDir).filter((f) => f.endsWith(".msg")).sort();
+    }
+    catch {
+        return null;
+    }
+    for (const file of files) {
+        const srcPath = path.join(queueDir, file);
+        const claimedPath = srcPath.replace(/\.msg$/, ".claimed");
+        try {
+            fs.renameSync(srcPath, claimedPath);
+        }
+        catch {
+            continue;
+        }
+        try {
+            const raw = fs.readFileSync(claimedPath, "utf-8");
+            fs.unlinkSync(claimedPath);
+            const parsed = JSON.parse(raw);
+            return typeof parsed.text === "string" ? parsed.text : raw;
+        }
+        catch {
+            try {
+                fs.unlinkSync(claimedPath);
+            }
+            catch { /* ignore */ }
+            continue;
+        }
+    }
+    return null;
+}
+export function pollFileQueue(timeoutMs, intervalMs = POLL_INTERVAL_MS) {
+    return new Promise((resolve) => {
+        const immediate = claimNextMessage();
+        if (immediate !== null) {
+            resolve(immediate);
+            return;
+        }
+        const deadline = Date.now() + timeoutMs;
+        const timer = setInterval(() => {
+            const msg = claimNextMessage();
+            if (msg !== null) {
+                clearInterval(timer);
+                resolve(msg);
+                return;
+            }
+            if (Date.now() >= deadline) {
+                clearInterval(timer);
+                resolve(null);
+            }
+        }, intervalMs);
+        timer.unref();
+    });
+}
+export async function pollFileQueueBatch(timeoutMs, intervalMs = POLL_INTERVAL_MS) {
+    const first = await pollFileQueue(timeoutMs, intervalMs);
+    if (first === null)
+        return null;
+    const messages = [first];
+    let extra = claimNextMessage();
+    while (extra !== null) {
+        messages.push(extra);
+        extra = claimNextMessage();
+    }
+    return messages.join("\n");
+}
+export function getQueueLength() {
+    if (!queueDir)
+        return 0;
+    try {
+        return fs.readdirSync(queueDir).filter((f) => f.endsWith(".msg")).length;
+    }
+    catch {
+        return 0;
+    }
+}
+export function getQueueMessages() {
+    if (!queueDir)
+        return [];
+    try {
+        const files = fs.readdirSync(queueDir).filter((f) => f.endsWith(".msg")).sort();
+        return files.map((f, i) => {
+            try {
+                const raw = fs.readFileSync(path.join(queueDir, f), "utf-8");
+                const parsed = JSON.parse(raw);
+                return { index: i, preview: (parsed.text ?? "").slice(0, 200) };
+            }
+            catch {
+                return { index: i, preview: "(unreadable)" };
+            }
+        });
+    }
+    catch {
+        return [];
+    }
+}
+export function cleanupStaleMessages() {
+    if (!queueDir)
+        return;
+    const now = Date.now();
+    try {
+        for (const f of fs.readdirSync(queueDir)) {
+            if (!f.endsWith(".claimed") && !f.endsWith(".tmp"))
+                continue;
+            const filePath = path.join(queueDir, f);
+            try {
+                const stat = fs.statSync(filePath);
+                if (now - stat.mtimeMs > STALE_MESSAGE_MS)
+                    fs.unlinkSync(filePath);
+            }
+            catch { /* ignore */ }
+        }
+    }
+    catch { /* ignore */ }
+}
+//# sourceMappingURL=file-queue.js.map

package/dist/file-queue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-queue.js","sourceRoot":"","sources":["../src/file-queue.ts"],"names":[],"mappings":"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"}

package/dist/server.js

@@ -1,13 +1,11 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
-import * as http from "node:http";
-import * as net from "node:net";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import * as os from "node:os";
-import * as cp from "node:child_process";
 import * as Lark from "@larksuiteoapi/node-sdk";
+import { initFileQueue, pushToFileQueue, pollFileQueueBatch, cleanupStaleMessages } from "./file-queue.js";
 // ── stdout 保护：MCP 用 stdio 通信，任何非协议输出都会破坏 JSON-RPC 帧 ──
 const _origStdoutWrite = process.stdout.write.bind(process.stdout);
 process.stdout.write = ((chunk, encodingOrCb, cb) => {
@@ -50,218 +48,17 @@ function log(level, ...args) {
     const msg = args.map((a) => (typeof a === "string" ? a : JSON.stringify(a))).join(" ");
     process.stderr.write(`[${localTimestamp()}][${level}] ${msg}\n`);
 }
-// ── 单实例保护（PID 锁 + TCP 端口互斥）─────────────────
-const workspaceDirs = [
-    process.env.LARK_WORKSPACE_DIR,
-    process.cwd(),
-].filter(Boolean);
-/**
- * PID 文件始终放在用户主目录下，避免因 CWD 不同导致多实例互相看不到。
- * 文件名含 APP_ID 哈希，保证不同应用不冲突。
- */
-function resolvePidFilePath() {
-    const suffix = APP_ID ? `-${APP_ID.slice(-8)}` : "";
-    const homeDir = os.homedir();
-    const dir = path.join(homeDir, ".lark-bridge-mcp");
-    if (!fs.existsSync(dir)) {
-        try {
-            fs.mkdirSync(dir, { recursive: true });
-        }
-        catch { /* ignore */ }
-    }
-    return path.join(dir, `mcp${suffix}.pid`);
-}
-const MCP_PID_FILE = resolvePidFilePath();
-/** 计算互斥端口号：基于 APP_ID 的确定性端口，范围 49152-65535 */
-function getSingletonPort() {
-    const base = APP_ID || "lark-bridge-default";
-    let hash = 0;
-    for (let i = 0; i < base.length; i++) {
-        hash = ((hash << 5) - hash + base.charCodeAt(i)) | 0;
-    }
-    return 49152 + (Math.abs(hash) % (65535 - 49152));
-}
-const SINGLETON_PORT = getSingletonPort();
-function forceKillPid(pid) {
-    try {
-        if (process.platform === "win32") {
-            cp.execSync(`taskkill /F /PID ${pid}`, { stdio: "ignore", timeout: 5000 });
-        }
-        else {
-            process.kill(pid, "SIGKILL");
-        }
-    }
-    catch { /* best-effort */ }
-}
-function isProcessAlive(pid) {
-    try {
-        process.kill(pid, 0);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-function killPreviousInstance() {
-    try {
-        if (!fs.existsSync(MCP_PID_FILE))
-            return;
-        const raw = fs.readFileSync(MCP_PID_FILE, "utf-8").trim();
-        const pids = raw.split(/[\r\n,]+/).map((s) => parseInt(s.trim(), 10)).filter((n) => !isNaN(n) && n !== process.pid);
-        for (const oldPid of pids) {
-            if (!isProcessAlive(oldPid))
-                continue;
-            log("WARN", `发现旧 MCP 进程 (PID=${oldPid})，正在强制终止...`);
-            forceKillPid(oldPid);
-            setTimeout(() => {
-                if (isProcessAlive(oldPid)) {
-                    log("WARN", `PID=${oldPid} 仍存活，重试 taskkill...`);
-                    forceKillPid(oldPid);
-                }
-            }, 1000);
-        }
-    }
-    catch (e) {
-        log("WARN", `清理旧进程失败: ${e?.message ?? e}`);
-    }
-}
-/** 通过 TCP 端口通知旧实例退出 */
-async function requestOldInstanceShutdown() {
-    return new Promise((resolve) => {
-        const client = net.createConnection({ port: SINGLETON_PORT, host: "127.0.0.1" }, () => {
-            client.write("shutdown");
-            client.end();
-        });
-        client.on("data", () => { });
-        client.on("end", () => { setTimeout(resolve, 500); });
-        client.on("error", () => { resolve(); });
-        client.setTimeout(3000, () => { client.destroy(); resolve(); });
-    });
-}
-let singletonServer = null;
-/** 启动 TCP 互斥锁服务器 —— 收到 shutdown 立即退出 */
-function startSingletonGuard() {
-    singletonServer = net.createServer((socket) => {
-        socket.on("data", (data) => {
-            if (data.toString().trim() === "shutdown") {
-                log("INFO", "收到新实例的 shutdown 指令，即将退出...");
-                socket.end("ok");
-                gracefulShutdown("singleton-replaced");
-            }
-        });
-    });
-    singletonServer.on("error", (err) => {
-        if (err.code === "EADDRINUSE") {
-            log("WARN", `互斥端口 ${SINGLETON_PORT} 被占用（旧实例仍在监听），已通过 PID 文件兜底`);
-        }
-    });
-    singletonServer.listen(SINGLETON_PORT, "127.0.0.1", () => {
-        log("INFO", `单实例守卫已启动 (port=${SINGLETON_PORT})`);
-    });
-    singletonServer.unref();
-}
-function writePidFile() {
-    try {
-        const dir = path.dirname(MCP_PID_FILE);
-        if (!fs.existsSync(dir))
-            fs.mkdirSync(dir, { recursive: true });
-        fs.writeFileSync(MCP_PID_FILE, String(process.pid), "utf-8");
-        const cleanup = () => {
-            try {
-                fs.unlinkSync(MCP_PID_FILE);
-            }
-            catch { /* best-effort */ }
-        };
-        process.on("exit", cleanup);
-        process.on("SIGTERM", () => { cleanup(); process.exit(0); });
-        process.on("SIGINT", () => { cleanup(); process.exit(0); });
-    }
-    catch (e) {
-        log("WARN", `写入 PID 文件失败: ${e?.message ?? e}`);
-    }
-}
-// ── 优雅退出 ─────────────────────────────────────────────
+// ── 优雅退出（stdio 断开检测，防止僵尸进程）────────────
 let isShuttingDown = false;
 function gracefulShutdown(reason) {
     if (isShuttingDown)
         return;
     isShuttingDown = true;
     log("INFO", `进程退出中 (reason=${reason}, PID=${process.pid})`);
-    try {
-        if (singletonServer)
-            singletonServer.close();
-    }
-    catch { /* ignore */ }
-    try {
-        fs.unlinkSync(MCP_PID_FILE);
-    }
-    catch { /* ignore */ }
     setTimeout(() => process.exit(0), 300);
 }
-// ── Daemon HTTP 客户端 ──────────────────────────────────
-let daemonBaseUrl = "";
-function findDaemonPort() {
-    const envPort = process.env.LARK_DAEMON_PORT;
-    if (envPort) {
-        const p = Number(envPort);
-        if (p > 0) {
-            log("INFO", `从 LARK_DAEMON_PORT 环境变量获取端口: ${p}`);
-            return p;
-        }
-    }
-    for (const ws of workspaceDirs) {
-        const lockPath = path.join(ws, ".cursor", ".lark-daemon.json");
-        try {
-            const raw = fs.readFileSync(lockPath, "utf-8");
-            const data = JSON.parse(raw);
-            if (data.port)
-                return Number(data.port);
-        }
-        catch { /* lock not found */ }
-    }
-    return null;
-}
-function httpRequest(method, urlPath, body, timeoutMs = 30_000) {
-    return new Promise((resolve, reject) => {
-        const url = new URL(urlPath, daemonBaseUrl);
-        const payload = body ? JSON.stringify(body) : undefined;
-        const req = http.request(url, {
-            method,
-            headers: payload
-                ? { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(payload) }
-                : undefined,
-            timeout: timeoutMs,
-        }, (res) => {
-            let data = "";
-            res.on("data", (c) => (data += c));
-            res.on("end", () => {
-                try {
-                    resolve(JSON.parse(data));
-                }
-                catch {
-                    resolve(data);
-                }
-            });
-        });
-        req.on("error", reject);
-        req.on("timeout", () => { req.destroy(); reject(new Error("timeout")); });
-        if (payload)
-            req.write(payload);
-        req.end();
-    });
-}
-async function pingDaemon(port) {
-    try {
-        const resp = await httpRequest("GET", `/health`);
-        return resp?.status === "ok";
-    }
-    catch {
-        return false;
-    }
-}
 let resolvedTarget = null;
 let autoOpenId = "";
-let embeddedMode = false;
 const larkClient = new Lark.Client({
     appId: APP_ID, appSecret: APP_SECRET,
     appType: Lark.AppType.SelfBuild,
@@ -329,7 +126,8 @@ function getSendTarget() {
         return { receiveIdType: "open_id", receiveId: autoOpenId };
     return null;
 }
-async function embeddedSendMessage(text) {
+// ── 发送（始终直接调用 Lark API）──────────────────────────
+async function sendMessage(text) {
     const target = getSendTarget();
     if (!target) {
         log("WARN", "无发送目标");
@@ -346,7 +144,7 @@ async function embeddedSendMessage(text) {
         log("ERROR", `飞书发送异常: ${e?.message ?? e}`);
     }
 }
-async function embeddedSendImage(imagePath) {
+async function sendImage(imagePath) {
     const target = getSendTarget();
     if (!target) {
         log("WARN", "无发送目标");
@@ -374,7 +172,7 @@ async function embeddedSendImage(imagePath) {
         log("ERROR", `发送图片异常: ${e?.message ?? e}`);
     }
 }
-async function embeddedSendFile(filePath) {
+async function sendFile(filePath) {
     const target = getSendTarget();
     if (!target) {
         log("WARN", "无发送目标");
@@ -403,6 +201,7 @@ async function embeddedSendFile(filePath) {
         log("ERROR", `发送文件异常: ${e?.message ?? e}`);
     }
 }
+// ── 接收（WebSocket → 共享文件队列 → poll 读取）──────────
 const IMAGE_DOWNLOAD_DIR = path.join(os.tmpdir(), "lark-bridge-images");
 async function downloadLarkImage(messageId, imageKey) {
     try {
@@ -481,75 +280,18 @@ async function processIncomingMessage(messageId, messageType, content) {
     }
     return parts.join("\n");
 }
-const messageQueue = [];
-const pollWaiters = [];
-const processedMessageIds = new Set();
 function pushMessage(content, messageId) {
-    if (!content || !content.trim()) {
+    if (!content?.trim()) {
         log("WARN", `丢弃空消息 (messageId=${messageId})`);
         return;
     }
-    if (messageId) {
-        if (processedMessageIds.has(messageId))
-            return;
-        processedMessageIds.add(messageId);
-        if (processedMessageIds.size > 200) {
-            const first = processedMessageIds.values().next().value;
-            if (first !== undefined)
-                processedMessageIds.delete(first);
-        }
-    }
-    log("INFO", `pushMessage: "${content.slice(0, 60)}", waiters=${pollWaiters.length}, queue=${messageQueue.length}`);
-    while (pollWaiters.length > 0) {
-        const waiter = pollWaiters.shift();
-        clearTimeout(waiter.timer);
-        waiter.resolve(content);
-        return;
-    }
-    messageQueue.push(content);
-}
-function drainEmptyMessages() {
-    while (messageQueue.length > 0 && !messageQueue[0]?.trim()) {
-        messageQueue.shift();
+    const written = pushToFileQueue(content, messageId, `mcp-${process.pid}`);
+    if (written) {
+        log("INFO", `消息已写入共享队列: "${content.slice(0, 60)}" (id=${messageId ?? "none"})`);
     }
-}
-function pullMessage(timeoutMs) {
-    drainEmptyMessages();
-    if (messageQueue.length > 0) {
-        const msg = messageQueue.shift();
-        log("INFO", `pullMessage: 从队列取出 "${msg.slice(0, 40)}", 剩余=${messageQueue.length}`);
-        return Promise.resolve(msg);
-    }
-    log("INFO", `pullMessage: 队列为空, 创建 waiter (timeout=${timeoutMs}ms)`);
-    return new Promise((resolve) => {
-        const entry = {
-            resolve,
-            timer: setTimeout(() => {
-                const idx = pollWaiters.indexOf(entry);
-                if (idx >= 0)
-                    pollWaiters.splice(idx, 1);
-                log("INFO", `pullMessage: waiter 超时 (${timeoutMs}ms), queue=${messageQueue.length}`);
-                resolve(null);
-            }, timeoutMs),
-        };
-        pollWaiters.push(entry);
-    });
-}
-async function waitForReply(timeoutMs) {
-    const first = await pullMessage(timeoutMs);
-    if (first === null)
-        return null;
-    const messages = [first];
-    while (messageQueue.length > 0) {
-        const next = messageQueue[0];
-        if (!next?.trim()) {
-            messageQueue.shift();
-            continue;
-        }
-        messages.push(messageQueue.shift());
+    else {
+        log("INFO", `消息已跳过（重复或写入失败）: id=${messageId ?? "none"}`);
     }
-    log("INFO", `waitForReply: 返回 ${messages.length} 条消息, 剩余队列=${messageQueue.length}`);
-    return messages.join("\n");
 }
 function startLarkConnection() {
     const eventDispatcher = new Lark.EventDispatcher(ENCRYPT_KEY ? { encryptKey: ENCRYPT_KEY } : {}).register({
@@ -589,41 +331,8 @@ function startLarkConnection() {
     const wsClient = new Lark.WSClient({ appId: APP_ID, appSecret: APP_SECRET, loggerLevel: Lark.LoggerLevel.error });
     wsClient.start({ eventDispatcher }).then(() => log("INFO", "飞书 WebSocket 连接建立成功")).catch((e) => log("ERROR", `飞书 WebSocket 连接失败: ${e?.message ?? e}`));
 }
-// ── 统一 API（daemon 代理 / 内嵌）─────────────────────────
-async function sendMessage(text) {
-    if (!embeddedMode) {
-        await httpRequest("POST", "/send", { text });
-    }
-    else {
-        await embeddedSendMessage(text);
-    }
-}
-async function sendImage(imagePath) {
-    if (!embeddedMode) {
-        await httpRequest("POST", "/send-image", { image_path: imagePath });
-    }
-    else {
-        await embeddedSendImage(imagePath);
-    }
-}
-async function sendFile(filePath) {
-    if (!embeddedMode) {
-        await httpRequest("POST", "/send-file", { file_path: filePath });
-    }
-    else {
-        await embeddedSendFile(filePath);
-    }
-}
-async function pollReply(timeoutMs) {
-    if (!embeddedMode) {
-        const httpTimeout = timeoutMs + 10_000;
-        const resp = await httpRequest("GET", `/poll?timeout=${timeoutMs}`, undefined, httpTimeout);
-        return resp?.message ?? null;
-    }
-    return await waitForReply(timeoutMs);
-}
 // ── MCP Server ──────────────────────────────────────────
-const mcpServer = new McpServer({ name: "feishu-cursor-bridge", version: "2.2.8", description: "飞书消息桥接 – 通过飞书与用户沟通" });
+const mcpServer = new McpServer({ name: "feishu-cursor-bridge", version: "2.3.1", description: "飞书消息桥接 – 通过飞书与用户沟通" });
 mcpServer.tool("sync_message", "飞书消息同步工具。传 message 则发送消息；传 timeout_seconds 则等待用户回复；两者同时传则先发送再等待。均不传时仅检查待处理消息。", {
     message: z.string().optional().describe("要发送给用户的消息内容。不传则不发送"),
     timeout_seconds: z.number().optional().describe("等待用户回复的超时秒数。不传则不等待，立即返回"),
@@ -633,7 +342,7 @@ mcpServer.tool("sync_message", "飞书消息同步工具。传 message 则发送
             await sendMessage(message);
         const timeoutMs = (timeout_seconds && timeout_seconds > 0) ? timeout_seconds * 1000 : 0;
         if (timeoutMs > 0) {
-            const reply = await pollReply(timeoutMs);
+            const reply = await pollFileQueueBatch(timeoutMs);
             if (reply === null)
                 return { content: [{ type: "text", text: "[waiting]" }] };
             return { content: [{ type: "text", text: reply }] };
@@ -648,68 +357,22 @@ mcpServer.tool("sync_message", "飞书消息同步工具。传 message 则发送
 mcpServer.tool("send_image", "发送本地图片到飞书。image_path 为本地文件绝对路径。", { image_path: z.string().describe("图片绝对路径") }, async ({ image_path }) => { await sendImage(image_path); return { content: [{ type: "text", text: "图片已发送" }] }; });
 mcpServer.tool("send_file", "发送本地文件到飞书。file_path 为本地文件绝对路径。", { file_path: z.string().describe("文件绝对路径") }, async ({ file_path }) => { await sendFile(file_path); return { content: [{ type: "text", text: "文件已发送" }] }; });
 // ── 主函数 ───────────────────────────────────────────────
-async function tryConnectDaemon(maxRetries = 3, retryDelayMs = 2000) {
-    for (let attempt = 1; attempt <= maxRetries; attempt++) {
-        const port = findDaemonPort();
-        if (port) {
-            daemonBaseUrl = `http://127.0.0.1:${port}`;
-            const alive = await pingDaemon(port);
-            if (alive) {
-                embeddedMode = false;
-                log("INFO", `已连接 daemon (port=${port})，代理模式${attempt > 1 ? ` (第${attempt}次尝试)` : ""}`);
-                return true;
-            }
-            log("WARN", `daemon lock 存在但无响应 (port=${port})${attempt < maxRetries ? "，稍后重试..." : ""}`);
-        }
-        else {
-            log("INFO", `未检测到 daemon${attempt < maxRetries ? "，稍后重试..." : ""}`);
-        }
-        if (attempt < maxRetries)
-            await new Promise((r) => setTimeout(r, retryDelayMs));
-    }
-    return false;
-}
 export async function main() {
+    if (!APP_ID || !APP_SECRET) {
+        log("ERROR", "LARK_APP_ID / LARK_APP_SECRET 未配置");
+        process.exit(1);
+    }
     log("INFO", "════════════════════════════════════════════════");
-    log("INFO", `feishu-cursor-bridge MCP v2.2.8 启动 (PID=${process.pid})`);
-    log("INFO", `workspaceDirs: ${JSON.stringify(workspaceDirs)}`);
-    log("INFO", `PID 文件: ${MCP_PID_FILE}`);
-    log("INFO", `互斥端口: ${SINGLETON_PORT}`);
+    log("INFO", `feishu-cursor-bridge MCP v2.3.1 启动 (PID=${process.pid})`);
     log("INFO", "════════════════════════════════════════════════");
-    // 第一步：通过 TCP 端口通知旧实例退出
-    await requestOldInstanceShutdown();
-    // 第二步：通过 PID 文件兜底杀死旧进程
-    killPreviousInstance();
-    // 第三步：写入新 PID 并启动互斥守卫
-    writePidFile();
-    startSingletonGuard();
-    const hasDaemonPortHint = !!process.env.LARK_DAEMON_PORT;
-    const connected = await tryConnectDaemon(hasDaemonPortHint ? 5 : 3, 2000);
-    if (!connected) {
-        if (hasDaemonPortHint) {
-            log("ERROR", "应用版模式下 daemon 不可达，MCP 将以纯代理模式运行（无内嵌 WebSocket，避免连接冲突）");
-            embeddedMode = false;
-            daemonBaseUrl = `http://127.0.0.1:${process.env.LARK_DAEMON_PORT}`;
-        }
-        else {
-            log("INFO", "降级为内嵌模式");
-            embeddedMode = true;
-        }
-    }
-    if (embeddedMode) {
-        if (!APP_ID || !APP_SECRET) {
-            log("ERROR", "LARK_APP_ID / LARK_APP_SECRET 未配置");
-            process.exit(1);
-        }
-        await initSendTarget();
-        startLarkConnection();
-    }
+    const queueDir = initFileQueue(APP_ID);
+    log("INFO", `共享文件队列: ${queueDir}`);
+    cleanupStaleMessages();
+    await initSendTarget();
+    startLarkConnection();
     const transport = new StdioServerTransport();
     await mcpServer.connect(transport);
-    log("INFO", `MCP Server 已连接 stdio ✓ (${embeddedMode ? "内嵌" : "代理"}模式)`);
-    // ── 关键：检测 stdio 断开后强制退出 ──
-    // 当 Cursor 关闭会话时 stdin 会关闭，但 Lark WebSocket 保持事件循环存活，
-    // 导致进程成为"僵尸"继续抢占飞书消息。
+    log("INFO", "MCP Server 已连接 stdio ✓");
     transport.onclose = () => {
         gracefulShutdown("transport-closed");
     };
@@ -719,7 +382,6 @@ export async function main() {
     process.stdin.on("close", () => {
         gracefulShutdown("stdin-close");
     });
-    // Windows 下 stdin 可能不触发 end/close，通过 readable 状态轮询兜底
     if (process.platform === "win32") {
         const stdinWatchdog = setInterval(() => {
             if (process.stdin.destroyed || !process.stdin.readable) {