@downcity/agent 1.1.237 → 1.1.258
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +21 -20
- package/bin/agent/{local/Agent.d.ts → Agent.d.ts} +37 -27
- package/bin/agent/Agent.d.ts.map +1 -0
- package/bin/agent/Agent.js +211 -0
- package/bin/agent/Agent.js.map +1 -0
- package/bin/agent/AgentContext.d.ts +64 -0
- package/bin/agent/AgentContext.d.ts.map +1 -0
- package/bin/agent/AgentContext.js +53 -0
- package/bin/agent/AgentContext.js.map +1 -0
- package/bin/agent/{local/AgentInstructions.d.ts → AgentInstructions.d.ts} +1 -6
- package/bin/agent/AgentInstructions.d.ts.map +1 -0
- package/bin/agent/{local/AgentInstructions.js → AgentInstructions.js} +1 -10
- package/bin/agent/AgentInstructions.js.map +1 -0
- package/bin/{model/CityModelAdapter.d.ts → agent/AgentModel.d.ts} +3 -3
- package/bin/agent/AgentModel.d.ts.map +1 -0
- package/bin/{model/CityModelAdapter.js → agent/AgentModel.js} +11 -4
- package/bin/agent/AgentModel.js.map +1 -0
- package/bin/agent/{local/services/AgentSessions.d.ts → AgentSessions.d.ts} +30 -40
- package/bin/agent/AgentSessions.d.ts.map +1 -0
- package/bin/agent/{local/services/AgentSessions.js → AgentSessions.js} +62 -79
- package/bin/agent/AgentSessions.js.map +1 -0
- package/bin/agent/AgentState.d.ts +64 -0
- package/bin/agent/AgentState.d.ts.map +1 -0
- package/bin/agent/AgentState.js +118 -0
- package/bin/agent/AgentState.js.map +1 -0
- package/bin/config/Paths.d.ts +0 -43
- package/bin/config/Paths.d.ts.map +1 -1
- package/bin/config/Paths.js +0 -79
- package/bin/config/Paths.js.map +1 -1
- package/bin/config/ProjectSetup.d.ts.map +1 -0
- package/bin/{agent/local → config}/ProjectSetup.js +1 -1
- package/bin/config/ProjectSetup.js.map +1 -0
- package/bin/executor/Executor.d.ts +20 -86
- package/bin/executor/Executor.d.ts.map +1 -1
- package/bin/executor/Executor.js +109 -260
- package/bin/executor/Executor.js.map +1 -1
- package/bin/executor/composer/system/default/DefaultSessionSystemComposer.d.ts +1 -1
- package/bin/executor/composer/system/default/DefaultSessionSystemComposer.d.ts.map +1 -1
- package/bin/executor/composer/system/default/SystemDomain.d.ts +1 -1
- package/bin/executor/composer/system/default/SystemDomain.d.ts.map +1 -1
- package/bin/executor/composer/system/default/SystemDomain.js +4 -1
- package/bin/executor/composer/system/default/SystemDomain.js.map +1 -1
- package/bin/executor/composer/system/default/assets/core.prompt.d.ts +1 -1
- package/bin/executor/composer/system/default/assets/core.prompt.d.ts.map +1 -1
- package/bin/executor/composer/system/default/assets/core.prompt.js +1 -1
- package/bin/executor/composer/system/default/assets/core.prompt.js.map +1 -1
- package/bin/executor/core-engine/CoreEngineRunner.d.ts +7 -13
- package/bin/executor/core-engine/CoreEngineRunner.d.ts.map +1 -1
- package/bin/executor/core-engine/CoreEngineRunner.js +81 -34
- package/bin/executor/core-engine/CoreEngineRunner.js.map +1 -1
- package/bin/executor/services/ExecutorRecoveryPolicy.d.ts +6 -12
- package/bin/executor/services/ExecutorRecoveryPolicy.d.ts.map +1 -1
- package/bin/executor/services/ExecutorRecoveryPolicy.js +20 -6
- package/bin/executor/services/ExecutorRecoveryPolicy.js.map +1 -1
- package/bin/executor/tools/file/ReadImageToolBridge.d.ts +21 -0
- package/bin/executor/tools/file/ReadImageToolBridge.d.ts.map +1 -0
- package/bin/executor/tools/file/ReadImageToolBridge.js +69 -0
- package/bin/executor/tools/file/ReadImageToolBridge.js.map +1 -0
- package/bin/executor/tools/plugin/PluginToolBridge.d.ts.map +1 -1
- package/bin/executor/tools/plugin/PluginToolBridge.js +6 -5
- package/bin/executor/tools/plugin/PluginToolBridge.js.map +1 -1
- package/bin/executor/tools/plugin/PluginToolDefinition.d.ts.map +1 -1
- package/bin/executor/tools/plugin/PluginToolDefinition.js +15 -2
- package/bin/executor/tools/plugin/PluginToolDefinition.js.map +1 -1
- package/bin/executor/types/SessionHistoryMeta.d.ts +0 -2
- package/bin/executor/types/SessionHistoryMeta.d.ts.map +1 -1
- package/bin/index.d.ts +17 -21
- package/bin/index.d.ts.map +1 -1
- package/bin/index.js +9 -11
- package/bin/index.js.map +1 -1
- package/bin/plugin/core/ActionScheduleExecutor.d.ts +1 -1
- package/bin/plugin/core/ActionScheduleExecutor.d.ts.map +1 -1
- package/bin/plugin/core/ActionScheduleRuntime.d.ts +1 -1
- package/bin/plugin/core/ActionScheduleRuntime.d.ts.map +1 -1
- package/bin/plugin/core/BasePlugin.d.ts +4 -3
- package/bin/plugin/core/BasePlugin.d.ts.map +1 -1
- package/bin/plugin/core/BasePlugin.js.map +1 -1
- package/bin/plugin/core/HookRegistry.d.ts +5 -8
- package/bin/plugin/core/HookRegistry.d.ts.map +1 -1
- package/bin/plugin/core/HookRegistry.js +12 -12
- package/bin/plugin/core/HookRegistry.js.map +1 -1
- package/bin/plugin/core/PluginActionFactory.d.ts +6 -3
- package/bin/plugin/core/PluginActionFactory.d.ts.map +1 -1
- package/bin/plugin/core/PluginActionFactory.js.map +1 -1
- package/bin/plugin/core/PluginActionRunner.d.ts +1 -1
- package/bin/plugin/core/PluginActionRunner.d.ts.map +1 -1
- package/bin/plugin/core/PluginCatalog.d.ts +1 -1
- package/bin/plugin/core/PluginCatalog.d.ts.map +1 -1
- package/bin/plugin/core/PluginHttpRoutes.d.ts +1 -1
- package/bin/plugin/core/PluginHttpRoutes.d.ts.map +1 -1
- package/bin/plugin/core/PluginLocalExecution.d.ts +4 -5
- package/bin/plugin/core/PluginLocalExecution.d.ts.map +1 -1
- package/bin/plugin/core/PluginLocalExecution.js +4 -12
- package/bin/plugin/core/PluginLocalExecution.js.map +1 -1
- package/bin/plugin/core/PluginRegistry.d.ts +16 -12
- package/bin/plugin/core/PluginRegistry.d.ts.map +1 -1
- package/bin/plugin/core/PluginRegistry.js +43 -22
- package/bin/plugin/core/PluginRegistry.js.map +1 -1
- package/bin/plugin/core/PluginStateController.d.ts +1 -1
- package/bin/plugin/core/PluginStateController.d.ts.map +1 -1
- package/bin/{agent/remote → remote}/RemoteAgent.d.ts +4 -4
- package/bin/remote/RemoteAgent.d.ts.map +1 -0
- package/bin/{agent/remote → remote}/RemoteAgent.js +3 -3
- package/bin/remote/RemoteAgent.js.map +1 -0
- package/bin/{agent/remote → remote}/RemoteSession.d.ts +9 -11
- package/bin/remote/RemoteSession.d.ts.map +1 -0
- package/bin/{agent/remote → remote}/RemoteSession.js +3 -33
- package/bin/remote/RemoteSession.js.map +1 -0
- package/bin/{agent/remote → remote}/RemoteTransport.d.ts +7 -9
- package/bin/remote/RemoteTransport.d.ts.map +1 -0
- package/bin/remote/RemoteTransport.js.map +1 -0
- package/bin/{agent/remote → remote}/TransportFactory.d.ts +1 -1
- package/bin/remote/TransportFactory.d.ts.map +1 -0
- package/bin/{agent/remote → remote}/TransportFactory.js +2 -2
- package/bin/remote/TransportFactory.js.map +1 -0
- package/bin/{agent/remote → remote}/transports/HttpRemoteAgentTransport.d.ts +8 -9
- package/bin/remote/transports/HttpRemoteAgentTransport.d.ts.map +1 -0
- package/bin/{agent/remote → remote}/transports/HttpRemoteAgentTransport.js +0 -13
- package/bin/remote/transports/HttpRemoteAgentTransport.js.map +1 -0
- package/bin/{rpc/Client.d.ts → remote/transports/RpcClient.d.ts} +15 -22
- package/bin/remote/transports/RpcClient.d.ts.map +1 -0
- package/bin/{rpc/Client.js → remote/transports/RpcClient.js} +2 -13
- package/bin/remote/transports/RpcClient.js.map +1 -0
- package/bin/{agent/remote → remote}/transports/RpcRemoteAgentTransport.d.ts +8 -9
- package/bin/remote/transports/RpcRemoteAgentTransport.d.ts.map +1 -0
- package/bin/{agent/remote → remote}/transports/RpcRemoteAgentTransport.js +1 -4
- package/bin/remote/transports/RpcRemoteAgentTransport.js.map +1 -0
- package/bin/session/DefaultSessionComposer.d.ts +18 -0
- package/bin/session/DefaultSessionComposer.d.ts.map +1 -0
- package/bin/session/DefaultSessionComposer.js +62 -0
- package/bin/session/DefaultSessionComposer.js.map +1 -0
- package/bin/session/Session.d.ts +44 -33
- package/bin/session/Session.d.ts.map +1 -1
- package/bin/session/Session.js +440 -274
- package/bin/session/Session.js.map +1 -1
- package/bin/session/SessionMessages.d.ts +117 -0
- package/bin/session/SessionMessages.d.ts.map +1 -0
- package/bin/session/{recorder/SessionRecorder.js → SessionMessages.js} +194 -284
- package/bin/session/SessionMessages.js.map +1 -0
- package/bin/session/SessionQueue.d.ts +34 -0
- package/bin/session/SessionQueue.d.ts.map +1 -0
- package/bin/session/SessionQueue.js +60 -0
- package/bin/session/SessionQueue.js.map +1 -0
- package/bin/session/SessionState.d.ts +70 -0
- package/bin/session/SessionState.d.ts.map +1 -0
- package/bin/session/SessionState.js +267 -0
- package/bin/session/SessionState.js.map +1 -0
- package/bin/session/SessionSystem.d.ts +15 -0
- package/bin/session/SessionSystem.d.ts.map +1 -0
- package/bin/session/SessionSystem.js +95 -0
- package/bin/session/SessionSystem.js.map +1 -0
- package/bin/session/SessionTurn.d.ts +84 -0
- package/bin/session/SessionTurn.d.ts.map +1 -0
- package/bin/session/SessionTurn.js +588 -0
- package/bin/session/SessionTurn.js.map +1 -0
- package/bin/session/approval/SessionApprovalBroker.d.ts +48 -0
- package/bin/session/approval/SessionApprovalBroker.d.ts.map +1 -0
- package/bin/session/approval/SessionApprovalBroker.js +126 -0
- package/bin/session/approval/SessionApprovalBroker.js.map +1 -0
- package/bin/session/browse/Browse.d.ts.map +1 -1
- package/bin/session/browse/Browse.js +1 -4
- package/bin/session/browse/Browse.js.map +1 -1
- package/bin/session/{recorder → messages}/JsonlSessionMessageStore.d.ts.map +1 -1
- package/bin/session/{recorder → messages}/JsonlSessionMessageStore.js.map +1 -1
- package/bin/session/messages/SessionAssistantMessageWriter.d.ts +62 -0
- package/bin/session/messages/SessionAssistantMessageWriter.d.ts.map +1 -0
- package/bin/session/messages/SessionAssistantMessageWriter.js +287 -0
- package/bin/session/messages/SessionAssistantMessageWriter.js.map +1 -0
- package/bin/session/messages/SessionJsonValue.d.ts +10 -0
- package/bin/session/messages/SessionJsonValue.d.ts.map +1 -0
- package/bin/session/messages/SessionJsonValue.js +23 -0
- package/bin/session/messages/SessionJsonValue.js.map +1 -0
- package/bin/session/{recorder → messages}/SessionMessageCodec.d.ts +4 -1
- package/bin/session/messages/SessionMessageCodec.d.ts.map +1 -0
- package/bin/session/{recorder → messages}/SessionMessageCodec.js +33 -19
- package/bin/session/messages/SessionMessageCodec.js.map +1 -0
- package/bin/session/messages/SessionMessageCompaction.d.ts +22 -0
- package/bin/session/messages/SessionMessageCompaction.d.ts.map +1 -0
- package/bin/session/{recorder/SessionRecorderCompaction.js → messages/SessionMessageCompaction.js} +19 -51
- package/bin/session/messages/SessionMessageCompaction.js.map +1 -0
- package/bin/session/runtime/SessionEventHub.d.ts +1 -8
- package/bin/session/runtime/SessionEventHub.d.ts.map +1 -1
- package/bin/session/runtime/SessionEventHub.js +1 -6
- package/bin/session/runtime/SessionEventHub.js.map +1 -1
- package/bin/session/storage/Metadata.d.ts +23 -5
- package/bin/session/storage/Metadata.d.ts.map +1 -1
- package/bin/session/storage/Metadata.js +32 -29
- package/bin/session/storage/Metadata.js.map +1 -1
- package/bin/session/storage/RuntimeSessionPort.d.ts +5 -10
- package/bin/session/storage/RuntimeSessionPort.d.ts.map +1 -1
- package/bin/session/storage/RuntimeSessionPort.js +2 -4
- package/bin/session/storage/RuntimeSessionPort.js.map +1 -1
- package/bin/types/agent/AgentOptions.d.ts +6 -35
- package/bin/types/agent/AgentOptions.d.ts.map +1 -1
- package/bin/types/agent/AgentState.d.ts +28 -0
- package/bin/types/agent/AgentState.d.ts.map +1 -0
- package/bin/types/agent/AgentState.js +9 -0
- package/bin/types/agent/AgentState.js.map +1 -0
- package/bin/types/agent/SessionActor.d.ts +0 -2
- package/bin/types/agent/SessionActor.d.ts.map +1 -1
- package/bin/types/agent/SessionTypes.d.ts +5 -18
- package/bin/types/agent/SessionTypes.d.ts.map +1 -1
- package/bin/types/executor/SessionRunContext.d.ts +8 -2
- package/bin/types/executor/SessionRunContext.d.ts.map +1 -1
- package/bin/types/executor/SessionRunContext.js +1 -1
- package/bin/types/executor/SessionToolExecutionContext.d.ts +20 -0
- package/bin/types/executor/SessionToolExecutionContext.d.ts.map +1 -0
- package/bin/types/executor/SessionToolExecutionContext.js +10 -0
- package/bin/types/executor/SessionToolExecutionContext.js.map +1 -0
- package/bin/types/plugin/PluginAction.d.ts +10 -1
- package/bin/types/plugin/PluginAction.d.ts.map +1 -1
- package/bin/types/plugin/PluginCommand.d.ts +3 -11
- package/bin/types/plugin/PluginCommand.d.ts.map +1 -1
- package/bin/types/plugin/PluginConfig.d.ts +12 -0
- package/bin/types/plugin/PluginConfig.d.ts.map +1 -0
- package/bin/types/plugin/PluginConfig.js +5 -0
- package/bin/types/plugin/PluginConfig.js.map +1 -0
- package/bin/types/plugin/PluginDefinition.d.ts +10 -3
- package/bin/types/plugin/PluginDefinition.d.ts.map +1 -1
- package/bin/types/plugin/PluginHttp.d.ts +1 -1
- package/bin/types/plugin/PluginHttp.d.ts.map +1 -1
- package/bin/types/plugin/PluginRunContext.d.ts +26 -0
- package/bin/types/plugin/PluginRunContext.d.ts.map +1 -0
- package/bin/types/plugin/PluginRunContext.js +10 -0
- package/bin/types/plugin/PluginRunContext.js.map +1 -0
- package/bin/types/plugin/PluginRuntime.d.ts +9 -3
- package/bin/types/plugin/PluginRuntime.d.ts.map +1 -1
- package/bin/types/plugin/PluginToolRuntime.d.ts +11 -0
- package/bin/types/plugin/PluginToolRuntime.d.ts.map +1 -1
- package/bin/types/rpc/RpcProtocol.d.ts +1 -13
- package/bin/types/rpc/RpcProtocol.d.ts.map +1 -1
- package/bin/types/session/SessionApproval.d.ts +4 -38
- package/bin/types/session/SessionApproval.d.ts.map +1 -1
- package/bin/types/session/SessionApprovalBroker.d.ts +17 -0
- package/bin/types/session/SessionApprovalBroker.d.ts.map +1 -0
- package/bin/types/session/SessionApprovalBroker.js +7 -0
- package/bin/types/session/SessionApprovalBroker.js.map +1 -0
- package/bin/types/session/SessionComposer.d.ts +99 -0
- package/bin/types/session/SessionComposer.d.ts.map +1 -0
- package/bin/types/session/SessionComposer.js +8 -0
- package/bin/types/session/SessionComposer.js.map +1 -0
- package/bin/types/session/SessionLocalState.d.ts +6 -6
- package/bin/types/session/SessionLocalState.d.ts.map +1 -1
- package/bin/types/session/SessionLocalState.js +1 -1
- package/bin/types/session/SessionMessage.d.ts +3 -2
- package/bin/types/session/SessionMessage.d.ts.map +1 -1
- package/bin/types/session/SessionMessages.d.ts +115 -0
- package/bin/types/session/SessionMessages.d.ts.map +1 -0
- package/bin/types/session/SessionMessages.js +7 -0
- package/bin/types/session/SessionMessages.js.map +1 -0
- package/bin/types/session/SessionMutation.d.ts +1 -10
- package/bin/types/session/SessionMutation.d.ts.map +1 -1
- package/bin/types/session/SessionMutation.js.map +1 -1
- package/bin/types/session/SessionOptions.d.ts +8 -23
- package/bin/types/session/SessionOptions.d.ts.map +1 -1
- package/bin/types/session/SessionPort.d.ts +72 -0
- package/bin/types/session/SessionPort.d.ts.map +1 -0
- package/bin/types/session/SessionPort.js +9 -0
- package/bin/types/session/SessionPort.js.map +1 -0
- package/bin/types/session/SessionQueue.d.ts +104 -0
- package/bin/types/session/SessionQueue.d.ts.map +1 -0
- package/bin/types/session/SessionQueue.js +7 -0
- package/bin/types/session/SessionQueue.js.map +1 -0
- package/bin/types/session/SessionState.d.ts +43 -0
- package/bin/types/session/SessionState.d.ts.map +1 -0
- package/bin/types/session/SessionState.js +7 -0
- package/bin/types/session/SessionState.js.map +1 -0
- package/bin/types/session/SessionSystem.d.ts +26 -0
- package/bin/types/session/SessionSystem.d.ts.map +1 -0
- package/bin/types/session/SessionSystem.js +7 -0
- package/bin/types/session/SessionSystem.js.map +1 -0
- package/bin/types/session/SessionTool.d.ts +23 -0
- package/bin/types/session/SessionTool.d.ts.map +1 -0
- package/bin/types/session/SessionTool.js +7 -0
- package/bin/types/session/SessionTool.js.map +1 -0
- package/bin/types/session/SessionTurn.d.ts +52 -0
- package/bin/types/session/SessionTurn.d.ts.map +1 -0
- package/bin/types/session/SessionTurn.js +7 -0
- package/bin/types/session/SessionTurn.js.map +1 -0
- package/package.json +3 -3
- package/scripts/agent-env.test.mjs +4 -18
- package/scripts/agent-ready.test.mjs +33 -2
- package/scripts/agent-session-maintenance.test.mjs +52 -0
- package/scripts/city-model-tool-loop.test.mjs +3 -4
- package/scripts/core-engine-context-compaction.test.mjs +5 -22
- package/scripts/image-plugin-job.test.mjs +4 -6
- package/scripts/plugin-tool-bridge.test.mjs +44 -36
- package/scripts/read-image-tool-bridge.test.mjs +71 -0
- package/scripts/remote-session-reconnect.test.mjs +1 -34
- package/scripts/session-compaction-prompts.test.mjs +1 -49
- package/scripts/session-composer.test.mjs +163 -0
- package/scripts/session-config-turn-boundary.test.mjs +2 -5
- package/scripts/session-list-title.test.mjs +3 -2
- package/scripts/session-messages-error.test.mjs +57 -0
- package/scripts/{session-recorder.test.mjs → session-messages.test.mjs} +131 -90
- package/scripts/session-queue.test.mjs +64 -0
- package/scripts/session-shell-approval.test.mjs +171 -0
- package/scripts/session-system-blocks.test.mjs +10 -10
- package/scripts/session-title-event.test.mjs +1 -0
- package/src/agent/Agent.ts +241 -0
- package/src/agent/AgentContext.ts +92 -0
- package/src/agent/{local/AgentInstructions.ts → AgentInstructions.ts} +0 -11
- package/src/{model/CityModelAdapter.ts → agent/AgentModel.ts} +10 -3
- package/src/agent/{local/services/AgentSessions.ts → AgentSessions.ts} +81 -110
- package/src/agent/AgentState.ts +151 -0
- package/src/config/Paths.ts +0 -91
- package/src/executor/Executor.ts +180 -386
- package/src/executor/README.md +29 -89
- package/src/executor/composer/system/default/DefaultSessionSystemComposer.ts +1 -1
- package/src/executor/composer/system/default/SystemDomain.ts +4 -2
- package/src/executor/composer/system/default/assets/core.prompt.ts +1 -1
- package/src/executor/composer/system/default/assets/core.prompt.ts.txt +15 -2
- package/src/executor/core-engine/CoreEngineRunner.ts +95 -54
- package/src/executor/services/ExecutorRecoveryPolicy.ts +24 -19
- package/src/executor/tools/file/ReadImageToolBridge.ts +79 -0
- package/src/executor/tools/plugin/PluginToolBridge.ts +6 -8
- package/src/executor/tools/plugin/PluginToolDefinition.ts +23 -3
- package/src/executor/types/SessionHistoryMeta.ts +0 -2
- package/src/index.ts +34 -53
- package/src/plugin/core/ActionScheduleExecutor.ts +1 -1
- package/src/plugin/core/ActionScheduleRuntime.ts +1 -1
- package/src/plugin/core/BasePlugin.ts +7 -3
- package/src/plugin/core/HookRegistry.ts +15 -18
- package/src/plugin/core/PluginActionFactory.ts +9 -3
- package/src/plugin/core/PluginActionRunner.ts +1 -1
- package/src/plugin/core/PluginCatalog.ts +1 -1
- package/src/plugin/core/PluginHttpRoutes.ts +1 -1
- package/src/plugin/core/PluginLocalExecution.ts +11 -24
- package/src/plugin/core/PluginRegistry.ts +55 -32
- package/src/plugin/core/PluginStateController.ts +1 -1
- package/src/{agent/remote → remote}/RemoteAgent.ts +4 -4
- package/src/{agent/remote → remote}/RemoteSession.ts +2 -35
- package/src/{agent/remote → remote}/RemoteTransport.ts +0 -3
- package/src/{agent/remote → remote}/TransportFactory.ts +3 -3
- package/src/{agent/remote → remote}/transports/HttpRemoteAgentTransport.ts +1 -23
- package/src/{rpc/Client.ts → remote/transports/RpcClient.ts} +1 -19
- package/src/{agent/remote → remote}/transports/RpcRemoteAgentTransport.ts +2 -10
- package/src/session/DefaultSessionComposer.ts +79 -0
- package/src/session/Session.ts +496 -332
- package/src/session/{recorder/SessionRecorder.ts → SessionMessages.ts} +254 -428
- package/src/session/SessionQueue.ts +86 -0
- package/src/session/SessionState.ts +322 -0
- package/src/session/SessionSystem.ts +117 -0
- package/src/session/SessionTurn.ts +684 -0
- package/src/session/approval/SessionApprovalBroker.ts +164 -0
- package/src/session/browse/Browse.ts +1 -4
- package/src/session/messages/SessionAssistantMessageWriter.ts +345 -0
- package/src/session/messages/SessionJsonValue.ts +25 -0
- package/src/session/{recorder → messages}/SessionMessageCodec.ts +38 -20
- package/src/session/{recorder/SessionRecorderCompaction.ts → messages/SessionMessageCompaction.ts} +30 -69
- package/src/session/runtime/SessionEventHub.ts +1 -14
- package/src/session/storage/Metadata.ts +60 -34
- package/src/session/storage/RuntimeSessionPort.ts +7 -14
- package/src/types/agent/AgentOptions.ts +6 -38
- package/src/types/agent/AgentState.ts +33 -0
- package/src/types/agent/SessionActor.ts +0 -3
- package/src/types/agent/SessionTypes.ts +5 -18
- package/src/types/executor/SessionRunContext.ts +10 -2
- package/src/types/executor/SessionToolExecutionContext.ts +21 -0
- package/src/types/plugin/PluginAction.ts +10 -1
- package/src/types/plugin/PluginCommand.ts +3 -14
- package/src/types/plugin/PluginConfig.ts +13 -0
- package/src/types/plugin/PluginDefinition.ts +13 -6
- package/src/types/plugin/PluginHttp.ts +1 -1
- package/src/types/plugin/PluginRunContext.ts +31 -0
- package/src/types/plugin/PluginRuntime.ts +13 -6
- package/src/types/plugin/PluginToolRuntime.ts +13 -1
- package/src/types/rpc/RpcProtocol.ts +0 -14
- package/src/types/session/SessionApproval.ts +4 -43
- package/src/types/session/SessionApprovalBroker.ts +18 -0
- package/src/types/session/SessionComposer.ts +114 -0
- package/src/types/session/SessionLocalState.ts +6 -6
- package/src/types/session/SessionMessage.ts +3 -2
- package/src/types/session/SessionMessages.ts +127 -0
- package/src/types/session/SessionMutation.ts +0 -11
- package/src/types/session/SessionOptions.ts +8 -40
- package/src/types/session/SessionPort.ts +97 -0
- package/src/types/session/SessionQueue.ts +122 -0
- package/src/types/session/SessionState.ts +47 -0
- package/src/types/session/SessionSystem.ts +27 -0
- package/src/types/session/SessionTool.ts +25 -0
- package/src/types/session/SessionTurn.ts +56 -0
- package/tsconfig.tsbuildinfo +1 -1
- package/bin/agent/local/Agent.d.ts.map +0 -1
- package/bin/agent/local/Agent.js +0 -216
- package/bin/agent/local/Agent.js.map +0 -1
- package/bin/agent/local/AgentInstructions.d.ts.map +0 -1
- package/bin/agent/local/AgentInstructions.js.map +0 -1
- package/bin/agent/local/AgentPluginFactory.d.ts +0 -26
- package/bin/agent/local/AgentPluginFactory.d.ts.map +0 -1
- package/bin/agent/local/AgentPluginFactory.js +0 -33
- package/bin/agent/local/AgentPluginFactory.js.map +0 -1
- package/bin/agent/local/AgentRuntimeAssembly.d.ts +0 -10
- package/bin/agent/local/AgentRuntimeAssembly.d.ts.map +0 -1
- package/bin/agent/local/AgentRuntimeAssembly.js +0 -43
- package/bin/agent/local/AgentRuntimeAssembly.js.map +0 -1
- package/bin/agent/local/ProjectSetup.d.ts.map +0 -1
- package/bin/agent/local/ProjectSetup.js.map +0 -1
- package/bin/agent/local/services/AgentAssemblyService.d.ts +0 -105
- package/bin/agent/local/services/AgentAssemblyService.d.ts.map +0 -1
- package/bin/agent/local/services/AgentAssemblyService.js +0 -184
- package/bin/agent/local/services/AgentAssemblyService.js.map +0 -1
- package/bin/agent/local/services/AgentBackgroundService.d.ts +0 -55
- package/bin/agent/local/services/AgentBackgroundService.d.ts.map +0 -1
- package/bin/agent/local/services/AgentBackgroundService.js +0 -85
- package/bin/agent/local/services/AgentBackgroundService.js.map +0 -1
- package/bin/agent/local/services/AgentSessions.d.ts.map +0 -1
- package/bin/agent/local/services/AgentSessions.js.map +0 -1
- package/bin/agent/remote/RemoteAgent.d.ts.map +0 -1
- package/bin/agent/remote/RemoteAgent.js.map +0 -1
- package/bin/agent/remote/RemoteSession.d.ts.map +0 -1
- package/bin/agent/remote/RemoteSession.js.map +0 -1
- package/bin/agent/remote/RemoteTransport.d.ts.map +0 -1
- package/bin/agent/remote/RemoteTransport.js.map +0 -1
- package/bin/agent/remote/TransportFactory.d.ts.map +0 -1
- package/bin/agent/remote/TransportFactory.js.map +0 -1
- package/bin/agent/remote/transports/HttpRemoteAgentTransport.d.ts.map +0 -1
- package/bin/agent/remote/transports/HttpRemoteAgentTransport.js.map +0 -1
- package/bin/agent/remote/transports/RpcRemoteAgentTransport.d.ts.map +0 -1
- package/bin/agent/remote/transports/RpcRemoteAgentTransport.js.map +0 -1
- package/bin/executor/SessionRunScope.d.ts +0 -68
- package/bin/executor/SessionRunScope.d.ts.map +0 -1
- package/bin/executor/SessionRunScope.js +0 -96
- package/bin/executor/SessionRunScope.js.map +0 -1
- package/bin/executor/composer/compaction/SessionCompactionComposer.d.ts +0 -74
- package/bin/executor/composer/compaction/SessionCompactionComposer.d.ts.map +0 -1
- package/bin/executor/composer/compaction/SessionCompactionComposer.js +0 -9
- package/bin/executor/composer/compaction/SessionCompactionComposer.js.map +0 -1
- package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionComposer.d.ts +0 -27
- package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionComposer.d.ts.map +0 -1
- package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionComposer.js +0 -39
- package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionComposer.js.map +0 -1
- package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionExecutor.d.ts +0 -44
- package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionExecutor.d.ts.map +0 -1
- package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionExecutor.js +0 -218
- package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionExecutor.js.map +0 -1
- package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionFileOperations.d.ts +0 -27
- package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionFileOperations.d.ts.map +0 -1
- package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionFileOperations.js +0 -181
- package/bin/executor/composer/compaction/jsonl/JsonlSessionCompactionFileOperations.js.map +0 -1
- package/bin/executor/composer/context/LocalSessionContextComposer.d.ts +0 -50
- package/bin/executor/composer/context/LocalSessionContextComposer.d.ts.map +0 -1
- package/bin/executor/composer/context/LocalSessionContextComposer.js +0 -108
- package/bin/executor/composer/context/LocalSessionContextComposer.js.map +0 -1
- package/bin/executor/composer/context/SessionContextComposer.d.ts +0 -67
- package/bin/executor/composer/context/SessionContextComposer.d.ts.map +0 -1
- package/bin/executor/composer/context/SessionContextComposer.js +0 -9
- package/bin/executor/composer/context/SessionContextComposer.js.map +0 -1
- package/bin/executor/composer/history/SessionHistoryComposer.d.ts +0 -54
- package/bin/executor/composer/history/SessionHistoryComposer.d.ts.map +0 -1
- package/bin/executor/composer/history/SessionHistoryComposer.js +0 -10
- package/bin/executor/composer/history/SessionHistoryComposer.js.map +0 -1
- package/bin/executor/composer/history/SessionHistoryWriter.d.ts +0 -46
- package/bin/executor/composer/history/SessionHistoryWriter.d.ts.map +0 -1
- package/bin/executor/composer/history/SessionHistoryWriter.js +0 -65
- package/bin/executor/composer/history/SessionHistoryWriter.js.map +0 -1
- package/bin/executor/composer/history/jsonl/JsonlSessionHistoryComposer.d.ts +0 -35
- package/bin/executor/composer/history/jsonl/JsonlSessionHistoryComposer.d.ts.map +0 -1
- package/bin/executor/composer/history/jsonl/JsonlSessionHistoryComposer.js +0 -105
- package/bin/executor/composer/history/jsonl/JsonlSessionHistoryComposer.js.map +0 -1
- package/bin/executor/messages/AssistantResultPersistence.d.ts +0 -66
- package/bin/executor/messages/AssistantResultPersistence.d.ts.map +0 -1
- package/bin/executor/messages/AssistantResultPersistence.js +0 -44
- package/bin/executor/messages/AssistantResultPersistence.js.map +0 -1
- package/bin/executor/services/ExecutorInflightService.d.ts +0 -34
- package/bin/executor/services/ExecutorInflightService.d.ts.map +0 -1
- package/bin/executor/services/ExecutorInflightService.js +0 -73
- package/bin/executor/services/ExecutorInflightService.js.map +0 -1
- package/bin/executor/store/history/SessionHistoryStore.d.ts +0 -140
- package/bin/executor/store/history/SessionHistoryStore.d.ts.map +0 -1
- package/bin/executor/store/history/SessionHistoryStore.js +0 -10
- package/bin/executor/store/history/SessionHistoryStore.js.map +0 -1
- package/bin/executor/store/history/jsonl/JsonlSessionHistoryStore.d.ts +0 -116
- package/bin/executor/store/history/jsonl/JsonlSessionHistoryStore.d.ts.map +0 -1
- package/bin/executor/store/history/jsonl/JsonlSessionHistoryStore.js +0 -709
- package/bin/executor/store/history/jsonl/JsonlSessionHistoryStore.js.map +0 -1
- package/bin/executor/types/SessionHistoryPaths.d.ts +0 -34
- package/bin/executor/types/SessionHistoryPaths.d.ts.map +0 -1
- package/bin/executor/types/SessionHistoryPaths.js +0 -2
- package/bin/executor/types/SessionHistoryPaths.js.map +0 -1
- package/bin/model/CityModelAdapter.d.ts.map +0 -1
- package/bin/model/CityModelAdapter.js.map +0 -1
- package/bin/rpc/Client.d.ts.map +0 -1
- package/bin/rpc/Client.js.map +0 -1
- package/bin/session/SessionSystemBuilder.d.ts +0 -107
- package/bin/session/SessionSystemBuilder.d.ts.map +0 -1
- package/bin/session/SessionSystemBuilder.js +0 -148
- package/bin/session/SessionSystemBuilder.js.map +0 -1
- package/bin/session/recorder/SessionMessageCodec.d.ts.map +0 -1
- package/bin/session/recorder/SessionMessageCodec.js.map +0 -1
- package/bin/session/recorder/SessionRecorder.d.ts +0 -217
- package/bin/session/recorder/SessionRecorder.d.ts.map +0 -1
- package/bin/session/recorder/SessionRecorder.js.map +0 -1
- package/bin/session/recorder/SessionRecorderCompaction.d.ts +0 -18
- package/bin/session/recorder/SessionRecorderCompaction.d.ts.map +0 -1
- package/bin/session/recorder/SessionRecorderCompaction.js.map +0 -1
- package/bin/session/recorder/SessionRecorderHistoryStore.d.ts +0 -66
- package/bin/session/recorder/SessionRecorderHistoryStore.d.ts.map +0 -1
- package/bin/session/recorder/SessionRecorderHistoryStore.js +0 -190
- package/bin/session/recorder/SessionRecorderHistoryStore.js.map +0 -1
- package/bin/session/runtime/SessionPromptRuntime.d.ts +0 -112
- package/bin/session/runtime/SessionPromptRuntime.d.ts.map +0 -1
- package/bin/session/runtime/SessionPromptRuntime.js +0 -357
- package/bin/session/runtime/SessionPromptRuntime.js.map +0 -1
- package/bin/session/services/SessionStateService.d.ts +0 -187
- package/bin/session/services/SessionStateService.d.ts.map +0 -1
- package/bin/session/services/SessionStateService.js +0 -467
- package/bin/session/services/SessionStateService.js.map +0 -1
- package/bin/session/services/SessionTurnService.d.ts +0 -90
- package/bin/session/services/SessionTurnService.d.ts.map +0 -1
- package/bin/session/services/SessionTurnService.js +0 -293
- package/bin/session/services/SessionTurnService.js.map +0 -1
- package/bin/session/services/SessionViewService.d.ts +0 -114
- package/bin/session/services/SessionViewService.d.ts.map +0 -1
- package/bin/session/services/SessionViewService.js +0 -204
- package/bin/session/services/SessionViewService.js.map +0 -1
- package/bin/session/storage/Persistence.d.ts +0 -73
- package/bin/session/storage/Persistence.d.ts.map +0 -1
- package/bin/session/storage/Persistence.js +0 -63
- package/bin/session/storage/Persistence.js.map +0 -1
- package/bin/types/agent/AgentRuntimeAssembly.d.ts +0 -72
- package/bin/types/agent/AgentRuntimeAssembly.d.ts.map +0 -1
- package/bin/types/agent/AgentRuntimeAssembly.js +0 -10
- package/bin/types/agent/AgentRuntimeAssembly.js.map +0 -1
- package/bin/types/runtime/agent/AgentContext.d.ts +0 -306
- package/bin/types/runtime/agent/AgentContext.d.ts.map +0 -1
- package/bin/types/runtime/agent/AgentContext.js +0 -128
- package/bin/types/runtime/agent/AgentContext.js.map +0 -1
- package/bin/types/session/SessionComposerOptions.d.ts +0 -90
- package/bin/types/session/SessionComposerOptions.d.ts.map +0 -1
- package/bin/types/session/SessionComposerOptions.js +0 -10
- package/bin/types/session/SessionComposerOptions.js.map +0 -1
- package/bin/types/session/SessionQueueCommand.d.ts +0 -68
- package/bin/types/session/SessionQueueCommand.d.ts.map +0 -1
- package/bin/types/session/SessionQueueCommand.js +0 -10
- package/bin/types/session/SessionQueueCommand.js.map +0 -1
- package/scripts/session-action-message.test.mjs +0 -410
- package/scripts/session-compaction-context-window.test.mjs +0 -96
- package/scripts/session-history-inflight.test.mjs +0 -146
- package/scripts/session-history-writer-error.test.mjs +0 -57
- package/scripts/session-prompt-runtime.test.mjs +0 -390
- package/src/agent/local/Agent.ts +0 -250
- package/src/agent/local/AgentPluginFactory.ts +0 -51
- package/src/agent/local/AgentRuntimeAssembly.ts +0 -65
- package/src/agent/local/services/AgentAssemblyService.ts +0 -307
- package/src/agent/local/services/AgentBackgroundService.ts +0 -115
- package/src/executor/SessionRunScope.ts +0 -122
- package/src/executor/composer/compaction/SessionCompactionComposer.ts +0 -84
- package/src/executor/composer/compaction/jsonl/JsonlSessionCompactionComposer.ts +0 -51
- package/src/executor/composer/compaction/jsonl/JsonlSessionCompactionExecutor.ts +0 -294
- package/src/executor/composer/compaction/jsonl/JsonlSessionCompactionFileOperations.ts +0 -197
- package/src/executor/composer/context/LocalSessionContextComposer.ts +0 -175
- package/src/executor/composer/context/SessionContextComposer.ts +0 -83
- package/src/executor/composer/history/SessionHistoryComposer.ts +0 -62
- package/src/executor/composer/history/SessionHistoryWriter.ts +0 -100
- package/src/executor/composer/history/jsonl/JsonlSessionHistoryComposer.ts +0 -133
- package/src/executor/messages/AssistantResultPersistence.ts +0 -106
- package/src/executor/services/ExecutorInflightService.ts +0 -95
- package/src/executor/store/history/SessionHistoryStore.ts +0 -172
- package/src/executor/store/history/jsonl/JsonlSessionHistoryStore.ts +0 -879
- package/src/executor/types/SessionHistoryPaths.ts +0 -38
- package/src/session/SessionSystemBuilder.ts +0 -262
- package/src/session/recorder/SessionRecorderHistoryStore.ts +0 -256
- package/src/session/runtime/SessionPromptRuntime.ts +0 -518
- package/src/session/services/SessionStateService.ts +0 -628
- package/src/session/services/SessionTurnService.ts +0 -368
- package/src/session/services/SessionViewService.ts +0 -335
- package/src/session/storage/Persistence.ts +0 -137
- package/src/types/agent/AgentRuntimeAssembly.ts +0 -74
- package/src/types/runtime/agent/AgentContext.ts +0 -387
- package/src/types/session/SessionComposerOptions.ts +0 -107
- package/src/types/session/SessionQueueCommand.ts +0 -78
- /package/bin/{agent/local → config}/ProjectSetup.d.ts +0 -0
- /package/bin/{agent/remote → remote}/RemoteTransport.js +0 -0
- /package/bin/session/{recorder → messages}/JsonlSessionMessageStore.d.ts +0 -0
- /package/bin/session/{recorder → messages}/JsonlSessionMessageStore.js +0 -0
- /package/src/{agent/local → config}/ProjectSetup.ts +0 -0
- /package/src/session/{recorder → messages}/JsonlSessionMessageStore.ts +0 -0
|
@@ -0,0 +1,588 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* SessionTurn:Session 输入队列与 Turn 生命周期的唯一所有者。
|
|
3
|
+
*
|
|
4
|
+
* 关键点(中文)
|
|
5
|
+
* - `prompt()` 是唯一输入入口,内部决定并入当前 turn 还是排到下一 turn。
|
|
6
|
+
* - 不把调度逻辑塞进 Executor;Executor 继续只负责单次执行。
|
|
7
|
+
* - 这里不暴露历史或消息模型,只编排 prompt 队列与 turn 生命周期。
|
|
8
|
+
*/
|
|
9
|
+
import { nanoid } from "nanoid";
|
|
10
|
+
import { extractTextFromParts, extractTextFromUiMessage } from "../executor/messages/UIMessageTransformer.js";
|
|
11
|
+
import { isAgentSessionPromptInputEmpty } from "../types/sdk/AgentSessionPrompt.js";
|
|
12
|
+
import { from_ui_assistant_parts } from "../session/messages/SessionMessageCodec.js";
|
|
13
|
+
import { generateId } from "../utils/Id.js";
|
|
14
|
+
import { SessionQueue } from "../session/SessionQueue.js";
|
|
15
|
+
const TURN_STOPPED_MESSAGE = "Turn stopped";
|
|
16
|
+
const QUEUED_PROMPT_CANCELLED_MESSAGE = "Prompt cancelled because session was stopped";
|
|
17
|
+
/**
|
|
18
|
+
* Session 输入队列与 Turn 编排器。
|
|
19
|
+
*/
|
|
20
|
+
export class SessionTurn {
|
|
21
|
+
session_id;
|
|
22
|
+
project_root;
|
|
23
|
+
executor;
|
|
24
|
+
state;
|
|
25
|
+
messages;
|
|
26
|
+
events;
|
|
27
|
+
approvals;
|
|
28
|
+
apply_command;
|
|
29
|
+
queue = new SessionQueue();
|
|
30
|
+
processing_promise = null;
|
|
31
|
+
active_turn = null;
|
|
32
|
+
active_run_context = null;
|
|
33
|
+
request_active_history_reload = null;
|
|
34
|
+
constructor(options) {
|
|
35
|
+
this.session_id = String(options.session_id || "").trim();
|
|
36
|
+
this.project_root = String(options.project_root || "").trim();
|
|
37
|
+
this.executor = options.executor;
|
|
38
|
+
this.state = options.state;
|
|
39
|
+
this.messages = options.messages;
|
|
40
|
+
this.events = options.events;
|
|
41
|
+
this.approvals = options.approvals;
|
|
42
|
+
this.apply_command = options.apply_command;
|
|
43
|
+
if (!this.session_id) {
|
|
44
|
+
throw new Error("SessionTurn requires a non-empty sessionId");
|
|
45
|
+
}
|
|
46
|
+
if (!this.project_root) {
|
|
47
|
+
throw new Error("SessionTurn requires a non-empty project_root");
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* 追加一条新的 prompt。
|
|
52
|
+
*/
|
|
53
|
+
async prompt(input) {
|
|
54
|
+
if (isAgentSessionPromptInputEmpty(input)) {
|
|
55
|
+
throw new Error("session.prompt requires a non-empty query");
|
|
56
|
+
}
|
|
57
|
+
await this.state.ensure_runnable();
|
|
58
|
+
const handle_promise = this.queue.enqueue_prompt(input);
|
|
59
|
+
this.ensure_processing();
|
|
60
|
+
return await handle_promise;
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* 把一次已成功创建的 command 加入统一输入队列。
|
|
64
|
+
*/
|
|
65
|
+
enqueue_command(command) {
|
|
66
|
+
this.queue.enqueue_command(command);
|
|
67
|
+
}
|
|
68
|
+
/** 把显式历史压缩加入统一输入队列。 */
|
|
69
|
+
async compact() {
|
|
70
|
+
await this.state.ensure_runnable();
|
|
71
|
+
this.enqueue_command({ type: "compact", command_id: generateId() });
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* 判断是否存在等待并入下一 Session step 的 prompt。
|
|
75
|
+
*/
|
|
76
|
+
has_pending_prompt() {
|
|
77
|
+
return this.queue.has_prompt();
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* 判断是否存在等待在下一 Session step 检查点执行的 command。
|
|
81
|
+
*/
|
|
82
|
+
has_pending_command() {
|
|
83
|
+
return this.queue.has_command();
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* 返回当前 actor prompt 调度器是否仍处于活跃态。
|
|
87
|
+
*
|
|
88
|
+
* 说明(中文)
|
|
89
|
+
* - 只要还有排队 prompt,或处理循环尚未结束,就视为活跃。
|
|
90
|
+
* - Session 会用它阻止内部 direct execution 与 actor 模式并发混用。
|
|
91
|
+
*/
|
|
92
|
+
is_active() {
|
|
93
|
+
return this.processing_promise !== null || this.has_pending_prompt();
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* 停止当前 turn,并取消尚未被吸收的排队 prompt。
|
|
97
|
+
*/
|
|
98
|
+
stop() {
|
|
99
|
+
const active_turn = this.active_turn;
|
|
100
|
+
const cancelled_queued_prompts = this.cancel_queued_prompts();
|
|
101
|
+
let executor_stop_requested = false;
|
|
102
|
+
if (active_turn) {
|
|
103
|
+
if (!active_turn.abort_controller.signal.aborted) {
|
|
104
|
+
active_turn.abort_controller.abort(new Error(TURN_STOPPED_MESSAGE));
|
|
105
|
+
}
|
|
106
|
+
executor_stop_requested = this.executor.stop();
|
|
107
|
+
}
|
|
108
|
+
const stopped = Boolean(active_turn ||
|
|
109
|
+
executor_stop_requested ||
|
|
110
|
+
cancelled_queued_prompts > 0);
|
|
111
|
+
return {
|
|
112
|
+
stopped,
|
|
113
|
+
...(active_turn ? { turnId: active_turn.turn_id } : {}),
|
|
114
|
+
cancelledQueuedPrompts: cancelled_queued_prompts,
|
|
115
|
+
reason: stopped ? "stopped" : "idle",
|
|
116
|
+
};
|
|
117
|
+
}
|
|
118
|
+
ensure_processing() {
|
|
119
|
+
if (this.processing_promise)
|
|
120
|
+
return;
|
|
121
|
+
this.processing_promise = this.process_loop().finally(() => {
|
|
122
|
+
this.processing_promise = null;
|
|
123
|
+
if (this.has_pending_prompt()) {
|
|
124
|
+
this.ensure_processing();
|
|
125
|
+
}
|
|
126
|
+
});
|
|
127
|
+
}
|
|
128
|
+
async process_loop() {
|
|
129
|
+
while (this.has_pending_prompt()) {
|
|
130
|
+
const next = this.queue.take_next_prompt();
|
|
131
|
+
if (!next)
|
|
132
|
+
break;
|
|
133
|
+
const current = next.prompt;
|
|
134
|
+
const turn_id = `turn:${this.session_id}:${Date.now()}:${nanoid(6)}`;
|
|
135
|
+
const active_turn = create_active_session_turn_state(turn_id);
|
|
136
|
+
this.active_turn = active_turn;
|
|
137
|
+
this.events.publish({
|
|
138
|
+
mutation_id: nanoid(),
|
|
139
|
+
variant: "turn",
|
|
140
|
+
type: "start",
|
|
141
|
+
session_id: this.session_id,
|
|
142
|
+
turn_id,
|
|
143
|
+
status: "running",
|
|
144
|
+
created_at: Date.now(),
|
|
145
|
+
});
|
|
146
|
+
current.deferred_handle.resolve(create_turn_handle(active_turn));
|
|
147
|
+
try {
|
|
148
|
+
await this.execute_commands(next.commands, active_turn);
|
|
149
|
+
await this.persist_prompt_message(current.input, turn_id, "prompt");
|
|
150
|
+
const result = await this.execute_prompt_turn({
|
|
151
|
+
turn_id,
|
|
152
|
+
prompt_input: current.input,
|
|
153
|
+
on_step_merge: async () => {
|
|
154
|
+
return await this.drain_queued_inputs(active_turn);
|
|
155
|
+
},
|
|
156
|
+
abort_signal: active_turn.abort_controller.signal,
|
|
157
|
+
});
|
|
158
|
+
const stopped = active_turn.abort_controller.signal.aborted;
|
|
159
|
+
const final_result = {
|
|
160
|
+
turnId: turn_id,
|
|
161
|
+
text: result.text,
|
|
162
|
+
success: stopped ? false : result.success,
|
|
163
|
+
...(result.assistantMessage
|
|
164
|
+
? { assistantMessage: result.assistantMessage }
|
|
165
|
+
: {}),
|
|
166
|
+
...(stopped
|
|
167
|
+
? { error: TURN_STOPPED_MESSAGE }
|
|
168
|
+
: result.error ? { error: result.error } : {}),
|
|
169
|
+
};
|
|
170
|
+
active_turn.result = final_result;
|
|
171
|
+
this.events.publish({
|
|
172
|
+
mutation_id: nanoid(),
|
|
173
|
+
variant: "turn",
|
|
174
|
+
type: "finish",
|
|
175
|
+
session_id: this.session_id,
|
|
176
|
+
turn_id,
|
|
177
|
+
status: stopped ? "stopped" : final_result.success ? "completed" : "failed",
|
|
178
|
+
created_at: Date.now(),
|
|
179
|
+
text: final_result.text,
|
|
180
|
+
...(final_result.error ? { error: final_result.error } : {}),
|
|
181
|
+
});
|
|
182
|
+
active_turn.deferred_finished.resolve(final_result);
|
|
183
|
+
}
|
|
184
|
+
catch (error) {
|
|
185
|
+
const message = active_turn.abort_controller.signal.aborted
|
|
186
|
+
? TURN_STOPPED_MESSAGE
|
|
187
|
+
: error instanceof Error ? error.message : String(error);
|
|
188
|
+
const final_result = {
|
|
189
|
+
turnId: turn_id,
|
|
190
|
+
text: "",
|
|
191
|
+
success: false,
|
|
192
|
+
assistantMessage: build_prompt_runtime_error_assistant_message({
|
|
193
|
+
session_id: this.session_id,
|
|
194
|
+
message,
|
|
195
|
+
}),
|
|
196
|
+
error: message,
|
|
197
|
+
};
|
|
198
|
+
active_turn.result = final_result;
|
|
199
|
+
if (message !== TURN_STOPPED_MESSAGE) {
|
|
200
|
+
try {
|
|
201
|
+
await this.messages.append_error_message({
|
|
202
|
+
scope: "turn",
|
|
203
|
+
turn_id,
|
|
204
|
+
code: "turn_execution_failed",
|
|
205
|
+
message,
|
|
206
|
+
recoverable: true,
|
|
207
|
+
});
|
|
208
|
+
}
|
|
209
|
+
catch {
|
|
210
|
+
// Error Message 写入失败不能阻止 turn handle 收口。
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
this.events.publish({
|
|
214
|
+
mutation_id: nanoid(),
|
|
215
|
+
variant: "turn",
|
|
216
|
+
type: "finish",
|
|
217
|
+
session_id: this.session_id,
|
|
218
|
+
turn_id,
|
|
219
|
+
status: active_turn.abort_controller.signal.aborted ? "stopped" : "failed",
|
|
220
|
+
created_at: Date.now(),
|
|
221
|
+
text: "",
|
|
222
|
+
error: message,
|
|
223
|
+
});
|
|
224
|
+
active_turn.deferred_finished.resolve(final_result);
|
|
225
|
+
}
|
|
226
|
+
finally {
|
|
227
|
+
if (this.active_turn === active_turn) {
|
|
228
|
+
this.active_turn = null;
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
cancel_queued_prompts() {
|
|
234
|
+
const cancelled = this.queue.cancel_prompts();
|
|
235
|
+
if (cancelled.length <= 0)
|
|
236
|
+
return 0;
|
|
237
|
+
for (const item of cancelled) {
|
|
238
|
+
const turn_id = `turn:${this.session_id}:cancelled:${Date.now()}:${nanoid(6)}`;
|
|
239
|
+
const cancelled_turn = create_active_session_turn_state(turn_id);
|
|
240
|
+
const final_result = {
|
|
241
|
+
turnId: turn_id,
|
|
242
|
+
text: "",
|
|
243
|
+
success: false,
|
|
244
|
+
assistantMessage: build_prompt_runtime_error_assistant_message({
|
|
245
|
+
session_id: this.session_id,
|
|
246
|
+
message: QUEUED_PROMPT_CANCELLED_MESSAGE,
|
|
247
|
+
}),
|
|
248
|
+
error: QUEUED_PROMPT_CANCELLED_MESSAGE,
|
|
249
|
+
};
|
|
250
|
+
cancelled_turn.result = final_result;
|
|
251
|
+
cancelled_turn.deferred_finished.resolve(final_result);
|
|
252
|
+
this.events.publish({
|
|
253
|
+
mutation_id: nanoid(),
|
|
254
|
+
variant: "turn",
|
|
255
|
+
type: "start",
|
|
256
|
+
session_id: this.session_id,
|
|
257
|
+
turn_id,
|
|
258
|
+
status: "running",
|
|
259
|
+
created_at: Date.now(),
|
|
260
|
+
});
|
|
261
|
+
this.events.publish({
|
|
262
|
+
mutation_id: nanoid(),
|
|
263
|
+
variant: "turn",
|
|
264
|
+
type: "finish",
|
|
265
|
+
session_id: this.session_id,
|
|
266
|
+
turn_id,
|
|
267
|
+
status: "failed",
|
|
268
|
+
created_at: Date.now(),
|
|
269
|
+
text: "",
|
|
270
|
+
error: QUEUED_PROMPT_CANCELLED_MESSAGE,
|
|
271
|
+
});
|
|
272
|
+
item.deferred_handle.resolve(create_turn_handle(cancelled_turn));
|
|
273
|
+
}
|
|
274
|
+
return cancelled.length;
|
|
275
|
+
}
|
|
276
|
+
/**
|
|
277
|
+
* 在下一 Session step 检查点按入队顺序提交配置并持久化 steer。
|
|
278
|
+
*/
|
|
279
|
+
async drain_queued_inputs(active_turn) {
|
|
280
|
+
const drained = this.queue.drain();
|
|
281
|
+
if (drained.length <= 0)
|
|
282
|
+
return [];
|
|
283
|
+
const merged = [];
|
|
284
|
+
for (let index = 0; index < drained.length; index += 1) {
|
|
285
|
+
const item = drained[index];
|
|
286
|
+
if (item.type !== "prompt") {
|
|
287
|
+
try {
|
|
288
|
+
await this.execute_queue_command(item, active_turn.turn_id);
|
|
289
|
+
}
|
|
290
|
+
catch {
|
|
291
|
+
// command 自己负责失败观测;单条失败不能吞掉后续 steer 或 command。
|
|
292
|
+
}
|
|
293
|
+
continue;
|
|
294
|
+
}
|
|
295
|
+
try {
|
|
296
|
+
const message = await this.persist_prompt_message(item.input, active_turn.turn_id, "steer");
|
|
297
|
+
item.deferred_handle.resolve(create_turn_handle(active_turn));
|
|
298
|
+
merged.push(message);
|
|
299
|
+
}
|
|
300
|
+
catch {
|
|
301
|
+
// 关键点(中文):若某条消息持久化失败,把未处理部分重新放回队列头部,避免静默丢失。
|
|
302
|
+
const remaining = drained.slice(index);
|
|
303
|
+
this.queue.restore_front(remaining);
|
|
304
|
+
break;
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
return merged;
|
|
308
|
+
}
|
|
309
|
+
/**
|
|
310
|
+
* 执行一组已经从统一队列截取的 command。
|
|
311
|
+
*/
|
|
312
|
+
async execute_commands(commands, active_turn) {
|
|
313
|
+
if (commands.length <= 0)
|
|
314
|
+
return;
|
|
315
|
+
for (const command of commands) {
|
|
316
|
+
try {
|
|
317
|
+
await this.execute_queue_command(command, active_turn.turn_id);
|
|
318
|
+
}
|
|
319
|
+
catch {
|
|
320
|
+
// command 自己负责失败观测;单条失败不能阻断当前 prompt。
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
/** 在 Step 检查点解释并提交一条领域命令。 */
|
|
325
|
+
async execute_queue_command(command, turn_id) {
|
|
326
|
+
if (command.type !== "compact") {
|
|
327
|
+
await this.apply_command(command, turn_id);
|
|
328
|
+
return;
|
|
329
|
+
}
|
|
330
|
+
const run_context = this.active_run_context ||
|
|
331
|
+
this.create_compaction_run_context(turn_id);
|
|
332
|
+
const result = await this.executor.compact_history(run_context);
|
|
333
|
+
if (result.compacted &&
|
|
334
|
+
this.active_run_context !== null &&
|
|
335
|
+
run_context === this.active_run_context) {
|
|
336
|
+
this.request_active_history_reload?.();
|
|
337
|
+
}
|
|
338
|
+
if (result.reason === "nothing_to_compact") {
|
|
339
|
+
await this.persist_action_event({
|
|
340
|
+
type: "action",
|
|
341
|
+
id: `compacting:${this.session_id}:${command.command_id}`,
|
|
342
|
+
title: "Session messages already compact",
|
|
343
|
+
description: "The Session has no active messages to compact.",
|
|
344
|
+
state: "completed",
|
|
345
|
+
metadata: {
|
|
346
|
+
v: 1,
|
|
347
|
+
ts: Date.now(),
|
|
348
|
+
sessionId: this.session_id,
|
|
349
|
+
turnId: turn_id,
|
|
350
|
+
},
|
|
351
|
+
});
|
|
352
|
+
}
|
|
353
|
+
}
|
|
354
|
+
/** 执行一个 Turn 内的模型与 Tool Step Loop。 */
|
|
355
|
+
async execute_prompt_turn(input) {
|
|
356
|
+
const assistant_writer_ref = { current: null };
|
|
357
|
+
let assistant_writer_task = null;
|
|
358
|
+
let assistant_segment_index = 0;
|
|
359
|
+
let history_reload_requested = false;
|
|
360
|
+
const ensure_assistant_writer = async () => {
|
|
361
|
+
if (assistant_writer_ref.current)
|
|
362
|
+
return assistant_writer_ref.current;
|
|
363
|
+
if (assistant_writer_task)
|
|
364
|
+
return await assistant_writer_task;
|
|
365
|
+
assistant_segment_index += 1;
|
|
366
|
+
assistant_writer_task = this.messages.open_assistant_message({
|
|
367
|
+
turn_id: input.turn_id,
|
|
368
|
+
segment_index: assistant_segment_index,
|
|
369
|
+
});
|
|
370
|
+
try {
|
|
371
|
+
assistant_writer_ref.current = await assistant_writer_task;
|
|
372
|
+
return assistant_writer_ref.current;
|
|
373
|
+
}
|
|
374
|
+
finally {
|
|
375
|
+
assistant_writer_task = null;
|
|
376
|
+
}
|
|
377
|
+
};
|
|
378
|
+
const run_context = {
|
|
379
|
+
turnId: input.turn_id,
|
|
380
|
+
sessionId: this.session_id,
|
|
381
|
+
projectRoot: this.project_root,
|
|
382
|
+
onStepCallback: async () => {
|
|
383
|
+
if (this.has_pending_command() && assistant_writer_ref.current) {
|
|
384
|
+
await assistant_writer_ref.current.complete();
|
|
385
|
+
assistant_writer_ref.current = null;
|
|
386
|
+
}
|
|
387
|
+
const merged = await input.on_step_merge();
|
|
388
|
+
if (merged.length > 0 && assistant_writer_ref.current) {
|
|
389
|
+
await assistant_writer_ref.current.complete();
|
|
390
|
+
assistant_writer_ref.current = null;
|
|
391
|
+
}
|
|
392
|
+
return merged;
|
|
393
|
+
},
|
|
394
|
+
hasPendingStepInput: () => this.has_pending_prompt(),
|
|
395
|
+
consume_history_reload: () => {
|
|
396
|
+
const requested = history_reload_requested;
|
|
397
|
+
history_reload_requested = false;
|
|
398
|
+
return requested;
|
|
399
|
+
},
|
|
400
|
+
onUiMessageChunkCallback: async (chunk) => {
|
|
401
|
+
if (!is_assistant_content_chunk(chunk.type))
|
|
402
|
+
return;
|
|
403
|
+
const writer = await ensure_assistant_writer();
|
|
404
|
+
await writer.apply_chunk(chunk);
|
|
405
|
+
},
|
|
406
|
+
on_tool_input_ready: async (tool_input) => {
|
|
407
|
+
const writer = await ensure_assistant_writer();
|
|
408
|
+
await writer.prepare_tool_input(tool_input);
|
|
409
|
+
},
|
|
410
|
+
shell_approval_gateway: this.approvals,
|
|
411
|
+
onActionCallback: async (event) => {
|
|
412
|
+
await this.persist_action_event(event);
|
|
413
|
+
},
|
|
414
|
+
injectedUserMessages: [],
|
|
415
|
+
deferredPersistedUserMessages: [],
|
|
416
|
+
pendingAssistantFileParts: [],
|
|
417
|
+
...(input.abort_signal ? { abortSignal: input.abort_signal } : {}),
|
|
418
|
+
};
|
|
419
|
+
const query = input.prompt_input.query;
|
|
420
|
+
const executor_query = typeof query === "string"
|
|
421
|
+
? query
|
|
422
|
+
: extractTextFromParts(query);
|
|
423
|
+
this.active_run_context = run_context;
|
|
424
|
+
this.request_active_history_reload = () => {
|
|
425
|
+
history_reload_requested = true;
|
|
426
|
+
};
|
|
427
|
+
let result;
|
|
428
|
+
try {
|
|
429
|
+
result = await this.executor.run({
|
|
430
|
+
query: executor_query,
|
|
431
|
+
runContext: run_context,
|
|
432
|
+
});
|
|
433
|
+
}
|
|
434
|
+
finally {
|
|
435
|
+
if (this.active_run_context === run_context) {
|
|
436
|
+
this.active_run_context = null;
|
|
437
|
+
this.request_active_history_reload = null;
|
|
438
|
+
}
|
|
439
|
+
}
|
|
440
|
+
const final_assistant_parts = result.assistantMessage
|
|
441
|
+
? from_ui_assistant_parts(result.assistantMessage.parts)
|
|
442
|
+
: [];
|
|
443
|
+
const final_assistant_writer = assistant_writer_ref.current;
|
|
444
|
+
if (final_assistant_writer) {
|
|
445
|
+
for (const part of final_assistant_parts) {
|
|
446
|
+
if (part.type === "file") {
|
|
447
|
+
await final_assistant_writer.append_file_part(part);
|
|
448
|
+
}
|
|
449
|
+
}
|
|
450
|
+
if (input.abort_signal?.aborted) {
|
|
451
|
+
await final_assistant_writer.stop();
|
|
452
|
+
}
|
|
453
|
+
else if (result.success) {
|
|
454
|
+
await final_assistant_writer.complete();
|
|
455
|
+
}
|
|
456
|
+
else {
|
|
457
|
+
await final_assistant_writer.fail(result.error);
|
|
458
|
+
}
|
|
459
|
+
}
|
|
460
|
+
else if (result.assistantMessage && final_assistant_parts.length > 0) {
|
|
461
|
+
assistant_segment_index += 1;
|
|
462
|
+
const fallback_writer = await this.messages.open_assistant_message({
|
|
463
|
+
turn_id: input.turn_id,
|
|
464
|
+
segment_index: assistant_segment_index,
|
|
465
|
+
});
|
|
466
|
+
for (const part of final_assistant_parts) {
|
|
467
|
+
await fallback_writer.upsert_part(part);
|
|
468
|
+
}
|
|
469
|
+
if (result.success)
|
|
470
|
+
await fallback_writer.complete();
|
|
471
|
+
else
|
|
472
|
+
await fallback_writer.fail(result.error);
|
|
473
|
+
}
|
|
474
|
+
if (!result.success && !input.abort_signal?.aborted && result.error) {
|
|
475
|
+
await this.messages.append_error_message({
|
|
476
|
+
scope: "turn",
|
|
477
|
+
turn_id: input.turn_id,
|
|
478
|
+
code: "turn_execution_failed",
|
|
479
|
+
message: result.error,
|
|
480
|
+
recoverable: true,
|
|
481
|
+
});
|
|
482
|
+
}
|
|
483
|
+
await this.state.touch_metadata();
|
|
484
|
+
const deferred_count = await this.messages.append_deferred_user_messages(result.deferredPersistedUserMessages);
|
|
485
|
+
if (deferred_count > 0)
|
|
486
|
+
await this.state.touch_metadata();
|
|
487
|
+
if (result.compact_required) {
|
|
488
|
+
await this.executor.compact_history(run_context);
|
|
489
|
+
}
|
|
490
|
+
return {
|
|
491
|
+
text: result.assistantMessage
|
|
492
|
+
? extractTextFromUiMessage(result.assistantMessage)
|
|
493
|
+
: "",
|
|
494
|
+
success: result.success,
|
|
495
|
+
...(result.assistantMessage
|
|
496
|
+
? { assistantMessage: result.assistantMessage }
|
|
497
|
+
: {}),
|
|
498
|
+
...(result.error ? { error: result.error } : {}),
|
|
499
|
+
};
|
|
500
|
+
}
|
|
501
|
+
/** 为 Turn 开始前的 compact 命令创建最小运行上下文。 */
|
|
502
|
+
create_compaction_run_context(turn_id) {
|
|
503
|
+
return {
|
|
504
|
+
turnId: turn_id,
|
|
505
|
+
sessionId: this.session_id,
|
|
506
|
+
projectRoot: this.project_root,
|
|
507
|
+
onActionCallback: async (event) => {
|
|
508
|
+
await this.persist_action_event(event);
|
|
509
|
+
},
|
|
510
|
+
injectedUserMessages: [],
|
|
511
|
+
deferredPersistedUserMessages: [],
|
|
512
|
+
pendingAssistantFileParts: [],
|
|
513
|
+
};
|
|
514
|
+
}
|
|
515
|
+
/** 持久化本轮 User 输入,并同步刷新标题与 metadata。 */
|
|
516
|
+
async persist_prompt_message(prompt, turn_id, input_type) {
|
|
517
|
+
const message = await this.messages.append_prompt_message({
|
|
518
|
+
project_root: this.project_root,
|
|
519
|
+
prompt,
|
|
520
|
+
turn_id,
|
|
521
|
+
input_type,
|
|
522
|
+
});
|
|
523
|
+
await this.state.ensure_title_from_history({ generate: true });
|
|
524
|
+
await this.state.touch_metadata();
|
|
525
|
+
return message;
|
|
526
|
+
}
|
|
527
|
+
/** 持久化 Executor Action,并同步刷新 Session metadata。 */
|
|
528
|
+
async persist_action_event(event) {
|
|
529
|
+
await this.messages.persist_action_record(event);
|
|
530
|
+
await this.state.touch_metadata();
|
|
531
|
+
}
|
|
532
|
+
}
|
|
533
|
+
/** 判断 UI stream chunk 是否属于 Assistant 可持久化内容。 */
|
|
534
|
+
function is_assistant_content_chunk(type) {
|
|
535
|
+
return (type === "text-start" ||
|
|
536
|
+
type === "text-delta" ||
|
|
537
|
+
type === "text-end" ||
|
|
538
|
+
type === "reasoning-start" ||
|
|
539
|
+
type === "reasoning-delta" ||
|
|
540
|
+
type === "reasoning-end" ||
|
|
541
|
+
type.startsWith("tool-") ||
|
|
542
|
+
type === "file");
|
|
543
|
+
}
|
|
544
|
+
function build_prompt_runtime_error_assistant_message(input) {
|
|
545
|
+
return {
|
|
546
|
+
id: `a:${input.session_id}:${Date.now()}:${nanoid(6)}`,
|
|
547
|
+
role: "assistant",
|
|
548
|
+
metadata: {
|
|
549
|
+
v: 1,
|
|
550
|
+
ts: Date.now(),
|
|
551
|
+
sessionId: input.session_id,
|
|
552
|
+
source: "egress",
|
|
553
|
+
kind: "normal",
|
|
554
|
+
extra: {
|
|
555
|
+
note: "session_prompt_runtime_error",
|
|
556
|
+
},
|
|
557
|
+
},
|
|
558
|
+
parts: [{ type: "text", text: input.message }],
|
|
559
|
+
};
|
|
560
|
+
}
|
|
561
|
+
function create_deferred() {
|
|
562
|
+
let resolve;
|
|
563
|
+
const promise = new Promise((inner_resolve) => {
|
|
564
|
+
resolve = inner_resolve;
|
|
565
|
+
});
|
|
566
|
+
return {
|
|
567
|
+
promise,
|
|
568
|
+
resolve,
|
|
569
|
+
};
|
|
570
|
+
}
|
|
571
|
+
function create_active_session_turn_state(turn_id) {
|
|
572
|
+
return {
|
|
573
|
+
turn_id,
|
|
574
|
+
result: null,
|
|
575
|
+
deferred_finished: create_deferred(),
|
|
576
|
+
abort_controller: new AbortController(),
|
|
577
|
+
};
|
|
578
|
+
}
|
|
579
|
+
function create_turn_handle(active_turn) {
|
|
580
|
+
return {
|
|
581
|
+
id: active_turn.turn_id,
|
|
582
|
+
get result() {
|
|
583
|
+
return active_turn.result;
|
|
584
|
+
},
|
|
585
|
+
finished: active_turn.deferred_finished.promise,
|
|
586
|
+
};
|
|
587
|
+
}
|
|
588
|
+
//# sourceMappingURL=SessionTurn.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SessionTurn.js","sourceRoot":"","sources":["../../src/session/SessionTurn.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Session 级 Tool 审批 Broker。
|
|
3
|
+
*
|
|
4
|
+
* 关键点(中文)
|
|
5
|
+
* - pending approval、审批模式、超时与用户决定只归当前 Session 所有。
|
|
6
|
+
* - Shell 通过强类型 Gateway 等待结果,不保存或反向发布 Session 状态。
|
|
7
|
+
*/
|
|
8
|
+
import type { ShellApprovalGateway, ShellApprovalHandle, ShellApprovalRequest } from "@downcity/shell";
|
|
9
|
+
import type { SessionApproval, SessionApprovalDecision, SessionApprovalMode, SessionApprovalModeSnapshot, SessionApprovalResult } from "../../types/session/SessionApproval.js";
|
|
10
|
+
import type { SessionMessages } from "../../session/SessionMessages.js";
|
|
11
|
+
/** 单个 Session 的审批状态与决定入口。 */
|
|
12
|
+
export declare class SessionApprovalBroker implements ShellApprovalGateway {
|
|
13
|
+
private readonly session_id;
|
|
14
|
+
private readonly messages;
|
|
15
|
+
private readonly pending_by_id;
|
|
16
|
+
private mode;
|
|
17
|
+
/**
|
|
18
|
+
* @param options Broker 所属 Session 与 Tool Runtime。
|
|
19
|
+
*/
|
|
20
|
+
constructor(options: {
|
|
21
|
+
/** 当前 Broker 所属 Session。 */
|
|
22
|
+
session_id: string;
|
|
23
|
+
/** 当前 Session 的 Message 领域入口。 */
|
|
24
|
+
messages: SessionMessages;
|
|
25
|
+
});
|
|
26
|
+
/** Shell 调用的强类型审批网关入口。 */
|
|
27
|
+
request(input: ShellApprovalRequest): Promise<ShellApprovalHandle>;
|
|
28
|
+
/** 返回当前 Session 的全部 pending approval 快照。 */
|
|
29
|
+
list(): SessionApproval[];
|
|
30
|
+
/** 返回当前 Session 的审批模式。 */
|
|
31
|
+
get_mode(): SessionApprovalModeSnapshot;
|
|
32
|
+
/** 更新当前 Session 的审批模式。 */
|
|
33
|
+
set_mode(mode: SessionApprovalMode): SessionApprovalModeSnapshot;
|
|
34
|
+
/** 处理用户提交的审批决定。 */
|
|
35
|
+
resolve(input: {
|
|
36
|
+
/** 当前审批请求标识。 */
|
|
37
|
+
approval_id: string;
|
|
38
|
+
/** 用户提交的审批决定。 */
|
|
39
|
+
decision: SessionApprovalDecision;
|
|
40
|
+
}): Promise<SessionApprovalResult>;
|
|
41
|
+
/** 让当前 Session 的全部 pending 请求过期,用于停止或销毁执行。 */
|
|
42
|
+
expire_all(): Promise<void>;
|
|
43
|
+
/** 处理单个自动过期请求。 */
|
|
44
|
+
private expire;
|
|
45
|
+
/** 先提交 Tool 状态,再兑现 Shell 等待 Promise,保证执行顺序稳定。 */
|
|
46
|
+
private settle;
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=SessionApprovalBroker.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SessionApprovalBroker.d.ts","sourceRoot":"","sources":["../../../src/session/approval/SessionApprovalBroker.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EACV,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,eAAe,EACf,uBAAuB,EACvB,mBAAmB,EACnB,2BAA2B,EAC3B,qBAAqB,EACtB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,6BAA6B;AAC7B,qBAAa,qBAAsB,YAAW,oBAAoB;IAChE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkB;IAC3C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA6C;IAC3E,OAAO,CAAC,IAAI,CAA8B;IAE1C;;OAEG;gBACS,OAAO,EAAE;QACnB,4BAA4B;QAC5B,UAAU,EAAE,MAAM,CAAC;QACnB,iCAAiC;QACjC,QAAQ,EAAE,eAAe,CAAC;KAC3B;IAKD,0BAA0B;IACpB,OAAO,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAwDxE,4CAA4C;IAC5C,IAAI,IAAI,eAAe,EAAE;IAIzB,0BAA0B;IAC1B,QAAQ,IAAI,2BAA2B;IAIvC,0BAA0B;IAC1B,QAAQ,CAAC,IAAI,EAAE,mBAAmB,GAAG,2BAA2B;IAKhE,mBAAmB;IACb,OAAO,CAAC,KAAK,EAAE;QACnB,gBAAgB;QAChB,WAAW,EAAE,MAAM,CAAC;QACpB,iBAAiB;QACjB,QAAQ,EAAE,uBAAuB,CAAC;KACnC,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAKlC,8CAA8C;IACxC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC,kBAAkB;YACJ,MAAM;IAIpB,iDAAiD;YACnC,MAAM;CAqBrB"}
|