diff --git a/CHANGELOG.md b/CHANGELOG.md index 229774de30..a6e9a76d13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ WeChat original voice can be prepared for playback, native quotes and retained l ### Added +- One Bot can bind several apps of the same platform, such as two Lark apps: each app's DMs and @mentions reach the same Inbox and replies go out through the app that received them. **Bind app** lists every connected app and greys out the ones a Bot already uses, naming that Bot, and External identities lists the Bot's apps grouped by platform. A shared reply from a Bot with two apps in the same group refuses with a clear message ([#1110](https://github.com/BotHarness/BotHarness/issues/1110), [External identities guide](docs/channel-sidebar/external-identities.md)). + - An app's conversation list in **Edit identity** is now manageable: conversations sort into **Waiting**, **Active**, **Muted** and **Blocked**. **Mute** keeps messages in the Inbox without waking the Bot, **Rules** edits one group's collection and wake, and **Block** (confirmed) cancels unsent replies and keeps the conversation out even after restart or unbinding and rebinding; **Allow again** starts fresh with no backfill. A new **New conversations** setting chooses **Admit automatically** or **Ask me first**; waiting conversations keep only names and counts, never message text. At most 20 new conversations per app join automatically each hour and 500 stay active; beyond that they wait with the reason shown ([#1109](https://github.com/BotHarness/BotHarness/issues/1109), [External identities guide](docs/channel-sidebar/external-identities.md)). - Slack, Discord and personal WeChat bind in one step too: after **Bind app**, DMs to a Slack or Discord app and @mentions of it in channels go straight to the Bot's Inbox with replies in the same thread; personal WeChat admits only DMs from the person who scanned it, never other contacts or groups. The bind dialog shows the real receiving state on every platform, and recorded group conversations follow the platform's global group intake and wake defaults ([#1112](https://github.com/BotHarness/BotHarness/issues/1112), [External identities guide](docs/channel-sidebar/external-identities.md)). diff --git a/CHANGELOG.zh.md b/CHANGELOG.zh.md index 433a8d34fa..e2c03f34e6 100644 --- a/CHANGELOG.zh.md +++ b/CHANGELOG.zh.md @@ -9,6 +9,8 @@ ### Added +- 一个 Bot 可以绑定同一平台的多个应用，例如两个飞书应用：每个应用的私聊和 @ 都进入同一个收件箱，并通过收到消息的应用回复。**绑定应用** 列出所有已连接的应用，已被 Bot 使用的应用置灰并注明是哪个 Bot；外部身份按平台列出这个 Bot 的应用。Bot 在同一个群里有两个应用时，转发来源的回复会明确拒绝（[#1110](https://github.com/BotHarness/BotHarness/issues/1110)，[外部身份教程](docs/channel-sidebar/external-identities.md)）。 + - **编辑外部身份** 里的会话列表现在可以管理：会话分为 **等待处理**、**活跃**、**已静音**、**已屏蔽**。**静音** 后消息照常进入收件箱但不唤醒 Bot，**规则** 单独调整一个群的收件和唤醒，**屏蔽**（需确认）会取消未发出的回复，重启、解绑再绑定后依然有效；**再次允许** 从下一条消息重新开始，不补收。新增 **新会话** 设置，可选 **自动接收** 或 **先问我**；等待中的会话只记录名称和次数，不保存消息内容。每个应用每小时最多自动加入 20 个新会话、最多 500 个活跃会话，超出时进入等待并显示原因（[#1109](https://github.com/BotHarness/BotHarness/issues/1109)，[外部身份教程](docs/channel-sidebar/external-identities.md)）。 - Slack、Discord 和个人微信也能一步绑定：**绑定应用** 后，私聊 Slack 或 Discord 应用、或在频道里 @ 它，消息直接进入 Bot 收件箱并在原话题回复；个人微信只接收扫码者本人的私聊，其他联系人和群不会进入。绑定弹窗对所有平台显示真实接收状态，已记下的群会话跟随平台全局默认的群收件和唤醒设置（[#1112](https://github.com/BotHarness/BotHarness/issues/1112)，[外部身份教程](docs/channel-sidebar/external-identities.md)）。 diff --git a/docs/assets/pr/1110-several-apps/README.md b/docs/assets/pr/1110-several-apps/README.md new file mode 100644 index 0000000000..4ca9fc0cdf --- /dev/null +++ b/docs/assets/pr/1110-several-apps/README.md @@ -0,0 +1,16 @@ +# #1110 Several apps per platform + +Captured from a real DSH Host (0.2.0-rc.1) with a simulated Lark provider that exposes four apps: Ada has two Lark apps, Bob has one, and one is unbound. The Bind app shots are opened from Bob. + +## Before + +A Bot could bind only one app per platform. Bind app greyed out a second Lark app, and nothing showed which Bot used which app. + +## After + +| | zh light | en dark | +| ------------------------------------------- | ----------------------------- | ---------------------------- | +| Two Lark apps on Ada | ![](identities-zh-light.webp) | ![](identities-en-dark.webp) | +| Bind app lists every app with its owner Bot | ![](bind-all-zh-light.webp) | ![](bind-all-en-dark.webp) | + +The remaining light/dark and zh/en variants are in this folder. diff --git a/docs/assets/pr/1110-several-apps/bind-all-en-dark.webp b/docs/assets/pr/1110-several-apps/bind-all-en-dark.webp new file mode 100644 index 0000000000..7fd0194360 Binary files /dev/null and b/docs/assets/pr/1110-several-apps/bind-all-en-dark.webp differ diff --git a/docs/assets/pr/1110-several-apps/bind-all-en-light.webp b/docs/assets/pr/1110-several-apps/bind-all-en-light.webp new file mode 100644 index 0000000000..95ff86a396 Binary files /dev/null and b/docs/assets/pr/1110-several-apps/bind-all-en-light.webp differ diff --git a/docs/assets/pr/1110-several-apps/bind-all-zh-dark.webp b/docs/assets/pr/1110-several-apps/bind-all-zh-dark.webp new file mode 100644 index 0000000000..ce84cd5cd6 Binary files /dev/null and b/docs/assets/pr/1110-several-apps/bind-all-zh-dark.webp differ diff --git a/docs/assets/pr/1110-several-apps/bind-all-zh-light.webp b/docs/assets/pr/1110-several-apps/bind-all-zh-light.webp new file mode 100644 index 0000000000..dfbde8d97e Binary files /dev/null and b/docs/assets/pr/1110-several-apps/bind-all-zh-light.webp differ diff --git a/docs/assets/pr/1110-several-apps/identities-en-dark.webp b/docs/assets/pr/1110-several-apps/identities-en-dark.webp new file mode 100644 index 0000000000..319cdaa9a3 Binary files /dev/null and b/docs/assets/pr/1110-several-apps/identities-en-dark.webp differ diff --git a/docs/assets/pr/1110-several-apps/identities-en-light.webp b/docs/assets/pr/1110-several-apps/identities-en-light.webp new file mode 100644 index 0000000000..0172bf24ce Binary files /dev/null and b/docs/assets/pr/1110-several-apps/identities-en-light.webp differ diff --git a/docs/assets/pr/1110-several-apps/identities-zh-dark.webp b/docs/assets/pr/1110-several-apps/identities-zh-dark.webp new file mode 100644 index 0000000000..32d283cb5e Binary files /dev/null and b/docs/assets/pr/1110-several-apps/identities-zh-dark.webp differ diff --git a/docs/assets/pr/1110-several-apps/identities-zh-light.webp b/docs/assets/pr/1110-several-apps/identities-zh-light.webp new file mode 100644 index 0000000000..48e4d0ab53 Binary files /dev/null and b/docs/assets/pr/1110-several-apps/identities-zh-light.webp differ diff --git a/docs/channel-sidebar/external-identities.md b/docs/channel-sidebar/external-identities.md index 7d05677710..f76ab27ee4 100644 --- a/docs/channel-sidebar/external-identities.md +++ b/docs/channel-sidebar/external-identities.md @@ -1,6 +1,6 @@ # External identities -Open **Bot DM → Channel sidebar → External identities**. It lists the external apps bound to this Bot (Lark / Feishu, Slack, Discord, WeChat and so on). An app belongs to exactly one Bot; other Bots cannot borrow it. +Open **Bot DM → Channel sidebar → External identities**. It lists the external apps bound to this Bot (Lark / Feishu, Slack, Discord, WeChat and so on). An app belongs to exactly one Bot; other Bots cannot borrow it. A Bot can bind several apps, including several of the same platform (for example two Lark apps): each app receives its own DMs and @mentions into the same Inbox, and the Bot replies through the app that received the message. Apps are listed grouped by platform. **Binding an app is enough.** Once bound, DMs to the app and @mentions of it in groups it belongs to go straight to this Bot’s Inbox, and the Bot replies in the same conversation. You don’t need a saved delivery target, a conversation authorization or a reception switch. Who can reach the app is decided by each platform's settings, such as Lark's availability scope, group membership and app permissions, or Discord's channel permissions. @@ -22,7 +22,7 @@ The same goes for Slack and Discord: DM the app or @mention it in a channel it b 1. First connect the app under **Settings → IM Bots**, following the guide for your platform. 2. Click **+ Bind app**. -3. Choose the connected app under **App**. The dropdown is searchable: type to filter. +3. Choose the connected app under **App**. The dropdown is searchable: type to filter. Every connected app is listed: apps a Bot already uses are greyed out and say which Bot (or **already bound to this Bot**), and disconnected apps say **not connected**. **Manage app credentials** opens **Settings → IM bots**. 4. Click **Bind app**. The dialog then shows the real receiving state: - **Ready**: DMs and @mentions to the app now reach this Bot’s Inbox. - **Connecting**: the app is still opening its receiver. Wait a moment. diff --git a/docs/channel-sidebar/external-identities.zh.md b/docs/channel-sidebar/external-identities.zh.md index 4f5b4b74ba..f6ade474d6 100644 --- a/docs/channel-sidebar/external-identities.zh.md +++ b/docs/channel-sidebar/external-identities.zh.md @@ -1,6 +1,6 @@ # 外部身份 -打开 **Bot 私聊 → Channel sidebar → 外部身份**。这里列出绑定给这个 Bot 的外部应用（Lark / 飞书、Slack、Discord、微信等）。一个应用只属于一个 Bot，其他 Bot 不能借用。 +打开 **Bot 私聊 → Channel sidebar → 外部身份**。这里列出绑定给这个 Bot 的外部应用（Lark / 飞书、Slack、Discord、微信等）。一个应用只属于一个 Bot，其他 Bot 不能借用。一个 Bot 可以绑定多个应用，同一平台也可以绑定多个（例如两个飞书应用）：每个应用各自的私聊和 @ 都进入同一个收件箱，Bot 通过收到消息的那个应用回复。应用按平台分组列出。 **绑定应用就够了。** 绑定后，私聊这个应用、或在它所在的群里 @ 它，消息会直接进入这个 Bot 的收件箱，Bot 在原会话回复。不需要保存投递目标，也不需要授权会话或打开收件开关。谁能联系到这个应用，由各平台的设置决定，例如飞书的可用范围、群成员和应用权限，或 Discord 的频道权限。 @@ -22,7 +22,7 @@ Slack 和 Discord 同样适用：私聊应用、或在它所在的频道里 @ 1. 先按对应平台的教程，在 **设置 → IM机器人** 连接应用。 2. 点击 **+ 绑定应用**。 -3. 在 **应用** 中选择已连接的应用。下拉框支持搜索，输入文字即可筛选。 +3. 在 **应用** 中选择已连接的应用。下拉框支持搜索，输入文字即可筛选。这里列出所有已连接的应用：已被 Bot 使用的应用置灰，并注明是哪个 Bot（或 **已绑定到这个 Bot**）；未连接的应用注明 **未连接**。**管理应用凭据** 会打开 **设置 → IM机器人**。 4. 点击 **绑定应用**。弹窗随后显示真实的接收状态： - **已就绪**：发给这个应用的私聊和群里 @ 它的消息，现在会进入这个 Bot 的收件箱。 - **正在连接**：应用正在建立接收连接，稍等片刻。 diff --git a/packages/client/src/client/external-entries.tsx b/packages/client/src/client/external-entries.tsx index 4f21c70020..0714a61620 100644 --- a/packages/client/src/client/external-entries.tsx +++ b/packages/client/src/client/external-entries.tsx @@ -23,6 +23,7 @@ function IdentitiesForBot({ t: ChannelSidebarEntryProps['t']; }): ReactElement { const { snapshot, failed, refresh, mount } = useMessagingSnapshot(slug, actions); + const { bots } = useClientState(); const [panel, setPanel] = useState<'pairing' | 'approval'>(); const [busy, setBusy] = useState(false); const [scopeFailed, setScopeFailed] = useState<'pairing' | 'approval'>(); @@ -68,6 +69,7 @@ function IdentitiesForBot({ await actions.messagingGroupPolicy(slug, grantId, input); await refresh(); }} + botName={(owner) => bots.find((bot) => bot.slug === owner)?.displayName ?? owner} /> slug, }: { snapshot: MessagingSnapshot | undefined; t: BotHarnessTranslate; mutate(input: MessagingIdentityInput): Promise; conversation(input: MessagingConversationInput): Promise; rules(grantId: string, input: GroupReceptionInput): Promise; + botName?(slug: string): string; }): ReactElement { const [mode, setMode] = useState<'bind' | 'bound' | 'edit' | 'reconnect' | 'unbind'>(); const [selected, setSelected] = useState(); @@ -127,40 +130,46 @@ export function ExternalIdentityList({

) : null} - {identities.map((row) => ( - {t(AVAILABILITY[row.availability])}} - muted={!row.enabled} - hint={t('identity.editFor', { name: row.name })} - dialog - disabled={busy} - onClick={() => open('edit', row)} - trailing={ - - void operate(() => - mutate({ - kind: 'update', - id: row.id, - expectedRevision: row.revision, - name: row.name, - enabled, - }), - ) - } - /> - } - /> - ))} + {[...identities] + .sort( + (a, b) => + platform(a.platform).localeCompare(platform(b.platform)) || + a.createdAt.localeCompare(b.createdAt), + ) + .map((row) => ( + {t(AVAILABILITY[row.availability])}} + muted={!row.enabled} + hint={t('identity.editFor', { name: row.name })} + dialog + disabled={busy} + onClick={() => open('edit', row)} + trailing={ + + void operate(() => + mutate({ + kind: 'update', + id: row.id, + expectedRevision: row.revision, + name: row.name, + enabled, + }), + ) + } + /> + } + /> + ))} ({ - value: account.providerId + ':' + account.ref, - label: account.name, - hint: platform(account.platform), - disabled: - !account.connected || identities.some((i) => i.platform === account.platform), - }))} + options={[...accounts] + .sort( + (a, b) => + Number(a.boundBotSlug !== undefined || !a.connected) - + Number(b.boundBotSlug !== undefined || !b.connected) || + platform(a.platform).localeCompare(platform(b.platform)) || + a.name.localeCompare(b.name), + ) + .map((account) => ({ + value: account.providerId + ':' + account.ref, + label: account.name, + hint: + account.boundBotSlug === undefined + ? account.connected + ? platform(account.platform) + : t('identity.appOffline', { platform: platform(account.platform) }) + : identities.some( + (i) => + i.providerId === account.providerId && + i.accountRef === account.ref, + ) + ? t('identity.appThisBot', { platform: platform(account.platform) }) + : t('identity.appUsedBy', { + platform: platform(account.platform), + name: botName(account.boundBotSlug), + }), + disabled: !account.connected || account.boundBotSlug !== undefined, + }))} /> {!accounts.length ?

{t('im.setup')}

: null}

