@zhushanwen/subagent-core 0.5.1 → 0.7.0
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 +1 -1
- package/dist/chunk-KXVBIVOU.js +16 -0
- package/dist/chunk-T2SYBW3I.js +24 -0
- package/dist/chunk-VURUAGMM.js +2305 -0
- package/dist/{types-Dv4QhSJ_.d.cts → engine-discovery-scan-ocpM8FmI.d.cts} +835 -668
- package/dist/{types-Dv4QhSJ_.d.ts → engine-discovery-scan-ocpM8FmI.d.ts} +835 -668
- package/dist/execution/engine/engine-discovery-scan.cjs +2210 -0
- package/dist/execution/engine/engine-discovery-scan.d.cts +4 -0
- package/dist/execution/engine/engine-discovery-scan.d.ts +4 -0
- package/dist/execution/engine/engine-discovery-scan.js +20 -0
- package/dist/execution/engine/paths.cjs +6 -23
- package/dist/execution/engine/paths.d.cts +1 -8
- package/dist/execution/engine/paths.d.ts +1 -8
- package/dist/execution/engine/paths.js +1 -1
- package/dist/execution/relay-env.cjs +12 -28
- package/dist/execution/relay-env.d.cts +1 -33
- package/dist/execution/relay-env.d.ts +1 -33
- package/dist/execution/relay-env.js +5 -3
- package/dist/index.cjs +14123 -15467
- package/dist/index.d.cts +1179 -1540
- package/dist/index.d.ts +1179 -1540
- package/dist/index.js +7694 -10986
- package/dist.bundle/index.cjs +33485 -0
- package/package.json +20 -26
- package/src/__tests__/record-store-last-line.test.ts +16 -7
- package/src/core/error-message.ts +7 -6
- package/src/core/host-services.ts +8 -2
- package/src/core/notify-ports.ts +17 -2
- package/src/execution/__tests__/agent-registry.test.ts +1 -1
- package/src/execution/__tests__/alive-store.test.ts +1 -1
- package/src/execution/__tests__/chat-engine-routing.test.ts +62 -28
- package/src/execution/__tests__/chat-round-first-round-watchdog.test.ts +255 -0
- package/src/execution/__tests__/collect-budget.test.ts +291 -0
- package/src/execution/__tests__/collect-coordinator-service.test.ts +316 -0
- package/src/execution/__tests__/collect-coordinator.test.ts +371 -0
- package/src/execution/__tests__/collect-mixed-dispatch.test.ts +229 -0
- package/src/execution/__tests__/config-collect-sync.test.ts +120 -0
- package/src/execution/__tests__/config.test.ts +1 -1
- package/src/execution/__tests__/delivery-methods.test.ts +179 -237
- package/src/execution/__tests__/execute-and-await-worktree.test.ts +0 -2
- package/src/execution/__tests__/execute-nesting.test.ts +20 -13
- package/src/execution/__tests__/explicit-agent-ref-guard.test.ts +21 -34
- package/src/execution/__tests__/finalized-marker.test.ts +1 -1
- package/src/execution/__tests__/gc-timer.test.ts +8 -23
- package/src/execution/__tests__/get-record-for-action-restart.test.ts +20 -10
- package/src/execution/__tests__/helpers/fake-engine-port.ts +187 -0
- package/src/execution/__tests__/helpers/spawn-mock.ts +36 -9
- package/src/execution/__tests__/helpers/subagent-service-mocks.ts +1 -1
- package/src/execution/__tests__/idle-gc.test.ts +200 -0
- package/src/execution/__tests__/lifecycle-predicates.test.ts +26 -21
- package/src/execution/__tests__/manifest-store-tmp-recovery.test.ts +1 -1
- package/src/execution/__tests__/nested-visibility-env-propagation.test.ts +5 -2
- package/src/execution/__tests__/notify-batch.test.ts +500 -0
- package/src/execution/__tests__/notify-ledger.test.ts +27 -0
- package/src/execution/__tests__/reconcile-sweep.test.ts +200 -0
- package/src/execution/__tests__/record-entry-collect.test.ts +102 -0
- package/src/execution/__tests__/record-store.test.ts +60 -6
- package/src/execution/__tests__/recursive-visibility-baseline.test.ts +20 -13
- package/src/execution/__tests__/relay-env.test.ts +12 -1
- package/src/execution/__tests__/round-supervisor.test.ts +293 -0
- package/src/execution/__tests__/session-file-gc.test.ts +1 -1
- package/src/execution/__tests__/session-pending.test.ts +119 -17
- package/src/execution/__tests__/start-collect-guard.test.ts +255 -0
- package/src/execution/__tests__/stream-sink-retirement.test.ts +10 -10
- package/src/execution/__tests__/subagent-actions-core.test.ts +6 -0
- package/src/execution/__tests__/subagent-service-multiproc-guard.test.ts +14 -11
- package/src/execution/__tests__/subagent-service-notify-gate.test.ts +33 -30
- package/src/execution/__tests__/subagent-service-parent-guard.test.ts +2 -9
- package/src/execution/__tests__/subagent-service-recovery-bounds.test.ts +59 -129
- package/src/execution/__tests__/subagent-service.test.ts +2 -2
- package/src/execution/__tests__/subprocess-agent-runner-routing.test.ts +109 -7
- package/src/execution/__tests__/subprocess-agent-runner.test.ts +108 -36
- package/src/execution/__tests__/sync-collect-recovery.test.ts +1102 -0
- package/src/execution/__tests__/tombstone-store.test.ts +1 -1
- package/src/execution/__tests__/workflow-state-root.test.ts +232 -0
- package/src/execution/__tests__/worktree-git-ops.test.ts +1 -1
- package/src/execution/__tests__/worktree-reconcile-aging.test.ts +2 -2
- package/src/execution/__tests__/worktree-reconcile.integration.test.ts +1 -1
- package/src/execution/__tests__/worktree-registry.test.ts +1 -1
- package/src/execution/agent-registry.ts +6 -2
- package/src/execution/collect-coordinator.ts +200 -0
- package/src/execution/config.ts +77 -5
- package/src/execution/dialog-queue.ts +6 -73
- package/src/execution/engine/__tests__/common/capability-gate.test.ts +115 -15
- package/src/execution/engine/__tests__/common/errors.test.ts +11 -18
- package/src/execution/engine/__tests__/common/event-journal.test.ts +1 -1
- package/src/execution/engine/__tests__/common/kill-chain.test.ts +7 -0
- package/src/execution/engine/__tests__/common/nesting-guard.test.ts +9 -3
- package/src/execution/engine/__tests__/common/pool-manager.test.ts +2 -2
- package/src/execution/engine/__tests__/common/session-view-service.test.ts +90 -3
- package/src/execution/engine/__tests__/conformance/H9-test-disposition.md +116 -0
- package/src/execution/engine/__tests__/conformance/__fixtures__/engine-protocol/fake-engine-protocol.mjs +377 -0
- package/src/execution/engine/__tests__/conformance/__fixtures__/engine-protocol/recorded.fixture.json +331 -0
- package/src/execution/engine/__tests__/conformance/__fixtures__/engine-protocol/smoke-run.fixture.json +213 -0
- package/src/execution/engine/__tests__/conformance/chat-round-protocol.test.ts +230 -0
- package/src/execution/engine/__tests__/conformance/contract.abort.test.ts +69 -42
- package/src/execution/engine/__tests__/conformance/contract.agent-events.test.ts +4 -81
- package/src/execution/engine/__tests__/conformance/contract.probe.test.ts +67 -44
- package/src/execution/engine/__tests__/conformance/contract.read-degradation.test.ts +82 -55
- package/src/execution/engine/__tests__/conformance/engine-conformance.live.test.ts +133 -70
- package/src/execution/engine/__tests__/conformance/engine-crash.test.ts +143 -0
- package/src/execution/engine/__tests__/conformance/fake-engine-capabilities.ts +19 -0
- package/src/execution/engine/__tests__/conformance/golden-replay.pi.test.ts +8 -3
- package/src/execution/engine/__tests__/conformance/golden-replay.zcode.test.ts +6 -5
- package/src/execution/engine/__tests__/conformance/protocol-blackbox.test.ts +398 -0
- package/src/execution/engine/__tests__/conformance/registry-fork-filter.test.ts +221 -0
- package/src/execution/engine/__tests__/conformance/round-liveness-supervisor.test.ts +302 -0
- package/src/execution/engine/__tests__/conformance/static-spawn-guard.test.ts +58 -0
- package/src/execution/engine/__tests__/engine-discovery-scan.test.ts +558 -0
- package/src/execution/engine/__tests__/host-task-spec.test.ts +45 -0
- package/src/execution/engine/__tests__/model-ref-split.test.ts +74 -0
- package/src/execution/engine/__tests__/registry.test.ts +206 -1
- package/src/execution/engine/__tests__/routing.test.ts +97 -0
- package/src/execution/engine/__tests__/run-failure-worktree-cleanup.test.ts +97 -0
- package/src/execution/engine/client/__tests__/__fixtures__/fake-engine.mjs +294 -0
- package/src/execution/engine/client/__tests__/engine-client.test.ts +516 -0
- package/src/execution/engine/client/__tests__/mirror.test.ts +67 -0
- package/src/execution/engine/client/__tests__/pid-file.test.ts +257 -0
- package/src/execution/engine/client/__tests__/protocol-closure.test.ts +95 -0
- package/src/execution/engine/client/__tests__/remote-engine.test.ts +457 -0
- package/src/execution/engine/client/client-options.ts +103 -0
- package/src/execution/engine/client/engine-client.ts +687 -0
- package/src/execution/engine/client/mirror.ts +167 -0
- package/src/execution/engine/client/pid-file.ts +392 -0
- package/src/execution/engine/client/reaper.ts +95 -0
- package/src/execution/engine/client/remote-engine.ts +441 -0
- package/src/execution/engine/client/reverse-router.ts +255 -0
- package/src/execution/engine/common/capability-gate.ts +109 -22
- package/src/execution/engine/common/errors.ts +9 -25
- package/src/execution/engine/common/event-journal.ts +4 -50
- package/src/execution/engine/common/journal-replay.ts +3 -1
- package/src/execution/engine/common/kill-chain.ts +18 -251
- package/src/execution/engine/common/nesting-guard.ts +18 -114
- package/src/execution/engine/common/pool-manager.ts +4 -0
- package/src/execution/engine/common/session-view-service.ts +56 -84
- package/src/execution/engine/config.ts +151 -0
- package/src/execution/engine/d8-compat.ts +346 -0
- package/src/execution/engine/engine-discovery-roots.ts +107 -0
- package/src/execution/engine/engine-discovery-scan.ts +269 -0
- package/src/execution/engine/engine-discovery.ts +30 -7
- package/src/execution/engine/engine-inspect-package.ts +282 -0
- package/src/execution/engine/engine-manifest.ts +244 -0
- package/src/execution/engine/host/__tests__/host-askuser-endpoint.test.ts +123 -0
- package/src/execution/engine/host/__tests__/host-bridge.test.ts +135 -0
- package/src/execution/engine/host/__tests__/spawned-children.test.ts +73 -0
- package/src/execution/engine/host/host-bridge.ts +150 -0
- package/src/execution/engine/host/host-ui-endpoint.ts +47 -0
- package/src/execution/engine/host/pi-host-binding.ts +91 -0
- package/src/execution/engine/host/spawned-children.ts +139 -0
- package/src/execution/engine/host-task-spec.ts +29 -2
- package/src/execution/engine/model-validation.ts +55 -2
- package/src/execution/engine/paths.ts +16 -41
- package/src/execution/engine/port.ts +48 -2
- package/src/execution/engine/registry.ts +153 -34
- package/src/execution/engine/routing.ts +225 -52
- package/src/execution/engine/types.ts +25 -200
- package/src/execution/execution-record.ts +7 -0
- package/src/execution/finalize-record.ts +40 -11
- package/src/execution/idle-gc.ts +89 -14
- package/src/execution/lifecycle-manager.ts +10 -7
- package/src/execution/lifecycle-predicates.ts +10 -8
- package/src/execution/notifier.ts +234 -25
- package/src/execution/notify-host.ts +21 -1
- package/src/execution/record-entry.ts +16 -0
- package/src/execution/record-store.ts +189 -31
- package/src/execution/relay-env.ts +19 -36
- package/src/execution/round-supervisor/domain.ts +89 -0
- package/src/execution/round-supervisor/index.ts +33 -0
- package/src/execution/round-supervisor/notify-accounting.ts +87 -0
- package/src/execution/round-supervisor/reconcile-sweep.ts +235 -0
- package/src/execution/round-supervisor/service-binding.test.ts +661 -0
- package/src/execution/round-supervisor/service-binding.ts +273 -0
- package/src/execution/round-supervisor/supervisor.ts +426 -0
- package/src/execution/session-pending.ts +68 -74
- package/src/execution/settled-watchdog.ts +39 -0
- package/src/execution/subagent-actions-core.ts +62 -6
- package/src/execution/subagent-service.ts +1161 -406
- package/src/execution/subprocess-agent-runner.ts +16 -8
- package/src/execution/sync-rebuild.ts +87 -0
- package/src/execution/types.ts +104 -117
- package/src/execution/ui-channels.ts +13 -214
- package/src/execution/ui-request-handler-factory.ts +7 -4
- package/src/execution/ui-request-observability.ts +2 -2
- package/src/execution/workflow-state-root.ts +67 -0
- package/src/execution/worktree-git-ops.ts +5 -0
- package/src/execution/worktree-manager.ts +11 -1
- package/src/index.ts +55 -26
- package/src/orchestration/__tests__/config-loader.test.ts +1 -1
- package/src/orchestration/__tests__/execute-agent-call.test.ts +1 -1
- package/src/orchestration/__tests__/file-run-store-prune.test.ts +1 -1
- package/src/orchestration/__tests__/file-run-store-throttle.test.ts +1 -1
- package/src/orchestration/__tests__/review-fix-loop-scriptpath-failfast.test.ts +1 -1
- package/src/orchestration/__tests__/script-generate.test.ts +5 -5
- package/src/orchestration/__tests__/skill-discovery.test.ts +2 -2
- package/src/orchestration/__tests__/workflow-files.test.ts +10 -10
- package/src/orchestration/__tests__/workflow-script-registry-impl.test.ts +1 -1
- package/src/orchestration/execute-agent-call.ts +1 -1
- package/src/orchestration/file-run-store.ts +144 -59
- package/src/orchestration/models/types.ts +43 -42
- package/src/shared/__tests__/atomic-write.test.ts +1 -1
- package/src/shared/__tests__/resource-discovery-host-roots.test.ts +5 -5
- package/src/shared/zcode-model-ref.ts +31 -0
- package/dist/chunk-43ONBFZX.js +0 -240
- package/dist/chunk-A4IVZWVX.js +0 -31
- package/dist/chunk-APZY4IME.js +0 -27
- package/dist/chunk-V3VHZ2VX.js +0 -59
- package/dist/execution/engine/engines/zcode/constants.cjs +0 -107
- package/dist/execution/engine/engines/zcode/constants.d.cts +0 -135
- package/dist/execution/engine/engines/zcode/constants.d.ts +0 -135
- package/dist/execution/engine/engines/zcode/constants.js +0 -54
- package/dist/execution/engine/engines/zcode/reader.cjs +0 -276
- package/dist/execution/engine/engines/zcode/reader.d.cts +0 -21
- package/dist/execution/engine/engines/zcode/reader.d.ts +0 -21
- package/dist/execution/engine/engines/zcode/reader.js +0 -9
- package/src/__tests__/append-system-prompt-assembly.test.ts +0 -243
- package/src/__tests__/fr4-get-state-handshake.test.ts +0 -125
- package/src/__tests__/session-runner.test.ts +0 -69
- package/src/execution/__tests__/ask-user-transit-e2e.test.ts +0 -490
- package/src/execution/__tests__/chatmode-first-round-closure-spawn.test.ts +0 -191
- package/src/execution/__tests__/descendant-sweep-guards.test.ts +0 -220
- package/src/execution/__tests__/descendant-sweep.test.ts +0 -269
- package/src/execution/__tests__/engine-model-validation.test.ts +0 -741
- package/src/execution/__tests__/epipe-fallback.test.ts +0 -248
- package/src/execution/__tests__/execution-runtime-face.test.ts +0 -272
- package/src/execution/__tests__/get-state-handshake.test.ts +0 -127
- package/src/execution/__tests__/helpers/session-runner-mocks.ts +0 -113
- package/src/execution/__tests__/keep-alive-no-progress.test.ts +0 -280
- package/src/execution/__tests__/kill-all-escalation.test.ts +0 -196
- package/src/execution/__tests__/max-turns-to-watchdog-ms.test.ts +0 -113
- package/src/execution/__tests__/output-collector.test.ts +0 -469
- package/src/execution/__tests__/pi-invocation.test.ts +0 -134
- package/src/execution/__tests__/recursive-visibility-env.test.ts +0 -149
- package/src/execution/__tests__/rpc-mode.test.ts +0 -89
- package/src/execution/__tests__/run-and-finalize-anchoring.test.ts +0 -387
- package/src/execution/__tests__/run-and-finalize-chatmode.test.ts +0 -277
- package/src/execution/__tests__/run-spawn-chatmode-settled.test.ts +0 -254
- package/src/execution/__tests__/run-spawn-edges.test.ts +0 -1079
- package/src/execution/__tests__/run-spawn-integration.test.ts +0 -933
- package/src/execution/__tests__/run-spawn-resume.test.ts +0 -322
- package/src/execution/__tests__/run-spawn-rpc-mode.test.ts +0 -196
- package/src/execution/__tests__/run-spawn-stdout-callback-throw.test.ts +0 -207
- package/src/execution/__tests__/service-kill-escalation.test.ts +0 -91
- package/src/execution/__tests__/session-runner-branch-cache-lru.test.ts +0 -110
- package/src/execution/__tests__/session-runner-close-prune.test.ts +0 -181
- package/src/execution/__tests__/session-runner-dispatch.test.ts +0 -489
- package/src/execution/__tests__/session-runner-epipe.test.ts +0 -179
- package/src/execution/__tests__/session-runner-heartbeat-idle-fallback.test.ts +0 -227
- package/src/execution/__tests__/session-runner-lifecycle-helpers.test.ts +0 -290
- package/src/execution/__tests__/session-runner-schema-env.test.ts +0 -352
- package/src/execution/__tests__/settled-watchdog.test.ts +0 -524
- package/src/execution/__tests__/spawn-args.test.ts +0 -446
- package/src/execution/__tests__/spawn-event-adapter-rpc.test.ts +0 -192
- package/src/execution/__tests__/spawn-event-adapter.test.ts +0 -167
- package/src/execution/__tests__/spawn-worktree-guidance.test.ts +0 -208
- package/src/execution/__tests__/spawned-children.test.ts +0 -236
- package/src/execution/__tests__/start-sync-model-guard.test.ts +0 -150
- package/src/execution/__tests__/stdin-writer.test.ts +0 -464
- package/src/execution/__tests__/subagent-service-message-close.test.ts +0 -693
- package/src/execution/__tests__/temp-prompt.test.ts +0 -53
- package/src/execution/__tests__/timeout-integration.test.ts +0 -616
- package/src/execution/__tests__/turn-limiter-semantics.test.ts +0 -194
- package/src/execution/__tests__/turn-limiter.test.ts +0 -65
- package/src/execution/__tests__/ui-request-handler.test.ts +0 -205
- package/src/execution/__tests__/ui-request-queue.test.ts +0 -298
- package/src/execution/__tests__/worktree-pid-registration.integration.test.ts +0 -230
- package/src/execution/engine/__tests__/common/schema-emulation.test.ts +0 -128
- package/src/execution/engine/__tests__/common/session-view-service-zcode-dbpath.test.ts +0 -149
- package/src/execution/engine/__tests__/conformance/__fixtures__/pi-golden-events.json +0 -28
- package/src/execution/engine/__tests__/conformance/zcode-appserver-harness.ts +0 -128
- package/src/execution/engine/__tests__/paths.test.ts +0 -39
- package/src/execution/engine/common/schema-emulation.ts +0 -189
- package/src/execution/engine/common/session-view-projection.ts +0 -51
- package/src/execution/engine/engines/pi/__tests__/pi-engine.test.ts +0 -615
- package/src/execution/engine/engines/pi/__tests__/reader.test.ts +0 -155
- package/src/execution/engine/engines/pi/__tests__/spawn-opts-direct.test.ts +0 -257
- package/src/execution/engine/engines/pi/argv-mirror.ts +0 -135
- package/src/execution/engine/engines/pi/get-state-handshake.ts +0 -179
- package/src/execution/engine/engines/pi/output-collector.ts +0 -317
- package/src/execution/engine/engines/pi/pi-engine.ts +0 -811
- package/src/execution/engine/engines/pi/pi-invocation.ts +0 -120
- package/src/execution/engine/engines/pi/reader.ts +0 -59
- package/src/execution/engine/engines/pi/registration.ts +0 -37
- package/src/execution/engine/engines/pi/session-runner.ts +0 -2840
- package/src/execution/engine/engines/pi/spawn-event-adapter.ts +0 -404
- package/src/execution/engine/engines/pi/stdin-writer.ts +0 -199
- package/src/execution/engine/engines/pi/temp-prompt.ts +0 -62
- package/src/execution/engine/engines/pi/turn-limiter.ts +0 -102
- package/src/execution/engine/engines/zcode/__tests__/__fixtures__/fake-appserver.mjs +0 -301
- package/src/execution/engine/engines/zcode/__tests__/__fixtures__/zcode-golden-appserver.json +0 -36
- package/src/execution/engine/engines/zcode/__tests__/appserver-launcher.test.ts +0 -321
- package/src/execution/engine/engines/zcode/__tests__/connection.test.ts +0 -473
- package/src/execution/engine/engines/zcode/__tests__/parser.test.ts +0 -43
- package/src/execution/engine/engines/zcode/__tests__/preparer.test.ts +0 -124
- package/src/execution/engine/engines/zcode/__tests__/reader.test.ts +0 -210
- package/src/execution/engine/engines/zcode/__tests__/registration.test.ts +0 -71
- package/src/execution/engine/engines/zcode/__tests__/session-channel-dispose-harvest.test.ts +0 -247
- package/src/execution/engine/engines/zcode/__tests__/session-channel-turn-timers.test.ts +0 -451
- package/src/execution/engine/engines/zcode/__tests__/session-channel.test.ts +0 -792
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine-appserver.test.ts +0 -782
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine-degrade.test.ts +0 -168
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine-dispose.test.ts +0 -210
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine-retry.test.ts +0 -353
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine-status.test.ts +0 -282
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine-timeout.test.ts +0 -372
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine.live.test.ts +0 -145
- package/src/execution/engine/engines/zcode/appserver-launcher.ts +0 -167
- package/src/execution/engine/engines/zcode/connection.ts +0 -598
- package/src/execution/engine/engines/zcode/constants.ts +0 -176
- package/src/execution/engine/engines/zcode/golden-sample.ts +0 -47
- package/src/execution/engine/engines/zcode/parser.ts +0 -102
- package/src/execution/engine/engines/zcode/preparer.ts +0 -235
- package/src/execution/engine/engines/zcode/reader.ts +0 -381
- package/src/execution/engine/engines/zcode/registration.ts +0 -37
- package/src/execution/engine/engines/zcode/session-channel.ts +0 -968
- package/src/execution/engine/engines/zcode/zcode-engine.ts +0 -1431
- package/src/execution/round-settlement.ts +0 -93
- package/src/execution/ui-request-queue.ts +0 -215
- package/src/shared/schema-env.ts +0 -44
|
@@ -1,524 +0,0 @@
|
|
|
1
|
-
// src/execution/__tests__/settled-watchdog.test.ts
|
|
2
|
-
//
|
|
3
|
-
// [T2-③ / D9 两段式] chatMode settled 等待守护:中段无进展检测 + 收尾段固定上界。
|
|
4
|
-
//
|
|
5
|
-
// 设计:docs/design/timeout-zcode-turn-and-settled-watchdog.md §6-D9 / §7(两段式
|
|
6
|
-
// 重锚定,P0-4 核心);收尾段 600s 定值由 P-T2c 已执行探针定案(probe/p-t2c-report.md,
|
|
7
|
-
// 收尾段 <2ms、compact 30 万 tokens 40.1s、P99×10=401s<600s);中段 30min 对齐
|
|
8
|
-
// KEEP_ALIVE_NO_PROGRESS_TIMEOUT_MS 先例。
|
|
9
|
-
//
|
|
10
|
-
// 覆盖五面(对应单元验收 ①-⑤):
|
|
11
|
-
// 1. 原语单测(settled-watchdog.ts):两常量值;①中段静默超时按第一段语义触发;
|
|
12
|
-
// ②agent_end 交棒后切换收尾段;③收尾段 settle 到达 disarm 不误杀;④两段各自
|
|
13
|
-
// 独立计时(中段已过时间不继承——收尾段从 agent_end 起满 600s 才 fire);
|
|
14
|
-
// ⑤env XYZ_SUBAGENT_SETTLED_WATCHDOG_MS 覆盖 / ≤0 双段关闭 / 非法回落。
|
|
15
|
-
// 2. 首轮挂载集成(runSpawn chatMode):prompt 发出后挂中段;静默 30min 触发 kill
|
|
16
|
-
// → close → runSpawn 以错误返回且错误含段标注 + 恢复指引(S-B 验收判据);
|
|
17
|
-
// agent_end 交棒后收尾段 600s 独立计时;正常轮转(agent_end+agent_settled)
|
|
18
|
-
// 不误杀。
|
|
19
|
-
// 3. 清除点:settled 到达(含 resolveRun 同点)/ close 任一发生即清——挂载点消费
|
|
20
|
-
// 同一导出常量(advance 常量值可触发 = 同源断言)。
|
|
21
|
-
//
|
|
22
|
-
// [时序约束] runSpawn 内部的前置 await 均为微任务级(mock),集成用例在调用 runSpawn
|
|
23
|
-
// **之前**启用 fake timers,再用 advanceTimersByTimeAsync(1) 循环 flush 到 spawn 被调
|
|
24
|
-
// ——settled watchdog 挂载于 spawn 时,先 waitForSpawn(真实 setTimeout 轮询)后
|
|
25
|
-
// useFakeTimers 的话 timer 已挂在真实时钟上,fake 时钟 advance 推不到(MF-3 先例
|
|
26
|
-
// 注释的同一原理)。
|
|
27
|
-
|
|
28
|
-
import { spawn } from "node:child_process";
|
|
29
|
-
import * as fs from "node:fs";
|
|
30
|
-
|
|
31
|
-
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
32
|
-
|
|
33
|
-
vi.mock("node:child_process", async () => {
|
|
34
|
-
const { FakeChild } = await import("./helpers/spawn-mock.ts");
|
|
35
|
-
return {
|
|
36
|
-
spawn: vi.fn(() => new FakeChild()),
|
|
37
|
-
execFile: vi.fn(
|
|
38
|
-
(
|
|
39
|
-
_cmd: string,
|
|
40
|
-
_args: readonly string[],
|
|
41
|
-
_opts: unknown,
|
|
42
|
-
cb: (err: Error | null, stdout?: string, stderr?: string) => void,
|
|
43
|
-
) => cb(new Error("execFile not configured in this test")),
|
|
44
|
-
),
|
|
45
|
-
};
|
|
46
|
-
});
|
|
47
|
-
|
|
48
|
-
vi.mock("node:fs", async () => {
|
|
49
|
-
const actual = await import("node:fs");
|
|
50
|
-
return {
|
|
51
|
-
default: {
|
|
52
|
-
...actual,
|
|
53
|
-
mkdirSync: vi.fn(),
|
|
54
|
-
existsSync: vi.fn(() => false),
|
|
55
|
-
appendFileSync: vi.fn(),
|
|
56
|
-
writeFileSync: vi.fn(),
|
|
57
|
-
readdirSync: vi.fn(() => []),
|
|
58
|
-
},
|
|
59
|
-
mkdirSync: vi.fn(),
|
|
60
|
-
existsSync: vi.fn(() => false),
|
|
61
|
-
appendFileSync: vi.fn(),
|
|
62
|
-
writeFileSync: vi.fn(),
|
|
63
|
-
readdirSync: vi.fn(() => []),
|
|
64
|
-
promises: actual.promises,
|
|
65
|
-
};
|
|
66
|
-
});
|
|
67
|
-
|
|
68
|
-
vi.mock("../alive-store.ts", () => ({ writeAliveMarker: vi.fn() }));
|
|
69
|
-
|
|
70
|
-
// chatMode agent_end 早返回(continue),不读 session-pending;统一 count=0 防干扰。
|
|
71
|
-
vi.mock("../session-pending.ts", () => ({
|
|
72
|
-
readActivePendingFromSessionFile: vi.fn(() => ({ count: 0, recentUnregister: false })),
|
|
73
|
-
prunePendingCursor: vi.fn(),
|
|
74
|
-
listActivePendingFromSessionFile: vi.fn(() => ({ items: [] })),
|
|
75
|
-
}));
|
|
76
|
-
|
|
77
|
-
vi.mock("../engine/engines/pi/temp-prompt.ts", () => ({
|
|
78
|
-
writePromptToTempFile: vi.fn(async (agent: string) => {
|
|
79
|
-
const safeName = agent.replace(/[^\w.-]+/g, "_");
|
|
80
|
-
return { dir: `/tmp/fake-${safeName}`, filePath: `/tmp/fake-${safeName}/prompt-${safeName}.md` };
|
|
81
|
-
}),
|
|
82
|
-
cleanupTempPrompt: vi.fn(async () => {}),
|
|
83
|
-
}));
|
|
84
|
-
|
|
85
|
-
import { runSpawn } from "../engine/engines/pi/session-runner.ts";
|
|
86
|
-
import {
|
|
87
|
-
_resetSettledWatchdogsForTest,
|
|
88
|
-
armMidRoundNoProgress,
|
|
89
|
-
armSettledWatchdog,
|
|
90
|
-
disarmSettledWatchdog,
|
|
91
|
-
getSettledWatchdogPhase,
|
|
92
|
-
getSettledWatchdogTimeoutMs,
|
|
93
|
-
handoverMidRoundToSettled,
|
|
94
|
-
hasSettledWatchdog,
|
|
95
|
-
isSettledWatchdogDisabled,
|
|
96
|
-
refreshMidRoundNoProgress,
|
|
97
|
-
SETTLED_MID_ROUND_NO_PROGRESS_MS,
|
|
98
|
-
SETTLED_WATCHDOG_ENV,
|
|
99
|
-
SETTLED_WATCHDOG_TIMEOUT_MS,
|
|
100
|
-
type SettledWatchdogFireInfo,
|
|
101
|
-
} from "../settled-watchdog.ts";
|
|
102
|
-
import { _resetLifecycleState } from "../lifecycle-manager.ts";
|
|
103
|
-
import { createRecord } from "../execution-record.ts";
|
|
104
|
-
import type { ExecutionRecord } from "../types.ts";
|
|
105
|
-
import {
|
|
106
|
-
emitStdoutLine,
|
|
107
|
-
type FakeChild,
|
|
108
|
-
lastSpawnedChild as lastSpawnedChildOf,
|
|
109
|
-
makeCtx,
|
|
110
|
-
makeOpts,
|
|
111
|
-
makeRecord,
|
|
112
|
-
} from "./helpers/spawn-mock.ts";
|
|
113
|
-
|
|
114
|
-
const mockSpawn = vi.mocked(spawn);
|
|
115
|
-
const lastSpawnedChild = (): FakeChild => lastSpawnedChildOf(mockSpawn);
|
|
116
|
-
|
|
117
|
-
function sessionHeaderLine(): Record<string, unknown> {
|
|
118
|
-
return { type: "session", id: "sess-sw", timestamp: "2026-09-01T00:00:00.000Z", cwd: "/tmp/test" };
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
/** 构造 chatMode record(idleTimeoutMs 拉长到 1h,防 idle timer 干扰两段窗口断言)。 */
|
|
122
|
-
function makeChatModeRecord(id = "sa-chat-sw"): ExecutionRecord {
|
|
123
|
-
const record = createRecord(id, {
|
|
124
|
-
agent: "general-purpose",
|
|
125
|
-
model: "test-model",
|
|
126
|
-
mode: "background",
|
|
127
|
-
task: "chat task",
|
|
128
|
-
slug: "chat",
|
|
129
|
-
startedAt: 1_000_000,
|
|
130
|
-
rootSessionId: "root-session",
|
|
131
|
-
parentRecordId: undefined,
|
|
132
|
-
depth: 0,
|
|
133
|
-
chatMode: true,
|
|
134
|
-
});
|
|
135
|
-
(record as { idleTimeoutMs: number }).idleTimeoutMs = 3_600_000;
|
|
136
|
-
return record;
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
/**
|
|
140
|
-
* fake timers 下的 spawn 等待:advanceTimersByTimeAsync(1) 循环 flush 微任务链
|
|
141
|
-
*(runSpawn 前置 await 均为 mock 的微任务级),直到 spawn 被调。
|
|
142
|
-
*/
|
|
143
|
-
async function waitForSpawnUnderFakeTimers(baseline: number, maxIters = 50): Promise<void> {
|
|
144
|
-
for (let i = 0; i < maxIters && mockSpawn.mock.results.length <= baseline; i++) {
|
|
145
|
-
await vi.advanceTimersByTimeAsync(1);
|
|
146
|
-
}
|
|
147
|
-
if (mockSpawn.mock.results.length <= baseline) {
|
|
148
|
-
throw new Error("spawn was not called under fake timers");
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
// ============================================================
|
|
153
|
-
// 原语单测(两段式,验收 ①-⑤)
|
|
154
|
-
// ============================================================
|
|
155
|
-
|
|
156
|
-
describe("[T2-③ / D9] settled-watchdog 两段式原语", () => {
|
|
157
|
-
beforeEach(() => {
|
|
158
|
-
vi.clearAllMocks();
|
|
159
|
-
vi.unstubAllEnvs();
|
|
160
|
-
_resetSettledWatchdogsForTest();
|
|
161
|
-
});
|
|
162
|
-
|
|
163
|
-
afterEach(() => {
|
|
164
|
-
_resetSettledWatchdogsForTest();
|
|
165
|
-
vi.unstubAllEnvs();
|
|
166
|
-
vi.useRealTimers();
|
|
167
|
-
});
|
|
168
|
-
|
|
169
|
-
it("两常量值:中段 30min(对齐 keep-alive 先例)+ 收尾段 600s(P-T2c 定案,值不变)", () => {
|
|
170
|
-
expect(SETTLED_MID_ROUND_NO_PROGRESS_MS).toBe(30 * 60 * 1000);
|
|
171
|
-
expect(SETTLED_WATCHDOG_TIMEOUT_MS).toBe(600_000);
|
|
172
|
-
expect(getSettledWatchdogTimeoutMs()).toBe(600_000);
|
|
173
|
-
expect(isSettledWatchdogDisabled()).toBe(false);
|
|
174
|
-
});
|
|
175
|
-
|
|
176
|
-
it("验收①:agent_end 前静默超时按第一段语义触发(mid-round 回调 + 段信息;收尾回调不触发)", async () => {
|
|
177
|
-
vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
|
|
178
|
-
const onMidTimeout = vi.fn();
|
|
179
|
-
const onSettleTimeout = vi.fn();
|
|
180
|
-
armMidRoundNoProgress("sa-1", { onMidTimeout, onSettleTimeout });
|
|
181
|
-
expect(hasSettledWatchdog("sa-1")).toBe(true);
|
|
182
|
-
expect(getSettledWatchdogPhase("sa-1")).toBe("mid-round");
|
|
183
|
-
|
|
184
|
-
await vi.advanceTimersByTimeAsync(SETTLED_MID_ROUND_NO_PROGRESS_MS - 1);
|
|
185
|
-
expect(onMidTimeout).not.toHaveBeenCalled();
|
|
186
|
-
await vi.advanceTimersByTimeAsync(1);
|
|
187
|
-
expect(onMidTimeout).toHaveBeenCalledTimes(1);
|
|
188
|
-
expect(onMidTimeout).toHaveBeenCalledWith({ phase: "mid-round", waitedMs: SETTLED_MID_ROUND_NO_PROGRESS_MS });
|
|
189
|
-
// 第一段语义:只触发中段回调,收尾回调不参与
|
|
190
|
-
expect(onSettleTimeout).not.toHaveBeenCalled();
|
|
191
|
-
// 到期回调先自删条目(对齐 armIdleTimer 语义)
|
|
192
|
-
expect(hasSettledWatchdog("sa-1")).toBe(false);
|
|
193
|
-
|
|
194
|
-
// disarm 已触发/不存在的 record:幂等 no-op
|
|
195
|
-
disarmSettledWatchdog("sa-1");
|
|
196
|
-
disarmSettledWatchdog("never-armed");
|
|
197
|
-
expect(onMidTimeout).toHaveBeenCalledTimes(1);
|
|
198
|
-
});
|
|
199
|
-
|
|
200
|
-
it("验收②:agent_end 交棒后切换到收尾段(phase=settled;收尾段从交棒点独立计时)", async () => {
|
|
201
|
-
vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
|
|
202
|
-
const onMidTimeout = vi.fn();
|
|
203
|
-
const onSettleTimeout = vi.fn();
|
|
204
|
-
armMidRoundNoProgress("sa-2", { onMidTimeout, onSettleTimeout });
|
|
205
|
-
|
|
206
|
-
handoverMidRoundToSettled("sa-2");
|
|
207
|
-
expect(getSettledWatchdogPhase("sa-2")).toBe("settled");
|
|
208
|
-
expect(hasSettledWatchdog("sa-2")).toBe(true);
|
|
209
|
-
|
|
210
|
-
// 交棒后满收尾段窗长才触发,触发的是收尾回调(段信息 settled + 600s)
|
|
211
|
-
await vi.advanceTimersByTimeAsync(SETTLED_WATCHDOG_TIMEOUT_MS - 1);
|
|
212
|
-
expect(onSettleTimeout).not.toHaveBeenCalled();
|
|
213
|
-
await vi.advanceTimersByTimeAsync(1);
|
|
214
|
-
expect(onSettleTimeout).toHaveBeenCalledTimes(1);
|
|
215
|
-
expect(onSettleTimeout).toHaveBeenCalledWith({ phase: "settled", waitedMs: SETTLED_WATCHDOG_TIMEOUT_MS });
|
|
216
|
-
expect(onMidTimeout).not.toHaveBeenCalled();
|
|
217
|
-
});
|
|
218
|
-
|
|
219
|
-
it("验收③:收尾段内 settle 到达(disarm)则正常解除不误杀", async () => {
|
|
220
|
-
vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
|
|
221
|
-
const onMidTimeout = vi.fn();
|
|
222
|
-
const onSettleTimeout = vi.fn();
|
|
223
|
-
armMidRoundNoProgress("sa-3", { onMidTimeout, onSettleTimeout });
|
|
224
|
-
handoverMidRoundToSettled("sa-3");
|
|
225
|
-
|
|
226
|
-
// settled 到达(生产接线:handleSdkEvent / close / 收尾统一 disarm,两段一并清)
|
|
227
|
-
disarmSettledWatchdog("sa-3");
|
|
228
|
-
expect(hasSettledWatchdog("sa-3")).toBe(false);
|
|
229
|
-
|
|
230
|
-
await vi.advanceTimersByTimeAsync(SETTLED_WATCHDOG_TIMEOUT_MS + 60_000);
|
|
231
|
-
expect(onSettleTimeout).not.toHaveBeenCalled();
|
|
232
|
-
expect(onMidTimeout).not.toHaveBeenCalled();
|
|
233
|
-
});
|
|
234
|
-
|
|
235
|
-
it("验收④:两段各自独立计时——中段已过时间不继承进收尾段(D9 交棒语义,构造性断言)", async () => {
|
|
236
|
-
vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
|
|
237
|
-
const onMidTimeout = vi.fn();
|
|
238
|
-
const onSettleTimeout = vi.fn();
|
|
239
|
-
armMidRoundNoProgress("sa-4", { onMidTimeout, onSettleTimeout });
|
|
240
|
-
|
|
241
|
-
// 中段跑了 29min(差 1min 触发)时 agent_end 到达交棒
|
|
242
|
-
await vi.advanceTimersByTimeAsync(SETTLED_MID_ROUND_NO_PROGRESS_MS - 60_000);
|
|
243
|
-
handoverMidRoundToSettled("sa-4");
|
|
244
|
-
|
|
245
|
-
// 若收尾段继承中段已过时间,agent_end 后约 10min 即触发;独立计时应满 600s
|
|
246
|
-
await vi.advanceTimersByTimeAsync(SETTLED_WATCHDOG_TIMEOUT_MS - 60_000);
|
|
247
|
-
expect(onSettleTimeout).not.toHaveBeenCalled();
|
|
248
|
-
expect(onMidTimeout).not.toHaveBeenCalled();
|
|
249
|
-
await vi.advanceTimersByTimeAsync(60_000);
|
|
250
|
-
expect(onSettleTimeout).toHaveBeenCalledTimes(1);
|
|
251
|
-
expect(onSettleTimeout).toHaveBeenCalledWith({ phase: "settled", waitedMs: SETTLED_WATCHDOG_TIMEOUT_MS });
|
|
252
|
-
});
|
|
253
|
-
|
|
254
|
-
it("中段刷新语义:有效事件行重挂同窗(连续静默才触发);交棒后刷新 no-op(收尾段不刷新)", async () => {
|
|
255
|
-
vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
|
|
256
|
-
const onMidTimeout = vi.fn();
|
|
257
|
-
const onSettleTimeout = vi.fn();
|
|
258
|
-
armMidRoundNoProgress("sa-5", { onMidTimeout, onSettleTimeout });
|
|
259
|
-
|
|
260
|
-
// 静默 29min → 事件刷新 → 再 29min 不触发(若未刷新早已触发)
|
|
261
|
-
await vi.advanceTimersByTimeAsync(SETTLED_MID_ROUND_NO_PROGRESS_MS - 60_000);
|
|
262
|
-
refreshMidRoundNoProgress("sa-5");
|
|
263
|
-
await vi.advanceTimersByTimeAsync(SETTLED_MID_ROUND_NO_PROGRESS_MS - 60_000);
|
|
264
|
-
expect(onMidTimeout).not.toHaveBeenCalled();
|
|
265
|
-
// 刷新后再满 1min 静默触发
|
|
266
|
-
await vi.advanceTimersByTimeAsync(60_000);
|
|
267
|
-
expect(onMidTimeout).toHaveBeenCalledTimes(1);
|
|
268
|
-
|
|
269
|
-
// 收尾段不刷新(D9 被否 (b) 方案的否决理由:刷新让收尾段失去唯一可收敛形态)
|
|
270
|
-
const onSettleOnly = vi.fn();
|
|
271
|
-
armSettledWatchdog("sa-5b", onSettleOnly);
|
|
272
|
-
refreshMidRoundNoProgress("sa-5b");
|
|
273
|
-
await vi.advanceTimersByTimeAsync(SETTLED_WATCHDOG_TIMEOUT_MS);
|
|
274
|
-
expect(onSettleOnly).toHaveBeenCalledTimes(1);
|
|
275
|
-
});
|
|
276
|
-
|
|
277
|
-
it("handover 幂等:未挂载 / 重复交棒 / 收尾段后再交棒均 no-op(pump 每轮 agent_end 都调)", async () => {
|
|
278
|
-
vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
|
|
279
|
-
// 未挂载:no-op
|
|
280
|
-
handoverMidRoundToSettled("sa-6-none");
|
|
281
|
-
expect(hasSettledWatchdog("sa-6-none")).toBe(false);
|
|
282
|
-
|
|
283
|
-
const onMidTimeout = vi.fn();
|
|
284
|
-
const onSettleTimeout = vi.fn();
|
|
285
|
-
armMidRoundNoProgress("sa-6", { onMidTimeout, onSettleTimeout });
|
|
286
|
-
// 重复交棒:第二次 no-op(不会叠加/重置收尾段计时)
|
|
287
|
-
handoverMidRoundToSettled("sa-6");
|
|
288
|
-
await vi.advanceTimersByTimeAsync(SETTLED_WATCHDOG_TIMEOUT_MS / 2);
|
|
289
|
-
handoverMidRoundToSettled("sa-6");
|
|
290
|
-
await vi.advanceTimersByTimeAsync(SETTLED_WATCHDOG_TIMEOUT_MS / 2);
|
|
291
|
-
expect(onSettleTimeout).toHaveBeenCalledTimes(1);
|
|
292
|
-
expect(onMidTimeout).not.toHaveBeenCalled();
|
|
293
|
-
});
|
|
294
|
-
|
|
295
|
-
it("重复 arm 以新窗口覆盖旧计时(新一轮 prompt:旧中段/残留收尾段一并作废)", async () => {
|
|
296
|
-
vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
|
|
297
|
-
const onMidTimeout = vi.fn();
|
|
298
|
-
const onSettleTimeout = vi.fn();
|
|
299
|
-
armMidRoundNoProgress("sa-7", { onMidTimeout, onSettleTimeout });
|
|
300
|
-
await vi.advanceTimersByTimeAsync(SETTLED_MID_ROUND_NO_PROGRESS_MS / 2);
|
|
301
|
-
// 新一轮 prompt 重新 arm:旧窗口必须作废(含异常形态下残留的收尾段)
|
|
302
|
-
armMidRoundNoProgress("sa-7", { onMidTimeout, onSettleTimeout });
|
|
303
|
-
expect(getSettledWatchdogPhase("sa-7")).toBe("mid-round");
|
|
304
|
-
|
|
305
|
-
await vi.advanceTimersByTimeAsync(SETTLED_MID_ROUND_NO_PROGRESS_MS - 1);
|
|
306
|
-
expect(onMidTimeout).not.toHaveBeenCalled();
|
|
307
|
-
await vi.advanceTimersByTimeAsync(1);
|
|
308
|
-
expect(onMidTimeout).toHaveBeenCalledTimes(1);
|
|
309
|
-
});
|
|
310
|
-
|
|
311
|
-
// ── 验收⑤:env XYZ_SUBAGENT_SETTLED_WATCHDOG_MS ──
|
|
312
|
-
|
|
313
|
-
it("验收⑤a:env >0 覆盖收尾段定值(生效窗长随 fire 信息回传)", async () => {
|
|
314
|
-
vi.stubEnv(SETTLED_WATCHDOG_ENV, "12345");
|
|
315
|
-
_resetSettledWatchdogsForTest(); // 清 env 解析缓存使新 env 生效
|
|
316
|
-
vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
|
|
317
|
-
expect(getSettledWatchdogTimeoutMs()).toBe(12_345);
|
|
318
|
-
expect(isSettledWatchdogDisabled()).toBe(false);
|
|
319
|
-
|
|
320
|
-
const onSettleTimeout = vi.fn();
|
|
321
|
-
armSettledWatchdog("sa-8", onSettleTimeout);
|
|
322
|
-
await vi.advanceTimersByTimeAsync(12_345 - 1);
|
|
323
|
-
expect(onSettleTimeout).not.toHaveBeenCalled();
|
|
324
|
-
await vi.advanceTimersByTimeAsync(1);
|
|
325
|
-
expect(onSettleTimeout).toHaveBeenCalledWith({ phase: "settled", waitedMs: 12_345 });
|
|
326
|
-
|
|
327
|
-
// 交棒路径同样消费覆盖值
|
|
328
|
-
const onSettle2 = vi.fn();
|
|
329
|
-
armMidRoundNoProgress("sa-8b", { onMidTimeout: vi.fn(), onSettleTimeout: onSettle2 });
|
|
330
|
-
handoverMidRoundToSettled("sa-8b");
|
|
331
|
-
await vi.advanceTimersByTimeAsync(12_345);
|
|
332
|
-
expect(onSettle2).toHaveBeenCalledWith({ phase: "settled", waitedMs: 12_345 });
|
|
333
|
-
});
|
|
334
|
-
|
|
335
|
-
it("验收⑤b:env ≤0 关闭两段(arm no-op + warn 明示三无窗口后果)", async () => {
|
|
336
|
-
vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
|
|
337
|
-
vi.stubEnv(SETTLED_WATCHDOG_ENV, "0");
|
|
338
|
-
_resetSettledWatchdogsForTest();
|
|
339
|
-
expect(isSettledWatchdogDisabled()).toBe(true);
|
|
340
|
-
|
|
341
|
-
const onMidTimeout = vi.fn();
|
|
342
|
-
const onSettleTimeout = vi.fn();
|
|
343
|
-
armMidRoundNoProgress("sa-9", { onMidTimeout, onSettleTimeout });
|
|
344
|
-
// 两段都不挂载(关闭语义:回到「三无窗口」,warn 已明示)
|
|
345
|
-
expect(hasSettledWatchdog("sa-9")).toBe(false);
|
|
346
|
-
handoverMidRoundToSettled("sa-9");
|
|
347
|
-
refreshMidRoundNoProgress("sa-9");
|
|
348
|
-
armSettledWatchdog("sa-9", onSettleTimeout);
|
|
349
|
-
expect(hasSettledWatchdog("sa-9")).toBe(false);
|
|
350
|
-
|
|
351
|
-
await vi.advanceTimersByTimeAsync(SETTLED_MID_ROUND_NO_PROGRESS_MS + SETTLED_WATCHDOG_TIMEOUT_MS);
|
|
352
|
-
expect(onMidTimeout).not.toHaveBeenCalled();
|
|
353
|
-
expect(onSettleTimeout).not.toHaveBeenCalled();
|
|
354
|
-
});
|
|
355
|
-
|
|
356
|
-
it("验收⑤c:env 非法(非数字)回落默认 + warn 留痕(LC-7 教训:非法回落必须可见)", () => {
|
|
357
|
-
vi.stubEnv(SETTLED_WATCHDOG_ENV, "not-a-number");
|
|
358
|
-
_resetSettledWatchdogsForTest();
|
|
359
|
-
expect(getSettledWatchdogTimeoutMs()).toBe(SETTLED_WATCHDOG_TIMEOUT_MS);
|
|
360
|
-
expect(isSettledWatchdogDisabled()).toBe(false);
|
|
361
|
-
});
|
|
362
|
-
|
|
363
|
-
it("验收⑤d:env 未设/空串 = 默认 600s(规则 19:用户显式指定才生效)", () => {
|
|
364
|
-
delete process.env[SETTLED_WATCHDOG_ENV];
|
|
365
|
-
_resetSettledWatchdogsForTest();
|
|
366
|
-
expect(getSettledWatchdogTimeoutMs()).toBe(600_000);
|
|
367
|
-
|
|
368
|
-
vi.stubEnv(SETTLED_WATCHDOG_ENV, " ");
|
|
369
|
-
_resetSettledWatchdogsForTest();
|
|
370
|
-
expect(getSettledWatchdogTimeoutMs()).toBe(600_000);
|
|
371
|
-
expect(isSettledWatchdogDisabled()).toBe(false);
|
|
372
|
-
});
|
|
373
|
-
});
|
|
374
|
-
|
|
375
|
-
// ============================================================
|
|
376
|
-
// runSpawn 首轮挂载集成(chatMode)
|
|
377
|
-
// ============================================================
|
|
378
|
-
|
|
379
|
-
describe("[T2-③ / D9] runSpawn 首轮挂载(chatMode)", () => {
|
|
380
|
-
beforeEach(() => {
|
|
381
|
-
vi.clearAllMocks();
|
|
382
|
-
vi.stubEnv("XYZ_SUBAGENT_SPAWN_WATCHDOG_MS", "");
|
|
383
|
-
_resetLifecycleState();
|
|
384
|
-
_resetSettledWatchdogsForTest();
|
|
385
|
-
vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout", "Date"] });
|
|
386
|
-
});
|
|
387
|
-
|
|
388
|
-
afterEach(() => {
|
|
389
|
-
vi.restoreAllMocks();
|
|
390
|
-
vi.unstubAllEnvs();
|
|
391
|
-
vi.useRealTimers();
|
|
392
|
-
_resetLifecycleState();
|
|
393
|
-
_resetSettledWatchdogsForTest();
|
|
394
|
-
});
|
|
395
|
-
|
|
396
|
-
it("验收①挂载面:agent_end 前静默超 30min(中段语义)→ kill 层主 → runSpawn 错误返回含段标注 + 恢复指引", async () => {
|
|
397
|
-
const record = makeChatModeRecord();
|
|
398
|
-
const baseline = mockSpawn.mock.results.length;
|
|
399
|
-
const promise = runSpawn(record, "Chat: mid-round wedge", makeOpts(), makeCtx());
|
|
400
|
-
await waitForSpawnUnderFakeTimers(baseline);
|
|
401
|
-
const child = lastSpawnedChild();
|
|
402
|
-
|
|
403
|
-
// prompt 发出后挂中段:advance 到中段窗长触发(原 10min 全程窗已不存在——
|
|
404
|
-
// advance 10min 静默不再误杀,是对 P0-4 的直接回归断言)
|
|
405
|
-
emitStdoutLine(child, sessionHeaderLine());
|
|
406
|
-
await vi.advanceTimersByTimeAsync(10 * 60 * 1000);
|
|
407
|
-
expect(child.killed).toBe(false);
|
|
408
|
-
await vi.advanceTimersByTimeAsync(SETTLED_MID_ROUND_NO_PROGRESS_MS - 10 * 60 * 1000 - 1_000);
|
|
409
|
-
expect(child.killed).toBe(false);
|
|
410
|
-
// [余量] fake timers 对 Date mock 有 ms 级舍入,断言边界留 1s 余量(对阈值语义无损)
|
|
411
|
-
await vi.advanceTimersByTimeAsync(2_000);
|
|
412
|
-
expect(child.killed).toBe(true);
|
|
413
|
-
expect(child.killSignal).toBe("SIGTERM");
|
|
414
|
-
|
|
415
|
-
// kill → close:runSpawn 以错误返回(设计 §6.2 首轮窗口形态)
|
|
416
|
-
child.stdout.end();
|
|
417
|
-
child.stderr.end();
|
|
418
|
-
child.emit("close", 143);
|
|
419
|
-
const result = await promise;
|
|
420
|
-
expect(result.success).toBe(false);
|
|
421
|
-
expect(result.error).toContain("settled watchdog");
|
|
422
|
-
expect(result.error).toContain("agent_settled");
|
|
423
|
-
expect(result.error).toContain("mid-round no-progress");
|
|
424
|
-
// S-B 验收判据:错误消息含恢复指引
|
|
425
|
-
expect(result.error).toContain("Recovery:");
|
|
426
|
-
expect(result.error).toContain("action:'list'");
|
|
427
|
-
});
|
|
428
|
-
|
|
429
|
-
it("验收②挂载面:agent_end 交棒后收尾段 600s 独立计时——中段 30min 不再适用,600s 到期 kill + settled 段文案", async () => {
|
|
430
|
-
const record = makeChatModeRecord();
|
|
431
|
-
const baseline = mockSpawn.mock.results.length;
|
|
432
|
-
const promise = runSpawn(record, "Chat: settle never arrives", makeOpts(), makeCtx());
|
|
433
|
-
await waitForSpawnUnderFakeTimers(baseline);
|
|
434
|
-
const child = lastSpawnedChild();
|
|
435
|
-
|
|
436
|
-
emitStdoutLine(child, sessionHeaderLine());
|
|
437
|
-
// agent_end 到达:交棒收尾段(中段静默 30min 判定随之失效)
|
|
438
|
-
emitStdoutLine(child, { type: "agent_end", messages: [], willRetry: false });
|
|
439
|
-
await new Promise((r) => setImmediate(r));
|
|
440
|
-
|
|
441
|
-
// 收尾段从 agent_end 起独立计时:满 600s 前不触发(600s < 中段 30min——本推进
|
|
442
|
-
// 段内无论收尾段还是残留中段都不该 fire)
|
|
443
|
-
await vi.advanceTimersByTimeAsync(SETTLED_WATCHDOG_TIMEOUT_MS - 2_000);
|
|
444
|
-
expect(child.killed).toBe(false);
|
|
445
|
-
await vi.advanceTimersByTimeAsync(4_000);
|
|
446
|
-
expect(child.killed).toBe(true);
|
|
447
|
-
expect(child.killSignal).toBe("SIGTERM");
|
|
448
|
-
|
|
449
|
-
child.stdout.end();
|
|
450
|
-
child.stderr.end();
|
|
451
|
-
child.emit("close", 143);
|
|
452
|
-
const result = await promise;
|
|
453
|
-
expect(result.success).toBe(false);
|
|
454
|
-
expect(result.error).toContain("settled watchdog");
|
|
455
|
-
expect(result.error).toContain("settled phase");
|
|
456
|
-
expect(result.error).toContain("after agent_end");
|
|
457
|
-
expect(result.error).toContain("Recovery:");
|
|
458
|
-
});
|
|
459
|
-
|
|
460
|
-
it("验收③挂载面:agent_end + agent_settled 正常轮转即清——advance 两段窗长合计不误杀已正常轮转的层主", async () => {
|
|
461
|
-
const record = makeChatModeRecord();
|
|
462
|
-
const baseline = mockSpawn.mock.results.length;
|
|
463
|
-
const promise = runSpawn(record, "Chat: normal", makeOpts(), makeCtx());
|
|
464
|
-
await waitForSpawnUnderFakeTimers(baseline);
|
|
465
|
-
const child = lastSpawnedChild();
|
|
466
|
-
|
|
467
|
-
emitStdoutLine(child, sessionHeaderLine());
|
|
468
|
-
emitStdoutLine(child, { type: "agent_end", messages: [], willRetry: false });
|
|
469
|
-
emitStdoutLine(child, { type: "agent_settled" });
|
|
470
|
-
await new Promise((r) => setImmediate(r));
|
|
471
|
-
|
|
472
|
-
// 首轮窗口结束(resolveRun 同点清除两段守护);idle timer 被拉长到 1h 不干扰
|
|
473
|
-
expect(hasSettledWatchdog(record.id)).toBe(false);
|
|
474
|
-
await vi.advanceTimersByTimeAsync(SETTLED_MID_ROUND_NO_PROGRESS_MS + SETTLED_WATCHDOG_TIMEOUT_MS + 60_000);
|
|
475
|
-
// settled watchdog 已清:子进程未被本守护 kill(若回归未清,此处 killed=true)
|
|
476
|
-
expect(child.killed).toBe(false);
|
|
477
|
-
|
|
478
|
-
// 收尾
|
|
479
|
-
child.stdout.end();
|
|
480
|
-
child.stderr.end();
|
|
481
|
-
child.emit("close", 0);
|
|
482
|
-
const result = await promise;
|
|
483
|
-
expect(result.success).toBe(true);
|
|
484
|
-
expect(result.error).toBeUndefined();
|
|
485
|
-
});
|
|
486
|
-
|
|
487
|
-
it("挂载面限定 chatMode:非 chatMode 首轮不挂 settled 守护(中段/收尾段均无)", async () => {
|
|
488
|
-
const record = makeRecord(); // 非 chatMode
|
|
489
|
-
const baseline = mockSpawn.mock.results.length;
|
|
490
|
-
const promise = runSpawn(record, "Task: not chat", makeOpts(), makeCtx());
|
|
491
|
-
await waitForSpawnUnderFakeTimers(baseline);
|
|
492
|
-
const child = lastSpawnedChild();
|
|
493
|
-
|
|
494
|
-
emitStdoutLine(child, sessionHeaderLine());
|
|
495
|
-
await new Promise((r) => setImmediate(r));
|
|
496
|
-
expect(hasSettledWatchdog(record.id)).toBe(false);
|
|
497
|
-
|
|
498
|
-
// 非 chatMode:即使静默超过中段窗长也不被 settled 守护 kill(spawn watchdog 同为
|
|
499
|
-
// 未挂载——裸缺省 + env 清),agent_end 之前的执行期不受 T2-③ 触及
|
|
500
|
-
await vi.advanceTimersByTimeAsync(SETTLED_MID_ROUND_NO_PROGRESS_MS + 60_000);
|
|
501
|
-
expect(child.killed).toBe(false);
|
|
502
|
-
|
|
503
|
-
// agent_end(count=0)→ final kill(既有语义)
|
|
504
|
-
emitStdoutLine(child, { type: "agent_end", messages: [], willRetry: false });
|
|
505
|
-
await new Promise((r) => setImmediate(r));
|
|
506
|
-
expect(child.killed).toBe(true);
|
|
507
|
-
|
|
508
|
-
child.stdout.end();
|
|
509
|
-
child.stderr.end();
|
|
510
|
-
child.emit("close", 143);
|
|
511
|
-
const result = await promise;
|
|
512
|
-
expect(result.success).toBe(true);
|
|
513
|
-
});
|
|
514
|
-
});
|
|
515
|
-
|
|
516
|
-
// fire info 类型形状守卫(挂载点回调签名消费;编译期校验的运行时锚定)
|
|
517
|
-
describe("[T2-③ / D9] SettledWatchdogFireInfo 形状", () => {
|
|
518
|
-
it("fire 信息的段与窗长字段齐全(挂载点文案分叉的契约面)", () => {
|
|
519
|
-
const mid: SettledWatchdogFireInfo = { phase: "mid-round", waitedMs: SETTLED_MID_ROUND_NO_PROGRESS_MS };
|
|
520
|
-
const settled: SettledWatchdogFireInfo = { phase: "settled", waitedMs: SETTLED_WATCHDOG_TIMEOUT_MS };
|
|
521
|
-
expect(mid.phase).toBe("mid-round");
|
|
522
|
-
expect(settled.phase).toBe("settled");
|
|
523
|
-
});
|
|
524
|
-
});
|