diff --git a/integrations/feishu-bridge/src/index.mjs b/integrations/feishu-bridge/src/index.mjs index 535ebd061..0a485b5c9 100644 --- a/integrations/feishu-bridge/src/index.mjs +++ b/integrations/feishu-bridge/src/index.mjs @@ -145,6 +145,29 @@ async function handleIncomingMessage(event) { const identity = incomingIdentity(event); if (!identity.chatId) return; + // Store the incoming message ID so sendText() can reply inside the same + // Feishu thread/topic — without this, every bot message creates a new + // standalone topic in thread-enabled groups. + // / 缓存入站消息 ID，让 sendText 能通过 reply API 在同一话题内回复。 + // / 否则每条 bot 消息都会在话题群中创建独立的新话题（见 #1710）。 + if (identity.messageId) { + const existing = await threadStore.getChat(identity.chatId); + if (existing) { + await threadStore.patchChat(identity.chatId, { + replyToMessageId: identity.messageId, + updatedAt: new Date().toISOString() + }); + } else { + await threadStore.setChat(identity.chatId, { + replyToMessageId: identity.messageId, + threadId: null, + lastSeq: 0, + activeTurnId: null, + updatedAt: new Date().toISOString() + }); + } + } + if (identity.messageType && identity.messageType !== "text") { await sendText(identity.chatId, "Only text messages are supported in this first bridge."); return; @@ -208,6 +231,9 @@ async function handleCommand(chatId, command) { case "approval": await decideApproval(chatId, action); return; + case "set_model": + await setChatModel(chatId, action.modelName); + return; case "prompt": await runPrompt(chatId, action.prompt); return; @@ -220,10 +246,14 @@ async function ensureThread(chatId, { forceNew = false } = {}) { const existing = await threadStore.getChat(chatId); if (existing?.threadId && !forceNew) return existing; + // Use per-chat model if set, fall back to bridge-level default. + // / 优先使用 per-chat 模型（/model 命令设置），否则用桥接级别的默认模型。 + const effectiveModel = existing?.model || config.model; + const thread = await runtimeJson("/v1/threads", { method: "POST", body: { - model: config.model, + model: effectiveModel, workspace: config.workspace, mode: config.mode, allow_shell: config.allowShell, @@ -251,6 +281,10 @@ async function runPrompt(chatId, prompt) { return; } const state = await ensureThread(chatId); + // Use per-chat model for this turn (may differ from the thread's + // creation model if the user ran /model after the thread was created). + // / 使用 per-chat 模型执行本轮对话（如果用户在创建线程后切换过模型）。 + const effectiveModel = state?.model || config.model; const detail = await runtimeJson(`/v1/threads/${encodeURIComponent(state.threadId)}`); const activeBlock = activeTurnBlock(detail, state); if (activeBlock) { @@ -273,7 +307,7 @@ async function runPrompt(chatId, prompt) { body: { prompt, input_summary: prompt.slice(0, 200), - model: config.model, + model: effectiveModel, mode: config.mode, allow_shell: config.allowShell, trust_mode: config.trustMode, @@ -530,22 +564,59 @@ async function decideApproval(chatId, action) { await sendText(chatId, `Approval ${approvalId}: ${decision}${remember ? " and remember" : ""}`); } +async function setChatModel(chatId, modelName) { + // /model — set per-chat model; "default" or empty resets to bridge default. + // / /model "default" 或空参数 — 恢复桥接级别的默认模型。 + if (!modelName || modelName === "default") { + await threadStore.patchChat(chatId, { + model: null, + updatedAt: new Date().toISOString() + }); + await sendText(chatId, `Reset per-chat model. Using bridge default: ${config.model}`); + return; + } + await threadStore.patchChat(chatId, { + model: modelName, + updatedAt: new Date().toISOString() + }); + await sendText(chatId, `Per-chat model set to: ${modelName}`); +} + async function sendText(chatId, text) { + // Try reply API first — keeps bot responses inside the same Feishu + // thread/topic instead of spawning new standalone topics. + // / 优先使用 reply API，确保 bot 回复留在话题群的同一条话题内。 + const state = await threadStore.getChat(chatId); + const replyToMessageId = state?.replyToMessageId || null; + + const replyMessage = + replyToMessageId + ? client.im?.v1?.message?.reply?.bind(client.im.v1.message) || + client.im?.message?.reply?.bind(client.im.message) + : null; const createMessage = client.im?.v1?.message?.create?.bind(client.im.v1.message) || client.im?.message?.create?.bind(client.im.message); if (!createMessage) { throw new Error("Lark SDK client does not expose im message create API"); } + for (const chunk of splitMessage(text, config.maxReplyChars)) { - await createMessage({ - params: { receive_id_type: "chat_id" }, - data: { - receive_id: chatId, - msg_type: "text", - content: JSON.stringify({ text: chunk }) - } - }); + const body = { + msg_type: "text", + content: JSON.stringify({ text: chunk }) + }; + if (replyMessage) { + await replyMessage({ + path: { message_id: replyToMessageId }, + data: body + }); + } else { + await createMessage({ + params: { receive_id_type: "chat_id" }, + data: { ...body, receive_id: chatId } + }); + } } } diff --git a/integrations/feishu-bridge/src/lib.mjs b/integrations/feishu-bridge/src/lib.mjs index a16daf936..2408fe811 100644 --- a/integrations/feishu-bridge/src/lib.mjs +++ b/integrations/feishu-bridge/src/lib.mjs @@ -67,7 +67,13 @@ export function incomingIdentity(event) { messageType: message.message_type || "", openId: sender.open_id || "", unionId: sender.union_id || "", - userId: sender.user_id || "" + userId: sender.user_id || "", + // Thread/topic group context: these fields let the bridge reply + // inside the same topic instead of spawning a new standalone topic. + // / 话题群上下文：用于在同一话题内回复，而非新建独立话题。 + parentId: message.parent_id || "", + rootId: message.root_id || "", + threadId: message.thread_id || "" }; } @@ -141,6 +147,11 @@ export function commandAction(command) { return { kind: "interrupt" }; case "compact": return { kind: "compact" }; + case "model": + // /model — switch per-chat default model. + // Stored in thread store and used for future threads/turns. + // Pass "default" to reset to the bridge-level default. + return { kind: "set_model", modelName: command.args }; case "allow": return { kind: "approval", decision: "allow", ...parseApprovalDecisionArgs(command.args) }; case "deny":