{t('identity.bindHint')}

+
+ +
) : mode === 'bound' && selectedAccount ? ( <> diff --git a/packages/client/src/client/locale.ts b/packages/client/src/client/locale.ts index a995282ec4..2df4dd0def 100644 --- a/packages/client/src/client/locale.ts +++ b/packages/client/src/client/locale.ts @@ -817,6 +817,10 @@ export const zh = { 'identity.kind.dm': '私聊', 'identity.kind.group': '群聊', 'identity.lastMessage': '最近消息 {time}', + 'identity.appUsedBy': '{platform} · 已被 {name} 使用', + 'identity.appThisBot': '{platform} · 已绑定到这个 Bot', + 'identity.appOffline': '{platform} · 未连接', + 'identity.manageApps': '管理应用凭据', 'identity.newConversations': '新会话', 'identity.newConversations.auto': '自动接收', 'identity.newConversations.ask': '先问我', @@ -860,7 +864,8 @@ export const zh = { 'identity.unbind': '解绑', 'identity.unbindFor': '解绑身份：{name}', 'identity.displayName': '本地显示名称', - 'identity.providerHint': '选择一个已在 IM 设置中连接的应用。应用凭据仍由 IM 插件管理。', + 'identity.providerHint': + '这里列出所有已在 IM 设置中连接的应用，以及各自绑定的 Bot。一个应用只属于一个 Bot。', 'identity.bindHint': '绑定后，私聊这个应用和在群里 @ 它的消息会直接进入这个 Bot 的收件箱，Bot 在原会话回复，不需要保存目标或授权会话。个人微信只接收扫码者本人的私聊。', 'identity.reconnectHint': @@ -2956,6 +2961,10 @@ My relationship with the Human, established lore and topics to avoid: [fill in]. 'identity.kind.dm': 'DM', 'identity.kind.group': 'Group', 'identity.lastMessage': 'Last message {time}', + 'identity.appUsedBy': '{platform} · used by {name}', + 'identity.appThisBot': '{platform} · already bound to this Bot', + 'identity.appOffline': '{platform} · not connected', + 'identity.manageApps': 'Manage app credentials', 'identity.newConversations': 'New conversations', 'identity.newConversations.auto': 'Admit automatically', 'identity.newConversations.ask': 'Ask me first', @@ -3003,7 +3012,7 @@ My relationship with the Human, established lore and topics to avoid: [fill in]. 'identity.unbindFor': 'Unbind identity: {name}', 'identity.displayName': 'Local display name', 'identity.providerHint': - 'Choose an app already connected in IM settings. The IM plugin keeps its credentials.', + 'Every app connected in IM settings is listed here with the Bot it is bound to. An app belongs to one Bot only.', 'identity.bindHint': 'Once bound, DMs to the app and @mentions of it in groups go straight to this Bot’s Inbox, and the Bot replies in place. No saved targets or conversation authorization needed. Personal WeChat only receives DMs from the person who scanned it.', 'identity.reconnectHint': diff --git a/packages/client/test/external-identity-list.test.ts b/packages/client/test/external-identity-list.test.ts index 1cbb8dbe16..244e7df611 100644 --- a/packages/client/test/external-identity-list.test.ts +++ b/packages/client/test/external-identity-list.test.ts @@ -43,7 +43,7 @@ vi.mock('@deepseek-ai/dsh-client-ui-primitives', async () => ({ })); import { ExternalIdentityList } from '../src/client/external-identity-list.js'; import { zhTranslate } from '../src/client/locale.js'; -import { chooseOption } from './primitive-mocks.js'; +import { chooseOption, openCombobox } from './primitive-mocks.js'; it('failed Switch writes retain the committed preference; stale Modal edits retain input rather than overwrite', async () => { Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true }); @@ -251,3 +251,70 @@ it('Bind app shows real readiness after the commit and the app row lists its con container.remove(); } }); + +it('Bind app lists every app, disables the ones a Bot uses with its owner, and offers a second app of a bound platform', async () => { + Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true }); + const app = (ref: string, boundBotSlug?: string) => ({ + providerId: 'dsh-im/feishu', + ref, + platform: 'feishu', + name: `App ${ref}`, + fingerprint: ref.padEnd(64, '0'), + connected: true, + ...(boundBotSlug ? { boundBotSlug } : {}), + }); + const snapshot: MessagingSnapshot = { + accounts: [app('mine', 'ada'), app('theirs', 'bea'), app('free')], + identities: [ + { + id: 'binding', + botSlug: 'ada', + providerId: 'dsh-im/feishu', + platform: 'feishu', + accountRef: 'mine', + fingerprint: 'mine'.padEnd(64, '0'), + name: 'App mine', + enabled: true, + revision: 1, + createdAt: '2026-10-07T00:00:00Z', + availability: 'available' as const, + newConversations: 'auto' as const, + grantCount: 0, + scopes: [], + }, + ], + grants: [], + intents: [], + }; + const container = document.createElement('div'); + document.body.append(container); + const root = createRoot(container); + try { + await act(async () => + root.render( + createElement(ExternalIdentityList, { + snapshot, + t: zhTranslate, + mutate: vi.fn(), + conversation: vi.fn(), + rules: vi.fn(), + botName: (slug: string) => (slug === 'bea' ? 'Bea' : slug), + }), + ), + ); + const bind = [...container.querySelectorAll('button')].find((b) => + b.textContent?.includes('绑定应用'), + )!; + await act(async () => bind.click()); + await openCombobox('应用', container); + const options = [...document.querySelectorAll('[role="option"]')]; + expect(options.map((o) => [o.dataset.value, o.disabled, o.textContent])).toEqual([ + ['dsh-im/feishu:free', false, expect.stringContaining('App free')], + ['dsh-im/feishu:mine', true, expect.stringContaining('已绑定到这个 Bot')], + ['dsh-im/feishu:theirs', true, expect.stringContaining('已被 Bea 使用')], + ]); + } finally { + await act(async () => root.unmount()); + container.remove(); + } +}); diff --git a/packages/core/src/database/schema-plan.ts b/packages/core/src/database/schema-plan.ts index 6428b33a6b..b25435e96f 100644 --- a/packages/core/src/database/schema-plan.ts +++ b/packages/core/src/database/schema-plan.ts @@ -1668,6 +1668,16 @@ const CONVERSATION_LIST_MIGRATION: SchemaMigration = { }, }; +const SEVERAL_APPS_MIGRATION: SchemaMigration = { + generation: 63, + module: 'messaging', + description: + 'Let one Bot bind several apps of the same platform; one app still belongs to one Bot', + migrate(database) { + database.exec('DROP INDEX IF EXISTS messaging_binding_bot_platform;'); + }, +}; + export const BOT_HARNESS_SCHEMA_PLAN = defineSchemaPlan([ SESSION_OWNERSHIP_MIGRATION, MESSAGING_TRACER_MIGRATION, @@ -1730,4 +1740,5 @@ export const BOT_HARNESS_SCHEMA_PLAN = defineSchemaPlan([ APPROVAL_MESSAGING_MIGRATION, BOUND_APP_ADMISSION_MIGRATION, CONVERSATION_LIST_MIGRATION, + SEVERAL_APPS_MIGRATION, ]); diff --git a/packages/core/src/messaging/outbound.ts b/packages/core/src/messaging/outbound.ts index b5872b9d43..8d4edbfc32 100644 --- a/packages/core/src/messaging/outbound.ts +++ b/packages/core/src/messaging/outbound.ts @@ -172,6 +172,12 @@ export interface OutboxIntent { reason?: string; } +export type MessagingApp = MessagingAccount & { + providerId: string; + boundBotSlug?: string; + bindingId?: string; +}; + export interface MessagingSnapshot { approvals?: ApprovalMessagingSnapshot; setup?: { @@ -192,7 +198,7 @@ export interface MessagingSnapshot { pairings?: PairingRequest[]; pairingReceivers?: { name: string; status: 'off' | 'connecting' | 'receiving' | 'unavailable' }[]; channelTargets?: { id: string; name: string }[]; - accounts: (MessagingAccount & { providerId: string })[]; + accounts: MessagingApp[]; grants: (MessagingGrant & { availability: 'available' | 'unavailable' | 'rebind-required'; reception: ReturnType; @@ -241,6 +247,7 @@ export interface OutboundMessaging { ): Promise; register(provider: MessagingProvider): () => void; snapshot(botSlug: string): Promise; + apps(): Promise; channelBridges(channelId: string): Promise; targets(providerId: string, accountRef: string): Promise; authorize(input: { @@ -669,15 +676,9 @@ export function createOutboundMessaging(options: { current(input.providerId, account.token); const prior = db .prepare( - 'SELECT id FROM messaging_bindings WHERE revoked_at IS NULL AND ((provider_id = ? AND (account_ref = ? OR fingerprint = ?)) OR (bot_slug = ? AND platform = ?))', + 'SELECT id FROM messaging_bindings WHERE revoked_at IS NULL AND provider_id = ? AND (account_ref = ? OR fingerprint = ?)', ) - .get( - input.providerId, - input.accountRef, - input.fingerprint, - botSlug, - account.platform, - ); + .get(input.providerId, input.accountRef, input.fingerprint); if (prior) throw new MessagingError('binding-conflict'); const id = randomUUID(); db.prepare( @@ -1185,7 +1186,7 @@ export function createOutboundMessaging(options: { .map(source), }; }, - async snapshot(botSlug) { + async apps() { const accounts = ( await Promise.allSettled( [...providers.values()].map(async (entry) => @@ -1196,6 +1197,30 @@ export function createOutboundMessaging(options: { ), ) ).flatMap((result) => (result.status === 'fulfilled' ? result.value : [])); + const bindings = database.read((db) => + db + .prepare( + 'SELECT id, bot_slug, provider_id, account_ref, fingerprint FROM messaging_bindings WHERE revoked_at IS NULL', + ) + .all(), + ) as { + id: string; + bot_slug: string; + provider_id: string; + account_ref: string; + fingerprint: string; + }[]; + return accounts.map((account) => { + const bound = bindings.find( + (b) => + b.provider_id === account.providerId && + (b.account_ref === account.ref || b.fingerprint === account.fingerprint), + ); + return bound ? { ...account, boundBotSlug: bound.bot_slug, bindingId: bound.id } : account; + }); + }, + async snapshot(botSlug) { + const accounts = await service.apps(); const rows = database.read((db) => db .prepare('SELECT body FROM messaging_grants WHERE bot_slug = ? ORDER BY created_at DESC') @@ -1423,16 +1448,9 @@ export function createOutboundMessaging(options: { active(input.botSlug); const existing = db .prepare( - 'SELECT id FROM messaging_bindings WHERE revoked_at IS NULL AND ((provider_id = ? AND account_ref = ?) OR (provider_id = ? AND fingerprint = ?) OR (bot_slug = ? AND platform = ?))', + 'SELECT id FROM messaging_bindings WHERE revoked_at IS NULL AND provider_id = ? AND (account_ref = ? OR fingerprint = ?)', ) - .get( - input.providerId, - input.accountRef, - input.providerId, - input.fingerprint, - input.botSlug, - inspected.account.platform, - ); + .get(input.providerId, input.accountRef, input.fingerprint); let reusable: MessagingIdentity | undefined; if (existing !== undefined) { reusable = readMessagingIdentity(db, (existing as { id: string }).id); diff --git a/packages/core/test/messaging-several-apps-migration.test.ts b/packages/core/test/messaging-several-apps-migration.test.ts new file mode 100644 index 0000000000..aa80c678f7 --- /dev/null +++ b/packages/core/test/messaging-several-apps-migration.test.ts @@ -0,0 +1,41 @@ +import { expect, it } from 'vitest'; +import { attachOperationalModule, mountOperationalDatabase } from '../src/database/owner.js'; +import { BOT_HARNESS_SCHEMA_PLAN } from '../src/database/schema-plan.js'; +import { defineSchemaPlan } from '../src/database/schema.js'; +import { createTempRoot } from './helpers.js'; + +it('drops the one-app-per-platform index at generation 63 and keeps one app per Bot', () => { + const home = createTempRoot('bh1110-upgrade-'); + const prior = mountOperationalDatabase({ + dshHome: home, + schemaPlan: defineSchemaPlan( + BOT_HARNESS_SCHEMA_PLAN.migrations.filter((m) => m.generation < 63), + ), + }); + const insert = + 'INSERT INTO messaging_bindings(id,bot_slug,provider_id,platform,account_ref,fingerprint,created_at,enabled) VALUES (?,?,?,?,?,?,?,1)'; + attachOperationalModule(prior, 'test').transaction((db) => { + db.prepare(insert).run('one', 'ada', 'dsh-im/feishu', 'feishu', 'app-1', 'f1', '2026-10-01'); + expect(() => + db.prepare(insert).run('two', 'ada', 'dsh-im/feishu', 'feishu', 'app-2', 'f2', '2026-10-01'), + ).toThrow(); + }); + prior.close(); + const current = mountOperationalDatabase({ dshHome: home, schemaPlan: BOT_HARNESS_SCHEMA_PLAN }); + expect(current.mode).toBe('ready'); + const port = attachOperationalModule(current, 'test'); + port.transaction((db) => + db.prepare(insert).run('two', 'ada', 'dsh-im/feishu', 'feishu', 'app-2', 'f2', '2026-10-02'), + ); + expect(() => + port.transaction((db) => + db + .prepare(insert) + .run('three', 'bea', 'dsh-im/feishu', 'feishu', 'app-1', 'f3', '2026-10-02'), + ), + ).toThrow(); + expect( + port.read((db) => db.prepare('SELECT id FROM messaging_bindings ORDER BY id').all()), + ).toEqual([{ id: 'one' }, { id: 'two' }]); + current.close(); +}); diff --git a/packages/core/test/messaging-several-apps.test.ts b/packages/core/test/messaging-several-apps.test.ts new file mode 100644 index 0000000000..6adbd8487e --- /dev/null +++ b/packages/core/test/messaging-several-apps.test.ts @@ -0,0 +1,224 @@ +import { setImmediate as tick } from 'node:timers/promises'; +import { afterEach, expect, it } from 'vitest'; +import { createBridgeMethods } from '../src/bridge/methods.js'; +import { attachOperationalModule } from '../src/database/owner.js'; +import { createCore, type BotHarnessCore } from '../src/plugin.js'; +import { createDshImProvider, type DshImOutboundService } from '../src/messaging/dsh-im.js'; +import type { MessagingInboundEvent, MessagingReplyRoute } from '../src/messaging/provider.js'; +import type { BotAgentAdapter } from '../src/runtime/bot-runtime.js'; +import { createTempRoot } from './helpers.js'; + +const APPS = { 'lark-a': 'a', 'lark-b': 'b', 'lark-c': 'c' } as const; +type App = keyof typeof APPS; +const fp = (app: App) => APPS[app].repeat(64); + +const cores: BotHarnessCore[] = []; +afterEach(async () => { + for (const core of cores.splice(0)) { + core.externalMessaging.close(); + await core.runtime.close(); + core.operationalDatabase.close(); + } +}); + +async function fixture() { + const home = createTempRoot('botharness-several-apps-'); + const agents: BotAgentAdapter = { + async runOrchestrator() {}, + async runAssignment() {}, + requestAssignment() { + return { delivery: 'steer' }; + }, + async stopAssignment() {}, + async close() {}, + }; + const core = createCore({ dshHome: home, agents }); + cores.push(core); + for (const slug of ['ada', 'bea']) + expect(core.registry.create({ slug, displayName: slug.toUpperCase() }).ok).toBe(true); + type Consumer = Parameters>[1]; + const consumers = new Map(); + const replies: { app: string; route: MessagingReplyRoute; text: string }[] = []; + const service: DshImOutboundService = { + contractVersion: 1, + replyContextVersion: 1, + replyReceiptVersion: 1, + replyFenceVersion: 1, + listBots: async () => Object.keys(APPS).map((botId) => ({ botId, channel: 'feishu' })), + listTargets: async () => [], + describeBot: async (botId) => ({ + version: 1, + channel: 'feishu', + botId, + account: { fingerprint: fp(botId as App), name: `App ${botId}` }, + connected: true, + capabilities: [ + 'proactive-text-checked', + 'exclusive-text-consumer', + 'ordinary-text-consumer', + 'reply-text-checked', + 'reply-context-checked', + 'reply-receipt-checked', + 'reply-fence-checked', + ], + }), + sendChecked: async () => ({ sent: true as const }), + consumeInbound: async (botId, input) => { + consumers.set(botId, input); + return () => { + if (consumers.get(botId) === input) consumers.delete(botId); + }; + }, + qualifyReplyChecked: async (_botId, route) => route, + replyChecked: async (botId, route, text, options) => { + if (options.beforeSend && !options.beforeSend()) + throw Object.assign(new Error('stale-route'), { code: 'stale-route' }); + replies.push({ app: botId, route, text }); + return { + sent: true, + receipt: { + version: 1, + messageId: 'reply-' + route.messageId, + conversationId: route.conversationId, + }, + }; + }, + }; + core.externalMessaging.register(createDshImProvider(service, 'feishu')!); + const settle = async () => { + for (let i = 0; i < 4; i++) await tick(); + await core.runtime.whenIdle(); + await tick(); + }; + const bind = async (slug: string, app: App) => { + const identity = await core.externalMessaging.identity(slug, { + kind: 'bind', + providerId: 'dsh-im/feishu', + accountRef: app, + fingerprint: fp(app), + }); + await settle(); + return identity; + }; + const query = (sql: string) => + attachOperationalModule(core.operationalDatabase, 'test').read((db) => db.prepare(sql).all()); + return { + core, + replies, + bind, + settle, + query, + methods: createBridgeMethods({ ...core }), + async receive(app: App, id: string, group = false) { + const consumer = consumers.get(app); + if (!consumer) throw new Error(`${app} not subscribed`); + const conversation = group ? 'oc_team' : `oc_dm_${app}`; + const event: MessagingInboundEvent = { + version: 1, + channel: 'feishu', + botId: app, + fingerprint: fp(app), + eventId: `ev-${id}`, + messageId: `om-${id}`, + actor: { kind: 'user', id: 'ou_human', name: 'Human' }, + conversation: { kind: group ? 'group' : 'dm', id: conversation }, + mentions: group ? [{ id: `ou-${app}`, key: '@_user_1' }] : [], + mentionedAccount: group, + at: '2026-10-07T00:00:00.000Z', + text: group ? `@_user_1 hi ${id}` : `hi ${id}`, + reply: { messageId: `om-${id}`, conversationId: conversation, actorId: 'ou_human' }, + replay: { kind: 'provider-redelivery', resumeCursor: false, gapPossible: true }, + }; + await consumer.onEvent(event, { signal: consumer.signal }); + await settle(); + }, + sourceId(messageId: string) { + return ( + query( + `SELECT source_event_id FROM source_events WHERE json_extract(payload_json, '$.external.event.messageId') = '${messageId}'`, + )[0] as { source_event_id: string } + ).source_event_id; + }, + }; +} + +it('one Bot binds two Lark apps; each admits its own DMs and replies through the receiving app', async () => { + const fx = await fixture(); + const first = await fx.bind('bea', 'lark-b'); + const second = await fx.bind('bea', 'lark-c'); + expect(first.id).not.toBe(second.id); + await fx.receive('lark-b', 'b1'); + await fx.receive('lark-c', 'c1'); + expect( + fx.query( + "SELECT g.binding_id AS binding, json_extract(g.body, '$.receiveScope.conversationId') AS conversation FROM messaging_grants g ORDER BY conversation", + ), + ).toEqual([ + { binding: first.id, conversation: 'oc_dm_lark-b' }, + { binding: second.id, conversation: 'oc_dm_lark-c' }, + ]); + expect( + fx.query( + "SELECT a.bot_slug AS bot, json_extract(e.payload_json, '$.external.grantId') IS NOT NULL AS attributed FROM inbox_admissions a JOIN source_events e USING(source_event_id)", + ), + ).toEqual([ + { bot: 'bea', attributed: 1 }, + { bot: 'bea', attributed: 1 }, + ]); + await fx.core.externalMessaging.reply('bea', fx.sourceId('om-b1'), 'via b'); + await fx.core.externalMessaging.reply('bea', fx.sourceId('om-c1'), 'via c'); + await fx.settle(); + expect(fx.replies.map((r) => [r.app, r.text])).toEqual([ + ['lark-b', 'via b'], + ['lark-c', 'via c'], + ]); +}); + +it('an app bound to one Bot is listed with its owner and refused to another Bot', async () => { + const fx = await fixture(); + const ada = await fx.bind('ada', 'lark-a'); + await expect(fx.bind('bea', 'lark-a')).rejects.toThrow('binding-conflict'); + const owners = async () => + Object.fromEntries( + (await fx.core.externalMessaging.apps()).map((app) => [app.ref, app.boundBotSlug ?? null]), + ); + expect(await owners()).toEqual({ 'lark-a': 'ada', 'lark-b': null, 'lark-c': null }); + expect((await fx.core.externalMessaging.snapshot('bea')).accounts).toEqual( + expect.arrayContaining([ + expect.objectContaining({ ref: 'lark-a', boundBotSlug: 'ada', bindingId: ada.id }), + ]), + ); + await fx.core.externalMessaging.identity('ada', { + kind: 'unbind', + id: ada.id, + expectedRevision: ada.revision, + }); + expect(await owners()).toEqual({ 'lark-a': null, 'lark-b': null, 'lark-c': null }); + await fx.bind('bea', 'lark-a'); + expect((await owners())['lark-a']).toBe('bea'); +}); + +it('a shared reply refuses when the responder has two apps in that group and works with one', async () => { + const fx = await fixture(); + await fx.bind('ada', 'lark-a'); + await fx.bind('bea', 'lark-b'); + await fx.receive('lark-a', 'a1', true); + await fx.receive('lark-b', 'b1', true); + const created = fx.methods.channelCreate({ name: 'Shared', members: ['ada', 'bea'] }); + if (!created.ok) throw new Error(created.error.message); + const channelId = created.value.channel.id; + const adaGrant = (await fx.core.externalMessaging.snapshot('ada')).grants[0]!; + expect( + await fx.methods.messagingChannelTarget({ slug: 'ada', grantId: adaGrant.id, channelId }), + ).toEqual({ ok: true, value: { updated: true } }); + await fx.receive('lark-a', 'a2', true); + const shared = fx.sourceId('om-a2'); + await fx.core.externalMessaging.reply('bea', shared, 'from bea'); + await fx.settle(); + expect(fx.replies.at(-1)).toMatchObject({ app: 'lark-b', text: 'from bea' }); + await fx.bind('bea', 'lark-c'); + await fx.receive('lark-c', 'c1', true); + await expect(fx.core.externalMessaging.reply('bea', shared, 'again')).rejects.toThrow( + 'reply-target-ambiguous', + ); +});