@zhin.js/service-activity-feedback 3.0.15 → 3.0.17

package/lib/orchestrator.d.ts

@@ -9,10 +9,18 @@ export declare class ActivityFeedbackOrchestrator {
     private readonly policy;
     private readonly executor;
     private readonly log;
+    private readonly active;
+    private readonly transient;
+    private readonly pendingCleanup;
     constructor(policy: ActivityFeedbackPolicy, executor: ActivityFeedbackExecutor, log: Logger);
     startPhase(payload: AIEventPayload, phase: ActivityFeedbackPhase, reason: string): Promise<void>;
     stopPhase(payload: AIEventPayload, phase: ActivityFeedbackPhase, reason: string): Promise<void>;
     updateThinkingText(payload: AIEventPayload, text: string): Promise<void>;
+    updatePhaseText(payload: AIEventPayload, phase: ActivityFeedbackPhase, text: string): Promise<void>;
+    showTransientPhase(payload: AIEventPayload, phase: ActivityFeedbackPhase, reason: string): Promise<void>;
+    dispose(): Promise<void>;
+    private phaseKey;
+    private clearTransient;
 }
 export {};
 //# sourceMappingURL=orchestrator.d.ts.map

package/lib/orchestrator.d.ts.map

@@ -1 +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"}
+{"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;IAarC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAdtB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAGlB;IACL,OAAO,CAAC,QAAQ,CAAC,SAAS,CAIrB;IACL,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA4B;gBAGxC,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;IAqChG,SAAS,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAe/F,kBAAkB,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxE,eAAe,CACnB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,qBAAqB,EAC5B,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC;IAWV,kBAAkB,CACtB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,qBAAqB,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;IAyBV,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAY9B,OAAO,CAAC,QAAQ;IAOhB,OAAO,CAAC,cAAc;CAMvB"}

package/lib/orchestrator.js

