@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,174 +0,0 @@
|
|
|
1
|
-
// src/execution/ui-request-queue.ts
|
|
2
|
-
//
|
|
3
|
-
// W3/W2: 子进程 extension_ui_request 的 FIFO 串行队列 + 转发处理。
|
|
4
|
-
//
|
|
5
|
-
// 从 session-runner.ts 提取(保持文件 < 1000 行)。职责单一:
|
|
6
|
-
// - createUiRequestQueue:每个子进程一个队列,保证多个 UI 请求(ask_user 等)
|
|
7
|
-
// FIFO 串行处理,防止并发询问用户导致交错。
|
|
8
|
-
// - handleUiRequest:从 ExtensionUiRequest 构造 UiRequest → 调主 agent uiRequestHandler
|
|
9
|
-
// → 按 UiResponse 形状回写 stdin。
|
|
10
|
-
// - extractMethodFields:method-specific 字段类型安全复制。
|
|
11
|
-
//
|
|
12
|
-
// session-runner.runSpawn 在 stdout pump 中拿到 extension_ui_request 后调 enqueue 入队。
|
|
13
|
-
|
|
14
|
-
import type { ChildProcess } from "node:child_process";
|
|
15
|
-
|
|
16
|
-
import { getLogger } from "@zhushanwen/pi-extension-logger";
|
|
17
|
-
|
|
18
|
-
import type { UiRequest } from "./dialog-queue.ts";
|
|
19
|
-
// 类型再导出:dialog-queue.ts 是 UiRequest/UiResponse/UiRequestHandler 的规范来源,
|
|
20
|
-
// 本模块再导出供测试 import(避免测试直接依赖 dialog-queue 内部实现)。
|
|
21
|
-
export type { UiRequest, UiRequestHandler, UiResponse } from "./dialog-queue.ts";
|
|
22
|
-
import type { SessionRunnerContext } from "./session-runner.ts";
|
|
23
|
-
import type { ExtensionUiRequest } from "./spawn-event-adapter.ts";
|
|
24
|
-
import { respond } from "./stdin-writer.ts";
|
|
25
|
-
import { parseChannel } from "./ui-channels.ts";
|
|
26
|
-
import { notifyMissingHandlerGlobal } from "./ui-request-observability.ts";
|
|
27
|
-
|
|
28
|
-
const logger = getLogger("subagents");
|
|
29
|
-
|
|
30
|
-
/**
|
|
31
|
-
* 创建 UI 请求队列。返回 enqueue 函数,调用方将 extension_ui_request 入队。
|
|
32
|
-
*
|
|
33
|
-
* 多个 extension_ui_request 并发到达时,队列保证 FIFO 串行处理:
|
|
34
|
-
* 前一个请求的 uiRequestHandler resolve 后,才将下一个请求发给主 agent UI。
|
|
35
|
-
* 防止并发询问用户导致交错(用户同时看到多个问题)。
|
|
36
|
-
*
|
|
37
|
-
* 设计:队列是 runSpawn 生命周期内的闭包状态(非模块级),
|
|
38
|
-
* 每个子进程实例独立队列,无跨 session 泄漏。
|
|
39
|
-
*
|
|
40
|
-
* @param child 子进程(stdin 写入 extension_ui_response)
|
|
41
|
-
* @param ctx SessionRunnerContext(含 uiRequestHandler 回调)
|
|
42
|
-
* @returns enqueue 函数:(id, request) => void,将请求入队并触发顺序处理
|
|
43
|
-
*/
|
|
44
|
-
export function createUiRequestQueue(
|
|
45
|
-
child: ChildProcess,
|
|
46
|
-
ctx: SessionRunnerContext,
|
|
47
|
-
): (id: string, request: ExtensionUiRequest) => void {
|
|
48
|
-
// [R3] AbortController 取消 pending handler——子进程退出时队列不再阻塞
|
|
49
|
-
const abortController = new AbortController();
|
|
50
|
-
const queue: Array<{ id: string; request: ExtensionUiRequest; signal: AbortSignal }> = [];
|
|
51
|
-
let processing = false;
|
|
52
|
-
let closed = false;
|
|
53
|
-
|
|
54
|
-
function processNext(): void {
|
|
55
|
-
if (processing || queue.length === 0 || closed) return;
|
|
56
|
-
processing = true;
|
|
57
|
-
const { id, request, signal } = queue.shift()!;
|
|
58
|
-
handleUiRequest(child, id, request, ctx, signal).finally(() => {
|
|
59
|
-
processing = false;
|
|
60
|
-
processNext();
|
|
61
|
-
});
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
// [R3] 子进程退出时 abort 所有 pending handler,队列不再阻塞
|
|
65
|
-
// [SR-4] 同步清理 L2 队列中该 child 的 pending dialog——child 在 dialog 等 L2 时退出,
|
|
66
|
-
// L2 里该项永不 settle → processing 永远 true → 所有其他子进程 dialog 永久阻塞(全局死锁)。
|
|
67
|
-
// pid 缺省(spawn 后极短窗口 child.pid 可能为 undefined)时跳过——此时该 child 还未在 L2
|
|
68
|
-
// 注册过任何 dialog(handleUiRequest 构造 UiRequest 时用同样的 child.pid,pid undefined 时
|
|
69
|
-
// 不填 _childPid,rejectChildDialogs 也匹配不到),无清理必要。
|
|
70
|
-
const onClose = (): void => {
|
|
71
|
-
// #19/#17 幂等守卫:close + error 可能都触发,二次调用会重复 rejectChildDialogs(虽依赖 L2 的 settled 幂等,
|
|
72
|
-
// 但 close 状态本身需守卫——避免 closed=true 后 queue.length=0 + abort 重复执行,以及重复 reject 导致语义噪声)。
|
|
73
|
-
if (closed) return;
|
|
74
|
-
closed = true;
|
|
75
|
-
abortController.abort();
|
|
76
|
-
queue.length = 0;
|
|
77
|
-
if (child.pid !== undefined) {
|
|
78
|
-
ctx.dialogQueue?.rejectChildDialogs({ pid: child.pid });
|
|
79
|
-
}
|
|
80
|
-
};
|
|
81
|
-
child.on("close", onClose);
|
|
82
|
-
child.on("error", onClose);
|
|
83
|
-
|
|
84
|
-
return function enqueue(id: string, request: ExtensionUiRequest): void {
|
|
85
|
-
if (closed) return;
|
|
86
|
-
queue.push({ id, request, signal: abortController.signal });
|
|
87
|
-
processNext();
|
|
88
|
-
};
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
/**
|
|
92
|
-
* 处理子进程发来的 extension_ui_request(ask_user 及其他 Pi UI method)。
|
|
93
|
-
*
|
|
94
|
-
* 流程:从 ExtensionUiRequest 构造 UiRequest(含 channel/channelPayload)
|
|
95
|
-
* → 调用主 agent uiRequestHandler → 按 UiResponse 形状回写 stdin。
|
|
96
|
-
*
|
|
97
|
-
* handler 未设置时不再静默忽略——console.warn 兜底(FR-9 可观测性),
|
|
98
|
-
* W3 接入 SubagentService.notifyMissingHandler 的 appendEntry。
|
|
99
|
-
*
|
|
100
|
-
* @param child 子进程(stdin 写入响应)
|
|
101
|
-
* @param id 请求 id(子进程用它关联 response)
|
|
102
|
-
* @param request ExtensionUiRequest(method 平铺,从 enqueueUiRequest 传入)
|
|
103
|
-
* @param ctx SessionRunnerContext(含 uiRequestHandler 回调)
|
|
104
|
-
* @param signal abort signal(子进程退出时触发,取消正在等待的 handler)
|
|
105
|
-
* @returns Promise(队列等待用:resolve 表示响应已写入 stdin 或已放弃)
|
|
106
|
-
*/
|
|
107
|
-
async function handleUiRequest(
|
|
108
|
-
child: ChildProcess,
|
|
109
|
-
id: string,
|
|
110
|
-
request: ExtensionUiRequest,
|
|
111
|
-
ctx: SessionRunnerContext,
|
|
112
|
-
signal?: AbortSignal,
|
|
113
|
-
): Promise<void> {
|
|
114
|
-
const handler = ctx.uiRequestHandler;
|
|
115
|
-
if (!handler) {
|
|
116
|
-
// #9 + #11:handler 缺失时不再静默 return(会让子进程永久挂起等 response)。
|
|
117
|
-
// - notifyMissingHandlerGlobal:经 globalThis 桥接到 observability 单例做 per-session 去重告警
|
|
118
|
-
// (FR-9 可观测性;未注册时走 fallback warn 不丢日志)
|
|
119
|
-
// - respond(cancelled):让子进程收到明确取消,不再永久挂起。等价于用户主动取消的语义。
|
|
120
|
-
// 去重 key 用 child.pid(队列内拿不到真实 sessionId;pid 是子进程会话的稳定标识,
|
|
121
|
-
// 去重粒度正确——同一子进程多次 handler 缺失只告警一次)。
|
|
122
|
-
notifyMissingHandlerGlobal(child.pid?.toString() ?? id);
|
|
123
|
-
respond(child, id, { cancelled: true }, signal);
|
|
124
|
-
return;
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
// 从 ExtensionUiRequest 构造 UiRequest(含 channel/channelPayload)
|
|
128
|
-
const { channel, channelPayload } = parseChannel(request);
|
|
129
|
-
// [SR-4] 填入 child.pid 作为内部元数据:L2 队列的 rejectChildDialogs 据此关联 child close
|
|
130
|
-
// 清理。factory 层 enqueue 时读 req._childPid 传给 opts.child。pid undefined(spawn 后极短
|
|
131
|
-
// 窗口)时不填——rejectChildDialogs 也匹配不到(onClose 同样用 child.pid 守卫),无副作用。
|
|
132
|
-
const uiReq: UiRequest = {
|
|
133
|
-
id,
|
|
134
|
-
method: request.method,
|
|
135
|
-
...(child.pid !== undefined ? { _childPid: child.pid } : {}),
|
|
136
|
-
...(channel !== undefined ? { channel } : {}),
|
|
137
|
-
...(channelPayload !== undefined ? { channelPayload } : {}),
|
|
138
|
-
...extractMethodFields(request),
|
|
139
|
-
};
|
|
140
|
-
|
|
141
|
-
try {
|
|
142
|
-
const result = await handler(uiReq);
|
|
143
|
-
// [R3] 子进程已退出,跳过写入
|
|
144
|
-
if (signal?.aborted) return;
|
|
145
|
-
respond(child, id, result, signal);
|
|
146
|
-
} catch (err) {
|
|
147
|
-
// [R3] 子进程已退出,跳过写入
|
|
148
|
-
if (signal?.aborted) return;
|
|
149
|
-
logger.error("[subagents] uiRequestHandler threw", {
|
|
150
|
-
detail: err instanceof Error ? err.message : String(err),
|
|
151
|
-
});
|
|
152
|
-
respond(child, id, { cancelled: true }, signal);
|
|
153
|
-
}
|
|
154
|
-
}
|
|
155
|
-
|
|
156
|
-
/** 从 ExtensionUiRequest 提取 method-specific 字段到 UiRequest(与 Pi rpc-types.ts 1:1)。
|
|
157
|
-
* 按 method 变体类型安全地复制对应字段;缺失字段不复制(保持 UiRequest 可选)。 */
|
|
158
|
-
function extractMethodFields(req: ExtensionUiRequest): Partial<UiRequest> {
|
|
159
|
-
const out: Partial<UiRequest> = {};
|
|
160
|
-
if ("title" in req && typeof req.title === "string") out.title = req.title;
|
|
161
|
-
if ("options" in req && Array.isArray(req.options)) out.options = req.options;
|
|
162
|
-
if ("message" in req && typeof req.message === "string") out.message = req.message;
|
|
163
|
-
if ("placeholder" in req && typeof req.placeholder === "string") out.placeholder = req.placeholder;
|
|
164
|
-
if ("prefill" in req && typeof req.prefill === "string") out.prefill = req.prefill;
|
|
165
|
-
if ("notifyType" in req && typeof req.notifyType === "string") out.notifyType = req.notifyType;
|
|
166
|
-
if ("statusKey" in req && typeof req.statusKey === "string") out.statusKey = req.statusKey;
|
|
167
|
-
if ("statusText" in req) out.statusText = req.statusText;
|
|
168
|
-
if ("widgetKey" in req && typeof req.widgetKey === "string") out.widgetKey = req.widgetKey;
|
|
169
|
-
if ("widgetLines" in req) out.widgetLines = req.widgetLines;
|
|
170
|
-
if ("widgetPlacement" in req) out.widgetPlacement = req.widgetPlacement;
|
|
171
|
-
if ("text" in req && typeof req.text === "string") out.text = req.text;
|
|
172
|
-
if ("timeout" in req && typeof req.timeout === "number") out.timeout = req.timeout;
|
|
173
|
-
return out;
|
|
174
|
-
}
|