Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(im): 共用渠道判定以兼容 Slack 后台回传

Dash50db3e6807ed
diff --git a/apps/desktop/src/main/hook-control/__tests__/backgroundResults.test.ts b/apps/desktop/src/main/hook-control/__tests__/backgroundResults.test.ts
index 6d8914a801..dfb1ec42a2 100644
--- a/apps/desktop/src/main/hook-control/__tests__/backgroundResults.test.ts
+++ b/apps/desktop/src/main/hook-control/__tests__/backgroundResults.test.ts
@@ -23,7 +23,10 @@ function fixture(key = 'telegram:dm:bot:user:g0') {
const result = { status: 'ok' as const, finalText: '自动执行结果', errorMessage: null, durationMs: 10 };
describe('IM session background results', () => {
- it.each(['telegram:dm:bot:user:g0', 'slack:T:C:1.2'])('forwards %s once, including attachments', (key) => {
+ it.each([
+ 'telegram:dm:bot:user:g0', 'slack:T:C:1.2', 'slack:dm:T1:U1:g2',
+ 'team-slack:C1:1.1', 'T1:C1:1.1', 'dm:U1:g2', 'dm:T1:U1:g2',
+ ])('forwards %s once, including attachments', (key) => {
const f = fixture(key);
f.output.start('session', '/work');
f.output.start('session', '/work');
@@ -38,10 +41,16 @@ describe('IM session background results', () => {
}) }));
});
- it('excludes X, old servers, and turns already owned by normal IM/reopen delivery', () => {
- const x = fixture('x:post:1');
- x.output.start('session', '/work');
- expect(x.watchContinuation).not.toHaveBeenCalled();
+ it.each(['x:post:1', 'discord:channel-1', 'arbitrary', 'dm:U1:invalid', 'T1:C1:invalid'])(
+ 'does not observe unsupported lane %s', (key) => {
+ const f = fixture(key);
+ f.output.start('session', '/work');
+ expect(f.watchContinuation).not.toHaveBeenCalled();
+ expect(f.send).not.toHaveBeenCalled();
+ },
+ );
+
+ it('excludes old servers and turns already owned by normal IM/reopen delivery', () => {
const f = fixture();
f.owned.mockReturnValue(true);
f.output.start('session', '/work');
diff --git a/apps/desktop/src/main/hook-control/backgroundResults.ts b/apps/desktop/src/main/hook-control/backgroundResults.ts
index 5927ff1f4f..b548f7ad39 100644
--- a/apps/desktop/src/main/hook-control/backgroundResults.ts
+++ b/apps/desktop/src/main/hook-control/backgroundResults.ts
@@ -2,6 +2,7 @@ import { randomUUID } from 'node:crypto';
import { makeTurnEnd, type HookMessage } from '@cindy/slack-hook-protocol';
import type { HookSessionRunner } from './dispatcher';
import type { HookBindingStore } from './bindings';
+import { providerForExternalKey } from './providerRouting.js';
/** Shares the normal observer/final attachment collector; no task replay or outbox. */
export function createBackgroundResults(deps: {
@@ -17,8 +18,10 @@ export function createBackgroundResults(deps: {
return {
start(sessionId: string, workingDir: string) {
if (deps.owned(sessionId) || watches.has(sessionId) || !deps.runner.watchContinuation) return;
- const targets = (deps.bindings.findBySession?.(sessionId) ?? []).filter(({ connectionId, externalKey }) =>
- /^(telegram|slack):/.test(externalKey) && deps.allowed(connectionId, workingDir));
+ const targets = (deps.bindings.findBySession?.(sessionId) ?? []).filter(({ connectionId, externalKey }) => {
+ const provider = providerForExternalKey(externalKey);
+ return (provider === 'telegram' || provider === 'slack') && deps.allowed(connectionId, workingDir);
+ });
if (!targets.length) return;
const senders = targets.map((target) => ({ ...target, send: deps.sender(target.connectionId) })).filter((t) => t.send);
if (!senders.length) return;
diff --git a/apps/desktop/src/main/hook-control/manager.ts b/apps/desktop/src/main/hook-control/manager.ts
index 3a5209a7db..ac5a2a5c91 100644
--- a/apps/desktop/src/main/hook-control/manager.ts
+++ b/apps/desktop/src/main/hook-control/manager.ts
@@ -109,61 +109,12 @@ import {
import { parseTelegramConnectUrl } from './telegramDeepLink.js';
import { parseXConnectUrl, xProfileUrlOrNull } from './xDeepLink.js';
import type { HookTransport, HookTransportOpts, HookTransportStatus } from './transport.js';
+import { providerForExternalKey, providerForTaskDispatch } from './providerRouting.js';
+export { providerForExternalKey, providerForTaskDispatch } from './providerRouting.js';
/** dispatcher / bindings 的 connectionId 基础键;运行时追加账号与 provider。 */
export const SLACK_HOOK_CONNECTION_ID = 'slack';
-/** Legacy Slack channel lane used before provider-prefixed external keys. */
-function isLegacySlackExternalKey(externalKey: string): boolean {
- return /^[A-Z][A-Z0-9]*:[A-Z][A-Z0-9]*:\d+(?:\.\d+)?$/.test(externalKey);
-}
-
-/** Pre-provider-prefix Slack DM lane accepted only for source-less/Slack traffic. */
-function isLegacySlackDmExternalKey(externalKey: string): boolean {
- return /^dm:(?:[A-Z][A-Z0-9]*:){1,2}g\d+$/.test(externalKey);
-}
-
-/**
- * Route only the providers implemented by this client. Missing source is
- * retained solely for legacy Slack servers; Telegram and X always have both an
- * explicit source and the provider-prefixed lane key from their wire contracts.
- * A source/key disagreement fails closed instead of letting a future or
- * compromised provider inherit Slack permissions and prompt semantics.
- */
-export function providerForTaskDispatch(
- payload: Pick<import('@cindy/slack-hook-protocol').TaskDispatchPayload, 'externalKey' | 'source'>,
-): HookProvider | null {
- const telegramKey = payload.externalKey.startsWith('telegram:');
- const xKey = payload.externalKey.startsWith('x:');
- const slackKey =
- payload.externalKey.startsWith('slack:') ||
- payload.externalKey.startsWith('team-slack:') ||
- // Pre-prefix Slack channel lane: <team>:<channel>:<message timestamp>.
- isLegacySlackExternalKey(payload.externalKey) ||
- isLegacySlackDmExternalKey(payload.externalKey);
- const source = payload.source?.im;
- if (source === undefined) return slackKey ? 'slack' : null;
- if (source === 'telegram') return telegramKey ? 'telegram' : null;
- if (source === 'x') return xKey ? 'x' : null;
- if (source === 'slack') return slackKey ? 'slack' : null;
- return null;
-}
-
-/** Route archive frames only for lane-key formats owned by implemented providers. */
-export function providerForExternalKey(externalKey: string): HookProvider | null {
- if (externalKey.startsWith('telegram:')) return 'telegram';
- if (externalKey.startsWith('x:')) return 'x';
- if (
- externalKey.startsWith('slack:') ||
- externalKey.startsWith('team-slack:') ||
- isLegacySlackExternalKey(externalKey) ||
- isLegacySlackDmExternalKey(externalKey)
- ) {
- return 'slack';
- }
- return null;
-}
-
/**
* group.message 的本地持久化 owner 只能来自 server 针对本次扇出的权威
* recipient,不能用帧到达时的当前 binding 猜测。旧 server 未协商 recipient
diff --git a/apps/desktop/src/main/hook-control/providerRouting.ts b/apps/desktop/src/main/hook-control/providerRouting.ts
new file mode 100644
index 0000000000..77f1c93cac
--- /dev/null
+++ b/apps/desktop/src/main/hook-control/providerRouting.ts
@@ -0,0 +1,25 @@
+import type { HookProvider, TaskDispatchPayload } from '@cindy/slack-hook-protocol';
+
+/** Shared lane classification for dispatch, archive and background results. */
+export function providerForExternalKey(externalKey: string): HookProvider | null {
+ if (externalKey.startsWith('telegram:')) return 'telegram';
+ if (externalKey.startsWith('x:')) return 'x';
+ if (
+ externalKey.startsWith('slack:') ||
+ externalKey.startsWith('team-slack:') ||
+ // Pre-prefix Slack channel and DM lanes remain supported.
+ /^[A-Z][A-Z0-9]*:[A-Z][A-Z0-9]*:\d+(?:\.\d+)?$/.test(externalKey) ||
+ /^dm:(?:[A-Z][A-Z0-9]*:){1,2}g\d+$/.test(externalKey)
+ ) return 'slack';
+ return null;
+}
+
+/** Missing source is legacy Slack only; explicit source must agree with the key. */
+export function providerForTaskDispatch(
+ payload: Pick<TaskDispatchPayload, 'externalKey' | 'source'>,
+): HookProvider | null {
+ const provider = providerForExternalKey(payload.externalKey);
+ const source = payload.source?.im;
+ if (source === undefined) return provider === 'slack' ? provider : null;
+ return source === provider ? provider : null;
+}
diff --git a/docs/product-rules/telegram-bot-parity.md b/docs/product-rules/telegram-bot-parity.md
index 3a7ddf2386..f6bc60084d 100644
--- a/docs/product-rules/telegram-bot-parity.md
+++ b/docs/product-rules/telegram-bot-parity.md
@@ -264,7 +264,8 @@ SSH 任务不把远端路径或托管媒体引用当作本地文件上传;个
已销毁的任务不会因迟到的发送完成回调再次派发。
官方 Telegram、Slack 复用已有 hook binding、轮次观察和附件收集;双方宣告 `session-result-v1`
-后用 `turn.end(background: true)` 发送结果,服务端在原私聊或话题新发消息。普通 IM 轮次和
+后,后台回传与任务派发共用渠道 key 判定,兼容既有 Slack 前缀、team-slack、旧频道和 DM key;X 不回传。
+结果用 `turn.end(background: true)` 发送,服务端在原私聊或话题新发消息。普通 IM 轮次和
已有 retry/reopen 轮次不另发一份。发送前复核账号代次、连接、目录授权与会话绑定;服务端
再核对设备绑定、聊天归属及 `/new` 代次。Telegram 保存新消息 route,回复结果仍回到原 lane。