@@ -3,6 +3,9 @@ export class ActivityFeedbackOrchestrator {
     policy;
     executor;
     log;
+    active = new Map();
+    transient = new Map();
+    pendingCleanup = new Set();
     constructor(policy, executor, log) {
         this.policy = policy;
         this.executor = executor;
@@ -31,6 +34,7 @@ export class ActivityFeedbackOrchestrator {
             const config = applySubagentActivityPrefixToConfig(resolution.config, payload);
             this.log.debug(`[ActivityFeedback] start ${phase} (${reason}) session=${ctx.sessionId}`);
             await this.executor.start(ctx, phase, config);
+            this.active.set(this.phaseKey(ctx, phase), { ctx, phase });
         }
         catch (error) {
             this.log.error(`[ActivityFeedback] start ${phase} failed (${reason}):`, error);
@@ -40,6 +44,9 @@ export class ActivityFeedbackOrchestrator {
         const ctx = toActivityFeedbackEventContext(payload);
         if (!ctx)
             return;
+        const key = this.phaseKey(ctx, phase);
+        this.clearTransient(key);
+        this.active.delete(key);
         try {
             this.log.debug(`[ActivityFeedback] stop ${phase} (${reason}) session=${ctx.sessionId}`);
             await this.executor.stop(ctx, phase);
@@ -49,15 +56,66 @@ export class ActivityFeedbackOrchestrator {
         }
     }
     async updateThinkingText(payload, text) {
+        await this.updatePhaseText(payload, 'thinking', text);
+    }
+    async updatePhaseText(payload, phase, text) {
         const ctx = toActivityFeedbackEventContext(payload);
         if (!ctx || !text)
             return;
         try {
-            await this.executor.updateThinkingText(ctx, withSubagentActivityPrefix(text, payload));
+            await this.executor.updateText(ctx, phase, withSubagentActivityPrefix(text, payload));
         }
         catch (error) {
-            this.log.error('[ActivityFeedback] thinking update failed:', error);
+            this.log.error(`[ActivityFeedback] ${phase} update failed:`, error);
         }
     }
+    async showTransientPhase(payload, phase, reason) {
+        await this.startPhase(payload, phase, reason);
+        const ctx = toActivityFeedbackEventContext(payload);
+        if (!ctx)
+            return;
+        const resolution = this.policy.resolvePhase(ctx.platform, ctx.endpointKey, phase, ctx.sceneType);
+        if (resolution.kind !== 'active')
+            return;
+        const delay = resolution.config.removeDelay ?? 3_000;
+        const key = this.phaseKey(ctx, phase);
+        this.clearTransient(key);
+        const timer = setTimeout(() => {
+            this.transient.delete(key);
+            this.active.delete(key);
+            const cleanup = this.executor.stop(ctx, phase)
+                .catch((error) => {
+                this.log.error(`[ActivityFeedback] transient ${phase} cleanup failed:`, error);
+            })
+                .finally(() => {
+                this.pendingCleanup.delete(cleanup);
+            });
+            this.pendingCleanup.add(cleanup);
+        }, Math.max(0, delay));
+        timer.unref?.();
+        this.transient.set(key, { timer, ctx, phase });
+    }
+    async dispose() {
+        const pending = [...this.active.values()];
+        const timers = [...this.transient.values()];
+        this.active.clear();
+        this.transient.clear();
+        for (const item of timers)
+            clearTimeout(item.timer);
+        await Promise.allSettled([
+            ...pending.map((item) => this.executor.stop(item.ctx, item.phase)),
+            ...this.pendingCleanup,
+        ]);
+    }
+    phaseKey(ctx, phase) {
+        return JSON.stringify([ctx.platform, ctx.endpointKey, ctx.sessionId, phase, ctx.messageId]);
+    }
+    clearTransient(key) {
+        const current = this.transient.get(key);
+        if (!current)
+            return;
+        clearTimeout(current.timer);
+        this.transient.delete(key);
+    }
 }
 //# sourceMappingURL=orchestrator.js.map

package/lib/orchestrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../src/orchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,EACzB,mCAAmC,EACnC,0BAA0B,GAG3B,MAAM,gBAAgB,CAAC;AAMxB,MAAM,OAAO,4BAA4B;IAEpB;IACA;IACA;IAHnB,YACmB,MAA8B,EAC9B,QAAkC,EAClC,GAAW;QAFX,WAAM,GAAN,MAAM,CAAwB;QAC9B,aAAQ,GAAR,QAAQ,CAA0B;QAClC,QAAG,GAAH,GAAG,CAAQ;IAC3B,CAAC;IAEJ,KAAK,CAAC,UAAU,CAAC,OAAuB,EAAE,KAA4B,EAAE,MAAc;QACpF,MAAM,SAAS,GAAG,KAA2D,CAAC;QAC9E,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,2BAA2B,KAAK,KAAK,MAAM,gBAAgB;kBACzD,cAAc,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,wBAAwB,CAAC,GAAG,CACzE,CAAC;YACF,OAAO;QACT,CAAC;QACD,MAAM,GAAG,GAAG,8BAA8B,CAAC,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,2BAA2B,KAAK,KAAK,MAAM,yBAAyB;kBAClE,cAAc,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CACpF,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;YACjG,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACjC,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,2BAA2B,KAAK,KAAK,MAAM,aAAa,UAAU,CAAC,IAAI,EAAE;sBACvE,KAAK,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,SAAS,GAAG,CAC3D,CAAC;gBACF,OAAO;YACT,CAAC;YAED,MAAM,MAAM,GAAG,mCAAmC,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC/E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,KAAK,KAAK,MAAM,aAAa,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;YACzF,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,KAAK,YAAY,MAAM,IAAI,EAAE,KAAK,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAuB,EAAE,KAA4B,EAAE,MAAc;QACnF,MAAM,GAAG,GAAG,8BAA8B,CAAC,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,GAAG;YAAE,OAAO;QAEjB,IAAI,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,KAAK,KAAK,MAAM,aAAa,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;YACxF,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,KAAK,YAAY,MAAM,IAAI,EAAE,KAAK,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,OAAuB,EAAE,IAAY;QAC5D,MAAM,GAAG,GAAG,8BAA8B,CAAC,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI;YAAE,OAAO;QAE1B,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,EAAE,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QACzF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4CAA4C,EAAE,KAAK,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"orchestrator.js","sourceRoot":"","sources":["../src/orchestrator.ts"],"names":[],"mappings":"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"}

package/lib/policy.d.ts.map

@@ -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,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,qBAAqB,EAC5B,SAAS,EAAE,iBAAiB,GAC3B,eAAe;CAsBnB"}
+{"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;CAuBnB"}

package/lib/policy.js

@@ -10,7 +10,7 @@ export class ActivityFeedbackPolicy {
         if (this.service.enabled === false) {
             return { kind: 'disabled' };
         }
-        const policy = mergeActivityFeedbackLayers(this.service.defaults, this.service.platforms?.[platform], this.service.endpoints?.[`${platform}:${endpointKey}`]);
+        const policy = mergeActivityFeedbackLayers(this.service.defaults, this.service.platforms?.[platform], this.service.endpoints?.[`${platform}:${endpointKey}`], schedulePhaseLayer(this.service, phase));
         if (policy?.enabled === false) {
             return { kind: 'disabled' };
         }
@@ -21,4 +21,15 @@ export class ActivityFeedbackPolicy {
         return { kind: 'active', config };
     }
 }
+function schedulePhaseLayer(service, phase) {
+    const scheduleKey = phase === 'schedule_start'
+        ? 'start'
+        : phase === 'schedule_finish'
+            ? 'finish'
+            : phase === 'schedule_error'
+                ? 'error'
+                : undefined;
+    const scenes = scheduleKey ? service.schedule?.phases?.[scheduleKey] : undefined;
+    return scenes ? { phases: { [phase]: scenes } } : undefined;
+}
 //# sourceMappingURL=policy.js.map

package/lib/policy.js.map

@@ -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,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"}
+{"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,EACtD,kBAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CACxC,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;AAED,SAAS,kBAAkB,CACzB,OAAsC,EACtC,KAA4B;IAE5B,MAAM,WAAW,GAAG,KAAK,KAAK,gBAAgB;QAC5C,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,KAAK,KAAK,iBAAiB;YAC3B,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,KAAK,KAAK,gBAAgB;gBAC1B,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,SAAS,CAAC;IAClB,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjF,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AAC9D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/service-activity-feedback",
-  "version": "3.0.15",
+  "version": "3.0.17",
   "description": "Activity Feedback 服务插件（Plugin Runtime）",
   "type": "module",
   "main": "./lib/index.js",
@@ -36,18 +36,18 @@
     "directory": "plugins/services/activity-feedback"
   },
   "dependencies": {
-    "@zhin.js/agent": "1.1.15",
-    "@zhin.js/logger": "1.0.76"
+    "@zhin.js/agent": "1.1.16",
+    "@zhin.js/logger": "1.0.77"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "zhin.js": "6.0.13"
+    "zhin.js": "6.0.14"
   },
   "peerDependencies": {
-    "@zhin.js/agent": "1.1.15",
-    "zhin.js": "6.0.13"
+    "@zhin.js/agent": "1.1.16",
+    "zhin.js": "6.0.14"
   },
   "peerDependenciesMeta": {
     "zhin.js": {

package/plugin.js

@@ -1,10 +1,11 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { definePlugin, outboundHostToken } from 'zhin.js';
+import { createGenerationAdmissionGate, createToken, definePlugin, outboundHostToken, } from 'zhin.js';
 import { getLogger } from '@zhin.js/logger';
 import { loadActivityFeedbackServiceConfig, } from "./lib/config.js";
 import { bindActivityFeedbackToAIEventBus, createActivityFeedbackOrchestratorForRuntime, } from "./lib/ai-event-binder.js";
-import { createNoopEndpointAccess, createOutboundEndpointAccess, } from "./lib/executor.js";
+import { createOutboundEndpointAccess, } from "./lib/executor.js";
 const logger = getLogger('activity-feedback');
+const activityFeedbackAdmissionToken = createToken('zhin.activity-feedback.generation-admission');
 /**
  * Activity Feedback service — Plugin Runtime entry.
  *
@@ -22,14 +23,21 @@ export default definePlugin({
         if (serviceConfig.enabled === false) {
             return;
         }
-        const access = context.resources.has(outboundHostToken)
-            ? createOutboundEndpointAccess(context.resources.use(outboundHostToken), logger)
-            : createNoopEndpointAccess();
+        const outbound = context.resources.has(outboundHostToken)
+            ? context.resources.use(outboundHostToken)
+            : undefined;
+        if (!outbound || typeof outbound.runWithView !== 'function') {
+            logger.debug('[ActivityFeedback] disabled: OutboundHost with generation-bound runWithView is required');
+            return;
+        }
+        const access = createOutboundEndpointAccess(outbound, logger);
         const orchestrator = createActivityFeedbackOrchestratorForRuntime(serviceConfig, logger, access);
-        const dispose = bindActivityFeedbackToAIEventBus(orchestrator);
-        context.lifecycle.add(() => {
+        const admission = createGenerationAdmissionGate();
+        context.resources.provide(activityFeedbackAdmissionToken, admission);
+        const dispose = bindActivityFeedbackToAIEventBus(orchestrator, admission, outbound.runWithView.bind(outbound));
+        context.lifecycle.add(async () => {
             logger.debug('[ActivityFeedback] Disposing Runtime AI event binder');
-            dispose();
+            await dispose();
         });
     },
 });

package/schema.json

@@ -3,10 +3,126 @@
   "type": "object",
   "additionalProperties": false,
   "properties": {
-    "enabled": { "type": "boolean", "default": true },
-    "defaults": { "type": "object", "additionalProperties": true },
-    "platforms": { "type": "object", "additionalProperties": true },
-    "endpoints": { "type": "object", "additionalProperties": true },
-    "schedule": { "type": "object", "additionalProperties": true }
+    "enabled": {
+      "type": "boolean",
+      "default": true,
+      "description": "Enable activity feedback for this plugin instance.",
+      "x-descriptionZh": "是否启用当前活动反馈插件实例。"
+    },
+    "defaults": {
+      "$ref": "#/$defs/activityFeedback",
+      "description": "Default policy for all platforms and Endpoints.",
+      "x-descriptionZh": "所有平台与 Endpoint 的默认策略。"
+    },
+    "platforms": {
+      "type": "object",
+      "x-keyPlaceholder": "<platform>",
+      "additionalProperties": { "$ref": "#/$defs/activityFeedback" },
+      "description": "Platform overrides keyed by platform name; values use the same shape as defaults.",
+      "x-descriptionZh": "按平台名覆盖；值的结构与 defaults 相同。"
+    },
+    "endpoints": {
+      "type": "object",
+      "x-keyPlaceholder": "<platform:endpointKey>",
+      "additionalProperties": { "$ref": "#/$defs/activityFeedback" },
+      "description": "Endpoint overrides keyed by platform:endpointKey; values use the same shape as defaults.",
+      "x-descriptionZh": "按 platform:endpointKey 覆盖；值的结构与 defaults 相同。"
+    },
+    "schedule": {
+      "$ref": "#/$defs/scheduleFeedback",
+      "description": "Schedule-only start, finish, and error feedback.",
+      "x-descriptionZh": "仅用于 Schedule 的开始、完成与失败反馈。"
+    }
+  },
+  "$defs": {
+    "activityFeedback": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "default": true,
+          "description": "Enable this policy layer.",
+          "x-descriptionZh": "是否启用当前策略层。"
+        },
+        "phases": {
+          "type": "object",
+          "additionalProperties": false,
+          "description": "Feedback policy keyed by lifecycle phase.",
+          "x-descriptionZh": "按生命周期 phase 配置反馈策略。",
+          "properties": {
+            "queued": { "$ref": "#/$defs/scenePhases" },
+            "active": { "$ref": "#/$defs/scenePhases" },
+            "thinking": { "$ref": "#/$defs/scenePhases" },
+            "schedule_start": { "$ref": "#/$defs/scenePhases" },
+            "schedule_finish": { "$ref": "#/$defs/scenePhases" },
+            "schedule_error": { "$ref": "#/$defs/scenePhases" }
+          }
+        }
+      }
+    },
+    "scenePhases": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "private": { "$ref": "#/$defs/phaseConfig" },
+        "group": { "$ref": "#/$defs/phaseConfig" },
+        "channel": { "$ref": "#/$defs/phaseConfig" }
+      }
+    },
+    "phaseConfig": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": ["reaction", "message", "typing", "none"],
+          "description": "How the phase is presented.",
+          "x-descriptionZh": "该 phase 的呈现方式。"
+        },
+        "emoji": {
+          "type": "string",
+          "description": "Reaction value for type=reaction.",
+          "x-descriptionZh": "type=reaction 时使用的回应值。"
+        },
+        "message": {
+          "type": "string",
+          "description": "Status text for type=message.",
+          "x-descriptionZh": "type=message 时使用的状态文本。"
+        },
+        "autoRemove": {
+          "type": "boolean",
+          "default": true,
+          "description": "Remove the feedback after the phase stops.",
+          "x-descriptionZh": "phase 停止后是否自动移除反馈。"
+        },
+        "removeDelay": {
+          "type": "number",
+          "description": "Delay before removal in milliseconds; negative values are normalized to zero at runtime.",
+          "x-descriptionZh": "自动移除前等待的毫秒数；负值会在运行时归一化为 0。"
+        },
+        "platformConfig": {
+          "type": "object",
+          "additionalProperties": true,
+          "description": "Platform-specific options.",
+          "x-descriptionZh": "平台特定选项。"
+        }
+      }
+    },
+    "scheduleFeedback": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "phases": {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "start": { "$ref": "#/$defs/scenePhases" },
+            "finish": { "$ref": "#/$defs/scenePhases" },
+            "error": { "$ref": "#/$defs/scenePhases" }
+          }
+        }
+      }
+    }
   }
 }

package/src/ai-event-binder.ts

@@ -3,8 +3,11 @@ import {
   activityFeedbackAiBus,
   isActivityFeedbackEnabled,
   type AIEventHandlers,
+  type AIEventPayload,
+  type AIEventTarget,
 } from '@zhin.js/agent';
 import { loadActivityFeedbackServiceConfig, type ActivityFeedbackServiceConfig } from './config.js';
+import type { GenerationAdmissionGate } from 'zhin.js';
 import {
   ActivityFeedbackExecutor,
   createNoopEndpointAccess,
@@ -29,7 +32,13 @@ export function createActivityFeedbackAIEventHandlers(
     onProcessingStart: async (payload) => {
       if (!isActivityFeedbackEnabled(payload, 'active')) return;
       await orchestrator.stopPhase(payload, 'queued', 'processing.start');
+      if (typeof payload.iterations === 'number' && payload.iterations > 1) {
+        await orchestrator.stopPhase(payload, 'thinking', 'processing.iteration');
+      }
       await orchestrator.startPhase(payload, 'active', 'processing.start');
+      if (typeof payload.iterations === 'number' && payload.iterations > 1 && payload.content?.trim()) {
+        await orchestrator.updatePhaseText(payload, 'active', payload.content.trim());
+      }
     },
 
     onTypingStart: async () => {},
@@ -47,9 +56,10 @@ export function createActivityFeedbackAIEventHandlers(
       await orchestrator.stopPhase(payload, 'active', 'processing.error');
     },
 
-    onTypingStop: (payload) => {
+    onTypingStop: async (payload) => {
       if (!isActivityFeedbackEnabled(payload, 'active')) return;
-      return orchestrator.stopPhase(payload, 'active', 'typing.stop');
+      await orchestrator.stopPhase(payload, 'thinking', 'typing.stop');
+      await orchestrator.stopPhase(payload, 'active', 'typing.stop');
     },
 
     onThinking: async (payload) => {
@@ -60,9 +70,26 @@ export function createActivityFeedbackAIEventHandlers(
       await orchestrator.updateThinkingText(payload, payload.thinking);
     },
 
+    onToolCall: async (payload) => {
+      if (!isActivityFeedbackEnabled(payload, 'active') || !payload.toolName?.trim()) return;
+      const text = `调用工具：${payload.toolName.trim()}…`;
+      await orchestrator.updatePhaseText(payload, 'thinking', text);
+      await orchestrator.updatePhaseText(payload, 'active', text);
+    },
+
+    onToolResult: async (payload) => {
+      if (!isActivityFeedbackEnabled(payload, 'active') || !payload.toolName?.trim()) return;
+      const outcome = payload.status === 'error' || payload.error ? '未完成' : '已完成';
+      const text = `工具 ${payload.toolName.trim()} ${outcome}，继续处理…`;
+      await orchestrator.updatePhaseText(payload, 'thinking', text);
+      await orchestrator.updatePhaseText(payload, 'active', text);
+    },
+
     onSubagentStart: async (payload) => {
       if (!isActivityFeedbackEnabled(payload, 'thinking')) return;
-      // Do not stop the parent turn's active indicator — subagent uses an isolated session key.
+      // The subagent has an isolated session key; remove its own active placeholder
+      // before switching to the richer thinking state.
+      await orchestrator.stopPhase(payload, 'active', 'subagent.start');
       await orchestrator.startPhase(payload, 'thinking', 'subagent.start');
       const tag = payload.agentId?.trim() || 'subagent';
       const label = payload.label?.trim()
@@ -72,16 +99,22 @@ export function createActivityFeedbackAIEventHandlers(
     },
 
     onSubagentFinish: async (payload) => {
-      if (!isActivityFeedbackEnabled(payload, 'active')) return;
-      await orchestrator.stopPhase(payload, 'thinking', 'subagent.finish');
-      await orchestrator.startPhase(payload, 'active', 'subagent.finish');
+      if (isActivityFeedbackEnabled(payload, 'thinking')) {
+        await orchestrator.stopPhase(payload, 'thinking', 'subagent.finish');
+      }
+      if (isActivityFeedbackEnabled(payload, 'active')) {
+        await orchestrator.stopPhase(payload, 'active', 'subagent.finish');
+      }
     },
 
     onScheduleStart: (payload) => orchestrator.startPhase(payload, 'schedule_start', 'schedule.start'),
-    onScheduleFinish: (payload) => orchestrator.stopPhase(payload, 'schedule_start', 'schedule.finish'),
+    onScheduleFinish: async (payload) => {
+      await orchestrator.stopPhase(payload, 'schedule_start', 'schedule.finish');
+      await orchestrator.showTransientPhase(payload, 'schedule_finish', 'schedule.finish');
+    },
     onScheduleError: async (payload) => {
       await orchestrator.stopPhase(payload, 'schedule_start', 'schedule.error');
-      await orchestrator.startPhase(payload, 'schedule_error', 'schedule.error');
+      await orchestrator.showTransientPhase(payload, 'schedule_error', 'schedule.error');
     },
   };
 }
@@ -92,11 +125,111 @@ export function createActivityFeedbackAIEventHandlers(
  */
 export function bindActivityFeedbackToAIEventBus(
   orchestrator: ActivityFeedbackOrchestrator,
-): () => void {
-  return subscribeAIEventsOnTarget(
+  admission: GenerationAdmissionGate,
+  runWithView: <T>(operation: () => Promise<T>) => Promise<T>,
+): () => Promise<void> {
+  let stopWatchingRetirement: (() => void) | undefined;
+  let cleanupNeedsGenerationView = false;
+  const watchRetirement = () => {
+    if (stopWatchingRetirement) return;
+    cleanupNeedsGenerationView = true;
+    stopWatchingRetirement = admission.onDeactivate(() => {
+      void close();
+    });
+  };
+  const serialized = createGenerationSerializedTarget(
     activityFeedbackAiBus,
+    admission,
+    runWithView,
+    watchRetirement,
+  );
+  const unsubscribe = subscribeAIEventsOnTarget(
+    serialized.target,
     createActivityFeedbackAIEventHandlers(orchestrator),
   );
+  let shutdown: Promise<void> | undefined;
+  function close(): Promise<void> {
+    if (shutdown) return shutdown;
+    const cleanup = async () => {
+      unsubscribe();
+      await serialized.close();
+      await orchestrator.dispose();
+    };
+    // Retirement is published before SnapshotStore changes its current pointer.
+    // Enter the IM view synchronously here so timers, native-typing keepalives,
+    // and final reaction/message cleanup all remain on this generation's Endpoint.
+    // A candidate rolled back before admitting any event has no generation-local
+    // feedback state, and its view is unavailable while Root is still idle.
+    shutdown = cleanupNeedsGenerationView ? runWithView(cleanup) : cleanup();
+    return shutdown;
+  }
+  return async () => {
+    stopWatchingRetirement?.();
+    await close();
+  };
+}
+
+/** Generation-local ordering: one queue per IM session, no module-level runtime state. */
+function createGenerationSerializedTarget(
+  source: AIEventTarget,
+  admission: GenerationAdmissionGate,
+  runWithView: <T>(operation: () => Promise<T>) => Promise<T>,
+  onAdmitted: () => void,
+): {
+  target: AIEventTarget;
+  close(): Promise<void>;
+} {
+  const tails = new Map<string, Promise<void>>();
+  const wrappers = new Map<(payload: AIEventPayload) => void | Promise<void>,
+    (payload: AIEventPayload) => Promise<void>>();
+  let closed = false;
+  const target: AIEventTarget = {
+    on(event, listener) {
+      const wrapped = async (payload: AIEventPayload) => {
+        const release = admission.acquire();
+        if (!release) return;
+        onAdmitted();
+        try {
+          await runWithView(async () => {
+            const key = payload.sessionId || '__global__';
+            const previous = tails.get(key);
+            const run = async () => {
+              if (!closed) await listener(payload);
+            };
+            const current = previous
+              ? previous.catch(() => undefined).then(run)
+              : run();
+            tails.set(key, current);
+            try {
+              await current;
+            } finally {
+              if (tails.get(key) === current) tails.delete(key);
+            }
+          });
+        } finally {
+          release();
+        }
+      };
+      wrappers.set(listener, wrapped);
+      return source.on(event, wrapped);
+    },
+    off(event, listener) {
+      const wrapped = wrappers.get(listener);
+      if (!wrapped) return source.off(event, listener);
+      wrappers.delete(listener);
+      return source.off(event, wrapped);
+    },
+  };
+  return {
+    target,
+    async close() {
+      closed = true;
+      const pending = [...tails.values()];
+      await Promise.allSettled(pending);
+      tails.clear();
+      wrappers.clear();
+    },
+  };
 }
 
 export type ActivityFeedbackLogger = {

package/src/config.ts

@@ -1,6 +1,6 @@
 import type { ActivityFeedbackConfig } from '@zhin.js/agent';
 
-/** 顶层 `activityFeedback` 配置（zhin.config.yml，与 endpoints 解耦） */
+/** Plugin Runtime 实例配置（`plugins.<instanceKey>`，与 Adapter endpoint 配置解耦）。 */
 export interface ActivityFeedbackServiceConfig {
   enabled?: boolean;
   defaults?: ActivityFeedbackConfig;