@xgjktech/xg_cwork_im 1.19.42 → 1.19.43
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 +492 -492
- package/dist/src/account-connection.d.ts +1 -1
- package/dist/src/account-connection.d.ts.map +1 -1
- package/dist/src/account-connection.js +25 -136
- package/dist/src/account-connection.js.map +1 -1
- package/dist/src/account-reconciler.d.ts +8 -17
- package/dist/src/account-reconciler.d.ts.map +1 -1
- package/dist/src/account-reconciler.js +11 -31
- package/dist/src/account-reconciler.js.map +1 -1
- package/dist/src/account-reconciler.test.js +1 -19
- package/dist/src/account-reconciler.test.js.map +1 -1
- package/dist/src/action-store-access.d.ts +0 -2
- package/dist/src/action-store-access.d.ts.map +1 -1
- package/dist/src/action-store-access.js +0 -7
- package/dist/src/action-store-access.js.map +1 -1
- package/dist/src/active-round-registry.d.ts +0 -6
- package/dist/src/active-round-registry.d.ts.map +1 -1
- package/dist/src/active-round-registry.js +2 -27
- package/dist/src/active-round-registry.js.map +1 -1
- package/dist/src/agent-stream-client-registry.d.ts +0 -2
- package/dist/src/agent-stream-client-registry.d.ts.map +1 -1
- package/dist/src/agent-stream-client-registry.js +1 -6
- package/dist/src/agent-stream-client-registry.js.map +1 -1
- package/dist/src/apply-sync-mapping.d.ts +1 -1
- package/dist/src/apply-sync-mapping.d.ts.map +1 -1
- package/dist/src/auth.d.ts +0 -2
- package/dist/src/auth.d.ts.map +1 -1
- package/dist/src/auth.js +0 -4
- package/dist/src/auth.js.map +1 -1
- package/dist/src/block-streaming-config.test.js +1 -7
- package/dist/src/block-streaming-config.test.js.map +1 -1
- package/dist/src/build-project-prompt.test.js +18 -18
- package/dist/src/channel-config.d.ts +17 -83
- package/dist/src/channel-config.d.ts.map +1 -1
- package/dist/src/channel-config.js +13 -46
- package/dist/src/channel-config.js.map +1 -1
- package/dist/src/channel-config.test.js +1 -58
- package/dist/src/channel-config.test.js.map +1 -1
- package/dist/src/channel.d.ts +3 -4
- package/dist/src/channel.d.ts.map +1 -1
- package/dist/src/channel.js +4 -127
- package/dist/src/channel.js.map +1 -1
- package/dist/src/connection.d.ts +0 -28
- package/dist/src/connection.d.ts.map +1 -1
- package/dist/src/connection.js +78 -155
- package/dist/src/connection.js.map +1 -1
- package/dist/src/deliver-text.test.js +22 -22
- package/dist/src/delivery/deliver-text.test.js +22 -22
- package/dist/src/delivery/turn-deliver-buffer.test.js +25 -25
- package/dist/src/dispatch-mentioned-reply.d.ts +2 -7
- package/dist/src/dispatch-mentioned-reply.d.ts.map +1 -1
- package/dist/src/dispatch-mentioned-reply.js +68 -243
- package/dist/src/dispatch-mentioned-reply.js.map +1 -1
- package/dist/src/gateway-session-queue.d.ts +6 -2
- package/dist/src/gateway-session-queue.d.ts.map +1 -1
- package/dist/src/gateway-session-queue.js +21 -78
- package/dist/src/gateway-session-queue.js.map +1 -1
- package/dist/src/group-history-tool.d.ts +1 -1
- package/dist/src/group-history-tool.d.ts.map +1 -1
- package/dist/src/inbound-display.d.ts.map +1 -1
- package/dist/src/inbound-display.js +1 -2
- package/dist/src/inbound-display.js.map +1 -1
- package/dist/src/inbound-input-media.d.ts +1 -1
- package/dist/src/inbound-input-media.d.ts.map +1 -1
- package/dist/src/inbound-media-local.d.ts +1 -1
- package/dist/src/inbound-media-local.d.ts.map +1 -1
- package/dist/src/inbound-model.d.ts +0 -9
- package/dist/src/inbound-model.d.ts.map +1 -1
- package/dist/src/inbound-model.js +0 -26
- package/dist/src/inbound-model.js.map +1 -1
- package/dist/src/inbound-model.test.js +1 -23
- package/dist/src/inbound-model.test.js.map +1 -1
- package/dist/src/inbound-terminal-state.d.ts +0 -2
- package/dist/src/inbound-terminal-state.d.ts.map +1 -1
- package/dist/src/inbound-terminal-state.js +2 -7
- package/dist/src/inbound-terminal-state.js.map +1 -1
- package/dist/src/modified-file-push-tracker.d.ts +24 -0
- package/dist/src/modified-file-push-tracker.d.ts.map +1 -0
- package/dist/src/modified-file-push-tracker.js +125 -0
- package/dist/src/modified-file-push-tracker.js.map +1 -0
- package/dist/src/nas-volumes.d.ts +2 -12
- package/dist/src/nas-volumes.d.ts.map +1 -1
- package/dist/src/nas-volumes.js +37 -147
- package/dist/src/nas-volumes.js.map +1 -1
- package/dist/src/nas-volumes.test.js +7 -39
- package/dist/src/nas-volumes.test.js.map +1 -1
- package/dist/src/per-message-model-pending.d.ts +3 -38
- package/dist/src/per-message-model-pending.d.ts.map +1 -1
- package/dist/src/per-message-model-pending.js +7 -96
- package/dist/src/per-message-model-pending.js.map +1 -1
- package/dist/src/plan/action-dispatch-event-compat.test.d.ts +2 -0
- package/dist/src/plan/action-dispatch-event-compat.test.d.ts.map +1 -0
- package/dist/src/plan/action-dispatch-event-compat.test.js +81 -0
- package/dist/src/plan/action-dispatch-event-compat.test.js.map +1 -0
- package/dist/src/plan/action-store-lifecycle.test.js +5 -5
- package/dist/src/plan/plan-core-db.test.js +9 -9
- package/dist/src/plan/plan-core-snapshot.test.js +9 -9
- package/dist/src/plan-event-subscription.d.ts +1 -1
- package/dist/src/plan-event-subscription.d.ts.map +1 -1
- package/dist/src/plan-stat-event.d.ts +15 -4
- package/dist/src/plan-stat-event.d.ts.map +1 -1
- package/dist/src/plan-stat-event.js +37 -4
- package/dist/src/plan-stat-event.js.map +1 -1
- package/dist/src/plan-stat-event.test.js +118 -1
- package/dist/src/plan-stat-event.test.js.map +1 -1
- package/dist/src/plan-store-access.d.ts +23 -0
- package/dist/src/plan-store-access.d.ts.map +1 -0
- package/dist/src/plan-store-access.js +96 -0
- package/dist/src/plan-store-access.js.map +1 -0
- package/dist/src/plan-store-access.test.d.ts +2 -0
- package/dist/src/plan-store-access.test.d.ts.map +1 -0
- package/dist/src/plan-store-access.test.js +207 -0
- package/dist/src/plan-store-access.test.js.map +1 -0
- package/dist/src/plan-tool-middleware.d.ts +11 -3
- package/dist/src/plan-tool-middleware.d.ts.map +1 -1
- package/dist/src/plan-tool-middleware.js +60 -11
- package/dist/src/plan-tool-middleware.js.map +1 -1
- package/dist/src/plan-tool-middleware.test.js +603 -83
- package/dist/src/plan-tool-middleware.test.js.map +1 -1
- package/dist/src/plan-ws-registry.d.ts +0 -4
- package/dist/src/plan-ws-registry.d.ts.map +1 -1
- package/dist/src/plan-ws-registry.js +0 -12
- package/dist/src/plan-ws-registry.js.map +1 -1
- package/dist/src/plan-ws-registry.test.js +1 -19
- package/dist/src/plan-ws-registry.test.js.map +1 -1
- package/dist/src/progress-display.d.ts +77 -0
- package/dist/src/progress-display.d.ts.map +1 -0
- package/dist/src/progress-display.js +420 -0
- package/dist/src/progress-display.js.map +1 -0
- package/dist/src/register-per-message-model-hook.d.ts +2 -10
- package/dist/src/register-per-message-model-hook.d.ts.map +1 -1
- package/dist/src/register-per-message-model-hook.js +6 -32
- package/dist/src/register-per-message-model-hook.js.map +1 -1
- package/dist/src/resolve-inbound-group-prompt.d.ts +1 -17
- package/dist/src/resolve-inbound-group-prompt.d.ts.map +1 -1
- package/dist/src/resolve-inbound-group-prompt.js +2 -16
- package/dist/src/resolve-inbound-group-prompt.js.map +1 -1
- package/dist/src/run-usage-session.d.ts +1 -4
- package/dist/src/run-usage-session.d.ts.map +1 -1
- package/dist/src/run-usage-session.js +1 -13
- package/dist/src/run-usage-session.js.map +1 -1
- package/dist/src/run-usage.d.ts +0 -15
- package/dist/src/run-usage.d.ts.map +1 -1
- package/dist/src/run-usage.js +4 -30
- package/dist/src/run-usage.js.map +1 -1
- package/dist/src/run-usage.test.js +11 -99
- package/dist/src/run-usage.test.js.map +1 -1
- package/dist/src/send-file-tool.d.ts +1 -1
- package/dist/src/send-file-tool.d.ts.map +1 -1
- package/dist/src/send-group-message-tool.d.ts +1 -1
- package/dist/src/send-group-message-tool.d.ts.map +1 -1
- package/dist/src/session/build-project-prompt.test.js +18 -18
- package/dist/src/session-im-context.d.ts +0 -2
- package/dist/src/session-im-context.d.ts.map +1 -1
- package/dist/src/session-im-context.js +2 -11
- package/dist/src/session-im-context.js.map +1 -1
- package/dist/src/subagent-delivery-phase.d.ts +10 -0
- package/dist/src/subagent-delivery-phase.d.ts.map +1 -0
- package/dist/src/subagent-delivery-phase.js +4 -0
- package/dist/src/subagent-delivery-phase.js.map +1 -0
- package/dist/src/subagent-delivery-phase.test.d.ts +2 -0
- package/dist/src/subagent-delivery-phase.test.d.ts.map +1 -0
- package/dist/src/subagent-delivery-phase.test.js +12 -0
- package/dist/src/subagent-delivery-phase.test.js.map +1 -0
- package/dist/src/subagent-monitor.d.ts +1 -14
- package/dist/src/subagent-monitor.d.ts.map +1 -1
- package/dist/src/subagent-monitor.js +36 -164
- package/dist/src/subagent-monitor.js.map +1 -1
- package/dist/src/subagent-monitor.test.js +0 -121
- package/dist/src/subagent-monitor.test.js.map +1 -1
- package/dist/src/tool-json-result.d.ts +1 -1
- package/dist/src/tool-json-result.d.ts.map +1 -1
- package/dist/src/turn/turn-agent-event-subscription.d.ts.map +1 -1
- package/dist/src/turn/turn-agent-event-subscription.js +14 -0
- package/dist/src/turn/turn-agent-event-subscription.js.map +1 -1
- package/dist/src/turn-deliver-buffer.test.js +25 -25
- package/dist/src/types.d.ts +1 -48
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/types.js.map +1 -1
- package/dist/src/workspace/nas-volumes.test.js +3 -2
- package/dist/src/workspace/nas-volumes.test.js.map +1 -1
- package/dist/src/ws-inbound-schema.d.ts.map +1 -1
- package/dist/src/ws-inbound-schema.js +0 -1
- package/dist/src/ws-inbound-schema.js.map +1 -1
- package/openclaw.plugin.json +30 -30
- package/package.json +83 -83
- package/dist/src/action-store-lifecycle.test.d.ts +0 -2
- package/dist/src/action-store-lifecycle.test.d.ts.map +0 -1
- package/dist/src/action-store-lifecycle.test.js +0 -195
- package/dist/src/action-store-lifecycle.test.js.map +0 -1
- package/dist/src/active-cron-context-store.d.ts +0 -20
- package/dist/src/active-cron-context-store.d.ts.map +0 -1
- package/dist/src/active-cron-context-store.js +0 -73
- package/dist/src/active-cron-context-store.js.map +0 -1
- package/dist/src/assistant-item-delivery.d.ts +0 -27
- package/dist/src/assistant-item-delivery.d.ts.map +0 -1
- package/dist/src/assistant-item-delivery.js +0 -134
- package/dist/src/assistant-item-delivery.js.map +0 -1
- package/dist/src/assistant-item-delivery.test.d.ts +0 -2
- package/dist/src/assistant-item-delivery.test.d.ts.map +0 -1
- package/dist/src/assistant-item-delivery.test.js +0 -116
- package/dist/src/assistant-item-delivery.test.js.map +0 -1
- package/dist/src/assistant-item-sink.d.ts +0 -17
- package/dist/src/assistant-item-sink.d.ts.map +0 -1
- package/dist/src/assistant-item-sink.js +0 -34
- package/dist/src/assistant-item-sink.js.map +0 -1
- package/dist/src/connection-workspace-event.test.d.ts +0 -2
- package/dist/src/connection-workspace-event.test.d.ts.map +0 -1
- package/dist/src/connection-workspace-event.test.js +0 -74
- package/dist/src/connection-workspace-event.test.js.map +0 -1
- package/dist/src/connection.test.d.ts +0 -2
- package/dist/src/connection.test.d.ts.map +0 -1
- package/dist/src/connection.test.js +0 -110
- package/dist/src/connection.test.js.map +0 -1
- package/dist/src/cron-appkey-binding-store.d.ts +0 -29
- package/dist/src/cron-appkey-binding-store.d.ts.map +0 -1
- package/dist/src/cron-appkey-binding-store.js +0 -239
- package/dist/src/cron-appkey-binding-store.js.map +0 -1
- package/dist/src/cron-appkey-binding-store.test.d.ts +0 -2
- package/dist/src/cron-appkey-binding-store.test.d.ts.map +0 -1
- package/dist/src/cron-appkey-binding-store.test.js +0 -387
- package/dist/src/cron-appkey-binding-store.test.js.map +0 -1
- package/dist/src/nas-site.d.ts +0 -16
- package/dist/src/nas-site.d.ts.map +0 -1
- package/dist/src/nas-site.js +0 -17
- package/dist/src/nas-site.js.map +0 -1
- package/dist/src/plan-core-adapter.d.ts +0 -54
- package/dist/src/plan-core-adapter.d.ts.map +0 -1
- package/dist/src/plan-core-adapter.js +0 -104
- package/dist/src/plan-core-adapter.js.map +0 -1
- package/dist/src/plan-core-adapter.test.d.ts +0 -2
- package/dist/src/plan-core-adapter.test.d.ts.map +0 -1
- package/dist/src/plan-core-adapter.test.js +0 -183
- package/dist/src/plan-core-adapter.test.js.map +0 -1
- package/dist/src/plan-core-db.d.ts +0 -22
- package/dist/src/plan-core-db.d.ts.map +0 -1
- package/dist/src/plan-core-db.js +0 -91
- package/dist/src/plan-core-db.js.map +0 -1
- package/dist/src/plan-core-db.test.d.ts +0 -2
- package/dist/src/plan-core-db.test.d.ts.map +0 -1
- package/dist/src/plan-core-db.test.js +0 -115
- package/dist/src/plan-core-db.test.js.map +0 -1
- package/dist/src/plan-core-snapshot.d.ts +0 -23
- package/dist/src/plan-core-snapshot.d.ts.map +0 -1
- package/dist/src/plan-core-snapshot.js +0 -66
- package/dist/src/plan-core-snapshot.js.map +0 -1
- package/dist/src/plan-core-snapshot.test.d.ts +0 -2
- package/dist/src/plan-core-snapshot.test.d.ts.map +0 -1
- package/dist/src/plan-core-snapshot.test.js +0 -157
- package/dist/src/plan-core-snapshot.test.js.map +0 -1
- package/dist/src/plugin-dispose.d.ts +0 -22
- package/dist/src/plugin-dispose.d.ts.map +0 -1
- package/dist/src/plugin-dispose.js +0 -66
- package/dist/src/plugin-dispose.js.map +0 -1
- package/dist/src/process-shared-store.d.ts +0 -48
- package/dist/src/process-shared-store.d.ts.map +0 -1
- package/dist/src/process-shared-store.js +0 -89
- package/dist/src/process-shared-store.js.map +0 -1
- package/dist/src/process-shared-store.test.d.ts +0 -2
- package/dist/src/process-shared-store.test.d.ts.map +0 -1
- package/dist/src/process-shared-store.test.js +0 -60
- package/dist/src/process-shared-store.test.js.map +0 -1
- package/dist/src/register-exec-env-hook.d.ts +0 -44
- package/dist/src/register-exec-env-hook.d.ts.map +0 -1
- package/dist/src/register-exec-env-hook.js +0 -473
- package/dist/src/register-exec-env-hook.js.map +0 -1
- package/dist/src/register-exec-env-hook.test.d.ts +0 -2
- package/dist/src/register-exec-env-hook.test.d.ts.map +0 -1
- package/dist/src/register-exec-env-hook.test.js +0 -189
- package/dist/src/register-exec-env-hook.test.js.map +0 -1
- package/dist/src/register-group-prompt-hook.d.ts +0 -17
- package/dist/src/register-group-prompt-hook.d.ts.map +0 -1
- package/dist/src/register-group-prompt-hook.js +0 -45
- package/dist/src/register-group-prompt-hook.js.map +0 -1
- package/dist/src/register-group-prompt-hook.test.d.ts +0 -2
- package/dist/src/register-group-prompt-hook.test.d.ts.map +0 -1
- package/dist/src/register-group-prompt-hook.test.js +0 -60
- package/dist/src/register-group-prompt-hook.test.js.map +0 -1
- package/dist/src/register-per-message-model-hook.test.d.ts +0 -2
- package/dist/src/register-per-message-model-hook.test.d.ts.map +0 -1
- package/dist/src/register-per-message-model-hook.test.js +0 -208
- package/dist/src/register-per-message-model-hook.test.js.map +0 -1
- package/dist/src/register-run-model-context-hook.d.ts +0 -11
- package/dist/src/register-run-model-context-hook.d.ts.map +0 -1
- package/dist/src/register-run-model-context-hook.js +0 -23
- package/dist/src/register-run-model-context-hook.js.map +0 -1
- package/dist/src/reply-dispatch-driver.d.ts +0 -89
- package/dist/src/reply-dispatch-driver.d.ts.map +0 -1
- package/dist/src/reply-dispatch-driver.js +0 -294
- package/dist/src/reply-dispatch-driver.js.map +0 -1
- package/dist/src/reply-dispatch-driver.test.d.ts +0 -2
- package/dist/src/reply-dispatch-driver.test.d.ts.map +0 -1
- package/dist/src/reply-dispatch-driver.test.js +0 -363
- package/dist/src/reply-dispatch-driver.test.js.map +0 -1
- package/dist/src/run-model-context.d.ts +0 -45
- package/dist/src/run-model-context.d.ts.map +0 -1
- package/dist/src/run-model-context.js +0 -108
- package/dist/src/run-model-context.js.map +0 -1
- package/dist/src/run-model-context.test.d.ts +0 -2
- package/dist/src/run-model-context.test.d.ts.map +0 -1
- package/dist/src/run-model-context.test.js +0 -68
- package/dist/src/run-model-context.test.js.map +0 -1
- package/dist/src/session-env-store.d.ts +0 -55
- package/dist/src/session-env-store.d.ts.map +0 -1
- package/dist/src/session-env-store.js +0 -328
- package/dist/src/session-env-store.js.map +0 -1
- package/dist/src/session-env-store.test.d.ts +0 -2
- package/dist/src/session-env-store.test.d.ts.map +0 -1
- package/dist/src/session-env-store.test.js +0 -151
- package/dist/src/session-env-store.test.js.map +0 -1
- package/dist/src/session-group-prompt.d.ts +0 -34
- package/dist/src/session-group-prompt.d.ts.map +0 -1
- package/dist/src/session-group-prompt.js +0 -101
- package/dist/src/session-group-prompt.js.map +0 -1
- package/dist/src/session-group-prompt.test.d.ts +0 -2
- package/dist/src/session-group-prompt.test.d.ts.map +0 -1
- package/dist/src/session-group-prompt.test.js +0 -72
- package/dist/src/session-group-prompt.test.js.map +0 -1
- package/dist/src/session-model-fallback.d.ts +0 -13
- package/dist/src/session-model-fallback.d.ts.map +0 -1
- package/dist/src/session-model-fallback.js +0 -24
- package/dist/src/session-model-fallback.js.map +0 -1
- package/dist/src/tool-event-adapter.d.ts +0 -31
- package/dist/src/tool-event-adapter.d.ts.map +0 -1
- package/dist/src/tool-event-adapter.js +0 -83
- package/dist/src/tool-event-adapter.js.map +0 -1
- package/dist/src/tool-event-adapter.test.d.ts +0 -2
- package/dist/src/tool-event-adapter.test.d.ts.map +0 -1
- package/dist/src/tool-event-adapter.test.js +0 -93
- package/dist/src/tool-event-adapter.test.js.map +0 -1
- package/dist/src/turn-agent-event-subscription.d.ts +0 -29
- package/dist/src/turn-agent-event-subscription.d.ts.map +0 -1
- package/dist/src/turn-agent-event-subscription.js +0 -289
- package/dist/src/turn-agent-event-subscription.js.map +0 -1
- package/dist/src/turn-agent-event-subscription.test.d.ts +0 -2
- package/dist/src/turn-agent-event-subscription.test.d.ts.map +0 -1
- package/dist/src/turn-agent-event-subscription.test.js +0 -165
- package/dist/src/turn-agent-event-subscription.test.js.map +0 -1
- package/dist/src/turn-end-controller.d.ts +0 -61
- package/dist/src/turn-end-controller.d.ts.map +0 -1
- package/dist/src/turn-end-controller.js +0 -239
- package/dist/src/turn-end-controller.js.map +0 -1
- package/dist/src/turn-end-controller.test.d.ts +0 -2
- package/dist/src/turn-end-controller.test.d.ts.map +0 -1
- package/dist/src/turn-end-controller.test.js +0 -97
- package/dist/src/turn-end-controller.test.js.map +0 -1
- package/dist/src/workspace-event-protocol.d.ts +0 -3
- package/dist/src/workspace-event-protocol.d.ts.map +0 -1
- package/dist/src/workspace-event-protocol.js +0 -3
- package/dist/src/workspace-event-protocol.js.map +0 -1
- package/dist/src/workspace-event-scheduler.d.ts +0 -54
- package/dist/src/workspace-event-scheduler.d.ts.map +0 -1
- package/dist/src/workspace-event-scheduler.js +0 -131
- package/dist/src/workspace-event-scheduler.js.map +0 -1
- package/dist/src/workspace-event-scheduler.test.d.ts +0 -2
- package/dist/src/workspace-event-scheduler.test.d.ts.map +0 -1
- package/dist/src/workspace-event-scheduler.test.js +0 -157
- package/dist/src/workspace-event-scheduler.test.js.map +0 -1
- package/dist/src/workspace-event.d.ts +0 -28
- package/dist/src/workspace-event.d.ts.map +0 -1
- package/dist/src/workspace-event.js +0 -674
- package/dist/src/workspace-event.js.map +0 -1
- package/dist/src/workspace-event.test.d.ts +0 -2
- package/dist/src/workspace-event.test.d.ts.map +0 -1
- package/dist/src/workspace-event.test.js +0 -265
- package/dist/src/workspace-event.test.js.map +0 -1
- package/dist/src/ws-inbound-schema.test.d.ts +0 -2
- package/dist/src/ws-inbound-schema.test.d.ts.map +0 -1
- package/dist/src/ws-inbound-schema.test.js +0 -58
- package/dist/src/ws-inbound-schema.test.js.map +0 -1
|
@@ -1,112 +1,25 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { turnOnAllChildrenDone } from "./turn-end-controller.js";
|
|
1
|
+
import { completeActiveRound } from "./active-round-registry.js";
|
|
3
2
|
/** 模块实例 ID:用于确认插件是否被重复加载(若日志出现两个不同 id,则存在双实例,spawn/end 可能被不同实例处理)。 */
|
|
4
3
|
const MODULE_INSTANCE_ID = `m${Date.now().toString(36)}${Math.random().toString(36).slice(2, 8)}`;
|
|
5
|
-
console.log(`[subagent-monitor] module loaded instance=${MODULE_INSTANCE_ID}
|
|
6
|
-
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
const
|
|
10
|
-
const roundAdmissionTombstones = getSharedMap("subagent-round-admission-tombstones");
|
|
4
|
+
console.log(`[subagent-monitor] module loaded instance=${MODULE_INSTANCE_ID}`);
|
|
5
|
+
const childToRound = new Map();
|
|
6
|
+
const roundMonitors = new Map();
|
|
7
|
+
const deferredFinished = new Map();
|
|
8
|
+
const roundAdmissionTombstones = new Map();
|
|
11
9
|
/** 记录被 `/stop` 中断的 subagent run(按 childSessionKey 索引,存被中断 runId 与过期时间)。 */
|
|
12
|
-
const childTombstones =
|
|
10
|
+
const childTombstones = new Map();
|
|
13
11
|
const POLL_INTERVAL_MS = 15_000;
|
|
14
|
-
/**
|
|
15
|
-
* apiCandidates 保留上限:OpenClaw 会对同一模块反复重注册(多代 registry 并存且从不触发
|
|
16
|
-
* cleanup,见日志 `registerSeq` 递增而 `cleanup` 为 0)。每代 register 都会 push 一个新 api 进
|
|
17
|
-
* 进程级 candidates,若不停老代则数组无限增长、引用无法回收。该数组仅作为「当前 runtime 探测
|
|
18
|
-
* 不可用时的回退池」(resolveUsablePluginApi),而单进程内 register 是按时间顺序的短爆发(通常
|
|
19
|
-
* 2~4 次),功能上只需最近几代即可,故截断更早的候选。
|
|
20
|
-
*/
|
|
21
|
-
const MAX_API_CANDIDATES = 4;
|
|
22
12
|
const ROUND_TOMBSTONE_TTL_MS = 30_000;
|
|
23
13
|
const CHILD_TOMBSTONE_TTL_MS = 5 * 60_000;
|
|
24
14
|
const MAX_INCR_MSGS = 5;
|
|
25
15
|
const MSG_TRUNCATE_LEN = 40;
|
|
26
16
|
/** 单次 tick 用 openclaw `agent.wait` 对账 subagent run 状态的探测超时。 */
|
|
27
17
|
const RUN_STATUS_PROBE_TIMEOUT_MS = 1_000;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
apiCandidates: [],
|
|
31
|
-
apiProbe: "unverified",
|
|
32
|
-
ticker: null,
|
|
33
|
-
}));
|
|
18
|
+
let tickerTimer = null;
|
|
19
|
+
let pluginApi = null;
|
|
34
20
|
export function setPluginApi(api) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
m.apiCandidates.push(api);
|
|
38
|
-
if (m.apiCandidates.length > MAX_API_CANDIDATES) {
|
|
39
|
-
m.apiCandidates.splice(0, m.apiCandidates.length - MAX_API_CANDIDATES);
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
if (m.api === null) {
|
|
43
|
-
m.api = api;
|
|
44
|
-
m.apiProbe = "unverified";
|
|
45
|
-
console.log(`[subagent-monitor] setPluginApi instance=${MODULE_INSTANCE_ID} adopt=first`);
|
|
46
|
-
return;
|
|
47
|
-
}
|
|
48
|
-
if (m.apiProbe === "good") {
|
|
49
|
-
// 已有确认可用的 runtime:拒绝未验证的新 runtime 覆盖,防止无绑定 registry 劫持监控。
|
|
50
|
-
if (isNewCandidate) {
|
|
51
|
-
console.warn(`[subagent-monitor] setPluginApi instance=${MODULE_INSTANCE_ID} keep=verified ` +
|
|
52
|
-
`candidates=${m.apiCandidates.length}`);
|
|
53
|
-
}
|
|
54
|
-
return;
|
|
55
|
-
}
|
|
56
|
-
if (m.apiProbe === "unverified") {
|
|
57
|
-
// 当前尚未探测:不切换,等首次 tick 探测出结果再决定。
|
|
58
|
-
console.log(`[subagent-monitor] setPluginApi instance=${MODULE_INSTANCE_ID} keep=unverified ` +
|
|
59
|
-
`candidates=${m.apiCandidates.length}`);
|
|
60
|
-
return;
|
|
61
|
-
}
|
|
62
|
-
// 当前已确认为不可用:采纳新候选重新探测。
|
|
63
|
-
m.api = api;
|
|
64
|
-
m.apiProbe = "unverified";
|
|
65
|
-
console.log(`[subagent-monitor] setPluginApi instance=${MODULE_INSTANCE_ID} adopt=switch candidates=${m.apiCandidates.length}`);
|
|
66
|
-
}
|
|
67
|
-
function isRequestScopedSubagentError(err) {
|
|
68
|
-
return err instanceof Error && err.name === "RequestScopedSubagentRuntimeError";
|
|
69
|
-
}
|
|
70
|
-
/**
|
|
71
|
-
* 探测某个 plugin api 的 runtime.subagent 是否可用。
|
|
72
|
-
* RequestScopedSubagentRuntimeError = 绑定不可用(无绑定 registry / 非 gateway 上下文);
|
|
73
|
-
* 其它结果(如 runId 不存在返回 error/timeout)说明绑定存在、dispatch 通了,视为可用。
|
|
74
|
-
*/
|
|
75
|
-
async function probeApiUsable(api) {
|
|
76
|
-
try {
|
|
77
|
-
await api.runtime.subagent.waitForRun({ runId: "probe", timeoutMs: 1 });
|
|
78
|
-
return true;
|
|
79
|
-
}
|
|
80
|
-
catch (err) {
|
|
81
|
-
return !isRequestScopedSubagentError(err);
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
/**
|
|
85
|
-
* 确认当前 m.api 可用;若不可用,尝试从候选里切回可用的 runtime。
|
|
86
|
-
* 返回最终使用的 m.api(所有候选都不可用时仍返回当前,由事件路径兜底)。
|
|
87
|
-
*/
|
|
88
|
-
async function resolveUsablePluginApi() {
|
|
89
|
-
if (!m.api)
|
|
90
|
-
return null;
|
|
91
|
-
if (m.apiProbe === "good")
|
|
92
|
-
return m.api;
|
|
93
|
-
if (await probeApiUsable(m.api)) {
|
|
94
|
-
m.apiProbe = "good";
|
|
95
|
-
return m.api;
|
|
96
|
-
}
|
|
97
|
-
for (const candidate of m.apiCandidates) {
|
|
98
|
-
if (candidate === m.api)
|
|
99
|
-
continue;
|
|
100
|
-
if (await probeApiUsable(candidate)) {
|
|
101
|
-
console.warn(`[subagent-monitor] m.api switch instance=${MODULE_INSTANCE_ID} ` +
|
|
102
|
-
`candidates=${m.apiCandidates.length}`);
|
|
103
|
-
m.api = candidate;
|
|
104
|
-
m.apiProbe = "good";
|
|
105
|
-
return m.api;
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
m.apiProbe = "bad";
|
|
109
|
-
return m.api;
|
|
21
|
+
pluginApi = api;
|
|
22
|
+
console.log(`[subagent-monitor] setPluginApi instance=${MODULE_INSTANCE_ID}`);
|
|
110
23
|
}
|
|
111
24
|
export function getSubagentMonitorInstanceId() {
|
|
112
25
|
return MODULE_INSTANCE_ID;
|
|
@@ -122,9 +35,9 @@ function pruneTombstones(now = Date.now()) {
|
|
|
122
35
|
}
|
|
123
36
|
}
|
|
124
37
|
function stopTickerIfIdle() {
|
|
125
|
-
if (roundMonitors.size === 0 &&
|
|
126
|
-
clearInterval(
|
|
127
|
-
|
|
38
|
+
if (roundMonitors.size === 0 && tickerTimer) {
|
|
39
|
+
clearInterval(tickerTimer);
|
|
40
|
+
tickerTimer = null;
|
|
128
41
|
}
|
|
129
42
|
}
|
|
130
43
|
function removeMonitor(monitor, reason) {
|
|
@@ -197,10 +110,6 @@ export function hasActiveSubagents(roundKey, generation) {
|
|
|
197
110
|
monitor.generation === generation &&
|
|
198
111
|
Array.from(monitor.subagents.values()).some((record) => !record.completed));
|
|
199
112
|
}
|
|
200
|
-
/** 子任务结束事件定位其所属轮次(供 turn-end-controller 递减活跃子任务数)。 */
|
|
201
|
-
export function findChildRoundIndex(childSessionKey) {
|
|
202
|
-
return childToRound.get(childSessionKey);
|
|
203
|
-
}
|
|
204
113
|
export function deferFinished(roundKey, generation, reason) {
|
|
205
114
|
deferredFinished.set(roundKey, { reason, generation });
|
|
206
115
|
}
|
|
@@ -274,46 +183,33 @@ async function settleMonitorIfComplete(monitor) {
|
|
|
274
183
|
return;
|
|
275
184
|
if (!Array.from(monitor.subagents.values()).every((record) => record.completed))
|
|
276
185
|
return;
|
|
277
|
-
const
|
|
278
|
-
|
|
279
|
-
return;
|
|
280
|
-
// 整轮收尾(WS FINISHED + RUN_USAGE + completeActiveRound)改由 turn-end-controller 在
|
|
281
|
-
// 主会话出现非 yield 段终态(或静默兜底)后,由 dispatch wrapper 统一执行;
|
|
282
|
-
// 这里只负责推送 SUBAGENT_STAT 快照,绝不自行 end/remove/complete ——
|
|
283
|
-
// OpenClaw 7.1+/8.x 中「所有已知子任务完成」不代表整轮结束(主会话可能 resume
|
|
284
|
-
// 继续派发新一批子任务),因此本快照允许多波次多次推送,仅对完全相同的状态去重。
|
|
186
|
+
const deferred = deferredFinished.get(monitor.roundKey);
|
|
187
|
+
const shouldCompleteRound = deferred?.generation === monitor.generation;
|
|
285
188
|
try {
|
|
286
189
|
await sendFinalStat(monitor, monitor.streamClient);
|
|
287
|
-
|
|
288
|
-
|
|
190
|
+
if (shouldCompleteRound && deferred) {
|
|
191
|
+
await monitor.streamClient.end(deferred.reason, {
|
|
192
|
+
groupId: monitor.groupId,
|
|
193
|
+
replyToMsgId: monitor.replyToMsgId,
|
|
194
|
+
});
|
|
289
195
|
}
|
|
290
|
-
monitor.lastPushedSignature = signature;
|
|
291
|
-
console.log(`[subagent-monitor] final SUBAGENT_STAT sent (settle) roundKey=${monitor.roundKey} gen=${monitor.generation} ` +
|
|
292
|
-
`subagents=${Array.from(monitor.subagents.values()).length} — waiting turn-end for FINISHED`);
|
|
293
196
|
}
|
|
294
197
|
catch (err) {
|
|
295
198
|
console.error(`[subagent-monitor] final state send failed: ${String(err)}`);
|
|
296
199
|
}
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
* 与 removeMonitor 的 settle 路径不同:此处轮次真正结束,直接拆监控与子任务索引。
|
|
302
|
-
*/
|
|
303
|
-
export function finalizeRoundMonitoring(roundKey, generation) {
|
|
304
|
-
const monitor = roundMonitors.get(roundKey);
|
|
305
|
-
if (!monitor || monitor.generation !== generation)
|
|
306
|
-
return;
|
|
307
|
-
removeMonitor(monitor, "round-finished");
|
|
200
|
+
removeMonitor(monitor, "settle");
|
|
201
|
+
if (shouldCompleteRound) {
|
|
202
|
+
completeActiveRound(monitor.roundKey, monitor.generation);
|
|
203
|
+
}
|
|
308
204
|
}
|
|
309
205
|
async function readSubagentMessages(record) {
|
|
310
|
-
if (!
|
|
206
|
+
if (!pluginApi || record.reading)
|
|
311
207
|
return;
|
|
312
208
|
record.reading = true;
|
|
313
209
|
try {
|
|
314
210
|
let messages = [];
|
|
315
211
|
try {
|
|
316
|
-
const result = await
|
|
212
|
+
const result = await pluginApi.runtime.subagent.getSessionMessages({
|
|
317
213
|
sessionKey: record.childSessionKey,
|
|
318
214
|
});
|
|
319
215
|
messages = Array.isArray(result.messages) ? result.messages : [];
|
|
@@ -336,10 +232,10 @@ async function readSubagentMessages(record) {
|
|
|
336
232
|
* 探测失败(如 runId 已不存在、状态码异常)保守按「仍在运行」处理,交给事件路径兜底。
|
|
337
233
|
*/
|
|
338
234
|
async function probeRunStatus(record) {
|
|
339
|
-
if (!
|
|
235
|
+
if (!pluginApi)
|
|
340
236
|
return false;
|
|
341
237
|
try {
|
|
342
|
-
const result = await
|
|
238
|
+
const result = await pluginApi.runtime.subagent.waitForRun({
|
|
343
239
|
runId: record.runId,
|
|
344
240
|
timeoutMs: RUN_STATUS_PROBE_TIMEOUT_MS,
|
|
345
241
|
});
|
|
@@ -351,19 +247,17 @@ async function probeRunStatus(record) {
|
|
|
351
247
|
}
|
|
352
248
|
}
|
|
353
249
|
function ensureTickerRunning() {
|
|
354
|
-
if (
|
|
250
|
+
if (tickerTimer)
|
|
355
251
|
return;
|
|
356
252
|
void tick();
|
|
357
|
-
|
|
358
|
-
|
|
253
|
+
tickerTimer = setInterval(() => void tick(), POLL_INTERVAL_MS);
|
|
254
|
+
tickerTimer.unref?.();
|
|
359
255
|
}
|
|
360
256
|
async function tick() {
|
|
361
257
|
if (roundMonitors.size === 0) {
|
|
362
258
|
stopTickerIfIdle();
|
|
363
259
|
return;
|
|
364
260
|
}
|
|
365
|
-
// 确保使用可用的 runtime:探测并必要时切回候选中的可用 api,避免坏 runtime 继续抛 RequestScoped。
|
|
366
|
-
await resolveUsablePluginApi();
|
|
367
261
|
for (const monitor of Array.from(roundMonitors.values())) {
|
|
368
262
|
try {
|
|
369
263
|
const runningRecords = Array.from(monitor.subagents.values()).filter((record) => !record.completed);
|
|
@@ -431,22 +325,7 @@ function toSubagentList(monitor, incremental) {
|
|
|
431
325
|
: record.messages,
|
|
432
326
|
}));
|
|
433
327
|
}
|
|
434
|
-
/**
|
|
435
|
-
* 客户端可见状态的稳定签名:新增子任务、状态翻转(running→completed)或消息数变化都会改变。
|
|
436
|
-
* 仅凭它做「无变化不重复推送」的去重;同一轮多波次派发不会被锁死。
|
|
437
|
-
*/
|
|
438
|
-
function statSignature(monitor) {
|
|
439
|
-
return Array.from(monitor.subagents.values())
|
|
440
|
-
.map((r) => `${r.runId}:${r.completed ? "completed" : "running"}:${r.messages.length}`)
|
|
441
|
-
.join("|");
|
|
442
|
-
}
|
|
443
328
|
function sendWsStat(monitor, client) {
|
|
444
|
-
const signature = statSignature(monitor);
|
|
445
|
-
// 有 running 子任务时保持逐 tick 推送(running/新增消息语义不变);
|
|
446
|
-
// 全部已完成且状态无变化(等 turn-end 的空窗)则去重,避免 tick 刷同一份完成快照。
|
|
447
|
-
const hasRunning = Array.from(monitor.subagents.values()).some((r) => !r.completed);
|
|
448
|
-
if (!hasRunning && signature === monitor.lastPushedSignature)
|
|
449
|
-
return;
|
|
450
329
|
const subagentList = toSubagentList(monitor, true);
|
|
451
330
|
client
|
|
452
331
|
.sendEvent({
|
|
@@ -461,7 +340,6 @@ function sendWsStat(monitor, client) {
|
|
|
461
340
|
if (record)
|
|
462
341
|
record.sendFrom += item.messages.length;
|
|
463
342
|
});
|
|
464
|
-
monitor.lastPushedSignature = signature;
|
|
465
343
|
})
|
|
466
344
|
.catch((err) => {
|
|
467
345
|
console.error(`[subagent-monitor] SUBAGENT_STAT failed: ${String(err)}`);
|
|
@@ -479,16 +357,10 @@ export function __tickForTests() {
|
|
|
479
357
|
return tick();
|
|
480
358
|
}
|
|
481
359
|
export function __resetSubagentMonitorForTests() {
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
if (m.ticker)
|
|
487
|
-
clearInterval(m.ticker);
|
|
488
|
-
m.ticker = null;
|
|
489
|
-
m.api = null;
|
|
490
|
-
m.apiProbe = "unverified";
|
|
491
|
-
m.apiCandidates.length = 0;
|
|
360
|
+
if (tickerTimer)
|
|
361
|
+
clearInterval(tickerTimer);
|
|
362
|
+
tickerTimer = null;
|
|
363
|
+
pluginApi = null;
|
|
492
364
|
childToRound.clear();
|
|
493
365
|
roundMonitors.clear();
|
|
494
366
|
deferredFinished.clear();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-monitor.js","sourceRoot":"","sources":["../../src/subagent-monitor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"subagent-monitor.js","sourceRoot":"","sources":["../../src/subagent-monitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -211,125 +211,4 @@ describe("subagent-monitor tick reconciliation", () => {
|
|
|
211
211
|
assert.equal(hasActiveSubagents(round.roundKey, round.generation), true);
|
|
212
212
|
});
|
|
213
213
|
});
|
|
214
|
-
function requestScopedError() {
|
|
215
|
-
const err = new Error("Plugin runtime subagent methods are only available during a gateway request.");
|
|
216
|
-
err.name = "RequestScopedSubagentRuntimeError";
|
|
217
|
-
return err;
|
|
218
|
-
}
|
|
219
|
-
describe("subagent-monitor pluginApi guard(方案B:坏 runtime 不劫持监控)", () => {
|
|
220
|
-
it("好 runtime 确认可用后,坏 runtime 的 register 不会覆盖(监控继续用好的)", async () => {
|
|
221
|
-
const events = [];
|
|
222
|
-
const { round, client } = setupRound(events);
|
|
223
|
-
// 好 runtime:probe 探测用 runId="probe" 返回 timeout(可用),真实 run 返回 ok(完成)。
|
|
224
|
-
const good = createPluginApi({
|
|
225
|
-
waitForRun: async ({ runId }) => runId === "probe" ? { status: "timeout" } : { status: "ok" },
|
|
226
|
-
});
|
|
227
|
-
setPluginApi(good);
|
|
228
|
-
startMonitor(spawnParams(round, client, "child-1", "run-1"));
|
|
229
|
-
events.length = 0;
|
|
230
|
-
await __tickForTests();
|
|
231
|
-
// 首次 tick 探测确认 good,run-1 被完成
|
|
232
|
-
assert.ok(events.some((e) => e === "SUBAGENT_STAT:run-1:completed"));
|
|
233
|
-
assert.equal(hasActiveSubagents(round.roundKey, round.generation), false);
|
|
234
|
-
// 坏 runtime 注册:waitForRun 直接抛 RequestScoped
|
|
235
|
-
const bad = createPluginApi({
|
|
236
|
-
waitForRun: async () => {
|
|
237
|
-
throw requestScopedError();
|
|
238
|
-
},
|
|
239
|
-
});
|
|
240
|
-
setPluginApi(bad);
|
|
241
|
-
// 新会话的 run-2:tick 仍应通过 good runtime 完成,坏 runtime 未劫持
|
|
242
|
-
const round2 = registerActiveRound({
|
|
243
|
-
accountId: "account-a",
|
|
244
|
-
groupId: "group-2",
|
|
245
|
-
agentId: "main",
|
|
246
|
-
sessionKey: "session-1",
|
|
247
|
-
replyToMsgId: "reply-1",
|
|
248
|
-
streamClient: client,
|
|
249
|
-
});
|
|
250
|
-
startMonitor(spawnParams(round2, client, "child-2", "run-2"));
|
|
251
|
-
events.length = 0;
|
|
252
|
-
await __tickForTests();
|
|
253
|
-
assert.ok(events.some((e) => e === "SUBAGENT_STAT:run-2:completed"));
|
|
254
|
-
assert.equal(hasActiveSubagents(round2.roundKey, round2.generation), false);
|
|
255
|
-
});
|
|
256
|
-
it("首个 runtime 不可用 → 探测后切回候选中的可用 runtime", async () => {
|
|
257
|
-
const events = [];
|
|
258
|
-
const { round, client } = setupRound(events);
|
|
259
|
-
const bad = createPluginApi({
|
|
260
|
-
waitForRun: async () => {
|
|
261
|
-
throw requestScopedError();
|
|
262
|
-
},
|
|
263
|
-
});
|
|
264
|
-
setPluginApi(bad);
|
|
265
|
-
startMonitor(spawnParams(round, client, "child-1", "run-1"));
|
|
266
|
-
events.length = 0;
|
|
267
|
-
await __tickForTests();
|
|
268
|
-
// 只有坏 runtime:探测失败,run 保持 running
|
|
269
|
-
assert.equal(hasActiveSubagents(round.roundKey, round.generation), true);
|
|
270
|
-
// 好 runtime 随后注册(当前已确认 bad → adopt=switch)
|
|
271
|
-
const good = createPluginApi({ waitForRun: async () => ({ status: "ok" }) });
|
|
272
|
-
setPluginApi(good);
|
|
273
|
-
events.length = 0;
|
|
274
|
-
await __tickForTests();
|
|
275
|
-
assert.ok(events.some((e) => e === "SUBAGENT_STAT:run-1:completed"));
|
|
276
|
-
assert.equal(hasActiveSubagents(round.roundKey, round.generation), false);
|
|
277
|
-
});
|
|
278
|
-
it("探测结果缓存:确认 good 后不再重复探测", async () => {
|
|
279
|
-
const events = [];
|
|
280
|
-
const { round, client } = setupRound(events);
|
|
281
|
-
let probeCalls = 0;
|
|
282
|
-
setPluginApi(createPluginApi({
|
|
283
|
-
waitForRun: async ({ runId }) => {
|
|
284
|
-
if (runId === "probe")
|
|
285
|
-
probeCalls += 1;
|
|
286
|
-
return { status: "timeout" };
|
|
287
|
-
},
|
|
288
|
-
}));
|
|
289
|
-
startMonitor(spawnParams(round, client, "child-1", "run-1"));
|
|
290
|
-
// 等 startMonitor 触发的 fire-and-forget tick 完成:它应探测一次并确认 good。
|
|
291
|
-
await new Promise((resolve) => setTimeout(resolve, 20));
|
|
292
|
-
assert.equal(probeCalls, 1);
|
|
293
|
-
await __tickForTests();
|
|
294
|
-
await __tickForTests();
|
|
295
|
-
assert.equal(probeCalls, 1);
|
|
296
|
-
});
|
|
297
|
-
});
|
|
298
|
-
describe("subagent-monitor 同一轮多波次(finalStatSent 锁存已去除)", () => {
|
|
299
|
-
it("第一波完成后同轮第二波子任务完成仍能推送 completed SUBAGENT_STAT", async () => {
|
|
300
|
-
const events = [];
|
|
301
|
-
const { round, client } = setupRound(events);
|
|
302
|
-
startMonitor(spawnParams(round, client, "child-1", "run-1"));
|
|
303
|
-
await settle();
|
|
304
|
-
events.length = 0;
|
|
305
|
-
markSubagentCompleted("child-1", "run-1");
|
|
306
|
-
await settle();
|
|
307
|
-
assert.ok(events.some((e) => e === "SUBAGENT_STAT:run-1:completed"), "第一波 final 缺失");
|
|
308
|
-
// 同 round、同 generation 再派第二波
|
|
309
|
-
startMonitor(spawnParams(round, client, "child-2", "run-2"));
|
|
310
|
-
await settle();
|
|
311
|
-
events.length = 0;
|
|
312
|
-
markSubagentCompleted("child-2", "run-2");
|
|
313
|
-
await settle();
|
|
314
|
-
assert.ok(events.some((e) => e.startsWith("SUBAGENT_STAT:") && e.includes("run-2:completed")), "第二波被一轮一次锁存吞掉(应能推送 completed)");
|
|
315
|
-
assert.equal(hasActiveSubagents(round.roundKey, round.generation), false);
|
|
316
|
-
});
|
|
317
|
-
it("全部完成后的空窗:无变化的 tick 不重复推 final 快照", async () => {
|
|
318
|
-
const events = [];
|
|
319
|
-
const { round, client } = setupRound(events);
|
|
320
|
-
setPluginApi(createPluginApi({
|
|
321
|
-
waitForRun: async () => ({ status: "ok" }),
|
|
322
|
-
}));
|
|
323
|
-
startMonitor(spawnParams(round, client, "child-1", "run-1"));
|
|
324
|
-
await settle();
|
|
325
|
-
// 首个 tick:探测 ok → 完成并 settle
|
|
326
|
-
await __tickForTests();
|
|
327
|
-
await __tickForTests();
|
|
328
|
-
events.length = 0;
|
|
329
|
-
// 空窗期反复 tick:状态无变化,不应再推(去重)
|
|
330
|
-
await __tickForTests();
|
|
331
|
-
await __tickForTests();
|
|
332
|
-
assert.equal(events.length, 0, "无变化 tick 不应重复推送 SUBAGENT_STAT");
|
|
333
|
-
});
|
|
334
|
-
});
|
|
335
214
|
//# sourceMappingURL=subagent-monitor.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-monitor.test.js","sourceRoot":"","sources":["../../src/subagent-monitor.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"subagent-monitor.test.js","sourceRoot":"","sources":["../../src/subagent-monitor.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AnyAgentTool } from "openclaw/plugin-sdk
|
|
1
|
+
import type { AnyAgentTool } from "openclaw/plugin-sdk";
|
|
2
2
|
type ToolExecuteReturn = Awaited<ReturnType<NonNullable<AnyAgentTool["execute"]>>>;
|
|
3
3
|
/**
|
|
4
4
|
* 与 `openclaw/plugin-sdk` 的 `jsonResult` 返回结构一致(AgentToolResult),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-json-result.d.ts","sourceRoot":"","sources":["../../src/tool-json-result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"tool-json-result.d.ts","sourceRoot":"","sources":["../../src/tool-json-result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,KAAK,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AAEnF;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,iBAAiB,CAUlE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn-agent-event-subscription.d.ts","sourceRoot":"","sources":["../../../src/turn/turn-agent-event-subscription.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"turn-agent-event-subscription.d.ts","sourceRoot":"","sources":["../../../src/turn/turn-agent-event-subscription.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AA+HnF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAKxE;AAED,wBAAgB,2BAA2B,IAAI,UAAU,CACrD,iBAAiB,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,gCAAgC,CAAC,CACzE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAwRb;AAED,qBAAqB;AACrB,wBAAgB,sBAAsB,IAAI,IAAI,CAQ7C;AAED,wBAAgB,kCAAkC,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAQ/E"}
|
|
@@ -23,8 +23,12 @@ import { getSharedMap } from "../plugin/process-shared-store.js";
|
|
|
23
23
|
import { handleCorePlanUpdate } from "../plan/plan-core-adapter.js";
|
|
24
24
|
import { readCoreProgressCard } from "../plan/plan-core-db.js";
|
|
25
25
|
import { buildToolEventData } from "../plan/tool-event-adapter.js";
|
|
26
|
+
import { createPlanToolResultMiddleware } from "../plan/plan-tool-middleware.js";
|
|
27
|
+
import { getActionById } from "../plan/action-store-access.js";
|
|
28
|
+
import { sendActionRunEvent } from "../plan/action-run-event.js";
|
|
26
29
|
import { turnOnActivity, turnOnSegmentEnd, turnOnSegmentStart, } from "./turn-end-controller.js";
|
|
27
30
|
const LOG_PREFIX = "[xg_cwork_im] [turn-agent-events]";
|
|
31
|
+
const handleNestedActionResult = createPlanToolResultMiddleware({ getActionById, sendActionRunEvent });
|
|
28
32
|
const runIdToSessionKey = getSharedMap("turn-runid-to-session");
|
|
29
33
|
const wrappedRunIdBySession = getSharedMap("turn-wrapped-runid");
|
|
30
34
|
const lastThinkingByRound = getSharedMap("turn-thinking-last");
|
|
@@ -144,6 +148,16 @@ export function createTurnAgentEventHandler() {
|
|
|
144
148
|
// 注意:这里不要求 sessionKey 命中 group 前缀,只以“能定位到活跃轮次”为准,
|
|
145
149
|
// 避免不同会话命名导致工具事件被误丢。
|
|
146
150
|
if (stream === "tool") {
|
|
151
|
+
// OpenClaw 9.9 的 tool_call 内层绕过结果中间件;仅补这类调用,直调仍走原入口。
|
|
152
|
+
if (event.data?.phase === "result" && event.data.name === "xg_action_dispatch" &&
|
|
153
|
+
typeof event.data.toolCallId === "string" && event.data.toolCallId.startsWith("tool_call:")) {
|
|
154
|
+
handleNestedActionResult({
|
|
155
|
+
toolName: event.data.name,
|
|
156
|
+
toolCallId: event.data.toolCallId,
|
|
157
|
+
args: {},
|
|
158
|
+
result: event.data.result,
|
|
159
|
+
}, { runtime: "openclaw" });
|
|
160
|
+
}
|
|
147
161
|
const sessionKey = event.sessionKey ?? runIdToSessionKey.get(runId);
|
|
148
162
|
if (!sessionKey)
|
|
149
163
|
return;
|