@zhushanwen/pi-subagent-workflow 8.6.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 +9 -13
- 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 +89 -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 +2 -2
- 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 +4 -4
- package/src/interface/commands.ts +3 -3
- package/src/interface/format.ts +2 -2
- package/src/interface/helpers.ts +1 -1
- 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 +263 -11
- package/src/interface/subagent-tool-schema.ts +20 -13
- package/src/interface/subagent-tool.ts +11 -6
- package/src/interface/subagents.ts +3 -3
- 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} +11 -11
- 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 -329
- package/src/execution/__tests__/channel-registry-handshake.test.ts +0 -243
- package/src/execution/__tests__/chat-engine-routing.test.ts +0 -601
- 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 -422
- 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 -200
- package/src/execution/__tests__/execution-record.test.ts +0 -1394
- package/src/execution/__tests__/explicit-agent-ref-guard.test.ts +0 -171
- 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 -169
- 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 -242
- 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 -672
- package/src/execution/__tests__/lifecycle-manager-lock.test.ts +0 -211
- package/src/execution/__tests__/lifecycle-manager.test.ts +0 -383
- 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 -140
- package/src/execution/__tests__/manifest-parentid.test.ts +0 -117
- package/src/execution/__tests__/model-resolver.test.ts +0 -465
- 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 -612
- package/src/execution/__tests__/notifier-golden-snapshot.test.ts +0 -261
- package/src/execution/__tests__/notify-ledger.test.ts +0 -826
- package/src/execution/__tests__/one-shot-upgrade.test.ts +0 -205
- package/src/execution/__tests__/output-collector.test.ts +0 -358
- 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 -687
- package/src/execution/__tests__/run-spawn-integration.test.ts +0 -933
- package/src/execution/__tests__/run-spawn-resume.test.ts +0 -322
- package/src/execution/__tests__/run-spawn-rpc-mode.test.ts +0 -196
- package/src/execution/__tests__/run-spawn-stdout-callback-throw.test.ts +0 -199
- 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 -350
- package/src/execution/__tests__/session-start-reaper.test.ts +0 -233
- package/src/execution/__tests__/spawn-args.test.ts +0 -445
- 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__/start-sync-model-guard.test.ts +0 -150
- 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 -599
- package/src/execution/__tests__/temp-prompt.test.ts +0 -53
- package/src/execution/__tests__/timeout-integration.test.ts +0 -615
- package/src/execution/__tests__/tombstone-store.test.ts +0 -73
- package/src/execution/__tests__/tool-action.test.ts +0 -476
- 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 -199
- package/src/execution/agent-result-mapper.ts +0 -90
- package/src/execution/alive-store.ts +0 -92
- package/src/execution/argv-mirror.ts +0 -113
- 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 -580
- 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 -658
- 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 -309
- package/src/execution/execute-options-mapper.ts +0 -112
- package/src/execution/execution-record.ts +0 -965
- 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 -513
- package/src/execution/lifecycle-predicates.ts +0 -65
- package/src/execution/manifest-store.ts +0 -256
- package/src/execution/model-config-service.ts +0 -219
- package/src/execution/model-resolver.ts +0 -248
- package/src/execution/notifier.ts +0 -330
- package/src/execution/notify-ledger.ts +0 -580
- package/src/execution/output-collector.ts +0 -228
- 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 -1781
- 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 -2141
- package/src/execution/subprocess-agent-runner.ts +0 -317
- 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 -973
- 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 -184
- 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 -349
- package/src/orchestration/__tests__/agent-call-catch-fallback.test.ts +0 -202
- package/src/orchestration/__tests__/agent-call-stream.test.ts +0 -152
- package/src/orchestration/__tests__/args-validator.test.ts +0 -143
- package/src/orchestration/__tests__/config-loader.test.ts +0 -503
- package/src/orchestration/__tests__/error-recovery-handlers.test.ts +0 -809
- 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 -451
- package/src/orchestration/__tests__/jsonl-run-store-corrupt-entry.test.ts +0 -150
- package/src/orchestration/__tests__/jsonl-run-store-loadall-sources.test.ts +0 -171
- package/src/orchestration/__tests__/jsonl-run-store-retention.test.ts +0 -202
- package/src/orchestration/__tests__/jsonl-run-store-session-file.test.ts +0 -1030
- package/src/orchestration/__tests__/launcher-nested-workflow.test.ts +0 -600
- package/src/orchestration/__tests__/lifecycle-runid-injection.test.ts +0 -96
- package/src/orchestration/__tests__/lifecycle.test.ts +0 -659
- package/src/orchestration/__tests__/non-cloneable-return-e2e.test.ts +0 -95
- package/src/orchestration/__tests__/review-fix-loop-e2e.test.ts +0 -2025
- package/src/orchestration/__tests__/script-lint.test.ts +0 -831
- package/src/orchestration/__tests__/skill-discovery.test.ts +0 -201
- package/src/orchestration/__tests__/test-mocks.ts +0 -197
- package/src/orchestration/__tests__/worker-exit-without-result.test.ts +0 -368
- 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 -563
- package/src/orchestration/__tests__/worker-script-builder.test.ts +0 -309
- package/src/orchestration/__tests__/worker-script-template-snapshot.test.ts +0 -129
- 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 -174
- package/src/orchestration/args-validator.ts +0 -127
- package/src/orchestration/config-loader.ts +0 -315
- package/src/orchestration/error-recovery.ts +0 -1018
- package/src/orchestration/execute-agent-call.ts +0 -256
- package/src/orchestration/launcher.ts +0 -455
- package/src/orchestration/lifecycle.ts +0 -399
- package/src/orchestration/models/__tests__/budget.test.ts +0 -307
- 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 -118
- package/src/orchestration/models/ports.ts +0 -164
- package/src/orchestration/models/run-runtime.ts +0 -104
- 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 -301
- 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 -115
- package/src/orchestration/worker-handle.ts +0 -115
- package/src/orchestration/worker-host.ts +0 -98
- package/src/orchestration/worker-script-builder.ts +0 -421
- 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__/model-ref.test.ts +0 -306
- 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/__tests__/timer-delay.test.ts +0 -61
- 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/model-ref.ts +0 -286
- package/src/shared/resource-discovery.ts +0 -811
- package/src/shared/resource-meta.ts +0 -65
- package/src/shared/schema-env.ts +0 -44
- package/src/shared/schema-jsonify.ts +0 -58
- package/src/shared/timer-delay.ts +0 -54
- 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 -1309
- package/workflows/review-fix-loop.js +0 -1404
- package/workflows/scatter-gather.js +0 -178
|
@@ -1,174 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Agent options resolver — resolves skill / schema to append-system-prompt
|
|
3
|
-
* content + env vars on every dispatch (BL-1).
|
|
4
|
-
*
|
|
5
|
-
* BL-1:解析 workflow 脚本里 `agent({skill,schema})` 的 inline override,
|
|
6
|
-
* 否则 pi 子进程只收到原始 prompt,没有 --append-system-prompt /
|
|
7
|
-
* --skill / PI_WORKFLOW_SCHEMA。
|
|
8
|
-
*
|
|
9
|
-
* 职责范围(M2 修正):仅处理 schema SO 指令(内容直传 appendSystemPrompt)+ skill。
|
|
10
|
-
* agent ref 处理(systemPrompt/model/thinkingLevel)已移交 resolveIdentity(execution 层,
|
|
11
|
-
* 经 getAgentConfig + resolveModel 完整覆盖),消除双重注入与 model 层级混乱。
|
|
12
|
-
*
|
|
13
|
-
* 调用方:engine/error-recovery.ts dispatchAgentCall(每次 agent-call 消息)。
|
|
14
|
-
* - skill → resolveSkillPath → skillPath(--skill)
|
|
15
|
-
* - schema → 结构化输出指令内容直传 appendSystemPrompt(--append-system-prompt)+ schemaEnv(PI_WORKFLOW_SCHEMA)
|
|
16
|
-
*
|
|
17
|
-
* M2 bug 修正:旧实现把 schema 指令写成临时文件、push 文件路径(而非内容)给下游,
|
|
18
|
-
* 下游 mapper/session-runner 把路径当文本拼进最终 append 文件,导致 schema 指令从未
|
|
19
|
-
* 进入子进程。改为指令内容直传(不写盘、无临时文件)。
|
|
20
|
-
*/
|
|
21
|
-
|
|
22
|
-
import type { AgentCallOpts } from "./models/types.ts";
|
|
23
|
-
import { resolveSkillPath } from "./skill-discovery.ts";
|
|
24
|
-
import { stringifySchemaCached } from "../shared/schema-jsonify.ts";
|
|
25
|
-
|
|
26
|
-
export interface ResolveResult {
|
|
27
|
-
opts: AgentCallOpts;
|
|
28
|
-
error?: string;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
// ── 根类型判定(与 structured-output 同源,本地副本) ──────────────
|
|
32
|
-
|
|
33
|
-
/** plain object 判定(isPlainObject,与 @zhushanwen/pi-structured-output schema-guards.ts 同语义)。 */
|
|
34
|
-
function isPlainObject(value: unknown): value is Record<string, unknown> {
|
|
35
|
-
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
/**
|
|
39
|
-
* [U3 本地副本·同源锚定] 判定权威 schema 的根数据形态是否为 object。
|
|
40
|
-
*
|
|
41
|
-
* 与 @zhushanwen/pi-structured-output `src/execute.ts` 的 `isObjectRootSchema`
|
|
42
|
-
* 逐语义一致(该函数是 structured-output 工具 parameters {value} 包装/解包的唯一
|
|
43
|
-
* 判定源)。两包是独立 npm 包不能直接 import——optional peer 依赖在独立安装场景
|
|
44
|
-
* (pi 用户单独装本包)不保证存在,顶层值 import 会让整个 extension 加载崩溃;
|
|
45
|
-
* 且 builtin esbuild bundle 会把 import 的包内联成双实例(先例:session-runner.ts
|
|
46
|
-
* 的 PI_WORKFLOW_SCHEMA env 契约注释)。故本地复制,任一端改动判定逻辑必须同步
|
|
47
|
-
* 另一端(两端 docstring 互相锚定)。
|
|
48
|
-
*
|
|
49
|
-
* draft-07 语义:无 type 时类型关键字按值形态适用——properties/required 等
|
|
50
|
-
* object 特有关键字的存在意味着作者在描述 object 输出,算 object 根;组合根
|
|
51
|
-
* (anyOf/oneOf/allOf/$ref/enum)可能接受非 object 值,保真起见一律按非 object
|
|
52
|
-
* ({value} 包装可容纳任意成员类型)。
|
|
53
|
-
*/
|
|
54
|
-
function isObjectRootSchema(schema: unknown): schema is Record<string, unknown> {
|
|
55
|
-
if (!isPlainObject(schema)) return false;
|
|
56
|
-
if (schema.type === "object") return true;
|
|
57
|
-
if (Array.isArray(schema.type) && schema.type.includes("object")) return true;
|
|
58
|
-
const OBJECT_ONLY_KEYS = [
|
|
59
|
-
"properties",
|
|
60
|
-
"required",
|
|
61
|
-
"patternProperties",
|
|
62
|
-
"additionalProperties",
|
|
63
|
-
"minProperties",
|
|
64
|
-
"maxProperties",
|
|
65
|
-
"dependencies",
|
|
66
|
-
"dependentRequired",
|
|
67
|
-
"propertyNames",
|
|
68
|
-
];
|
|
69
|
-
return OBJECT_ONLY_KEYS.some((k) => k in schema);
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
/**
|
|
73
|
-
* 构造 schema structured-output 指令——resolver 单点注入的唯一文案源。
|
|
74
|
-
*
|
|
75
|
-
* [审查项#2] 消费链:resolveAgentOpts → appendSystemPrompt(ASP 稳定前缀区)。
|
|
76
|
-
* 此前 session-runner 有一份措辞相近的同名函数并把指令拼进 task 末尾,形成
|
|
77
|
-
* ASP + task 双重静态注入;task 后缀已删(task 每 agent 变化不可缓存,工具
|
|
78
|
-
* parameters 是 pi 必然注入的权威展示——注册工具 schema 随每次请求下发进
|
|
79
|
-
* provider 请求体,机制登记 PS-21:pi-ai dist/api/anthropic-messages.js
|
|
80
|
-
* convertTools :1000/:1008 → :1017 input_schema、openai-completions.js :1099
|
|
81
|
-
* parameters——schema 全文不必在 task 重复,文本重复浪费 ~730 tokens/子进程)。
|
|
82
|
-
*
|
|
83
|
-
* [审查项#4] AP 告知:注入侧校验用 additionalProperties:false 收窄后的
|
|
84
|
-
* parameters,模型自带 schema 外字段会被拒——不前置告知,拒绝显得凭空。
|
|
85
|
-
*
|
|
86
|
-
* JSON 序列化用 compact(stringifySchemaCached),与 schemaEnv 复用同串(IF7 #13)。
|
|
87
|
-
*/
|
|
88
|
-
export function formatSchemaInstruction(schema: Record<string, unknown>): string {
|
|
89
|
-
const schemaJson = stringifySchemaCached(schema, "compact");
|
|
90
|
-
// [U3] 根类型条件化:判定与 structured-output 的工具 parameters {value} 包装/解包
|
|
91
|
-
// 同源(上方 isObjectRootSchema 本地副本)。object 根 arguments 即 data;非 object
|
|
92
|
-
// 根参数层实为 {value} 包装——ASP 文案必须与工具 description 同语汇告知包装契约
|
|
93
|
-
// ({value: <data>} + value. 错误路径前缀),否则模型直传裸值必首调失败。
|
|
94
|
-
const isObjectRoot = isObjectRootSchema(schema);
|
|
95
|
-
const argsContractLine = isObjectRoot
|
|
96
|
-
? "Your call arguments ARE the result data itself — the tool's parameter schema IS the required shape of your result."
|
|
97
|
-
: "The tool's single argument must be an object `{value: <data>}` — put the result itself in `value`, and it must conform to the schema below. " +
|
|
98
|
-
"Validation errors may reference paths starting with `value.` (e.g. `value.0`, `value.name`): " +
|
|
99
|
-
"that prefix addresses the wrapper, not your data.";
|
|
100
|
-
const rulesCallLine = isObjectRoot
|
|
101
|
-
? "- Call the structured-output tool with your result data as its arguments. The system validates them against the schema above automatically."
|
|
102
|
-
: "- Call the structured-output tool with `{value: <your result data>}`. The system validates the `value` field against the schema above automatically.";
|
|
103
|
-
// [AP 告知条件化] 根级 additionalProperties 未声明时 D4 注入 false(见
|
|
104
|
-
// structured-output tool-definition)——额外字段恒拒绝,强承诺成立;作者显式声明
|
|
105
|
-
// true / 子 schema 时 injection 侧尊重不动,额外字段按作者声明放行,无条件
|
|
106
|
-
// 「一律拒绝」文案与参数层行为不符(保守方向误导:模型不敢传合法字段)。
|
|
107
|
-
const apLine = schema.additionalProperties === undefined
|
|
108
|
-
? "- Fields not defined in this schema are rejected — do not add extra fields."
|
|
109
|
-
: "- Extra fields follow this schema's own additionalProperties declaration.";
|
|
110
|
-
return [
|
|
111
|
-
"## MANDATORY: Structured Output Requirement",
|
|
112
|
-
"",
|
|
113
|
-
"This task requires structured output.",
|
|
114
|
-
"Your FINAL action must be calling the `structured-output` tool.",
|
|
115
|
-
"",
|
|
116
|
-
argsContractLine,
|
|
117
|
-
`Your result must conform to this schema:`,
|
|
118
|
-
"```json",
|
|
119
|
-
schemaJson,
|
|
120
|
-
"```",
|
|
121
|
-
"",
|
|
122
|
-
"Rules:",
|
|
123
|
-
rulesCallLine,
|
|
124
|
-
"- Do NOT output JSON in your text response — use the structured-output tool.",
|
|
125
|
-
"- Do NOT skip this step. The structured-output call IS your result.",
|
|
126
|
-
"- Complete all other work FIRST, then call structured-output as the last action.",
|
|
127
|
-
apLine,
|
|
128
|
-
].join("\n");
|
|
129
|
-
}
|
|
130
|
-
|
|
131
|
-
/**
|
|
132
|
-
* Resolve skill and schema into appendSystemPrompt (content array) + skillPath + schemaEnv.
|
|
133
|
-
*
|
|
134
|
-
* - Skill name -> resolved SKILL.md dir path via --skill
|
|
135
|
-
* - Schema JSON -> structured-output instruction string pushed into appendSystemPrompt
|
|
136
|
-
* (content, not file path) + PI_WORKFLOW_SCHEMA env
|
|
137
|
-
*
|
|
138
|
-
* Agent ref is intentionally NOT handled here — resolveIdentity (execution layer)
|
|
139
|
-
* covers it via getAgentConfig + resolveModel. Handling agent here would cause
|
|
140
|
-
* double-injection (agentConfig.systemPrompt at session-runner + appendSystemPrompt)
|
|
141
|
-
* and model-tier confusion.
|
|
142
|
-
*
|
|
143
|
-
* Returns the enriched opts.
|
|
144
|
-
*/
|
|
145
|
-
export function resolveAgentOpts(opts: AgentCallOpts): ResolveResult {
|
|
146
|
-
const appendSystemPrompt: string[] = [];
|
|
147
|
-
|
|
148
|
-
// Resolve skill name to SKILL.md path
|
|
149
|
-
if (opts.skill) {
|
|
150
|
-
const skillPath = resolveSkillPath(opts.skill);
|
|
151
|
-
if (!skillPath) {
|
|
152
|
-
return { opts, error: `Skill not found: ${opts.skill}. Searched .agents/skills/ and ~/.pi/agent/skills/` };
|
|
153
|
-
}
|
|
154
|
-
opts = { ...opts, skillPath };
|
|
155
|
-
}
|
|
156
|
-
|
|
157
|
-
// Inject schema as structured-output instruction into appendSystemPrompt (content,
|
|
158
|
-
// not temp file) and set environment variable for conditional tool + hook activation.
|
|
159
|
-
// M2 fix: previously wrote the instruction to a temp file and pushed the FILE PATH,
|
|
160
|
-
// which got concatenated into the final append file as path garbage — the SO instruction
|
|
161
|
-
// never reached the subprocess. Now the instruction content is pushed directly.
|
|
162
|
-
if (opts.schema) {
|
|
163
|
-
// IF7(#13):formatSchemaInstruction 与 schemaEnv 对同一 schema 对象引用共享
|
|
164
|
-
// WeakMap 缓存条目(compact stringify 整个 dispatch 只发生一次)
|
|
165
|
-
appendSystemPrompt.push(formatSchemaInstruction(opts.schema));
|
|
166
|
-
|
|
167
|
-
// Set env var for structured-output extension to activate tool + hook
|
|
168
|
-
opts = { ...opts, schemaEnv: stringifySchemaCached(opts.schema, "compact") };
|
|
169
|
-
}
|
|
170
|
-
|
|
171
|
-
return {
|
|
172
|
-
opts: { ...opts, ...(appendSystemPrompt.length > 0 ? { appendSystemPrompt } : {}) },
|
|
173
|
-
};
|
|
174
|
-
}
|
|
@@ -1,127 +0,0 @@
|
|
|
1
|
-
// src/orchestration/args-validator.ts
|
|
2
|
-
//
|
|
3
|
-
// m3:参数校验单一 chokepoint(IF3 validateRunArgs + IF4 ArgsValidationError)。
|
|
4
|
-
// lifecycle.runWorkflow 首行调用——§5.3 fail-fast:参数错误在 worker 启动前返回,
|
|
5
|
-
// 带「read 脚本重看」指引。
|
|
6
|
-
//
|
|
7
|
-
// 设计决策(m3 design-review 探针实证):
|
|
8
|
-
// - ajv 选项钉死 { coerceTypes:true, strictSchema:false, allErrors:true, useDefaults:false }:
|
|
9
|
-
// coerceTypes 原地规范化弱 LLM 的字符串参数('false'→false、'10'→10,m2 MAJOR-1 闭环);
|
|
10
|
-
// strictSchema:false 容忍用户 workflow 的自定义关键字/format(默认 strict:true 会误判畸形);
|
|
11
|
-
// useDefaults:false 不注入 schema default(脚本 fallback 语义不变)。
|
|
12
|
-
// - 无缓存:ajv.compile 实测 0.006ms/次([P-compile]),v5 §6.5 的 Map 缓存被探针证据推翻。
|
|
13
|
-
// - null-scan + required 空串复查:coerceTypes 下 {target:null} 会被 coerce 成 "" 放行
|
|
14
|
-
// required(required 只查属性存在性)——null 视为缺失、必填字符串空串视为失败,
|
|
15
|
-
// 与 review-fix-loop 脚本的 !target 语义对齐,保住「启动前 fail-fast」承诺。
|
|
16
|
-
|
|
17
|
-
import Ajv from "ajv";
|
|
18
|
-
|
|
19
|
-
import type { RunSpec } from "./models/run-spec.ts";
|
|
20
|
-
|
|
21
|
-
/** 参数校验失败(§5.3)。三调用方各自 catch 并映射到返回类型。 */
|
|
22
|
-
export class ArgsValidationError extends Error {
|
|
23
|
-
readonly workflowName: string;
|
|
24
|
-
/** ajv 校验错误数组(畸形 schema 时为 undefined)。 */
|
|
25
|
-
readonly errors?: readonly unknown[];
|
|
26
|
-
|
|
27
|
-
constructor(workflowName: string, message: string, errors?: readonly unknown[]) {
|
|
28
|
-
super(message);
|
|
29
|
-
this.name = "ArgsValidationError";
|
|
30
|
-
this.workflowName = workflowName;
|
|
31
|
-
this.errors = errors;
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
const ajv = new Ajv({
|
|
36
|
-
coerceTypes: true,
|
|
37
|
-
strictSchema: false,
|
|
38
|
-
allErrors: true,
|
|
39
|
-
useDefaults: false,
|
|
40
|
-
});
|
|
41
|
-
|
|
42
|
-
/** §5.3 错误文案:workflow 名 + errors 摘要 + info 指引。 */
|
|
43
|
-
function formatMessage(name: string, errors: readonly unknown[]): string {
|
|
44
|
-
const lines = errors.map((e) => {
|
|
45
|
-
let path = "/";
|
|
46
|
-
let msg = "invalid";
|
|
47
|
-
if (e !== null && typeof e === "object") {
|
|
48
|
-
const err = e as Record<string, unknown>;
|
|
49
|
-
if (typeof err.instancePath === "string" && err.instancePath) path = err.instancePath;
|
|
50
|
-
if (typeof err.message === "string") msg = err.message;
|
|
51
|
-
}
|
|
52
|
-
return `- ${path}: ${msg}`;
|
|
53
|
-
});
|
|
54
|
-
return (
|
|
55
|
-
`Invalid args for workflow '${name}': ${errors.length} error(s)\n` +
|
|
56
|
-
`${lines.join("\n")}\n` +
|
|
57
|
-
`Read the workflow script file (location from <available_workflows>) for the parameter schema and usage.`
|
|
58
|
-
);
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
/**
|
|
62
|
-
* 校验 spec.parameters(JSON Schema draft-07)对 spec.args 的约束。
|
|
63
|
-
*
|
|
64
|
-
* - spec.parameters === undefined → 跳过(安全退化:漏拷 parameters 退化是「不校验」非「校验错」)
|
|
65
|
-
* - coerceTypes 原地规范化 spec.args(worker 启动 + 崩溃重建重跑共用同一对象,
|
|
66
|
-
* run.spec === spec,保证重跑路径参数一致)
|
|
67
|
-
* - 失败 throw ArgsValidationError(非原始 ajv 错误)
|
|
68
|
-
*
|
|
69
|
-
* @throws ArgsValidationError 参数不合法或 schema 无效
|
|
70
|
-
*/
|
|
71
|
-
export function validateRunArgs(spec: RunSpec): void {
|
|
72
|
-
const { parameters, args, scriptName } = spec;
|
|
73
|
-
if (parameters === undefined) return;
|
|
74
|
-
|
|
75
|
-
if (parameters === null || typeof parameters !== "object" || Array.isArray(parameters)) {
|
|
76
|
-
throw new ArgsValidationError(
|
|
77
|
-
scriptName,
|
|
78
|
-
`Workflow '${scriptName}' has an invalid parameter schema (expected object). Read the workflow script file (location from <available_workflows>) to inspect it.`,
|
|
79
|
-
);
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
// null-scan:null 值视为缺失(coerceTypes 会把 null→"" 放行 required,绕过 fail-fast)。
|
|
83
|
-
// 只删 schema 未声明 nullable 的键——type 含 "null"(如 ["string","null"])的合法 null
|
|
84
|
-
// 输入保留(m3 exec-review M1 探针实证:全键删除会拒掉 nullable required 的合法值)。
|
|
85
|
-
const schema = parameters as Record<string, unknown>;
|
|
86
|
-
const properties =
|
|
87
|
-
schema.properties !== null && typeof schema.properties === "object"
|
|
88
|
-
? (schema.properties as Record<string, unknown>)
|
|
89
|
-
: {};
|
|
90
|
-
for (const key of Object.keys(args)) {
|
|
91
|
-
if (args[key] !== null) continue;
|
|
92
|
-
const prop = properties[key];
|
|
93
|
-
let isNullable = false;
|
|
94
|
-
if (prop !== null && typeof prop === "object") {
|
|
95
|
-
const propType = (prop as Record<string, unknown>).type;
|
|
96
|
-
isNullable = Array.isArray(propType)
|
|
97
|
-
? (propType as unknown[]).includes("null")
|
|
98
|
-
: propType === "null";
|
|
99
|
-
}
|
|
100
|
-
if (!isNullable) delete args[key];
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
let validate: ReturnType<Ajv["compile"]>;
|
|
104
|
-
try {
|
|
105
|
-
validate = ajv.compile(parameters);
|
|
106
|
-
} catch (err) {
|
|
107
|
-
// 真畸形 schema(如 type:'not-a-type')→ 结构化 ArgsValidationError,不泄漏原始 throw
|
|
108
|
-
const detail = err instanceof Error ? err.message : String(err);
|
|
109
|
-
throw new ArgsValidationError(
|
|
110
|
-
scriptName,
|
|
111
|
-
`Workflow '${scriptName}' has an invalid parameter schema: ${detail}. Read the workflow script file (location from <available_workflows>) to inspect it.`,
|
|
112
|
-
);
|
|
113
|
-
}
|
|
114
|
-
|
|
115
|
-
if (!validate(args)) {
|
|
116
|
-
throw new ArgsValidationError(
|
|
117
|
-
scriptName,
|
|
118
|
-
formatMessage(scriptName, validate.errors ?? []),
|
|
119
|
-
validate.errors ?? undefined,
|
|
120
|
-
);
|
|
121
|
-
}
|
|
122
|
-
// 注:非空约束由 schema 声明(minLength/pattern),chokepoint 不发明约束——
|
|
123
|
-
// m3 exec-review M2:硬编码 trim 空串复查与 schema 显式语义(enum 含 ''/minLength:0)
|
|
124
|
-
// 矛盾。review-fix-loop 的 target 用 { minLength: 1, pattern: '\\S' } 表达。
|
|
125
|
-
// 校验失败时 spec.args 可能已被 null-scan/coerce 部分 mutate(文档化行为:失败后
|
|
126
|
-
// 调用方不应复用该 args 对象)。
|
|
127
|
-
}
|
|
@@ -1,315 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Workflow Config Loader — 统一资源发现版(ADR-031)
|
|
3
|
-
*
|
|
4
|
-
* 扫描逻辑委托给 shared/resource-discovery(与 agent 发现共享同一套扫描源)。
|
|
5
|
-
* 本文件只保留 workflow 专属的 meta 提取(经 shared/meta-parser.ts IF1 统一 parser)+ 60s TTL 缓存。
|
|
6
|
-
*
|
|
7
|
-
* m2 收敛:删 extractMetaViaRegex + safeEvalObject(new Function),改调 parseResourceMeta
|
|
8
|
-
* (真实 YAML 解析 @pi-meta 块注释,发现期不执行作者代码,v5 原则 6 no-eval)。
|
|
9
|
-
* toCachedMeta 整对象透传(...meta),不再 {name,description,phases} 解构——消灭第 1 处重映射。
|
|
10
|
-
*
|
|
11
|
-
* Failed imports are marked available=false — the loader never throws.
|
|
12
|
-
*/
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
import { resolve } from "node:path";
|
|
16
|
-
|
|
17
|
-
// WorkflowMeta 规范来源是 shared/resource-meta.ts(m1 DM1);WorkflowSource 来自 workflow-script
|
|
18
|
-
import type { WorkflowSource } from "./models/workflow-script.ts";
|
|
19
|
-
import { clearLintMemo } from "./models/workflow-script.ts";
|
|
20
|
-
import type { WorkflowMeta } from "../shared/resource-meta.ts";
|
|
21
|
-
import { getCachedFile, getCachedFileContent, clearFileCache } from "../shared/resource-discovery.ts";
|
|
22
|
-
import { parseResourceMeta } from "../shared/meta-parser.ts";
|
|
23
|
-
import { normalizeRef, WORKFLOW_REF_EXT } from "../shared/agent-ref.ts";
|
|
24
|
-
export type { WorkflowMeta, WorkflowSource };
|
|
25
|
-
|
|
26
|
-
import { getAgentDir } from "@earendil-works/pi-coding-agent";
|
|
27
|
-
import { getLogger } from "@zhushanwen/pi-extension-logger";
|
|
28
|
-
|
|
29
|
-
const logger = getLogger("config-loader");
|
|
30
|
-
|
|
31
|
-
import {
|
|
32
|
-
discoverResources,
|
|
33
|
-
findWorkspaceRoot,
|
|
34
|
-
type ResourceSource,
|
|
35
|
-
type ScanConfig,
|
|
36
|
-
} from "../shared/resource-discovery.ts";
|
|
37
|
-
|
|
38
|
-
// ── Public types ──────────────────────────────────────────────
|
|
39
|
-
|
|
40
|
-
export interface CachedWorkflowMeta extends WorkflowMeta {
|
|
41
|
-
/** Absolute path to the script file */
|
|
42
|
-
path: string;
|
|
43
|
-
/** false when the script failed to load or has no valid meta export */
|
|
44
|
-
available: boolean;
|
|
45
|
-
/** Whether this is a saved (fixed) or temporary (ad-hoc) workflow */
|
|
46
|
-
source: WorkflowSource;
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
// ── Internal types ────────────────────────────────────────────
|
|
50
|
-
|
|
51
|
-
interface CacheEntry {
|
|
52
|
-
meta: CachedWorkflowMeta;
|
|
53
|
-
/** 文件 mtime(m5:mtime 键控判失效——删 60s TTL,mtime 未变即命中)。 */
|
|
54
|
-
mtimeMs: number;
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
// ── Constants ─────────────────────────────────────────────────
|
|
58
|
-
|
|
59
|
-
// m5:删 60s TTL——mtime 键控判失效(TTL 只服务 getWorkflow 且造成 60s 陈旧窗口)。
|
|
60
|
-
|
|
61
|
-
// ── Cache ─────────────────────────────────────────────────────
|
|
62
|
-
|
|
63
|
-
// Keyed by workspace root so that switching projects does not serve stale entries.
|
|
64
|
-
const cache = new Map<string, Map<string, CacheEntry>>();
|
|
65
|
-
|
|
66
|
-
function getCacheBucket(workspaceRoot: string): Map<string, CacheEntry> {
|
|
67
|
-
let bucket = cache.get(workspaceRoot);
|
|
68
|
-
if (!bucket) {
|
|
69
|
-
bucket = new Map<string, CacheEntry>();
|
|
70
|
-
cache.set(workspaceRoot, bucket);
|
|
71
|
-
}
|
|
72
|
-
return bucket;
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
function isCacheValid(entry: CacheEntry): boolean {
|
|
76
|
-
// m5:mtime 判变——文件 mtime 未变即命中(删 TTL 后文件变更立即反映)
|
|
77
|
-
const file = getCachedFile(entry.meta.path);
|
|
78
|
-
return file !== null && file.mtimeMs === entry.mtimeMs;
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
// ── Helpers ───────────────────────────────────────────────────
|
|
82
|
-
|
|
83
|
-
/** Extract filename stem (no directory, no extension). */
|
|
84
|
-
function stem(filePath: string): string {
|
|
85
|
-
const base = filePath.split("/").pop() ?? filePath;
|
|
86
|
-
const dot = base.lastIndexOf(".");
|
|
87
|
-
return dot > 0 ? base.slice(0, dot) : base;
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
// ── ResourceSource → WorkflowSource 映射 ─────────────────────
|
|
91
|
-
|
|
92
|
-
/** 统一模块的 ResourceSource 映射为 workflow 的 saved/tmp 语义 */
|
|
93
|
-
function toWorkflowSource(source: ResourceSource): WorkflowSource {
|
|
94
|
-
return source === "project-pi-tmp" ? "tmp" : "saved";
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
/**
|
|
98
|
-
* 按路径推导 ResourceSource(IF4/外部 #5 残留)。
|
|
99
|
-
*
|
|
100
|
-
* getWorkflowByPath 可加载任意绝对路径(不限扫描源),此前硬编码 "user-pi"
|
|
101
|
-
* 使 workspaceRoot/.pi/workflows/.tmp/ 下的临时脚本按路径加载被错标 saved
|
|
102
|
-
* (discoverWorkflows 对同文件正确标 tmp,两路径不一致)。修正:路径落在
|
|
103
|
-
* tmp 目录前缀内 → "project-pi-tmp",其余 → "user-pi"(非 tmp 路径输出不变,DS4)。
|
|
104
|
-
*/
|
|
105
|
-
function deriveResourceSource(filePath: string, workspaceRoot: string): ResourceSource {
|
|
106
|
-
const tmpDir = resolve(workspaceRoot, ".pi/workflows/.tmp");
|
|
107
|
-
const normalized = resolve(filePath);
|
|
108
|
-
return normalized === tmpDir || normalized.startsWith(`${tmpDir}/`) ? "project-pi-tmp" : "user-pi";
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
// ── 单文件 → CachedWorkflowMeta(IF1 parseResourceMeta + 整对象透传)──
|
|
112
|
-
|
|
113
|
-
/**
|
|
114
|
-
* 提取单个文件的 meta(经 IF1 parseResourceMeta),失败时标 available=false(fail-safe 不抛)。
|
|
115
|
-
*
|
|
116
|
-
* m2:整对象透传(...meta),不再 {name,description,phases} 解构——消灭第 1 处重映射,
|
|
117
|
-
* parameters/usage/when/notFor 一路流到 script.meta。仅认 @pi-meta 新格式(D1 无 adapter)。
|
|
118
|
-
*/
|
|
119
|
-
async function toCachedMeta(
|
|
120
|
-
filePath: string,
|
|
121
|
-
source: ResourceSource,
|
|
122
|
-
): Promise<CachedWorkflowMeta> {
|
|
123
|
-
const fallbackName = stem(filePath);
|
|
124
|
-
const wfSource = toWorkflowSource(source);
|
|
125
|
-
try {
|
|
126
|
-
const content = getCachedFileContent(filePath); // m5:统一 mtime 缓存层
|
|
127
|
-
if (content === null) throw new Error("file not readable");
|
|
128
|
-
const meta = parseResourceMeta(content, "workflow");
|
|
129
|
-
if (meta && meta.kind === "workflow") {
|
|
130
|
-
return { ...meta, path: filePath, available: true, source: wfSource };
|
|
131
|
-
}
|
|
132
|
-
// m2 exec-review MINOR-4:文件可读但 meta=null → 旧 const meta 格式或格式错误,
|
|
133
|
-
// 静默 available=false(D1 无 adapter)。warn 帮助用户定位需迁移到 @pi-meta 的存量 workflow。
|
|
134
|
-
logger.warn(
|
|
135
|
-
`[config-loader] ${filePath}: 未解析到 @pi-meta 元数据(旧 const meta 格式需迁移)→ available=false`,
|
|
136
|
-
);
|
|
137
|
-
} catch (err) {
|
|
138
|
-
// 读失败 → available=false(fail-safe 不抛,与原行为一致)
|
|
139
|
-
logger.debug(`[config-loader] skip unreadable workflow file ${filePath}`, {
|
|
140
|
-
reason: err instanceof Error ? err.message : String(err),
|
|
141
|
-
});
|
|
142
|
-
}
|
|
143
|
-
return {
|
|
144
|
-
kind: "workflow",
|
|
145
|
-
name: fallbackName,
|
|
146
|
-
description: "",
|
|
147
|
-
phases: [],
|
|
148
|
-
path: filePath,
|
|
149
|
-
available: false,
|
|
150
|
-
source: wfSource,
|
|
151
|
-
};
|
|
152
|
-
}
|
|
153
|
-
|
|
154
|
-
// ── Public API ────────────────────────────────────────────────
|
|
155
|
-
|
|
156
|
-
/**
|
|
157
|
-
* workflow 发现的扫描配置。每个字段显式声明一个扫描源目录。
|
|
158
|
-
*
|
|
159
|
-
* 生产环境用 defaultScanConfig() 构造默认值(全局 ~/.pi/agent/* 目录)。
|
|
160
|
-
* 测试/隔离环境构造完整 config 指向 tmp 目录,完全不碰全局文件系统。
|
|
161
|
-
*/
|
|
162
|
-
export interface WorkflowScanConfig {
|
|
163
|
-
/** 项目级脚本目录(workspaceRoot/.pi/workflows) */
|
|
164
|
-
projectDir: string;
|
|
165
|
-
/** user 级脚本目录(~/.pi/agent/workflows) */
|
|
166
|
-
userDir: string;
|
|
167
|
-
/** 临时脚本目录(workspaceRoot/.pi/workflows/.tmp) */
|
|
168
|
-
tmpDir: string;
|
|
169
|
-
/** npm 包扫描目录(~/.pi/agent/npm/node_modules 等) */
|
|
170
|
-
npmDirs: string[];
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
/**
|
|
174
|
-
* 把 WorkflowScanConfig 转为统一模块的 ScanConfig。
|
|
175
|
-
*
|
|
176
|
-
* 测试隔离场景下传入完整 config——此时按声明的 projectDir/tmpDir 反推
|
|
177
|
-
* workspaceRoot(与原行为一致:resolve(config.projectDir, "../.."))。
|
|
178
|
-
* 生产场景(省略或部分 config)走 findWorkspaceRoot(cwd)。
|
|
179
|
-
*/
|
|
180
|
-
function toScanConfig(
|
|
181
|
-
configOrCwd: Partial<WorkflowScanConfig> & { cwd?: string } | undefined,
|
|
182
|
-
): ScanConfig {
|
|
183
|
-
// 测试隔离:传入了 projectDir,直接反推 workspaceRoot
|
|
184
|
-
if (configOrCwd?.projectDir) {
|
|
185
|
-
const workspaceRoot = resolve(configOrCwd.projectDir, "../..");
|
|
186
|
-
return {
|
|
187
|
-
kind: "workflows",
|
|
188
|
-
workspaceRoot,
|
|
189
|
-
agentDir: "test-no-agent-dir",
|
|
190
|
-
includeTmp: true,
|
|
191
|
-
};
|
|
192
|
-
}
|
|
193
|
-
|
|
194
|
-
// 生产默认
|
|
195
|
-
const cwd = configOrCwd?.cwd;
|
|
196
|
-
const workspaceRoot = findWorkspaceRoot(cwd);
|
|
197
|
-
return {
|
|
198
|
-
kind: "workflows",
|
|
199
|
-
workspaceRoot,
|
|
200
|
-
agentDir: getAgentDir(),
|
|
201
|
-
includeTmp: true,
|
|
202
|
-
};
|
|
203
|
-
}
|
|
204
|
-
|
|
205
|
-
/**
|
|
206
|
-
* 从指定 config 扫描所有 workflow 脚本,按 tmp>project>npm>user 优先级
|
|
207
|
-
* 去重,60s TTL 缓存(按 workspaceRoot 分桶)。
|
|
208
|
-
*
|
|
209
|
-
* 扫描逻辑委托给 shared/resource-discovery(与 agent 发现共享同一套扫描源)。
|
|
210
|
-
*
|
|
211
|
-
* Never throws. 解析失败的脚本以 available=false 返回。
|
|
212
|
-
*
|
|
213
|
-
* @param configOrCwd 完整 WorkflowScanConfig(隔离用)、部分字段(覆盖默认)、
|
|
214
|
-
* 或省略(纯生产默认)。可选 cwd 用于推导 workspaceRoot。
|
|
215
|
-
*/
|
|
216
|
-
export async function discoverWorkflows(
|
|
217
|
-
configOrCwd?: Partial<WorkflowScanConfig> & { cwd?: string },
|
|
218
|
-
): Promise<CachedWorkflowMeta[]> {
|
|
219
|
-
const scanConfig = toScanConfig(configOrCwd);
|
|
220
|
-
const workspaceRoot = scanConfig.workspaceRoot;
|
|
221
|
-
|
|
222
|
-
// 统一发现:返回已去重的资源列表(按优先级合并)
|
|
223
|
-
const resources = await discoverResources(scanConfig);
|
|
224
|
-
|
|
225
|
-
// 提取 meta(逐文件)
|
|
226
|
-
const mergedMap = new Map<string, CachedWorkflowMeta>();
|
|
227
|
-
for (const resource of resources) {
|
|
228
|
-
const cachedMeta = await toCachedMeta(resource.path, resource.source);
|
|
229
|
-
// available=false 的不覆盖已有的 available=true(与统一模块逻辑一致)
|
|
230
|
-
if (!cachedMeta.available && mergedMap.has(cachedMeta.name)) {
|
|
231
|
-
continue;
|
|
232
|
-
}
|
|
233
|
-
mergedMap.set(cachedMeta.name, cachedMeta);
|
|
234
|
-
}
|
|
235
|
-
|
|
236
|
-
// 按 name 码点序输出(KV-cache 契约,与 injector 层一致):不依赖发现层
|
|
237
|
-
// 优先级迭代序 / readdir 枚举序,重建结果顺序稳定。
|
|
238
|
-
const merged = Array.from(mergedMap.values()).sort((a, b) =>
|
|
239
|
-
a.name < b.name ? -1 : a.name > b.name ? 1 : 0,
|
|
240
|
-
);
|
|
241
|
-
|
|
242
|
-
// Update cache (scoped to current workspace root)
|
|
243
|
-
const bucket = getCacheBucket(workspaceRoot);
|
|
244
|
-
for (const wf of merged) {
|
|
245
|
-
const file = getCachedFile(wf.path);
|
|
246
|
-
bucket.set(wf.name, { meta: wf, mtimeMs: file?.mtimeMs ?? 0 });
|
|
247
|
-
}
|
|
248
|
-
|
|
249
|
-
return merged;
|
|
250
|
-
}
|
|
251
|
-
|
|
252
|
-
/**
|
|
253
|
-
* Load and cache all available workflow scripts from project-level
|
|
254
|
-
* (.pi/workflows/) and user-level (~/.pi/agent/workflows/) directories.
|
|
255
|
-
*
|
|
256
|
-
* discoverWorkflows() 的生产 preset——用全局默认目录。
|
|
257
|
-
*
|
|
258
|
-
* Never throws. Failed imports are returned with available=false.
|
|
259
|
-
*/
|
|
260
|
-
export async function loadWorkflows(): Promise<CachedWorkflowMeta[]> {
|
|
261
|
-
return discoverWorkflows();
|
|
262
|
-
}
|
|
263
|
-
|
|
264
|
-
/**
|
|
265
|
-
* Get a specific workflow by name.
|
|
266
|
-
* Returns cached result if still valid, otherwise triggers a fresh load.
|
|
267
|
-
*/
|
|
268
|
-
export async function getWorkflow(name: string): Promise<CachedWorkflowMeta | undefined> {
|
|
269
|
-
const workspaceRoot = findWorkspaceRoot();
|
|
270
|
-
const bucket = getCacheBucket(workspaceRoot);
|
|
271
|
-
const cached = bucket.get(name);
|
|
272
|
-
if (cached && isCacheValid(cached)) {
|
|
273
|
-
return cached.meta;
|
|
274
|
-
}
|
|
275
|
-
|
|
276
|
-
const workflows = await loadWorkflows();
|
|
277
|
-
return workflows.find((wf) => wf.name === name);
|
|
278
|
-
}
|
|
279
|
-
|
|
280
|
-
/**
|
|
281
|
-
* 按绝对路径加载单个 workflow(workflowRef 统一解析入口——S2 路径统一)。
|
|
282
|
-
*
|
|
283
|
-
* - ~/ 前缀展开;相对路径/非 .js 引用返回 undefined(引用唯一形态 = 绝对路径)
|
|
284
|
-
* - 任意路径(不限扫描源):内置包内脚本、用户任意位置脚本均可执行
|
|
285
|
-
* - meta 提取失败/文件不可读 → available=false(fail-safe,不抛)
|
|
286
|
-
* - [perf] 与 getWorkflow(name) 对称走 bucket 缓存(key=绝对路径,与 stem 名不冲突),
|
|
287
|
-
* 消除 workflow tool 主路径每次 run 的全文 regex + YAML.parse(mtime 判变失效)
|
|
288
|
-
*/
|
|
289
|
-
export async function getWorkflowByPath(ref: string): Promise<CachedWorkflowMeta | undefined> {
|
|
290
|
-
const filePath = normalizeRef(ref, WORKFLOW_REF_EXT);
|
|
291
|
-
if (filePath === null) return undefined;
|
|
292
|
-
const workspaceRoot = findWorkspaceRoot();
|
|
293
|
-
const bucket = getCacheBucket(workspaceRoot);
|
|
294
|
-
const cached = bucket.get(filePath);
|
|
295
|
-
if (cached && isCacheValid(cached)) {
|
|
296
|
-
return cached.meta;
|
|
297
|
-
}
|
|
298
|
-
// IF4:source 按路径推导——.tmp 前缀 → project-pi-tmp(→ "tmp"),其余 user-pi 维持现值
|
|
299
|
-
const meta = await toCachedMeta(filePath, deriveResourceSource(filePath, workspaceRoot));
|
|
300
|
-
const file = getCachedFile(filePath);
|
|
301
|
-
if (file) bucket.set(filePath, { meta, mtimeMs: file.mtimeMs });
|
|
302
|
-
return meta;
|
|
303
|
-
}
|
|
304
|
-
|
|
305
|
-
/**
|
|
306
|
-
* Invalidate the internal meta cache.
|
|
307
|
-
* The next call to loadWorkflows or getWorkflow will re-scan directories.
|
|
308
|
-
*/
|
|
309
|
-
export function invalidateCache(): void {
|
|
310
|
-
// m5:清统一 mtime 缓存层 + bucket(测试隔离 + mtime 漏判场景手动刷新兜底)
|
|
311
|
-
// IF9:连带清 workflow-script validate 的 lint memo(同源文件缓存,测试隔离统一走它)
|
|
312
|
-
clearFileCache();
|
|
313
|
-
cache.clear();
|
|
314
|
-
clearLintMemo();
|
|
315
|
-
}
|