@xgjktech/xg_cwork_im 1.13.1 → 1.14.6
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/README.md +3 -0
- package/dist/src/agent-context-types.d.ts +39 -1
- package/dist/src/agent-context-types.d.ts.map +1 -1
- package/dist/src/agent-context-types.js +52 -7
- package/dist/src/agent-context-types.js.map +1 -1
- package/dist/src/agent-context-types.test.d.ts +2 -0
- package/dist/src/agent-context-types.test.d.ts.map +1 -0
- package/dist/src/agent-context-types.test.js +61 -0
- package/dist/src/agent-context-types.test.js.map +1 -0
- package/dist/src/block-streaming-config.test.d.ts +2 -0
- package/dist/src/block-streaming-config.test.d.ts.map +1 -0
- package/dist/src/block-streaming-config.test.js +41 -0
- package/dist/src/block-streaming-config.test.js.map +1 -0
- package/dist/src/build-project-prompt.d.ts.map +1 -1
- package/dist/src/build-project-prompt.js +5 -1
- package/dist/src/build-project-prompt.js.map +1 -1
- package/dist/src/channel-config.d.ts +128 -0
- package/dist/src/channel-config.d.ts.map +1 -1
- package/dist/src/channel-config.js +67 -0
- package/dist/src/channel-config.js.map +1 -1
- package/dist/src/channel.d.ts.map +1 -1
- package/dist/src/channel.js +22 -7
- package/dist/src/channel.js.map +1 -1
- package/dist/src/connection.d.ts +7 -0
- package/dist/src/connection.d.ts.map +1 -1
- package/dist/src/connection.js +16 -1
- package/dist/src/connection.js.map +1 -1
- package/dist/src/deliver-text.d.ts +13 -0
- package/dist/src/deliver-text.d.ts.map +1 -0
- package/dist/src/deliver-text.js +28 -0
- package/dist/src/deliver-text.js.map +1 -0
- package/dist/src/deliver-text.test.d.ts +2 -0
- package/dist/src/deliver-text.test.d.ts.map +1 -0
- package/dist/src/deliver-text.test.js +31 -0
- package/dist/src/deliver-text.test.js.map +1 -0
- package/dist/src/dispatch-mentioned-reply.d.ts.map +1 -1
- package/dist/src/dispatch-mentioned-reply.js +62 -18
- package/dist/src/dispatch-mentioned-reply.js.map +1 -1
- package/dist/src/inbound-display.d.ts +2 -0
- package/dist/src/inbound-display.d.ts.map +1 -1
- package/dist/src/inbound-display.js +16 -5
- package/dist/src/inbound-display.js.map +1 -1
- package/dist/src/inbound-input-media.js +1 -1
- package/dist/src/inbound-input-media.js.map +1 -1
- package/dist/src/inbound-media-local.js +1 -1
- package/dist/src/inbound-media-local.js.map +1 -1
- package/dist/src/inbound-terminal-delivery.d.ts +9 -3
- package/dist/src/inbound-terminal-delivery.d.ts.map +1 -1
- package/dist/src/inbound-terminal-delivery.js +70 -15
- package/dist/src/inbound-terminal-delivery.js.map +1 -1
- package/dist/src/inbound-terminal-state.d.ts +16 -1
- package/dist/src/inbound-terminal-state.d.ts.map +1 -1
- package/dist/src/inbound-terminal-state.js +58 -1
- package/dist/src/inbound-terminal-state.js.map +1 -1
- package/dist/src/inbound-terminal-state.test.js +59 -7
- package/dist/src/inbound-terminal-state.test.js.map +1 -1
- package/dist/src/per-message-fallback-notice.d.ts +11 -1
- package/dist/src/per-message-fallback-notice.d.ts.map +1 -1
- package/dist/src/per-message-fallback-notice.js +16 -1
- package/dist/src/per-message-fallback-notice.js.map +1 -1
- package/dist/src/per-message-fallback-notice.test.d.ts +2 -0
- package/dist/src/per-message-fallback-notice.test.d.ts.map +1 -0
- package/dist/src/per-message-fallback-notice.test.js +47 -0
- package/dist/src/per-message-fallback-notice.test.js.map +1 -0
- package/dist/src/resource-file.d.ts +7 -1
- package/dist/src/resource-file.d.ts.map +1 -1
- package/dist/src/resource-file.js +56 -19
- package/dist/src/resource-file.js.map +1 -1
- package/dist/src/send-service.d.ts.map +1 -1
- package/dist/src/send-service.js +33 -7
- package/dist/src/send-service.js.map +1 -1
- package/dist/src/types.d.ts +27 -0
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/types.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* 入站 IM 消息终态投递:幂等、结构化日志、HTTP 兜底发送。
|
|
3
3
|
*/
|
|
4
|
-
import { buildTerminalUserMessage, classifyRuntimeErrorMessage, formatTerminalLogLine, hasGlobalTerminalSent, markGlobalTerminalSent, resolveTerminalState, } from "./inbound-terminal-state.js";
|
|
4
|
+
import { buildTerminalUserMessage, classifyRuntimeErrorMessage, formatTerminalLogLine, hasGlobalTerminalSent, markGlobalTerminalSent, resolveNoReplyCause, resolveTerminalState, resolveHttpSuppressedReason, shouldSendTerminalHttpForState, } from "./inbound-terminal-state.js";
|
|
5
5
|
export class InboundTerminalController {
|
|
6
6
|
messageId;
|
|
7
7
|
groupId;
|
|
@@ -15,7 +15,9 @@ export class InboundTerminalController {
|
|
|
15
15
|
compactionShown = false;
|
|
16
16
|
compactionIncomplete = false;
|
|
17
17
|
runtimeErrorHint;
|
|
18
|
-
|
|
18
|
+
normalizerSilentSkip = false;
|
|
19
|
+
normalizerHeartbeatSkip = false;
|
|
20
|
+
normalizerSkipReasons = [];
|
|
19
21
|
localTerminalSent = false;
|
|
20
22
|
lastResolvedState;
|
|
21
23
|
constructor(args) {
|
|
@@ -37,8 +39,18 @@ export class InboundTerminalController {
|
|
|
37
39
|
markTimeoutFired() {
|
|
38
40
|
this.timeoutFired = true;
|
|
39
41
|
}
|
|
40
|
-
|
|
41
|
-
|
|
42
|
+
/** OpenClaw reply normalizer 跳过 payload 时记录(onSkip reason)。 */
|
|
43
|
+
noteNormalizerSkip(reason) {
|
|
44
|
+
const r = reason.trim();
|
|
45
|
+
if (r && !this.normalizerSkipReasons.includes(r)) {
|
|
46
|
+
this.normalizerSkipReasons.push(r);
|
|
47
|
+
}
|
|
48
|
+
if (reason === "silent") {
|
|
49
|
+
this.normalizerSilentSkip = true;
|
|
50
|
+
}
|
|
51
|
+
else if (reason === "heartbeat") {
|
|
52
|
+
this.normalizerHeartbeatSkip = true;
|
|
53
|
+
}
|
|
42
54
|
}
|
|
43
55
|
noteCompactionNotice(text) {
|
|
44
56
|
this.compactionShown = true;
|
|
@@ -67,22 +79,44 @@ export class InboundTerminalController {
|
|
|
67
79
|
* 尝试发送终态 HTTP 兜底。返回是否已向 IM 发送(含此前已发送的幂等命中)。
|
|
68
80
|
*/
|
|
69
81
|
async trySendTerminal(state, sendFn, extra) {
|
|
82
|
+
const metrics = {
|
|
83
|
+
deliver_invoke_count: extra?.deliverInvokeCount,
|
|
84
|
+
deliver_call_count: extra?.deliverCallCount,
|
|
85
|
+
normalizer_silent_skip: this.normalizerSilentSkip,
|
|
86
|
+
normalizer_heartbeat_skip: this.normalizerHeartbeatSkip,
|
|
87
|
+
};
|
|
88
|
+
const suppressedReason = resolveHttpSuppressedReason(state, {
|
|
89
|
+
normalizerSilentSkip: this.normalizerSilentSkip,
|
|
90
|
+
normalizerHeartbeatSkip: this.normalizerHeartbeatSkip,
|
|
91
|
+
});
|
|
70
92
|
if (state === "success") {
|
|
71
|
-
this.logTerminal(state, false, extra?.errorMessage);
|
|
93
|
+
this.logTerminal(state, false, extra?.errorMessage, extra?.noReplyCause, metrics);
|
|
72
94
|
return false;
|
|
73
95
|
}
|
|
74
96
|
if (this.hasBusinessReply && state !== "timeout") {
|
|
75
|
-
|
|
76
|
-
this.logTerminal(state, false, extra?.errorMessage);
|
|
97
|
+
this.logTerminal(state, false, extra?.errorMessage, extra?.noReplyCause, metrics);
|
|
77
98
|
return false;
|
|
78
99
|
}
|
|
79
100
|
if (this.localTerminalSent || hasGlobalTerminalSent(this.messageId)) {
|
|
80
|
-
this.logTerminal(state, false, extra?.errorMessage);
|
|
101
|
+
this.logTerminal(state, false, extra?.errorMessage, extra?.noReplyCause, metrics);
|
|
81
102
|
return false;
|
|
82
103
|
}
|
|
83
104
|
const text = buildTerminalUserMessage(state);
|
|
84
105
|
if (!text.trim()) {
|
|
85
|
-
this.logTerminal(state, false, extra?.errorMessage);
|
|
106
|
+
this.logTerminal(state, false, extra?.errorMessage, extra?.noReplyCause, metrics);
|
|
107
|
+
return false;
|
|
108
|
+
}
|
|
109
|
+
if (!shouldSendTerminalHttpForState(state, {
|
|
110
|
+
normalizerSilentSkip: this.normalizerSilentSkip,
|
|
111
|
+
normalizerHeartbeatSkip: this.normalizerHeartbeatSkip,
|
|
112
|
+
})) {
|
|
113
|
+
this.log.info(`${this.logPrefix} [terminal] HTTP suppressed reason=${suppressedReason} ` +
|
|
114
|
+
`normalizer_skip_reasons=${JSON.stringify(this.normalizerSkipReasons)} ` +
|
|
115
|
+
`message_id=${this.messageId} (intentional silence; user sees no HTTP body)`);
|
|
116
|
+
this.logTerminal(state, false, extra?.errorMessage, extra?.noReplyCause, {
|
|
117
|
+
...metrics,
|
|
118
|
+
http_suppressed_reason: suppressedReason,
|
|
119
|
+
});
|
|
86
120
|
return false;
|
|
87
121
|
}
|
|
88
122
|
try {
|
|
@@ -90,7 +124,7 @@ export class InboundTerminalController {
|
|
|
90
124
|
this.localTerminalSent = true;
|
|
91
125
|
markGlobalTerminalSent(this.messageId, state);
|
|
92
126
|
this.lastResolvedState = state;
|
|
93
|
-
this.logTerminal(state, true, extra?.errorMessage);
|
|
127
|
+
this.logTerminal(state, true, extra?.errorMessage, extra?.noReplyCause, metrics);
|
|
94
128
|
if (state === "timeout") {
|
|
95
129
|
this.hasBusinessReply = true;
|
|
96
130
|
}
|
|
@@ -98,7 +132,7 @@ export class InboundTerminalController {
|
|
|
98
132
|
}
|
|
99
133
|
catch (err) {
|
|
100
134
|
this.log.error(`${this.logPrefix} [terminal] Failed to send terminal notice state=${state}: ${String(err)}`);
|
|
101
|
-
this.logTerminal(state, false, extra?.errorMessage ?? String(err));
|
|
135
|
+
this.logTerminal(state, false, extra?.errorMessage ?? String(err), extra?.noReplyCause, metrics);
|
|
102
136
|
return false;
|
|
103
137
|
}
|
|
104
138
|
}
|
|
@@ -115,9 +149,11 @@ export class InboundTerminalController {
|
|
|
115
149
|
runtimeErrorHint: this.runtimeErrorHint,
|
|
116
150
|
deliverInvokeCount: args.deliverInvokeCount,
|
|
117
151
|
deliverCallCount: args.deliverCallCount,
|
|
118
|
-
|
|
152
|
+
normalizerSilentSkip: this.normalizerSilentSkip,
|
|
153
|
+
normalizerHeartbeatSkip: this.normalizerHeartbeatSkip,
|
|
119
154
|
};
|
|
120
155
|
const state = resolveTerminalState(input);
|
|
156
|
+
const noReplyCause = resolveNoReplyCause(input);
|
|
121
157
|
this.lastResolvedState = state;
|
|
122
158
|
if (!this.hasBusinessReply || state === "timeout") {
|
|
123
159
|
const errMsg = this.runtimeErrorHint?.errorMessage ??
|
|
@@ -130,10 +166,20 @@ export class InboundTerminalController {
|
|
|
130
166
|
: args.lastDeliverError !== undefined
|
|
131
167
|
? String(args.lastDeliverError)
|
|
132
168
|
: undefined);
|
|
133
|
-
await this.trySendTerminal(state, args.sendFn, {
|
|
169
|
+
await this.trySendTerminal(state, args.sendFn, {
|
|
170
|
+
errorMessage: errMsg,
|
|
171
|
+
noReplyCause,
|
|
172
|
+
deliverInvokeCount: args.deliverInvokeCount,
|
|
173
|
+
deliverCallCount: args.deliverCallCount,
|
|
174
|
+
});
|
|
134
175
|
}
|
|
135
176
|
else {
|
|
136
|
-
this.logTerminal("success", true
|
|
177
|
+
this.logTerminal("success", true, undefined, noReplyCause, {
|
|
178
|
+
deliver_invoke_count: args.deliverInvokeCount,
|
|
179
|
+
deliver_call_count: args.deliverCallCount,
|
|
180
|
+
normalizer_silent_skip: this.normalizerSilentSkip,
|
|
181
|
+
normalizer_heartbeat_skip: this.normalizerHeartbeatSkip,
|
|
182
|
+
});
|
|
137
183
|
}
|
|
138
184
|
return state;
|
|
139
185
|
}
|
|
@@ -149,7 +195,7 @@ export class InboundTerminalController {
|
|
|
149
195
|
wasTerminalDelivered() {
|
|
150
196
|
return this.localTerminalSent;
|
|
151
197
|
}
|
|
152
|
-
logTerminal(state, sentToIm, errorMessage) {
|
|
198
|
+
logTerminal(state, sentToIm, errorMessage, noReplyCause, metrics) {
|
|
153
199
|
const line = formatTerminalLogLine({
|
|
154
200
|
message_id: this.messageId,
|
|
155
201
|
group_id: this.groupId,
|
|
@@ -160,10 +206,19 @@ export class InboundTerminalController {
|
|
|
160
206
|
sent_to_im: sentToIm,
|
|
161
207
|
error_type: state === "success" ? undefined : state,
|
|
162
208
|
error_message: errorMessage,
|
|
209
|
+
no_reply_cause: state === "no_reply" ? noReplyCause : undefined,
|
|
210
|
+
deliver_invoke_count: metrics?.deliver_invoke_count,
|
|
211
|
+
deliver_call_count: metrics?.deliver_call_count,
|
|
212
|
+
normalizer_silent_skip: metrics?.normalizer_silent_skip,
|
|
213
|
+
normalizer_heartbeat_skip: metrics?.normalizer_heartbeat_skip,
|
|
214
|
+
http_suppressed_reason: metrics?.http_suppressed_reason,
|
|
163
215
|
});
|
|
164
216
|
if (state === "success" && sentToIm) {
|
|
165
217
|
this.log.info(`${this.logPrefix} ${line}`);
|
|
166
218
|
}
|
|
219
|
+
else if (state === "no_reply" && !sentToIm) {
|
|
220
|
+
this.log.warn(`${this.logPrefix} ${line}`);
|
|
221
|
+
}
|
|
167
222
|
else if (sentToIm) {
|
|
168
223
|
this.log.warn(`${this.logPrefix} ${line}`);
|
|
169
224
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbound-terminal-delivery.js","sourceRoot":"","sources":["../../src/inbound-terminal-delivery.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACH,wBAAwB,EACxB,2BAA2B,EAC3B,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"inbound-terminal-delivery.js","sourceRoot":"","sources":["../../src/inbound-terminal-delivery.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,8 +20,16 @@ export type TerminalLogFields = {
|
|
|
20
20
|
sent_to_im: boolean;
|
|
21
21
|
error_type?: TerminalState;
|
|
22
22
|
error_message?: string;
|
|
23
|
+
no_reply_cause?: NoReplyCause;
|
|
24
|
+
deliver_invoke_count?: number;
|
|
25
|
+
deliver_call_count?: number;
|
|
26
|
+
normalizer_silent_skip?: boolean;
|
|
27
|
+
normalizer_heartbeat_skip?: boolean;
|
|
28
|
+
http_suppressed_reason?: "intentional_silent" | "heartbeat_only";
|
|
23
29
|
};
|
|
24
30
|
export declare function formatTerminalLogLine(fields: TerminalLogFields): string;
|
|
31
|
+
/** 终态为 no_reply 时的细分原因(用于日志与是否发 HTTP 兜底)。 */
|
|
32
|
+
export type NoReplyCause = "intentional_silent" | "heartbeat_only" | "zero_deliver" | "all_deliver_skipped" | "unknown";
|
|
25
33
|
export type ResolveTerminalStateInput = {
|
|
26
34
|
hasBusinessReply: boolean;
|
|
27
35
|
timeoutFired: boolean;
|
|
@@ -34,8 +42,15 @@ export type ResolveTerminalStateInput = {
|
|
|
34
42
|
runtimeErrorHint?: RuntimeErrorHint;
|
|
35
43
|
deliverInvokeCount: number;
|
|
36
44
|
deliverCallCount: number;
|
|
37
|
-
|
|
45
|
+
/** OpenClaw normalizer 因 NO_REPLY / silent token 跳过 payload(onSkip reason=silent) */
|
|
46
|
+
normalizerSilentSkip?: boolean;
|
|
47
|
+
/** normalizer 因 HEARTBEAT_OK 等跳过(onSkip reason=heartbeat) */
|
|
48
|
+
normalizerHeartbeatSkip?: boolean;
|
|
38
49
|
};
|
|
50
|
+
export declare function resolveHttpSuppressedReason(state: TerminalState, input: Pick<ResolveTerminalStateInput, "normalizerSilentSkip" | "normalizerHeartbeatSkip">): "intentional_silent" | "heartbeat_only" | undefined;
|
|
51
|
+
/** 模型/OpenClaw 主动静默(NO_REPLY、heartbeat)时不应向 IM 发「没有生成回复」HTTP。 */
|
|
52
|
+
export declare function shouldSendTerminalHttpForState(state: TerminalState, input: Pick<ResolveTerminalStateInput, "normalizerSilentSkip" | "normalizerHeartbeatSkip">): boolean;
|
|
53
|
+
export declare function resolveNoReplyCause(input: ResolveTerminalStateInput): NoReplyCause | undefined;
|
|
39
54
|
/** 在 finally 阶段根据观测信号推断终态(success 由 hasBusinessReply 在外层短路)。 */
|
|
40
55
|
export declare function resolveTerminalState(input: ResolveTerminalStateInput): TerminalState;
|
|
41
56
|
export declare function hasGlobalTerminalSent(messageId: string): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbound-terminal-state.d.ts","sourceRoot":"","sources":["../../src/inbound-terminal-state.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,kBAAkB,CAAC;AAEpG,MAAM,MAAM,aAAa,GACnB,SAAS,GACT,UAAU,GACV,SAAS,GACT,eAAe,GACf,gBAAgB,GAChB,mBAAmB,GACnB,iBAAiB,GACjB,WAAW,GACX,YAAY,CAAC;AAEnB,MAAM,MAAM,gBAAgB,GAAG;IAC3B,SAAS,EAAE,aAAa,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;CACxB,CAAC;AAcF,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,CAkB7E;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAKnE;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,CAuBrE;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,cAAc,CAAC;IACxB,cAAc,EAAE,aAAa,CAAC;IAC9B,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"inbound-terminal-state.d.ts","sourceRoot":"","sources":["../../src/inbound-terminal-state.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,kBAAkB,CAAC;AAEpG,MAAM,MAAM,aAAa,GACnB,SAAS,GACT,UAAU,GACV,SAAS,GACT,eAAe,GACf,gBAAgB,GAChB,mBAAmB,GACnB,iBAAiB,GACjB,WAAW,GACX,YAAY,CAAC;AAEnB,MAAM,MAAM,gBAAgB,GAAG;IAC3B,SAAS,EAAE,aAAa,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;CACxB,CAAC;AAcF,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,CAkB7E;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAKnE;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,CAuBrE;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,cAAc,CAAC;IACxB,cAAc,EAAE,aAAa,CAAC;IAC9B,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,YAAY,CAAC;IAC9B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,sBAAsB,CAAC,EAAE,oBAAoB,GAAG,gBAAgB,CAAC;CACpE,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAuBvE;AAED,6CAA6C;AAC7C,MAAM,MAAM,YAAY,GAClB,oBAAoB,GACpB,gBAAgB,GAChB,cAAc,GACd,qBAAqB,GACrB,SAAS,CAAC;AAEhB,MAAM,MAAM,yBAAyB,GAAG;IACpC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,eAAe,EAAE,OAAO,CAAC;IACzB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,qFAAqF;IACrF,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,6DAA6D;IAC7D,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACrC,CAAC;AAEF,wBAAgB,2BAA2B,CACvC,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,IAAI,CAAC,yBAAyB,EAAE,sBAAsB,GAAG,yBAAyB,CAAC,GAC3F,oBAAoB,GAAG,gBAAgB,GAAG,SAAS,CAWrD;AAED,iEAAiE;AACjE,wBAAgB,8BAA8B,CAC1C,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,IAAI,CAAC,yBAAyB,EAAE,sBAAsB,GAAG,yBAAyB,CAAC,GAC3F,OAAO,CAQT;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,yBAAyB,GAAG,YAAY,GAAG,SAAS,CAiB9F;AAED,gEAAgE;AAChE,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,GAAG,aAAa,CAmCpF;AAKD,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAEhE;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI,CAMpF;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAEnF;AAED,oBAAoB;AACpB,wBAAgB,+BAA+B,IAAI,IAAI,CAEtD"}
|
|
@@ -66,9 +66,59 @@ export function formatTerminalLogLine(fields) {
|
|
|
66
66
|
`sent_to_im=${fields.sent_to_im}`,
|
|
67
67
|
fields.error_type ? `error_type=${fields.error_type}` : undefined,
|
|
68
68
|
fields.error_message ? `error_message=${JSON.stringify(fields.error_message)}` : undefined,
|
|
69
|
+
fields.no_reply_cause ? `no_reply_cause=${fields.no_reply_cause}` : undefined,
|
|
70
|
+
fields.deliver_invoke_count != null ? `deliver_invoke_count=${fields.deliver_invoke_count}` : undefined,
|
|
71
|
+
fields.deliver_call_count != null ? `deliver_call_count=${fields.deliver_call_count}` : undefined,
|
|
72
|
+
fields.normalizer_silent_skip != null
|
|
73
|
+
? `normalizer_silent_skip=${fields.normalizer_silent_skip}`
|
|
74
|
+
: undefined,
|
|
75
|
+
fields.normalizer_heartbeat_skip != null
|
|
76
|
+
? `normalizer_heartbeat_skip=${fields.normalizer_heartbeat_skip}`
|
|
77
|
+
: undefined,
|
|
78
|
+
fields.http_suppressed_reason ? `http_suppressed_reason=${fields.http_suppressed_reason}` : undefined,
|
|
69
79
|
].filter(Boolean);
|
|
70
80
|
return parts.join(" ");
|
|
71
81
|
}
|
|
82
|
+
export function resolveHttpSuppressedReason(state, input) {
|
|
83
|
+
if (state !== "no_reply") {
|
|
84
|
+
return undefined;
|
|
85
|
+
}
|
|
86
|
+
if (input.normalizerSilentSkip) {
|
|
87
|
+
return "intentional_silent";
|
|
88
|
+
}
|
|
89
|
+
if (input.normalizerHeartbeatSkip) {
|
|
90
|
+
return "heartbeat_only";
|
|
91
|
+
}
|
|
92
|
+
return undefined;
|
|
93
|
+
}
|
|
94
|
+
/** 模型/OpenClaw 主动静默(NO_REPLY、heartbeat)时不应向 IM 发「没有生成回复」HTTP。 */
|
|
95
|
+
export function shouldSendTerminalHttpForState(state, input) {
|
|
96
|
+
if (state !== "no_reply") {
|
|
97
|
+
return true;
|
|
98
|
+
}
|
|
99
|
+
if (input.normalizerSilentSkip || input.normalizerHeartbeatSkip) {
|
|
100
|
+
return false;
|
|
101
|
+
}
|
|
102
|
+
return true;
|
|
103
|
+
}
|
|
104
|
+
export function resolveNoReplyCause(input) {
|
|
105
|
+
if (input.hasBusinessReply) {
|
|
106
|
+
return undefined;
|
|
107
|
+
}
|
|
108
|
+
if (input.normalizerSilentSkip) {
|
|
109
|
+
return "intentional_silent";
|
|
110
|
+
}
|
|
111
|
+
if (input.normalizerHeartbeatSkip) {
|
|
112
|
+
return "heartbeat_only";
|
|
113
|
+
}
|
|
114
|
+
if (input.deliverInvokeCount === 0) {
|
|
115
|
+
return "zero_deliver";
|
|
116
|
+
}
|
|
117
|
+
if (input.deliverInvokeCount > 0 && input.deliverCallCount === 0) {
|
|
118
|
+
return "all_deliver_skipped";
|
|
119
|
+
}
|
|
120
|
+
return "unknown";
|
|
121
|
+
}
|
|
72
122
|
/** 在 finally 阶段根据观测信号推断终态(success 由 hasBusinessReply 在外层短路)。 */
|
|
73
123
|
export function resolveTerminalState(input) {
|
|
74
124
|
if (input.hasBusinessReply) {
|
|
@@ -92,7 +142,14 @@ export function resolveTerminalState(input) {
|
|
|
92
142
|
if (input.compactionIncomplete || (input.compactionShown && input.deliverCallCount === 0)) {
|
|
93
143
|
return "compaction_failed";
|
|
94
144
|
}
|
|
95
|
-
if (input.
|
|
145
|
+
if (input.deliverInvokeCount > 0 &&
|
|
146
|
+
input.deliverCallCount === 0 &&
|
|
147
|
+
input.runtimeErrorHint === undefined &&
|
|
148
|
+
input.dispatchError === undefined &&
|
|
149
|
+
input.lastDeliverError === undefined) {
|
|
150
|
+
return "no_reply";
|
|
151
|
+
}
|
|
152
|
+
if (input.deliverInvokeCount === 0 && !input.dispatchThrew) {
|
|
96
153
|
return "no_reply";
|
|
97
154
|
}
|
|
98
155
|
return "runtime_error";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbound-terminal-state.js","sourceRoot":"","sources":["../../src/inbound-terminal-state.ts"],"names":[],"mappings":"AAAA;;GAEG;AAoBH,MAAM,gBAAgB,GAAG;IACrB,kBAAkB;IAClB,kBAAkB;IAClB,UAAU;IACV,yBAAyB;IACzB,0BAA0B;CAC7B,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,mBAAmB,EAAE,WAAW,EAAE,cAAc,EAAE,kBAAkB,CAAC,CAAC;AAE/F,MAAM,gBAAgB,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AAElD,MAAM,UAAU,2BAA2B,CAAC,OAAe;IACvD,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IAEhC,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC;IAC9D,CAAC;IACD,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC;IACvD,CAAC;IACD,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC;IACxD,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QAC7F,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC;IACjE,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAY;IAC7C,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;QACvB,OAAO,2BAA2B,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,2BAA2B,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,KAAoB;IACzD,QAAQ,KAAK,EAAE,CAAC;QACZ,KAAK,gBAAgB;YACjB,OAAO,CACH,2CAA2C,CAC9C,CAAC;QACN,KAAK,mBAAmB;YACpB,OAAO,+BAA+B,CAAC;QAC3C,KAAK,SAAS;YACV,OAAO,iBAAiB,CAAC;QAC7B,KAAK,UAAU;YACX,OAAO,qCAAqC,CAAC;QACjD,KAAK,eAAe;YAChB,OAAO,oBAAoB,CAAC;QAChC,KAAK,iBAAiB;YAClB,OAAO,wBAAwB,CAAC;QACpC,KAAK,WAAW;YACZ,OAAO,UAAU,CAAC;QACtB,KAAK,YAAY;YACb,OAAO,gBAAgB,CAAC;QAC5B,KAAK,SAAS;YACV,OAAO,EAAE,CAAC;IAClB,CAAC;AACL,CAAC;
|
|
1
|
+
{"version":3,"file":"inbound-terminal-state.js","sourceRoot":"","sources":["../../src/inbound-terminal-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import assert from "node:assert/strict";
|
|
2
2
|
import { describe, it, beforeEach } from "node:test";
|
|
3
|
-
import { buildTerminalUserMessage, classifyRuntimeErrorMessage, hasGlobalTerminalSent, markGlobalTerminalSent, resetGlobalTerminalSentForTests, resolveTerminalState, } from "./inbound-terminal-state.js";
|
|
3
|
+
import { buildTerminalUserMessage, classifyRuntimeErrorMessage, hasGlobalTerminalSent, markGlobalTerminalSent, resetGlobalTerminalSentForTests, resolveNoReplyCause, resolveTerminalState, shouldSendTerminalHttpForState, } from "./inbound-terminal-state.js";
|
|
4
4
|
import { InboundTerminalController, prefixProactiveOutboundText } from "./inbound-terminal-delivery.js";
|
|
5
5
|
describe("classifyRuntimeErrorMessage", () => {
|
|
6
6
|
it("detects precheck overflow", () => {
|
|
@@ -26,7 +26,6 @@ describe("resolveTerminalState", () => {
|
|
|
26
26
|
compactionIncomplete: false,
|
|
27
27
|
deliverInvokeCount: 1,
|
|
28
28
|
deliverCallCount: 1,
|
|
29
|
-
noReplySignaled: false,
|
|
30
29
|
}), "success");
|
|
31
30
|
});
|
|
32
31
|
it("returns precheck_error from runtime hint", () => {
|
|
@@ -38,7 +37,6 @@ describe("resolveTerminalState", () => {
|
|
|
38
37
|
compactionIncomplete: false,
|
|
39
38
|
deliverInvokeCount: 1,
|
|
40
39
|
deliverCallCount: 0,
|
|
41
|
-
noReplySignaled: false,
|
|
42
40
|
runtimeErrorHint: {
|
|
43
41
|
errorType: "precheck_error",
|
|
44
42
|
errorMessage: "Context overflow: prompt too large for the model (precheck)",
|
|
@@ -54,10 +52,20 @@ describe("resolveTerminalState", () => {
|
|
|
54
52
|
compactionIncomplete: false,
|
|
55
53
|
deliverInvokeCount: 0,
|
|
56
54
|
deliverCallCount: 0,
|
|
57
|
-
noReplySignaled: false,
|
|
58
55
|
}), "compaction_failed");
|
|
59
56
|
});
|
|
60
|
-
it("returns no_reply
|
|
57
|
+
it("returns no_reply when deliver invoked but all plugin-skipped", () => {
|
|
58
|
+
assert.equal(resolveTerminalState({
|
|
59
|
+
hasBusinessReply: false,
|
|
60
|
+
timeoutFired: false,
|
|
61
|
+
dispatchThrew: false,
|
|
62
|
+
compactionShown: false,
|
|
63
|
+
compactionIncomplete: false,
|
|
64
|
+
deliverInvokeCount: 3,
|
|
65
|
+
deliverCallCount: 0,
|
|
66
|
+
}), "no_reply");
|
|
67
|
+
});
|
|
68
|
+
it("returns no_reply for silent turn without deliver", () => {
|
|
61
69
|
assert.equal(resolveTerminalState({
|
|
62
70
|
hasBusinessReply: false,
|
|
63
71
|
timeoutFired: false,
|
|
@@ -66,7 +74,6 @@ describe("resolveTerminalState", () => {
|
|
|
66
74
|
compactionIncomplete: false,
|
|
67
75
|
deliverInvokeCount: 0,
|
|
68
76
|
deliverCallCount: 0,
|
|
69
|
-
noReplySignaled: true,
|
|
70
77
|
}), "no_reply");
|
|
71
78
|
});
|
|
72
79
|
it("returns timeout when watchdog fired", () => {
|
|
@@ -78,10 +85,34 @@ describe("resolveTerminalState", () => {
|
|
|
78
85
|
compactionIncomplete: false,
|
|
79
86
|
deliverInvokeCount: 0,
|
|
80
87
|
deliverCallCount: 0,
|
|
81
|
-
noReplySignaled: false,
|
|
82
88
|
}), "timeout");
|
|
83
89
|
});
|
|
84
90
|
});
|
|
91
|
+
describe("shouldSendTerminalHttpForState", () => {
|
|
92
|
+
it("suppresses HTTP for intentional NO_REPLY silent skip", () => {
|
|
93
|
+
assert.equal(shouldSendTerminalHttpForState("no_reply", { normalizerSilentSkip: true }), false);
|
|
94
|
+
});
|
|
95
|
+
it("keeps HTTP for genuine empty deliver", () => {
|
|
96
|
+
assert.equal(shouldSendTerminalHttpForState("no_reply", {
|
|
97
|
+
normalizerSilentSkip: false,
|
|
98
|
+
normalizerHeartbeatSkip: false,
|
|
99
|
+
}), true);
|
|
100
|
+
});
|
|
101
|
+
});
|
|
102
|
+
describe("resolveNoReplyCause", () => {
|
|
103
|
+
it("classifies intentional silent", () => {
|
|
104
|
+
assert.equal(resolveNoReplyCause({
|
|
105
|
+
hasBusinessReply: false,
|
|
106
|
+
timeoutFired: false,
|
|
107
|
+
dispatchThrew: false,
|
|
108
|
+
compactionShown: false,
|
|
109
|
+
compactionIncomplete: false,
|
|
110
|
+
deliverInvokeCount: 0,
|
|
111
|
+
deliverCallCount: 0,
|
|
112
|
+
normalizerSilentSkip: true,
|
|
113
|
+
}), "intentional_silent");
|
|
114
|
+
});
|
|
115
|
+
});
|
|
85
116
|
describe("buildTerminalUserMessage", () => {
|
|
86
117
|
it("uses distinct copy for precheck vs no_reply", () => {
|
|
87
118
|
const precheck = buildTerminalUserMessage("precheck_error");
|
|
@@ -141,6 +172,27 @@ describe("InboundTerminalController idempotency", () => {
|
|
|
141
172
|
assert.ok(sent.includes("上下文过大"));
|
|
142
173
|
markGlobalTerminalSent("msg-2002", "precheck_error");
|
|
143
174
|
});
|
|
175
|
+
it("does not send HTTP for intentional NO_REPLY silent skip", async () => {
|
|
176
|
+
const controller = new InboundTerminalController({
|
|
177
|
+
messageId: "msg-3003",
|
|
178
|
+
groupId: "g3",
|
|
179
|
+
sessionKey: "sk3",
|
|
180
|
+
log: noopLog,
|
|
181
|
+
logPrefix: "[test]",
|
|
182
|
+
});
|
|
183
|
+
controller.noteNormalizerSkip("silent");
|
|
184
|
+
let sendCount = 0;
|
|
185
|
+
const state = await controller.finalizeAndDeliver({
|
|
186
|
+
sendFn: async () => {
|
|
187
|
+
sendCount++;
|
|
188
|
+
},
|
|
189
|
+
dispatchThrew: false,
|
|
190
|
+
deliverInvokeCount: 0,
|
|
191
|
+
deliverCallCount: 0,
|
|
192
|
+
});
|
|
193
|
+
assert.equal(state, "no_reply");
|
|
194
|
+
assert.equal(sendCount, 0);
|
|
195
|
+
});
|
|
144
196
|
});
|
|
145
197
|
describe("prefixProactiveOutboundText", () => {
|
|
146
198
|
it("prefixes cron messages once", () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbound-terminal-state.test.js","sourceRoot":"","sources":["../../src/inbound-terminal-state.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EACH,wBAAwB,EACxB,2BAA2B,EAC3B,qBAAqB,EACrB,sBAAsB,EACtB,+BAA+B,EAC/B,oBAAoB,
|
|
1
|
+
{"version":3,"file":"inbound-terminal-state.test.js","sourceRoot":"","sources":["../../src/inbound-terminal-state.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ export declare function normalizeModelRefString(raw: string): string;
|
|
|
20
20
|
export declare function parseFallbackNoticeEffectiveModelRef(noticeText: string): string | undefined;
|
|
21
21
|
export declare function runtimeModelRefsMatch(requestedRaw: string | undefined, actualKey: string | undefined): boolean;
|
|
22
22
|
/**
|
|
23
|
-
* 是否应抑制发往 IM 的 fallback
|
|
23
|
+
* 是否应抑制发往 IM 的 fallback 运营通知(在通道已开启投递时的细粒度规则)。
|
|
24
24
|
* - 无 ai_model:不抑制
|
|
25
25
|
* - 有 ai_model 且通知中的实际模型与指定一致:抑制(误报)
|
|
26
26
|
* - 有 ai_model 但实际模型不同:不抑制(真实 failover)
|
|
@@ -30,4 +30,14 @@ export declare function shouldSuppressPerMessageFallbackNotice(params: {
|
|
|
30
30
|
requestedModelRaw: string | undefined;
|
|
31
31
|
noticeText?: string;
|
|
32
32
|
}): boolean;
|
|
33
|
+
/**
|
|
34
|
+
* IM deliver 是否应抑制 fallback 运营通知。
|
|
35
|
+
* 默认不投递;仅 `deliverModelFallbackNotice: true` 时考虑下发,并仍过滤 ai_model 误报。
|
|
36
|
+
*/
|
|
37
|
+
export declare function shouldSuppressFallbackNoticeForIm(params: {
|
|
38
|
+
isFallbackNotice: boolean;
|
|
39
|
+
deliverModelFallbackNotice?: boolean;
|
|
40
|
+
requestedModelRaw?: string;
|
|
41
|
+
noticeText?: string;
|
|
42
|
+
}): boolean;
|
|
33
43
|
//# sourceMappingURL=per-message-fallback-notice.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"per-message-fallback-notice.d.ts","sourceRoot":"","sources":["../../src/per-message-fallback-notice.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,MAAM,MAAM,eAAe,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAElE,uDAAuD;AACvD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAKhF;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAI3D;AAUD;;;;GAIG;AACH,wBAAgB,oCAAoC,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO3F;AAED,wBAAgB,qBAAqB,CACjC,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC9B,OAAO,CAQT;AAED;;;;;GAKG;AACH,wBAAgB,sCAAsC,CAAC,MAAM,EAAE;IAC3D,gBAAgB,EAAE,OAAO,CAAC;IAC1B,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAQV"}
|
|
1
|
+
{"version":3,"file":"per-message-fallback-notice.d.ts","sourceRoot":"","sources":["../../src/per-message-fallback-notice.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,MAAM,MAAM,eAAe,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAElE,uDAAuD;AACvD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAKhF;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAI3D;AAUD;;;;GAIG;AACH,wBAAgB,oCAAoC,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO3F;AAED,wBAAgB,qBAAqB,CACjC,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,SAAS,EAAE,MAAM,GAAG,SAAS,GAC9B,OAAO,CAQT;AAED;;;;;GAKG;AACH,wBAAgB,sCAAsC,CAAC,MAAM,EAAE;IAC3D,gBAAgB,EAAE,OAAO,CAAC;IAC1B,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAQV;AAED;;;GAGG;AACH,wBAAgB,iCAAiC,CAAC,MAAM,EAAE;IACtD,gBAAgB,EAAE,OAAO,CAAC;IAC1B,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAQV"}
|
|
@@ -58,7 +58,7 @@ export function runtimeModelRefsMatch(requestedRaw, actualKey) {
|
|
|
58
58
|
return false;
|
|
59
59
|
}
|
|
60
60
|
/**
|
|
61
|
-
* 是否应抑制发往 IM 的 fallback
|
|
61
|
+
* 是否应抑制发往 IM 的 fallback 运营通知(在通道已开启投递时的细粒度规则)。
|
|
62
62
|
* - 无 ai_model:不抑制
|
|
63
63
|
* - 有 ai_model 且通知中的实际模型与指定一致:抑制(误报)
|
|
64
64
|
* - 有 ai_model 但实际模型不同:不抑制(真实 failover)
|
|
@@ -75,4 +75,19 @@ export function shouldSuppressPerMessageFallbackNotice(params) {
|
|
|
75
75
|
return false;
|
|
76
76
|
return runtimeModelRefsMatch(params.requestedModelRaw, effectiveFromNotice);
|
|
77
77
|
}
|
|
78
|
+
/**
|
|
79
|
+
* IM deliver 是否应抑制 fallback 运营通知。
|
|
80
|
+
* 默认不投递;仅 `deliverModelFallbackNotice: true` 时考虑下发,并仍过滤 ai_model 误报。
|
|
81
|
+
*/
|
|
82
|
+
export function shouldSuppressFallbackNoticeForIm(params) {
|
|
83
|
+
if (!params.isFallbackNotice)
|
|
84
|
+
return false;
|
|
85
|
+
if (params.deliverModelFallbackNotice !== true)
|
|
86
|
+
return true;
|
|
87
|
+
return shouldSuppressPerMessageFallbackNotice({
|
|
88
|
+
isFallbackNotice: true,
|
|
89
|
+
requestedModelRaw: params.requestedModelRaw,
|
|
90
|
+
noticeText: params.noticeText,
|
|
91
|
+
});
|
|
92
|
+
}
|
|
78
93
|
//# sourceMappingURL=per-message-fallback-notice.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"per-message-fallback-notice.js","sourceRoot":"","sources":["../../src/per-message-fallback-notice.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"per-message-fallback-notice.js","sourceRoot":"","sources":["../../src/per-message-fallback-notice.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"per-message-fallback-notice.test.d.ts","sourceRoot":"","sources":["../../src/per-message-fallback-notice.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import assert from "node:assert/strict";
|
|
2
|
+
import { describe, it } from "node:test";
|
|
3
|
+
import { shouldDeliverModelFallbackNoticeToIm } from "./channel-config.js";
|
|
4
|
+
import { parseFallbackNoticeEffectiveModelRef, shouldSuppressFallbackNoticeForIm, shouldSuppressPerMessageFallbackNotice, } from "./per-message-fallback-notice.js";
|
|
5
|
+
function cfg(overrides = {}) {
|
|
6
|
+
return { baseUrl: "https://example.com", ...overrides };
|
|
7
|
+
}
|
|
8
|
+
const FALLBACK_NOTICE = "↪️ Model Fallback: newapi-xgjk/minimax-latest-cloud (selected newapi-xgjk/gemini-latest-cloud; auth)";
|
|
9
|
+
describe("model fallback notice for IM", () => {
|
|
10
|
+
it("shouldDeliverModelFallbackNoticeToIm is false unless explicitly true", () => {
|
|
11
|
+
assert.equal(shouldDeliverModelFallbackNoticeToIm(cfg()), false);
|
|
12
|
+
assert.equal(shouldDeliverModelFallbackNoticeToIm(cfg({ deliverModelFallbackNotice: false })), false);
|
|
13
|
+
assert.equal(shouldDeliverModelFallbackNoticeToIm(cfg({ deliverModelFallbackNotice: true })), true);
|
|
14
|
+
});
|
|
15
|
+
it("shouldSuppressFallbackNoticeForIm suppresses by default", () => {
|
|
16
|
+
assert.equal(shouldSuppressFallbackNoticeForIm({
|
|
17
|
+
isFallbackNotice: true,
|
|
18
|
+
noticeText: FALLBACK_NOTICE,
|
|
19
|
+
}), true);
|
|
20
|
+
});
|
|
21
|
+
it("shouldSuppressFallbackNoticeForIm delivers when enabled and not spurious", () => {
|
|
22
|
+
assert.equal(shouldSuppressFallbackNoticeForIm({
|
|
23
|
+
isFallbackNotice: true,
|
|
24
|
+
deliverModelFallbackNotice: true,
|
|
25
|
+
noticeText: FALLBACK_NOTICE,
|
|
26
|
+
}), false);
|
|
27
|
+
});
|
|
28
|
+
it("shouldSuppressFallbackNoticeForIm still suppresses spurious ai_model match when enabled", () => {
|
|
29
|
+
assert.equal(shouldSuppressFallbackNoticeForIm({
|
|
30
|
+
isFallbackNotice: true,
|
|
31
|
+
deliverModelFallbackNotice: true,
|
|
32
|
+
requestedModelRaw: "newapi-xgjk/minimax-latest-cloud",
|
|
33
|
+
noticeText: FALLBACK_NOTICE,
|
|
34
|
+
}), true);
|
|
35
|
+
});
|
|
36
|
+
it("parseFallbackNoticeEffectiveModelRef reads active model", () => {
|
|
37
|
+
assert.equal(parseFallbackNoticeEffectiveModelRef(FALLBACK_NOTICE), "newapi-xgjk/minimax-latest-cloud");
|
|
38
|
+
});
|
|
39
|
+
it("shouldSuppressPerMessageFallbackNotice ignores non-fallback payloads", () => {
|
|
40
|
+
assert.equal(shouldSuppressPerMessageFallbackNotice({
|
|
41
|
+
isFallbackNotice: false,
|
|
42
|
+
requestedModelRaw: "a/b",
|
|
43
|
+
noticeText: FALLBACK_NOTICE,
|
|
44
|
+
}), false);
|
|
45
|
+
});
|
|
46
|
+
});
|
|
47
|
+
//# sourceMappingURL=per-message-fallback-notice.test.js.map
|