@zhushanwen/subagent-core 0.2.0 → 0.5.1
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 +45 -2
- package/agents/analyst.md +60 -0
- package/agents/coder.md +69 -0
- package/agents/debugger.md +66 -0
- package/agents/doc-reviewer.md +49 -0
- package/agents/explorer.md +63 -0
- package/agents/general-purpose.md +32 -0
- package/agents/orchestrator.md +61 -0
- package/agents/planner.md +53 -0
- package/agents/researcher.md +67 -0
- package/agents/reviewer.md +73 -0
- package/dist/chunk-43ONBFZX.js +240 -0
- package/dist/chunk-APZY4IME.js +27 -0
- package/dist/chunk-V3VHZ2VX.js +59 -0
- package/dist/execution/engine/engines/zcode/constants.cjs +62 -9
- package/dist/execution/engine/engines/zcode/constants.d.cts +116 -12
- package/dist/execution/engine/engines/zcode/constants.d.ts +116 -12
- package/dist/execution/engine/engines/zcode/constants.js +39 -7
- package/dist/execution/engine/engines/zcode/reader.d.cts +2 -1
- package/dist/execution/engine/engines/zcode/reader.d.ts +2 -1
- package/dist/execution/engine/engines/zcode/reader.js +4 -234
- package/dist/execution/engine/paths.js +7 -19
- package/dist/index.cjs +18234 -1277
- package/dist/index.d.cts +5646 -673
- package/dist/index.d.ts +5646 -673
- package/dist/index.js +17828 -1277
- package/dist/{types-BxyAidGf.d.cts → types-Dv4QhSJ_.d.cts} +678 -112
- package/dist/{types-BxyAidGf.d.ts → types-Dv4QhSJ_.d.ts} +678 -112
- package/package.json +7 -4
- package/src/__tests__/agent-opts-resolver-schema-prompt.test.ts +0 -1
- package/src/__tests__/append-system-prompt-assembly.test.ts +8 -7
- package/src/__tests__/fr4-get-state-handshake.test.ts +2 -2
- package/src/__tests__/m2-append-content-probe.test.ts +0 -1
- package/src/__tests__/manifest-store.test.ts +10 -9
- package/src/__tests__/record-store-cache.test.ts +0 -2
- package/src/__tests__/record-store-index.test.ts +1 -2
- package/src/__tests__/review-fix-loop-script.test.ts +93 -3
- package/src/__tests__/review-fix-loop-utils.test.ts +31 -10
- package/src/__tests__/robustness-low-batch1.test.ts +6 -5
- package/src/__tests__/robustness-medium-batch1.test.ts +2 -2
- package/src/__tests__/robustness-medium-batch2.test.ts +17 -6
- package/src/__tests__/robustness-medium-batch4.test.ts +2 -2
- package/src/__tests__/session-runner.test.ts +1 -1
- package/src/__tests__/smoke.test.ts +9 -2
- package/src/core/__tests__/host-services.test.ts +2 -2
- package/src/core/__tests__/logger.test.ts +1 -1
- package/src/core/error-message.ts +9 -0
- package/src/core/host-services.ts +21 -5
- package/src/core/notify-ports.ts +18 -5
- package/src/execution/__tests__/agent-profile.test.ts +232 -0
- package/src/execution/__tests__/agent-registry.test.ts +370 -0
- package/src/execution/__tests__/agent-result-mapper.test.ts +18 -2
- package/src/execution/__tests__/agents-assembly.test.ts +219 -0
- package/src/execution/__tests__/ask-user-transit-e2e.test.ts +6 -6
- package/src/execution/__tests__/chat-engine-routing.test.ts +136 -30
- package/src/execution/__tests__/chatmode-first-round-closure-spawn.test.ts +5 -4
- package/src/execution/__tests__/cold-resurrect.test.ts +283 -0
- package/src/execution/__tests__/create-concurrency-pool.test.ts +194 -0
- package/src/execution/__tests__/delivery-methods.test.ts +77 -62
- package/src/execution/__tests__/descendant-sweep-guards.test.ts +220 -0
- package/src/execution/__tests__/descendant-sweep.test.ts +269 -0
- package/src/execution/__tests__/dialog-queue.test.ts +199 -1
- package/src/execution/__tests__/engine-model-validation.test.ts +741 -0
- package/src/execution/__tests__/epipe-fallback.test.ts +31 -24
- package/src/execution/__tests__/execute-and-await-worktree.test.ts +21 -91
- package/src/execution/__tests__/execute-nesting.test.ts +34 -188
- package/src/execution/__tests__/execution-record.test.ts +217 -60
- package/src/execution/__tests__/execution-runtime-face.test.ts +272 -0
- package/src/execution/__tests__/explicit-agent-ref-guard.test.ts +3 -3
- package/src/execution/__tests__/finalize-record.test.ts +278 -16
- package/src/execution/__tests__/gc-timer.test.ts +57 -2
- package/src/execution/__tests__/get-record-for-action-restart.test.ts +14 -12
- package/src/execution/__tests__/get-state-handshake.test.ts +127 -0
- package/src/execution/__tests__/helpers/mock-extension-api.ts +1 -1
- package/src/execution/__tests__/helpers/session-runner-mocks.ts +113 -0
- package/src/execution/__tests__/helpers/spawn-mock.ts +150 -3
- package/src/execution/__tests__/helpers/subagent-service-mocks.ts +137 -0
- package/src/execution/__tests__/keep-alive-no-progress.test.ts +280 -0
- package/src/execution/__tests__/kill-all-escalation.test.ts +196 -0
- package/src/execution/__tests__/lifecycle-manager-idle-timer-identity.test.ts +117 -0
- package/src/execution/__tests__/lifecycle-manager.test.ts +39 -0
- package/src/execution/__tests__/lifecycle-predicates.test.ts +1 -2
- package/src/execution/__tests__/manifest-parentid.test.ts +4 -4
- package/src/execution/__tests__/manifest-store-tmp-recovery.test.ts +99 -0
- package/src/execution/__tests__/max-turns-to-watchdog-ms.test.ts +113 -0
- package/src/execution/__tests__/model-resolver.test.ts +2 -2
- package/src/execution/__tests__/nested-visibility-env-propagation.test.ts +23 -121
- package/src/execution/__tests__/nested-visibility.test.ts +2 -0
- package/src/execution/__tests__/notify-ledger.test.ts +1249 -0
- package/src/execution/__tests__/output-collector.test.ts +117 -6
- package/src/execution/__tests__/pi-invocation.test.ts +1 -1
- package/src/execution/__tests__/record-store-orphan-revive.test.ts +159 -0
- package/src/execution/__tests__/record-store.test.ts +89 -5
- package/src/execution/__tests__/records-cwd-isolation.test.ts +2 -2
- package/src/execution/__tests__/recursive-visibility-baseline.test.ts +29 -132
- package/src/execution/__tests__/recursive-visibility-env.test.ts +55 -179
- package/src/execution/__tests__/rpc-mode.test.ts +2 -2
- package/src/execution/__tests__/run-and-finalize-anchoring.test.ts +387 -0
- package/src/execution/__tests__/run-and-finalize-chatmode.test.ts +19 -9
- package/src/execution/__tests__/run-spawn-chatmode-settled.test.ts +5 -4
- package/src/execution/__tests__/run-spawn-edges.test.ts +418 -26
- package/src/execution/__tests__/run-spawn-integration.test.ts +3 -3
- package/src/execution/__tests__/run-spawn-resume.test.ts +2 -2
- package/src/execution/__tests__/run-spawn-rpc-mode.test.ts +2 -2
- package/src/execution/__tests__/run-spawn-stdout-callback-throw.test.ts +16 -8
- package/src/execution/__tests__/service-kill-escalation.test.ts +91 -0
- package/src/execution/__tests__/session-context-resolver.test.ts +0 -2
- package/src/execution/__tests__/session-file-gc.test.ts +35 -0
- package/src/execution/__tests__/session-pending.test.ts +471 -0
- package/src/execution/__tests__/session-reconstructor.test.ts +366 -15
- package/src/execution/__tests__/session-runner-branch-cache-lru.test.ts +110 -0
- package/src/execution/__tests__/session-runner-close-prune.test.ts +181 -0
- package/src/execution/__tests__/session-runner-dispatch.test.ts +489 -0
- package/src/execution/__tests__/session-runner-epipe.test.ts +4 -3
- package/src/execution/__tests__/session-runner-heartbeat-idle-fallback.test.ts +227 -0
- package/src/execution/__tests__/session-runner-lifecycle-helpers.test.ts +290 -0
- package/src/execution/__tests__/session-runner-schema-env.test.ts +7 -5
- package/src/execution/__tests__/settled-watchdog.test.ts +524 -0
- package/src/execution/__tests__/spawn-args.test.ts +11 -10
- package/src/execution/__tests__/spawn-event-adapter-rpc.test.ts +26 -23
- package/src/execution/__tests__/spawn-event-adapter.test.ts +1 -1
- package/src/execution/__tests__/spawn-worktree-guidance.test.ts +5 -4
- package/src/execution/__tests__/spawned-children.test.ts +155 -11
- package/src/execution/__tests__/start-sync-model-guard.test.ts +4 -4
- package/src/execution/__tests__/stdin-writer.test.ts +6 -4
- package/src/execution/__tests__/stream-sink-retirement.test.ts +6 -6
- package/src/execution/__tests__/subagent-actions-core.test.ts +1017 -0
- package/src/execution/__tests__/subagent-service-message-close.test.ts +99 -35
- package/src/execution/__tests__/subagent-service-multiproc-guard.test.ts +174 -0
- package/src/execution/__tests__/subagent-service-notify-gate.test.ts +271 -0
- package/src/execution/__tests__/subagent-service-parent-guard.test.ts +33 -29
- package/src/execution/__tests__/subagent-service-recovery-bounds.test.ts +341 -0
- package/src/execution/__tests__/subagent-service.test.ts +37 -30
- package/src/execution/__tests__/subprocess-agent-runner-routing.test.ts +88 -12
- package/src/execution/__tests__/subprocess-agent-runner-timeout.test.ts +75 -0
- package/src/execution/__tests__/subprocess-agent-runner.test.ts +22 -20
- package/src/execution/__tests__/temp-prompt.test.ts +1 -1
- package/src/execution/__tests__/timeout-integration.test.ts +13 -12
- package/src/execution/__tests__/turn-limiter-semantics.test.ts +1 -1
- package/src/execution/__tests__/turn-limiter.test.ts +1 -1
- package/src/execution/__tests__/ui-request-handler-factory.test.ts +107 -7
- package/src/execution/__tests__/ui-request-handler.test.ts +4 -3
- package/src/execution/__tests__/ui-request-queue.test.ts +167 -2
- package/src/execution/__tests__/worktree-git-ops.test.ts +571 -0
- package/src/execution/__tests__/worktree-manager.test.ts +14 -5
- package/src/execution/__tests__/worktree-pid-registration.integration.test.ts +4 -3
- package/src/execution/__tests__/worktree-reconcile-aging.test.ts +204 -0
- package/src/execution/agent-registry.ts +298 -30
- package/src/execution/agent-result-mapper.ts +3 -0
- package/src/execution/agents-assembly.ts +88 -0
- package/src/execution/cold-resurrect.ts +199 -0
- package/src/execution/concurrency-pool.ts +71 -9
- package/src/execution/dialog-queue.ts +101 -3
- package/src/execution/engine/__tests__/common/capability-gate.test.ts +91 -0
- package/src/execution/engine/__tests__/common/data-dir.test.ts +1 -1
- package/src/execution/engine/__tests__/common/journal-wiring.test.ts +84 -0
- package/src/execution/engine/__tests__/common/kill-chain.test.ts +34 -7
- package/src/execution/engine/__tests__/common/persona-router.test.ts +4 -5
- package/src/execution/engine/__tests__/common/pool-manager.test.ts +211 -51
- package/src/execution/engine/__tests__/common/session-view-service-zcode-dbpath.test.ts +149 -0
- package/src/execution/engine/__tests__/common/session-view-service.test.ts +499 -0
- package/src/execution/engine/__tests__/conformance/contract.abort.test.ts +56 -99
- package/src/execution/engine/__tests__/conformance/contract.agent-events.test.ts +88 -15
- package/src/execution/engine/__tests__/conformance/engine-conformance.live.test.ts +33 -7
- package/src/execution/engine/__tests__/conformance/golden-replay.pi.test.ts +1 -1
- package/src/execution/engine/__tests__/conformance/golden-replay.zcode.test.ts +75 -54
- package/src/execution/engine/__tests__/conformance/zcode-appserver-harness.ts +128 -0
- package/src/execution/engine/__tests__/engine-discovery.test.ts +15 -3
- package/src/execution/engine/__tests__/model-prompt.test.ts +15 -3
- package/src/execution/engine/__tests__/registry.test.ts +94 -3
- package/src/execution/engine/__tests__/routing.test.ts +115 -6
- package/src/execution/engine/common/capability-gate.ts +92 -0
- package/src/execution/engine/common/journal-wiring.ts +97 -0
- package/src/execution/engine/common/kill-chain.ts +42 -10
- package/src/execution/engine/common/nesting-guard.ts +66 -0
- package/src/execution/engine/common/persona-router.ts +18 -8
- package/src/execution/engine/common/pool-manager.ts +332 -78
- package/src/execution/engine/common/session-view-service.ts +506 -0
- package/src/execution/engine/common/session-view-types.ts +125 -0
- package/src/execution/engine/engine-discovery.ts +12 -16
- package/src/execution/engine/engines/pi/__tests__/pi-engine.test.ts +174 -28
- package/src/execution/engine/engines/pi/__tests__/spawn-opts-direct.test.ts +257 -0
- package/src/execution/{argv-mirror.ts → engine/engines/pi/argv-mirror.ts} +43 -21
- package/src/execution/{get-state-handshake.ts → engine/engines/pi/get-state-handshake.ts} +86 -11
- package/src/execution/{output-collector.ts → engine/engines/pi/output-collector.ts} +108 -19
- package/src/execution/engine/engines/pi/pi-engine.ts +434 -38
- package/src/execution/{pi-invocation.ts → engine/engines/pi/pi-invocation.ts} +2 -2
- package/src/execution/engine/engines/pi/reader.ts +11 -0
- package/src/execution/engine/engines/pi/registration.ts +4 -2
- package/src/execution/engine/engines/pi/session-runner.ts +2840 -0
- package/src/execution/{spawn-event-adapter.ts → engine/engines/pi/spawn-event-adapter.ts} +75 -34
- package/src/execution/{stdin-writer.ts → engine/engines/pi/stdin-writer.ts} +10 -9
- package/src/execution/{temp-prompt.ts → engine/engines/pi/temp-prompt.ts} +2 -2
- package/src/execution/{turn-limiter.ts → engine/engines/pi/turn-limiter.ts} +1 -1
- package/src/execution/engine/engines/zcode/__tests__/__fixtures__/fake-appserver.mjs +301 -0
- package/src/execution/engine/engines/zcode/__tests__/__fixtures__/zcode-golden-appserver.json +36 -0
- package/src/execution/engine/engines/zcode/__tests__/appserver-launcher.test.ts +321 -0
- package/src/execution/engine/engines/zcode/__tests__/connection.test.ts +473 -0
- package/src/execution/engine/engines/zcode/__tests__/parser.test.ts +7 -210
- package/src/execution/engine/engines/zcode/__tests__/preparer.test.ts +6 -110
- package/src/execution/engine/engines/zcode/__tests__/session-channel-dispose-harvest.test.ts +247 -0
- package/src/execution/engine/engines/zcode/__tests__/session-channel-turn-timers.test.ts +451 -0
- package/src/execution/engine/engines/zcode/__tests__/session-channel.test.ts +792 -0
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine-appserver.test.ts +782 -0
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine-degrade.test.ts +168 -0
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine-dispose.test.ts +210 -0
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine-retry.test.ts +353 -0
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine-status.test.ts +282 -0
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine-timeout.test.ts +372 -0
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine.live.test.ts +65 -47
- package/src/execution/engine/engines/zcode/appserver-launcher.ts +167 -0
- package/src/execution/engine/engines/zcode/connection.ts +598 -0
- package/src/execution/engine/engines/zcode/constants.ts +147 -14
- package/src/execution/engine/engines/zcode/golden-sample.ts +42 -34
- package/src/execution/engine/engines/zcode/parser.ts +12 -346
- package/src/execution/engine/engines/zcode/preparer.ts +22 -150
- package/src/execution/engine/engines/zcode/session-channel.ts +968 -0
- package/src/execution/engine/engines/zcode/zcode-engine.ts +1023 -250
- package/src/execution/engine/host-task-spec.ts +32 -36
- package/src/execution/engine/model-validation.ts +177 -0
- package/src/execution/engine/port.ts +65 -7
- package/src/execution/engine/registry.ts +53 -0
- package/src/execution/engine/routing.ts +75 -1
- package/src/execution/engine/types.ts +30 -103
- package/src/execution/execution-record.ts +222 -144
- package/src/execution/finalize-record.ts +181 -85
- package/src/execution/idle-gc.ts +28 -0
- package/src/execution/lifecycle-manager.ts +27 -3
- package/src/execution/lifecycle-predicates.ts +1 -1
- package/src/execution/manifest-store.ts +53 -62
- package/src/execution/notifier.ts +10 -10
- package/src/execution/notify-host.ts +212 -0
- package/src/execution/notify-ledger.ts +117 -16
- package/src/execution/record-entry.ts +8 -2
- package/src/execution/record-store.ts +148 -88
- package/src/execution/round-settlement.ts +93 -0
- package/src/execution/session-file-gc.ts +96 -62
- package/src/execution/session-pending.ts +213 -62
- package/src/execution/session-reconstructor.ts +256 -143
- package/src/execution/sessions-index.ts +127 -102
- package/src/execution/settled-watchdog.ts +311 -0
- package/src/execution/subagent-actions-core.ts +686 -0
- package/src/execution/subagent-service.ts +1106 -907
- package/src/execution/subprocess-agent-runner.ts +144 -97
- package/src/execution/types.ts +9 -0
- package/src/execution/ui-request-handler-factory.ts +126 -75
- package/src/execution/ui-request-queue.ts +50 -19
- package/src/execution/worktree-git-ops.ts +397 -0
- package/src/execution/worktree-manager.ts +72 -10
- package/src/execution/worktree-registry.ts +6 -12
- package/src/index.ts +542 -9
- package/src/orchestration/__tests__/__fixtures__/worker-template.snapshot.txt +42 -3
- package/src/orchestration/__tests__/agent-call-catch-fallback.test.ts +3 -5
- package/src/orchestration/__tests__/agent-call-stream.test.ts +2 -2
- package/src/orchestration/__tests__/args-meta.test.ts +358 -0
- package/src/orchestration/__tests__/args-validator.test.ts +14 -0
- package/src/orchestration/__tests__/error-recovery-rebuild-failure.test.ts +312 -0
- package/src/orchestration/__tests__/error-recovery-terminal-hardening.test.ts +384 -0
- package/src/orchestration/__tests__/execute-agent-call.test.ts +151 -11
- package/src/orchestration/__tests__/file-run-store-prune.test.ts +168 -0
- package/src/orchestration/__tests__/file-run-store-throttle.test.ts +168 -0
- package/src/orchestration/__tests__/file-run-store.test.ts +390 -0
- package/src/orchestration/__tests__/helpers/flush-microtasks.ts +13 -0
- package/src/orchestration/__tests__/launcher-nested-workflow.test.ts +34 -0
- package/src/orchestration/__tests__/lifecycle-abort-broadcast-signal.test.ts +357 -0
- package/src/orchestration/__tests__/lifecycle-recover-crashed.test.ts +289 -0
- package/src/orchestration/__tests__/lifecycle-runid-injection.test.ts +3 -3
- package/src/orchestration/__tests__/lifecycle.test.ts +84 -5
- package/src/orchestration/__tests__/non-cloneable-return-e2e.test.ts +1 -1
- package/src/orchestration/__tests__/run-snapshot.test.ts +356 -0
- package/src/orchestration/__tests__/script-generate.test.ts +314 -0
- package/src/orchestration/__tests__/script-lint.test.ts +17 -0
- package/src/orchestration/__tests__/test-mocks.ts +2 -0
- package/src/orchestration/__tests__/worker-exit-without-result.test.ts +7 -6
- package/src/orchestration/__tests__/worker-message-pump-finalize-run.test.ts +229 -0
- package/src/orchestration/__tests__/{error-recovery-handlers.test.ts → worker-message-pump-handlers.test.ts} +28 -27
- package/src/orchestration/__tests__/{error-recovery-postmessage-defense.test.ts → worker-message-pump-postmessage-defense.test.ts} +8 -8
- package/src/orchestration/__tests__/{error-recovery-serialize-failed-result.test.ts → worker-message-pump-serialize-failed-result.test.ts} +2 -2
- package/src/orchestration/__tests__/{error-recovery-workflow-call.test.ts → worker-message-pump-workflow-call.test.ts} +1 -1
- package/src/orchestration/__tests__/worker-pending-timeout-abort.test.ts +275 -0
- package/src/orchestration/__tests__/worker-script-builder-runtime.test.ts +78 -1
- package/src/orchestration/__tests__/worker-script-builder.test.ts +1 -1
- package/src/orchestration/__tests__/workflow-files.test.ts +186 -0
- package/src/orchestration/__tests__/workflow-nesting-e2e.test.ts +1 -1
- package/src/orchestration/__tests__/workflow-run-summary.test.ts +119 -0
- package/src/orchestration/__tests__/workflow-script-registry-impl.test.ts +124 -0
- package/src/orchestration/agent-opts-resolver.ts +8 -8
- package/src/orchestration/args-meta.ts +198 -0
- package/src/orchestration/args-validator.ts +53 -31
- package/src/orchestration/execute-agent-call.ts +25 -79
- package/src/orchestration/file-run-store.ts +327 -0
- package/src/orchestration/launcher.ts +160 -104
- package/src/orchestration/lifecycle.ts +371 -97
- package/src/orchestration/models/agent-call.ts +7 -7
- package/src/orchestration/models/budget.ts +5 -5
- package/src/orchestration/models/ports.ts +4 -4
- package/src/orchestration/models/run-runtime.ts +15 -15
- package/src/orchestration/models/trace.ts +9 -9
- package/src/orchestration/models/types.ts +111 -22
- package/src/orchestration/models/workflow-run.ts +28 -28
- package/src/orchestration/models/workflow-script.ts +4 -4
- package/src/orchestration/run-snapshot.ts +266 -0
- package/src/orchestration/script-generate.ts +154 -0
- package/src/orchestration/script-lint.ts +123 -90
- package/src/orchestration/worker-handle.ts +10 -10
- package/src/orchestration/worker-host.ts +10 -10
- package/src/orchestration/{error-recovery.ts → worker-message-pump.ts} +498 -221
- package/src/orchestration/worker-script-builder.ts +401 -346
- package/src/orchestration/workflow-files.ts +37 -11
- package/src/orchestration/workflow-run-summary.ts +69 -0
- package/src/orchestration/workflow-script-registry-impl.ts +31 -9
- package/src/shared/__tests__/agent-ref.test.ts +209 -2
- package/src/shared/__tests__/atomic-write.test.ts +267 -0
- package/src/shared/__tests__/bounded-serialize.test.ts +236 -0
- package/src/shared/__tests__/injection-render.test.ts +518 -0
- package/src/shared/__tests__/meta-parser.test.ts +151 -0
- package/src/shared/__tests__/resource-discovery-host-roots.test.ts +474 -0
- package/src/shared/__tests__/resource-discovery.test.ts +261 -217
- package/src/shared/agent-ref.ts +143 -2
- package/src/shared/atomic-write.ts +323 -0
- package/src/shared/bounded-serialize.ts +154 -0
- package/src/shared/injection-render.ts +279 -0
- package/src/shared/meta-parser.ts +182 -68
- package/src/shared/model-ref.ts +15 -2
- package/src/shared/resource-discovery.ts +97 -204
- package/src/shared/resource-meta.ts +14 -0
- package/src/shared/schema-jsonify.ts +1 -1
- package/src/shared/xml-injection.ts +9 -9
- package/workflows/README.md +9 -9
- package/workflows/chain.js +4 -2
- package/workflows/map-reduce.js +5 -3
- package/workflows/parallel.js +5 -3
- package/workflows/review-fix-loop-utils.cjs +165 -92
- package/workflows/review-fix-loop-utils.d.cts +287 -0
- package/workflows/review-fix-loop.js +18 -7
- package/workflows/scatter-gather.js +4 -2
- package/dist/chunk-3VOERJPJ.js +0 -22
- package/src/execution/__tests__/execute-options-mapper.test.ts +0 -200
- package/src/execution/engine/engines/pi/__tests__/task-spec-mapper.test.ts +0 -164
- package/src/execution/engine/engines/pi/task-spec-mapper.ts +0 -100
- package/src/execution/engine/engines/zcode/__tests__/__fixtures__/zcode-golden-spawn.json +0 -39
- package/src/execution/engine/engines/zcode/__tests__/launcher.test.ts +0 -150
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine.test.ts +0 -580
- package/src/execution/engine/engines/zcode/launcher.ts +0 -161
- package/src/execution/execute-options-mapper.ts +0 -115
- package/src/execution/session-runner.ts +0 -1789
- package/src/shared/__tests__/resource-discovery-manifest-cache.test.ts +0 -288
|
@@ -13,10 +13,16 @@ import * as path from "node:path";
|
|
|
13
13
|
|
|
14
14
|
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
|
15
15
|
|
|
16
|
-
import {
|
|
16
|
+
import {
|
|
17
|
+
IDENTITY_CUSTOM_TYPE,
|
|
18
|
+
readIdentityAnywhere,
|
|
19
|
+
readIdentityHeader,
|
|
20
|
+
readIdentityTail,
|
|
21
|
+
reconstructFromFile,
|
|
22
|
+
} from "../session-reconstructor.ts";
|
|
17
23
|
|
|
18
24
|
/** 写一行到文件(JSON.stringify + 换行)。 */
|
|
19
|
-
function writeLine(file: number
|
|
25
|
+
function writeLine(file: number, obj: unknown): void {
|
|
20
26
|
fs.writeSync(file, `${JSON.stringify(obj)}\n`);
|
|
21
27
|
}
|
|
22
28
|
|
|
@@ -77,7 +83,7 @@ describe("reconstructFromFile", () => {
|
|
|
77
83
|
filePath = path.join(tmpDir, "test.jsonl");
|
|
78
84
|
});
|
|
79
85
|
afterEach(() => {
|
|
80
|
-
fs.rmSync(tmpDir, { recursive: true, force: true });
|
|
86
|
+
fs.rmSync(tmpDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
|
|
81
87
|
});
|
|
82
88
|
|
|
83
89
|
function writeJsonl(lines: unknown[]): void {
|
|
@@ -113,7 +119,7 @@ describe("reconstructFromFile", () => {
|
|
|
113
119
|
it("thinking block 累积进 turn.thinking", () => {
|
|
114
120
|
writeJsonl([
|
|
115
121
|
headerLine(),
|
|
116
|
-
identityEntry({ id: "r1", agent: "w", mode: "
|
|
122
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
117
123
|
assistantEntry([
|
|
118
124
|
{ type: "thinking", thinking: "let me think" },
|
|
119
125
|
{ type: "text", text: "answer" },
|
|
@@ -127,7 +133,7 @@ describe("reconstructFromFile", () => {
|
|
|
127
133
|
it("多 assistant message → 多 turn,result 用空行拼接", () => {
|
|
128
134
|
writeJsonl([
|
|
129
135
|
headerLine(),
|
|
130
|
-
identityEntry({ id: "r1", agent: "w", mode: "
|
|
136
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
131
137
|
assistantEntry([{ type: "text", text: "first" }], { ts: 1000 }),
|
|
132
138
|
assistantEntry([{ type: "text", text: "second" }], { ts: 2000, parentId: undefined }),
|
|
133
139
|
]);
|
|
@@ -190,7 +196,7 @@ describe("reconstructFromFile", () => {
|
|
|
190
196
|
it("读出 identity 里的 parentRecordId/depth(递归层级)", () => {
|
|
191
197
|
writeJsonl([
|
|
192
198
|
headerLine(),
|
|
193
|
-
identityEntry({ id: "run-2", agent: "w", mode: "
|
|
199
|
+
identityEntry({ id: "run-2", agent: "w", mode: "background", task: "t", startedAt: 100, rootSessionId: "sess-A", parentRecordId: "run-1", depth: 2 }),
|
|
194
200
|
assistantEntry([{ type: "text", text: "ok" }]),
|
|
195
201
|
]);
|
|
196
202
|
const rec = reconstructFromFile(filePath);
|
|
@@ -228,7 +234,7 @@ describe("reconstructFromFile", () => {
|
|
|
228
234
|
it("toolCall + toolResult → InternalToolCall done", () => {
|
|
229
235
|
writeJsonl([
|
|
230
236
|
headerLine(),
|
|
231
|
-
identityEntry({ id: "r1", agent: "w", mode: "
|
|
237
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
232
238
|
assistantEntry([
|
|
233
239
|
{ type: "toolCall", id: "call-1", name: "read", arguments: { path: "/x.ts" } },
|
|
234
240
|
]),
|
|
@@ -245,7 +251,7 @@ describe("reconstructFromFile", () => {
|
|
|
245
251
|
it("toolResult isError → InternalToolCall failed", () => {
|
|
246
252
|
writeJsonl([
|
|
247
253
|
headerLine(),
|
|
248
|
-
identityEntry({ id: "r1", agent: "w", mode: "
|
|
254
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
249
255
|
assistantEntry([
|
|
250
256
|
{ type: "toolCall", id: "call-1", name: "bash", arguments: { command: "false" } },
|
|
251
257
|
]),
|
|
@@ -259,7 +265,7 @@ describe("reconstructFromFile", () => {
|
|
|
259
265
|
it("孤儿 toolResult(无匹配 toolCall)→ 丢弃,不崩", () => {
|
|
260
266
|
writeJsonl([
|
|
261
267
|
headerLine(),
|
|
262
|
-
identityEntry({ id: "r1", agent: "w", mode: "
|
|
268
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
263
269
|
assistantEntry([{ type: "text", text: "ok" }]),
|
|
264
270
|
toolResultEntry("nonexistent", "read"),
|
|
265
271
|
]);
|
|
@@ -276,7 +282,7 @@ describe("reconstructFromFile", () => {
|
|
|
276
282
|
it("stopReason=error → lastError + error 字段", () => {
|
|
277
283
|
writeJsonl([
|
|
278
284
|
headerLine(),
|
|
279
|
-
identityEntry({ id: "r1", agent: "w", mode: "
|
|
285
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
280
286
|
assistantEntry([{ type: "text", text: "partial" }], {
|
|
281
287
|
stopReason: "error", errorMessage: "API timeout",
|
|
282
288
|
}),
|
|
@@ -290,7 +296,7 @@ describe("reconstructFromFile", () => {
|
|
|
290
296
|
it("stopReason=aborted 无 errorMessage → lastError = 'aborted'", () => {
|
|
291
297
|
writeJsonl([
|
|
292
298
|
headerLine(),
|
|
293
|
-
identityEntry({ id: "r1", agent: "w", mode: "
|
|
299
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
294
300
|
assistantEntry([{ type: "text", text: "" }], { stopReason: "aborted" }),
|
|
295
301
|
]);
|
|
296
302
|
const rec = reconstructFromFile(filePath);
|
|
@@ -301,7 +307,7 @@ describe("reconstructFromFile", () => {
|
|
|
301
307
|
it("前序 error 但最后 stop → lastError 清除(镜像 turn_end 语义),status=done", () => {
|
|
302
308
|
writeJsonl([
|
|
303
309
|
headerLine(),
|
|
304
|
-
identityEntry({ id: "r1", agent: "w", mode: "
|
|
310
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
305
311
|
assistantEntry([{ type: "text", text: "oops" }], {
|
|
306
312
|
stopReason: "error", errorMessage: "transient", ts: 1000,
|
|
307
313
|
}),
|
|
@@ -321,7 +327,7 @@ describe("reconstructFromFile", () => {
|
|
|
321
327
|
it("tool_start + tool_end + turn_end 条目", () => {
|
|
322
328
|
writeJsonl([
|
|
323
329
|
headerLine(),
|
|
324
|
-
identityEntry({ id: "r1", agent: "w", mode: "
|
|
330
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
325
331
|
assistantEntry([
|
|
326
332
|
{ type: "toolCall", id: "c1", name: "read", arguments: { path: "/x.ts" } },
|
|
327
333
|
]),
|
|
@@ -359,7 +365,7 @@ describe("reconstructFromFile", () => {
|
|
|
359
365
|
it("有 identity 但无 assistant message → undefined", () => {
|
|
360
366
|
writeJsonl([
|
|
361
367
|
headerLine(),
|
|
362
|
-
identityEntry({ id: "r1", agent: "w", mode: "
|
|
368
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
363
369
|
]);
|
|
364
370
|
expect(reconstructFromFile(filePath)).toBeUndefined();
|
|
365
371
|
});
|
|
@@ -368,7 +374,7 @@ describe("reconstructFromFile", () => {
|
|
|
368
374
|
const fd = fs.openSync(filePath, "w");
|
|
369
375
|
fs.writeSync(fd, `${JSON.stringify(headerLine())}\n`);
|
|
370
376
|
fs.writeSync(fd, "THIS IS NOT JSON\n");
|
|
371
|
-
fs.writeSync(fd, `${JSON.stringify(identityEntry({ id: "r1", agent: "w", mode: "
|
|
377
|
+
fs.writeSync(fd, `${JSON.stringify(identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }))}\n`);
|
|
372
378
|
fs.writeSync(fd, `${JSON.stringify(assistantEntry([{ type: "text", text: "survived" }]))}\n`);
|
|
373
379
|
fs.closeSync(fd);
|
|
374
380
|
const rec = reconstructFromFile(filePath);
|
|
@@ -376,4 +382,349 @@ describe("reconstructFromFile", () => {
|
|
|
376
382
|
expect(rec!.result).toBe("survived");
|
|
377
383
|
});
|
|
378
384
|
});
|
|
385
|
+
|
|
386
|
+
// ============================================================
|
|
387
|
+
// 分支覆盖补充(特征锚定,守护行为保持重构)
|
|
388
|
+
// ============================================================
|
|
389
|
+
describe("分支覆盖补充(特征锚定)", () => {
|
|
390
|
+
it("无 session header(第 1 行非 header)→ 该行仍按普通 entry 解析,正常重建", () => {
|
|
391
|
+
writeJsonl([
|
|
392
|
+
identityEntry({ id: "r1", agent: "w", mode: "sync", task: "t", startedAt: 100 }),
|
|
393
|
+
assistantEntry([{ type: "text", text: "no header" }]),
|
|
394
|
+
]);
|
|
395
|
+
const rec = reconstructFromFile(filePath);
|
|
396
|
+
expect(rec).toBeDefined();
|
|
397
|
+
expect(rec!.result).toBe("no header");
|
|
398
|
+
});
|
|
399
|
+
|
|
400
|
+
it("首行(header 位)损坏 JSON → 跳过该行,后续行仍解析", () => {
|
|
401
|
+
const fd = fs.openSync(filePath, "w");
|
|
402
|
+
fs.writeSync(fd, "CORRUPTED FIRST LINE\n");
|
|
403
|
+
fs.writeSync(fd, `${JSON.stringify(identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }))}\n`);
|
|
404
|
+
fs.writeSync(fd, `${JSON.stringify(assistantEntry([{ type: "text", text: "after corrupt header" }]))}\n`);
|
|
405
|
+
fs.closeSync(fd);
|
|
406
|
+
const rec = reconstructFromFile(filePath);
|
|
407
|
+
expect(rec).toBeDefined();
|
|
408
|
+
expect(rec!.result).toBe("after corrupt header");
|
|
409
|
+
});
|
|
410
|
+
|
|
411
|
+
it("文件只有空白行 → undefined(entries 为空)", () => {
|
|
412
|
+
fs.writeFileSync(filePath, "\n\n \n", "utf-8");
|
|
413
|
+
expect(reconstructFromFile(filePath)).toBeUndefined();
|
|
414
|
+
});
|
|
415
|
+
|
|
416
|
+
it("identity custom entry 的 data 非法(缺 task)→ undefined", () => {
|
|
417
|
+
writeJsonl([
|
|
418
|
+
headerLine(),
|
|
419
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", startedAt: 100 }), // 缺 task
|
|
420
|
+
assistantEntry([{ type: "text", text: "orphan identity" }]),
|
|
421
|
+
]);
|
|
422
|
+
expect(reconstructFromFile(filePath)).toBeUndefined();
|
|
423
|
+
});
|
|
424
|
+
|
|
425
|
+
it("model_change → model = provider/modelId(多次出现时后写覆盖)", () => {
|
|
426
|
+
writeJsonl([
|
|
427
|
+
headerLine(),
|
|
428
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
429
|
+
{ type: "model_change", provider: "p1", modelId: "m1", timestamp: new Date(500).toISOString() },
|
|
430
|
+
assistantEntry([{ type: "text", text: "first" }], { ts: 1000 }),
|
|
431
|
+
{ type: "model_change", provider: "p2", modelId: "m2", timestamp: new Date(1500).toISOString() },
|
|
432
|
+
assistantEntry([{ type: "text", text: "second" }], { ts: 2000 }),
|
|
433
|
+
]);
|
|
434
|
+
const rec = reconstructFromFile(filePath);
|
|
435
|
+
expect(rec!.model).toBe("p2/m2");
|
|
436
|
+
});
|
|
437
|
+
|
|
438
|
+
it("model_change 字段非字符串(provider 缺失)→ model 保持空串", () => {
|
|
439
|
+
writeJsonl([
|
|
440
|
+
headerLine(),
|
|
441
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
442
|
+
{ type: "model_change", provider: 42, modelId: "m1", timestamp: new Date(500).toISOString() },
|
|
443
|
+
assistantEntry([{ type: "text", text: "ok" }]),
|
|
444
|
+
]);
|
|
445
|
+
const rec = reconstructFromFile(filePath);
|
|
446
|
+
expect(rec!.model).toBe("");
|
|
447
|
+
});
|
|
448
|
+
|
|
449
|
+
it("thinking_level_change → thinkingLevel 恢复;无该 entry → undefined", () => {
|
|
450
|
+
writeJsonl([
|
|
451
|
+
headerLine(),
|
|
452
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
453
|
+
{ type: "thinking_level_change", thinkingLevel: "high", timestamp: new Date(500).toISOString() },
|
|
454
|
+
assistantEntry([{ type: "text", text: "ok" }]),
|
|
455
|
+
]);
|
|
456
|
+
const withLevel = reconstructFromFile(filePath);
|
|
457
|
+
expect(withLevel!.thinkingLevel).toBe("high");
|
|
458
|
+
|
|
459
|
+
writeJsonl([
|
|
460
|
+
headerLine(),
|
|
461
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
462
|
+
assistantEntry([{ type: "text", text: "ok" }]),
|
|
463
|
+
]);
|
|
464
|
+
const withoutLevel = reconstructFromFile(filePath);
|
|
465
|
+
expect(withoutLevel!.thinkingLevel).toBeUndefined();
|
|
466
|
+
});
|
|
467
|
+
|
|
468
|
+
it("entry.timestamp 非法(Date.parse NaN)→ endedAt 回落 message.timestamp", () => {
|
|
469
|
+
writeJsonl([
|
|
470
|
+
headerLine(),
|
|
471
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
472
|
+
{ ...(assistantEntry([{ type: "text", text: "bad ts" }], { ts: 7777 }) as Record<string, unknown>), timestamp: "not-a-date" },
|
|
473
|
+
]);
|
|
474
|
+
const rec = reconstructFromFile(filePath);
|
|
475
|
+
expect(rec!.endedAt).toBe(7777);
|
|
476
|
+
});
|
|
477
|
+
|
|
478
|
+
it("assistant message 无 content(非数组)→ 空 turn,usage 与 stopReason 均被跳过", () => {
|
|
479
|
+
writeJsonl([
|
|
480
|
+
headerLine(),
|
|
481
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
482
|
+
{
|
|
483
|
+
type: "message",
|
|
484
|
+
timestamp: new Date(3000).toISOString(),
|
|
485
|
+
message: {
|
|
486
|
+
role: "assistant",
|
|
487
|
+
content: "not-an-array",
|
|
488
|
+
usage: { input: 100, output: 100 },
|
|
489
|
+
stopReason: "error",
|
|
490
|
+
errorMessage: "boom",
|
|
491
|
+
timestamp: 3000,
|
|
492
|
+
},
|
|
493
|
+
},
|
|
494
|
+
]);
|
|
495
|
+
const rec = reconstructFromFile(filePath);
|
|
496
|
+
// turn 在 content 校验前已创建 → record 存在
|
|
497
|
+
expect(rec).toBeDefined();
|
|
498
|
+
expect(rec!.turnCount).toBe(1);
|
|
499
|
+
expect(rec!.turns[0].text).toBe("");
|
|
500
|
+
expect(rec!.totalTokens).toBe(0); // usage 被 continue 跳过
|
|
501
|
+
expect(rec!.lastError).toBeUndefined(); // stopReason=error 也被跳过
|
|
502
|
+
expect(rec!.error).toBeUndefined();
|
|
503
|
+
expect(rec!.endedAt).toBe(3000);
|
|
504
|
+
});
|
|
505
|
+
|
|
506
|
+
it("assistant message content 合法但无 usage → totalTokens 0,正常重建", () => {
|
|
507
|
+
writeJsonl([
|
|
508
|
+
headerLine(),
|
|
509
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
510
|
+
{
|
|
511
|
+
type: "message",
|
|
512
|
+
timestamp: new Date(1000).toISOString(),
|
|
513
|
+
message: {
|
|
514
|
+
role: "assistant",
|
|
515
|
+
content: [{ type: "text", text: "no usage" }],
|
|
516
|
+
stopReason: "stop",
|
|
517
|
+
timestamp: 1000,
|
|
518
|
+
},
|
|
519
|
+
},
|
|
520
|
+
]);
|
|
521
|
+
const rec = reconstructFromFile(filePath);
|
|
522
|
+
expect(rec!.result).toBe("no usage");
|
|
523
|
+
expect(rec!.totalTokens).toBe(0);
|
|
524
|
+
});
|
|
525
|
+
|
|
526
|
+
it("孤儿 toolCall(toolResult 未到达)→ toolCalls 空,turn_end label 兜底 'turn'", () => {
|
|
527
|
+
writeJsonl([
|
|
528
|
+
headerLine(),
|
|
529
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
530
|
+
assistantEntry([{ type: "toolCall", id: "c1", name: "read", arguments: { path: "/x" } }]),
|
|
531
|
+
]);
|
|
532
|
+
const rec = reconstructFromFile(filePath);
|
|
533
|
+
expect(rec).toBeDefined();
|
|
534
|
+
expect(rec!.turns[0].toolCalls).toHaveLength(0);
|
|
535
|
+
const turnEnd = rec!.eventLog.find((e) => e.type === "turn_end");
|
|
536
|
+
expect(turnEnd?.label).toBe("turn"); // 空 text turn 的摘要兜底
|
|
537
|
+
});
|
|
538
|
+
|
|
539
|
+
it("stopReason 非 error/aborted/stop(如 length)→ lastError 保持前值不清除", () => {
|
|
540
|
+
writeJsonl([
|
|
541
|
+
headerLine(),
|
|
542
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
543
|
+
assistantEntry([{ type: "text", text: "oops" }], {
|
|
544
|
+
stopReason: "error", errorMessage: "transient", ts: 1000,
|
|
545
|
+
}),
|
|
546
|
+
assistantEntry([{ type: "text", text: "truncated" }], { stopReason: "length", ts: 2000 }),
|
|
547
|
+
]);
|
|
548
|
+
const rec = reconstructFromFile(filePath);
|
|
549
|
+
expect(rec!.lastError).toBe("transient");
|
|
550
|
+
expect(rec!.error).toBe("transient");
|
|
551
|
+
});
|
|
552
|
+
|
|
553
|
+
it("toolResult 配对 → result.content/details 透传,startedTs 取 assistant timestamp", () => {
|
|
554
|
+
writeJsonl([
|
|
555
|
+
headerLine(),
|
|
556
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100 }),
|
|
557
|
+
assistantEntry([{ type: "toolCall", id: "c9", name: "bash", arguments: { command: "ls" } }]),
|
|
558
|
+
toolResultEntry("c9", "bash", { text: "file1\nfile2" }),
|
|
559
|
+
]);
|
|
560
|
+
const rec = reconstructFromFile(filePath);
|
|
561
|
+
const tc = rec!.turns[0].toolCalls[0];
|
|
562
|
+
expect(tc.result).toEqual({ content: [{ type: "text", text: "file1\nfile2" }], details: undefined });
|
|
563
|
+
expect(tc.startedTs).toBe(1000);
|
|
564
|
+
});
|
|
565
|
+
|
|
566
|
+
it("identity 的 chatMode/worktree/forkDepth 经展开透传到 record", () => {
|
|
567
|
+
writeJsonl([
|
|
568
|
+
headerLine(),
|
|
569
|
+
identityEntry({ id: "r1", agent: "w", mode: "background", task: "t", startedAt: 100, chatMode: true, worktree: true, forkDepth: 2 }),
|
|
570
|
+
assistantEntry([{ type: "text", text: "ok" }]),
|
|
571
|
+
]);
|
|
572
|
+
const rec = reconstructFromFile(filePath);
|
|
573
|
+
expect(rec!.chatMode).toBe(true);
|
|
574
|
+
expect(rec!.worktree).toBe(true);
|
|
575
|
+
expect(rec!.forkDepth).toBe(2);
|
|
576
|
+
});
|
|
577
|
+
});
|
|
578
|
+
});
|
|
579
|
+
|
|
580
|
+
// ============================================================
|
|
581
|
+
// 轻量 identity 扫描(readIdentityHeader / readIdentityTail / readIdentityAnywhere)
|
|
582
|
+
// ============================================================
|
|
583
|
+
// 直测三入口(parseIdentityFromText 的宿主):头/尾窗口命中、预筛、从后往前、
|
|
584
|
+
// 归一化 fallback、损坏行跳过。
|
|
585
|
+
describe("轻量 identity 扫描(readIdentityHeader / readIdentityTail / readIdentityAnywhere)", () => {
|
|
586
|
+
let tmpDir: string;
|
|
587
|
+
let filePath: string;
|
|
588
|
+
|
|
589
|
+
beforeEach(() => {
|
|
590
|
+
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "sr-identity-scan-"));
|
|
591
|
+
filePath = path.join(tmpDir, "scan.jsonl");
|
|
592
|
+
});
|
|
593
|
+
afterEach(() => {
|
|
594
|
+
fs.rmSync(tmpDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 20 });
|
|
595
|
+
});
|
|
596
|
+
|
|
597
|
+
/** 写原始文本行(不经 JSON.stringify——填充行/截断行构造用)。 */
|
|
598
|
+
function writeRaw(lines: string[]): void {
|
|
599
|
+
fs.writeFileSync(filePath, lines.map((l) => `${l}\n`).join(""), "utf-8");
|
|
600
|
+
}
|
|
601
|
+
|
|
602
|
+
/** >64KB 的无特征填充行(预筛跳过,永不被 JSON.parse)。 */
|
|
603
|
+
const fillerLine = "F".repeat(70 * 1024);
|
|
604
|
+
|
|
605
|
+
it("identity 在头部 → 读出身份 + identity 之前途经的 model/thinkingLevel", () => {
|
|
606
|
+
writeRaw([
|
|
607
|
+
JSON.stringify(headerLine()),
|
|
608
|
+
JSON.stringify({ type: "model_change", provider: "p1", modelId: "m1", timestamp: new Date(500).toISOString() }),
|
|
609
|
+
JSON.stringify({ type: "thinking_level_change", thinkingLevel: "high", timestamp: new Date(600).toISOString() }),
|
|
610
|
+
JSON.stringify(identityEntry({
|
|
611
|
+
id: "bg-9", agent: "worker", mode: "sync", task: "scan", startedAt: 42,
|
|
612
|
+
slug: "s9", rootSessionId: "sess-R", depth: 1, forkDepth: 0,
|
|
613
|
+
})),
|
|
614
|
+
]);
|
|
615
|
+
expect(readIdentityHeader(filePath)).toEqual({
|
|
616
|
+
id: "bg-9",
|
|
617
|
+
agent: "worker",
|
|
618
|
+
mode: "sync",
|
|
619
|
+
task: "scan",
|
|
620
|
+
slug: "s9",
|
|
621
|
+
startedAt: 42,
|
|
622
|
+
rootSessionId: "sess-R",
|
|
623
|
+
parentRecordId: undefined,
|
|
624
|
+
depth: 1,
|
|
625
|
+
forkDepth: 0,
|
|
626
|
+
chatMode: undefined,
|
|
627
|
+
worktree: undefined,
|
|
628
|
+
model: "p1/m1",
|
|
629
|
+
thinkingLevel: "high",
|
|
630
|
+
sessionFile: filePath,
|
|
631
|
+
});
|
|
632
|
+
});
|
|
633
|
+
|
|
634
|
+
it("identity 之后的 model_change 不捕获(找到即停)", () => {
|
|
635
|
+
writeRaw([
|
|
636
|
+
JSON.stringify(headerLine()),
|
|
637
|
+
JSON.stringify(identityEntry({ id: "bg-8", agent: "w", mode: "background", task: "t", startedAt: 1 })),
|
|
638
|
+
JSON.stringify({ type: "model_change", provider: "late", modelId: "m", timestamp: new Date(900).toISOString() }),
|
|
639
|
+
]);
|
|
640
|
+
expect(readIdentityHeader(filePath)?.model).toBe("");
|
|
641
|
+
});
|
|
642
|
+
|
|
643
|
+
it("头部无 identity → readIdentityHeader undefined", () => {
|
|
644
|
+
writeRaw([JSON.stringify(headerLine()), JSON.stringify({ type: "model_change", provider: "p", modelId: "m" })]);
|
|
645
|
+
expect(readIdentityHeader(filePath)).toBeUndefined();
|
|
646
|
+
});
|
|
647
|
+
|
|
648
|
+
it("文件缺失 → 三入口均 undefined(不抛)", () => {
|
|
649
|
+
const missing = path.join(tmpDir, "nope.jsonl");
|
|
650
|
+
expect(readIdentityHeader(missing)).toBeUndefined();
|
|
651
|
+
expect(readIdentityTail(missing)).toBeUndefined();
|
|
652
|
+
expect(readIdentityAnywhere(missing)).toBeUndefined();
|
|
653
|
+
});
|
|
654
|
+
|
|
655
|
+
it("identity 仅在尾部(>64KB 填充)→ header miss / tail 命中 / anywhere 命中", () => {
|
|
656
|
+
writeRaw([
|
|
657
|
+
JSON.stringify(headerLine()),
|
|
658
|
+
fillerLine,
|
|
659
|
+
JSON.stringify(identityEntry({ id: "bg-tail", agent: "w", mode: "background", task: "t", startedAt: 7 })),
|
|
660
|
+
]);
|
|
661
|
+
expect(readIdentityHeader(filePath)).toBeUndefined();
|
|
662
|
+
const tail = readIdentityTail(filePath);
|
|
663
|
+
expect(tail?.id).toBe("bg-tail");
|
|
664
|
+
// model/thinkingLevel 在尾部窗口外 → best-effort 空/undefined
|
|
665
|
+
expect(tail?.model).toBe("");
|
|
666
|
+
expect(tail?.thinkingLevel).toBeUndefined();
|
|
667
|
+
expect(readIdentityAnywhere(filePath)?.id).toBe("bg-tail");
|
|
668
|
+
});
|
|
669
|
+
|
|
670
|
+
it("尾部多轮 identity → tail/anywhere 从后往前取最后一条(最新鲜)", () => {
|
|
671
|
+
writeRaw([
|
|
672
|
+
JSON.stringify(headerLine()),
|
|
673
|
+
fillerLine,
|
|
674
|
+
JSON.stringify(identityEntry({ id: "bg-old", agent: "w", mode: "background", task: "t", startedAt: 1 })),
|
|
675
|
+
JSON.stringify(identityEntry({ id: "bg-new", agent: "w", mode: "background", task: "t2", startedAt: 2 })),
|
|
676
|
+
]);
|
|
677
|
+
expect(readIdentityTail(filePath)?.id).toBe("bg-new");
|
|
678
|
+
expect(readIdentityAnywhere(filePath)?.id).toBe("bg-new");
|
|
679
|
+
});
|
|
680
|
+
|
|
681
|
+
it("尾部块首行残缺(含特征串的截断 JSON)→ 跳过该行,后续行仍命中", () => {
|
|
682
|
+
writeRaw([
|
|
683
|
+
JSON.stringify(headerLine()),
|
|
684
|
+
fillerLine,
|
|
685
|
+
'{"type":"custom","customType":"subagent-identity","data":{"id":"trunc"', // 截断行
|
|
686
|
+
JSON.stringify(identityEntry({ id: "bg-after-trunc", agent: "w", mode: "background", task: "t", startedAt: 3 })),
|
|
687
|
+
]);
|
|
688
|
+
expect(readIdentityTail(filePath)?.id).toBe("bg-after-trunc");
|
|
689
|
+
});
|
|
690
|
+
|
|
691
|
+
it("旧 identity(parentSessionId、无 slug/depth)→ rootSessionId fallback + slug 兜底空串 + depth 0", () => {
|
|
692
|
+
writeRaw([
|
|
693
|
+
JSON.stringify(headerLine()),
|
|
694
|
+
JSON.stringify(identityEntry({ id: "bg-old", agent: "w", mode: "background", task: "t", startedAt: 1, parentSessionId: "sess-legacy" })),
|
|
695
|
+
]);
|
|
696
|
+
expect(readIdentityHeader(filePath)).toMatchObject({
|
|
697
|
+
id: "bg-old",
|
|
698
|
+
slug: "",
|
|
699
|
+
rootSessionId: "sess-legacy",
|
|
700
|
+
depth: 0,
|
|
701
|
+
forkDepth: undefined,
|
|
702
|
+
});
|
|
703
|
+
});
|
|
704
|
+
|
|
705
|
+
it("identity 的 chatMode/worktree 透传到轻量 recon", () => {
|
|
706
|
+
writeRaw([
|
|
707
|
+
JSON.stringify(headerLine()),
|
|
708
|
+
JSON.stringify(identityEntry({ id: "bg-chat", agent: "w", mode: "background", task: "t", startedAt: 1, chatMode: true, worktree: true })),
|
|
709
|
+
]);
|
|
710
|
+
expect(readIdentityHeader(filePath)).toMatchObject({ chatMode: true, worktree: true });
|
|
711
|
+
});
|
|
712
|
+
|
|
713
|
+
it("identity data 非法(缺 task)→ 各入口 undefined", () => {
|
|
714
|
+
writeRaw([
|
|
715
|
+
JSON.stringify(headerLine()),
|
|
716
|
+
JSON.stringify(identityEntry({ id: "bg-bad", agent: "w", mode: "background", startedAt: 1 })), // 缺 task
|
|
717
|
+
]);
|
|
718
|
+
expect(readIdentityHeader(filePath)).toBeUndefined();
|
|
719
|
+
expect(readIdentityTail(filePath)).toBeUndefined();
|
|
720
|
+
expect(readIdentityAnywhere(filePath)).toBeUndefined();
|
|
721
|
+
});
|
|
722
|
+
|
|
723
|
+
it("损坏行(无特征串)预筛跳过,identity 行仍命中", () => {
|
|
724
|
+
writeRaw([
|
|
725
|
+
"THIS IS NOT JSON",
|
|
726
|
+
JSON.stringify(identityEntry({ id: "bg-prefilter", agent: "w", mode: "background", task: "t", startedAt: 5 })),
|
|
727
|
+
]);
|
|
728
|
+
expect(readIdentityHeader(filePath)?.id).toBe("bg-prefilter");
|
|
729
|
+
});
|
|
379
730
|
});
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
// src/execution/__tests__/session-runner-branch-cache-lru.test.ts
|
|
2
|
+
//
|
|
3
|
+
// [LC-8/T6③] branchCache LRU 上界。
|
|
4
|
+
//
|
|
5
|
+
// 背景(设计 §4.3 LC-8):缓存 key=cwd,worktree 路径每次唯一 → 模块级 Map 永不淘汰,
|
|
6
|
+
// 条目按 path 永久累积(长寿命 orchestrator 内存无界,实锤·轻微)。T6③ 加 LRU 上限
|
|
7
|
+
// BRANCH_CACHE_MAX_ENTRIES=64(常量导出)。
|
|
8
|
+
//
|
|
9
|
+
// 覆盖(验收:65 个路径插入后规模 64,最旧被淘汰):
|
|
10
|
+
// - 65 次 miss 插入 → size 封顶 64,execFile 恰 65 次;
|
|
11
|
+
// - 最旧条目已被淘汰(再查重新 spawn git),次旧条目仍在(LRU 只淘汰最旧);
|
|
12
|
+
// - get 命中刷新 LRU 序(touch 后不再是淘汰候选);
|
|
13
|
+
// - 常量导出值 = 64。
|
|
14
|
+
|
|
15
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
16
|
+
|
|
17
|
+
// buildEnvBlock 用 execFile 异步取 git branch:按 opts.cwd 回填可区分的 branch 名。
|
|
18
|
+
const { execFileMock } = vi.hoisted(() => ({ execFileMock: vi.fn() }));
|
|
19
|
+
vi.mock("node:child_process", async () => {
|
|
20
|
+
const actual = await import("node:child_process");
|
|
21
|
+
return { ...actual, execFile: execFileMock };
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
// Mock 共享 logger(buildEnvBlock 的 git 失败 debug 留痕不落真实日志盘)。
|
|
25
|
+
const { loggerMock } = vi.hoisted(() => ({
|
|
26
|
+
loggerMock: { debug: vi.fn(), warn: vi.fn(), error: vi.fn() },
|
|
27
|
+
}));
|
|
28
|
+
vi.mock("../../core/logger.ts", () => ({ getLogger: () => loggerMock }));
|
|
29
|
+
|
|
30
|
+
import {
|
|
31
|
+
BRANCH_CACHE_MAX_ENTRIES,
|
|
32
|
+
_getBranchCacheSizeForTest,
|
|
33
|
+
_resetBranchCacheForTest,
|
|
34
|
+
buildEnvBlock,
|
|
35
|
+
} from "../engine/engines/pi/session-runner.ts";
|
|
36
|
+
|
|
37
|
+
/** execFile mock 回填 br-<cwd>(branch 与 cwd 一一对应,淘汰行为可断言)。 */
|
|
38
|
+
function stubGitBranchSuccess(): void {
|
|
39
|
+
execFileMock.mockImplementation(
|
|
40
|
+
(
|
|
41
|
+
_cmd: string,
|
|
42
|
+
_args: readonly string[],
|
|
43
|
+
opts: { cwd?: string },
|
|
44
|
+
cb: (err: Error | null, stdout?: string, stderr?: string) => void,
|
|
45
|
+
) => cb(null, `br-${opts?.cwd ?? "unknown"}`, ""),
|
|
46
|
+
);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
beforeEach(() => {
|
|
50
|
+
_resetBranchCacheForTest();
|
|
51
|
+
stubGitBranchSuccess();
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
afterEach(() => {
|
|
55
|
+
_resetBranchCacheForTest();
|
|
56
|
+
execFileMock.mockReset();
|
|
57
|
+
loggerMock.debug.mockClear();
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
describe("[LC-8] branchCache LRU 上界", () => {
|
|
61
|
+
it("常量导出 BRANCH_CACHE_MAX_ENTRIES = 64", () => {
|
|
62
|
+
expect(BRANCH_CACHE_MAX_ENTRIES).toBe(64);
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
it("65 个路径插入后规模封顶 64,最旧被淘汰(重新 spawn git)", async () => {
|
|
66
|
+
const cwds = Array.from({ length: BRANCH_CACHE_MAX_ENTRIES + 1 }, (_, i) => `/tmp/lru-cwd-${i}`);
|
|
67
|
+
for (const cwd of cwds) {
|
|
68
|
+
const block = await buildEnvBlock(cwd);
|
|
69
|
+
expect(block).toContain(`Git branch: br-${cwd}`);
|
|
70
|
+
}
|
|
71
|
+
// 65 次 miss 插入,第 65 次插入时淘汰最旧(cwd-0)→ execFile 恰 65 次、规模 64
|
|
72
|
+
expect(execFileMock).toHaveBeenCalledTimes(BRANCH_CACHE_MAX_ENTRIES + 1);
|
|
73
|
+
expect(_getBranchCacheSizeForTest()).toBe(BRANCH_CACHE_MAX_ENTRIES);
|
|
74
|
+
|
|
75
|
+
// 最旧(cwd-0)已被 LRU 淘汰 → 再次查询重新 spawn git(66 次);重插后淘汰次旧
|
|
76
|
+
//(cwd-1),更近插入的 cwd-2 不受影响
|
|
77
|
+
const block0 = await buildEnvBlock("/tmp/lru-cwd-0");
|
|
78
|
+
expect(block0).toContain("Git branch: br-/tmp/lru-cwd-0");
|
|
79
|
+
expect(execFileMock).toHaveBeenCalledTimes(BRANCH_CACHE_MAX_ENTRIES + 2);
|
|
80
|
+
|
|
81
|
+
// cwd-2(仍近插入序)仍在缓存 → 查询不再 spawn(仍 66 次)
|
|
82
|
+
await buildEnvBlock("/tmp/lru-cwd-2");
|
|
83
|
+
expect(execFileMock).toHaveBeenCalledTimes(BRANCH_CACHE_MAX_ENTRIES + 2);
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
it("get 命中刷新 LRU 序:被 touch 的条目不再是最旧淘汰候选", async () => {
|
|
87
|
+
const cwdA = "/tmp/lru-touch-a";
|
|
88
|
+
const cwdB = "/tmp/lru-touch-b";
|
|
89
|
+
await buildEnvBlock(cwdA); // A 先插
|
|
90
|
+
await buildEnvBlock(cwdB); // B 后插
|
|
91
|
+
expect(execFileMock).toHaveBeenCalledTimes(2);
|
|
92
|
+
|
|
93
|
+
await buildEnvBlock(cwdA); // 命中并 touch → A 变最新,B 变最旧;零 spawn
|
|
94
|
+
expect(execFileMock).toHaveBeenCalledTimes(2);
|
|
95
|
+
|
|
96
|
+
// 再插 63 个新条目挤爆缓存(2 + 63 = 65 → 淘汰恰 1 个最旧):B(最旧)被淘汰、
|
|
97
|
+
// A(被 touch 过,次新)存活
|
|
98
|
+
for (let i = 0; i < BRANCH_CACHE_MAX_ENTRIES - 1; i++) {
|
|
99
|
+
await buildEnvBlock(`/tmp/lru-flood-${i}`);
|
|
100
|
+
}
|
|
101
|
+
expect(_getBranchCacheSizeForTest()).toBe(BRANCH_CACHE_MAX_ENTRIES);
|
|
102
|
+
const spawnsAfterFlood = execFileMock.mock.calls.length;
|
|
103
|
+
|
|
104
|
+
await buildEnvBlock(cwdA); // A 被 touch 过 → 仍在缓存
|
|
105
|
+
expect(execFileMock).toHaveBeenCalledTimes(spawnsAfterFlood);
|
|
106
|
+
|
|
107
|
+
await buildEnvBlock(cwdB); // B 最早未 touch → 已被淘汰,重新 spawn
|
|
108
|
+
expect(execFileMock).toHaveBeenCalledTimes(spawnsAfterFlood + 1);
|
|
109
|
+
});
|
|
110
|
+
});
|