@zhushanwen/pi-subagent-workflow 8.5.0 → 8.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +13 -16
- package/relay/relay.mjs +1 -1
- package/src/host/__tests__/pi-host.test.ts +214 -0
- package/src/host/pi-host.ts +109 -0
- package/src/index.ts +142 -32
- package/src/injectors/__tests__/engine-awareness.test.ts +292 -0
- package/src/injectors/__tests__/engine-section-stability.test.ts +341 -0
- package/src/injectors/__tests__/subagent-list-injector.test.ts +5 -5
- package/src/injectors/__tests__/workflow-list-injector.test.ts +5 -5
- package/src/injectors/engine-awareness.ts +123 -0
- package/src/injectors/model-list-injector.ts +1 -1
- package/src/injectors/subagent-list-injector.ts +8 -8
- package/src/injectors/workflow-list-injector.ts +8 -8
- package/src/interface/__tests__/detectors.test.ts +3 -3
- package/src/interface/__tests__/subagent-tool-path-guard.test.ts +157 -0
- package/src/interface/__tests__/subagent-tool-prompt.test.ts +12 -0
- package/src/interface/__tests__/tool-workflow-script-generate.test.ts +2 -2
- package/src/interface/__tests__/tool-workflow-throw-paths.test.ts +1 -1
- package/src/interface/bg-notify-render.ts +34 -13
- package/src/interface/commands.ts +3 -3
- package/src/interface/format.ts +2 -2
- package/src/interface/helpers.ts +3 -3
- package/src/interface/list-component.ts +4 -4
- package/src/interface/list-shared.ts +2 -2
- package/src/interface/list-view.ts +2 -2
- package/src/interface/subagent-actions.ts +288 -19
- package/src/interface/subagent-tool-schema.ts +163 -0
- package/src/interface/subagent-tool.ts +65 -129
- package/src/interface/subagents.ts +5 -5
- package/src/interface/tool-render.ts +34 -2
- package/src/interface/tool-workflow-script.ts +4 -4
- package/src/interface/tool-workflow.ts +6 -6
- package/src/interface/views/WorkflowsView.ts +5 -5
- package/src/interface/views/__tests__/WorkflowsView-signature.test.ts +3 -3
- package/src/interface/views/__tests__/detail-content-session-file.test.ts +2 -2
- package/src/interface/views/detail-content.ts +4 -4
- package/src/interface/views/format.ts +4 -4
- package/src/{orchestration/jsonl-run-store.ts → jsonl-run-store.ts} +132 -18
- package/src/execution/__tests__/__fixtures__/notifier-golden-snapshots.json +0 -53
- package/src/execution/__tests__/__fixtures__/truncline.snapshot.json +0 -1
- package/src/execution/__tests__/agent-registry.test.ts +0 -363
- package/src/execution/__tests__/agent-result-mapper.test.ts +0 -150
- package/src/execution/__tests__/alive-store.test.ts +0 -147
- package/src/execution/__tests__/ask-user-transit-e2e.test.ts +0 -490
- package/src/execution/__tests__/before-agent-start-injection.test.ts +0 -132
- package/src/execution/__tests__/bg-notify-render.test.ts +0 -256
- package/src/execution/__tests__/channel-registry-handshake.test.ts +0 -243
- package/src/execution/__tests__/chat-engine-routing.test.ts +0 -597
- package/src/execution/__tests__/chatmode-first-round-closure-service.test.ts +0 -365
- package/src/execution/__tests__/chatmode-first-round-closure-spawn.test.ts +0 -190
- package/src/execution/__tests__/chatmode-round-notify-real-chain.test.ts +0 -215
- package/src/execution/__tests__/concurrency-pool.test.ts +0 -250
- package/src/execution/__tests__/config.test.ts +0 -110
- package/src/execution/__tests__/conversation-wiring.test.ts +0 -198
- package/src/execution/__tests__/crash-recovery.test.ts +0 -320
- package/src/execution/__tests__/delivery-methods.test.ts +0 -385
- package/src/execution/__tests__/dialog-queue.test.ts +0 -299
- package/src/execution/__tests__/epipe-fallback.test.ts +0 -241
- package/src/execution/__tests__/execute-and-await-worktree.test.ts +0 -243
- package/src/execution/__tests__/execute-nesting.test.ts +0 -323
- package/src/execution/__tests__/execute-options-mapper.test.ts +0 -189
- package/src/execution/__tests__/execution-record.test.ts +0 -1284
- package/src/execution/__tests__/finalize-record.test.ts +0 -368
- package/src/execution/__tests__/finalized-marker.test.ts +0 -82
- package/src/execution/__tests__/format-schema-instruction.test.ts +0 -138
- package/src/execution/__tests__/format.test.ts +0 -458
- package/src/execution/__tests__/gc-timer.test.ts +0 -184
- package/src/execution/__tests__/get-record-for-action-restart.test.ts +0 -254
- package/src/execution/__tests__/gui-mode-dispatch.test.ts +0 -59
- package/src/execution/__tests__/helpers/mock-extension-api.ts +0 -30
- package/src/execution/__tests__/helpers/spawn-mock.ts +0 -238
- package/src/execution/__tests__/host-mode.test.ts +0 -87
- package/src/execution/__tests__/index-session-start-identity.test.ts +0 -371
- package/src/execution/__tests__/index-session-start.test.ts +0 -593
- package/src/execution/__tests__/lifecycle-manager-lock.test.ts +0 -211
- package/src/execution/__tests__/lifecycle-manager.test.ts +0 -337
- package/src/execution/__tests__/lifecycle-predicates.test.ts +0 -116
- package/src/execution/__tests__/list-component.test.ts +0 -401
- package/src/execution/__tests__/list-fields.test.ts +0 -109
- package/src/execution/__tests__/manifest-parentid.test.ts +0 -117
- package/src/execution/__tests__/model-resolver.test.ts +0 -413
- package/src/execution/__tests__/nested-visibility-env-propagation.test.ts +0 -287
- package/src/execution/__tests__/nested-visibility.test.ts +0 -325
- package/src/execution/__tests__/notifier-flush.test.ts +0 -574
- package/src/execution/__tests__/notifier-golden-snapshot.test.ts +0 -261
- package/src/execution/__tests__/one-shot-upgrade.test.ts +0 -205
- package/src/execution/__tests__/output-collector.test.ts +0 -61
- package/src/execution/__tests__/parent-child-matrix.test.ts +0 -336
- package/src/execution/__tests__/path-encoding.test.ts +0 -104
- package/src/execution/__tests__/pi-invocation.test.ts +0 -134
- package/src/execution/__tests__/record-store.test.ts +0 -1057
- package/src/execution/__tests__/records-cwd-isolation.test.ts +0 -91
- package/src/execution/__tests__/recursive-visibility-baseline.test.ts +0 -339
- package/src/execution/__tests__/recursive-visibility-env.test.ts +0 -273
- package/src/execution/__tests__/relay-agent.test.ts +0 -448
- package/src/execution/__tests__/relay-env.test.ts +0 -42
- package/src/execution/__tests__/resource-policy.test.ts +0 -109
- package/src/execution/__tests__/rpc-mode.test.ts +0 -89
- package/src/execution/__tests__/run-and-finalize-chatmode.test.ts +0 -267
- package/src/execution/__tests__/run-spawn-chatmode-settled.test.ts +0 -253
- package/src/execution/__tests__/run-spawn-edges.test.ts +0 -644
- package/src/execution/__tests__/run-spawn-integration.test.ts +0 -933
- package/src/execution/__tests__/run-spawn-resume.test.ts +0 -322
- package/src/execution/__tests__/run-spawn-rpc-mode.test.ts +0 -196
- package/src/execution/__tests__/sdk-contract.test.ts +0 -273
- package/src/execution/__tests__/session-context-resolver.test.ts +0 -167
- package/src/execution/__tests__/session-file-gc.test.ts +0 -293
- package/src/execution/__tests__/session-pending.test.ts +0 -197
- package/src/execution/__tests__/session-reconstructor.test.ts +0 -379
- package/src/execution/__tests__/session-runner-epipe.test.ts +0 -178
- package/src/execution/__tests__/session-runner-schema-env.test.ts +0 -311
- package/src/execution/__tests__/session-start-reaper.test.ts +0 -233
- package/src/execution/__tests__/spawn-args.test.ts +0 -434
- package/src/execution/__tests__/spawn-event-adapter-rpc.test.ts +0 -189
- package/src/execution/__tests__/spawn-event-adapter.test.ts +0 -167
- package/src/execution/__tests__/spawn-worktree-guidance.test.ts +0 -207
- package/src/execution/__tests__/spawned-children.test.ts +0 -92
- package/src/execution/__tests__/startup-config-declaration.test.ts +0 -35
- package/src/execution/__tests__/status-refactor.test.ts +0 -345
- package/src/execution/__tests__/stdin-writer.test.ts +0 -463
- package/src/execution/__tests__/stream-sink-retirement.test.ts +0 -261
- package/src/execution/__tests__/subagent-service-abort.test.ts +0 -60
- package/src/execution/__tests__/subagent-service-message-close.test.ts +0 -629
- package/src/execution/__tests__/subagent-service-parent-guard.test.ts +0 -180
- package/src/execution/__tests__/subagent-service.test.ts +0 -788
- package/src/execution/__tests__/subprocess-agent-runner-routing.test.ts +0 -310
- package/src/execution/__tests__/subprocess-agent-runner.test.ts +0 -506
- package/src/execution/__tests__/temp-prompt.test.ts +0 -53
- package/src/execution/__tests__/timeout-integration.test.ts +0 -397
- package/src/execution/__tests__/tombstone-store.test.ts +0 -73
- package/src/execution/__tests__/tool-action.test.ts +0 -385
- package/src/execution/__tests__/truncline-snapshot.test.ts +0 -81
- package/src/execution/__tests__/turn-limiter-semantics.test.ts +0 -194
- package/src/execution/__tests__/turn-limiter.test.ts +0 -65
- package/src/execution/__tests__/ui-channels.test.ts +0 -187
- package/src/execution/__tests__/ui-interaction-model.test.ts +0 -67
- package/src/execution/__tests__/ui-request-handler-factory.test.ts +0 -370
- package/src/execution/__tests__/ui-request-handler.test.ts +0 -204
- package/src/execution/__tests__/ui-request-observability.test.ts +0 -114
- package/src/execution/__tests__/ui-request-queue.test.ts +0 -133
- package/src/execution/__tests__/worktree-manager.test.ts +0 -633
- package/src/execution/__tests__/worktree-pid-registration.integration.test.ts +0 -229
- package/src/execution/__tests__/worktree-reconcile.integration.test.ts +0 -181
- package/src/execution/__tests__/worktree-registry.test.ts +0 -199
- package/src/execution/agent-registry.ts +0 -193
- package/src/execution/agent-result-mapper.ts +0 -90
- package/src/execution/alive-store.ts +0 -92
- package/src/execution/argv-mirror.ts +0 -109
- package/src/execution/best-effort.ts +0 -38
- package/src/execution/channel-registry-access.ts +0 -144
- package/src/execution/concurrency-pool.ts +0 -116
- package/src/execution/config.ts +0 -96
- package/src/execution/dialog-queue.ts +0 -330
- package/src/execution/engine/__tests__/common/data-dir.test.ts +0 -53
- package/src/execution/engine/__tests__/common/errors.test.ts +0 -132
- package/src/execution/engine/__tests__/common/event-journal.test.ts +0 -177
- package/src/execution/engine/__tests__/common/kill-chain.test.ts +0 -192
- package/src/execution/engine/__tests__/common/nesting-guard.test.ts +0 -81
- package/src/execution/engine/__tests__/common/persona-router.test.ts +0 -123
- package/src/execution/engine/__tests__/common/pool-manager.test.ts +0 -154
- package/src/execution/engine/__tests__/common/schema-emulation.test.ts +0 -128
- package/src/execution/engine/__tests__/conformance/__fixtures__/pi-golden-events.json +0 -28
- package/src/execution/engine/__tests__/conformance/agent-event-invariants.ts +0 -141
- package/src/execution/engine/__tests__/conformance/contract.abort.test.ts +0 -109
- package/src/execution/engine/__tests__/conformance/contract.agent-events.test.ts +0 -101
- package/src/execution/engine/__tests__/conformance/contract.probe.test.ts +0 -77
- package/src/execution/engine/__tests__/conformance/contract.read-degradation.test.ts +0 -104
- package/src/execution/engine/__tests__/conformance/contract.relay.test.ts +0 -342
- package/src/execution/engine/__tests__/conformance/engine-conformance.live.test.ts +0 -201
- package/src/execution/engine/__tests__/conformance/golden-replay.pi.test.ts +0 -76
- package/src/execution/engine/__tests__/conformance/golden-replay.zcode.test.ts +0 -79
- package/src/execution/engine/__tests__/engine-discovery.test.ts +0 -87
- package/src/execution/engine/__tests__/engines-declaration.test.ts +0 -36
- package/src/execution/engine/__tests__/model-prompt.test.ts +0 -85
- package/src/execution/engine/__tests__/paths.test.ts +0 -39
- package/src/execution/engine/__tests__/registry.test.ts +0 -120
- package/src/execution/engine/__tests__/routing.test.ts +0 -231
- package/src/execution/engine/common/data-dir.ts +0 -62
- package/src/execution/engine/common/errors.ts +0 -183
- package/src/execution/engine/common/event-journal.ts +0 -254
- package/src/execution/engine/common/journal-replay.ts +0 -62
- package/src/execution/engine/common/kill-chain.ts +0 -221
- package/src/execution/engine/common/nesting-guard.ts +0 -50
- package/src/execution/engine/common/persona-router.ts +0 -108
- package/src/execution/engine/common/pool-manager.ts +0 -226
- package/src/execution/engine/common/schema-emulation.ts +0 -189
- package/src/execution/engine/common/session-view-projection.ts +0 -51
- package/src/execution/engine/engine-discovery.ts +0 -65
- package/src/execution/engine/engines/pi/__tests__/pi-engine.test.ts +0 -469
- package/src/execution/engine/engines/pi/__tests__/reader.test.ts +0 -155
- package/src/execution/engine/engines/pi/__tests__/task-spec-mapper.test.ts +0 -164
- package/src/execution/engine/engines/pi/pi-engine.ts +0 -415
- package/src/execution/engine/engines/pi/reader.ts +0 -48
- package/src/execution/engine/engines/pi/registration.ts +0 -35
- 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__/parser.test.ts +0 -246
- package/src/execution/engine/engines/zcode/__tests__/preparer.test.ts +0 -228
- package/src/execution/engine/engines/zcode/__tests__/reader.test.ts +0 -210
- package/src/execution/engine/engines/zcode/__tests__/registration.test.ts +0 -64
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine.live.test.ts +0 -127
- package/src/execution/engine/engines/zcode/__tests__/zcode-engine.test.ts +0 -567
- package/src/execution/engine/engines/zcode/constants.ts +0 -43
- package/src/execution/engine/engines/zcode/golden-sample.ts +0 -39
- package/src/execution/engine/engines/zcode/launcher.ts +0 -161
- package/src/execution/engine/engines/zcode/parser.ts +0 -436
- package/src/execution/engine/engines/zcode/preparer.ts +0 -363
- package/src/execution/engine/engines/zcode/reader.ts +0 -381
- package/src/execution/engine/engines/zcode/registration.ts +0 -37
- package/src/execution/engine/engines/zcode/zcode-engine.ts +0 -648
- package/src/execution/engine/host-task-spec.ts +0 -47
- package/src/execution/engine/model-prompt.ts +0 -59
- package/src/execution/engine/paths.ts +0 -42
- package/src/execution/engine/port.ts +0 -153
- package/src/execution/engine/registry.ts +0 -123
- package/src/execution/engine/routing.ts +0 -218
- package/src/execution/engine/types.ts +0 -304
- package/src/execution/execute-options-mapper.ts +0 -111
- package/src/execution/execution-record.ts +0 -906
- package/src/execution/finalize-record.ts +0 -251
- package/src/execution/finalized-marker.ts +0 -51
- package/src/execution/get-state-handshake.ts +0 -104
- package/src/execution/host-mode.ts +0 -56
- package/src/execution/idle-gc.ts +0 -47
- package/src/execution/lifecycle-manager.ts +0 -491
- package/src/execution/lifecycle-predicates.ts +0 -65
- package/src/execution/manifest-store.ts +0 -256
- package/src/execution/model-config-service.ts +0 -204
- package/src/execution/model-resolver.ts +0 -276
- package/src/execution/notifier.ts +0 -260
- package/src/execution/output-collector.ts +0 -88
- package/src/execution/path-encoding.ts +0 -60
- package/src/execution/pi-invocation.ts +0 -120
- package/src/execution/record-entry.ts +0 -132
- package/src/execution/record-store.ts +0 -1234
- package/src/execution/relay-env.ts +0 -37
- package/src/execution/session-context-resolver.ts +0 -64
- package/src/execution/session-file-gc.ts +0 -120
- package/src/execution/session-pending.ts +0 -164
- package/src/execution/session-reconstructor.ts +0 -678
- package/src/execution/session-runner.ts +0 -1548
- package/src/execution/sessions-index.ts +0 -304
- package/src/execution/spawn-event-adapter.ts +0 -363
- package/src/execution/stdin-writer.ts +0 -198
- package/src/execution/stream-sink.ts +0 -126
- package/src/execution/subagent-service.ts +0 -2119
- package/src/execution/subprocess-agent-runner.ts +0 -303
- package/src/execution/temp-prompt.ts +0 -62
- package/src/execution/tombstone-store.ts +0 -72
- package/src/execution/turn-limiter.ts +0 -102
- package/src/execution/types.ts +0 -910
- package/src/execution/ui-channels.ts +0 -216
- package/src/execution/ui-interaction-model.ts +0 -48
- package/src/execution/ui-request-handler-factory.ts +0 -212
- package/src/execution/ui-request-observability.ts +0 -81
- package/src/execution/ui-request-queue.ts +0 -174
- package/src/execution/worktree-manager.ts +0 -688
- package/src/execution/worktree-registry.ts +0 -222
- package/src/orchestration/__tests__/__fixtures__/worker-template.snapshot.txt +0 -336
- package/src/orchestration/__tests__/agent-call-catch-fallback.test.ts +0 -208
- package/src/orchestration/__tests__/agent-call-stream.test.ts +0 -157
- package/src/orchestration/__tests__/args-validator.test.ts +0 -143
- package/src/orchestration/__tests__/concurrency-gate.test.ts +0 -125
- package/src/orchestration/__tests__/config-loader.test.ts +0 -503
- package/src/orchestration/__tests__/error-recovery-handlers.test.ts +0 -724
- package/src/orchestration/__tests__/error-recovery-postmessage-defense.test.ts +0 -405
- package/src/orchestration/__tests__/error-recovery-serialize-failed-result.test.ts +0 -56
- package/src/orchestration/__tests__/error-recovery-workflow-call.test.ts +0 -166
- package/src/orchestration/__tests__/execute-agent-call.test.ts +0 -314
- package/src/orchestration/__tests__/jsonl-run-store-loadall-sources.test.ts +0 -171
- package/src/orchestration/__tests__/jsonl-run-store-session-file.test.ts +0 -1030
- package/src/orchestration/__tests__/launcher-nested-workflow.test.ts +0 -277
- package/src/orchestration/__tests__/lifecycle-runid-injection.test.ts +0 -96
- package/src/orchestration/__tests__/lifecycle.test.ts +0 -625
- package/src/orchestration/__tests__/review-fix-loop-e2e.test.ts +0 -1971
- package/src/orchestration/__tests__/script-lint.test.ts +0 -831
- package/src/orchestration/__tests__/skill-discovery.test.ts +0 -157
- package/src/orchestration/__tests__/test-mocks.ts +0 -197
- package/src/orchestration/__tests__/worker-host.test.ts +0 -120
- package/src/orchestration/__tests__/worker-returnmeta-passthrough.test.ts +0 -164
- package/src/orchestration/__tests__/worker-script-builder-runtime.test.ts +0 -520
- package/src/orchestration/__tests__/worker-script-builder.test.ts +0 -309
- package/src/orchestration/__tests__/worker-script-template-snapshot.test.ts +0 -110
- package/src/orchestration/__tests__/workflow-nesting-e2e.test.ts +0 -317
- package/src/orchestration/__tests__/workflow-script-lint-memo.test.ts +0 -110
- package/src/orchestration/__tests__/workflows-e2e.test.ts +0 -537
- package/src/orchestration/agent-opts-resolver.ts +0 -93
- package/src/orchestration/args-validator.ts +0 -127
- package/src/orchestration/concurrency-gate.ts +0 -69
- package/src/orchestration/config-loader.ts +0 -315
- package/src/orchestration/error-recovery.ts +0 -862
- package/src/orchestration/execute-agent-call.ts +0 -217
- package/src/orchestration/launcher.ts +0 -410
- package/src/orchestration/lifecycle.ts +0 -396
- package/src/orchestration/models/__tests__/budget.test.ts +0 -367
- package/src/orchestration/models/__tests__/trace.test.ts +0 -408
- package/src/orchestration/models/agent-call.ts +0 -83
- package/src/orchestration/models/budget.ts +0 -148
- package/src/orchestration/models/ports.ts +0 -164
- package/src/orchestration/models/run-runtime.ts +0 -89
- package/src/orchestration/models/run-spec.ts +0 -83
- package/src/orchestration/models/run-state.ts +0 -44
- package/src/orchestration/models/trace.ts +0 -183
- package/src/orchestration/models/types.ts +0 -292
- package/src/orchestration/models/workflow-run.ts +0 -254
- package/src/orchestration/models/workflow-script-registry.ts +0 -35
- package/src/orchestration/models/workflow-script.ts +0 -117
- package/src/orchestration/script-lint.ts +0 -766
- package/src/orchestration/skill-discovery.ts +0 -92
- package/src/orchestration/worker-handle.ts +0 -115
- package/src/orchestration/worker-host.ts +0 -98
- package/src/orchestration/worker-script-builder.ts +0 -408
- package/src/orchestration/workflow-files.ts +0 -85
- package/src/orchestration/workflow-script-registry-impl.ts +0 -133
- package/src/shared/__tests__/agent-ref.test.ts +0 -34
- package/src/shared/__tests__/meta-parser.test.ts +0 -304
- package/src/shared/__tests__/resource-discovery-manifest-cache.test.ts +0 -280
- package/src/shared/__tests__/resource-discovery.test.ts +0 -736
- package/src/shared/__tests__/resource-meta.test.ts +0 -51
- package/src/shared/__tests__/schema-jsonify.test.ts +0 -81
- package/src/shared/agent-event.ts +0 -13
- package/src/shared/agent-ref.ts +0 -57
- package/src/shared/meta-parser.ts +0 -261
- package/src/shared/resource-discovery.ts +0 -811
- package/src/shared/resource-meta.ts +0 -65
- package/src/shared/schema-jsonify.ts +0 -56
- package/src/shared/xml-injection.ts +0 -35
- package/workflows/README.md +0 -81
- package/workflows/_shared/agent-refs.cjs +0 -40
- package/workflows/chain.js +0 -131
- package/workflows/map-reduce.js +0 -174
- package/workflows/parallel.js +0 -148
- package/workflows/review-fix-loop-utils.cjs +0 -1307
- package/workflows/review-fix-loop.js +0 -1396
- package/workflows/scatter-gather.js +0 -178
|
@@ -1,413 +0,0 @@
|
|
|
1
|
-
// src/__tests__/model-resolver.test.ts
|
|
2
|
-
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
|
3
|
-
|
|
4
|
-
import {
|
|
5
|
-
availableThinkingLevels,
|
|
6
|
-
type ModelInfo,
|
|
7
|
-
type ModelRegistryLike,
|
|
8
|
-
resolveModel,
|
|
9
|
-
} from "../model-resolver.ts";
|
|
10
|
-
|
|
11
|
-
// ============================================================
|
|
12
|
-
// helpers
|
|
13
|
-
// ============================================================
|
|
14
|
-
|
|
15
|
-
function makeModel(over: Partial<ModelInfo> = {}): ModelInfo {
|
|
16
|
-
return {
|
|
17
|
-
id: over.id ?? "sonnet-4-5",
|
|
18
|
-
name: over.name ?? "Claude Sonnet 4.5",
|
|
19
|
-
provider: over.provider ?? "anthropic",
|
|
20
|
-
reasoning: over.reasoning ?? false,
|
|
21
|
-
thinkingLevelMap: over.thinkingLevelMap,
|
|
22
|
-
contextWindow: over.contextWindow,
|
|
23
|
-
};
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
/** 构造 mock registry:registered 表 (provider/modelId) → ModelInfo;authed 集合控制鉴权。 */
|
|
27
|
-
function makeRegistry(models: ModelInfo[], authed: string[] = models.map((m) => `${m.provider}/${m.id}`)): ModelRegistryLike {
|
|
28
|
-
const authSet = new Set(authed);
|
|
29
|
-
return {
|
|
30
|
-
getAvailable: () => models,
|
|
31
|
-
find: (provider, modelId) => models.find((m) => m.provider === provider && m.id === modelId),
|
|
32
|
-
hasConfiguredAuth: (m) => {
|
|
33
|
-
if (!m || typeof m !== "object") return false;
|
|
34
|
-
const mm = m as ModelInfo;
|
|
35
|
-
return authSet.has(`${mm.provider}/${mm.id}`);
|
|
36
|
-
},
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
/** 主 agent model(第三层兼底)。 */
|
|
41
|
-
const ctxModel = makeModel({ id: "main-model", provider: "main" });
|
|
42
|
-
|
|
43
|
-
// ============================================================
|
|
44
|
-
// resolveModel — 三层优先级
|
|
45
|
-
// ============================================================
|
|
46
|
-
|
|
47
|
-
describe("resolveModel — three-layer priority", () => {
|
|
48
|
-
it("L1: paramOverride.model wins over agentConfig and ctxModel", () => {
|
|
49
|
-
const m1 = makeModel({ id: "explicit", provider: "p1" });
|
|
50
|
-
const reg = makeRegistry([m1]);
|
|
51
|
-
const r = resolveModel(
|
|
52
|
-
{ name: "worker", systemPrompt: "", model: "main/agent-md" },
|
|
53
|
-
reg,
|
|
54
|
-
{ model: "p1/explicit" },
|
|
55
|
-
ctxModel,
|
|
56
|
-
);
|
|
57
|
-
expect(r.model.id).toBe("explicit");
|
|
58
|
-
});
|
|
59
|
-
|
|
60
|
-
it("L2: agentConfig.model used when no paramOverride", () => {
|
|
61
|
-
const m = makeModel({ id: "agent-md-model", provider: "ap" });
|
|
62
|
-
const reg = makeRegistry([m]);
|
|
63
|
-
const r = resolveModel(
|
|
64
|
-
{ name: "worker", systemPrompt: "", model: "ap/agent-md-model" },
|
|
65
|
-
reg,
|
|
66
|
-
undefined,
|
|
67
|
-
ctxModel,
|
|
68
|
-
);
|
|
69
|
-
expect(r.model.id).toBe("agent-md-model");
|
|
70
|
-
});
|
|
71
|
-
|
|
72
|
-
it("L3: ctxModel (main agent model) used when no override and no agentConfig.model", () => {
|
|
73
|
-
const reg = makeRegistry([]);
|
|
74
|
-
const r = resolveModel(
|
|
75
|
-
{ name: "worker", systemPrompt: "" },
|
|
76
|
-
reg,
|
|
77
|
-
undefined,
|
|
78
|
-
ctxModel,
|
|
79
|
-
);
|
|
80
|
-
expect(r.model).toBe(ctxModel);
|
|
81
|
-
expect(r.thinkingLevel).toBeUndefined();
|
|
82
|
-
});
|
|
83
|
-
|
|
84
|
-
it("L3: ctxModel used even when registry is empty (no lookup needed)", () => {
|
|
85
|
-
const reg = makeRegistry([]);
|
|
86
|
-
const r = resolveModel(undefined, reg, undefined, ctxModel);
|
|
87
|
-
expect(r.model).toBe(ctxModel);
|
|
88
|
-
});
|
|
89
|
-
});
|
|
90
|
-
|
|
91
|
-
// ============================================================
|
|
92
|
-
// 显式指定失败的错误行为
|
|
93
|
-
// ============================================================
|
|
94
|
-
|
|
95
|
-
describe("resolveModel — explicit override failures throw (no silent fallback)", () => {
|
|
96
|
-
it("paramOverride.model not in registry → throws (does NOT fall back to ctxModel)", () => {
|
|
97
|
-
const reg = makeRegistry([]);
|
|
98
|
-
expect(() =>
|
|
99
|
-
resolveModel(undefined, reg, { model: "x/nonexistent" }, ctxModel),
|
|
100
|
-
).toThrow(/not found in registry/);
|
|
101
|
-
});
|
|
102
|
-
|
|
103
|
-
it("paramOverride.model found but auth missing → throws auth-specific message", () => {
|
|
104
|
-
const m = makeModel({ id: "unauthed", provider: "u" });
|
|
105
|
-
const reg = makeRegistry([m], []); // 无鉴权
|
|
106
|
-
expect(() =>
|
|
107
|
-
resolveModel(undefined, reg, { model: "u/unauthed" }, ctxModel),
|
|
108
|
-
).toThrow(/exists but auth is not configured/);
|
|
109
|
-
});
|
|
110
|
-
|
|
111
|
-
it("agentConfig.model not in registry → throws", () => {
|
|
112
|
-
const reg = makeRegistry([]);
|
|
113
|
-
expect(() =>
|
|
114
|
-
resolveModel(
|
|
115
|
-
{ name: "worker", systemPrompt: "", model: "x/missing" },
|
|
116
|
-
reg,
|
|
117
|
-
undefined,
|
|
118
|
-
ctxModel,
|
|
119
|
-
),
|
|
120
|
-
).toThrow(/not found in registry/);
|
|
121
|
-
});
|
|
122
|
-
|
|
123
|
-
it("no override, no agentConfig.model, no ctxModel → throws listing available", () => {
|
|
124
|
-
const m = makeModel({ id: "visible", provider: "v" });
|
|
125
|
-
const reg = makeRegistry([m]);
|
|
126
|
-
expect(() => resolveModel(undefined, reg, undefined, undefined)).toThrow(
|
|
127
|
-
/No available model.*Available models/s,
|
|
128
|
-
);
|
|
129
|
-
});
|
|
130
|
-
|
|
131
|
-
it("invalid model string (no slash) → throws", () => {
|
|
132
|
-
const reg = makeRegistry([]);
|
|
133
|
-
expect(() =>
|
|
134
|
-
resolveModel(undefined, reg, { model: "no-slash" }, ctxModel),
|
|
135
|
-
).toThrow(/not found in registry/);
|
|
136
|
-
});
|
|
137
|
-
});
|
|
138
|
-
|
|
139
|
-
// ============================================================
|
|
140
|
-
// thinkingLevel 解析
|
|
141
|
-
// ============================================================
|
|
142
|
-
|
|
143
|
-
describe("resolveModel — thinkingLevel resolution", () => {
|
|
144
|
-
it("override path: returns requested thinkingLevel when model supports it", () => {
|
|
145
|
-
const m = makeModel({
|
|
146
|
-
id: "reasoning-model",
|
|
147
|
-
provider: "rp",
|
|
148
|
-
reasoning: true,
|
|
149
|
-
thinkingLevelMap: { low: 1, high: 2, xhigh: 3 },
|
|
150
|
-
});
|
|
151
|
-
const reg = makeRegistry([m]);
|
|
152
|
-
const r = resolveModel(undefined, reg, { model: "rp/reasoning-model", thinkingLevel: "high" });
|
|
153
|
-
expect(r.thinkingLevel).toBe("high");
|
|
154
|
-
});
|
|
155
|
-
|
|
156
|
-
it("override path: clamps down to highest available when requested unsupported", () => {
|
|
157
|
-
const m = makeModel({
|
|
158
|
-
id: "limited-model",
|
|
159
|
-
provider: "lp",
|
|
160
|
-
reasoning: true,
|
|
161
|
-
thinkingLevelMap: { low: 1, medium: 2 }, // 不含 xhigh
|
|
162
|
-
});
|
|
163
|
-
const reg = makeRegistry([m]);
|
|
164
|
-
const r = resolveModel(undefined, reg, { model: "lp/limited-model", thinkingLevel: "xhigh" });
|
|
165
|
-
expect(r.thinkingLevel).toBe("medium");
|
|
166
|
-
});
|
|
167
|
-
|
|
168
|
-
it("override path: returns undefined when model.reasoning === false", () => {
|
|
169
|
-
const m = makeModel({ id: "non-reasoning", provider: "nr", reasoning: false });
|
|
170
|
-
const reg = makeRegistry([m]);
|
|
171
|
-
const r = resolveModel(undefined, reg, { model: "nr/non-reasoning", thinkingLevel: "high" });
|
|
172
|
-
expect(r.thinkingLevel).toBeUndefined();
|
|
173
|
-
});
|
|
174
|
-
|
|
175
|
-
it("ctxModel path: thinkingLevel from paramOverride.thinkingLevel (pass-through, no clamp)", () => {
|
|
176
|
-
const reg = makeRegistry([]);
|
|
177
|
-
const r = resolveModel(undefined, reg, { thinkingLevel: "high" }, ctxModel);
|
|
178
|
-
// ctxModel reasoning=false,但 ctxModel 路径不 clamp(主 agent model 直接透传)
|
|
179
|
-
expect(r.thinkingLevel).toBe("high");
|
|
180
|
-
});
|
|
181
|
-
|
|
182
|
-
it("ctxModel path: thinkingLevel from agentConfig.thinkingLevel when no paramOverride", () => {
|
|
183
|
-
const reg = makeRegistry([]);
|
|
184
|
-
const r = resolveModel(
|
|
185
|
-
{ name: "worker", systemPrompt: "", thinkingLevel: "medium" },
|
|
186
|
-
reg,
|
|
187
|
-
undefined,
|
|
188
|
-
ctxModel,
|
|
189
|
-
);
|
|
190
|
-
expect(r.thinkingLevel).toBe("medium");
|
|
191
|
-
});
|
|
192
|
-
|
|
193
|
-
it("ctxModel path: thinkingLevel undefined when no override and ctxModel non-reasoning", () => {
|
|
194
|
-
const reg = makeRegistry([]);
|
|
195
|
-
// ctxModel(makeModel 默认 reasoning=false)无 override → 非 reasoning 不支持 thinking
|
|
196
|
-
const r = resolveModel(undefined, reg, undefined, ctxModel);
|
|
197
|
-
expect(r.thinkingLevel).toBeUndefined();
|
|
198
|
-
});
|
|
199
|
-
|
|
200
|
-
// ── 默认 thinking 兜底:无显式指定时用「模型最高可用档」(不落 pi 默认 medium)──
|
|
201
|
-
|
|
202
|
-
it("ctxModel path: no override + reasoning model with map → highest mapped level", () => {
|
|
203
|
-
const reg = makeRegistry([]);
|
|
204
|
-
const m = makeModel({ id: "r-main", provider: "rm", reasoning: true, thinkingLevelMap: { low: 1, high: 2, xhigh: 3 } });
|
|
205
|
-
const r = resolveModel(undefined, reg, undefined, m);
|
|
206
|
-
expect(r.thinkingLevel).toBe("xhigh");
|
|
207
|
-
});
|
|
208
|
-
|
|
209
|
-
it("ctxModel path: no override + reasoning model with map containing max → max", () => {
|
|
210
|
-
const reg = makeRegistry([]);
|
|
211
|
-
const m = makeModel({ id: "r-max", provider: "rm", reasoning: true, thinkingLevelMap: { high: 2, max: 99 } });
|
|
212
|
-
const r = resolveModel(undefined, reg, undefined, m);
|
|
213
|
-
expect(r.thinkingLevel).toBe("max");
|
|
214
|
-
});
|
|
215
|
-
|
|
216
|
-
it("ctxModel path: no override + reasoning model without map → xhigh (pi-legal ceiling)", () => {
|
|
217
|
-
const reg = makeRegistry([]);
|
|
218
|
-
// 无 map 时不能用 "max"——pi 侧 model:"max" 后缀非法会导致 model 解析失败
|
|
219
|
-
const m = makeModel({ id: "r-nomap", provider: "rm", reasoning: true });
|
|
220
|
-
const r = resolveModel(undefined, reg, undefined, m);
|
|
221
|
-
expect(r.thinkingLevel).toBe("xhigh");
|
|
222
|
-
});
|
|
223
|
-
|
|
224
|
-
it("override path: no thinkingLevel param → defaults to model's highest mapped level", () => {
|
|
225
|
-
const m = makeModel({
|
|
226
|
-
id: "default-thinking",
|
|
227
|
-
provider: "dt",
|
|
228
|
-
reasoning: true,
|
|
229
|
-
thinkingLevelMap: { minimal: 1, medium: 2, high: 3 },
|
|
230
|
-
});
|
|
231
|
-
const reg = makeRegistry([m]);
|
|
232
|
-
const r = resolveModel(undefined, reg, { model: "dt/default-thinking" });
|
|
233
|
-
expect(r.thinkingLevel).toBe("high");
|
|
234
|
-
});
|
|
235
|
-
});
|
|
236
|
-
|
|
237
|
-
// ============================================================
|
|
238
|
-
// lookupModel 容错:剥离 ":thinkingLevel" 后缀(A)
|
|
239
|
-
// ============================================================
|
|
240
|
-
|
|
241
|
-
describe('resolveModel — strips ":thinkingLevel" suffix from model string (A)', () => {
|
|
242
|
-
it('resolves model passed with ":xhigh" suffix', () => {
|
|
243
|
-
const m = makeModel({ id: "ds-pro", provider: "deepseek-router", reasoning: true, thinkingLevelMap: { xhigh: 3 } });
|
|
244
|
-
const reg = makeRegistry([m]);
|
|
245
|
-
const r = resolveModel(undefined, reg, { model: "deepseek-router/ds-pro:xhigh" }, ctxModel);
|
|
246
|
-
expect(r.model.id).toBe("ds-pro");
|
|
247
|
-
});
|
|
248
|
-
|
|
249
|
-
it('resolves model passed with ":high" suffix (registry has no suffix)', () => {
|
|
250
|
-
const m = makeModel({ id: "sonnet", provider: "anthropic", reasoning: true, thinkingLevelMap: { high: 2 } });
|
|
251
|
-
const reg = makeRegistry([m]);
|
|
252
|
-
const r = resolveModel(undefined, reg, { model: "anthropic/sonnet:high" });
|
|
253
|
-
expect(r.model.id).toBe("sonnet");
|
|
254
|
-
});
|
|
255
|
-
|
|
256
|
-
it('strips ":off" suffix (off is a valid thinking level)', () => {
|
|
257
|
-
const m = makeModel({ id: "m1", provider: "p", reasoning: false });
|
|
258
|
-
const reg = makeRegistry([m]);
|
|
259
|
-
const r = resolveModel(undefined, reg, { model: "p/m1:off" });
|
|
260
|
-
expect(r.model.id).toBe("m1");
|
|
261
|
-
});
|
|
262
|
-
|
|
263
|
-
it('does NOT strip unrelated colon suffix (e.g. ":foo")', () => {
|
|
264
|
-
// ":foo" 不是合法 thinking level,不剥离 → 查不到 → 抛 not found
|
|
265
|
-
const m = makeModel({ id: "m1", provider: "p", reasoning: false });
|
|
266
|
-
const reg = makeRegistry([m]);
|
|
267
|
-
expect(() => resolveModel(undefined, reg, { model: "p/m1:foo" })).toThrow(/not found in registry/);
|
|
268
|
-
});
|
|
269
|
-
|
|
270
|
-
it('suffix-stripped resolve still respects explicit thinkingLevel param', () => {
|
|
271
|
-
const m = makeModel({ id: "ds-pro", provider: "deepseek-router", reasoning: true, thinkingLevelMap: { high: 2, xhigh: 3 } });
|
|
272
|
-
const reg = makeRegistry([m]);
|
|
273
|
-
// model 带 ":xhigh" 但 thinkingLevel param 指定 high -> thinking 取 high
|
|
274
|
-
const r = resolveModel(undefined, reg, { model: "deepseek-router/ds-pro:xhigh", thinkingLevel: "high" });
|
|
275
|
-
expect(r.model.id).toBe("ds-pro");
|
|
276
|
-
expect(r.thinkingLevel).toBe("high");
|
|
277
|
-
});
|
|
278
|
-
});
|
|
279
|
-
|
|
280
|
-
// ============================================================
|
|
281
|
-
// not-found 错误信息:列出相近可用 model(B)
|
|
282
|
-
// ============================================================
|
|
283
|
-
|
|
284
|
-
describe("resolveModel — not-found error suggests similar models (B)", () => {
|
|
285
|
-
it("not-found with available registry lists similar models", () => {
|
|
286
|
-
const m = makeModel({ id: "ds-pro", provider: "deepseek-router" });
|
|
287
|
-
const reg = makeRegistry([m]);
|
|
288
|
-
let msg = "";
|
|
289
|
-
try {
|
|
290
|
-
resolveModel(undefined, reg, { model: "deepseek-router/ds-por" }, ctxModel); // 拼写错误
|
|
291
|
-
} catch (e) {
|
|
292
|
-
msg = (e as Error).message;
|
|
293
|
-
}
|
|
294
|
-
expect(msg).toMatch(/not found in registry/);
|
|
295
|
-
expect(msg).toMatch(/deepseek-router\/ds-pro/); // 建议列表含正确拼写
|
|
296
|
-
});
|
|
297
|
-
|
|
298
|
-
it("not-found with empty registry reports no available models", () => {
|
|
299
|
-
const reg = makeRegistry([]);
|
|
300
|
-
expect(() => resolveModel(undefined, reg, { model: "x/none" }, ctxModel)).toThrow(
|
|
301
|
-
/Registry has no available models/,
|
|
302
|
-
);
|
|
303
|
-
});
|
|
304
|
-
|
|
305
|
-
it("auth-missing error does NOT list models, points to models.json", () => {
|
|
306
|
-
const m = makeModel({ id: "unauthed", provider: "u" });
|
|
307
|
-
const reg = makeRegistry([m], []);
|
|
308
|
-
let msg = "";
|
|
309
|
-
try {
|
|
310
|
-
resolveModel(undefined, reg, { model: "u/unauthed" }, ctxModel);
|
|
311
|
-
} catch (e) {
|
|
312
|
-
msg = (e as Error).message;
|
|
313
|
-
}
|
|
314
|
-
expect(msg).toMatch(/auth is not configured/);
|
|
315
|
-
expect(msg).toMatch(/models\.json/);
|
|
316
|
-
expect(msg).not.toMatch(/Similar available models/); // auth 错误不列 model
|
|
317
|
-
});
|
|
318
|
-
|
|
319
|
-
it("P1: resolves model passed with ':max' suffix (THINKING_ORDER includes 'max')", () => {
|
|
320
|
-
const m = makeModel({ id: "mock-model", provider: "p1", reasoning: true, thinkingLevelMap: { max: 4 } });
|
|
321
|
-
const reg = makeRegistry([m]);
|
|
322
|
-
const r = resolveModel(
|
|
323
|
-
{ name: "worker", systemPrompt: "" },
|
|
324
|
-
reg,
|
|
325
|
-
{ model: "p1/mock-model:max" },
|
|
326
|
-
ctxModel,
|
|
327
|
-
);
|
|
328
|
-
expect(r.model).toBeTruthy();
|
|
329
|
-
expect(r.model.id).toBe("mock-model");
|
|
330
|
-
expect(r.thinkingLevel).toBe("max");
|
|
331
|
-
});
|
|
332
|
-
});
|
|
333
|
-
|
|
334
|
-
describe("availableThinkingLevels", () => {
|
|
335
|
-
it("returns [] when reasoning false", () => {
|
|
336
|
-
expect(availableThinkingLevels({ reasoning: false })).toEqual([]);
|
|
337
|
-
});
|
|
338
|
-
it("returns [] when no thinkingLevelMap", () => {
|
|
339
|
-
expect(availableThinkingLevels({ reasoning: true })).toEqual([]);
|
|
340
|
-
});
|
|
341
|
-
it("filters THINKING_ORDER to non-null map entries, ascending", () => {
|
|
342
|
-
expect(
|
|
343
|
-
availableThinkingLevels({ reasoning: true, thinkingLevelMap: { off: 0, high: 2, low: 1, xhigh: 3 } }),
|
|
344
|
-
).toEqual(["off", "low", "high", "xhigh"]);
|
|
345
|
-
});
|
|
346
|
-
|
|
347
|
-
it("P2: includes 'max' as the last level (THINKING_ORDER SSOT derived)", () => {
|
|
348
|
-
const levels = availableThinkingLevels({ reasoning: true, thinkingLevelMap: { off: 0, low: 1, high: 2, xhigh: 3, max: 4 } });
|
|
349
|
-
expect(levels).toEqual(["off", "low", "high", "xhigh", "max"]);
|
|
350
|
-
expect(levels.slice(-3)).toEqual(["high", "xhigh", "max"]);
|
|
351
|
-
});
|
|
352
|
-
});
|
|
353
|
-
|
|
354
|
-
// ============================================================
|
|
355
|
-
// ModelConfigService: initModel(ctxModel) → resolveModel L3 plumb-through
|
|
356
|
-
// changeset 主打路径的 runtime 契约保护(EA-4)。
|
|
357
|
-
// 链路:session_start initModel({ctxModel}) → _ctxModel 缓存 → resolveModel 第三层命中
|
|
358
|
-
// ============================================================
|
|
359
|
-
|
|
360
|
-
import * as fs from "node:fs";
|
|
361
|
-
import * as os from "node:os";
|
|
362
|
-
import * as path from "node:path";
|
|
363
|
-
|
|
364
|
-
import { ModelConfigService } from "../model-config-service.ts";
|
|
365
|
-
|
|
366
|
-
describe("ModelConfigService: ctx.model plumb-through (EA-4)", () => {
|
|
367
|
-
let tmpDir: string;
|
|
368
|
-
|
|
369
|
-
beforeEach(() => {
|
|
370
|
-
tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "subagents-resolver-test-"));
|
|
371
|
-
});
|
|
372
|
-
afterEach(() => {
|
|
373
|
-
fs.rmSync(tmpDir, { recursive: true, force: true });
|
|
374
|
-
});
|
|
375
|
-
|
|
376
|
-
/** 构造已 initModel 的 ModelConfigService,ctxModel 注入缓存。 */
|
|
377
|
-
function makeService(ctxModel: ModelInfo | undefined, registry: ModelRegistryLike = makeRegistry([])): ModelConfigService {
|
|
378
|
-
const svc = new ModelConfigService({ agentDir: tmpDir });
|
|
379
|
-
svc.initModel({
|
|
380
|
-
modelRegistry: registry,
|
|
381
|
-
sessionId: "test-session",
|
|
382
|
-
ctxModel,
|
|
383
|
-
});
|
|
384
|
-
return svc;
|
|
385
|
-
}
|
|
386
|
-
|
|
387
|
-
it("initModel caches ctxModel; resolveModel L3 returns it (no override, no agentConfig.model)", () => {
|
|
388
|
-
const main = makeModel({ id: "main-model", provider: "main" });
|
|
389
|
-
const svc = makeService(main);
|
|
390
|
-
|
|
391
|
-
// 无 override、无 agentConfig.model → 第三层命中缓存的 ctxModel
|
|
392
|
-
const r = svc.resolveModel("general-purpose", undefined);
|
|
393
|
-
expect(r.model).toBe(main);
|
|
394
|
-
});
|
|
395
|
-
|
|
396
|
-
it("resolveModel L3 hits cached ctxModel even with agent that has no model in frontmatter", () => {
|
|
397
|
-
const main = makeModel({ id: "inherited", provider: "parent" });
|
|
398
|
-
const svc = makeService(main);
|
|
399
|
-
|
|
400
|
-
// worker.md 无 model frontmatter → 跳过 L2,命中 L3 ctxModel
|
|
401
|
-
const r = svc.resolveModel("worker", undefined);
|
|
402
|
-
expect(r.model).toBe(main);
|
|
403
|
-
});
|
|
404
|
-
|
|
405
|
-
it("resolveModel still prefers explicit paramOverride over cached ctxModel (L1 > L3)", () => {
|
|
406
|
-
const main = makeModel({ id: "main", provider: "main" });
|
|
407
|
-
const explicit = makeModel({ id: "explicit", provider: "p1" });
|
|
408
|
-
const svc = makeService(main, makeRegistry([explicit]));
|
|
409
|
-
|
|
410
|
-
const r = svc.resolveModel("worker", { model: "p1/explicit" });
|
|
411
|
-
expect(r.model.id).toBe("explicit");
|
|
412
|
-
});
|
|
413
|
-
});
|
|
@@ -1,287 +0,0 @@
|
|
|
1
|
-
// src/execution/__tests__/nested-visibility-env-propagation.test.ts
|
|
2
|
-
//
|
|
3
|
-
// SP-8 嵌套可见性修复验证(TC-3:PI_SUBAGENT_ROOT_SESSION_ID env 贯穿)。
|
|
4
|
-
//
|
|
5
|
-
// 验证 env 身份贯穿机制:
|
|
6
|
-
// TC-3a: 根进程 initSession:无 env → sessionRootId = sessionId(自己是 ROOT)
|
|
7
|
-
// TC-3b: 子进程 initSession:有 env → sessionRootId = env 值(贯穿真 ROOT)
|
|
8
|
-
// TC-3c: 孙进程 initSession:env 链全程贯穿
|
|
9
|
-
// TC-3d: 子进程 execute 创建的 record.rootSessionId = env 贯穿的真 ROOT
|
|
10
|
-
// TC-3e: 子进程 collectRecords 用 sessionRootId 过滤
|
|
11
|
-
//
|
|
12
|
-
// mock 策略与 recursive-visibility-baseline.test.ts 一致。
|
|
13
|
-
|
|
14
|
-
import type { PassThrough } from "node:stream";
|
|
15
|
-
|
|
16
|
-
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
17
|
-
|
|
18
|
-
// ── mock modules ──
|
|
19
|
-
|
|
20
|
-
vi.mock("node:child_process", async () => {
|
|
21
|
-
const { EventEmitter } = await import("node:events");
|
|
22
|
-
const { PassThrough } = await import("node:stream");
|
|
23
|
-
|
|
24
|
-
class FakeChild extends EventEmitter {
|
|
25
|
-
pid = 12345;
|
|
26
|
-
stdout = new PassThrough();
|
|
27
|
-
stderr = new PassThrough();
|
|
28
|
-
killed = false;
|
|
29
|
-
killSignal: string | undefined;
|
|
30
|
-
kill(sig?: string): boolean {
|
|
31
|
-
this.killed = true;
|
|
32
|
-
this.killSignal = sig;
|
|
33
|
-
return true;
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
return {
|
|
38
|
-
spawn: vi.fn(() => new FakeChild()),
|
|
39
|
-
// buildEnvBlock 用 execFile 异步取 git branch:默认 err-first 兜底(catch → branch="")
|
|
40
|
-
execFile: vi.fn(
|
|
41
|
-
(
|
|
42
|
-
_cmd: string,
|
|
43
|
-
_args: readonly string[],
|
|
44
|
-
_opts: unknown,
|
|
45
|
-
cb: (err: Error | null, stdout?: string, stderr?: string) => void,
|
|
46
|
-
) => cb(new Error("execFile not configured in this test")),
|
|
47
|
-
),
|
|
48
|
-
};
|
|
49
|
-
});
|
|
50
|
-
|
|
51
|
-
vi.mock("node:fs", async () => {
|
|
52
|
-
const actual = await import("node:fs");
|
|
53
|
-
return {
|
|
54
|
-
default: {
|
|
55
|
-
...actual,
|
|
56
|
-
mkdirSync: vi.fn(),
|
|
57
|
-
existsSync: vi.fn(() => false),
|
|
58
|
-
appendFileSync: vi.fn(),
|
|
59
|
-
writeFileSync: vi.fn(),
|
|
60
|
-
readdirSync: vi.fn(() => []),
|
|
61
|
-
},
|
|
62
|
-
mkdirSync: vi.fn(),
|
|
63
|
-
existsSync: vi.fn(() => false),
|
|
64
|
-
appendFileSync: vi.fn(),
|
|
65
|
-
writeFileSync: vi.fn(),
|
|
66
|
-
readdirSync: vi.fn(() => []),
|
|
67
|
-
promises: actual.promises,
|
|
68
|
-
};
|
|
69
|
-
});
|
|
70
|
-
|
|
71
|
-
vi.mock("../alive-store.ts", async (importOriginal) => {
|
|
72
|
-
const actual = await importOriginal<typeof import("../alive-store.ts")>();
|
|
73
|
-
return {
|
|
74
|
-
...actual,
|
|
75
|
-
writeAliveMarker: vi.fn(),
|
|
76
|
-
removeAliveMarker: vi.fn(),
|
|
77
|
-
};
|
|
78
|
-
});
|
|
79
|
-
|
|
80
|
-
vi.mock("../finalized-marker.ts", () => ({
|
|
81
|
-
writeFinalized: vi.fn(),
|
|
82
|
-
readFinalized: vi.fn(() => false),
|
|
83
|
-
}));
|
|
84
|
-
|
|
85
|
-
vi.mock("../manifest-store.ts", () => {
|
|
86
|
-
class FakeManifestStore {
|
|
87
|
-
writeManifest = vi.fn(async () => {});
|
|
88
|
-
readManifest = vi.fn(async () => null);
|
|
89
|
-
listAllSync = vi.fn(() => []);
|
|
90
|
-
recoverTmpFiles = vi.fn(async () => []);
|
|
91
|
-
}
|
|
92
|
-
return { ManifestStore: vi.fn(function (_recordsDir: string) { return new FakeManifestStore(); }) };
|
|
93
|
-
});
|
|
94
|
-
|
|
95
|
-
vi.mock("../temp-prompt.ts", () => ({
|
|
96
|
-
writePromptToTempFile: vi.fn(async (agent: string) => {
|
|
97
|
-
const safeName = agent.replace(/[^\w.-]+/g, "_");
|
|
98
|
-
return { dir: `/tmp/fake-${safeName}`, filePath: `/tmp/fake-${safeName}/prompt-${safeName}.md` };
|
|
99
|
-
}),
|
|
100
|
-
cleanupTempPrompt: vi.fn(async () => {}),
|
|
101
|
-
}));
|
|
102
|
-
|
|
103
|
-
import { spawn } from "node:child_process";
|
|
104
|
-
|
|
105
|
-
import { ModelConfigService } from "../model-config-service.ts";
|
|
106
|
-
import type { ModelInfo, ModelRegistryLike } from "../model-resolver.ts";
|
|
107
|
-
import type { RecordStore } from "../record-store.ts";
|
|
108
|
-
import { createRecord } from "../execution-record.ts";
|
|
109
|
-
import { SubagentService } from "../subagent-service.ts";
|
|
110
|
-
|
|
111
|
-
const mockSpawn = vi.mocked(spawn);
|
|
112
|
-
|
|
113
|
-
// ── env 名常量(与 subagent-service.ts 一致)──
|
|
114
|
-
const ENV_ROOT_SESSION_ID = "PI_SUBAGENT_ROOT_SESSION_ID";
|
|
115
|
-
const ENV_SELF_RECORD_ID = "PI_SUBAGENT_SELF_RECORD_ID";
|
|
116
|
-
const ENV_DEPTH = "PI_SUBAGENT_DEPTH";
|
|
117
|
-
const ENV_FORK_DEPTH = "PI_SUBAGENT_FORK_DEPTH";
|
|
118
|
-
const ENV_ROOT_CWD = "PI_SUBAGENT_ROOT_CWD";
|
|
119
|
-
|
|
120
|
-
// ── helpers ──
|
|
121
|
-
|
|
122
|
-
interface FakeChild {
|
|
123
|
-
pid: number;
|
|
124
|
-
stdout: PassThrough;
|
|
125
|
-
stderr: PassThrough;
|
|
126
|
-
killed: boolean;
|
|
127
|
-
killSignal: string | undefined;
|
|
128
|
-
kill(sig?: string): boolean;
|
|
129
|
-
emit(event: string, ...args: unknown[]): boolean;
|
|
130
|
-
}
|
|
131
|
-
|
|
132
|
-
function lastSpawnedChild(): FakeChild {
|
|
133
|
-
const result = mockSpawn.mock.results.at(-1);
|
|
134
|
-
if (!result) throw new Error("spawn was not called yet");
|
|
135
|
-
return result.value as FakeChild;
|
|
136
|
-
}
|
|
137
|
-
|
|
138
|
-
function getLastSpawnEnv(): Record<string, string | undefined> {
|
|
139
|
-
return (mockSpawn.mock.calls.at(-1)?.[2]?.env as Record<string, string | undefined>) ?? {};
|
|
140
|
-
}
|
|
141
|
-
|
|
142
|
-
function sessionHeader(id = "env-prop-session"): Record<string, unknown> {
|
|
143
|
-
return { type: "session", id, timestamp: "2026-08-11T00-00-00-000Z", cwd: "/tmp/test" };
|
|
144
|
-
}
|
|
145
|
-
|
|
146
|
-
function emitStdoutLine(child: FakeChild, obj: Record<string, unknown>): void {
|
|
147
|
-
child.stdout.write(`${JSON.stringify(obj)}\n`);
|
|
148
|
-
}
|
|
149
|
-
|
|
150
|
-
async function driveChildToCompletion(child: FakeChild, events: Record<string, unknown>[] = []): Promise<void> {
|
|
151
|
-
emitStdoutLine(child, sessionHeader());
|
|
152
|
-
for (const e of events) emitStdoutLine(child, e);
|
|
153
|
-
child.stdout.end();
|
|
154
|
-
child.stderr.end();
|
|
155
|
-
child.emit("close", 0);
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
function makeEmptyRegistry(): ModelRegistryLike {
|
|
159
|
-
return { getAvailable: () => [], find: () => undefined, hasConfiguredAuth: () => true };
|
|
160
|
-
}
|
|
161
|
-
|
|
162
|
-
function makePi() {
|
|
163
|
-
return { sendMessage: vi.fn(), appendEntry: vi.fn(), events: { emit: vi.fn() } };
|
|
164
|
-
}
|
|
165
|
-
|
|
166
|
-
const ctxModel: ModelInfo = { id: "m", name: "M", provider: "p", reasoning: false };
|
|
167
|
-
|
|
168
|
-
function setupService(sessionId: string, env?: Record<string, string>): SubagentService {
|
|
169
|
-
const agentDir = "/tmp/env-prop-it";
|
|
170
|
-
const modelService = new ModelConfigService({ agentDir });
|
|
171
|
-
modelService.initModel({
|
|
172
|
-
modelRegistry: makeEmptyRegistry(),
|
|
173
|
-
sessionId,
|
|
174
|
-
ctxModel,
|
|
175
|
-
});
|
|
176
|
-
const service = new SubagentService({
|
|
177
|
-
cwd: agentDir,
|
|
178
|
-
modelService,
|
|
179
|
-
getMainSessionFile: () => "/mock/main-session.jsonl",
|
|
180
|
-
});
|
|
181
|
-
service.initSession({ pi: makePi(), sessionId });
|
|
182
|
-
return service;
|
|
183
|
-
}
|
|
184
|
-
|
|
185
|
-
// ── 用例 ──
|
|
186
|
-
|
|
187
|
-
describe("TC-3: PI_SUBAGENT_ROOT_SESSION_ID env 贯穿正确", () => {
|
|
188
|
-
beforeEach(() => {
|
|
189
|
-
vi.clearAllMocks();
|
|
190
|
-
for (const k of [ENV_ROOT_SESSION_ID, ENV_SELF_RECORD_ID, ENV_DEPTH, ENV_FORK_DEPTH, ENV_ROOT_CWD]) {
|
|
191
|
-
delete process.env[k];
|
|
192
|
-
}
|
|
193
|
-
});
|
|
194
|
-
|
|
195
|
-
afterEach(() => {
|
|
196
|
-
for (const k of [ENV_ROOT_SESSION_ID, ENV_SELF_RECORD_ID, ENV_DEPTH, ENV_FORK_DEPTH, ENV_ROOT_CWD]) {
|
|
197
|
-
delete process.env[k];
|
|
198
|
-
}
|
|
199
|
-
vi.restoreAllMocks();
|
|
200
|
-
});
|
|
201
|
-
|
|
202
|
-
it("TC-3a: 根进程 initSession:无 env → sessionRootId = sessionId(自己是 ROOT)", () => {
|
|
203
|
-
const service = setupService("root-it");
|
|
204
|
-
const sessionRootId = Reflect.get(service, "sessionRootId") as string;
|
|
205
|
-
expect(sessionRootId).toBe("root-it");
|
|
206
|
-
});
|
|
207
|
-
|
|
208
|
-
it("TC-3b: 子进程 initSession:有 env PI_SUBAGENT_ROOT_SESSION_ID → sessionRootId = env 值(贯穿真 ROOT)", () => {
|
|
209
|
-
process.env[ENV_ROOT_SESSION_ID] = "real-root-session";
|
|
210
|
-
const service = setupService("child-session");
|
|
211
|
-
|
|
212
|
-
const sessionRootId = Reflect.get(service, "sessionRootId") as string;
|
|
213
|
-
expect(sessionRootId).toBe("real-root-session"); // env 贯穿,不是 child-session
|
|
214
|
-
});
|
|
215
|
-
|
|
216
|
-
it("TC-3c: 孙进程 initSession:env 链全程贯穿,B 的 sessionRootId 仍为 ROOT", () => {
|
|
217
|
-
// 模拟 B 子进程收到的 env(A 在 spawn B 时注入)
|
|
218
|
-
process.env[ENV_ROOT_SESSION_ID] = "root-main-session";
|
|
219
|
-
process.env[ENV_SELF_RECORD_ID] = "sa-a-record";
|
|
220
|
-
process.env[ENV_DEPTH] = "1";
|
|
221
|
-
|
|
222
|
-
const service = setupService("b-session");
|
|
223
|
-
|
|
224
|
-
// B 的 sessionRootId 仍为 ROOT(env 贯穿,不被 B 自己的 sessionId 覆盖)
|
|
225
|
-
const sessionRootId = Reflect.get(service, "sessionRootId") as string;
|
|
226
|
-
expect(sessionRootId).toBe("root-main-session");
|
|
227
|
-
|
|
228
|
-
// B 的 execCtxBaseline 记录了 B 自己的身份(recordId + depth)
|
|
229
|
-
const baseline = Reflect.get(service, "execCtxBaseline") as { recordId: string; depth: number };
|
|
230
|
-
expect(baseline.recordId).toBe("sa-a-record");
|
|
231
|
-
expect(baseline.depth).toBe(1);
|
|
232
|
-
});
|
|
233
|
-
|
|
234
|
-
it("TC-3d: 子进程 execute 创建的 record.rootSessionId = env 贯穿的真 ROOT", async () => {
|
|
235
|
-
process.env[ENV_ROOT_SESSION_ID] = "root-main-session";
|
|
236
|
-
process.env[ENV_SELF_RECORD_ID] = "sa-parent";
|
|
237
|
-
process.env[ENV_DEPTH] = "1";
|
|
238
|
-
|
|
239
|
-
const service = setupService("child-session");
|
|
240
|
-
|
|
241
|
-
// execute 创建 record(模拟 B 内创建 C)
|
|
242
|
-
const handle = await service.execute({
|
|
243
|
-
task: "nested task",
|
|
244
|
-
ctxModel,
|
|
245
|
-
});
|
|
246
|
-
const store = Reflect.get(service, "store") as RecordStore;
|
|
247
|
-
|
|
248
|
-
// collectRecords 用 sessionRootId 过滤(子进程应看到 ROOT 整棵树)
|
|
249
|
-
const records = store.collectRecords(100, "all", "root-main-session");
|
|
250
|
-
const found = records.find((r) => r.id === handle.subagentId);
|
|
251
|
-
|
|
252
|
-
expect(found).toBeDefined();
|
|
253
|
-
expect(found!.rootSessionId).toBe("root-main-session"); // 指向 ROOT,不是 child-session
|
|
254
|
-
expect(found!.parentRecordId).toBe("sa-parent"); // 父链来自基线
|
|
255
|
-
expect(found!.depth).toBe(2); // 基线 depth=1 + 1 = 2
|
|
256
|
-
});
|
|
257
|
-
|
|
258
|
-
it("TC-3e: 子进程 collectRecords 用 sessionRootId 过滤(能看到 ROOT 整棵树)", () => {
|
|
259
|
-
process.env[ENV_ROOT_SESSION_ID] = "root-main-session";
|
|
260
|
-
process.env[ENV_SELF_RECORD_ID] = "sa-parent";
|
|
261
|
-
process.env[ENV_DEPTH] = "1";
|
|
262
|
-
|
|
263
|
-
const service = setupService("child-session");
|
|
264
|
-
|
|
265
|
-
// 手动注入一条 running record(避免需要真正 spawn)
|
|
266
|
-
const store = Reflect.get(service, "store") as RecordStore;
|
|
267
|
-
const recordC = createRecord("sa-c", {
|
|
268
|
-
agent: "worker",
|
|
269
|
-
model: "test/model",
|
|
270
|
-
mode: "background",
|
|
271
|
-
task: "deep nested",
|
|
272
|
-
startedAt: Date.now(),
|
|
273
|
-
rootSessionId: "root-main-session",
|
|
274
|
-
parentRecordId: "sa-parent",
|
|
275
|
-
depth: 2,
|
|
276
|
-
});
|
|
277
|
-
store.register(recordC);
|
|
278
|
-
|
|
279
|
-
// collectRecords(不带 filter)用 this.sessionRootId 过滤
|
|
280
|
-
const viaService = service.collectRecords(100);
|
|
281
|
-
const ids = viaService.map((r) => r.id);
|
|
282
|
-
|
|
283
|
-
// C 的 record 归 ROOT(rootSessionId=root-main-session),能被子进程查到
|
|
284
|
-
expect(ids).toContain("sa-c");
|
|
285
|
-
expect(viaService.find((r) => r.id === "sa-c")!.rootSessionId).toBe("root-main-session");
|
|
286
|
-
});
|
|
287
|
-
});
|