@zhushanwen/subagent-core 0.2.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 +114 -0
- package/dist/chunk-3VOERJPJ.js +22 -0
- package/dist/chunk-A4IVZWVX.js +31 -0
- package/dist/execution/engine/engines/zcode/constants.cjs +54 -0
- package/dist/execution/engine/engines/zcode/constants.d.cts +31 -0
- package/dist/execution/engine/engines/zcode/constants.d.ts +31 -0
- package/dist/execution/engine/engines/zcode/constants.js +22 -0
- package/dist/execution/engine/engines/zcode/reader.cjs +276 -0
- package/dist/execution/engine/engines/zcode/reader.d.cts +20 -0
- package/dist/execution/engine/engines/zcode/reader.d.ts +20 -0
- package/dist/execution/engine/engines/zcode/reader.js +239 -0
- package/dist/execution/engine/paths.cjs +55 -0
- package/dist/execution/engine/paths.d.cts +8 -0
- package/dist/execution/engine/paths.d.ts +8 -0
- package/dist/execution/engine/paths.js +26 -0
- package/dist/execution/relay-env.cjs +62 -0
- package/dist/execution/relay-env.d.cts +33 -0
- package/dist/execution/relay-env.d.ts +33 -0
- package/dist/execution/relay-env.js +20 -0
- package/dist/index.cjs +1852 -0
- package/dist/index.d.cts +1184 -0
- package/dist/index.d.ts +1184 -0
- package/dist/index.js +1810 -0
- package/dist/types-BxyAidGf.d.cts +875 -0
- package/dist/types-BxyAidGf.d.ts +875 -0
- package/package.json +99 -0
- package/src/__tests__/agent-opts-resolver-schema-prompt.test.ts +142 -0
- package/src/__tests__/append-system-prompt-assembly.test.ts +242 -0
- package/src/__tests__/builtin-workflows-structure.test.ts +180 -0
- package/src/__tests__/derive-closed-display-parity.test.ts +93 -0
- package/src/__tests__/fr4-get-state-handshake.test.ts +125 -0
- package/src/__tests__/fr8-orphan-recovery.test.ts +259 -0
- package/src/__tests__/m2-append-content-probe.test.ts +73 -0
- package/src/__tests__/manifest-store.test.ts +368 -0
- package/src/__tests__/record-store-cache.test.ts +335 -0
- package/src/__tests__/record-store-index.test.ts +560 -0
- package/src/__tests__/record-store-last-line.test.ts +129 -0
- package/src/__tests__/review-fix-loop-script.test.ts +288 -0
- package/src/__tests__/review-fix-loop-utils.test.ts +2377 -0
- package/src/__tests__/robustness-low-batch1.test.ts +286 -0
- package/src/__tests__/robustness-medium-batch1.test.ts +69 -0
- package/src/__tests__/robustness-medium-batch2.test.ts +65 -0
- package/src/__tests__/robustness-medium-batch3.test.ts +30 -0
- package/src/__tests__/robustness-medium-batch4.test.ts +358 -0
- package/src/__tests__/session-runner.test.ts +69 -0
- package/src/__tests__/smoke.test.ts +9 -0
- package/src/__tests__/stream-sink.test.ts +203 -0
- package/src/core/__tests__/host-services.test.ts +144 -0
- package/src/core/__tests__/logger.test.ts +78 -0
- package/src/core/__tests__/notify-ports.test.ts +104 -0
- package/src/core/host-services.ts +97 -0
- package/src/core/logger.ts +47 -0
- package/src/core/notify-ports.ts +126 -0
- package/src/execution/__tests__/__fixtures__/notifier-golden-snapshots.json +53 -0
- package/src/execution/__tests__/__fixtures__/truncline.snapshot.json +1 -0
- package/src/execution/__tests__/agent-result-mapper.test.ts +150 -0
- package/src/execution/__tests__/alive-store.test.ts +147 -0
- package/src/execution/__tests__/ask-user-transit-e2e.test.ts +490 -0
- package/src/execution/__tests__/channel-registry-handshake.test.ts +242 -0
- package/src/execution/__tests__/chat-engine-routing.test.ts +610 -0
- package/src/execution/__tests__/chatmode-first-round-closure-spawn.test.ts +190 -0
- package/src/execution/__tests__/concurrency-pool.test.ts +250 -0
- package/src/execution/__tests__/config.test.ts +302 -0
- package/src/execution/__tests__/delivery-methods.test.ts +424 -0
- package/src/execution/__tests__/dialog-queue.test.ts +299 -0
- package/src/execution/__tests__/epipe-fallback.test.ts +241 -0
- package/src/execution/__tests__/execute-and-await-worktree.test.ts +243 -0
- package/src/execution/__tests__/execute-nesting.test.ts +323 -0
- package/src/execution/__tests__/execute-options-mapper.test.ts +200 -0
- package/src/execution/__tests__/execution-record.test.ts +1394 -0
- package/src/execution/__tests__/explicit-agent-ref-guard.test.ts +171 -0
- package/src/execution/__tests__/finalize-record.test.ts +367 -0
- package/src/execution/__tests__/finalized-marker.test.ts +104 -0
- package/src/execution/__tests__/format-schema-instruction.test.ts +169 -0
- package/src/execution/__tests__/gc-timer.test.ts +184 -0
- package/src/execution/__tests__/get-record-for-action-restart.test.ts +254 -0
- package/src/execution/__tests__/helpers/mock-extension-api.ts +30 -0
- package/src/execution/__tests__/helpers/spawn-mock.ts +242 -0
- package/src/execution/__tests__/host-mode.test.ts +87 -0
- package/src/execution/__tests__/lifecycle-manager-lock.test.ts +211 -0
- package/src/execution/__tests__/lifecycle-manager.test.ts +383 -0
- package/src/execution/__tests__/lifecycle-predicates.test.ts +116 -0
- package/src/execution/__tests__/manifest-parentid.test.ts +117 -0
- package/src/execution/__tests__/model-resolver.test.ts +465 -0
- package/src/execution/__tests__/nested-visibility-env-propagation.test.ts +287 -0
- package/src/execution/__tests__/nested-visibility.test.ts +325 -0
- package/src/execution/__tests__/output-collector.test.ts +358 -0
- package/src/execution/__tests__/path-encoding.test.ts +104 -0
- package/src/execution/__tests__/pi-invocation.test.ts +134 -0
- package/src/execution/__tests__/record-store.test.ts +1057 -0
- package/src/execution/__tests__/records-cwd-isolation.test.ts +91 -0
- package/src/execution/__tests__/recursive-visibility-baseline.test.ts +339 -0
- package/src/execution/__tests__/recursive-visibility-env.test.ts +273 -0
- package/src/execution/__tests__/relay-env.test.ts +42 -0
- package/src/execution/__tests__/resource-policy.test.ts +109 -0
- package/src/execution/__tests__/rpc-mode.test.ts +89 -0
- package/src/execution/__tests__/run-and-finalize-chatmode.test.ts +267 -0
- package/src/execution/__tests__/run-spawn-chatmode-settled.test.ts +253 -0
- package/src/execution/__tests__/run-spawn-edges.test.ts +687 -0
- package/src/execution/__tests__/run-spawn-integration.test.ts +933 -0
- package/src/execution/__tests__/run-spawn-resume.test.ts +322 -0
- package/src/execution/__tests__/run-spawn-rpc-mode.test.ts +196 -0
- package/src/execution/__tests__/run-spawn-stdout-callback-throw.test.ts +199 -0
- package/src/execution/__tests__/session-context-resolver.test.ts +167 -0
- package/src/execution/__tests__/session-file-gc.test.ts +293 -0
- package/src/execution/__tests__/session-reconstructor.test.ts +379 -0
- package/src/execution/__tests__/session-runner-epipe.test.ts +178 -0
- package/src/execution/__tests__/session-runner-schema-env.test.ts +350 -0
- package/src/execution/__tests__/spawn-args.test.ts +445 -0
- package/src/execution/__tests__/spawn-event-adapter-rpc.test.ts +189 -0
- package/src/execution/__tests__/spawn-event-adapter.test.ts +167 -0
- package/src/execution/__tests__/spawn-worktree-guidance.test.ts +207 -0
- package/src/execution/__tests__/spawned-children.test.ts +92 -0
- package/src/execution/__tests__/start-sync-model-guard.test.ts +150 -0
- package/src/execution/__tests__/stdin-writer.test.ts +462 -0
- package/src/execution/__tests__/stream-sink-retirement.test.ts +261 -0
- package/src/execution/__tests__/subagent-service-abort.test.ts +60 -0
- package/src/execution/__tests__/subagent-service-message-close.test.ts +629 -0
- package/src/execution/__tests__/subagent-service-parent-guard.test.ts +180 -0
- package/src/execution/__tests__/subagent-service.test.ts +788 -0
- package/src/execution/__tests__/subprocess-agent-runner-routing.test.ts +310 -0
- package/src/execution/__tests__/subprocess-agent-runner.test.ts +612 -0
- package/src/execution/__tests__/temp-prompt.test.ts +53 -0
- package/src/execution/__tests__/timeout-integration.test.ts +615 -0
- package/src/execution/__tests__/tombstone-store.test.ts +73 -0
- package/src/execution/__tests__/turn-limiter-semantics.test.ts +194 -0
- package/src/execution/__tests__/turn-limiter.test.ts +65 -0
- package/src/execution/__tests__/ui-channels.test.ts +187 -0
- package/src/execution/__tests__/ui-interaction-model.test.ts +67 -0
- package/src/execution/__tests__/ui-request-handler-factory.test.ts +369 -0
- package/src/execution/__tests__/ui-request-handler.test.ts +204 -0
- package/src/execution/__tests__/ui-request-observability.test.ts +113 -0
- package/src/execution/__tests__/ui-request-queue.test.ts +133 -0
- package/src/execution/__tests__/worktree-manager.test.ts +633 -0
- package/src/execution/__tests__/worktree-pid-registration.integration.test.ts +229 -0
- package/src/execution/__tests__/worktree-reconcile.integration.test.ts +181 -0
- package/src/execution/__tests__/worktree-registry.test.ts +199 -0
- package/src/execution/agent-registry.ts +199 -0
- package/src/execution/agent-result-mapper.ts +90 -0
- package/src/execution/alive-store.ts +119 -0
- package/src/execution/argv-mirror.ts +113 -0
- package/src/execution/best-effort.ts +38 -0
- package/src/execution/channel-registry-access.ts +144 -0
- package/src/execution/concurrency-pool.ts +116 -0
- package/src/execution/config.ts +165 -0
- package/src/execution/dialog-queue.ts +330 -0
- package/src/execution/engine/__tests__/common/data-dir.test.ts +78 -0
- package/src/execution/engine/__tests__/common/errors.test.ts +132 -0
- package/src/execution/engine/__tests__/common/event-journal.test.ts +177 -0
- package/src/execution/engine/__tests__/common/kill-chain.test.ts +192 -0
- package/src/execution/engine/__tests__/common/nesting-guard.test.ts +81 -0
- package/src/execution/engine/__tests__/common/persona-router.test.ts +123 -0
- package/src/execution/engine/__tests__/common/pool-manager.test.ts +154 -0
- package/src/execution/engine/__tests__/common/schema-emulation.test.ts +128 -0
- package/src/execution/engine/__tests__/conformance/__fixtures__/pi-golden-events.json +28 -0
- package/src/execution/engine/__tests__/conformance/agent-event-invariants.ts +141 -0
- package/src/execution/engine/__tests__/conformance/contract.abort.test.ts +109 -0
- package/src/execution/engine/__tests__/conformance/contract.agent-events.test.ts +101 -0
- package/src/execution/engine/__tests__/conformance/contract.probe.test.ts +77 -0
- package/src/execution/engine/__tests__/conformance/contract.read-degradation.test.ts +104 -0
- package/src/execution/engine/__tests__/conformance/engine-conformance.live.test.ts +201 -0
- package/src/execution/engine/__tests__/conformance/golden-replay.pi.test.ts +76 -0
- package/src/execution/engine/__tests__/conformance/golden-replay.zcode.test.ts +79 -0
- package/src/execution/engine/__tests__/engine-discovery.test.ts +87 -0
- package/src/execution/engine/__tests__/model-prompt.test.ts +197 -0
- package/src/execution/engine/__tests__/paths.test.ts +39 -0
- package/src/execution/engine/__tests__/registry.test.ts +120 -0
- package/src/execution/engine/__tests__/routing.test.ts +231 -0
- package/src/execution/engine/common/data-dir.ts +66 -0
- package/src/execution/engine/common/errors.ts +183 -0
- package/src/execution/engine/common/event-journal.ts +254 -0
- package/src/execution/engine/common/journal-replay.ts +62 -0
- package/src/execution/engine/common/kill-chain.ts +221 -0
- package/src/execution/engine/common/nesting-guard.ts +50 -0
- package/src/execution/engine/common/persona-router.ts +108 -0
- package/src/execution/engine/common/pool-manager.ts +226 -0
- package/src/execution/engine/common/schema-emulation.ts +189 -0
- package/src/execution/engine/common/session-view-projection.ts +51 -0
- package/src/execution/engine/engine-discovery.ts +65 -0
- package/src/execution/engine/engines/pi/__tests__/pi-engine.test.ts +469 -0
- package/src/execution/engine/engines/pi/__tests__/reader.test.ts +155 -0
- package/src/execution/engine/engines/pi/__tests__/task-spec-mapper.test.ts +164 -0
- package/src/execution/engine/engines/pi/pi-engine.ts +415 -0
- package/src/execution/engine/engines/pi/reader.ts +48 -0
- package/src/execution/engine/engines/pi/registration.ts +35 -0
- package/src/execution/engine/engines/pi/task-spec-mapper.ts +100 -0
- package/src/execution/engine/engines/zcode/__tests__/__fixtures__/zcode-golden-spawn.json +39 -0
- package/src/execution/engine/engines/zcode/__tests__/launcher.test.ts +150 -0
- package/src/execution/engine/engines/zcode/__tests__/parser.test.ts +246 -0
- package/src/execution/engine/engines/zcode/__tests__/preparer.test.ts +228 -0
- package/src/execution/engine/engines/zcode/__tests__/reader.test.ts +210 -0
- package/src/execution/engine/engines/zcode/__tests__/registration.test.ts +71 -0
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine.live.test.ts +127 -0
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine.test.ts +580 -0
- package/src/execution/engine/engines/zcode/constants.ts +43 -0
- package/src/execution/engine/engines/zcode/golden-sample.ts +39 -0
- package/src/execution/engine/engines/zcode/launcher.ts +161 -0
- package/src/execution/engine/engines/zcode/parser.ts +436 -0
- package/src/execution/engine/engines/zcode/preparer.ts +363 -0
- package/src/execution/engine/engines/zcode/reader.ts +381 -0
- package/src/execution/engine/engines/zcode/registration.ts +37 -0
- package/src/execution/engine/engines/zcode/zcode-engine.ts +658 -0
- package/src/execution/engine/host-task-spec.ts +47 -0
- package/src/execution/engine/model-prompt.ts +158 -0
- package/src/execution/engine/paths.ts +42 -0
- package/src/execution/engine/port.ts +153 -0
- package/src/execution/engine/registry.ts +133 -0
- package/src/execution/engine/routing.ts +218 -0
- package/src/execution/engine/types.ts +309 -0
- package/src/execution/execute-options-mapper.ts +115 -0
- package/src/execution/execution-record.ts +984 -0
- package/src/execution/finalize-record.ts +254 -0
- package/src/execution/finalized-marker.ts +70 -0
- package/src/execution/get-state-handshake.ts +104 -0
- package/src/execution/host-mode.ts +56 -0
- package/src/execution/idle-gc.ts +47 -0
- package/src/execution/lifecycle-manager.ts +513 -0
- package/src/execution/lifecycle-predicates.ts +65 -0
- package/src/execution/manifest-store.ts +256 -0
- package/src/execution/model-config-service.ts +250 -0
- package/src/execution/model-resolver.ts +248 -0
- package/src/execution/notifier.ts +372 -0
- package/src/execution/notify-ledger.ts +580 -0
- package/src/execution/output-collector.ts +228 -0
- package/src/execution/path-encoding.ts +60 -0
- package/src/execution/pi-invocation.ts +120 -0
- package/src/execution/record-entry.ts +132 -0
- package/src/execution/record-store.ts +1265 -0
- package/src/execution/relay-env.ts +37 -0
- package/src/execution/session-context-resolver.ts +64 -0
- package/src/execution/session-file-gc.ts +120 -0
- package/src/execution/session-pending.ts +170 -0
- package/src/execution/session-reconstructor.ts +678 -0
- package/src/execution/session-runner.ts +1789 -0
- package/src/execution/sessions-index.ts +304 -0
- package/src/execution/spawn-event-adapter.ts +363 -0
- package/src/execution/stdin-writer.ts +198 -0
- package/src/execution/stream-sink.ts +126 -0
- package/src/execution/subagent-service.ts +2268 -0
- package/src/execution/subprocess-agent-runner.ts +317 -0
- package/src/execution/temp-prompt.ts +62 -0
- package/src/execution/tombstone-store.ts +72 -0
- package/src/execution/turn-limiter.ts +102 -0
- package/src/execution/types.ts +1023 -0
- package/src/execution/ui-channels.ts +216 -0
- package/src/execution/ui-interaction-model.ts +48 -0
- package/src/execution/ui-request-handler-factory.ts +243 -0
- package/src/execution/ui-request-observability.ts +81 -0
- package/src/execution/ui-request-queue.ts +184 -0
- package/src/execution/worktree-manager.ts +688 -0
- package/src/execution/worktree-registry.ts +279 -0
- package/src/index.ts +87 -0
- package/src/orchestration/__tests__/__fixtures__/worker-template.snapshot.txt +349 -0
- package/src/orchestration/__tests__/agent-call-catch-fallback.test.ts +202 -0
- package/src/orchestration/__tests__/agent-call-stream.test.ts +152 -0
- package/src/orchestration/__tests__/args-validator.test.ts +143 -0
- package/src/orchestration/__tests__/config-loader.test.ts +503 -0
- package/src/orchestration/__tests__/error-recovery-handlers.test.ts +809 -0
- package/src/orchestration/__tests__/error-recovery-postmessage-defense.test.ts +404 -0
- package/src/orchestration/__tests__/error-recovery-serialize-failed-result.test.ts +56 -0
- package/src/orchestration/__tests__/error-recovery-workflow-call.test.ts +166 -0
- package/src/orchestration/__tests__/execute-agent-call.test.ts +451 -0
- package/src/orchestration/__tests__/launcher-nested-workflow.test.ts +600 -0
- package/src/orchestration/__tests__/lifecycle-runid-injection.test.ts +96 -0
- package/src/orchestration/__tests__/lifecycle.test.ts +659 -0
- package/src/orchestration/__tests__/non-cloneable-return-e2e.test.ts +95 -0
- package/src/orchestration/__tests__/review-fix-loop-scriptpath-failfast.test.ts +183 -0
- package/src/orchestration/__tests__/script-lint.test.ts +831 -0
- package/src/orchestration/__tests__/skill-discovery.test.ts +210 -0
- package/src/orchestration/__tests__/test-mocks.ts +197 -0
- package/src/orchestration/__tests__/worker-exit-without-result.test.ts +368 -0
- package/src/orchestration/__tests__/worker-host.test.ts +120 -0
- package/src/orchestration/__tests__/worker-returnmeta-passthrough.test.ts +164 -0
- package/src/orchestration/__tests__/worker-script-builder-runtime.test.ts +563 -0
- package/src/orchestration/__tests__/worker-script-builder.test.ts +309 -0
- package/src/orchestration/__tests__/worker-script-template-snapshot.test.ts +129 -0
- package/src/orchestration/__tests__/workflow-nesting-e2e.test.ts +317 -0
- package/src/orchestration/__tests__/workflow-script-lint-memo.test.ts +110 -0
- package/src/orchestration/agent-opts-resolver.ts +174 -0
- package/src/orchestration/args-validator.ts +127 -0
- package/src/orchestration/config-loader.ts +316 -0
- package/src/orchestration/error-recovery.ts +1018 -0
- package/src/orchestration/execute-agent-call.ts +256 -0
- package/src/orchestration/launcher.ts +455 -0
- package/src/orchestration/lifecycle.ts +399 -0
- package/src/orchestration/models/__tests__/budget.test.ts +307 -0
- package/src/orchestration/models/agent-call.ts +83 -0
- package/src/orchestration/models/budget.ts +118 -0
- package/src/orchestration/models/ports.ts +164 -0
- package/src/orchestration/models/run-runtime.ts +104 -0
- package/src/orchestration/models/run-spec.ts +83 -0
- package/src/orchestration/models/run-state.ts +44 -0
- package/src/orchestration/models/trace.ts +183 -0
- package/src/orchestration/models/types.ts +301 -0
- package/src/orchestration/models/workflow-run.ts +254 -0
- package/src/orchestration/models/workflow-script-registry.ts +35 -0
- package/src/orchestration/models/workflow-script.ts +117 -0
- package/src/orchestration/script-lint.ts +766 -0
- package/src/orchestration/skill-discovery.ts +135 -0
- package/src/orchestration/worker-handle.ts +115 -0
- package/src/orchestration/worker-host.ts +98 -0
- package/src/orchestration/worker-script-builder.ts +421 -0
- package/src/orchestration/workflow-files.ts +85 -0
- package/src/orchestration/workflow-script-registry-impl.ts +133 -0
- package/src/shared/__tests__/agent-ref.test.ts +34 -0
- package/src/shared/__tests__/meta-parser.test.ts +304 -0
- package/src/shared/__tests__/model-ref.test.ts +306 -0
- package/src/shared/__tests__/resource-discovery-manifest-cache.test.ts +288 -0
- package/src/shared/__tests__/resource-discovery.test.ts +749 -0
- package/src/shared/__tests__/resource-meta.test.ts +51 -0
- package/src/shared/__tests__/schema-jsonify.test.ts +81 -0
- package/src/shared/__tests__/timer-delay.test.ts +61 -0
- package/src/shared/agent-event.ts +13 -0
- package/src/shared/agent-ref.ts +57 -0
- package/src/shared/meta-parser.ts +261 -0
- package/src/shared/model-ref.ts +286 -0
- package/src/shared/resource-discovery.ts +835 -0
- package/src/shared/resource-meta.ts +65 -0
- package/src/shared/schema-env.ts +44 -0
- package/src/shared/schema-jsonify.ts +58 -0
- package/src/shared/timer-delay.ts +54 -0
- package/src/shared/xml-injection.ts +35 -0
- package/workflows/README.md +81 -0
- package/workflows/_shared/agent-refs.cjs +40 -0
- package/workflows/chain.js +137 -0
- package/workflows/map-reduce.js +180 -0
- package/workflows/parallel.js +154 -0
- package/workflows/review-fix-loop-utils.cjs +1542 -0
- package/workflows/review-fix-loop.js +1605 -0
- package/workflows/scatter-gather.js +184 -0
|
@@ -0,0 +1,243 @@
|
|
|
1
|
+
// src/__tests__/execute-and-await-worktree.test.ts
|
|
2
|
+
//
|
|
3
|
+
// executeAndAwait 的 worktree 失败收尾测试(W1 code review 修复回归锁)。
|
|
4
|
+
//
|
|
5
|
+
// 覆盖:worktreeManager.create 抛错时 record 被 finalizeFailed(status→failed)且原错外抛。
|
|
6
|
+
// (worktree 与 fork 解耦后,worktree:true+fork:false 的解耦验证见 subagent-service.test.ts。)
|
|
7
|
+
//
|
|
8
|
+
// ── mock 策略 ──
|
|
9
|
+
//
|
|
10
|
+
// 复用 execute-nesting.test.ts 的 spawn / node:fs / manifest-store / temp-prompt / alive-store
|
|
11
|
+
// / finalized-marker mock 范式(见该文件头部详细注释)。本文件 **不驱动 FakeChild 完成**——
|
|
12
|
+
// 被测的两个分支都在 runSpawn 之前抛/收尾(worktree create 在步骤 2.5,runSpawn 在步骤 5),
|
|
13
|
+
// 因此 spawn 即使被调也无人驱动,测试在抛错后立即断言即可结束。
|
|
14
|
+
//
|
|
15
|
+
// worktreeManager 是 SubagentService 构造时 new 出的私有字段(WorktreeManager 实例,非模块)。
|
|
16
|
+
// 测试 2 用 vi.spyOn(Reflect.get(service, "worktreeManager"), "create") 注入抛错,无需模块级 mock。
|
|
17
|
+
|
|
18
|
+
import { PassThrough } from "node:stream";
|
|
19
|
+
|
|
20
|
+
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
21
|
+
|
|
22
|
+
// ── mock modules(与 execute-nesting.test.ts 同范式)──
|
|
23
|
+
|
|
24
|
+
vi.mock("node:child_process", async () => {
|
|
25
|
+
const { EventEmitter } = await import("node:events");
|
|
26
|
+
const { PassThrough } = await import("node:stream");
|
|
27
|
+
|
|
28
|
+
class FakeChild extends EventEmitter {
|
|
29
|
+
pid = 12345;
|
|
30
|
+
stdout = new PassThrough();
|
|
31
|
+
stderr = new PassThrough();
|
|
32
|
+
killed = false;
|
|
33
|
+
killSignal: string | undefined;
|
|
34
|
+
kill(sig?: string): boolean {
|
|
35
|
+
this.killed = true;
|
|
36
|
+
this.killSignal = sig;
|
|
37
|
+
return true;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
return {
|
|
42
|
+
spawn: vi.fn(() => new FakeChild()),
|
|
43
|
+
// buildEnvBlock 的 git branch 调用(execFile 异步):默认 err-first 兜底 → catch → branch=""
|
|
44
|
+
execFile: vi.fn(
|
|
45
|
+
(
|
|
46
|
+
_cmd: string,
|
|
47
|
+
_args: readonly string[],
|
|
48
|
+
_opts: unknown,
|
|
49
|
+
cb: (err: Error | null, stdout?: string, stderr?: string) => void,
|
|
50
|
+
) => cb(new Error("execFile not configured in this test")),
|
|
51
|
+
),
|
|
52
|
+
};
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
vi.mock("node:fs", async () => {
|
|
56
|
+
const actual = await import("node:fs");
|
|
57
|
+
return {
|
|
58
|
+
default: {
|
|
59
|
+
...actual,
|
|
60
|
+
mkdirSync: vi.fn(),
|
|
61
|
+
existsSync: vi.fn(() => false),
|
|
62
|
+
appendFileSync: vi.fn(),
|
|
63
|
+
writeFileSync: vi.fn(),
|
|
64
|
+
readdirSync: vi.fn(() => []),
|
|
65
|
+
},
|
|
66
|
+
mkdirSync: vi.fn(),
|
|
67
|
+
existsSync: vi.fn(() => false),
|
|
68
|
+
appendFileSync: vi.fn(),
|
|
69
|
+
writeFileSync: vi.fn(),
|
|
70
|
+
readdirSync: vi.fn(() => []),
|
|
71
|
+
promises: actual.promises,
|
|
72
|
+
};
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
vi.mock("../alive-store.ts", async (importOriginal) => {
|
|
76
|
+
const actual = await importOriginal<typeof import("../alive-store.ts")>();
|
|
77
|
+
return {
|
|
78
|
+
...actual,
|
|
79
|
+
writeAliveMarker: vi.fn(),
|
|
80
|
+
removeAliveMarker: vi.fn(),
|
|
81
|
+
};
|
|
82
|
+
});
|
|
83
|
+
|
|
84
|
+
vi.mock("../finalized-marker.ts", () => ({
|
|
85
|
+
writeFinalized: vi.fn(),
|
|
86
|
+
readFinalized: vi.fn(() => false),
|
|
87
|
+
}));
|
|
88
|
+
|
|
89
|
+
vi.mock("../manifest-store.ts", () => {
|
|
90
|
+
class FakeManifestStore {
|
|
91
|
+
writeManifest = vi.fn(async () => {});
|
|
92
|
+
readManifest = vi.fn(async () => null);
|
|
93
|
+
listAllSync = vi.fn(() => []);
|
|
94
|
+
recoverTmpFiles = vi.fn(async () => []);
|
|
95
|
+
}
|
|
96
|
+
return { ManifestStore: FakeManifestStore };
|
|
97
|
+
});
|
|
98
|
+
|
|
99
|
+
vi.mock("../temp-prompt.ts", () => ({
|
|
100
|
+
writePromptToTempFile: vi.fn(async (agent: string) => {
|
|
101
|
+
const safeName = agent.replace(/[^\w.-]+/g, "_");
|
|
102
|
+
return { dir: `/tmp/fake-${safeName}`, filePath: `/tmp/fake-${safeName}/prompt-${safeName}.md` };
|
|
103
|
+
}),
|
|
104
|
+
cleanupTempPrompt: vi.fn(async () => {}),
|
|
105
|
+
}));
|
|
106
|
+
|
|
107
|
+
import { ModelConfigService } from "../model-config-service.ts";
|
|
108
|
+
import type { ModelInfo, ModelRegistryLike } from "../model-resolver.ts";
|
|
109
|
+
import type { RecordStore } from "../record-store.ts";
|
|
110
|
+
import type { WorktreeManager } from "../worktree-manager.ts";
|
|
111
|
+
import { SubagentService } from "../subagent-service.ts";
|
|
112
|
+
|
|
113
|
+
// ── 辅助:service 构造(与 execute-nesting.test.ts setup 等价)──
|
|
114
|
+
|
|
115
|
+
function makeEmptyRegistry(): ModelRegistryLike {
|
|
116
|
+
return { getAvailable: () => [], find: () => undefined, hasConfiguredAuth: () => true };
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
function makePi() {
|
|
120
|
+
return { sendMessage: vi.fn(), appendEntry: vi.fn(), events: { emit: vi.fn() } };
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
interface SetupResult {
|
|
124
|
+
service: SubagentService;
|
|
125
|
+
worktreeManager: WorktreeManager;
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
function setup(): SetupResult {
|
|
129
|
+
const agentDir = "/tmp/exec-await-worktree-it"; // fs 已 mock,路径不需真实存在
|
|
130
|
+
const modelService = new ModelConfigService({ agentDir });
|
|
131
|
+
modelService.initModel({
|
|
132
|
+
modelRegistry: makeEmptyRegistry(),
|
|
133
|
+
sessionId: "exec-await-worktree-it",
|
|
134
|
+
ctxModel: { id: "m", name: "M", provider: "p", reasoning: false },
|
|
135
|
+
});
|
|
136
|
+
const service = new SubagentService({
|
|
137
|
+
cwd: agentDir,
|
|
138
|
+
modelService,
|
|
139
|
+
getMainSessionFile: () => "/mock/main-session.jsonl",
|
|
140
|
+
});
|
|
141
|
+
service.initSession({ pi: makePi(), sessionId: "exec-await-worktree-it" });
|
|
142
|
+
// worktreeManager 是 SubagentService 构造时 new 的 private 字段(无外部注入入口),
|
|
143
|
+
// 测试经 Reflect.get 访问后 cast 到生产导出类型 WorktreeManager(已在文件顶部 import),
|
|
144
|
+
// 让字段/方法签名与生产类型契约绑定。
|
|
145
|
+
const worktreeManager = Reflect.get(service, "worktreeManager") as WorktreeManager;
|
|
146
|
+
return { service, worktreeManager };
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
const ctxModel: ModelInfo = { id: "m", name: "M", provider: "p", reasoning: false };
|
|
150
|
+
|
|
151
|
+
/**
|
|
152
|
+
* 从 service 取出 private store(断言 record 终态用)。
|
|
153
|
+
*
|
|
154
|
+
* worktreeManager 与 store 都是 SubagentService 构造时 new 出的 private 字段——
|
|
155
|
+
* 无外部注入入口,测试只能经 Reflect.get 访问。这里 cast 到生产导出类型
|
|
156
|
+
* (RecordStore / WorktreeManager)而非内联匿名 shape,让测试与生产类型契约绑定:
|
|
157
|
+
* 字段改名/签名变更时 tsc 立即报错(而非静默漂移)。
|
|
158
|
+
*/
|
|
159
|
+
function getStore(service: SubagentService): RecordStore {
|
|
160
|
+
return Reflect.get(service, "store") as RecordStore;
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
describe("executeAndAwait worktree 失败收尾", () => {
|
|
164
|
+
afterEach(() => {
|
|
165
|
+
vi.restoreAllMocks();
|
|
166
|
+
});
|
|
167
|
+
|
|
168
|
+
// ============================================================
|
|
169
|
+
// worktreeManager.create 抛错 → record 收尾为 failed + 原错外抛
|
|
170
|
+
// ============================================================
|
|
171
|
+
it("worktreeManager.create 失败时 finalizeFailed 收尾 record 并抛原错", async () => {
|
|
172
|
+
const { service, worktreeManager } = setup();
|
|
173
|
+
|
|
174
|
+
const createErr = new Error("worktree create boom");
|
|
175
|
+
vi.spyOn(worktreeManager, "create").mockImplementation(() => {
|
|
176
|
+
throw createErr;
|
|
177
|
+
});
|
|
178
|
+
|
|
179
|
+
// spy store.archive:finalizeFailed 真实收尾链(CAS→completeRecord→archive)的最末一步。
|
|
180
|
+
// 捕获传入 archive 的 record,断言其 status 已被推向 "failed"(证明 finalizeFailed 完整执行,
|
|
181
|
+
// 而非仅 tryTransition 中途返回)。archive 真实执行(不 mockImplementation)以保留移出 running map 的语义。
|
|
182
|
+
const store = getStore(service);
|
|
183
|
+
const archiveSpy = vi.spyOn(store, "archive");
|
|
184
|
+
|
|
185
|
+
await expect(
|
|
186
|
+
service.executeAndAwait({
|
|
187
|
+
task: "worktree create will fail",
|
|
188
|
+
slug: "worktree-create-fail",
|
|
189
|
+
worktree: true,
|
|
190
|
+
fork: true,
|
|
191
|
+
ctxModel,
|
|
192
|
+
}),
|
|
193
|
+
).rejects.toBe(createErr);
|
|
194
|
+
|
|
195
|
+
// finalizeFailed 完整执行:record 经 CAS→completeRecord 推到 failed 终态后 archive。
|
|
196
|
+
expect(archiveSpy).toHaveBeenCalledTimes(1);
|
|
197
|
+
// store 现已强类型为 RecordStore → archive 入参为 ExecutionRecord,无需 `as` 断言。
|
|
198
|
+
const archivedRecord = archiveSpy.mock.calls[0]![0];
|
|
199
|
+
expect(archivedRecord.status).toBe("closed");
|
|
200
|
+
// archive 后 record 已移出 running map → listRunning 空、getMutable 取不到。
|
|
201
|
+
expect(store.listRunning()).toHaveLength(0);
|
|
202
|
+
expect(store.getMutable(archivedRecord.id)).toBeUndefined();
|
|
203
|
+
});
|
|
204
|
+
|
|
205
|
+
// ============================================================
|
|
206
|
+
// create-await 竞态守卫(Phase 2):create await 窗口内 dispose 抢先把
|
|
207
|
+
// record CAS 成 closed → 守卫 cleanup + throw cancelled(失败 throw 语义,
|
|
208
|
+
// SAR.run 的 catch 会转 AgentResult.error)。守卫 throw 不落在 try 内
|
|
209
|
+
// (否则被上方 catch 当 create 失败再走 finalizeFailed,对已 closed record 语义未定义)。
|
|
210
|
+
// ============================================================
|
|
211
|
+
it("守卫:create await 窗口内 dispose 抢先 → cleanup 被调 + throw cancelled(不进 runAndFinalize)", async () => {
|
|
212
|
+
const { service, worktreeManager } = setup();
|
|
213
|
+
|
|
214
|
+
const handle = Object.freeze({
|
|
215
|
+
path: "/tmp/wt-guard2",
|
|
216
|
+
branch: "pi-sub-guard2",
|
|
217
|
+
baseCommit: "abc123",
|
|
218
|
+
mainCwd: "/repo",
|
|
219
|
+
}) as Parameters<WorktreeManager["cleanup"]>[0];
|
|
220
|
+
let resolveCreate!: (h: unknown) => void;
|
|
221
|
+
vi.spyOn(worktreeManager, "create").mockImplementation(
|
|
222
|
+
() => new Promise((r) => { resolveCreate = r; }) as ReturnType<WorktreeManager["create"]>,
|
|
223
|
+
);
|
|
224
|
+
const cleanupSpy = vi.spyOn(worktreeManager, "cleanup").mockResolvedValue(undefined);
|
|
225
|
+
|
|
226
|
+
const execP = service.executeAndAwait({
|
|
227
|
+
task: "guard test",
|
|
228
|
+
slug: "guard-test",
|
|
229
|
+
worktree: true,
|
|
230
|
+
fork: true,
|
|
231
|
+
ctxModel,
|
|
232
|
+
});
|
|
233
|
+
// 微任务推进:record 已建 + executeAndAwait 挂在 pending create 上
|
|
234
|
+
await new Promise((r) => { setTimeout(r, 0); });
|
|
235
|
+
// dispose 抢先:CAS running → closed(此刻 worktreeHandle 仍 undefined,
|
|
236
|
+
// dispose 的 fire-and-forget cleanup 跳过)——守卫是唯一清理点
|
|
237
|
+
service.disposeAllRecords("parent-shutdown");
|
|
238
|
+
resolveCreate(handle);
|
|
239
|
+
|
|
240
|
+
await expect(execP).rejects.toThrow("cancelled during worktree creation");
|
|
241
|
+
expect(cleanupSpy).toHaveBeenCalledWith(handle);
|
|
242
|
+
});
|
|
243
|
+
});
|
|
@@ -0,0 +1,323 @@
|
|
|
1
|
+
// src/__tests__/execute-nesting.test.ts
|
|
2
|
+
//
|
|
3
|
+
// D-030~D-033 嵌套 / 并发池 / 节流回归锁。独立于 execute-integration.test.ts。
|
|
4
|
+
//
|
|
5
|
+
// 用例:
|
|
6
|
+
// D-032 background 进并发池(分层配额:max(1, maxConcurrent - depth))
|
|
7
|
+
// D-033 execute 入口通用嵌套护栏(execCtxAls 计 fork+非 fork 嵌套,深度>MAX 拒)
|
|
8
|
+
// (原「嵌套抑制 onUpdate」「节流清理 throttleState」用例组已随 onEventThrottled
|
|
9
|
+
// 死路径删除一并移除——swf-perf-impl ledger #22 / cleanup-slice TC4)
|
|
10
|
+
//
|
|
11
|
+
// ── mock 策略 ──
|
|
12
|
+
//
|
|
13
|
+
// [关键] runSpawn(session-runner.ts)通过 child_process.spawn("pi",...) 启动子进程,
|
|
14
|
+
// 事件经 stdout JSON 流回流。它 **不走 getSdk / createAgentSession**。
|
|
15
|
+
// 因此本文件 mock 的是 node:child_process.spawn(返回 FakeChild),而非 getSdk/fakeSession
|
|
16
|
+
// (那是对 in-process run() 的旧 mock,在 spawn 改造后是死代码)。
|
|
17
|
+
//
|
|
18
|
+
// mock 模式参考 run-spawn-integration.test.ts(该文件是 spawn 改造后的正确 mock 范式):
|
|
19
|
+
// - node:child_process.spawn → FakeChild(EventEmitter + PassThrough),测试控制器
|
|
20
|
+
// emit stdout JSON 行(header + SdkEvent)/ stderr / close 时序。
|
|
21
|
+
// - node:child_process.execFile → err-first callback 默认兜底(buildEnvBlock 的 git
|
|
22
|
+
// branch 调用失败 → catch → branch="",避免副作用)。
|
|
23
|
+
// - node:fs 同步方法 → mock(mkdirSync/existsSync/appendFileSync/writeFileSync/readdirSync),
|
|
24
|
+
// 避免 sessionDir/sessionFile 触碰真实文件系统。
|
|
25
|
+
// - fs.promises.* → 保留真实实现(temp-prompt 整体被 mock,不触发真实 I/O)。
|
|
26
|
+
// - temp-prompt → mock(writePromptToTempFile 返回固定路径,消除 fake-timers flaky)。
|
|
27
|
+
// - alive-store.writeAliveMarker → mock(避免写 .alive sidecar)。
|
|
28
|
+
//
|
|
29
|
+
// 所有断言语义不变:它们测的是 SubagentService 的 **编排逻辑**
|
|
30
|
+
// (pool.acquire / execCtxAls 深度),这些逻辑
|
|
31
|
+
// 无论事件来自 fakeSession.subscribe 还是 FakeChild.stdout 都一致。
|
|
32
|
+
|
|
33
|
+
import type { PassThrough } from "node:stream";
|
|
34
|
+
|
|
35
|
+
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
36
|
+
|
|
37
|
+
// ── mock modules ──
|
|
38
|
+
//
|
|
39
|
+
// vitest 会把 vi.mock 提升到文件顶部(早于其他 import / 声明)。mock 工厂若要引用
|
|
40
|
+
// FakeChild,需在工厂内部 import(async 工厂可用 await import),而非引用顶部
|
|
41
|
+
// 顶层 import(它们在 vi.mock 执行时尚未绑定)。
|
|
42
|
+
|
|
43
|
+
vi.mock("node:child_process", async () => {
|
|
44
|
+
const { EventEmitter } = await import("node:events");
|
|
45
|
+
const { PassThrough } = await import("node:stream");
|
|
46
|
+
|
|
47
|
+
// FakeChild:模拟 ChildProcess(EventEmitter + PassThrough streams)。
|
|
48
|
+
// 测试通过 lastSpawnedChild() 取回实例,控制 emit stdout JSON 行 / close 时序。
|
|
49
|
+
class FakeChild extends EventEmitter {
|
|
50
|
+
pid = 12345;
|
|
51
|
+
stdout = new PassThrough();
|
|
52
|
+
stderr = new PassThrough();
|
|
53
|
+
killed = false;
|
|
54
|
+
killSignal: string | undefined;
|
|
55
|
+
kill(sig?: string): boolean {
|
|
56
|
+
this.killed = true;
|
|
57
|
+
this.killSignal = sig;
|
|
58
|
+
return true;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
return {
|
|
63
|
+
spawn: vi.fn(() => new FakeChild()),
|
|
64
|
+
// buildEnvBlock 的 git branch 调用(execFile 异步):默认 err-first 兜底 → catch → branch=""
|
|
65
|
+
execFile: vi.fn(
|
|
66
|
+
(
|
|
67
|
+
_cmd: string,
|
|
68
|
+
_args: readonly string[],
|
|
69
|
+
_opts: unknown,
|
|
70
|
+
cb: (err: Error | null, stdout?: string, stderr?: string) => void,
|
|
71
|
+
) => cb(new Error("execFile not configured in this test")),
|
|
72
|
+
),
|
|
73
|
+
};
|
|
74
|
+
});
|
|
75
|
+
|
|
76
|
+
// node:fs:同步方法 mock(runSpawn 用到的全部),promises 保留真实实现(temp-prompt 用)。
|
|
77
|
+
vi.mock("node:fs", async () => {
|
|
78
|
+
const actual = await import("node:fs");
|
|
79
|
+
return {
|
|
80
|
+
default: {
|
|
81
|
+
...actual,
|
|
82
|
+
mkdirSync: vi.fn(),
|
|
83
|
+
existsSync: vi.fn(() => false),
|
|
84
|
+
appendFileSync: vi.fn(),
|
|
85
|
+
writeFileSync: vi.fn(),
|
|
86
|
+
readdirSync: vi.fn(() => []),
|
|
87
|
+
},
|
|
88
|
+
// 具名导出与 default 保持一致
|
|
89
|
+
mkdirSync: vi.fn(),
|
|
90
|
+
existsSync: vi.fn(() => false),
|
|
91
|
+
appendFileSync: vi.fn(),
|
|
92
|
+
writeFileSync: vi.fn(),
|
|
93
|
+
readdirSync: vi.fn(() => []),
|
|
94
|
+
// promises 保留真实实现——temp-prompt 已被 mock(见下方 vi.mock),不再触发真实 I/O
|
|
95
|
+
promises: actual.promises,
|
|
96
|
+
};
|
|
97
|
+
});
|
|
98
|
+
|
|
99
|
+
// alive-store:mock writeAliveMarker(runSpawn 写 .alive sidecar)+ removeAliveMarker
|
|
100
|
+
// (finalizeRecord 收尾删 .alive)。其余导出(readAliveMarker/isProcessAlive)保留真实实现
|
|
101
|
+
// (worktree-manager/record-store 用,本组用例不涉及但保留以避免间接报错)。
|
|
102
|
+
vi.mock("../alive-store.ts", async (importOriginal) => {
|
|
103
|
+
const actual = await importOriginal<typeof import("../alive-store.ts")>();
|
|
104
|
+
return {
|
|
105
|
+
...actual,
|
|
106
|
+
writeAliveMarker: vi.fn(),
|
|
107
|
+
removeAliveMarker: vi.fn(),
|
|
108
|
+
};
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
// finalized-marker mock:避免真实 fs 写 sidecar(测试不关心 finalized 行为)
|
|
112
|
+
vi.mock("../finalized-marker.ts", () => ({
|
|
113
|
+
writeFinalized: vi.fn(),
|
|
114
|
+
readFinalized: vi.fn(() => false),
|
|
115
|
+
}));
|
|
116
|
+
|
|
117
|
+
// manifest-store mock:writeManifest 用真实 fs.promises 写盘,但本文件 fs 同步方法已 mock
|
|
118
|
+
// (目录从不真实创建)→ open/rename/unlink 全 ENOENT → bestEffort 异步 console.debug。
|
|
119
|
+
// 这些延迟 console 通过 worker RPC(onUserConsoleLog)回流,与 vitest teardown 形成 race:
|
|
120
|
+
// "Closing rpc while onUserConsoleLog was pending" → unhandled rejection / exit 1(flaky)。
|
|
121
|
+
// 本组用例测编排逻辑(pool / depth / throttle),不测 manifest 持久化(有 manifest-store.test.ts
|
|
122
|
+
// 独立覆盖)。故 mock 成 no-op,消除 teardown race 的根因——异步 console 输出。
|
|
123
|
+
vi.mock("../manifest-store.ts", () => {
|
|
124
|
+
class FakeManifestStore {
|
|
125
|
+
writeManifest = vi.fn(async () => {});
|
|
126
|
+
readManifest = vi.fn(async () => null);
|
|
127
|
+
listAllSync = vi.fn(() => []);
|
|
128
|
+
recoverTmpFiles = vi.fn(async () => []);
|
|
129
|
+
}
|
|
130
|
+
return { ManifestStore: FakeManifestStore };
|
|
131
|
+
});
|
|
132
|
+
|
|
133
|
+
// temp-prompt:mock 掉真实 fs.promises I/O,消除 fake-timers 下的 flaky 竞态
|
|
134
|
+
// (详见 run-spawn-integration.test.ts 同名 mock 的注释)。
|
|
135
|
+
vi.mock("../temp-prompt.ts", () => ({
|
|
136
|
+
writePromptToTempFile: vi.fn(async (agent: string) => {
|
|
137
|
+
const safeName = agent.replace(/[^\w.-]+/g, "_");
|
|
138
|
+
return { dir: `/tmp/fake-${safeName}`, filePath: `/tmp/fake-${safeName}/prompt-${safeName}.md` };
|
|
139
|
+
}),
|
|
140
|
+
cleanupTempPrompt: vi.fn(async () => {}),
|
|
141
|
+
}));
|
|
142
|
+
|
|
143
|
+
import { spawn } from "node:child_process";
|
|
144
|
+
|
|
145
|
+
import { waitForSpawn } from "./helpers/spawn-mock.ts";
|
|
146
|
+
import { ModelConfigService } from "../model-config-service.ts";
|
|
147
|
+
import type { ModelInfo, ModelRegistryLike } from "../model-resolver.ts";
|
|
148
|
+
import { MAX_FORK_DEPTH } from "../session-context-resolver.ts";
|
|
149
|
+
import { SubagentService } from "../subagent-service.ts";
|
|
150
|
+
|
|
151
|
+
const mockSpawn = vi.mocked(spawn);
|
|
152
|
+
|
|
153
|
+
/**
|
|
154
|
+
* spawn mock 返回的 fake child 类型。
|
|
155
|
+
* 由于 FakeChild 定义在 vi.mock 工厂内部(作用域隔离),此处用结构子集类型描述,
|
|
156
|
+
* 测试代码通过此类型访问 stdout/stderr/kill 等成员。
|
|
157
|
+
*/
|
|
158
|
+
interface FakeChild {
|
|
159
|
+
pid: number;
|
|
160
|
+
stdout: PassThrough;
|
|
161
|
+
stderr: PassThrough;
|
|
162
|
+
killed: boolean;
|
|
163
|
+
killSignal: string | undefined;
|
|
164
|
+
kill(sig?: string): boolean;
|
|
165
|
+
emit(event: string, ...args: unknown[]): boolean;
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
/** 从最近一次 spawn 调用取回返回的 FakeChild(测试控制器)。 */
|
|
169
|
+
function lastSpawnedChild(): FakeChild {
|
|
170
|
+
const result = mockSpawn.mock.results.at(-1);
|
|
171
|
+
if (!result) throw new Error("spawn was not called yet");
|
|
172
|
+
return result.value as FakeChild;
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
// ============================================================
|
|
176
|
+
// 辅助:FakeChild stdout 驱动(替代旧 fakeSession.subscribe 的事件注入)
|
|
177
|
+
// ============================================================
|
|
178
|
+
|
|
179
|
+
/** 构造 session header 行(stdout 首行,runSpawn 据此回填 record.sessionFile)。 */
|
|
180
|
+
function sessionHeader(id = "nest-session"): Record<string, unknown> {
|
|
181
|
+
return {
|
|
182
|
+
type: "session",
|
|
183
|
+
id,
|
|
184
|
+
timestamp: "2026-07-03T12-00-00-000Z",
|
|
185
|
+
cwd: "/tmp/test",
|
|
186
|
+
};
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
/** 向 stdout 写一行 JSON(自动补换行,runSpawn 按 \n split 行)。 */
|
|
190
|
+
function emitStdoutLine(child: FakeChild, obj: Record<string, unknown>): void {
|
|
191
|
+
child.stdout.write(`${JSON.stringify(obj)}\n`);
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
/**
|
|
195
|
+
* 驱动 FakeChild 完成 session:写 header + 可选事件 + close(0)。
|
|
196
|
+
*
|
|
197
|
+
* 这是「让 runSpawn 自然 resolve」的标准收尾路径。runSpawn 在 close 后判定 success
|
|
198
|
+
* (exitCode=0 → success=true),并跑 identity 补写 + finalizeRecord。
|
|
199
|
+
*
|
|
200
|
+
* @param events header 之后、close 之前 emit 的 SdkEvent 行(tool/message/turn 等)
|
|
201
|
+
*/
|
|
202
|
+
async function driveChildToCompletion(child: FakeChild, events: Record<string, unknown>[] = []): Promise<void> {
|
|
203
|
+
emitStdoutLine(child, sessionHeader());
|
|
204
|
+
for (const e of events) emitStdoutLine(child, e);
|
|
205
|
+
child.stdout.end();
|
|
206
|
+
child.stderr.end();
|
|
207
|
+
child.emit("close", 0);
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
// ============================================================
|
|
211
|
+
// 辅助:service 构造(与旧 setup 等价,但不再装配 fakeSdk)
|
|
212
|
+
// ============================================================
|
|
213
|
+
|
|
214
|
+
function makeEmptyRegistry(): ModelRegistryLike {
|
|
215
|
+
return { getAvailable: () => [], find: () => undefined, hasConfiguredAuth: () => true };
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
function makePi() {
|
|
219
|
+
return { sendMessage: vi.fn(), appendEntry: vi.fn(), events: { emit: vi.fn() } };
|
|
220
|
+
}
|
|
221
|
+
|
|
222
|
+
interface SetupResult {
|
|
223
|
+
service: SubagentService;
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
function setup(): SetupResult {
|
|
227
|
+
const agentDir = "/tmp/nest-it"; // fs 已 mock,路径不需真实存在
|
|
228
|
+
const modelService = new ModelConfigService({ agentDir });
|
|
229
|
+
modelService.initModel({
|
|
230
|
+
modelRegistry: makeEmptyRegistry(),
|
|
231
|
+
sessionId: "nest-it",
|
|
232
|
+
ctxModel: { id: "m", name: "M", provider: "p", reasoning: false },
|
|
233
|
+
});
|
|
234
|
+
const service = new SubagentService({
|
|
235
|
+
cwd: agentDir,
|
|
236
|
+
modelService,
|
|
237
|
+
getMainSessionFile: () => "/mock/main-session.jsonl",
|
|
238
|
+
});
|
|
239
|
+
service.initSession({ pi: makePi(), sessionId: "nest-it" });
|
|
240
|
+
return { service };
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
const ctxModel: ModelInfo = { id: "m", name: "M", provider: "p", reasoning: false };
|
|
244
|
+
|
|
245
|
+
/** execCtxAls.run 的 duck-type(绕过 import AsyncLocalStorage,足够本组用例)。 */
|
|
246
|
+
interface ExecCtxAls {
|
|
247
|
+
run: <T>(store: { recordId: string | undefined; depth: number }, cb: () => T) => T;
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
describe("嵌套护栏 / 并发池 / 节流(D-030~D-033 回归锁)", () => {
|
|
251
|
+
afterEach(() => {
|
|
252
|
+
vi.clearAllMocks();
|
|
253
|
+
});
|
|
254
|
+
|
|
255
|
+
// ============================================================
|
|
256
|
+
// D-032: background execute 进并发池(分层配额)
|
|
257
|
+
// ============================================================
|
|
258
|
+
|
|
259
|
+
it("[D-032] background execute 调 pool.acquire(进池限流)", async () => {
|
|
260
|
+
const { service } = setup();
|
|
261
|
+
|
|
262
|
+
const pool = Reflect.get(service, "pool") as { acquire: ReturnType<typeof vi.fn>; release: ReturnType<typeof vi.fn> };
|
|
263
|
+
const acquireSpy = vi.spyOn(pool, "acquire");
|
|
264
|
+
|
|
265
|
+
const execPromise = service.execute({ task: "bg in pool", ctxModel });
|
|
266
|
+
// detached runAndFinalize → acquire。等 spawn 拿到 child 再驱动完成。
|
|
267
|
+
await waitForSpawn(mockSpawn);
|
|
268
|
+
await driveChildToCompletion(lastSpawnedChild());
|
|
269
|
+
|
|
270
|
+
// 等 detached promise 链跑完(kickOffBackground 的 .then notify)
|
|
271
|
+
await new Promise<void>((r) => setTimeout(r, 10));
|
|
272
|
+
|
|
273
|
+
expect(acquireSpy).toHaveBeenCalled();
|
|
274
|
+
// background execute 立即返回 handle(不等完成)
|
|
275
|
+
const handle = await execPromise;
|
|
276
|
+
expect(handle.mode).toBe("background");
|
|
277
|
+
});
|
|
278
|
+
|
|
279
|
+
// ============================================================
|
|
280
|
+
// D-033: 通用嵌套护栏(execute 入口,execCtxAls 非 fork 路径)
|
|
281
|
+
// ============================================================
|
|
282
|
+
|
|
283
|
+
it("[D-033] execCtxAls depth=MAX 时 execute 抛错(nestingDepth=MAX+1 被拒)", async () => {
|
|
284
|
+
const { service } = setup();
|
|
285
|
+
|
|
286
|
+
const execCtxAls = Reflect.get(service, "execCtxAls") as ExecCtxAls;
|
|
287
|
+
|
|
288
|
+
await expect(
|
|
289
|
+
execCtxAls.run({ recordId: "parent", depth: MAX_FORK_DEPTH }, () =>
|
|
290
|
+
service.execute({ task: "too deep", ctxModel }),
|
|
291
|
+
),
|
|
292
|
+
).rejects.toThrow(/nesting depth/);
|
|
293
|
+
|
|
294
|
+
// 无副作用:guard 在 createRecordForMode 之前,record 未创建
|
|
295
|
+
expect(service.collectRecords(10)).toHaveLength(0);
|
|
296
|
+
// guard 在 spawn 之前——不应 spawn 任何子进程
|
|
297
|
+
expect(mockSpawn).not.toHaveBeenCalled();
|
|
298
|
+
});
|
|
299
|
+
|
|
300
|
+
it("[D-033] execCtxAls depth=MAX-1 时 execute 不抛(nestingDepth=MAX 允许)", async () => {
|
|
301
|
+
const { service } = setup();
|
|
302
|
+
|
|
303
|
+
const execCtxAls = Reflect.get(service, "execCtxAls") as ExecCtxAls;
|
|
304
|
+
|
|
305
|
+
const execPromise = execCtxAls.run({ recordId: "parent", depth: MAX_FORK_DEPTH - 1 }, () =>
|
|
306
|
+
service.execute({ task: "at limit", ctxModel }),
|
|
307
|
+
);
|
|
308
|
+
await waitForSpawn(mockSpawn);
|
|
309
|
+
await driveChildToCompletion(lastSpawnedChild(), [
|
|
310
|
+
{ type: "turn_end" },
|
|
311
|
+
{ type: "message_end", message: { usage: { input: 1 } } },
|
|
312
|
+
]);
|
|
313
|
+
const result = await execPromise;
|
|
314
|
+
|
|
315
|
+
expect(result.mode).toBe("background");
|
|
316
|
+
});
|
|
317
|
+
|
|
318
|
+
// ============================================================
|
|
319
|
+
// 原嵌套抑制 onUpdate / 节流清理 throttleState 用例组(:322-355)已删除——
|
|
320
|
+
// onEventThrottled 死路径删除(swf-perf-impl ledger #22 / cleanup-slice TC4/IF14,
|
|
321
|
+
// 详见 .cw/swf-perf-impl/cleanup-slice-design.json)。恢复点:本 slice 前的 git 历史。
|
|
322
|
+
// ============================================================
|
|
323
|
+
});
|