@michengai/dsh-im-connect 1.0.49 → 1.0.50
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -0
- package/CHANGELOG.zh-CN.md +10 -0
- package/lib/channels/telegram-retry.d.ts +2 -2
- package/lib/channels/telegram-retry.d.ts.map +1 -1
- package/lib/channels/telegram-retry.js +25 -7
- package/lib/channels/telegram-retry.js.map +1 -1
- package/lib/channels/telegram.d.ts.map +1 -1
- package/lib/channels/telegram.js +4 -8
- package/lib/channels/telegram.js.map +1 -1
- package/lib/engine/deferred-delivery.d.ts +6 -1
- package/lib/engine/deferred-delivery.d.ts.map +1 -1
- package/lib/engine/deferred-delivery.js +59 -7
- package/lib/engine/deferred-delivery.js.map +1 -1
- package/lib/engine/gateway.d.ts +4 -2
- package/lib/engine/gateway.d.ts.map +1 -1
- package/lib/engine/gateway.js +115 -15
- package/lib/engine/gateway.js.map +1 -1
- package/lib/engine/message-progress.d.ts +3 -0
- package/lib/engine/message-progress.d.ts.map +1 -1
- package/lib/engine/message-progress.js +52 -5
- package/lib/engine/message-progress.js.map +1 -1
- package/lib/engine/session-history.d.ts +1 -0
- package/lib/engine/session-history.d.ts.map +1 -1
- package/lib/engine/session-history.js +3 -0
- package/lib/engine/session-history.js.map +1 -1
- package/package.json +1 -1
- package/src/channels/telegram-retry.ts +23 -8
- package/src/channels/telegram.ts +4 -8
- package/src/engine/deferred-delivery.ts +49 -7
- package/src/engine/gateway.ts +102 -21
- package/src/engine/message-progress.ts +42 -6
- package/src/engine/session-history.ts +4 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-progress.js","sourceRoot":"","sources":["../../src/engine/message-progress.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"message-progress.js","sourceRoot":"","sources":["../../src/engine/message-progress.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export type HistoryHost = {
|
|
|
16
16
|
* 官方 Session 没有公开 events,同步活日志是 snapshotEvents。
|
|
17
17
|
* events 只服务夹具和非官方对象;空数组继续往下看,避免把“还没写上”当成没有历史。
|
|
18
18
|
*/
|
|
19
|
+
export declare function hasSessionHistoryCapability(session?: HistorySession): boolean;
|
|
19
20
|
export declare function readLiveSessionHistory(session?: HistorySession): readonly HistoryEvent[] | undefined;
|
|
20
21
|
/** 冷读优先 inspect;空结果或失败再回退活日志,不能把一次空存储前缀当成日志不存在。 */
|
|
21
22
|
export declare function readSessionHistory(host: HistoryHost | undefined, session: HistorySession | undefined, signal?: AbortSignal): Promise<readonly HistoryEvent[] | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-history.d.ts","sourceRoot":"","sources":["../../src/engine/session-history.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,GAAG,CAAA;CAAE,CAAA;AAC3F,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,MAAM,CAAC,EAAE,SAAS,YAAY,EAAE,CAAA;IAChC,cAAc,CAAC,EAAE,MAAM,SAAS,YAAY,EAAE,CAAA;CAC/C,CAAA;AACD,MAAM,MAAM,WAAW,GAAG;IAAE,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAA;AAEzD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,YAAY,EAAE,GAAG,SAAS,CAQpG;AAED,mDAAmD;AACnD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,WAAW,GAAG,SAAS,EAC7B,OAAO,EAAE,cAAc,GAAG,SAAS,EACnC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,SAAS,YAAY,EAAE,GAAG,SAAS,CAAC,CAU9C"}
|
|
1
|
+
{"version":3,"file":"session-history.d.ts","sourceRoot":"","sources":["../../src/engine/session-history.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,GAAG,CAAA;CAAE,CAAA;AAC3F,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,MAAM,CAAC,EAAE,SAAS,YAAY,EAAE,CAAA;IAChC,cAAc,CAAC,EAAE,MAAM,SAAS,YAAY,EAAE,CAAA;CAC/C,CAAA;AACD,MAAM,MAAM,WAAW,GAAG;IAAE,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAA;AAEzD;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAE7E;AAED,wBAAgB,sBAAsB,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,YAAY,EAAE,GAAG,SAAS,CAQpG;AAED,mDAAmD;AACnD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,WAAW,GAAG,SAAS,EAC7B,OAAO,EAAE,cAAc,GAAG,SAAS,EACnC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,SAAS,YAAY,EAAE,GAAG,SAAS,CAAC,CAU9C"}
|
|
@@ -2,6 +2,9 @@
|
|
|
2
2
|
* 官方 Session 没有公开 events,同步活日志是 snapshotEvents。
|
|
3
3
|
* events 只服务夹具和非官方对象;空数组继续往下看,避免把“还没写上”当成没有历史。
|
|
4
4
|
*/
|
|
5
|
+
export function hasSessionHistoryCapability(session) {
|
|
6
|
+
return typeof session?.snapshotEvents === 'function' || Array.isArray(session?.events);
|
|
7
|
+
}
|
|
5
8
|
export function readLiveSessionHistory(session) {
|
|
6
9
|
if (Array.isArray(session?.events) && session.events.length > 0)
|
|
7
10
|
return session.events;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-history.js","sourceRoot":"","sources":["../../src/engine/session-history.ts"],"names":[],"mappings":"AAQA;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CAAC,OAAwB;IAC7D,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,OAAO,CAAC,MAAM,CAAA;IACtF,IAAI,OAAO,OAAO,EAAE,cAAc,KAAK,UAAU,EAAE,CAAC;QAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,EAAE,CAAA;QACzC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;YAAE,OAAO,QAAQ,CAAA;IAC9C,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC;QAAE,OAAO,OAAO,CAAC,MAAM,CAAA;IACzD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,mDAAmD;AACnD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAA6B,EAC7B,OAAmC,EACnC,MAAoB;IAEpB,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,CAAA;IACtB,MAAM,UAAU,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAqH,CAAA;IACvK,IAAI,EAAE,IAAI,OAAO,UAAU,EAAE,OAAO,KAAK,UAAU,EAAE,CAAC;QACpD,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;YACvD,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;gBAAE,OAAO,UAAU,CAAC,MAAM,CAAA;QACjG,CAAC;QAAC,MAAM,CAAC,CAAC,4BAA4B,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,sBAAsB,CAAC,OAAO,CAAC,CAAA;AACxC,CAAC"}
|
|
1
|
+
{"version":3,"file":"session-history.js","sourceRoot":"","sources":["../../src/engine/session-history.ts"],"names":[],"mappings":"AAQA;;;GAGG;AACH,MAAM,UAAU,2BAA2B,CAAC,OAAwB;IAClE,OAAO,OAAO,OAAO,EAAE,cAAc,KAAK,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;AACxF,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,OAAwB;IAC7D,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,OAAO,CAAC,MAAM,CAAA;IACtF,IAAI,OAAO,OAAO,EAAE,cAAc,KAAK,UAAU,EAAE,CAAC;QAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,EAAE,CAAA;QACzC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;YAAE,OAAO,QAAQ,CAAA;IAC9C,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC;QAAE,OAAO,OAAO,CAAC,MAAM,CAAA;IACzD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,mDAAmD;AACnD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAA6B,EAC7B,OAAmC,EACnC,MAAoB;IAEpB,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,CAAA;IACtB,MAAM,UAAU,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAqH,CAAA;IACvK,IAAI,EAAE,IAAI,OAAO,UAAU,EAAE,OAAO,KAAK,UAAU,EAAE,CAAC;QACpD,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;YACvD,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;gBAAE,OAAO,UAAU,CAAC,MAAM,CAAA;QACjG,CAAC;QAAC,MAAM,CAAC,CAAC,4BAA4B,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,sBAAsB,CAAC,OAAO,CAAC,CAAA;AACxC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@michengai/dsh-im-connect",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.50",
|
|
4
4
|
"description": "DSH IM Connect — 将主流即时通讯平台接入本机 DeepSeek Harness · Connect major messaging platforms to local DeepSeek Harness agents",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"packageManager": "pnpm@11.22.0",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { sleepWithSignal, timeoutSignal } from '../engine/abort.js'
|
|
2
|
-
import { DeliveryRejected } from '../engine/deferred-delivery.js'
|
|
2
|
+
import { DeliveryRejected, DeliveryUnavailable } from '../engine/deferred-delivery.js'
|
|
3
3
|
|
|
4
4
|
const TRANSIENT_STATUS = new Set([408, 425, 429, 500, 502, 503, 504])
|
|
5
5
|
const TRANSIENT_CODE = new Set(['ECONNRESET', 'ECONNREFUSED', 'ETIMEDOUT', 'EAI_AGAIN', 'ENETUNREACH', 'EHOSTUNREACH', 'EPIPE', 'UND_ERR_CONNECT_TIMEOUT', 'UND_ERR_HEADERS_TIMEOUT', 'UND_ERR_BODY_TIMEOUT', 'UND_ERR_SOCKET'])
|
|
@@ -18,6 +18,19 @@ export function isTelegramTransient(error: unknown, depth = 0): boolean {
|
|
|
18
18
|
return isTelegramTransient(e.cause, depth + 1) || (Array.isArray(e.errors) && e.errors.some(cause => isTelegramTransient(cause, depth + 1)))
|
|
19
19
|
}
|
|
20
20
|
|
|
21
|
+
// Only errors proving DNS/connection establishment failed before any HTTP request.
|
|
22
|
+
// Resets, body/header timeouts, generic fetch failures and HTTP responses stay ambiguous.
|
|
23
|
+
const NOT_SUBMITTED_CODE = new Set(['ENOTFOUND', 'EAI_AGAIN', 'ECONNREFUSED', 'ENETUNREACH', 'EHOSTUNREACH', 'UND_ERR_CONNECT_TIMEOUT'])
|
|
24
|
+
function notSubmitted(error: unknown, depth = 0): boolean {
|
|
25
|
+
if (!error || typeof error !== 'object' || depth > 4) return false
|
|
26
|
+
const value = error as { status?: unknown; code?: string; name?: string; message?: string; cause?: unknown; errors?: unknown[] }
|
|
27
|
+
if (value.status !== undefined || ['AbortError', 'TimeoutError'].includes(value.name ?? '')) return false
|
|
28
|
+
if (value.code !== undefined) return NOT_SUBMITTED_CODE.has(value.code)
|
|
29
|
+
if (value.name === 'AggregateError' && Array.isArray(value.errors) && value.errors.length) return value.errors.every(cause => notSubmitted(cause, depth + 1))
|
|
30
|
+
// Only unwrap the actual fetch transport envelope, never an application/partial-send error.
|
|
31
|
+
return value.name === 'TypeError' && value.message === 'fetch failed' && notSubmitted(value.cause, depth + 1)
|
|
32
|
+
}
|
|
33
|
+
|
|
21
34
|
export interface TelegramRetryOptions {
|
|
22
35
|
signal?: AbortSignal
|
|
23
36
|
budgetMs?: number
|
|
@@ -25,11 +38,11 @@ export interface TelegramRetryOptions {
|
|
|
25
38
|
log?: (line: string) => void
|
|
26
39
|
/** Fixed method name only; never log token-bearing URLs, payloads or raw network errors. */
|
|
27
40
|
method?: string
|
|
28
|
-
/**
|
|
41
|
+
/** 已有消息的编辑可安全重试;新建操作只重试明确拒收或连接建立前失败。 */
|
|
29
42
|
edit?: boolean
|
|
30
43
|
}
|
|
31
44
|
|
|
32
|
-
/**
|
|
45
|
+
/** 新建操作只重试明确限流或连接建立前失败;编辑已有消息可重试临时错误。 */
|
|
33
46
|
export async function retryTelegram<T>(operation: (signal: AbortSignal) => Promise<T>, options: TelegramRetryOptions = {}): Promise<T> {
|
|
34
47
|
const delays = options.delaysMs ?? [1000, 3000, 8000]
|
|
35
48
|
const budget = options.budgetMs ?? 90_000
|
|
@@ -41,16 +54,18 @@ export async function retryTelegram<T>(operation: (signal: AbortSignal) => Promi
|
|
|
41
54
|
try { return await operation(signal) }
|
|
42
55
|
catch (error) {
|
|
43
56
|
signal.throwIfAborted()
|
|
57
|
+
const unavailable = notSubmitted(error)
|
|
58
|
+
const failure = unavailable ? new DeliveryUnavailable('Telegram connection unavailable before request submission', { cause: error }) : error
|
|
44
59
|
const limited = error instanceof DeliveryRejected && (error as { status?: number }).status === 429
|
|
45
|
-
const canRetry = options.edit ? isTelegramTransient(error) : limited
|
|
46
|
-
//
|
|
47
|
-
const finalError = () => ambiguous && (error as { rejected?: boolean })?.rejected === true
|
|
48
|
-
? new Error(
|
|
60
|
+
const canRetry = unavailable || (options.edit ? isTelegramTransient(error) : limited)
|
|
61
|
+
// A prior ambiguous edit cannot become a definite non-delivery just because a later attempt fails before connect.
|
|
62
|
+
const finalError = () => ambiguous && (unavailable || (error as { rejected?: boolean })?.rejected === true)
|
|
63
|
+
? new Error('telegram delivery unknown', { cause: failure }) : failure
|
|
49
64
|
if (!canRetry || attempt >= delays.length) throw finalError()
|
|
50
65
|
const retryAfterMs = Number((error as { retryAfterMs?: number }).retryAfterMs)
|
|
51
66
|
const delay = Math.max(delays[attempt]!, Number.isFinite(retryAfterMs) && retryAfterMs > 0 ? retryAfterMs : 0)
|
|
52
67
|
if (Date.now() + delay >= deadline) throw finalError()
|
|
53
|
-
if (!limited) ambiguous = true
|
|
68
|
+
if (!limited && !unavailable) ambiguous = true
|
|
54
69
|
options.log?.(`[telegram] ${options.method ?? 'delivery'} 临时发送失败,${delay / 1000}s 后重试(${attempt + 1}/${delays.length})`)
|
|
55
70
|
await sleepWithSignal(delay, signal)
|
|
56
71
|
}
|
package/src/channels/telegram.ts
CHANGED
|
@@ -78,11 +78,6 @@ const STATUS_REACTION_DELAYS_MS = [400, 1200] as const
|
|
|
78
78
|
* 放宽到 6 秒仍然有界,不会堆积请求。
|
|
79
79
|
*/
|
|
80
80
|
const TYPING_REQUEST_TIMEOUT_MS = 6000
|
|
81
|
-
/**
|
|
82
|
-
* typing 自己吃到 429 后的退避上限。正文 / 编辑的冷却再长也不牵连 typing:
|
|
83
|
-
* 一个群被编辑限流几十秒时,「正在输入」不该跟着整段消失。
|
|
84
|
-
*/
|
|
85
|
-
const TYPING_COOLDOWN_MAX_MS = 30_000
|
|
86
81
|
|
|
87
82
|
function isTerminalStatus(state: string): boolean {
|
|
88
83
|
return state === 'success' || state === 'ended' || state === 'error' || state === 'cancelled'
|
|
@@ -855,7 +850,7 @@ export function createTelegramChannel(config: TelegramConfig, log: (line: string
|
|
|
855
850
|
async sendAction(chatId, _action, signal) {
|
|
856
851
|
signal?.throwIfAborted()
|
|
857
852
|
const route = parseTelegramChatId(chatId)
|
|
858
|
-
// 只受 typing
|
|
853
|
+
// 只受 typing 自己的冷却约束:正文 / 编辑被限流时,「正在输入」仍要照发,
|
|
859
854
|
// 否则同聊天的一次 40 秒 429 就能让它整段消失。typing 自己吃到 429 才退避。
|
|
860
855
|
const chatKey = String(route.chatId)
|
|
861
856
|
if ((typingCooldownUntil.get(chatKey) ?? 0) > Date.now()) return
|
|
@@ -870,8 +865,9 @@ export function createTelegramChannel(config: TelegramConfig, log: (line: string
|
|
|
870
865
|
const status = Number((error as { status?: unknown } | undefined)?.status)
|
|
871
866
|
const retryAfterMs = Number((error as { retryAfterMs?: unknown } | undefined)?.retryAfterMs)
|
|
872
867
|
if (status === 429) {
|
|
873
|
-
const wait = Math.
|
|
874
|
-
|
|
868
|
+
const wait = Math.max(1000, Number.isFinite(retryAfterMs) ? retryAfterMs : 0)
|
|
869
|
+
// 同群不同话题的在途 429 可能乱序返回;较短的新冷却不能覆盖较长的旧冷却。
|
|
870
|
+
typingCooldownUntil.set(chatKey, Math.max(typingCooldownUntil.get(chatKey) ?? 0, Date.now() + wait))
|
|
875
871
|
}
|
|
876
872
|
const safeStatus = Number.isFinite(status) ? ` status=${status}` : ''
|
|
877
873
|
// 每次 pulse 都失败时只记第一条:可观测,又不至于把日志刷满。
|
|
@@ -86,6 +86,20 @@ export class DeferredDelivery {
|
|
|
86
86
|
try { this.flush() } catch (error) { this.entries = previous; throw error }
|
|
87
87
|
this.active.add(id)
|
|
88
88
|
}
|
|
89
|
+
/** Persist a stable completion notice before attempting platform I/O. */
|
|
90
|
+
beginNotice(id: string, sessionId: string, channelId: string, message: ImMessage, text: string, turn?: number): boolean {
|
|
91
|
+
if (this.entries.some(entry => entry.id === id)) return false
|
|
92
|
+
this.begin(id, sessionId, channelId, message)
|
|
93
|
+
try {
|
|
94
|
+
this.patch(id, { text, turn, status: 'unknown' })
|
|
95
|
+
this.active.delete(id)
|
|
96
|
+
} catch (error) {
|
|
97
|
+
this.entries = this.entries.filter(entry => entry.id !== id)
|
|
98
|
+
try { this.flush() } catch { this.quarantined.add(id) }
|
|
99
|
+
throw error
|
|
100
|
+
}
|
|
101
|
+
return true
|
|
102
|
+
}
|
|
89
103
|
reject(id: string, definite = false): void {
|
|
90
104
|
try { this.patch(id, { status: definite ? 'rejected' : 'unknown' }) }
|
|
91
105
|
catch (error) { this.quarantined.add(id); throw error }
|
|
@@ -97,6 +111,9 @@ export class DeferredDelivery {
|
|
|
97
111
|
if (Object.entries(update).every(([key, value]) => Object.is((entry as any)[key], value))) return
|
|
98
112
|
const previous = { ...entry }
|
|
99
113
|
Object.assign(entry, update)
|
|
114
|
+
for (const [key, value] of Object.entries(update)) {
|
|
115
|
+
if (value === undefined) delete (entry as any)[key]
|
|
116
|
+
}
|
|
100
117
|
try { this.flush() } catch (error) {
|
|
101
118
|
for (const key of Object.keys(entry)) delete (entry as any)[key]
|
|
102
119
|
Object.assign(entry, previous)
|
|
@@ -106,6 +123,20 @@ export class DeferredDelivery {
|
|
|
106
123
|
claim(sessionId: string, turn: number, requestId: string): void {
|
|
107
124
|
for (const e of this.entries) if (e.sessionId === sessionId && e.id === requestId && e.turn === undefined) this.patch(e.id, { turn })
|
|
108
125
|
}
|
|
126
|
+
/** Save authoritative reply text before platform I/O, independent of later history availability. */
|
|
127
|
+
preserveText(sessionId: string, turn: number | undefined, text: string): void {
|
|
128
|
+
if (!Number.isSafeInteger(turn) || !text) return
|
|
129
|
+
if (text.length > 1_000_000) return
|
|
130
|
+
for (const entry of this.entries) {
|
|
131
|
+
if (entry.sessionId !== sessionId || entry.turn !== turn || !this.active.has(entry.id)
|
|
132
|
+
|| ['blocked', 'expired', 'rejected', 'sent'].includes(entry.status)) continue
|
|
133
|
+
const current = entry.text ? entry.text.split('\n\n') : []
|
|
134
|
+
if (!current.includes(text)) current.push(text)
|
|
135
|
+
const accumulated = current.join('\n\n')
|
|
136
|
+
if (accumulated.length > 1_000_000) continue
|
|
137
|
+
this.patch(entry.id, { text: accumulated, parts: undefined })
|
|
138
|
+
}
|
|
139
|
+
}
|
|
109
140
|
liveStart(sessionId: string, turn: number): string[] {
|
|
110
141
|
const ids = this.entries.filter(e => e.sessionId === sessionId && e.turn === turn && this.active.has(e.id) && !['blocked', 'expired'].includes(e.status)).map(e => e.id)
|
|
111
142
|
for (const id of ids) this.patch(id, { status: 'unknown' })
|
|
@@ -113,14 +144,14 @@ export class DeferredDelivery {
|
|
|
113
144
|
}
|
|
114
145
|
/**
|
|
115
146
|
* 实时投递收口。`ok` 表示全部确认送达;`rejected` 表示一片都没送到、
|
|
116
|
-
*
|
|
147
|
+
* 且每次失败都明确未提交或被平台拒绝,此时不存在「可能已送达」
|
|
117
148
|
* 的歧义,直接置为 `ready`,交回 30s 巡检自动补发。
|
|
118
149
|
* 其余失败保持 `unknown`,不猜测、不自动重发。
|
|
119
150
|
*/
|
|
120
151
|
complete(sessionId: string, turn: number, ok: boolean, rejected = false): void {
|
|
121
152
|
for (const e of this.entries) if (e.sessionId === sessionId && e.turn === turn && this.active.has(e.id)) {
|
|
122
153
|
// waiting 表示实时路径根本未发送,留给冷读取;unknown 不猜测为失败。
|
|
123
|
-
if (e.status === 'unknown' && ok) this.patch(e.id, { status: 'sent' })
|
|
154
|
+
if (e.status === 'unknown' && ok) this.patch(e.id, { status: 'sent', text: undefined, parts: undefined })
|
|
124
155
|
else if (e.status === 'unknown' && rejected) this.patch(e.id, { status: 'ready' })
|
|
125
156
|
this.active.delete(e.id)
|
|
126
157
|
}
|
|
@@ -157,26 +188,37 @@ export class DeferredDelivery {
|
|
|
157
188
|
}
|
|
158
189
|
if (!valid(entry)) { this.patch(id, { status: 'blocked' }); return }
|
|
159
190
|
const duplicate = this.entries.find(e => e.id !== id && e.sessionId === entry.sessionId && e.turn !== undefined && e.turn === entry.turn && ['sent', 'unknown', 'sending'].includes(e.status))
|
|
160
|
-
if (duplicate && !explicit) {
|
|
191
|
+
if (duplicate && !explicit) {
|
|
192
|
+
this.patch(id, {
|
|
193
|
+
status: duplicate.status === 'sent' ? 'sent' : 'unknown',
|
|
194
|
+
...(duplicate.status === 'sent' ? { text: undefined, parts: undefined } : {}),
|
|
195
|
+
})
|
|
196
|
+
return
|
|
197
|
+
}
|
|
161
198
|
if (!entry.parts) this.patch(id, { parts: chunks(entry.text!) })
|
|
162
199
|
const parts = entry.parts!
|
|
163
|
-
if (!parts.length) { this.patch(id, { status: 'sent' }); return }
|
|
200
|
+
if (!parts.length) { this.patch(id, { status: 'sent', text: undefined, parts: undefined }); return }
|
|
164
201
|
for (let index = entry.offset; index < parts.length; index++) {
|
|
165
202
|
if (!valid(entry)) { this.patch(id, { status: 'blocked' }); return }
|
|
166
203
|
this.patch(id, { status: 'sending' })
|
|
167
204
|
try { await send(entry, parts[index]!) }
|
|
168
205
|
catch (error) {
|
|
169
206
|
// 只有适配器明确确认请求未提交时才保留自动恢复资格。
|
|
170
|
-
this.patch(id, { status: error instanceof DeliveryUnavailable ? 'ready' : 'unknown' })
|
|
207
|
+
this.patch(id, { status: error instanceof DeliveryUnavailable || error instanceof DeliveryRejected ? 'ready' : 'unknown' })
|
|
171
208
|
return
|
|
172
209
|
}
|
|
173
210
|
const blocked = (entry.status as string) === 'blocked'
|
|
174
|
-
this.patch(id, {
|
|
211
|
+
this.patch(id, {
|
|
212
|
+
offset: index + 1,
|
|
213
|
+
status: blocked ? 'blocked' : index + 1 === parts.length ? 'sent' : 'ready',
|
|
214
|
+
...(index + 1 === parts.length ? { text: undefined, parts: undefined } : {}),
|
|
215
|
+
})
|
|
175
216
|
if (blocked) return
|
|
176
217
|
}
|
|
177
218
|
})
|
|
178
219
|
}
|
|
179
220
|
}
|
|
221
|
+
/** Trusted adapter evidence that no request was submitted; not a generic network failure. */
|
|
180
222
|
export class DeliveryUnavailable extends Error {}
|
|
181
223
|
|
|
182
224
|
/**
|
|
@@ -193,5 +235,5 @@ export class DeliveryRejected extends Error {
|
|
|
193
235
|
* 整条重发会让用户看到重复内容,因此退化为结果不明的普通错误。
|
|
194
236
|
*/
|
|
195
237
|
export function afterPartialDelivery(error: unknown): unknown {
|
|
196
|
-
return error instanceof DeliveryRejected ? new Error(error.message, { cause: error }) : error
|
|
238
|
+
return error instanceof DeliveryRejected || error instanceof DeliveryUnavailable ? new Error(error.message, { cause: error }) : error
|
|
197
239
|
}
|
package/src/engine/gateway.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { DeferredDelivery, DeliveryRejected, DeliveryUnavailable, type DeferredEntry } from './deferred-delivery.js'
|
|
2
|
+
import { readLiveSessionHistory, hasSessionHistoryCapability, type HistorySession } from './session-history.js'
|
|
2
3
|
import { ChoiceSendError } from './choice-delivery.js'
|
|
3
4
|
import { sleepWithSignal } from './abort.js'
|
|
4
5
|
import { ThinkingDisplayTracker, normalizeThinkingDisplay, type ThinkingDisplayTarget } from './thinking-display.js'
|
|
@@ -6,7 +7,7 @@ import { assistantText, isSilentReplyText } from './assistant-text.js'
|
|
|
6
7
|
import { readDeliveryHistory } from './delivery-history.js'
|
|
7
8
|
import { FileInputError, filePromptParts } from './file-input.js'
|
|
8
9
|
import { ChoiceStore, type Choice } from './choices.js'
|
|
9
|
-
import { MessageProgress, ProgressTracker, type TurnCompletion } from './message-progress.js'
|
|
10
|
+
import { extractErrorDetail, MessageProgress, ProgressTracker, type TurnCompletion } from './message-progress.js'
|
|
10
11
|
import { notice, replyText, withReplyLocale } from './command-locale.js'
|
|
11
12
|
import { FileDelivery, type DeliverySession } from './file-delivery.js'
|
|
12
13
|
import { ChatCommands } from './chat-commands.js'
|
|
@@ -94,9 +95,10 @@ export interface DeliveryOutcome {
|
|
|
94
95
|
}
|
|
95
96
|
|
|
96
97
|
/**
|
|
97
|
-
*
|
|
98
|
+
* 是否有明确证据证明本次发送未落地。
|
|
98
99
|
*
|
|
99
|
-
*
|
|
100
|
+
* {@link DeliveryUnavailable} 只用于适配器证明连接建立前失败、请求尚未提交。
|
|
101
|
+
* 另一类是渠道显式抛出的 {@link DeliveryRejected}(例如微信
|
|
100
102
|
* `/ilink/bot/sendmessage ret=-2 … prepare failed`、HTTP 429/503):
|
|
101
103
|
* 这类响应说明请求到达平台但未被受理,重发不会让用户收到两条。
|
|
102
104
|
*
|
|
@@ -105,15 +107,12 @@ export interface DeliveryOutcome {
|
|
|
105
107
|
* 请求可能已经落地。这些都保持「送达未知」,只由用户用 `/delivery retry` 决定。
|
|
106
108
|
*/
|
|
107
109
|
export function isDefiniteSendFailure(error: unknown): boolean {
|
|
108
|
-
return error instanceof DeliveryRejected
|
|
110
|
+
return error instanceof DeliveryRejected || error instanceof DeliveryUnavailable
|
|
109
111
|
}
|
|
110
112
|
|
|
111
113
|
interface AgentLike {
|
|
112
114
|
id?: string
|
|
113
|
-
session?:
|
|
114
|
-
id?: string
|
|
115
|
-
events?: readonly { type?: string; data?: Record<string, unknown> }[]
|
|
116
|
-
}
|
|
115
|
+
session?: HistorySession
|
|
117
116
|
}
|
|
118
117
|
|
|
119
118
|
interface ApprovalRequestLike {
|
|
@@ -161,7 +160,7 @@ export class ImEngine {
|
|
|
161
160
|
private readonly sessionActors = new Map<string, string>()
|
|
162
161
|
private readonly chatActors = new Map<string, string>()
|
|
163
162
|
private readonly interactionMessageIds = new Map<string, string | undefined>()
|
|
164
|
-
private readonly questionActors = new Map<string, string>()
|
|
163
|
+
private readonly questionActors = new Map<string, string | undefined>()
|
|
165
164
|
private readonly questionDeliveries = new Map<string, Promise<InteractionDeliveryResult>>()
|
|
166
165
|
private readonly questionPromptDelivered = new Set<string>()
|
|
167
166
|
private readonly queues = new Map<string, Promise<void>>()
|
|
@@ -527,8 +526,24 @@ export class ImEngine {
|
|
|
527
526
|
return
|
|
528
527
|
}
|
|
529
528
|
if (binding && this.questions.has(binding.sessionId)) {
|
|
530
|
-
const
|
|
531
|
-
|
|
529
|
+
const questionActor = this.questionActors.has(binding.sessionId) ? this.questionActors.get(binding.sessionId) : this.sessionActors.get(binding.sessionId)
|
|
530
|
+
let isAuthorizedActor = false
|
|
531
|
+
if (questionActor) {
|
|
532
|
+
isAuthorizedActor = (msg.userId === questionActor)
|
|
533
|
+
} else {
|
|
534
|
+
const candidates = new Set<string>()
|
|
535
|
+
const sessionActor = this.sessionActors.get(binding.sessionId)
|
|
536
|
+
if (sessionActor) candidates.add(sessionActor)
|
|
537
|
+
if (kind === 'group') {
|
|
538
|
+
for (const entry of this.deferred.list(channel.id)) {
|
|
539
|
+
if (entry.sessionId === binding.sessionId && entry.message.kind === 'group' && entry.message.chatId === msg.chatId && entry.message.userId && !['sent', 'rejected', 'expired'].includes(entry.status)) {
|
|
540
|
+
candidates.add(entry.message.userId)
|
|
541
|
+
}
|
|
542
|
+
}
|
|
543
|
+
}
|
|
544
|
+
isAuthorizedActor = candidates.size === 0 || (!!msg.userId && candidates.has(msg.userId))
|
|
545
|
+
}
|
|
546
|
+
if (!isAuthorizedActor) {
|
|
532
547
|
await this.deliver(channel, msg.chatId, notice(this.ctx, '只有发起当前任务的用户可以回答这个问题。'))
|
|
533
548
|
return
|
|
534
549
|
}
|
|
@@ -593,7 +608,8 @@ export class ImEngine {
|
|
|
593
608
|
const channel = this.channels.get(entry.channelId)
|
|
594
609
|
if (this.disposed || !channel) return false
|
|
595
610
|
const binding = this.router.lookup(entry.channelId, entry.message.kind ?? 'dm', entry.message.chatId)
|
|
596
|
-
return binding?.sessionId === entry.sessionId &&
|
|
611
|
+
return binding?.sessionId === entry.sessionId && (entry.turn === undefined || !this.progress.hasNewerTurn(entry.sessionId, entry.turn))
|
|
612
|
+
&& decideAccess({ userAllowed: this.isAuthorized(entry.channelId, channel, entry.message), kind: entry.message.kind, addressed: true }) === 'allow'
|
|
597
613
|
}
|
|
598
614
|
|
|
599
615
|
private async recoverDelivery(entry: DeferredEntry, fresh = false, explicit = false): Promise<'missing' | 'unavailable' | undefined> {
|
|
@@ -870,6 +886,41 @@ export class ImEngine {
|
|
|
870
886
|
}, req.signal, () => cancelled)
|
|
871
887
|
}
|
|
872
888
|
|
|
889
|
+
private recoverQuestionActor(sessionId: string, session: HistorySession | undefined): { hasHistory: boolean; actor?: string } {
|
|
890
|
+
if (!hasSessionHistoryCapability(session)) return { hasHistory: false }
|
|
891
|
+
try {
|
|
892
|
+
const events = readLiveSessionHistory(session)
|
|
893
|
+
if (!events) return { hasHistory: true }
|
|
894
|
+
let turn: number | undefined
|
|
895
|
+
let ids = new Set<string>()
|
|
896
|
+
for (const event of events) {
|
|
897
|
+
if (event.type === 'turn/start') {
|
|
898
|
+
turn = Number.isSafeInteger(event.data?.turn) ? event.data.turn : undefined
|
|
899
|
+
ids = new Set()
|
|
900
|
+
} else if (event.type === 'turn/end' && event.data?.turn === turn) {
|
|
901
|
+
turn = undefined
|
|
902
|
+
ids.clear()
|
|
903
|
+
} else if (turn !== undefined && event.type === 'user/message') {
|
|
904
|
+
if (typeof event.data?.id === 'string') ids.add(event.data.id)
|
|
905
|
+
if (typeof event.data?.source?.rpcId === 'string') ids.add(event.data.source.rpcId)
|
|
906
|
+
}
|
|
907
|
+
}
|
|
908
|
+
if (turn === undefined || !ids.size) return { hasHistory: true }
|
|
909
|
+
const binding = this.router.bindingForSession(sessionId)
|
|
910
|
+
if (!binding) return { hasHistory: true }
|
|
911
|
+
const channel = this.channels.get(binding.channelId)
|
|
912
|
+
if (!channel) return { hasHistory: true }
|
|
913
|
+
const actors = new Set(this.deferred.list(binding.channelId).filter(entry =>
|
|
914
|
+
ids.has(entry.id) && entry.sessionId === sessionId && entry.message.kind === binding.kind
|
|
915
|
+
&& entry.message.chatId === binding.chatId && !!entry.message.userId
|
|
916
|
+
&& (entry.turn === undefined || entry.turn === turn)
|
|
917
|
+
&& !['sent', 'rejected', 'expired'].includes(entry.status)
|
|
918
|
+
&& this.isAuthorized(binding.channelId, channel, entry.message) && this.validDelivery(entry),
|
|
919
|
+
).map(entry => entry.message.userId!))
|
|
920
|
+
return { hasHistory: true, actor: actors.size === 1 ? actors.values().next().value : undefined }
|
|
921
|
+
} catch { return { hasHistory: true } }
|
|
922
|
+
}
|
|
923
|
+
|
|
873
924
|
private async onUserQuestions(
|
|
874
925
|
req: UserQuestionRequestLike,
|
|
875
926
|
next: () => Promise<UserQuestionAnswer>,
|
|
@@ -887,7 +938,10 @@ export class ImEngine {
|
|
|
887
938
|
throw req.signal.reason ?? new DOMException('Aborted', 'AbortError')
|
|
888
939
|
}
|
|
889
940
|
const initialBinding = this.router.bindingForSession(sessionId)
|
|
890
|
-
const
|
|
941
|
+
const recovered = this.recoverQuestionActor(sessionId, req.agent?.session)
|
|
942
|
+
const actor = recovered.hasHistory
|
|
943
|
+
? (recovered.actor ?? (initialBinding?.kind === 'dm' ? initialBinding.chatId : undefined))
|
|
944
|
+
: this.sessionActors.get(sessionId) ?? (initialBinding ? this.chatActors.get(`${initialBinding.channelId}:${initialBinding.kind}:${initialBinding.chatId}`) : undefined) ?? (initialBinding?.kind === 'dm' ? initialBinding.chatId : undefined)
|
|
891
945
|
if (actor) this.sessionActors.set(sessionId, actor)
|
|
892
946
|
const typedQuestions = questions as UserQuestionItem[]
|
|
893
947
|
return await this.runInteraction(sessionId, async () => {
|
|
@@ -902,7 +956,7 @@ export class ImEngine {
|
|
|
902
956
|
// Abort can reject while the prompt send is still in flight; attach the
|
|
903
957
|
// observer now, then await the same promise after presentation completes.
|
|
904
958
|
void wait.catch(() => undefined)
|
|
905
|
-
|
|
959
|
+
this.questionActors.set(sessionId, actor)
|
|
906
960
|
const resume = this.progress.waiting(sessionId, true)
|
|
907
961
|
try {
|
|
908
962
|
const delivery = await this.retryInteraction(channel, () => this.deliverQuestionInteraction(sessionId, channel, binding.chatId, this.formatQuestion(
|
|
@@ -1118,7 +1172,17 @@ export class ImEngine {
|
|
|
1118
1172
|
if (event.type !== 'turn/end') this.progress.event(id, event)
|
|
1119
1173
|
const outcome: DeliveryOutcome = { ok: !skip, content: false }
|
|
1120
1174
|
const deferEnd = event.type === 'turn/end' && this.replyFinalization.keys().includes(id)
|
|
1121
|
-
const process = () =>
|
|
1175
|
+
const process = async () => {
|
|
1176
|
+
if (event.type === 'assistant/message' && event.surfaceOp === 'append' && !invalid
|
|
1177
|
+
&& binding && channel && !this.router.isMuted(id)) {
|
|
1178
|
+
const content = event.data?.message?.content
|
|
1179
|
+
// Tool-call narration is not an authoritative final body to replay after a crash.
|
|
1180
|
+
const text = Array.isArray(content) && content.some(part => part?.type === 'tool-call')
|
|
1181
|
+
? undefined : assistantText(content, channel.skipInterimText)
|
|
1182
|
+
if (text) this.deferred.preserveText(id, turn, text)
|
|
1183
|
+
}
|
|
1184
|
+
if (!skip) await this.processSessionEvent(session, event, outcome, trackedEnd)
|
|
1185
|
+
}
|
|
1122
1186
|
let work: Promise<void>
|
|
1123
1187
|
if (event.type === 'assistant/message') {
|
|
1124
1188
|
// Start now, registering content before a synchronous turn/end; queue only its barrier.
|
|
@@ -1318,12 +1382,16 @@ export class ImEngine {
|
|
|
1318
1382
|
const thinkingFinal = this.thinking.finish(thinkingTarget)
|
|
1319
1383
|
this.progress.delivery(sessionId, thinkingTurn, thinkingFinal.then(() => undefined))
|
|
1320
1384
|
this.streamHints.delete(streamKey)
|
|
1321
|
-
const reason = (event.data as { reason?: { kind?: string; error?:
|
|
1385
|
+
const reason = (event.data as { reason?: { kind?: string; error?: unknown } } | undefined)?.reason
|
|
1322
1386
|
this.log(`[${channel.id}] 回合结束 ${sessionId}: ${reason?.kind ?? 'ok'}`)
|
|
1323
1387
|
if (reason?.kind === 'error' && !trackedEnd) {
|
|
1324
|
-
const
|
|
1388
|
+
const errorDetail = extractErrorDetail(reason.error)
|
|
1389
|
+
const detail = errorDetail || '模型调用失败'
|
|
1325
1390
|
this.log(`[${channel.id}] 回合失败 ${sessionId}: ${detail}`)
|
|
1326
|
-
const failed =
|
|
1391
|
+
const failed = [
|
|
1392
|
+
notice(this.ctx, '助手没有生成回复,请查看本机日志。'),
|
|
1393
|
+
errorDetail ? notice(this.ctx, '原因:{0}', errorDetail) : '',
|
|
1394
|
+
].filter(Boolean).join('\n\n')
|
|
1327
1395
|
const taken = await this.streams.take(streamKey, sessionId)
|
|
1328
1396
|
if (taken.invalidated || !stillDeliverable()) {
|
|
1329
1397
|
await this.discardEmptyTake(taken)
|
|
@@ -1539,13 +1607,23 @@ export class ImEngine {
|
|
|
1539
1607
|
const notified = await withReplyLocale(this.ctx, async () => {
|
|
1540
1608
|
const text = ({
|
|
1541
1609
|
empty: replyText('本次处理已结束,未返回可投递的结果。可补充要求后继续。'),
|
|
1542
|
-
error:
|
|
1610
|
+
error: [
|
|
1611
|
+
replyText('本次处理失败,已返回的内容保留。请查看会话状态,或补充要求后重试。'),
|
|
1612
|
+
result.errorDetail ? replyText('原因:{0}', result.errorDetail) : '',
|
|
1613
|
+
].filter(Boolean).join('\n\n'),
|
|
1543
1614
|
cancelled: result.reasonKind === 'max-tokens'
|
|
1544
1615
|
? replyText('本次处理已达到输出长度上限,已返回的内容保留。可发送「继续」接续生成。')
|
|
1545
1616
|
: replyText('本次处理已停止,已返回的内容保留。可直接发消息继续。'),
|
|
1546
1617
|
'delivery-failed': replyText('本次处理已结束,但部分回复或文件未能发送。查看交付记录:/delivery;完整结果和文件请在网页查看,不会自动重复执行任务。'),
|
|
1547
1618
|
})[status]
|
|
1548
1619
|
if (!valid()) return
|
|
1620
|
+
const noticeId = `completion:${result.sessionId}:${result.turn}:${status}`
|
|
1621
|
+
try {
|
|
1622
|
+
if (!this.deferred.beginNotice(noticeId, result.sessionId, channel.id, message, text, result.turn)) return
|
|
1623
|
+
} catch (error) {
|
|
1624
|
+
this.log(`[im-delivery] 完成通知记录失败: ${error instanceof Error ? error.message : String(error)}`)
|
|
1625
|
+
return
|
|
1626
|
+
}
|
|
1549
1627
|
if (result.status === 'error' || result.status === 'cancelled' || result.status === 'empty') {
|
|
1550
1628
|
for (const entry of this.deferred.list(channel.id, message)) if (entry.sessionId === result.sessionId && entry.turn === result.turn && entry.status === 'waiting') {
|
|
1551
1629
|
this.deferred.patch(entry.id, { status: 'unknown' })
|
|
@@ -1560,11 +1638,14 @@ export class ImEngine {
|
|
|
1560
1638
|
const body = text
|
|
1561
1639
|
// 复用已有回复流发送异常说明;收口结果不明时不重复发送。
|
|
1562
1640
|
await taken.stream.finish([taken.text, body].filter(Boolean).join('\n\n'))
|
|
1641
|
+
this.deferred.patch(noticeId, { status: 'sent' })
|
|
1563
1642
|
return true
|
|
1564
1643
|
}
|
|
1565
1644
|
}
|
|
1566
|
-
const outcome = { ok: true }
|
|
1645
|
+
const outcome: DeliveryOutcome = { ok: true }
|
|
1567
1646
|
await this.deliver(channel, message.chatId, text, outcome)
|
|
1647
|
+
if (outcome.ok) this.deferred.patch(noticeId, { status: 'sent' })
|
|
1648
|
+
else if (outcome.definite) this.deferred.patch(noticeId, { status: 'ready' })
|
|
1568
1649
|
return outcome.ok
|
|
1569
1650
|
})
|
|
1570
1651
|
if (notified) for (const id of terminalIds) this.deferred.patch(id, { status: 'sent' })
|
|
@@ -1694,7 +1775,7 @@ export class ImEngine {
|
|
|
1694
1775
|
let tracked: Promise<InteractionDeliveryResult>
|
|
1695
1776
|
const current = this.questions.current(sessionId)
|
|
1696
1777
|
const binding = this.router.bindingForSession(sessionId)
|
|
1697
|
-
const actor = this.questionActors.get(sessionId)
|
|
1778
|
+
const actor = this.questionActors.has(sessionId) ? this.questionActors.get(sessionId) : this.sessionActors.get(sessionId) ?? (binding ? this.chatActors.get(`${binding.channelId}:${binding.kind}:${binding.chatId}`) : undefined) ?? (binding?.kind === 'dm' ? chatId : undefined)
|
|
1698
1779
|
const selected = this.questionSelections.get(sessionId) ?? new Set<number>()
|
|
1699
1780
|
const choices: Choice[] = current?.question.options?.map((option, index) => ({
|
|
1700
1781
|
label: (current.question.multiSelect && selected.has(index) ? '✓ ' : '') + option.label,
|