@zhin.js/service-activity-feedback 3.0.2 → 3.0.5
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/lib/ai-event-binder.d.ts.map +1 -1
- package/lib/ai-event-binder.js +6 -5
- package/lib/ai-event-binder.js.map +1 -1
- package/lib/config.d.ts +1 -1
- package/lib/config.d.ts.map +1 -1
- package/lib/config.js +2 -2
- package/lib/config.js.map +1 -1
- package/lib/executor.d.ts +2 -2
- package/lib/executor.d.ts.map +1 -1
- package/lib/executor.js +16 -14
- package/lib/executor.js.map +1 -1
- package/lib/orchestrator.d.ts.map +1 -1
- package/lib/orchestrator.js +17 -7
- package/lib/orchestrator.js.map +1 -1
- package/lib/policy.d.ts +1 -1
- package/lib/policy.d.ts.map +1 -1
- package/lib/policy.js +2 -2
- package/lib/policy.js.map +1 -1
- package/package.json +7 -7
- package/src/ai-event-binder.ts +6 -5
- package/src/config.ts +2 -2
- package/src/executor.ts +17 -15
- package/src/orchestrator.ts +27 -6
- package/src/policy.ts +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ai-event-binder.d.ts","sourceRoot":"","sources":["../src/ai-event-binder.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAqC,KAAK,6BAA6B,EAAE,MAAM,aAAa,CAAC;AACpG,OAAO,EAGL,KAAK,8BAA8B,EACpC,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAC;AAGjE,wBAAgB,qCAAqC,CACnD,YAAY,EAAE,4BAA4B,GACzC,eAAe,
|
|
1
|
+
{"version":3,"file":"ai-event-binder.d.ts","sourceRoot":"","sources":["../src/ai-event-binder.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAqC,KAAK,6BAA6B,EAAE,MAAM,aAAa,CAAC;AACpG,OAAO,EAGL,KAAK,8BAA8B,EACpC,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAC;AAGjE,wBAAgB,qCAAqC,CACnD,YAAY,EAAE,4BAA4B,GACzC,eAAe,CAqEjB;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAC9C,YAAY,EAAE,4BAA4B,GACzC,MAAM,IAAI,CAKZ;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACjD,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CAClD,CAAC;AAEF,MAAM,WAAW,yCAAyC;IACxD,aAAa,EAAE,6BAA6B,CAAC;IAC7C,MAAM,EAAE,8BAA8B,CAAC;IACvC,MAAM,EAAE,sBAAsB,CAAC;CAChC;AAED,wBAAgB,kCAAkC,CAChD,OAAO,EAAE,yCAAyC,GACjD,4BAA4B,CAI9B;AAED,uFAAuF;AACvF,wBAAgB,4CAA4C,CAC1D,aAAa,EAAE,6BAA6B,EAC5C,MAAM,EAAE,sBAAsB,EAC9B,MAAM,GAAE,8BAA2D,GAClE,4BAA4B,CAM9B"}
|
package/lib/ai-event-binder.js
CHANGED
|
@@ -53,12 +53,13 @@ export function createActivityFeedbackAIEventHandlers(orchestrator) {
|
|
|
53
53
|
onSubagentStart: async (payload) => {
|
|
54
54
|
if (!isActivityFeedbackEnabled(payload, 'thinking'))
|
|
55
55
|
return;
|
|
56
|
-
|
|
56
|
+
// Do not stop the parent turn's active indicator — subagent uses an isolated session key.
|
|
57
57
|
await orchestrator.startPhase(payload, 'thinking', 'subagent.start');
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
58
|
+
const tag = payload.agentId?.trim() || 'subagent';
|
|
59
|
+
const label = payload.label?.trim()
|
|
60
|
+
? `子任务执行中: ${payload.label.trim()}...`
|
|
61
|
+
: '思考中...';
|
|
62
|
+
await orchestrator.updateThinkingText(payload, `[${tag}] ${label}`);
|
|
62
63
|
},
|
|
63
64
|
onSubagentFinish: async (payload) => {
|
|
64
65
|
if (!isActivityFeedbackEnabled(payload, 'active'))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ai-event-binder.js","sourceRoot":"","sources":["../src/ai-event-binder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ai-event-binder.js","sourceRoot":"","sources":["../src/ai-event-binder.ts"],"names":[],"mappings":"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"}
|
package/lib/config.d.ts
CHANGED
|
@@ -13,5 +13,5 @@ export interface ActivityFeedbackServiceConfig {
|
|
|
13
13
|
export declare function mergeActivityFeedbackLayers(...layers: (ActivityFeedbackConfig | undefined)[]): ActivityFeedbackConfig | undefined;
|
|
14
14
|
export declare function loadActivityFeedbackServiceConfig(raw: ActivityFeedbackServiceConfig | undefined): ActivityFeedbackServiceConfig;
|
|
15
15
|
/** @deprecated 使用 ActivityFeedbackPolicy */
|
|
16
|
-
export declare function resolveActivityFeedbackForTarget(service: ActivityFeedbackServiceConfig, platform: string,
|
|
16
|
+
export declare function resolveActivityFeedbackForTarget(service: ActivityFeedbackServiceConfig, platform: string, endpointKey: string): ActivityFeedbackConfig | undefined;
|
|
17
17
|
//# sourceMappingURL=config.d.ts.map
|
package/lib/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAE7D,+DAA+D;AAC/D,MAAM,WAAW,6BAA6B;IAC5C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACnD,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACnD,2BAA2B;IAC3B,QAAQ,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,GAAG,OAAO,GAAG,QAAQ,EAAE,OAAO,gBAAgB,EAAE,2BAA2B,CAAC,CAAC,CAAC;KAC9G,CAAC;CACH;AAyBD,wBAAgB,2BAA2B,CACzC,GAAG,MAAM,EAAE,CAAC,sBAAsB,GAAG,SAAS,CAAC,EAAE,GAChD,sBAAsB,GAAG,SAAS,CAcpC;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,6BAA6B,GAAG,SAAS,GAC7C,6BAA6B,CAK/B;AAED,4CAA4C;AAC5C,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,6BAA6B,EACtC,QAAQ,EAAE,MAAM,EAChB,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAE7D,+DAA+D;AAC/D,MAAM,WAAW,6BAA6B;IAC5C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACnD,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACnD,2BAA2B;IAC3B,QAAQ,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,GAAG,OAAO,GAAG,QAAQ,EAAE,OAAO,gBAAgB,EAAE,2BAA2B,CAAC,CAAC,CAAC;KAC9G,CAAC;CACH;AAyBD,wBAAgB,2BAA2B,CACzC,GAAG,MAAM,EAAE,CAAC,sBAAsB,GAAG,SAAS,CAAC,EAAE,GAChD,sBAAsB,GAAG,SAAS,CAcpC;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,6BAA6B,GAAG,SAAS,GAC7C,6BAA6B,CAK/B;AAED,4CAA4C;AAC5C,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,6BAA6B,EACtC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB,sBAAsB,GAAG,SAAS,CASpC"}
|
package/lib/config.js
CHANGED
|
@@ -41,10 +41,10 @@ export function loadActivityFeedbackServiceConfig(raw) {
|
|
|
41
41
|
};
|
|
42
42
|
}
|
|
43
43
|
/** @deprecated 使用 ActivityFeedbackPolicy */
|
|
44
|
-
export function resolveActivityFeedbackForTarget(service, platform,
|
|
44
|
+
export function resolveActivityFeedbackForTarget(service, platform, endpointKey) {
|
|
45
45
|
if (service.enabled === false) {
|
|
46
46
|
return { enabled: false };
|
|
47
47
|
}
|
|
48
|
-
return mergeActivityFeedbackLayers(service.defaults, service.platforms?.[platform], service.endpoints?.[`${platform}:${
|
|
48
|
+
return mergeActivityFeedbackLayers(service.defaults, service.platforms?.[platform], service.endpoints?.[`${platform}:${endpointKey}`]);
|
|
49
49
|
}
|
|
50
50
|
//# sourceMappingURL=config.js.map
|
package/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAcA,SAAS,eAAe,CACtB,IAAsC,EACtC,QAA0C;IAE1C,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IACzC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC;QACrB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;QAC1B,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;KAC/B,CAA6D,CAAC;IAE/D,MAAM,MAAM,GAAkD,EAAE,CAAC;IACjE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,CAAC,KAAK,CAAC,GAAG;YACd,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC;YAChB,GAAG,QAAQ,EAAE,CAAC,KAAK,CAAC;YACpB,OAAO,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE;YACrE,KAAK,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE;YAC/D,OAAO,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE;SACtE,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,GAAG,MAA8C;IAEjD,IAAI,MAA0C,CAAC;IAC/C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YAC9E,SAAS;QACX,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS;YAAE,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAChE,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC/C,GAA8C;IAE9C,OAAO;QACL,OAAO,EAAE,IAAI;QACb,GAAG,GAAG;KACP,CAAC;AACJ,CAAC;AAED,4CAA4C;AAC5C,MAAM,UAAU,gCAAgC,CAC9C,OAAsC,EACtC,QAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAcA,SAAS,eAAe,CACtB,IAAsC,EACtC,QAA0C;IAE1C,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IACzC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC;QACrB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;QAC1B,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;KAC/B,CAA6D,CAAC;IAE/D,MAAM,MAAM,GAAkD,EAAE,CAAC;IACjE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,CAAC,KAAK,CAAC,GAAG;YACd,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC;YAChB,GAAG,QAAQ,EAAE,CAAC,KAAK,CAAC;YACpB,OAAO,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE;YACrE,KAAK,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE;YAC/D,OAAO,EAAE,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE;SACtE,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,GAAG,MAA8C;IAEjD,IAAI,MAA0C,CAAC;IAC/C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YAC9E,SAAS;QACX,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS;YAAE,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAChE,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC/C,GAA8C;IAE9C,OAAO;QACL,OAAO,EAAE,IAAI;QACb,GAAG,GAAG;KACP,CAAC;AACJ,CAAC;AAED,4CAA4C;AAC5C,MAAM,UAAU,gCAAgC,CAC9C,OAAsC,EACtC,QAAgB,EAChB,WAAmB;IAEnB,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;QAC9B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;IACD,OAAO,2BAA2B,CAChC,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,EAC7B,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,QAAQ,IAAI,WAAW,EAAE,CAAC,CAClD,CAAC;AACJ,CAAC"}
|
package/lib/executor.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { type ActivityFeedbackPhase, type EndpointWithActivityFeedback, type Res
|
|
|
3
3
|
import type { OutboundHost } from '@zhin.js/plugin-runtime';
|
|
4
4
|
/** IM 侧 endpoint 访问 seam（便于测试注入 fake） */
|
|
5
5
|
export interface ActivityFeedbackEndpointAccess {
|
|
6
|
-
resolve(platform: string,
|
|
6
|
+
resolve(platform: string, endpointKey: string): {
|
|
7
7
|
endpoint: EndpointWithActivityFeedback;
|
|
8
8
|
adapter: Adapter;
|
|
9
9
|
} | undefined;
|
|
@@ -14,7 +14,7 @@ export declare function createNoopEndpointAccess(): ActivityFeedbackEndpointAcce
|
|
|
14
14
|
* Plugin Runtime: resolve endpoints via OutboundHost → ImRuntime.sendEndpointMessage.
|
|
15
15
|
* Typing/reaction text goes through the unified outbound chain (no legacy Adapter.inject).
|
|
16
16
|
*
|
|
17
|
-
* 按 platform:
|
|
17
|
+
* 按 platform:endpointKey 缓存 { endpoint, adapter }：activity manager 挂在
|
|
18
18
|
* endpoint.$activityFeedback 上，start/stop 必须解析到同一个对象，否则
|
|
19
19
|
* stop 时拿不到 manager，typing 指示器永远无法停止。
|
|
20
20
|
*/
|
package/lib/executor.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAgG,KAAK,qBAAqB,EAAE,KAAK,4BAA4B,EAAwC,KAAK,mCAAmC,EAAE,KAAK,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAChT,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,yCAAyC;AACzC,MAAM,WAAW,8BAA8B;IAC7C,OAAO,CACL,QAAQ,EAAE,MAAM,EAChB,
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAgG,KAAK,qBAAqB,EAAE,KAAK,4BAA4B,EAAwC,KAAK,mCAAmC,EAAE,KAAK,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAChT,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,yCAAyC;AACzC,MAAM,WAAW,8BAA8B;IAC7C,OAAO,CACL,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB;QAAE,QAAQ,EAAE,4BAA4B,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,CAAC;CAC7E;AAED,6FAA6F;AAC7F,wBAAgB,wBAAwB,IAAI,8BAA8B,CAMzE;AAqBD;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,YAAY,EACtB,MAAM,CAAC,EAAE;IAAE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAA;CAAE,GAC5D,8BAA8B,CA4FhC;AA2GD,qBAAa,wBAAwB;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,8BAA8B;IAE7D,KAAK,CACT,GAAG,EAAE,4BAA4B,EACjC,KAAK,EAAE,qBAAqB,EAC5B,WAAW,EAAE,mCAAmC,GAC/C,OAAO,CAAC,IAAI,CAAC;IAOV,IAAI,CAAC,GAAG,EAAE,4BAA4B,EAAE,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpF,kBAAkB,CAAC,GAAG,EAAE,4BAA4B,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAMzF"}
|
package/lib/executor.js
CHANGED
|
@@ -32,27 +32,27 @@ function stringifySendContent(content) {
|
|
|
32
32
|
* Plugin Runtime: resolve endpoints via OutboundHost → ImRuntime.sendEndpointMessage.
|
|
33
33
|
* Typing/reaction text goes through the unified outbound chain (no legacy Adapter.inject).
|
|
34
34
|
*
|
|
35
|
-
* 按 platform:
|
|
35
|
+
* 按 platform:endpointKey 缓存 { endpoint, adapter }：activity manager 挂在
|
|
36
36
|
* endpoint.$activityFeedback 上，start/stop 必须解析到同一个对象，否则
|
|
37
37
|
* stop 时拿不到 manager，typing 指示器永远无法停止。
|
|
38
38
|
*/
|
|
39
39
|
export function createOutboundEndpointAccess(outbound, logger) {
|
|
40
40
|
const cache = new Map();
|
|
41
41
|
return {
|
|
42
|
-
resolve(platform,
|
|
43
|
-
const key = `${platform}:${
|
|
42
|
+
resolve(platform, endpointKey) {
|
|
43
|
+
const key = `${platform}:${endpointKey}`;
|
|
44
44
|
const cached = cache.get(key);
|
|
45
45
|
if (cached)
|
|
46
46
|
return cached;
|
|
47
47
|
const addReaction = outbound.addReaction;
|
|
48
48
|
const removeReaction = outbound.removeReaction;
|
|
49
49
|
const endpoint = {
|
|
50
|
-
$id:
|
|
50
|
+
$id: endpointKey,
|
|
51
51
|
// Prefer real OutboundHost.recall when available (icqq RECALL_MSG).
|
|
52
52
|
$recallMessage: async (messageId) => {
|
|
53
53
|
if (outbound.recall) {
|
|
54
54
|
try {
|
|
55
|
-
await outbound.recall({ adapter: platform,
|
|
55
|
+
await outbound.recall({ adapter: platform, endpointKey, messageId });
|
|
56
56
|
return;
|
|
57
57
|
}
|
|
58
58
|
catch (error) {
|
|
@@ -65,7 +65,7 @@ export function createOutboundEndpointAccess(outbound, logger) {
|
|
|
65
65
|
$addReaction: addReaction
|
|
66
66
|
? async (messageId, emoji, hint) => addReaction({
|
|
67
67
|
adapter: platform,
|
|
68
|
-
|
|
68
|
+
endpointKey,
|
|
69
69
|
messageId,
|
|
70
70
|
emoji,
|
|
71
71
|
sceneType: hint?.sceneType,
|
|
@@ -76,7 +76,7 @@ export function createOutboundEndpointAccess(outbound, logger) {
|
|
|
76
76
|
? async (messageId, reactionId) => {
|
|
77
77
|
await removeReaction({
|
|
78
78
|
adapter: platform,
|
|
79
|
-
|
|
79
|
+
endpointKey,
|
|
80
80
|
messageId,
|
|
81
81
|
reactionId,
|
|
82
82
|
});
|
|
@@ -91,9 +91,11 @@ export function createOutboundEndpointAccess(outbound, logger) {
|
|
|
91
91
|
try {
|
|
92
92
|
const messageId = await outbound.send({
|
|
93
93
|
adapter: platform,
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
94
|
+
endpointKey,
|
|
95
|
+
conversation: {
|
|
96
|
+
kind: options.type || 'private',
|
|
97
|
+
id: options.id,
|
|
98
|
+
},
|
|
97
99
|
content: text,
|
|
98
100
|
});
|
|
99
101
|
// Prefer real id; fall back to a sentinel so MessageTypingIndicator
|
|
@@ -106,7 +108,7 @@ export function createOutboundEndpointAccess(outbound, logger) {
|
|
|
106
108
|
}
|
|
107
109
|
},
|
|
108
110
|
endpoints: {
|
|
109
|
-
get: (id) => (id ===
|
|
111
|
+
get: (id) => (id === endpointKey ? endpoint : undefined),
|
|
110
112
|
},
|
|
111
113
|
};
|
|
112
114
|
const resolved = { endpoint, adapter: adapter };
|
|
@@ -203,21 +205,21 @@ export class ActivityFeedbackExecutor {
|
|
|
203
205
|
this.access = access;
|
|
204
206
|
}
|
|
205
207
|
async start(ctx, phase, phaseConfig) {
|
|
206
|
-
const resolved = this.access.resolve(ctx.platform, ctx.
|
|
208
|
+
const resolved = this.access.resolve(ctx.platform, ctx.endpointKey);
|
|
207
209
|
if (!resolved)
|
|
208
210
|
return;
|
|
209
211
|
const driver = createPhaseDriver(resolved.endpoint, ctx.platform, resolved.adapter);
|
|
210
212
|
await driver.start(ctx, phase, phaseConfig);
|
|
211
213
|
}
|
|
212
214
|
async stop(ctx, phase) {
|
|
213
|
-
const resolved = this.access.resolve(ctx.platform, ctx.
|
|
215
|
+
const resolved = this.access.resolve(ctx.platform, ctx.endpointKey);
|
|
214
216
|
if (!resolved?.endpoint.$activityFeedback)
|
|
215
217
|
return;
|
|
216
218
|
const driver = createPhaseDriver(resolved.endpoint, ctx.platform, resolved.adapter);
|
|
217
219
|
await driver.stop(ctx, phase);
|
|
218
220
|
}
|
|
219
221
|
async updateThinkingText(ctx, text) {
|
|
220
|
-
const resolved = this.access.resolve(ctx.platform, ctx.
|
|
222
|
+
const resolved = this.access.resolve(ctx.platform, ctx.endpointKey);
|
|
221
223
|
if (!resolved)
|
|
222
224
|
return;
|
|
223
225
|
const driver = createPhaseDriver(resolved.endpoint, ctx.platform, resolved.adapter);
|
package/lib/executor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,gCAAgC,EAAkN,MAAM,gBAAgB,CAAC;AAWhT,6FAA6F;AAC7F,MAAM,UAAU,wBAAwB;IACtC,OAAO;QACL,OAAO;YACL,OAAO,SAAS,CAAC;QACnB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAgB;IAC5C,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,OAAO,CAAC;IAChD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAAE,OAAO,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3E,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI,OAAO,OAAO,KAAK,QAAQ;YAAE,OAAO,OAAO,CAAC;QAChD,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC3C,MAAM,IAAI,GAAI,OAAuD,CAAC,IAAI;mBACpE,OAA6B,CAAC;YACpC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,IAAI,MAAM,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACxF,OAAO,IAAI,CAAC,IAAI,CAAC;YACnB,CAAC;YACD,IAAI,OAAQ,OAA6B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC5D,OAAQ,OAA4B,CAAC,IAAI,CAAC;YAC5C,CAAC;QACH,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,4BAA4B,CAC1C,QAAsB,EACtB,MAA6D;IAE7D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAwE,CAAC;IAC9F,OAAO;QACL,OAAO,CAAC,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../src/orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../src/orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC3B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAErD,KAAK,MAAM,GAAG;IAAE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAAC,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAA;CAAE,CAAC;AAErH,qBAAa,4BAA4B;IAErC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAFH,MAAM,EAAE,sBAAsB,EAC9B,QAAQ,EAAE,wBAAwB,EAClC,GAAG,EAAE,MAAM;IAGxB,UAAU,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoChG,SAAS,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/F,kBAAkB,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAU/E"}
|
package/lib/orchestrator.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { toActivityFeedbackEventContext, isActivityFeedbackEnabled, } from '@zhin.js/agent';
|
|
1
|
+
import { toActivityFeedbackEventContext, isActivityFeedbackEnabled, applySubagentActivityPrefixToConfig, withSubagentActivityPrefix, } from '@zhin.js/agent';
|
|
2
2
|
export class ActivityFeedbackOrchestrator {
|
|
3
3
|
policy;
|
|
4
4
|
executor;
|
|
@@ -10,17 +10,27 @@ export class ActivityFeedbackOrchestrator {
|
|
|
10
10
|
}
|
|
11
11
|
async startPhase(payload, phase, reason) {
|
|
12
12
|
const gatePhase = phase;
|
|
13
|
-
if (!isActivityFeedbackEnabled(payload, gatePhase))
|
|
13
|
+
if (!isActivityFeedbackEnabled(payload, gatePhase)) {
|
|
14
|
+
this.log.debug(`[ActivityFeedback] skip ${phase} (${reason}): gate closed`
|
|
15
|
+
+ ` (eligible=${String(payload.hookContext?.activityFeedbackEligible)})`);
|
|
14
16
|
return;
|
|
17
|
+
}
|
|
15
18
|
const ctx = toActivityFeedbackEventContext(payload);
|
|
16
|
-
if (!ctx)
|
|
19
|
+
if (!ctx) {
|
|
20
|
+
this.log.debug(`[ActivityFeedback] skip ${phase} (${reason}): unresolvable context`
|
|
21
|
+
+ ` (platform=${String(payload.platform)} endpoint=${String(payload.endpointKey)})`);
|
|
17
22
|
return;
|
|
23
|
+
}
|
|
18
24
|
try {
|
|
19
|
-
const resolution = this.policy.resolvePhase(ctx.platform, ctx.
|
|
20
|
-
if (resolution.kind !== 'active')
|
|
25
|
+
const resolution = this.policy.resolvePhase(ctx.platform, ctx.endpointKey, phase, ctx.sceneType);
|
|
26
|
+
if (resolution.kind !== 'active') {
|
|
27
|
+
this.log.debug(`[ActivityFeedback] skip ${phase} (${reason}): policy=${resolution.kind}`
|
|
28
|
+
+ ` (${ctx.platform}:${ctx.endpointKey} ${ctx.sceneType})`);
|
|
21
29
|
return;
|
|
30
|
+
}
|
|
31
|
+
const config = applySubagentActivityPrefixToConfig(resolution.config, payload);
|
|
22
32
|
this.log.debug(`[ActivityFeedback] start ${phase} (${reason}) session=${ctx.sessionId}`);
|
|
23
|
-
await this.executor.start(ctx, phase,
|
|
33
|
+
await this.executor.start(ctx, phase, config);
|
|
24
34
|
}
|
|
25
35
|
catch (error) {
|
|
26
36
|
this.log.error(`[ActivityFeedback] start ${phase} failed (${reason}):`, error);
|
|
@@ -43,7 +53,7 @@ export class ActivityFeedbackOrchestrator {
|
|
|
43
53
|
if (!ctx || !text)
|
|
44
54
|
return;
|
|
45
55
|
try {
|
|
46
|
-
await this.executor.updateThinkingText(ctx, text);
|
|
56
|
+
await this.executor.updateThinkingText(ctx, withSubagentActivityPrefix(text, payload));
|
|
47
57
|
}
|
|
48
58
|
catch (error) {
|
|
49
59
|
this.log.error('[ActivityFeedback] thinking update failed:', error);
|
package/lib/orchestrator.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../src/orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,
|
|
1
|
+
{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../src/orchestrator.ts"],"names":[],"mappings":"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"}
|
package/lib/policy.d.ts
CHANGED
|
@@ -13,6 +13,6 @@ export type PhaseResolution = {
|
|
|
13
13
|
export declare class ActivityFeedbackPolicy {
|
|
14
14
|
private readonly service;
|
|
15
15
|
constructor(service: ActivityFeedbackServiceConfig);
|
|
16
|
-
resolvePhase(platform: string,
|
|
16
|
+
resolvePhase(platform: string, endpointKey: string, phase: ActivityFeedbackPhase, sceneType: ActivitySceneType): PhaseResolution;
|
|
17
17
|
}
|
|
18
18
|
//# sourceMappingURL=policy.d.ts.map
|
package/lib/policy.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../src/policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,iBAAiB,EACtB,KAAK,mCAAmC,EACzC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,KAAK,6BAA6B,EAGnC,MAAM,aAAa,CAAC;AAErB,YAAY,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,iCAAiC,EAAE,gCAAgC,EAAE,MAAM,aAAa,CAAC;AAElG,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GACpB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,mCAAmC,CAAA;CAAE,CAAC;AAEpE,qBAAa,sBAAsB;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,6BAA6B;IAEnE,YAAY,CACV,QAAQ,EAAE,MAAM,EAChB,
|
|
1
|
+
{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../src/policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,qBAAqB,EAC1B,KAAK,iBAAiB,EACtB,KAAK,mCAAmC,EACzC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,KAAK,6BAA6B,EAGnC,MAAM,aAAa,CAAC;AAErB,YAAY,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,iCAAiC,EAAE,gCAAgC,EAAE,MAAM,aAAa,CAAC;AAElG,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GACpB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,mCAAmC,CAAA;CAAE,CAAC;AAEpE,qBAAa,sBAAsB;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,6BAA6B;IAEnE,YAAY,CACV,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,qBAAqB,EAC5B,SAAS,EAAE,iBAAiB,GAC3B,eAAe;CAsBnB"}
|
package/lib/policy.js
CHANGED
|
@@ -6,11 +6,11 @@ export class ActivityFeedbackPolicy {
|
|
|
6
6
|
constructor(service) {
|
|
7
7
|
this.service = service;
|
|
8
8
|
}
|
|
9
|
-
resolvePhase(platform,
|
|
9
|
+
resolvePhase(platform, endpointKey, phase, sceneType) {
|
|
10
10
|
if (this.service.enabled === false) {
|
|
11
11
|
return { kind: 'disabled' };
|
|
12
12
|
}
|
|
13
|
-
const policy = mergeActivityFeedbackLayers(this.service.defaults, this.service.platforms?.[platform], this.service.endpoints?.[`${platform}:${
|
|
13
|
+
const policy = mergeActivityFeedbackLayers(this.service.defaults, this.service.platforms?.[platform], this.service.endpoints?.[`${platform}:${endpointKey}`]);
|
|
14
14
|
if (policy?.enabled === false) {
|
|
15
15
|
return { kind: 'disabled' };
|
|
16
16
|
}
|
package/lib/policy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"policy.js","sourceRoot":"","sources":["../src/policy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kCAAkC,GAInC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,2BAA2B,GAE5B,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,iCAAiC,EAAE,gCAAgC,EAAE,MAAM,aAAa,CAAC;AAOlG,MAAM,OAAO,sBAAsB;IACJ;IAA7B,YAA6B,OAAsC;QAAtC,YAAO,GAAP,OAAO,CAA+B;IAAG,CAAC;IAEvE,YAAY,CACV,QAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"policy.js","sourceRoot":"","sources":["../src/policy.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kCAAkC,GAInC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAEL,2BAA2B,GAE5B,MAAM,aAAa,CAAC;AAGrB,OAAO,EAAE,iCAAiC,EAAE,gCAAgC,EAAE,MAAM,aAAa,CAAC;AAOlG,MAAM,OAAO,sBAAsB;IACJ;IAA7B,YAA6B,OAAsC;QAAtC,YAAO,GAAP,OAAO,CAA+B;IAAG,CAAC;IAEvE,YAAY,CACV,QAAgB,EAChB,WAAmB,EACnB,KAA4B,EAC5B,SAA4B;QAE5B,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;YACnC,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;QAC9B,CAAC;QAED,MAAM,MAAM,GAAG,2BAA2B,CACxC,IAAI,CAAC,OAAO,CAAC,QAAQ,EACrB,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,EAClC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,QAAQ,IAAI,WAAW,EAAE,CAAC,CACvD,CAAC;QAEF,IAAI,MAAM,EAAE,OAAO,KAAK,KAAK,EAAE,CAAC;YAC9B,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;QAC9B,CAAC;QAED,MAAM,MAAM,GAAG,kCAAkC,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACtF,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAC1B,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACpC,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zhin.js/service-activity-feedback",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.5",
|
|
4
4
|
"description": "Activity Feedback 服务插件（Plugin Runtime）",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -36,19 +36,19 @@
|
|
|
36
36
|
"directory": "plugins/services/activity-feedback"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@zhin.js/agent": "1.1.
|
|
40
|
-
"@zhin.js/logger": "1.0.
|
|
41
|
-
"@zhin.js/plugin-runtime": "1.1.
|
|
39
|
+
"@zhin.js/agent": "1.1.5",
|
|
40
|
+
"@zhin.js/logger": "1.0.76",
|
|
41
|
+
"@zhin.js/plugin-runtime": "1.1.5"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"@types/node": "^26.1.2",
|
|
45
45
|
"typescript": "^6.0.3",
|
|
46
46
|
"vitest": "^4.1.10",
|
|
47
|
-
"zhin.js": "6.0.
|
|
47
|
+
"zhin.js": "6.0.4"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
|
-
"@zhin.js/agent": "1.1.
|
|
51
|
-
"zhin.js": "6.0.
|
|
50
|
+
"@zhin.js/agent": "1.1.5",
|
|
51
|
+
"zhin.js": "6.0.4"
|
|
52
52
|
},
|
|
53
53
|
"peerDependenciesMeta": {
|
|
54
54
|
"zhin.js": {
|
package/src/ai-event-binder.ts
CHANGED
|
@@ -62,12 +62,13 @@ export function createActivityFeedbackAIEventHandlers(
|
|
|
62
62
|
|
|
63
63
|
onSubagentStart: async (payload) => {
|
|
64
64
|
if (!isActivityFeedbackEnabled(payload, 'thinking')) return;
|
|
65
|
-
|
|
65
|
+
// Do not stop the parent turn's active indicator — subagent uses an isolated session key.
|
|
66
66
|
await orchestrator.startPhase(payload, 'thinking', 'subagent.start');
|
|
67
|
-
const
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
67
|
+
const tag = payload.agentId?.trim() || 'subagent';
|
|
68
|
+
const label = payload.label?.trim()
|
|
69
|
+
? `子任务执行中: ${payload.label.trim()}...`
|
|
70
|
+
: '思考中...';
|
|
71
|
+
await orchestrator.updateThinkingText(payload, `[${tag}] ${label}`);
|
|
71
72
|
},
|
|
72
73
|
|
|
73
74
|
onSubagentFinish: async (payload) => {
|
package/src/config.ts
CHANGED
|
@@ -66,7 +66,7 @@ export function loadActivityFeedbackServiceConfig(
|
|
|
66
66
|
export function resolveActivityFeedbackForTarget(
|
|
67
67
|
service: ActivityFeedbackServiceConfig,
|
|
68
68
|
platform: string,
|
|
69
|
-
|
|
69
|
+
endpointKey: string,
|
|
70
70
|
): ActivityFeedbackConfig | undefined {
|
|
71
71
|
if (service.enabled === false) {
|
|
72
72
|
return { enabled: false };
|
|
@@ -74,6 +74,6 @@ export function resolveActivityFeedbackForTarget(
|
|
|
74
74
|
return mergeActivityFeedbackLayers(
|
|
75
75
|
service.defaults,
|
|
76
76
|
service.platforms?.[platform],
|
|
77
|
-
service.endpoints?.[`${platform}:${
|
|
77
|
+
service.endpoints?.[`${platform}:${endpointKey}`],
|
|
78
78
|
);
|
|
79
79
|
}
|
package/src/executor.ts
CHANGED
|
@@ -6,7 +6,7 @@ import type { OutboundHost } from '@zhin.js/plugin-runtime';
|
|
|
6
6
|
export interface ActivityFeedbackEndpointAccess {
|
|
7
7
|
resolve(
|
|
8
8
|
platform: string,
|
|
9
|
-
|
|
9
|
+
endpointKey: string,
|
|
10
10
|
): { endpoint: EndpointWithActivityFeedback; adapter: Adapter } | undefined;
|
|
11
11
|
}
|
|
12
12
|
|
|
@@ -42,7 +42,7 @@ function stringifySendContent(content: unknown): string {
|
|
|
42
42
|
* Plugin Runtime: resolve endpoints via OutboundHost → ImRuntime.sendEndpointMessage.
|
|
43
43
|
* Typing/reaction text goes through the unified outbound chain (no legacy Adapter.inject).
|
|
44
44
|
*
|
|
45
|
-
* 按 platform:
|
|
45
|
+
* 按 platform:endpointKey 缓存 { endpoint, adapter }：activity manager 挂在
|
|
46
46
|
* endpoint.$activityFeedback 上，start/stop 必须解析到同一个对象，否则
|
|
47
47
|
* stop 时拿不到 manager，typing 指示器永远无法停止。
|
|
48
48
|
*/
|
|
@@ -52,19 +52,19 @@ export function createOutboundEndpointAccess(
|
|
|
52
52
|
): ActivityFeedbackEndpointAccess {
|
|
53
53
|
const cache = new Map<string, { endpoint: EndpointWithActivityFeedback; adapter: Adapter }>();
|
|
54
54
|
return {
|
|
55
|
-
resolve(platform,
|
|
56
|
-
const key = `${platform}:${
|
|
55
|
+
resolve(platform, endpointKey) {
|
|
56
|
+
const key = `${platform}:${endpointKey}`;
|
|
57
57
|
const cached = cache.get(key);
|
|
58
58
|
if (cached) return cached;
|
|
59
59
|
const addReaction = outbound.addReaction;
|
|
60
60
|
const removeReaction = outbound.removeReaction;
|
|
61
61
|
const endpoint = {
|
|
62
|
-
$id:
|
|
62
|
+
$id: endpointKey,
|
|
63
63
|
// Prefer real OutboundHost.recall when available (icqq RECALL_MSG).
|
|
64
64
|
$recallMessage: async (messageId: string) => {
|
|
65
65
|
if (outbound.recall) {
|
|
66
66
|
try {
|
|
67
|
-
await outbound.recall({ adapter: platform,
|
|
67
|
+
await outbound.recall({ adapter: platform, endpointKey, messageId });
|
|
68
68
|
return;
|
|
69
69
|
} catch (error) {
|
|
70
70
|
logger?.debug(
|
|
@@ -85,7 +85,7 @@ export function createOutboundEndpointAccess(
|
|
|
85
85
|
hint?: { sceneType?: 'private' | 'group' | 'channel'; channelId?: string },
|
|
86
86
|
) => addReaction({
|
|
87
87
|
adapter: platform,
|
|
88
|
-
|
|
88
|
+
endpointKey,
|
|
89
89
|
messageId,
|
|
90
90
|
emoji,
|
|
91
91
|
sceneType: hint?.sceneType,
|
|
@@ -96,7 +96,7 @@ export function createOutboundEndpointAccess(
|
|
|
96
96
|
? async (messageId: string, reactionId: string) => {
|
|
97
97
|
await removeReaction({
|
|
98
98
|
adapter: platform,
|
|
99
|
-
|
|
99
|
+
endpointKey,
|
|
100
100
|
messageId,
|
|
101
101
|
reactionId,
|
|
102
102
|
});
|
|
@@ -114,9 +114,11 @@ export function createOutboundEndpointAccess(
|
|
|
114
114
|
try {
|
|
115
115
|
const messageId = await outbound.send({
|
|
116
116
|
adapter: platform,
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
117
|
+
endpointKey,
|
|
118
|
+
conversation: {
|
|
119
|
+
kind: (options.type as 'private' | 'group' | 'channel' | undefined) || 'private',
|
|
120
|
+
id: options.id,
|
|
121
|
+
},
|
|
120
122
|
content: text,
|
|
121
123
|
});
|
|
122
124
|
// Prefer real id; fall back to a sentinel so MessageTypingIndicator
|
|
@@ -131,7 +133,7 @@ export function createOutboundEndpointAccess(
|
|
|
131
133
|
}
|
|
132
134
|
},
|
|
133
135
|
endpoints: {
|
|
134
|
-
get: (id: string) => (id ===
|
|
136
|
+
get: (id: string) => (id === endpointKey ? endpoint : undefined),
|
|
135
137
|
},
|
|
136
138
|
};
|
|
137
139
|
const resolved = { endpoint, adapter: adapter as unknown as Adapter };
|
|
@@ -254,21 +256,21 @@ export class ActivityFeedbackExecutor {
|
|
|
254
256
|
phase: ActivityFeedbackPhase,
|
|
255
257
|
phaseConfig: ResolvedActivityFeedbackPhaseConfig,
|
|
256
258
|
): Promise<void> {
|
|
257
|
-
const resolved = this.access.resolve(ctx.platform, ctx.
|
|
259
|
+
const resolved = this.access.resolve(ctx.platform, ctx.endpointKey);
|
|
258
260
|
if (!resolved) return;
|
|
259
261
|
const driver = createPhaseDriver(resolved.endpoint, ctx.platform, resolved.adapter);
|
|
260
262
|
await driver.start(ctx, phase, phaseConfig);
|
|
261
263
|
}
|
|
262
264
|
|
|
263
265
|
async stop(ctx: ActivityFeedbackEventContext, phase: ActivityFeedbackPhase): Promise<void> {
|
|
264
|
-
const resolved = this.access.resolve(ctx.platform, ctx.
|
|
266
|
+
const resolved = this.access.resolve(ctx.platform, ctx.endpointKey);
|
|
265
267
|
if (!resolved?.endpoint.$activityFeedback) return;
|
|
266
268
|
const driver = createPhaseDriver(resolved.endpoint, ctx.platform, resolved.adapter);
|
|
267
269
|
await driver.stop(ctx, phase);
|
|
268
270
|
}
|
|
269
271
|
|
|
270
272
|
async updateThinkingText(ctx: ActivityFeedbackEventContext, text: string): Promise<void> {
|
|
271
|
-
const resolved = this.access.resolve(ctx.platform, ctx.
|
|
273
|
+
const resolved = this.access.resolve(ctx.platform, ctx.endpointKey);
|
|
272
274
|
if (!resolved) return;
|
|
273
275
|
const driver = createPhaseDriver(resolved.endpoint, ctx.platform, resolved.adapter);
|
|
274
276
|
await driver.updateThinkingText(ctx, text);
|
package/src/orchestrator.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import {
|
|
2
2
|
toActivityFeedbackEventContext,
|
|
3
3
|
isActivityFeedbackEnabled,
|
|
4
|
+
applySubagentActivityPrefixToConfig,
|
|
5
|
+
withSubagentActivityPrefix,
|
|
4
6
|
type AIEventPayload,
|
|
5
7
|
type ActivityFeedbackPhase,
|
|
6
8
|
} from '@zhin.js/agent';
|
|
@@ -18,16 +20,35 @@ export class ActivityFeedbackOrchestrator {
|
|
|
18
20
|
|
|
19
21
|
async startPhase(payload: AIEventPayload, phase: ActivityFeedbackPhase, reason: string): Promise<void> {
|
|
20
22
|
const gatePhase = phase as import('@zhin.js/agent').ActivityFeedbackGatePhase;
|
|
21
|
-
if (!isActivityFeedbackEnabled(payload, gatePhase))
|
|
23
|
+
if (!isActivityFeedbackEnabled(payload, gatePhase)) {
|
|
24
|
+
this.log.debug(
|
|
25
|
+
`[ActivityFeedback] skip ${phase} (${reason}): gate closed`
|
|
26
|
+
+ ` (eligible=${String(payload.hookContext?.activityFeedbackEligible)})`,
|
|
27
|
+
);
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
22
30
|
const ctx = toActivityFeedbackEventContext(payload);
|
|
23
|
-
if (!ctx)
|
|
31
|
+
if (!ctx) {
|
|
32
|
+
this.log.debug(
|
|
33
|
+
`[ActivityFeedback] skip ${phase} (${reason}): unresolvable context`
|
|
34
|
+
+ ` (platform=${String(payload.platform)} endpoint=${String(payload.endpointKey)})`,
|
|
35
|
+
);
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
24
38
|
|
|
25
39
|
try {
|
|
26
|
-
const resolution = this.policy.resolvePhase(ctx.platform, ctx.
|
|
27
|
-
if (resolution.kind !== 'active')
|
|
40
|
+
const resolution = this.policy.resolvePhase(ctx.platform, ctx.endpointKey, phase, ctx.sceneType);
|
|
41
|
+
if (resolution.kind !== 'active') {
|
|
42
|
+
this.log.debug(
|
|
43
|
+
`[ActivityFeedback] skip ${phase} (${reason}): policy=${resolution.kind}`
|
|
44
|
+
+ ` (${ctx.platform}:${ctx.endpointKey} ${ctx.sceneType})`,
|
|
45
|
+
);
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
28
48
|
|
|
49
|
+
const config = applySubagentActivityPrefixToConfig(resolution.config, payload);
|
|
29
50
|
this.log.debug(`[ActivityFeedback] start ${phase} (${reason}) session=${ctx.sessionId}`);
|
|
30
|
-
await this.executor.start(ctx, phase,
|
|
51
|
+
await this.executor.start(ctx, phase, config);
|
|
31
52
|
} catch (error) {
|
|
32
53
|
this.log.error(`[ActivityFeedback] start ${phase} failed (${reason}):`, error);
|
|
33
54
|
}
|
|
@@ -50,7 +71,7 @@ export class ActivityFeedbackOrchestrator {
|
|
|
50
71
|
if (!ctx || !text) return;
|
|
51
72
|
|
|
52
73
|
try {
|
|
53
|
-
await this.executor.updateThinkingText(ctx, text);
|
|
74
|
+
await this.executor.updateThinkingText(ctx, withSubagentActivityPrefix(text, payload));
|
|
54
75
|
} catch (error) {
|
|
55
76
|
this.log.error('[ActivityFeedback] thinking update failed:', error);
|
|
56
77
|
}
|
package/src/policy.ts
CHANGED
|
@@ -23,7 +23,7 @@ export class ActivityFeedbackPolicy {
|
|
|
23
23
|
|
|
24
24
|
resolvePhase(
|
|
25
25
|
platform: string,
|
|
26
|
-
|
|
26
|
+
endpointKey: string,
|
|
27
27
|
phase: ActivityFeedbackPhase,
|
|
28
28
|
sceneType: ActivitySceneType,
|
|
29
29
|
): PhaseResolution {
|
|
@@ -34,7 +34,7 @@ export class ActivityFeedbackPolicy {
|
|
|
34
34
|
const policy = mergeActivityFeedbackLayers(
|
|
35
35
|
this.service.defaults,
|
|
36
36
|
this.service.platforms?.[platform],
|
|
37
|
-
this.service.endpoints?.[`${platform}:${
|
|
37
|
+
this.service.endpoints?.[`${platform}:${endpointKey}`],
|
|
38
38
|
);
|
|
39
39
|
|
|
40
40
|
if (policy?.enabled === false) {
|