@coralai/sps-cli 0.63.6 → 0.65.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +9 -0
- package/README-CN.md +2 -0
- package/README.md +2 -0
- package/dist/commands/agentCommand.d.ts.map +1 -1
- package/dist/commands/agentCommand.js +4 -3
- package/dist/commands/agentCommand.js.map +1 -1
- package/dist/commands/agentRenderer.js +3 -3
- package/dist/commands/agentRenderer.js.map +1 -1
- package/dist/commands/cardDashboard.d.ts.map +1 -1
- package/dist/commands/cardDashboard.js +2 -2
- package/dist/commands/cardDashboard.js.map +1 -1
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +0 -3
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/logs.d.ts.map +1 -1
- package/dist/commands/logs.js +15 -15
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/openaiAgent.d.ts +3 -0
- package/dist/commands/openaiAgent.d.ts.map +1 -0
- package/dist/commands/openaiAgent.js +81 -0
- package/dist/commands/openaiAgent.js.map +1 -0
- package/dist/commands/pipelineRunner.js.map +1 -1
- package/dist/commands/pipelineTick.js +1 -1
- package/dist/commands/pipelineTick.js.map +1 -1
- package/dist/commands/projectInit.d.ts +11 -1
- package/dist/commands/projectInit.d.ts.map +1 -1
- package/dist/commands/projectInit.js +38 -7
- package/dist/commands/projectInit.js.map +1 -1
- package/dist/commands/prune.d.ts +6 -0
- package/dist/commands/prune.d.ts.map +1 -0
- package/dist/commands/prune.js +87 -0
- package/dist/commands/prune.js.map +1 -0
- package/dist/commands/qaTick.js +1 -1
- package/dist/commands/qaTick.js.map +1 -1
- package/dist/commands/reset.d.ts.map +1 -1
- package/dist/commands/reset.js +3 -2
- package/dist/commands/reset.js.map +1 -1
- package/dist/commands/setup.d.ts.map +1 -1
- package/dist/commands/setup.js +8 -1
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/skillCommand.d.ts.map +1 -1
- package/dist/commands/skillCommand.js +2 -3
- package/dist/commands/skillCommand.js.map +1 -1
- package/dist/commands/status.js +2 -2
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/stop.js +3 -3
- package/dist/commands/stop.js.map +1 -1
- package/dist/commands/tick.d.ts.map +1 -1
- package/dist/commands/tick.js +5 -2
- package/dist/commands/tick.js.map +1 -1
- package/dist/commands/workerDashboard.d.ts.map +1 -1
- package/dist/commands/workerDashboard.js +27 -26
- package/dist/commands/workerDashboard.js.map +1 -1
- package/dist/commands/workerLaunch.js +1 -1
- package/dist/commands/workerLaunch.js.map +1 -1
- package/dist/console/routes/chat.d.ts +18 -1
- package/dist/console/routes/chat.d.ts.map +1 -1
- package/dist/console/routes/chat.js +529 -40
- package/dist/console/routes/chat.js.map +1 -1
- package/dist/console/routes/fs.d.ts.map +1 -1
- package/dist/console/routes/fs.js +2 -1
- package/dist/console/routes/fs.js.map +1 -1
- package/dist/console/routes/logs.d.ts.map +1 -1
- package/dist/console/routes/logs.js +17 -5
- package/dist/console/routes/logs.js.map +1 -1
- package/dist/console/routes/projects.d.ts.map +1 -1
- package/dist/console/routes/projects.js +25 -2
- package/dist/console/routes/projects.js.map +1 -1
- package/dist/console/routes/workers.js +3 -3
- package/dist/console/routes/workers.js.map +1 -1
- package/dist/console-assets/assets/{ShowcasePage-BWHyDQhw.js → ShowcasePage-DFRO5bAO.js} +1 -1
- package/dist/console-assets/assets/{index-rQ_2k-G9.css → index-DZ28qAcd.css} +1 -1
- package/dist/console-assets/assets/{index-DH_TQHY4.js → index-De5GjRjY.js} +220 -215
- package/dist/console-assets/index.html +2 -2
- package/dist/core/agents/AgentBackend.d.ts +2 -2
- package/dist/core/agents/AgentBackend.d.ts.map +1 -1
- package/dist/core/agents/AgentBackend.js.map +1 -1
- package/dist/core/agents/DaemonBackend.d.ts +12 -2
- package/dist/core/agents/DaemonBackend.d.ts.map +1 -1
- package/dist/core/agents/DaemonBackend.js +59 -12
- package/dist/core/agents/DaemonBackend.js.map +1 -1
- package/dist/core/agents/resolveBackend.d.ts +4 -1
- package/dist/core/agents/resolveBackend.d.ts.map +1 -1
- package/dist/core/agents/resolveBackend.js +31 -1
- package/dist/core/agents/resolveBackend.js.map +1 -1
- package/dist/core/auditLog.d.ts +1 -1
- package/dist/core/auditLog.d.ts.map +1 -1
- package/dist/core/config.d.ts +5 -8
- package/dist/core/config.d.ts.map +1 -1
- package/dist/core/config.js +3 -9
- package/dist/core/config.js.map +1 -1
- package/dist/core/intel/agentsConfig.d.ts +9 -0
- package/dist/core/intel/agentsConfig.d.ts.map +1 -1
- package/dist/core/intel/agentsConfig.js +42 -0
- package/dist/core/intel/agentsConfig.js.map +1 -1
- package/dist/core/intel/types.d.ts +1 -0
- package/dist/core/intel/types.d.ts.map +1 -1
- package/dist/core/markerFile.d.ts.map +1 -1
- package/dist/core/markerFile.js +2 -2
- package/dist/core/markerFile.js.map +1 -1
- package/dist/core/openaiWorkerLog.d.ts +7 -0
- package/dist/core/openaiWorkerLog.d.ts.map +1 -0
- package/dist/core/openaiWorkerLog.js +98 -0
- package/dist/core/openaiWorkerLog.js.map +1 -0
- package/dist/core/paths.d.ts +1 -1
- package/dist/core/paths.d.ts.map +1 -1
- package/dist/core/paths.js +9 -7
- package/dist/core/paths.js.map +1 -1
- package/dist/core/pipelineConfig.js +7 -7
- package/dist/core/pipelineConfig.js.map +1 -1
- package/dist/core/pipelineSession.d.ts +3 -1
- package/dist/core/pipelineSession.d.ts.map +1 -1
- package/dist/core/pipelineSession.js +8 -2
- package/dist/core/pipelineSession.js.map +1 -1
- package/dist/core/processInspect.d.ts +5 -0
- package/dist/core/processInspect.d.ts.map +1 -1
- package/dist/core/processInspect.js +41 -11
- package/dist/core/processInspect.js.map +1 -1
- package/dist/core/projectPipelineAdapter.d.ts.map +1 -1
- package/dist/core/projectPipelineAdapter.js +4 -4
- package/dist/core/projectPipelineAdapter.js.map +1 -1
- package/dist/core/runtimeSnapshot.d.ts +2 -2
- package/dist/core/runtimeSnapshot.d.ts.map +1 -1
- package/dist/core/runtimeSnapshot.js +2 -2
- package/dist/core/runtimeSnapshot.js.map +1 -1
- package/dist/core/runtimeStore.d.ts +12 -12
- package/dist/core/runtimeStore.d.ts.map +1 -1
- package/dist/core/runtimeStore.js +16 -16
- package/dist/core/runtimeStore.js.map +1 -1
- package/dist/core/runtimeTypes.d.ts +109 -24
- package/dist/core/runtimeTypes.d.ts.map +1 -1
- package/dist/core/runtimeTypes.js +1 -1
- package/dist/core/sessionCleanup.d.ts +1 -1
- package/dist/core/sessionCleanup.d.ts.map +1 -1
- package/dist/core/sessionCleanup.js +2 -2
- package/dist/core/sessionCleanup.js.map +1 -1
- package/dist/core/sessionContext.d.ts +2 -2
- package/dist/core/sessionContext.d.ts.map +1 -1
- package/dist/core/sessionContext.js +1 -1
- package/dist/core/sessionContext.js.map +1 -1
- package/dist/core/sessionLiveness.d.ts +7 -6
- package/dist/core/sessionLiveness.d.ts.map +1 -1
- package/dist/core/sessionLiveness.js +3 -4
- package/dist/core/sessionLiveness.js.map +1 -1
- package/dist/core/state.d.ts +13 -12
- package/dist/core/state.d.ts.map +1 -1
- package/dist/core/state.js +9 -1
- package/dist/core/state.js.map +1 -1
- package/dist/core/workerRuntimeSummary.js +2 -2
- package/dist/core/workerRuntimeSummary.js.map +1 -1
- package/dist/core/workspacePaths.d.ts +22 -0
- package/dist/core/workspacePaths.d.ts.map +1 -0
- package/dist/core/workspacePaths.js +73 -0
- package/dist/core/workspacePaths.js.map +1 -0
- package/dist/daemon/daemonClient.d.ts +19 -22
- package/dist/daemon/daemonClient.d.ts.map +1 -1
- package/dist/daemon/daemonClient.js +82 -2
- package/dist/daemon/daemonClient.js.map +1 -1
- package/dist/daemon/sessionDaemon.d.ts +52 -7
- package/dist/daemon/sessionDaemon.d.ts.map +1 -1
- package/dist/daemon/sessionDaemon.js +40 -24
- package/dist/daemon/sessionDaemon.js.map +1 -1
- package/dist/engines/EventHandler.js +1 -1
- package/dist/engines/EventHandler.js.map +1 -1
- package/dist/engines/MonitorEngine.d.ts +2 -2
- package/dist/engines/MonitorEngine.d.ts.map +1 -1
- package/dist/engines/MonitorEngine.js +15 -17
- package/dist/engines/MonitorEngine.js.map +1 -1
- package/dist/engines/StageEngine.d.ts +5 -3
- package/dist/engines/StageEngine.d.ts.map +1 -1
- package/dist/engines/StageEngine.js +33 -18
- package/dist/engines/StageEngine.js.map +1 -1
- package/dist/main.js +41 -2
- package/dist/main.js.map +1 -1
- package/dist/manager/makeBackendFactory.d.ts +11 -4
- package/dist/manager/makeBackendFactory.d.ts.map +1 -1
- package/dist/manager/makeBackendFactory.js +28 -15
- package/dist/manager/makeBackendFactory.js.map +1 -1
- package/dist/manager/runtime-coordinator.js.map +1 -1
- package/dist/manager/supervisor.d.ts +7 -7
- package/dist/manager/supervisor.d.ts.map +1 -1
- package/dist/manager/supervisor.js +7 -7
- package/dist/manager/supervisor.js.map +1 -1
- package/dist/manager/worker-manager-impl.d.ts +4 -4
- package/dist/manager/worker-manager-impl.d.ts.map +1 -1
- package/dist/manager/worker-manager-impl.js +56 -24
- package/dist/manager/worker-manager-impl.js.map +1 -1
- package/dist/manager/worker-manager.d.ts +6 -6
- package/dist/manager/worker-manager.d.ts.map +1 -1
- package/dist/openai-agent/agentFactory.d.ts +10 -0
- package/dist/openai-agent/agentFactory.d.ts.map +1 -0
- package/dist/openai-agent/agentFactory.js +26 -0
- package/dist/openai-agent/agentFactory.js.map +1 -0
- package/dist/openai-agent/eventMap.d.ts +11 -0
- package/dist/openai-agent/eventMap.d.ts.map +1 -0
- package/dist/openai-agent/eventMap.js +191 -0
- package/dist/openai-agent/eventMap.js.map +1 -0
- package/dist/openai-agent/hooks.d.ts +13 -0
- package/dist/openai-agent/hooks.d.ts.map +1 -0
- package/dist/openai-agent/hooks.js +63 -0
- package/dist/openai-agent/hooks.js.map +1 -0
- package/dist/openai-agent/instructions.d.ts +3 -0
- package/dist/openai-agent/instructions.d.ts.map +1 -0
- package/dist/openai-agent/instructions.js +63 -0
- package/dist/openai-agent/instructions.js.map +1 -0
- package/dist/openai-agent/interactions/broker.d.ts +23 -0
- package/dist/openai-agent/interactions/broker.d.ts.map +1 -0
- package/dist/openai-agent/interactions/broker.js +316 -0
- package/dist/openai-agent/interactions/broker.js.map +1 -0
- package/dist/openai-agent/mcp/managedMcp.d.ts +31 -0
- package/dist/openai-agent/mcp/managedMcp.d.ts.map +1 -0
- package/dist/openai-agent/mcp/managedMcp.js +95 -0
- package/dist/openai-agent/mcp/managedMcp.js.map +1 -0
- package/dist/openai-agent/protocolWriter.d.ts +29 -0
- package/dist/openai-agent/protocolWriter.d.ts.map +1 -0
- package/dist/openai-agent/protocolWriter.js +74 -0
- package/dist/openai-agent/protocolWriter.js.map +1 -0
- package/dist/openai-agent/providerCapabilities.d.ts +31 -0
- package/dist/openai-agent/providerCapabilities.d.ts.map +1 -0
- package/dist/openai-agent/providerCapabilities.js +49 -0
- package/dist/openai-agent/providerCapabilities.js.map +1 -0
- package/dist/openai-agent/providerFactory.d.ts +18 -0
- package/dist/openai-agent/providerFactory.d.ts.map +1 -0
- package/dist/openai-agent/providerFactory.js +38 -0
- package/dist/openai-agent/providerFactory.js.map +1 -0
- package/dist/openai-agent/request.d.ts +22 -0
- package/dist/openai-agent/request.d.ts.map +1 -0
- package/dist/openai-agent/request.js +89 -0
- package/dist/openai-agent/request.js.map +1 -0
- package/dist/openai-agent/runWorker.d.ts +25 -0
- package/dist/openai-agent/runWorker.d.ts.map +1 -0
- package/dist/openai-agent/runWorker.js +635 -0
- package/dist/openai-agent/runWorker.js.map +1 -0
- package/dist/openai-agent/sandbox/execution.d.ts +36 -0
- package/dist/openai-agent/sandbox/execution.d.ts.map +1 -0
- package/dist/openai-agent/sandbox/execution.js +239 -0
- package/dist/openai-agent/sandbox/execution.js.map +1 -0
- package/dist/openai-agent/sandbox/productionDocker.d.ts +17 -0
- package/dist/openai-agent/sandbox/productionDocker.d.ts.map +1 -0
- package/dist/openai-agent/sandbox/productionDocker.js +76 -0
- package/dist/openai-agent/sandbox/productionDocker.js.map +1 -0
- package/dist/openai-agent/sdkContract.d.ts +18 -0
- package/dist/openai-agent/sdkContract.d.ts.map +1 -0
- package/dist/openai-agent/sdkContract.js +2 -0
- package/dist/openai-agent/sdkContract.js.map +1 -0
- package/dist/openai-agent/storage/atomic.d.ts +10 -0
- package/dist/openai-agent/storage/atomic.d.ts.map +1 -0
- package/dist/openai-agent/storage/atomic.js +112 -0
- package/dist/openai-agent/storage/atomic.js.map +1 -0
- package/dist/openai-agent/storage/checkpoint.d.ts +38 -0
- package/dist/openai-agent/storage/checkpoint.d.ts.map +1 -0
- package/dist/openai-agent/storage/checkpoint.js +141 -0
- package/dist/openai-agent/storage/checkpoint.js.map +1 -0
- package/dist/openai-agent/storage/errors.d.ts +8 -0
- package/dist/openai-agent/storage/errors.d.ts.map +1 -0
- package/dist/openai-agent/storage/errors.js +11 -0
- package/dist/openai-agent/storage/errors.js.map +1 -0
- package/dist/openai-agent/storage/index.d.ts +12 -0
- package/dist/openai-agent/storage/index.d.ts.map +1 -0
- package/dist/openai-agent/storage/index.js +12 -0
- package/dist/openai-agent/storage/index.js.map +1 -0
- package/dist/openai-agent/storage/interaction.d.ts +45 -0
- package/dist/openai-agent/storage/interaction.d.ts.map +1 -0
- package/dist/openai-agent/storage/interaction.js +372 -0
- package/dist/openai-agent/storage/interaction.js.map +1 -0
- package/dist/openai-agent/storage/lock.d.ts +13 -0
- package/dist/openai-agent/storage/lock.d.ts.map +1 -0
- package/dist/openai-agent/storage/lock.js +95 -0
- package/dist/openai-agent/storage/lock.js.map +1 -0
- package/dist/openai-agent/storage/metrics.d.ts +34 -0
- package/dist/openai-agent/storage/metrics.d.ts.map +1 -0
- package/dist/openai-agent/storage/metrics.js +74 -0
- package/dist/openai-agent/storage/metrics.js.map +1 -0
- package/dist/openai-agent/storage/output.d.ts +22 -0
- package/dist/openai-agent/storage/output.d.ts.map +1 -0
- package/dist/openai-agent/storage/output.js +175 -0
- package/dist/openai-agent/storage/output.js.map +1 -0
- package/dist/openai-agent/storage/session.d.ts +38 -0
- package/dist/openai-agent/storage/session.d.ts.map +1 -0
- package/dist/openai-agent/storage/session.js +216 -0
- package/dist/openai-agent/storage/session.js.map +1 -0
- package/dist/openai-agent/storage/toolLedger.d.ts +64 -0
- package/dist/openai-agent/storage/toolLedger.d.ts.map +1 -0
- package/dist/openai-agent/storage/toolLedger.js +281 -0
- package/dist/openai-agent/storage/toolLedger.js.map +1 -0
- package/dist/openai-agent/storage/workerStorage.d.ts +21 -0
- package/dist/openai-agent/storage/workerStorage.d.ts.map +1 -0
- package/dist/openai-agent/storage/workerStorage.js +38 -0
- package/dist/openai-agent/storage/workerStorage.js.map +1 -0
- package/dist/openai-agent/storage/workspace.d.ts +17 -0
- package/dist/openai-agent/storage/workspace.d.ts.map +1 -0
- package/dist/openai-agent/storage/workspace.js +67 -0
- package/dist/openai-agent/storage/workspace.js.map +1 -0
- package/dist/openai-agent/testHelpers.d.ts +9 -0
- package/dist/openai-agent/testHelpers.d.ts.map +1 -0
- package/dist/openai-agent/testHelpers.js +35 -0
- package/dist/openai-agent/testHelpers.js.map +1 -0
- package/dist/openai-agent/tools/ledgerTools.d.ts +12 -0
- package/dist/openai-agent/tools/ledgerTools.d.ts.map +1 -0
- package/dist/openai-agent/tools/ledgerTools.js +151 -0
- package/dist/openai-agent/tools/ledgerTools.js.map +1 -0
- package/dist/providers/MarkdownTaskBackend.d.ts.map +1 -1
- package/dist/providers/MarkdownTaskBackend.js +2 -2
- package/dist/providers/MarkdownTaskBackend.js.map +1 -1
- package/dist/providers/RuntimeSessionRuntime.d.ts +35 -15
- package/dist/providers/RuntimeSessionRuntime.d.ts.map +1 -1
- package/dist/providers/RuntimeSessionRuntime.js +239 -22
- package/dist/providers/RuntimeSessionRuntime.js.map +1 -1
- package/dist/providers/llm/chatTools.d.ts.map +1 -1
- package/dist/providers/llm/chatTools.js +3 -3
- package/dist/providers/llm/chatTools.js.map +1 -1
- package/dist/providers/llm/codexAuth.d.ts +6 -1
- package/dist/providers/llm/codexAuth.d.ts.map +1 -1
- package/dist/providers/llm/codexAuth.js +45 -9
- package/dist/providers/llm/codexAuth.js.map +1 -1
- package/dist/providers/llm/codexModel.d.ts +4 -1
- package/dist/providers/llm/codexModel.d.ts.map +1 -1
- package/dist/providers/llm/codexModel.js +13 -3
- package/dist/providers/llm/codexModel.js.map +1 -1
- package/dist/providers/llm/localSubscription.d.ts +1 -1
- package/dist/providers/llm/localSubscription.d.ts.map +1 -1
- package/dist/providers/llm/localSubscription.js +2 -2
- package/dist/providers/llm/localSubscription.js.map +1 -1
- package/dist/providers/runtimeEventMap.d.ts +54 -5
- package/dist/providers/runtimeEventMap.d.ts.map +1 -1
- package/dist/providers/runtimeEventMap.js +110 -11
- package/dist/providers/runtimeEventMap.js.map +1 -1
- package/dist/runtime/agentd/client.d.ts +29 -0
- package/dist/runtime/agentd/client.d.ts.map +1 -0
- package/dist/runtime/agentd/client.js +131 -0
- package/dist/runtime/agentd/client.js.map +1 -0
- package/dist/runtime/agentd/main.d.ts +10 -0
- package/dist/runtime/agentd/main.d.ts.map +1 -0
- package/dist/runtime/agentd/main.js +49 -0
- package/dist/runtime/agentd/main.js.map +1 -0
- package/dist/runtime/agentd/protocol.d.ts +74 -0
- package/dist/runtime/agentd/protocol.d.ts.map +1 -0
- package/dist/runtime/agentd/protocol.js +21 -0
- package/dist/runtime/agentd/protocol.js.map +1 -0
- package/dist/runtime/agentd/server.d.ts +15 -0
- package/dist/runtime/agentd/server.d.ts.map +1 -0
- package/dist/runtime/agentd/server.js +116 -0
- package/dist/runtime/agentd/server.js.map +1 -0
- package/dist/runtime/backends/claude/ClaudeBackend.d.ts +155 -0
- package/dist/runtime/backends/claude/ClaudeBackend.d.ts.map +1 -0
- package/dist/runtime/backends/claude/ClaudeBackend.js +398 -0
- package/dist/runtime/backends/claude/ClaudeBackend.js.map +1 -0
- package/dist/runtime/backends/claude/ClaudeSessions.d.ts +23 -0
- package/dist/runtime/backends/claude/ClaudeSessions.d.ts.map +1 -0
- package/dist/runtime/backends/claude/ClaudeSessions.js +45 -0
- package/dist/runtime/backends/claude/ClaudeSessions.js.map +1 -0
- package/dist/runtime/backends/claude/inprocTools.d.ts +17 -0
- package/dist/runtime/backends/claude/inprocTools.d.ts.map +1 -0
- package/dist/runtime/backends/claude/inprocTools.js +14 -0
- package/dist/runtime/backends/claude/inprocTools.js.map +1 -0
- package/dist/runtime/backends/process/ExternalProcessBackend.d.ts +83 -0
- package/dist/runtime/backends/process/ExternalProcessBackend.d.ts.map +1 -0
- package/dist/runtime/backends/process/ExternalProcessBackend.js +642 -0
- package/dist/runtime/backends/process/ExternalProcessBackend.js.map +1 -0
- package/dist/runtime/contract/AgentBackend.d.ts +199 -0
- package/dist/runtime/contract/AgentBackend.d.ts.map +1 -0
- package/dist/runtime/contract/AgentBackend.js +2 -0
- package/dist/runtime/contract/AgentBackend.js.map +1 -0
- package/dist/runtime/contract/events.d.ts +96 -0
- package/dist/runtime/contract/events.d.ts.map +1 -0
- package/dist/runtime/contract/events.js +2 -0
- package/dist/runtime/contract/events.js.map +1 -0
- package/dist/runtime/contract/index.d.ts +13 -0
- package/dist/runtime/contract/index.d.ts.map +1 -0
- package/dist/runtime/contract/index.js +2 -0
- package/dist/runtime/contract/index.js.map +1 -0
- package/dist/runtime/contract/lifecycle.d.ts +26 -0
- package/dist/runtime/contract/lifecycle.d.ts.map +1 -0
- package/dist/runtime/contract/lifecycle.js +6 -0
- package/dist/runtime/contract/lifecycle.js.map +1 -0
- package/dist/runtime/contract/processProtocol.d.ts +263 -0
- package/dist/runtime/contract/processProtocol.d.ts.map +1 -0
- package/dist/runtime/contract/processProtocol.js +779 -0
- package/dist/runtime/contract/processProtocol.js.map +1 -0
- package/dist/runtime/contract/service.d.ts +85 -0
- package/dist/runtime/contract/service.d.ts.map +1 -0
- package/dist/runtime/contract/service.js +2 -0
- package/dist/runtime/contract/service.js.map +1 -0
- package/dist/runtime/contract/versioning.d.ts +44 -0
- package/dist/runtime/contract/versioning.d.ts.map +1 -0
- package/dist/runtime/contract/versioning.js +10 -0
- package/dist/runtime/contract/versioning.js.map +1 -0
- package/dist/runtime/index.d.ts +21 -0
- package/dist/runtime/index.d.ts.map +1 -0
- package/dist/runtime/index.js +26 -0
- package/dist/runtime/index.js.map +1 -0
- package/dist/runtime/runtime.d.ts +21 -0
- package/dist/runtime/runtime.d.ts.map +1 -0
- package/dist/runtime/runtime.js +34 -0
- package/dist/runtime/runtime.js.map +1 -0
- package/dist/runtime/service/AgentRuntime.d.ts +60 -0
- package/dist/runtime/service/AgentRuntime.d.ts.map +1 -0
- package/dist/runtime/service/AgentRuntime.js +396 -0
- package/dist/runtime/service/AgentRuntime.js.map +1 -0
- package/dist/runtime/service/FileRecordStore.d.ts +12 -0
- package/dist/runtime/service/FileRecordStore.d.ts.map +1 -0
- package/dist/runtime/service/FileRecordStore.js +48 -0
- package/dist/runtime/service/FileRecordStore.js.map +1 -0
- package/dist/runtime/service/backendFactory.d.ts +8 -0
- package/dist/runtime/service/backendFactory.d.ts.map +1 -0
- package/dist/runtime/service/backendFactory.js +20 -0
- package/dist/runtime/service/backendFactory.js.map +1 -0
- package/dist/runtime/stub/NoopBackend.d.ts +29 -0
- package/dist/runtime/stub/NoopBackend.d.ts.map +1 -0
- package/dist/runtime/stub/NoopBackend.js +56 -0
- package/dist/runtime/stub/NoopBackend.js.map +1 -0
- package/dist/runtime/stub/NoopService.d.ts +23 -0
- package/dist/runtime/stub/NoopService.d.ts.map +1 -0
- package/dist/runtime/stub/NoopService.js +136 -0
- package/dist/runtime/stub/NoopService.js.map +1 -0
- package/dist/runtime/stub/index.d.ts +8 -0
- package/dist/runtime/stub/index.d.ts.map +1 -0
- package/dist/runtime/stub/index.js +8 -0
- package/dist/runtime/stub/index.js.map +1 -0
- package/dist/runtime/versioning/VersionManager.d.ts +31 -0
- package/dist/runtime/versioning/VersionManager.d.ts.map +1 -0
- package/dist/runtime/versioning/VersionManager.js +142 -0
- package/dist/runtime/versioning/VersionManager.js.map +1 -0
- package/dist/services/ChatService.d.ts +11 -0
- package/dist/services/ChatService.d.ts.map +1 -1
- package/dist/services/ChatService.js +35 -5
- package/dist/services/ChatService.js.map +1 -1
- package/dist/services/LogService.d.ts +10 -4
- package/dist/services/LogService.d.ts.map +1 -1
- package/dist/services/LogService.js +26 -5
- package/dist/services/LogService.js.map +1 -1
- package/dist/services/ProjectService.d.ts +56 -0
- package/dist/services/ProjectService.d.ts.map +1 -1
- package/dist/services/ProjectService.js +182 -15
- package/dist/services/ProjectService.js.map +1 -1
- package/dist/services/WorkerService.d.ts +1 -0
- package/dist/services/WorkerService.d.ts.map +1 -1
- package/dist/services/WorkerService.js +72 -0
- package/dist/services/WorkerService.js.map +1 -1
- package/dist/services/executors.d.ts +1 -0
- package/dist/services/executors.d.ts.map +1 -1
- package/dist/services/executors.js +9 -1
- package/dist/services/executors.js.map +1 -1
- package/dist/services/promptPreview.d.ts.map +1 -1
- package/dist/services/promptPreview.js +4 -3
- package/dist/services/promptPreview.js.map +1 -1
- package/dist/shared/runtimePaths.d.ts +4 -0
- package/dist/shared/runtimePaths.d.ts.map +1 -1
- package/dist/shared/runtimePaths.js +8 -0
- package/dist/shared/runtimePaths.js.map +1 -1
- package/dist/shared/runtimeSchemas.d.ts +6 -2
- package/dist/shared/runtimeSchemas.d.ts.map +1 -1
- package/dist/shared/runtimeSchemas.js +3 -2
- package/dist/shared/runtimeSchemas.js.map +1 -1
- package/docs/openai-daemon-agent.md +144 -0
- package/package.json +15 -9
- package/project-template/.claude/hooks/openai/on-start.sh +6 -0
- package/project-template/.claude/hooks/openai/on-stop.sh +6 -0
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module providers/RuntimeSessionRuntime
|
|
3
3
|
* @description **统一宿主(人才市场)** 的 sps 侧适配器:实现 sessionDaemon 依赖的 `AgentRuntime`
|
|
4
|
-
* 接口,内部 delegate
|
|
4
|
+
* 接口,内部 delegate `../runtime/index.js` 的 `AgentRuntime`(市场内核:多 slot
|
|
5
5
|
* 调度 + 容量 + idle-gc)+ `ClaudeBackend`(工人,**直连 SDK,无 ACP**)。
|
|
6
6
|
* subscribe 里把厚 WorkerOutputEvent 经 `mapRuntimeEvent` 转成 daemon 富事件
|
|
7
7
|
* (tool_use 一次带完整 input → present_choices)。claude ACP 删除后为唯一会话宿主。
|
|
@@ -9,11 +9,16 @@
|
|
|
9
9
|
* @layer provider
|
|
10
10
|
* @boundedContext agents
|
|
11
11
|
*/
|
|
12
|
+
import { rm } from 'node:fs/promises';
|
|
12
13
|
import { homedir } from 'node:os';
|
|
13
|
-
import { resolve } from 'node:path';
|
|
14
|
+
import { relative, resolve, sep } from 'node:path';
|
|
15
|
+
import { fileURLToPath } from 'node:url';
|
|
14
16
|
import * as claudeSdk from '@anthropic-ai/claude-agent-sdk';
|
|
15
|
-
import { createRuntime, } from '
|
|
17
|
+
import { createRuntime, } from '../runtime/index.js';
|
|
16
18
|
import { mapRuntimeEvent } from './runtimeEventMap.js';
|
|
19
|
+
import { WorkerOutputStore } from '../openai-agent/storage/output.js';
|
|
20
|
+
import { InteractionStore } from '../openai-agent/storage/interaction.js';
|
|
21
|
+
import { getAgentProvider } from './llm/providers.js';
|
|
17
22
|
/** agent-runtime SessionState → ACP 两枚举(供 daemon 巡检/GC 判活)。 */
|
|
18
23
|
function toSlotStatus(s) {
|
|
19
24
|
if (s === 'dead')
|
|
@@ -47,12 +52,27 @@ export class RuntimeSessionRuntime {
|
|
|
47
52
|
ready;
|
|
48
53
|
/** slot → 当前底层 sessionId(供 buildSessionName/巡检)。 */
|
|
49
54
|
sessionIds = new Map();
|
|
50
|
-
|
|
55
|
+
sessionBackends = new Map();
|
|
56
|
+
workerEntry;
|
|
57
|
+
workerArgs;
|
|
58
|
+
homeDir;
|
|
59
|
+
processEnv;
|
|
60
|
+
providerCredentialResolver;
|
|
61
|
+
constructor(options = {}) {
|
|
62
|
+
this.workerEntry =
|
|
63
|
+
options.workerEntry ?? fileURLToPath(new URL('../main.js', import.meta.url));
|
|
64
|
+
this.workerArgs = options.workerArgs ?? ['openai-agent'];
|
|
65
|
+
this.homeDir = options.homeDir ?? homedir();
|
|
66
|
+
this.processEnv = options.processEnv ?? process.env;
|
|
67
|
+
this.providerCredentialResolver =
|
|
68
|
+
options.providerCredentialResolver ??
|
|
69
|
+
((providerId) => getAgentProvider(providerId)?.apiKey);
|
|
51
70
|
// 市场内核:注入 sps 的 claude-agent-sdk(0.3.x);records 落盘(daemon 崩溃恢复,resume-by-id 兜底)。
|
|
52
|
-
this.ready =
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
71
|
+
this.ready = Promise.resolve(options.kernel ??
|
|
72
|
+
createRuntime({
|
|
73
|
+
claudeSdk: claudeSdk,
|
|
74
|
+
statePath: resolve(this.homeDir, '.coral', 'sessions', 'runtime-state.json'),
|
|
75
|
+
})).then((k) => {
|
|
56
76
|
this.kernel = k;
|
|
57
77
|
});
|
|
58
78
|
}
|
|
@@ -64,13 +84,13 @@ export class RuntimeSessionRuntime {
|
|
|
64
84
|
buildSessionName(slot) {
|
|
65
85
|
return slot.startsWith('session-') ? `sps-${slot}` : `sps-runtime-${slot}`;
|
|
66
86
|
}
|
|
67
|
-
/** agent-runtime SessionRecord → sps
|
|
68
|
-
|
|
87
|
+
/** agent-runtime SessionRecord → sps WorkerSessionRecord(缺的字段合理默认;市场模型不追全 ACP 字段)。 */
|
|
88
|
+
toWorkerSessionRecord(r) {
|
|
69
89
|
const now = new Date().toISOString();
|
|
70
90
|
const running = r.runState === 'running';
|
|
71
91
|
return {
|
|
72
92
|
slot: r.slot,
|
|
73
|
-
tool: 'claude',
|
|
93
|
+
tool: r.backend === 'openai' ? 'openai' : 'claude',
|
|
74
94
|
sessionId: r.sessionId ?? this.sessionIds.get(r.slot) ?? '',
|
|
75
95
|
sessionName: this.buildSessionName(r.slot),
|
|
76
96
|
pid: r.pid ?? null,
|
|
@@ -86,16 +106,118 @@ export class RuntimeSessionRuntime {
|
|
|
86
106
|
lastSeenAt: r.updatedAt ?? null,
|
|
87
107
|
lastOutputAt: r.lastOutputAt ?? null,
|
|
88
108
|
lastPaneText: '',
|
|
109
|
+
runId: r.runId ?? null,
|
|
110
|
+
turnId: r.turnId ?? null,
|
|
111
|
+
lastSequence: r.lastSequence ?? 0,
|
|
112
|
+
terminal: r.terminal ?? null,
|
|
113
|
+
...(r.resumeFailed ? { resumeFailed: r.resumeFailed } : {}),
|
|
114
|
+
...(r.capabilities ? { capabilities: r.capabilities } : {}),
|
|
115
|
+
...(r.liveness ? { liveness: r.liveness } : {}),
|
|
89
116
|
};
|
|
90
117
|
}
|
|
91
118
|
/** ensureSession opts(McpServerConfig + resume/skills/outputStyle)→ agent-runtime SessionConfig。 */
|
|
92
|
-
buildConfig(cwd, opts) {
|
|
119
|
+
buildConfig(backend, cwd, opts) {
|
|
93
120
|
const mcpServers = (opts?.mcpServers ?? []).map((m) => ({
|
|
94
121
|
name: m.name,
|
|
95
122
|
transport: 'stdio',
|
|
96
123
|
command: m.command,
|
|
97
124
|
args: m.args,
|
|
98
125
|
}));
|
|
126
|
+
if (backend === 'openai') {
|
|
127
|
+
const provider = opts?.provider;
|
|
128
|
+
if (!provider) {
|
|
129
|
+
throw new Error('OpenAI daemon session requires an explicit provider');
|
|
130
|
+
}
|
|
131
|
+
const env = {};
|
|
132
|
+
for (const key of [
|
|
133
|
+
'HOME',
|
|
134
|
+
'PATH',
|
|
135
|
+
'OPENAI_API_KEY',
|
|
136
|
+
'SPS_OPENAI_API_KEY',
|
|
137
|
+
'SPS_PROVIDER_API_KEY',
|
|
138
|
+
'CODEX_AUTH_FILE',
|
|
139
|
+
'HTTP_PROXY',
|
|
140
|
+
'HTTPS_PROXY',
|
|
141
|
+
'NO_PROXY',
|
|
142
|
+
'NODE_ENV',
|
|
143
|
+
'SPS_OPENAI_SANDBOX_IMAGE',
|
|
144
|
+
// 记忆 v2:自定义 store 根/模式透传给 openai worker,其 memory_* MCP 工具(及其 sps MCP 子进程)
|
|
145
|
+
// 才落到与父进程同一 store(默认 ~/.coral/memory 时 resolve 一致、无需透传)。
|
|
146
|
+
'SPS_MEMORY_ROOT',
|
|
147
|
+
'SPS_MEMORY_MODE',
|
|
148
|
+
'SPS_MEMORY_EXTERNAL_URL',
|
|
149
|
+
]) {
|
|
150
|
+
const value = opts?.extraEnv?.[key] ?? this.processEnv[key];
|
|
151
|
+
if (value !== undefined)
|
|
152
|
+
env[key] = value;
|
|
153
|
+
}
|
|
154
|
+
// 卡片 skill 白名单 → 经 env 透传给 openai worker(envAllowlist=Object.keys(env)),
|
|
155
|
+
// worker 侧 prepareOpenAISandboxExecution 据此把 skillsDir 过滤成只含这些技能(S1)。
|
|
156
|
+
if (opts?.skills?.length)
|
|
157
|
+
env.SPS_CARD_SKILLS = opts.skills.join(',');
|
|
158
|
+
// 人设 style 名字(S5):claude 用官方 Output Style,openai 无此机制 → 透传名字,worker 的
|
|
159
|
+
// buildOpenAIAgentInstructions 读 .claude/output-styles/<name>.md 正文注入 system prompt。
|
|
160
|
+
if (opts?.outputStyle)
|
|
161
|
+
env.SPS_WORKER_OUTPUT_STYLE = opts.outputStyle;
|
|
162
|
+
const production = this.processEnv.NODE_ENV === 'production';
|
|
163
|
+
const configuredSandbox = this.processEnv.SPS_OPENAI_SANDBOX_PROVIDER;
|
|
164
|
+
const sandboxProvider = configuredSandbox ?? (production ? 'docker' : 'unix_local');
|
|
165
|
+
if (sandboxProvider !== 'unix_local' &&
|
|
166
|
+
sandboxProvider !== 'docker') {
|
|
167
|
+
throw new Error(`Unsupported OpenAI daemon sandbox provider: ${sandboxProvider}`);
|
|
168
|
+
}
|
|
169
|
+
if (production && sandboxProvider !== 'docker') {
|
|
170
|
+
throw new Error('Production OpenAI daemon sessions require the Docker sandbox provider');
|
|
171
|
+
}
|
|
172
|
+
if (provider.providerId !== 'codex' &&
|
|
173
|
+
provider.providerId !== 'official') {
|
|
174
|
+
const credential = this.providerCredentialResolver(provider.providerId);
|
|
175
|
+
if (credential)
|
|
176
|
+
env.SPS_PROVIDER_API_KEY = credential;
|
|
177
|
+
}
|
|
178
|
+
const cfg = {
|
|
179
|
+
backend: 'openai',
|
|
180
|
+
cwd,
|
|
181
|
+
model: provider.model,
|
|
182
|
+
...(opts?.resumeSessionId
|
|
183
|
+
? { resumeSessionId: opts.resumeSessionId }
|
|
184
|
+
: {}),
|
|
185
|
+
env,
|
|
186
|
+
mcpServers,
|
|
187
|
+
externalProcess: {
|
|
188
|
+
executable: process.execPath,
|
|
189
|
+
args: [this.workerEntry, ...this.workerArgs],
|
|
190
|
+
envAllowlist: Object.keys(env),
|
|
191
|
+
sessionRoot: resolve(this.homeDir, '.coral', 'sessions', 'openai'),
|
|
192
|
+
provider: {
|
|
193
|
+
providerId: provider.providerId,
|
|
194
|
+
model: provider.model,
|
|
195
|
+
transport: provider.transport,
|
|
196
|
+
...(provider.baseUrl ? { baseUrl: provider.baseUrl } : {}),
|
|
197
|
+
},
|
|
198
|
+
conversationOwner: { kind: 'local_session' },
|
|
199
|
+
agentBundleVersion: '1',
|
|
200
|
+
sandbox: {
|
|
201
|
+
profile: sandboxProvider === 'docker' ? 'production' : 'workspace',
|
|
202
|
+
provider: sandboxProvider,
|
|
203
|
+
},
|
|
204
|
+
mcp: {
|
|
205
|
+
servers: (opts?.mcpServers ?? []).map((server) => ({
|
|
206
|
+
name: server.name,
|
|
207
|
+
transport: 'stdio',
|
|
208
|
+
commandRef: `sps:${server.name}`,
|
|
209
|
+
})),
|
|
210
|
+
},
|
|
211
|
+
options: {
|
|
212
|
+
trace: this.processEnv.SPS_OPENAI_AGENT_TRACE === '1',
|
|
213
|
+
},
|
|
214
|
+
onStderr: (data) => {
|
|
215
|
+
process.stderr.write(`[openai-agent] ${data}`);
|
|
216
|
+
},
|
|
217
|
+
},
|
|
218
|
+
};
|
|
219
|
+
return cfg;
|
|
220
|
+
}
|
|
99
221
|
const cfg = {
|
|
100
222
|
backend: 'claude',
|
|
101
223
|
cwd,
|
|
@@ -115,7 +237,7 @@ export class RuntimeSessionRuntime {
|
|
|
115
237
|
// 🔴 worker 必须继承 daemon 进程 env(PATH 等)+ SPS_* 覆盖——与旧 ACP 路 `{...process.env, ...extraEnv}` 对齐。
|
|
116
238
|
// 只赋 extraEnv 会**替换**整个 env、丢掉 PATH → claude 钩子里 `sps hook ...` 报 command not found
|
|
117
239
|
// → STARTED-<stage> ACK 标签打不上 → ACK 超时 → 卡片误判 NEEDS-FIX(daemon 切换后的 seq129 坑)。
|
|
118
|
-
cfg.env = { ...
|
|
240
|
+
cfg.env = { ...this.processEnv, ...(opts?.extraEnv ?? {}) };
|
|
119
241
|
// 保活(persistent):一个 claude 子进程跨多轮常驻(流式输入喂多轮),等价 ACP 的暖会话——
|
|
120
242
|
// 秒回、不必每轮 resume 重读整条 transcript;空闲由 daemon idle-TTL(默认 10min)回收(无损,下次 resume)。
|
|
121
243
|
cfg.claude = { persistent: true };
|
|
@@ -129,26 +251,27 @@ export class RuntimeSessionRuntime {
|
|
|
129
251
|
cfg.claude.extraOptions = extra;
|
|
130
252
|
return cfg;
|
|
131
253
|
}
|
|
132
|
-
async ensureSession(slot,
|
|
254
|
+
async ensureSession(slot, tool = 'claude', cwd = process.cwd(), opts) {
|
|
133
255
|
const kernel = await this.k();
|
|
134
|
-
const rec = await kernel.ensureSession(slot, this.buildConfig(cwd, opts));
|
|
256
|
+
const rec = await kernel.ensureSession(slot, this.buildConfig(tool, cwd, opts));
|
|
135
257
|
if (rec.sessionId)
|
|
136
258
|
this.sessionIds.set(slot, rec.sessionId);
|
|
137
|
-
|
|
259
|
+
this.sessionBackends.set(slot, tool);
|
|
260
|
+
return this.toWorkerSessionRecord({ ...rec, slot });
|
|
138
261
|
}
|
|
139
262
|
async startRun(slot, prompt) {
|
|
140
263
|
const kernel = await this.k();
|
|
141
264
|
const rec = await kernel.startRun(slot, prompt);
|
|
142
265
|
if (rec.sessionId)
|
|
143
266
|
this.sessionIds.set(slot, rec.sessionId);
|
|
144
|
-
return this.
|
|
267
|
+
return this.toWorkerSessionRecord({ ...rec, slot });
|
|
145
268
|
}
|
|
146
269
|
/** resume 由 ensureSession 的 resumeSessionId 处理;这里等价再派一轮。 */
|
|
147
270
|
async resumeRun(slot, prompt) {
|
|
148
271
|
return this.startRun(slot, prompt);
|
|
149
272
|
}
|
|
150
273
|
/** callback subscribe(daemon 契约)桥接 agent-runtime 的 async-iterable + 富事件映射。 */
|
|
151
|
-
subscribe(slot, listener) {
|
|
274
|
+
subscribe(slot, listener, opts) {
|
|
152
275
|
let cancelled = false;
|
|
153
276
|
let sub = null;
|
|
154
277
|
void (async () => {
|
|
@@ -156,11 +279,48 @@ export class RuntimeSessionRuntime {
|
|
|
156
279
|
if (cancelled)
|
|
157
280
|
return;
|
|
158
281
|
sub = kernel.subscribe(slot);
|
|
282
|
+
const initialRecord = (await kernel.inspect(slot))[0];
|
|
283
|
+
const backend = this.sessionBackends.get(slot) ??
|
|
284
|
+
(initialRecord?.backend === 'openai' ? 'openai' : 'claude');
|
|
285
|
+
const seenEventIds = new Set();
|
|
286
|
+
let lastSequence = opts?.afterSequence ?? 0;
|
|
287
|
+
const emitMapped = (mapped) => {
|
|
288
|
+
listener(mapped);
|
|
289
|
+
};
|
|
290
|
+
const emitProcess = (event) => {
|
|
291
|
+
if (seenEventIds.has(event.eventId) ||
|
|
292
|
+
event.sequence <= lastSequence) {
|
|
293
|
+
return;
|
|
294
|
+
}
|
|
295
|
+
seenEventIds.add(event.eventId);
|
|
296
|
+
lastSequence = event.sequence;
|
|
297
|
+
for (const mapped of mapRuntimeEvent({ kind: 'process', event })) {
|
|
298
|
+
emitMapped(mapped);
|
|
299
|
+
}
|
|
300
|
+
};
|
|
301
|
+
if (backend === 'openai') {
|
|
302
|
+
const record = initialRecord;
|
|
303
|
+
if (record?.sessionId && record.runId) {
|
|
304
|
+
const output = new WorkerOutputStore(resolve(this.homeDir, '.coral', 'sessions', 'openai', record.sessionId), record.sessionId, record.runId);
|
|
305
|
+
for await (const event of output.replay(lastSequence)) {
|
|
306
|
+
emitProcess(event);
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
}
|
|
159
310
|
for await (const ev of sub) {
|
|
160
311
|
if (cancelled)
|
|
161
312
|
break;
|
|
162
|
-
|
|
163
|
-
|
|
313
|
+
const runtimeEvent = ev;
|
|
314
|
+
// ExternalProcessBackend intentionally emits rich + compatibility-thin
|
|
315
|
+
// events. SPS consumes the rich stream only to avoid double rendering.
|
|
316
|
+
if (backend === 'openai' && runtimeEvent.kind !== 'process')
|
|
317
|
+
continue;
|
|
318
|
+
if (runtimeEvent.kind === 'process') {
|
|
319
|
+
emitProcess(runtimeEvent.event);
|
|
320
|
+
continue;
|
|
321
|
+
}
|
|
322
|
+
for (const mapped of mapRuntimeEvent(runtimeEvent)) {
|
|
323
|
+
emitMapped(mapped);
|
|
164
324
|
}
|
|
165
325
|
}
|
|
166
326
|
})();
|
|
@@ -172,16 +332,73 @@ export class RuntimeSessionRuntime {
|
|
|
172
332
|
async cancelRun(slot) {
|
|
173
333
|
await (await this.k()).cancelRun(slot);
|
|
174
334
|
}
|
|
335
|
+
async submitInteraction(slot, interactionId, answer, expectedRevision) {
|
|
336
|
+
const kernel = await this.k();
|
|
337
|
+
const record = (await kernel.inspect(slot))[0];
|
|
338
|
+
if (!record || record.backend !== 'openai' || !record.sessionId) {
|
|
339
|
+
throw new Error(`OpenAI session ${slot} was not found`);
|
|
340
|
+
}
|
|
341
|
+
const normalized = JSON.parse(JSON.stringify(answer));
|
|
342
|
+
const interactions = new InteractionStore(resolve(this.homeDir, '.coral', 'sessions', 'openai', record.sessionId));
|
|
343
|
+
await interactions.submit(interactionId, expectedRevision, normalized);
|
|
344
|
+
if (!kernel.submitInteraction) {
|
|
345
|
+
throw new Error('Runtime kernel does not support interactions');
|
|
346
|
+
}
|
|
347
|
+
await kernel.submitInteraction(slot, interactionId, normalized);
|
|
348
|
+
}
|
|
349
|
+
async cancelInteraction(slot, interactionId, expectedRevision) {
|
|
350
|
+
const kernel = await this.k();
|
|
351
|
+
const record = (await kernel.inspect(slot))[0];
|
|
352
|
+
if (!record || record.backend !== 'openai' || !record.sessionId) {
|
|
353
|
+
throw new Error(`OpenAI session ${slot} was not found`);
|
|
354
|
+
}
|
|
355
|
+
const interactions = new InteractionStore(resolve(this.homeDir, '.coral', 'sessions', 'openai', record.sessionId));
|
|
356
|
+
await interactions.cancel(interactionId, expectedRevision);
|
|
357
|
+
await kernel.stopSession(slot, 'cancelled');
|
|
358
|
+
}
|
|
175
359
|
async stopSession(slot) {
|
|
176
360
|
await (await this.k()).stopSession(slot);
|
|
177
361
|
this.sessionIds.delete(slot);
|
|
362
|
+
this.sessionBackends.delete(slot);
|
|
363
|
+
}
|
|
364
|
+
/**
|
|
365
|
+
* Retention boundary: stop the controlled worker first, then remove the
|
|
366
|
+
* entire worker-owned session tree (history, outputs, checkpoints,
|
|
367
|
+
* interactions, ledger, metrics, and sandbox snapshots) as one retryable
|
|
368
|
+
* operation.
|
|
369
|
+
*/
|
|
370
|
+
async deleteSession(slot, expectedSessionId) {
|
|
371
|
+
const kernel = await this.k();
|
|
372
|
+
const record = (await kernel.inspect(slot))[0];
|
|
373
|
+
if (record && record.backend !== 'openai') {
|
|
374
|
+
throw new Error(`Refusing to delete non-OpenAI session ${slot}`);
|
|
375
|
+
}
|
|
376
|
+
const sessionId = record?.sessionId ?? expectedSessionId;
|
|
377
|
+
if (record?.sessionId && expectedSessionId && record.sessionId !== expectedSessionId) {
|
|
378
|
+
throw new Error(`Session identity changed for ${slot}; refusing retention cleanup`);
|
|
379
|
+
}
|
|
380
|
+
await kernel.stopSession(slot);
|
|
381
|
+
this.sessionIds.delete(slot);
|
|
382
|
+
this.sessionBackends.delete(slot);
|
|
383
|
+
if (!sessionId)
|
|
384
|
+
return;
|
|
385
|
+
if (!/^[A-Za-z0-9][A-Za-z0-9._-]{0,199}$/.test(sessionId)) {
|
|
386
|
+
throw new Error('OpenAI session id contains unsafe path characters');
|
|
387
|
+
}
|
|
388
|
+
const root = resolve(this.homeDir, '.coral', 'sessions', 'openai');
|
|
389
|
+
const target = resolve(root, sessionId);
|
|
390
|
+
const path = relative(root, target);
|
|
391
|
+
if (path === '..' || path.startsWith(`..${sep}`)) {
|
|
392
|
+
throw new Error('OpenAI session retention target escapes its root');
|
|
393
|
+
}
|
|
394
|
+
await rm(target, { recursive: true, force: true });
|
|
178
395
|
}
|
|
179
396
|
async inspect(slot) {
|
|
180
397
|
const recs = await (await this.k()).inspect(slot);
|
|
181
398
|
const sessions = {};
|
|
182
399
|
for (const r of recs)
|
|
183
|
-
sessions[r.slot] = this.
|
|
184
|
-
return { version: 1, updatedAt: new Date().toISOString(), updatedBy: 'runtime', sessions };
|
|
400
|
+
sessions[r.slot] = this.toWorkerSessionRecord(r);
|
|
401
|
+
return { version: 1, schemaVersion: 2, updatedAt: new Date().toISOString(), updatedBy: 'runtime', sessions };
|
|
185
402
|
}
|
|
186
403
|
/** 死记录 GC:市场内核已做 idle-TTL 回收;此处为 daemon 周期调用留一个安全 no-op(不阻断)。 */
|
|
187
404
|
gcOfflineSessions(_staleMs) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RuntimeSessionRuntime.js","sourceRoot":"","sources":["../../src/providers/RuntimeSessionRuntime.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"RuntimeSessionRuntime.js","sourceRoot":"","sources":["../../src/providers/RuntimeSessionRuntime.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatTools.d.ts","sourceRoot":"","sources":["../../../src/providers/llm/chatTools.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"chatTools.d.ts","sourceRoot":"","sources":["../../../src/providers/llm/chatTools.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAQxB,wBAAgB,SAAS;;;;;;8BAuHxB"}
|
|
@@ -7,10 +7,10 @@
|
|
|
7
7
|
* @boundedContext chat
|
|
8
8
|
*/
|
|
9
9
|
import { existsSync, readdirSync } from 'node:fs';
|
|
10
|
-
import { basename, join
|
|
10
|
+
import { basename, join } from 'node:path';
|
|
11
11
|
import { tool } from '@openai/agents';
|
|
12
12
|
import { z } from 'zod';
|
|
13
|
-
|
|
13
|
+
import { projectsDir } from '../../shared/runtimePaths.js';
|
|
14
14
|
/** 目录 basename → 合法项目名(非 [a-zA-Z0-9_-] 换 '-',折叠去边)。 */
|
|
15
15
|
function sanitizeProjectName(raw) {
|
|
16
16
|
return raw.replace(/[^a-zA-Z0-9_-]/g, '-').replace(/-+/g, '-').replace(/^-+|-+$/g, '');
|
|
@@ -75,7 +75,7 @@ export function chatTools() {
|
|
|
75
75
|
description: '列出本机已有项目名。',
|
|
76
76
|
parameters: z.object({}),
|
|
77
77
|
async execute() {
|
|
78
|
-
const dir =
|
|
78
|
+
const dir = projectsDir();
|
|
79
79
|
if (!existsSync(dir))
|
|
80
80
|
return '(无项目)';
|
|
81
81
|
const names = readdirSync(dir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatTools.js","sourceRoot":"","sources":["../../../src/providers/llm/chatTools.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"chatTools.js","sourceRoot":"","sources":["../../../src/providers/llm/chatTools.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,11 @@ export interface CodexCreds {
|
|
|
3
3
|
accessToken: string;
|
|
4
4
|
accountId: string;
|
|
5
5
|
}
|
|
6
|
+
export interface CodexCredentialOptions {
|
|
7
|
+
authPath?: string;
|
|
8
|
+
fetchImpl?: typeof fetch;
|
|
9
|
+
now?: () => number;
|
|
10
|
+
}
|
|
6
11
|
/** 取可用的 Codex 凭据;access_token 过期(留 2 分钟余量)则刷新并写回 auth.json。 */
|
|
7
|
-
export declare function getCodexCreds(): Promise<CodexCreds>;
|
|
12
|
+
export declare function getCodexCreds(options?: CodexCredentialOptions): Promise<CodexCreds>;
|
|
8
13
|
//# sourceMappingURL=codexAuth.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codexAuth.d.ts","sourceRoot":"","sources":["../../../src/providers/llm/codexAuth.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,oBAAoB,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"codexAuth.d.ts","sourceRoot":"","sources":["../../../src/providers/llm/codexAuth.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,oBAAoB,0CAA0C,CAAC;AAG5E,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAWD,+DAA+D;AAC/D,wBAAsB,aAAa,CACjC,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,UAAU,CAAC,CAyBrB"}
|
|
@@ -6,13 +6,14 @@
|
|
|
6
6
|
* @layer provider
|
|
7
7
|
* @boundedContext smartarrange
|
|
8
8
|
*/
|
|
9
|
-
import { readFileSync, writeFileSync } from 'node:fs';
|
|
9
|
+
import { readFileSync, renameSync, writeFileSync } from 'node:fs';
|
|
10
10
|
import { homedir } from 'node:os';
|
|
11
|
-
import { join } from 'node:path';
|
|
12
|
-
|
|
11
|
+
import { dirname, join } from 'node:path';
|
|
12
|
+
import { randomUUID } from 'node:crypto';
|
|
13
13
|
const CLIENT_ID = 'app_EMoamEEZ73f0CkXaXp7hrann';
|
|
14
14
|
const TOKEN_URL = 'https://auth.openai.com/oauth/token';
|
|
15
15
|
export const CODEX_RESPONSES_BASE = 'https://chatgpt.com/backend-api/codex';
|
|
16
|
+
const refreshes = new Map();
|
|
16
17
|
function jwtExpMs(jwt) {
|
|
17
18
|
try {
|
|
18
19
|
const p = JSON.parse(Buffer.from(jwt.split('.')[1], 'base64url').toString());
|
|
@@ -23,17 +24,47 @@ function jwtExpMs(jwt) {
|
|
|
23
24
|
}
|
|
24
25
|
}
|
|
25
26
|
/** 取可用的 Codex 凭据;access_token 过期(留 2 分钟余量)则刷新并写回 auth.json。 */
|
|
26
|
-
export async function getCodexCreds() {
|
|
27
|
-
const
|
|
27
|
+
export async function getCodexCreds(options = {}) {
|
|
28
|
+
const authPath = options.authPath ??
|
|
29
|
+
process.env.CODEX_AUTH_FILE ??
|
|
30
|
+
join(homedir(), '.codex', 'auth.json');
|
|
31
|
+
const raw = readCodexAuth(authPath);
|
|
28
32
|
const access = raw.tokens?.access_token;
|
|
29
33
|
const refresh = raw.tokens?.refresh_token;
|
|
30
34
|
const accountId = raw.tokens?.account_id;
|
|
31
35
|
if (!access || !refresh || !accountId)
|
|
32
|
-
throw new Error(
|
|
33
|
-
if (Date.now() <= jwtExpMs(access) - 120_000) {
|
|
36
|
+
throw new Error(`${authPath} 缺 token/account_id(请先用 codex 登录)`);
|
|
37
|
+
if ((options.now ?? Date.now)() <= jwtExpMs(access) - 120_000) {
|
|
34
38
|
return { accessToken: access, accountId };
|
|
35
39
|
}
|
|
36
|
-
const
|
|
40
|
+
const currentRefresh = refreshes.get(authPath);
|
|
41
|
+
if (currentRefresh)
|
|
42
|
+
return currentRefresh;
|
|
43
|
+
const operation = refreshCodexCredentials(authPath, options);
|
|
44
|
+
refreshes.set(authPath, operation);
|
|
45
|
+
try {
|
|
46
|
+
return await operation;
|
|
47
|
+
}
|
|
48
|
+
finally {
|
|
49
|
+
if (refreshes.get(authPath) === operation)
|
|
50
|
+
refreshes.delete(authPath);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
function readCodexAuth(authPath) {
|
|
54
|
+
return JSON.parse(readFileSync(authPath, 'utf-8'));
|
|
55
|
+
}
|
|
56
|
+
async function refreshCodexCredentials(authPath, options) {
|
|
57
|
+
// Another process may have refreshed since the initial read.
|
|
58
|
+
const raw = readCodexAuth(authPath);
|
|
59
|
+
const access = raw.tokens?.access_token;
|
|
60
|
+
const refresh = raw.tokens?.refresh_token;
|
|
61
|
+
const accountId = raw.tokens?.account_id;
|
|
62
|
+
if (!access || !refresh || !accountId)
|
|
63
|
+
throw new Error(`${authPath} 缺 token/account_id(请先用 codex 登录)`);
|
|
64
|
+
if ((options.now ?? Date.now)() <= jwtExpMs(access) - 120_000) {
|
|
65
|
+
return { accessToken: access, accountId };
|
|
66
|
+
}
|
|
67
|
+
const res = await (options.fetchImpl ?? fetch)(TOKEN_URL, {
|
|
37
68
|
method: 'POST',
|
|
38
69
|
headers: { 'content-type': 'application/json' },
|
|
39
70
|
body: JSON.stringify({ grant_type: 'refresh_token', client_id: CLIENT_ID, refresh_token: refresh }),
|
|
@@ -51,7 +82,12 @@ export async function getCodexCreds() {
|
|
|
51
82
|
account_id: accountId,
|
|
52
83
|
};
|
|
53
84
|
raw.last_refresh = new Date().toISOString();
|
|
54
|
-
|
|
85
|
+
atomicWriteAuth(authPath, raw);
|
|
55
86
|
return { accessToken: j.access_token, accountId };
|
|
56
87
|
}
|
|
88
|
+
function atomicWriteAuth(authPath, value) {
|
|
89
|
+
const temporary = join(dirname(authPath), `.${randomUUID()}.auth.json.tmp`);
|
|
90
|
+
writeFileSync(temporary, JSON.stringify(value, null, 2), { mode: 0o600 });
|
|
91
|
+
renameSync(temporary, authPath);
|
|
92
|
+
}
|
|
57
93
|
//# sourceMappingURL=codexAuth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codexAuth.js","sourceRoot":"","sources":["../../../src/providers/llm/codexAuth.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"codexAuth.js","sourceRoot":"","sources":["../../../src/providers/llm/codexAuth.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,SAAS,GAAG,8BAA8B,CAAC;AACjD,MAAM,SAAS,GAAG,qCAAqC,CAAC;AACxD,MAAM,CAAC,MAAM,oBAAoB,GAAG,uCAAuC,CAAC;AAC5E,MAAM,SAAS,GAAG,IAAI,GAAG,EAA+B,CAAC;AAazD,SAAS,QAAQ,CAAC,GAAW;IAC3B,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7E,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,CAAC;IACX,CAAC;AACH,CAAC;AAED,+DAA+D;AAC/D,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,UAAkC,EAAE;IAEpC,MAAM,QAAQ,GACZ,OAAO,CAAC,QAAQ;QAChB,OAAO,CAAC,GAAG,CAAC,eAAe;QAC3B,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IACzC,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC;IACxC,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC;IAC1C,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;IACzC,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS;QACnC,MAAM,IAAI,KAAK,CAAC,GAAG,QAAQ,mCAAmC,CAAC,CAAC;IAElE,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,QAAQ,CAAC,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;QAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC5C,CAAC;IAED,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC/C,IAAI,cAAc;QAAE,OAAO,cAAc,CAAC;IAC1C,MAAM,SAAS,GAAG,uBAAuB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7D,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACnC,IAAI,CAAC;QACH,OAAO,MAAM,SAAS,CAAC;IACzB,CAAC;YAAS,CAAC;QACT,IAAI,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,SAAS;YAAE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACxE,CAAC;AACH,CAAC;AAOD,SAAS,aAAa,CAAC,QAAgB;IACrC,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAkB,CAAC;AACtE,CAAC;AAED,KAAK,UAAU,uBAAuB,CACpC,QAAgB,EAChB,OAA+B;IAE/B,6DAA6D;IAC7D,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC;IACxC,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC;IAC1C,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;IACzC,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS;QACnC,MAAM,IAAI,KAAK,CAAC,GAAG,QAAQ,mCAAmC,CAAC,CAAC;IAElE,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,QAAQ,CAAC,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;QAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAC5C,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,IAAI,KAAK,CAAC,CAAC,SAAS,EAAE;QACxD,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC;KACpG,CAAC,CAAC;IACH,IAAI,CAAC,GAAG,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,CAAC,MAAM,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IACzG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAyE,CAAC;IACrG,IAAI,CAAC,CAAC,CAAC,YAAY;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAEjE,GAAG,CAAC,MAAM,GAAG;QACX,GAAG,GAAG,CAAC,MAAM;QACb,YAAY,EAAE,CAAC,CAAC,YAAY;QAC5B,aAAa,EAAE,CAAC,CAAC,aAAa,IAAI,OAAO;QACzC,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC,MAAM,EAAE,QAAQ;QAC5C,UAAU,EAAE,SAAS;KACtB,CAAC;IACF,GAAG,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC5C,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAE/B,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,YAAY,EAAE,SAAS,EAAE,CAAC;AACpD,CAAC;AAED,SAAS,eAAe,CAAC,QAAgB,EAAE,KAAoB;IAC7D,MAAM,SAAS,GAAG,IAAI,CACpB,OAAO,CAAC,QAAQ,CAAC,EACjB,IAAI,UAAU,EAAE,gBAAgB,CACjC,CAAC;IACF,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1E,UAAU,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAClC,CAAC"}
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
* @boundedContext smartarrange
|
|
10
10
|
*/
|
|
11
11
|
import { OpenAIResponsesModel } from '@openai/agents';
|
|
12
|
+
import { type CodexCreds } from './codexAuth.js';
|
|
12
13
|
/**
|
|
13
14
|
* 构造一个走【自定义 URL + API Key】的 Responses Model(openai/chatgpt 生图适配器用):
|
|
14
15
|
* 与 codex 同款链路(GPT 模型 + hosted image_generation 工具),但鉴权是静态 Bearer Key,
|
|
@@ -16,5 +17,7 @@ import { OpenAIResponsesModel } from '@openai/agents';
|
|
|
16
17
|
*/
|
|
17
18
|
export declare function buildRelayResponsesModel(baseUrl: string, apiKey: string, model: string): OpenAIResponsesModel;
|
|
18
19
|
/** 构造一个走 Codex(ChatGPT 订阅)的 Responses Model:每请求刷新 token、注鉴权头、store:false、修 SSE。 */
|
|
19
|
-
export declare function buildCodexModel(model: string
|
|
20
|
+
export declare function buildCodexModel(model: string, options?: {
|
|
21
|
+
resolveCredentials?: () => Promise<CodexCreds>;
|
|
22
|
+
}): OpenAIResponsesModel;
|
|
20
23
|
//# sourceMappingURL=codexModel.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codexModel.d.ts","sourceRoot":"","sources":["../../../src/providers/llm/codexModel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"codexModel.d.ts","sourceRoot":"","sources":["../../../src/providers/llm/codexModel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,gBAAgB,CAAC;AAmDxB;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,oBAAoB,CAqB7G;AAED,mFAAmF;AACnF,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,EACb,OAAO,GAAE;IACP,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;CAC3C,GACL,oBAAoB,CA4CtB"}
|