agent-tower 0.7.1-beta.3 → 0.7.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/dist/executors/__tests__/base.executor.test.js +2 -2
- package/dist/executors/__tests__/base.executor.test.js.map +1 -1
- package/dist/executors/__tests__/codex.executor.test.js +137 -25
- package/dist/executors/__tests__/codex.executor.test.js.map +1 -1
- package/dist/executors/__tests__/providers.test.js +69 -2
- package/dist/executors/__tests__/providers.test.js.map +1 -1
- package/dist/executors/__tests__/stdin-prompt.executors.test.js +61 -3
- package/dist/executors/__tests__/stdin-prompt.executors.test.js.map +1 -1
- package/dist/executors/base.executor.d.ts +8 -1
- package/dist/executors/base.executor.d.ts.map +1 -1
- package/dist/executors/base.executor.js +22 -8
- package/dist/executors/base.executor.js.map +1 -1
- package/dist/executors/claude-code.executor.d.ts +2 -0
- package/dist/executors/claude-code.executor.d.ts.map +1 -1
- package/dist/executors/claude-code.executor.js +51 -41
- package/dist/executors/claude-code.executor.js.map +1 -1
- package/dist/executors/codex.executor.d.ts +3 -0
- package/dist/executors/codex.executor.d.ts.map +1 -1
- package/dist/executors/codex.executor.js +35 -1
- package/dist/executors/codex.executor.js.map +1 -1
- package/dist/executors/cursor-agent.executor.d.ts +1 -0
- package/dist/executors/cursor-agent.executor.d.ts.map +1 -1
- package/dist/executors/cursor-agent.executor.js +2 -0
- package/dist/executors/cursor-agent.executor.js.map +1 -1
- package/dist/executors/default-providers.json +45 -39
- package/dist/executors/gemini-cli.executor.d.ts +3 -1
- package/dist/executors/gemini-cli.executor.d.ts.map +1 -1
- package/dist/executors/gemini-cli.executor.js +18 -12
- package/dist/executors/gemini-cli.executor.js.map +1 -1
- package/dist/executors/index.d.ts +4 -0
- package/dist/executors/index.d.ts.map +1 -1
- package/dist/executors/index.js +14 -4
- package/dist/executors/index.js.map +1 -1
- package/dist/executors/providers.d.ts +4 -1
- package/dist/executors/providers.d.ts.map +1 -1
- package/dist/executors/providers.js +20 -5
- package/dist/executors/providers.js.map +1 -1
- package/dist/output/__tests__/claude-code-parser-lifecycle.test.d.ts +2 -0
- package/dist/output/__tests__/claude-code-parser-lifecycle.test.d.ts.map +1 -0
- package/dist/output/__tests__/claude-code-parser-lifecycle.test.js +84 -0
- package/dist/output/__tests__/claude-code-parser-lifecycle.test.js.map +1 -0
- package/dist/output/claude-code-parser.d.ts +14 -2
- package/dist/output/claude-code-parser.d.ts.map +1 -1
- package/dist/output/claude-code-parser.js +55 -8
- package/dist/output/claude-code-parser.js.map +1 -1
- package/dist/pipeline/__tests__/agent-pipeline.test.js +48 -1
- package/dist/pipeline/__tests__/agent-pipeline.test.js.map +1 -1
- package/dist/pipeline/agent-pipeline.d.ts +6 -1
- package/dist/pipeline/agent-pipeline.d.ts.map +1 -1
- package/dist/pipeline/agent-pipeline.js +42 -4
- package/dist/pipeline/agent-pipeline.js.map +1 -1
- package/dist/routes/__tests__/providers.test.js +287 -12
- package/dist/routes/__tests__/providers.test.js.map +1 -1
- package/dist/routes/__tests__/sessions-runtime.test.js +9 -0
- package/dist/routes/__tests__/sessions-runtime.test.js.map +1 -1
- package/dist/routes/providers.d.ts +2 -0
- package/dist/routes/providers.d.ts.map +1 -1
- package/dist/routes/providers.js +79 -34
- package/dist/routes/providers.js.map +1 -1
- package/dist/routes/sessions.js +2 -2
- package/dist/routes/sessions.js.map +1 -1
- package/dist/runtime/__tests__/acp-agent-definitions.test.js +54 -6
- package/dist/runtime/__tests__/acp-agent-definitions.test.js.map +1 -1
- package/dist/runtime/__tests__/acp-driver-lifecycle.test.js +85 -12
- package/dist/runtime/__tests__/acp-driver-lifecycle.test.js.map +1 -1
- package/dist/runtime/__tests__/acp-driver.test.js +38 -1
- package/dist/runtime/__tests__/acp-driver.test.js.map +1 -1
- package/dist/runtime/__tests__/claude-cli-control.test.d.ts +2 -0
- package/dist/runtime/__tests__/claude-cli-control.test.d.ts.map +1 -0
- package/dist/runtime/__tests__/claude-cli-control.test.js +147 -0
- package/dist/runtime/__tests__/claude-cli-control.test.js.map +1 -0
- package/dist/runtime/__tests__/claude-cli-driver.test.d.ts +2 -0
- package/dist/runtime/__tests__/claude-cli-driver.test.d.ts.map +1 -0
- package/dist/runtime/__tests__/claude-cli-driver.test.js +327 -0
- package/dist/runtime/__tests__/claude-cli-driver.test.js.map +1 -0
- package/dist/runtime/__tests__/cli-driver-lifecycle.test.js +107 -2
- package/dist/runtime/__tests__/cli-driver-lifecycle.test.js.map +1 -1
- package/dist/runtime/__tests__/codex-cli-control.test.d.ts +2 -0
- package/dist/runtime/__tests__/codex-cli-control.test.d.ts.map +1 -0
- package/dist/runtime/__tests__/codex-cli-control.test.js +287 -0
- package/dist/runtime/__tests__/codex-cli-control.test.js.map +1 -0
- package/dist/runtime/__tests__/codex-cli-identity.test.d.ts +2 -0
- package/dist/runtime/__tests__/codex-cli-identity.test.d.ts.map +1 -0
- package/dist/runtime/__tests__/codex-cli-identity.test.js +166 -0
- package/dist/runtime/__tests__/codex-cli-identity.test.js.map +1 -0
- package/dist/runtime/__tests__/codex-runtime-resolution.test.js +32 -0
- package/dist/runtime/__tests__/codex-runtime-resolution.test.js.map +1 -1
- package/dist/runtime/__tests__/runtime-coordinator.test.js +74 -0
- package/dist/runtime/__tests__/runtime-coordinator.test.js.map +1 -1
- package/dist/runtime/acp/acp-driver.d.ts.map +1 -1
- package/dist/runtime/acp/acp-driver.js +27 -9
- package/dist/runtime/acp/acp-driver.js.map +1 -1
- package/dist/runtime/acp/agents/claude-code.d.ts.map +1 -1
- package/dist/runtime/acp/agents/claude-code.js +6 -11
- package/dist/runtime/acp/agents/claude-code.js.map +1 -1
- package/dist/runtime/acp/agents/codex.d.ts.map +1 -1
- package/dist/runtime/acp/agents/codex.js +15 -6
- package/dist/runtime/acp/agents/codex.js.map +1 -1
- package/dist/runtime/acp/agents/cursor-agent.d.ts.map +1 -1
- package/dist/runtime/acp/agents/cursor-agent.js +2 -1
- package/dist/runtime/acp/agents/cursor-agent.js.map +1 -1
- package/dist/runtime/acp/agents/deepseek-hermes.js +3 -3
- package/dist/runtime/acp/agents/deepseek-hermes.js.map +1 -1
- package/dist/runtime/acp/agents/gemini-cli.d.ts.map +1 -1
- package/dist/runtime/acp/agents/gemini-cli.js +1 -0
- package/dist/runtime/acp/agents/gemini-cli.js.map +1 -1
- package/dist/runtime/acp/agents/grok-build.d.ts.map +1 -1
- package/dist/runtime/acp/agents/grok-build.js +4 -1
- package/dist/runtime/acp/agents/grok-build.js.map +1 -1
- package/dist/runtime/acp/agents/kiro-cli.d.ts.map +1 -1
- package/dist/runtime/acp/agents/kiro-cli.js +2 -1
- package/dist/runtime/acp/agents/kiro-cli.js.map +1 -1
- package/dist/runtime/acp/agents/minion-code.js +1 -1
- package/dist/runtime/acp/agents/minion-code.js.map +1 -1
- package/dist/runtime/acp/agents/native-agent.d.ts +2 -0
- package/dist/runtime/acp/agents/native-agent.d.ts.map +1 -1
- package/dist/runtime/acp/agents/native-agent.js +12 -16
- package/dist/runtime/acp/agents/native-agent.js.map +1 -1
- package/dist/runtime/acp/agents/opencode.d.ts.map +1 -1
- package/dist/runtime/acp/agents/opencode.js +50 -2
- package/dist/runtime/acp/agents/opencode.js.map +1 -1
- package/dist/runtime/acp/agents/pi-coding-agent.d.ts.map +1 -1
- package/dist/runtime/acp/agents/pi-coding-agent.js +2 -5
- package/dist/runtime/acp/agents/pi-coding-agent.js.map +1 -1
- package/dist/runtime/acp/agents/qwen-code.d.ts.map +1 -1
- package/dist/runtime/acp/agents/qwen-code.js +9 -11
- package/dist/runtime/acp/agents/qwen-code.js.map +1 -1
- package/dist/runtime/acp/agents/types.d.ts +4 -2
- package/dist/runtime/acp/agents/types.d.ts.map +1 -1
- package/dist/runtime/acp/codex-cli-identity.d.ts +52 -0
- package/dist/runtime/acp/codex-cli-identity.d.ts.map +1 -0
- package/dist/runtime/acp/codex-cli-identity.js +179 -0
- package/dist/runtime/acp/codex-cli-identity.js.map +1 -0
- package/dist/runtime/acp/codex-provider-config.d.ts +15 -2
- package/dist/runtime/acp/codex-provider-config.d.ts.map +1 -1
- package/dist/runtime/acp/codex-provider-config.js +42 -5
- package/dist/runtime/acp/codex-provider-config.js.map +1 -1
- package/dist/runtime/claude-cli-control.d.ts +32 -0
- package/dist/runtime/claude-cli-control.d.ts.map +1 -0
- package/dist/runtime/claude-cli-control.js +156 -0
- package/dist/runtime/claude-cli-control.js.map +1 -0
- package/dist/runtime/cli-action-summary.d.ts +3 -0
- package/dist/runtime/cli-action-summary.d.ts.map +1 -0
- package/dist/runtime/cli-action-summary.js +13 -0
- package/dist/runtime/cli-action-summary.js.map +1 -0
- package/dist/runtime/cli-driver.d.ts.map +1 -1
- package/dist/runtime/cli-driver.js +119 -26
- package/dist/runtime/cli-driver.js.map +1 -1
- package/dist/runtime/cli-parser.d.ts +4 -1
- package/dist/runtime/cli-parser.d.ts.map +1 -1
- package/dist/runtime/cli-parser.js +2 -2
- package/dist/runtime/cli-parser.js.map +1 -1
- package/dist/runtime/codex-cli-control.d.ts +63 -0
- package/dist/runtime/codex-cli-control.d.ts.map +1 -0
- package/dist/runtime/codex-cli-control.js +311 -0
- package/dist/runtime/codex-cli-control.js.map +1 -0
- package/dist/runtime/codex-cli-projector.d.ts +17 -0
- package/dist/runtime/codex-cli-projector.d.ts.map +1 -0
- package/dist/runtime/codex-cli-projector.js +80 -0
- package/dist/runtime/codex-cli-projector.js.map +1 -0
- package/dist/runtime/contracts.d.ts +12 -2
- package/dist/runtime/contracts.d.ts.map +1 -1
- package/dist/runtime/runtime-coordinator.d.ts +1 -1
- package/dist/runtime/runtime-coordinator.d.ts.map +1 -1
- package/dist/runtime/runtime-coordinator.js +40 -6
- package/dist/runtime/runtime-coordinator.js.map +1 -1
- package/dist/services/__tests__/claude-cli-capabilities.service.test.d.ts +2 -0
- package/dist/services/__tests__/claude-cli-capabilities.service.test.d.ts.map +1 -0
- package/dist/services/__tests__/claude-cli-capabilities.service.test.js +37 -0
- package/dist/services/__tests__/claude-cli-capabilities.service.test.js.map +1 -0
- package/dist/services/__tests__/codex-cli-capabilities.service.test.d.ts +2 -0
- package/dist/services/__tests__/codex-cli-capabilities.service.test.d.ts.map +1 -0
- package/dist/services/__tests__/codex-cli-capabilities.service.test.js +35 -0
- package/dist/services/__tests__/codex-cli-capabilities.service.test.js.map +1 -0
- package/dist/services/__tests__/codex-model-capabilities.service.test.js +23 -2
- package/dist/services/__tests__/codex-model-capabilities.service.test.js.map +1 -1
- package/dist/services/__tests__/execution-permission.service.test.d.ts +2 -0
- package/dist/services/__tests__/execution-permission.service.test.d.ts.map +1 -0
- package/dist/services/__tests__/execution-permission.service.test.js +111 -0
- package/dist/services/__tests__/execution-permission.service.test.js.map +1 -0
- package/dist/services/__tests__/provider-config.service.test.js +1 -0
- package/dist/services/__tests__/provider-config.service.test.js.map +1 -1
- package/dist/services/__tests__/session-manager.lifecycle.test.js +151 -3
- package/dist/services/__tests__/session-manager.lifecycle.test.js.map +1 -1
- package/dist/services/claude-cli-capabilities.service.d.ts +11 -0
- package/dist/services/claude-cli-capabilities.service.d.ts.map +1 -0
- package/dist/services/claude-cli-capabilities.service.js +54 -0
- package/dist/services/claude-cli-capabilities.service.js.map +1 -0
- package/dist/services/codex-cli-capabilities.service.d.ts +12 -0
- package/dist/services/codex-cli-capabilities.service.d.ts.map +1 -0
- package/dist/services/codex-cli-capabilities.service.js +65 -0
- package/dist/services/codex-cli-capabilities.service.js.map +1 -0
- package/dist/services/codex-model-capabilities.service.d.ts.map +1 -1
- package/dist/services/codex-model-capabilities.service.js +12 -1
- package/dist/services/codex-model-capabilities.service.js.map +1 -1
- package/dist/services/execution-permission.service.d.ts +30 -0
- package/dist/services/execution-permission.service.d.ts.map +1 -0
- package/dist/services/execution-permission.service.js +149 -0
- package/dist/services/execution-permission.service.js.map +1 -0
- package/dist/services/provider-config.service.d.ts.map +1 -1
- package/dist/services/provider-config.service.js +19 -29
- package/dist/services/provider-config.service.js.map +1 -1
- package/dist/services/session-manager.d.ts +9 -7
- package/dist/services/session-manager.d.ts.map +1 -1
- package/dist/services/session-manager.js +46 -7
- package/dist/services/session-manager.js.map +1 -1
- package/dist/services/task.service.d.ts +4 -4
- package/dist/services/workspace.service.d.ts +7 -7
- package/dist/utils/cli-duplex-channel.d.ts +21 -0
- package/dist/utils/cli-duplex-channel.d.ts.map +1 -0
- package/dist/utils/cli-duplex-channel.js +200 -0
- package/dist/utils/cli-duplex-channel.js.map +1 -0
- package/dist/utils/cli-duplex-channel.test.d.ts +2 -0
- package/dist/utils/cli-duplex-channel.test.d.ts.map +1 -0
- package/dist/utils/cli-duplex-channel.test.js +191 -0
- package/dist/utils/cli-duplex-channel.test.js.map +1 -0
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +1 -0
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/process-launch.d.ts +3 -0
- package/dist/utils/process-launch.d.ts.map +1 -1
- package/dist/utils/process-launch.js +129 -10
- package/dist/utils/process-launch.js.map +1 -1
- package/dist/utils/process-launch.test.js +103 -0
- package/dist/utils/process-launch.test.js.map +1 -1
- package/dist/web/assets/{AgentDemoPage-B6pABvRL.js → AgentDemoPage-Gr8q6VxC.js} +1 -1
- package/dist/web/assets/{AgentEnvironmentSettingsPage-CqMfdwkM.js → AgentEnvironmentSettingsPage-b0XzUzna.js} +1 -1
- package/dist/web/assets/{AgentLogo-Ntqe3_Mx.js → AgentLogo-q8Chady2.js} +1 -1
- package/dist/web/assets/ConversationPage-DQRA8WuD.js +3 -0
- package/dist/web/assets/CreateTaskInput-Dr6Lvllw.js +1 -0
- package/dist/web/assets/{DemoPage-D1Ki6sJ0.js → DemoPage-DaDC_MIJ.js} +1 -1
- package/dist/web/assets/ExecutionPermissionSelector-DglILGVC.js +29 -0
- package/dist/web/assets/{GeneralSettingsPage-DoAXPabw.js → GeneralSettingsPage-BKRf-usO.js} +1 -1
- package/dist/web/assets/{Icons-KJJd6C8K.js → Icons-7lThaqQv.js} +1 -1
- package/dist/web/assets/{LoadingPreviewPage-BqCKBvgv.js → LoadingPreviewPage-BHAQCQDA.js} +1 -1
- package/dist/web/assets/{McpSettingsPage-QXVD4XCW.js → McpSettingsPage-CVOEPwCv.js} +1 -1
- package/dist/web/assets/{MemberAvatar-kbJEoyh0.js → MemberAvatar-DUXHTIXf.js} +1 -1
- package/dist/web/assets/{NotificationSettingsPage-BrqSeU--.js → NotificationSettingsPage-DBe1YCNN.js} +1 -1
- package/dist/web/assets/{ProfileSettingsPage-BmWgVdnG.js → ProfileSettingsPage-DwziCseV.js} +1 -1
- package/dist/web/assets/ProjectKanbanPage-Dcz8KXWU.js +86 -0
- package/dist/web/assets/{ProjectSettingsPage-BVINN99w.js → ProjectSettingsPage-hzSrj79M.js} +1 -1
- package/dist/web/assets/ProviderSettingsPage-CC3zkdf6.js +67 -0
- package/dist/web/assets/{SettingsMasterDetail-OF28cvPV.js → SettingsMasterDetail-D5lNH2f6.js} +1 -1
- package/dist/web/assets/{TeamSettingsPage-BWGm0m7s.js → TeamSettingsPage-Cdbvh2ne.js} +1 -1
- package/dist/web/assets/{arc-CqFgRaZU.js → arc-d2D24uRQ.js} +1 -1
- package/dist/web/assets/{architectureDiagram-3BPJPVTR-C0PMdIZJ.js → architectureDiagram-3BPJPVTR-C_p9_AH2.js} +1 -1
- package/dist/web/assets/{blockDiagram-GPEHLZMM-SqqtxqkX.js → blockDiagram-GPEHLZMM-CKsR1Tax.js} +1 -1
- package/dist/web/assets/{c4Diagram-AAUBKEIU-DYJXB3xL.js → c4Diagram-AAUBKEIU-BBUKt2FW.js} +1 -1
- package/dist/web/assets/channel-D0hF47LU.js +1 -0
- package/dist/web/assets/check-BqhuHtHP.js +1 -0
- package/dist/web/assets/{chevron-down-BZfpVhYr.js → chevron-down-Bw_76CB_.js} +1 -1
- package/dist/web/assets/{chevron-right-D52zUyOF.js → chevron-right-DbcFf_Dw.js} +1 -1
- package/dist/web/assets/{chevron-up-CFOy5dmW.js → chevron-up-x1n3MhC-.js} +1 -1
- package/dist/web/assets/{chunk-2J33WTMH-DQCbv8W_.js → chunk-2J33WTMH-BcGNhDoU.js} +1 -1
- package/dist/web/assets/{chunk-4BX2VUAB-B_68_oNW.js → chunk-4BX2VUAB-9dL7TVjW.js} +1 -1
- package/dist/web/assets/{chunk-55IACEB6-Bb-pPIxs.js → chunk-55IACEB6-CzJzh0tH.js} +1 -1
- package/dist/web/assets/{chunk-727SXJPM-CAiaySk6.js → chunk-727SXJPM-Bp5EOgoG.js} +1 -1
- package/dist/web/assets/{chunk-AQP2D5EJ-ChCLJ4Wv.js → chunk-AQP2D5EJ-BaLnh9ac.js} +1 -1
- package/dist/web/assets/{chunk-FMBD7UC4-Kz0Cc0mv.js → chunk-FMBD7UC4-BcbzC8r4.js} +1 -1
- package/dist/web/assets/{chunk-ND2GUHAM-BttoT7UR.js → chunk-ND2GUHAM-DkT5Stbd.js} +1 -1
- package/dist/web/assets/{chunk-QZHKN3VN-BcVhzXXK.js → chunk-QZHKN3VN-DszScpAV.js} +1 -1
- package/dist/web/assets/{circle-alert-D67xfWMs.js → circle-alert-ChWS5BPS.js} +1 -1
- package/dist/web/assets/classDiagram-4FO5ZUOK-ulXJsBKw.js +1 -0
- package/dist/web/assets/classDiagram-v2-Q7XG4LA2-ulXJsBKw.js +1 -0
- package/dist/web/assets/{code-block-OCS4YCEC-CMA1utSp.js → code-block-OCS4YCEC-G8tEtSdL.js} +1 -1
- package/dist/web/assets/{confirm-dialog-BWvZEHpu.js → confirm-dialog-0vHzUzvI.js} +1 -1
- package/dist/web/assets/{cose-bilkent-S5V4N54A-B391zTey.js → cose-bilkent-S5V4N54A-DueZsNr5.js} +1 -1
- package/dist/web/assets/cssMode-Dqx3XDOC.js +1 -0
- package/dist/web/assets/{dagre-BM42HDAG-CymH_FEZ.js → dagre-BM42HDAG-BkQGrA8s.js} +1 -1
- package/dist/web/assets/{diagram-2AECGRRQ-DXOIiLDr.js → diagram-2AECGRRQ-D4qtEjjj.js} +1 -1
- package/dist/web/assets/{diagram-5GNKFQAL-B9ocgjdh.js → diagram-5GNKFQAL-ZuFk-7GO.js} +1 -1
- package/dist/web/assets/{diagram-KO2AKTUF-DLMpk9Wg.js → diagram-KO2AKTUF-kwBr5lw0.js} +1 -1
- package/dist/web/assets/{diagram-LMA3HP47-BBnF83je.js → diagram-LMA3HP47-m88-mNyr.js} +1 -1
- package/dist/web/assets/{diagram-OG6HWLK6-AK4FunVI.js → diagram-OG6HWLK6-B9gV1dxA.js} +1 -1
- package/dist/web/assets/{erDiagram-TEJ5UH35-B1mryURg.js → erDiagram-TEJ5UH35-De_DsoOX.js} +1 -1
- package/dist/web/assets/{flowDiagram-I6XJVG4X-BjIG_1l5.js → flowDiagram-I6XJVG4X-9VwLS0b3.js} +1 -1
- package/dist/web/assets/{folder-picker-CaM_drIJ.js → folder-picker-B0khMt7A.js} +1 -1
- package/dist/web/assets/{freemarker2-Dj1C_6Ng.js → freemarker2-CLp1Yffb.js} +2 -2
- package/dist/web/assets/{ganttDiagram-6RSMTGT7-DjR6lyIQ.js → ganttDiagram-6RSMTGT7-DoOyYr5i.js} +1 -1
- package/dist/web/assets/{gitGraphDiagram-PVQCEYII-BpW2L4ry.js → gitGraphDiagram-PVQCEYII-CMGuTxMz.js} +1 -1
- package/dist/web/assets/handlebars-CmLfR6Uy.js +1 -0
- package/dist/web/assets/html-D34UDOLc.js +1 -0
- package/dist/web/assets/htmlMode-qjrvkZFJ.js +1 -0
- package/dist/web/assets/{index-DaRxJqVy.js → index-DI7lHrAR.js} +4 -4
- package/dist/web/assets/index-DrzmyANC.js +122 -0
- package/dist/web/assets/index-MMCbS8_L.css +1 -0
- package/dist/web/assets/{infoDiagram-5YYISTIA-Cu-PA_-6.js → infoDiagram-5YYISTIA-gUCDmQX7.js} +1 -1
- package/dist/web/assets/{ishikawaDiagram-YF4QCWOH-S6Esbkdw.js → ishikawaDiagram-YF4QCWOH-CmfFhhIz.js} +1 -1
- package/dist/web/assets/javascript-D5tp0LcO.js +1 -0
- package/dist/web/assets/{journeyDiagram-JHISSGLW-wPF9FT9V.js → journeyDiagram-JHISSGLW-BvV5GoR_.js} +1 -1
- package/dist/web/assets/{jsonMode-D6IoFlQF.js → jsonMode-BbjYNQ7Q.js} +4 -4
- package/dist/web/assets/{kanban-definition-UN3LZRKU-C4jl9zOj.js → kanban-definition-UN3LZRKU-BpTm0MC-.js} +1 -1
- package/dist/web/assets/{layers-hQUUT3Gb.js → layers-DslPQJ3T.js} +1 -1
- package/dist/web/assets/{linear-D83xDp0H.js → linear-BJ_g8wqu.js} +1 -1
- package/dist/web/assets/liquid-DBu3_6XS.js +1 -0
- package/dist/web/assets/{lspLanguageFeatures-CUyibjAN.js → lspLanguageFeatures-PSX0tqnR.js} +1 -1
- package/dist/web/assets/mdx-Bb4nrA8s.js +1 -0
- package/dist/web/assets/{mermaid-NOHMQCX5-CGCWmHha.js → mermaid-NOHMQCX5-B44shuzc.js} +45 -45
- package/dist/web/assets/{message-square-B-uYQiTq.js → message-square-C-22K3oa.js} +1 -1
- package/dist/web/assets/{mindmap-definition-RKZ34NQL-D5v2uvjn.js → mindmap-definition-RKZ34NQL-DS5GLydx.js} +1 -1
- package/dist/web/assets/{modal-D87uszzb.js → modal-CFVLBZ5p.js} +1 -1
- package/dist/web/assets/{monaco-B25-2nEB.js → monaco-CkaUvvB4.js} +3 -3
- package/dist/web/assets/{pencil-CY2RnQrx.js → pencil-DB3VPszm.js} +1 -1
- package/dist/web/assets/{pieDiagram-4H26LBE5-6wdFz_7x.js → pieDiagram-4H26LBE5-C1PJJGsh.js} +1 -1
- package/dist/web/assets/python-BfodDYt4.js +1 -0
- package/dist/web/assets/{quadrantDiagram-W4KKPZXB-C1CrGMEK.js → quadrantDiagram-W4KKPZXB-CzDfs-TQ.js} +1 -1
- package/dist/web/assets/razor-DdED1MBH.js +1 -0
- package/dist/web/assets/{requirementDiagram-4Y6WPE33-mDtZrxpp.js → requirementDiagram-4Y6WPE33-qHbU7oZa.js} +1 -1
- package/dist/web/assets/{sankeyDiagram-5OEKKPKP-hBlj0XoH.js → sankeyDiagram-5OEKKPKP-BfRgrEeN.js} +1 -1
- package/dist/web/assets/select-CL78HCY0.js +1 -0
- package/dist/web/assets/{sequenceDiagram-3UESZ5HK-DsWmMm20.js → sequenceDiagram-3UESZ5HK-CGTNzKk3.js} +1 -1
- package/dist/web/assets/{server-qlZupTvg.js → server-Cd7APx6v.js} +1 -1
- package/dist/web/assets/{stateDiagram-AJRCARHV-VNyX1L66.js → stateDiagram-AJRCARHV-BY1LJ4b7.js} +1 -1
- package/dist/web/assets/stateDiagram-v2-BHNVJYJU-BV_JKRZC.js +1 -0
- package/dist/web/assets/{switch-1pvXCcP-.js → switch-DmQ0Brgd.js} +1 -1
- package/dist/web/assets/{textarea-D9oaz-Ba.js → textarea-DOte4pMQ.js} +1 -1
- package/dist/web/assets/{timeline-definition-PNZ67QCA-DuBxxd9E.js → timeline-definition-PNZ67QCA-BBhCKsly.js} +1 -1
- package/dist/web/assets/{trash-2-C0P8jNpJ.js → trash-2-BSAHXKfW.js} +1 -1
- package/dist/web/assets/{tsMode-ogL-3MSe.js → tsMode-B6rHoWny.js} +2 -2
- package/dist/web/assets/typescript-C2A3q8UY.js +1 -0
- package/dist/web/assets/{upload-BYgsDplu.js → upload-e87qV_RH.js} +1 -1
- package/dist/web/assets/{use-profiles-BkGnmson.js → use-profiles-Cv2zBJOC.js} +1 -1
- package/dist/web/assets/{use-projects-B4w00h5I.js → use-projects-C8WDJXdj.js} +1 -1
- package/dist/web/assets/use-providers-CnpIgITQ.js +1 -0
- package/dist/web/assets/{useNormalizedLogs-MsDkcnRQ.js → useNormalizedLogs-AbIXa8s-.js} +1 -1
- package/dist/web/assets/{vennDiagram-CIIHVFJN-RbPPOLBo.js → vennDiagram-CIIHVFJN-DrDrt_Jg.js} +1 -1
- package/dist/web/assets/{wardley-L42UT6IY-DXzUbdMF.js → wardley-L42UT6IY-CMYQm14y.js} +1 -1
- package/dist/web/assets/{wardleyDiagram-YWT4CUSO-B0QXobQM.js → wardleyDiagram-YWT4CUSO-COLA9A80.js} +1 -1
- package/dist/web/assets/xml-D4xDxfjR.js +1 -0
- package/dist/web/assets/{xychartDiagram-2RQKCTM6-C7bFJItM.js → xychartDiagram-2RQKCTM6-BDegkKoT.js} +1 -1
- package/dist/web/assets/yaml-yJExA7tq.js +1 -0
- package/dist/web/index.html +2 -2
- package/node_modules/@agent-tower/shared/dist/execution-permission.d.ts +19 -0
- package/node_modules/@agent-tower/shared/dist/execution-permission.d.ts.map +1 -0
- package/node_modules/@agent-tower/shared/dist/execution-permission.js +53 -0
- package/node_modules/@agent-tower/shared/dist/execution-permission.js.map +1 -0
- package/node_modules/@agent-tower/shared/dist/index.d.ts +1 -0
- package/node_modules/@agent-tower/shared/dist/index.d.ts.map +1 -1
- package/node_modules/@agent-tower/shared/dist/index.js +1 -0
- package/node_modules/@agent-tower/shared/dist/index.js.map +1 -1
- package/node_modules/@agent-tower/shared/dist/provider-capabilities.d.ts +6 -5
- package/node_modules/@agent-tower/shared/dist/provider-capabilities.d.ts.map +1 -1
- package/node_modules/@agent-tower/shared/dist/provider-capabilities.js.map +1 -1
- package/node_modules/@agent-tower/shared/dist/types.d.ts +49 -2
- package/node_modules/@agent-tower/shared/dist/types.d.ts.map +1 -1
- package/node_modules/@agent-tower/shared/dist/types.js.map +1 -1
- package/package.json +1 -1
- package/dist/web/assets/ConversationPage-BINGA8XL.js +0 -3
- package/dist/web/assets/CreateTaskInput-8bLhHYOc.js +0 -1
- package/dist/web/assets/ProjectKanbanPage-D7RJm4yg.js +0 -92
- package/dist/web/assets/ProviderSettingsPage-BlgfQMwe.js +0 -95
- package/dist/web/assets/channel-B8s9dqlX.js +0 -1
- package/dist/web/assets/check-C1zWgxFO.js +0 -1
- package/dist/web/assets/classDiagram-4FO5ZUOK-61bPx188.js +0 -1
- package/dist/web/assets/classDiagram-v2-Q7XG4LA2-61bPx188.js +0 -1
- package/dist/web/assets/cssMode-CNU1q_Gl.js +0 -1
- package/dist/web/assets/handlebars-DNXOgRZc.js +0 -1
- package/dist/web/assets/html-C20FgNS-.js +0 -1
- package/dist/web/assets/htmlMode-CtcV1Ktd.js +0 -1
- package/dist/web/assets/index-dElqH2UR.css +0 -1
- package/dist/web/assets/index-oC5eh7mZ.js +0 -122
- package/dist/web/assets/javascript-CFAVZ6Tb.js +0 -1
- package/dist/web/assets/liquid-CuzuRJIN.js +0 -1
- package/dist/web/assets/mdx-C3rxTvel.js +0 -1
- package/dist/web/assets/python-BYGLbOzO.js +0 -1
- package/dist/web/assets/razor-m0U9iUAj.js +0 -1
- package/dist/web/assets/select-D7WkUiad.js +0 -1
- package/dist/web/assets/stateDiagram-v2-BHNVJYJU-DHz3oGyD.js +0 -1
- package/dist/web/assets/typescript-rHoDxTY8.js +0 -1
- package/dist/web/assets/use-providers-B70-BYNu.js +0 -1
- package/dist/web/assets/xml-BqnpQrAq.js +0 -1
- package/dist/web/assets/yaml-mz2Zn_K2.js +0 -1
|
@@ -0,0 +1,287 @@
|
|
|
1
|
+
import { describe, it, expect, vi } from 'vitest';
|
|
2
|
+
import { CodexCliControl } from '../codex-cli-control.js';
|
|
3
|
+
import { MsgStore } from '../../output/msg-store.js';
|
|
4
|
+
function setup(resumeThreadId, responseFirst = false, executionPermission = 'ASK') {
|
|
5
|
+
const frames = [];
|
|
6
|
+
const requested = [];
|
|
7
|
+
const failed = vi.fn();
|
|
8
|
+
const invalidated = vi.fn();
|
|
9
|
+
const store = new MsgStore();
|
|
10
|
+
let writeImpl;
|
|
11
|
+
const io = { subscribe: vi.fn(), close: vi.fn(), end: vi.fn(), write: async (data, current) => {
|
|
12
|
+
const m = JSON.parse(data);
|
|
13
|
+
frames.push(m);
|
|
14
|
+
if (writeImpl)
|
|
15
|
+
return writeImpl(m, current);
|
|
16
|
+
if (m.method === 'initialize')
|
|
17
|
+
queueMicrotask(() => control.handle({ id: m.id, result: {} }));
|
|
18
|
+
if (m.method === 'thread/start' || m.method === 'thread/resume')
|
|
19
|
+
queueMicrotask(() => control.handle({ id: m.id, result: { thread: { id: 'thread' }, approvalPolicy: 'on-request', approvalsReviewer: executionPermission === 'AUTO_SANDBOX' ? 'auto_review' : 'user', sandbox: { type: 'workspaceWrite', writableRoots: [], networkAccess: false } } }));
|
|
20
|
+
if (m.method === 'turn/start')
|
|
21
|
+
queueMicrotask(() => {
|
|
22
|
+
if (responseFirst) {
|
|
23
|
+
control.handle({ id: m.id, result: { turn: { id: 'native-turn' } } });
|
|
24
|
+
control.handle({ id: 'early', method: 'item/commandExecution/requestApproval', params: { threadId: 'thread', turnId: 'native-turn', itemId: 'early-tool', command: 'preview' } });
|
|
25
|
+
}
|
|
26
|
+
control.handle({ method: 'turn/started', params: { threadId: 'thread', turn: { id: 'native-turn' } } });
|
|
27
|
+
if (!responseFirst)
|
|
28
|
+
control.handle({ id: m.id, result: { turn: { id: 'native-turn' } } });
|
|
29
|
+
});
|
|
30
|
+
} };
|
|
31
|
+
const control = new CodexCliControl(io, store, { sessionId: 'session', turnId: 'tower-turn', runtimeInstanceId: 'generation', executionPermission, sensitiveValues: ['native-secret'] }, {
|
|
32
|
+
requested: r => requested.push(r), invalidated, failed,
|
|
33
|
+
});
|
|
34
|
+
const params = { threadId: 'thread', turnId: 'native-turn', itemId: 'tool' };
|
|
35
|
+
const notify = (method, extra = {}) => control.handle({ method, params: { ...params, ...extra } });
|
|
36
|
+
const approval = (id = 0, method = 'item/commandExecution/requestApproval', extra = {}) => control.handle({ id, method, params: { ...params, command: 'printf native-secret TOKEN=private', ...extra } });
|
|
37
|
+
const start = () => control.start(JSON.stringify({ cwd: '/workspace', ...(resumeThreadId ? { resumeThreadId } : {}), input: [{ type: 'text', text: 'task', text_elements: [] }] }), vi.fn());
|
|
38
|
+
return { control, store, frames, requested, failed, invalidated, notify, approval, start, write: (fn) => { writeImpl = fn; } };
|
|
39
|
+
}
|
|
40
|
+
describe('Codex app-server RPC approval contract', () => {
|
|
41
|
+
it.each([undefined, 'thread'])('confirms ASK before the task on new/resumed thread %s', async (resume) => {
|
|
42
|
+
const h = setup(resume);
|
|
43
|
+
await h.start();
|
|
44
|
+
expect(h.frames.map(m => m.method)).toEqual(['initialize', 'initialized', resume ? 'thread/resume' : 'thread/start', 'turn/start']);
|
|
45
|
+
expect(h.frames[2].params).toMatchObject({ approvalPolicy: 'on-request', approvalsReviewer: 'user', sandbox: 'workspace-write' });
|
|
46
|
+
expect(h.store.getSnapshot().sessionId).toBe('thread');
|
|
47
|
+
h.control.close();
|
|
48
|
+
});
|
|
49
|
+
it.each([undefined, 'thread'])('confirms AUTO_SANDBOX before the task on new/resumed thread %s', async (resume) => {
|
|
50
|
+
const h = setup(resume, false, 'AUTO_SANDBOX');
|
|
51
|
+
await h.start();
|
|
52
|
+
expect(h.frames[2].params).toMatchObject({ approvalPolicy: 'on-request', approvalsReviewer: 'auto_review', sandbox: 'workspace-write' });
|
|
53
|
+
expect(h.frames.at(-1)?.method).toBe('turn/start');
|
|
54
|
+
h.control.close();
|
|
55
|
+
});
|
|
56
|
+
it.each([undefined, 'thread'])('reports native AUTO_SANDBOX rejection without starting a %s turn', async (resume) => {
|
|
57
|
+
const h = setup(resume, false, 'AUTO_SANDBOX');
|
|
58
|
+
h.write(async (m) => {
|
|
59
|
+
if (m.method === 'initialize')
|
|
60
|
+
queueMicrotask(() => h.control.handle({ id: m.id, result: {} }));
|
|
61
|
+
else if (m.method === (resume ? 'thread/resume' : 'thread/start')) {
|
|
62
|
+
queueMicrotask(() => h.control.handle({ id: m.id, error: { code: -32602, message: 'auto_review unsupported' } }));
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
await expect(h.start()).rejects.toMatchObject({ code: 'permission_mode_unconfirmed', message: expect.stringContaining('auto_review') });
|
|
66
|
+
expect(h.frames.some(frame => frame.method === 'turn/start')).toBe(false);
|
|
67
|
+
h.control.close();
|
|
68
|
+
});
|
|
69
|
+
it('reports a native turn/start rejection under auto_review without changing mode', async () => {
|
|
70
|
+
const h = setup(undefined, false, 'AUTO_SANDBOX');
|
|
71
|
+
h.write(async (m) => {
|
|
72
|
+
if (m.method === 'initialize')
|
|
73
|
+
queueMicrotask(() => h.control.handle({ id: m.id, result: {} }));
|
|
74
|
+
else if (m.method === 'thread/start')
|
|
75
|
+
queueMicrotask(() => h.control.handle({ id: m.id, result: {
|
|
76
|
+
thread: { id: 'thread' }, approvalPolicy: 'on-request', approvalsReviewer: 'auto_review',
|
|
77
|
+
sandbox: { type: 'workspaceWrite', writableRoots: [], networkAccess: false },
|
|
78
|
+
} }));
|
|
79
|
+
else if (m.method === 'turn/start')
|
|
80
|
+
queueMicrotask(() => h.control.handle({ id: m.id, error: { code: -32602, message: 'unsupported model' } }));
|
|
81
|
+
});
|
|
82
|
+
await expect(h.start()).rejects.toMatchObject({ code: 'control_request_failed', message: expect.stringContaining('AUTO_SANDBOX') });
|
|
83
|
+
expect(h.frames.filter(frame => frame.method === 'thread/start')).toHaveLength(1);
|
|
84
|
+
expect(h.frames.filter(frame => frame.method === 'turn/start')).toHaveLength(1);
|
|
85
|
+
h.control.close();
|
|
86
|
+
});
|
|
87
|
+
it('keeps AUTO_SANDBOX unavailable when native reviewer or sandbox is not confirmed on resume', async () => {
|
|
88
|
+
const h = setup('thread', false, 'AUTO_SANDBOX');
|
|
89
|
+
h.write(async (m) => {
|
|
90
|
+
if (m.method === 'initialize')
|
|
91
|
+
queueMicrotask(() => h.control.handle({ id: m.id, result: {} }));
|
|
92
|
+
else if (m.method === 'thread/resume')
|
|
93
|
+
queueMicrotask(() => h.control.handle({ id: m.id, result: { thread: { id: 'thread' }, approvalPolicy: 'on-request', approvalsReviewer: 'user', sandbox: { type: 'workspaceWrite' } } }));
|
|
94
|
+
});
|
|
95
|
+
await expect(h.start()).rejects.toMatchObject({ code: 'permission_mode_unconfirmed' });
|
|
96
|
+
expect(h.frames.some(m => m.method === 'turn/start')).toBe(false);
|
|
97
|
+
h.control.close();
|
|
98
|
+
});
|
|
99
|
+
it.each([undefined, 'thread'])('rejects expanded or unconfirmed AUTO_SANDBOX boundaries before %s turn', async (resume) => {
|
|
100
|
+
for (const sandbox of [
|
|
101
|
+
{ type: 'workspaceWrite', writableRoots: ['/outside'], networkAccess: false },
|
|
102
|
+
{ type: 'workspaceWrite', writableRoots: [], networkAccess: true },
|
|
103
|
+
{ type: 'workspaceWrite' },
|
|
104
|
+
]) {
|
|
105
|
+
const h = setup(resume, false, 'AUTO_SANDBOX');
|
|
106
|
+
h.write(async (m) => {
|
|
107
|
+
if (m.method === 'initialize')
|
|
108
|
+
queueMicrotask(() => h.control.handle({ id: m.id, result: {} }));
|
|
109
|
+
else if (m.method === (resume ? 'thread/resume' : 'thread/start'))
|
|
110
|
+
queueMicrotask(() => h.control.handle({ id: m.id, result: {
|
|
111
|
+
thread: { id: 'thread' }, approvalPolicy: 'on-request', approvalsReviewer: 'auto_review', sandbox,
|
|
112
|
+
} }));
|
|
113
|
+
});
|
|
114
|
+
await expect(h.start()).rejects.toMatchObject({ code: 'permission_mode_unconfirmed' });
|
|
115
|
+
expect(h.frames.some(frame => frame.method === 'turn/start')).toBe(false);
|
|
116
|
+
h.control.close();
|
|
117
|
+
}
|
|
118
|
+
});
|
|
119
|
+
it('passes remaining native requests to the human approval flow under AUTO_SANDBOX', async () => {
|
|
120
|
+
const h = setup(undefined, false, 'AUTO_SANDBOX');
|
|
121
|
+
await h.start();
|
|
122
|
+
h.approval(7);
|
|
123
|
+
expect(h.requested).toHaveLength(1);
|
|
124
|
+
expect(h.frames.some(frame => frame.id === 7 && frame.result)).toBe(false);
|
|
125
|
+
await h.control.resolve(h.requested[0].requestId, 'reject_once');
|
|
126
|
+
expect(h.frames.at(-1)).toEqual({ id: 7, result: { decision: 'decline' } });
|
|
127
|
+
h.control.close();
|
|
128
|
+
});
|
|
129
|
+
it.each(['approvalPolicy', 'approvalsReviewer', 'sandbox'])('does not send a task when %s is unconfirmed', async (field) => {
|
|
130
|
+
const h = setup('thread');
|
|
131
|
+
h.write(async (m) => {
|
|
132
|
+
if (m.method === 'initialize')
|
|
133
|
+
queueMicrotask(() => h.control.handle({ id: m.id, result: {} }));
|
|
134
|
+
else if (m.method === 'thread/resume')
|
|
135
|
+
queueMicrotask(() => h.control.handle({ id: m.id, result: { thread: { id: 'thread' }, approvalPolicy: 'on-request', approvalsReviewer: 'user', sandbox: { type: 'workspaceWrite' }, [field]: null } }));
|
|
136
|
+
});
|
|
137
|
+
await expect(h.start()).rejects.toMatchObject({ code: 'permission_mode_unconfirmed' });
|
|
138
|
+
expect(h.frames.some(m => m.method === 'turn/start')).toBe(false);
|
|
139
|
+
h.control.close();
|
|
140
|
+
});
|
|
141
|
+
it.each(['allow_once', 'reject_once'])('delivers %s once without native persistent grants or raw payload exposure', async (option) => {
|
|
142
|
+
const h = setup();
|
|
143
|
+
await h.start();
|
|
144
|
+
h.approval(0, undefined, { availableDecisions: ['accept', { acceptWithExecpolicyAmendment: { execpolicy_amendment: ['sh'] } }, 'cancel'] });
|
|
145
|
+
h.approval();
|
|
146
|
+
expect(h.requested).toHaveLength(1);
|
|
147
|
+
expect(h.requested[0]).toMatchObject({ turnId: 'tower-turn', runtimeInstanceId: 'generation', toolCallId: 'tool' });
|
|
148
|
+
expect(JSON.stringify(h.requested)).not.toMatch(/native-secret|private/);
|
|
149
|
+
expect(JSON.stringify(h.store.getSnapshot())).not.toContain('requestApproval');
|
|
150
|
+
await h.control.resolve(h.requested[0].requestId, option);
|
|
151
|
+
expect(h.frames.at(-1)).toEqual({ id: 0, result: { decision: option === 'allow_once' ? 'accept' : 'decline' } });
|
|
152
|
+
await expect(h.control.resolve(h.requested[0].requestId, option)).rejects.toMatchObject({ code: 'permission_not_found' });
|
|
153
|
+
h.control.close();
|
|
154
|
+
});
|
|
155
|
+
it('projects concurrent commands, assistant deltas, file changes, MCP and per-turn usage', async () => {
|
|
156
|
+
const h = setup();
|
|
157
|
+
await h.start();
|
|
158
|
+
h.notify('item/started', { item: { id: 'a', type: 'agentMessage', text: '' } });
|
|
159
|
+
h.notify('item/agentMessage/delta', { itemId: 'a', delta: 'streaming' });
|
|
160
|
+
for (const id of ['one', 'two'])
|
|
161
|
+
h.notify('item/started', { item: { id, type: 'commandExecution', command: id, status: 'inProgress' } });
|
|
162
|
+
h.notify('item/commandExecution/outputDelta', { itemId: 'one', delta: 'output' });
|
|
163
|
+
h.notify('item/completed', { item: { id: 'two', type: 'commandExecution', command: 'two', status: 'declined' } });
|
|
164
|
+
h.notify('item/completed', { item: { id: 'one', type: 'commandExecution', command: 'one', status: 'completed', aggregatedOutput: 'final' } });
|
|
165
|
+
h.notify('item/started', { item: { id: 'file', type: 'fileChange', changes: [{ path: '/outside/a.txt', kind: { type: 'add' }, diff: 'secret-diff' }] } });
|
|
166
|
+
h.approval('file-request', 'item/fileChange/requestApproval', { itemId: 'file', command: undefined, grantRoot: null });
|
|
167
|
+
expect(h.requested.at(-1)?.actionDetails).toContain('/outside/a.txt');
|
|
168
|
+
expect(JSON.stringify(h.requested)).not.toContain('secret-diff');
|
|
169
|
+
h.notify('item/completed', { item: { id: 'mcp', type: 'mcpToolCall', server: 'tower', tool: 'read', status: 'completed', result: 'mcp result' } });
|
|
170
|
+
const completed = vi.fn();
|
|
171
|
+
h.control.onTurnCompleted(completed);
|
|
172
|
+
h.notify('thread/tokenUsage/updated', { tokenUsage: { last: { inputTokens: 10, outputTokens: 5 }, total: { inputTokens: 1000 } } });
|
|
173
|
+
h.notify('turn/completed', { turn: { id: 'native-turn', status: 'completed' } });
|
|
174
|
+
h.notify('turn/completed', { turn: { id: 'native-turn', status: 'completed' } });
|
|
175
|
+
const entries = h.store.getSnapshot().entries;
|
|
176
|
+
expect(entries.find(e => e.id === 'a')?.content).toBe('streaming');
|
|
177
|
+
expect(entries.find(e => e.id === 'one')).toMatchObject({ content: 'one\n\nOutput:\nfinal', metadata: { status: 'success' } });
|
|
178
|
+
expect(entries.find(e => e.id === 'two')?.metadata?.status).toBe('denied');
|
|
179
|
+
expect(entries.find(e => e.metadata?.tokenUsage)?.metadata?.tokenUsage?.totalTokens).toBe(15);
|
|
180
|
+
expect(completed).toHaveBeenCalledTimes(1);
|
|
181
|
+
h.control.close();
|
|
182
|
+
});
|
|
183
|
+
it('uses typed RPC IDs and invalidates only the matching native request', async () => {
|
|
184
|
+
const h = setup();
|
|
185
|
+
await h.start();
|
|
186
|
+
h.approval(0);
|
|
187
|
+
h.approval('0');
|
|
188
|
+
h.notify('serverRequest/resolved', { requestId: 0 });
|
|
189
|
+
await expect(h.control.resolve(h.requested[0].requestId, 'allow_once')).rejects.toMatchObject({ code: 'permission_not_found' });
|
|
190
|
+
await h.control.resolve(h.requested[1].requestId, 'reject_once');
|
|
191
|
+
expect(h.frames.at(-1).id).toBe('0');
|
|
192
|
+
h.control.close();
|
|
193
|
+
});
|
|
194
|
+
it('bounds repeated command output and final aggregates while retaining entry identity and the latest tail', async () => {
|
|
195
|
+
const h = setup();
|
|
196
|
+
await h.start();
|
|
197
|
+
h.notify('item/started', { item: { id: 'large', type: 'commandExecution', command: 'large output', status: 'inProgress' } });
|
|
198
|
+
const original = h.store.getSnapshot().entries.find(e => e.id === 'large');
|
|
199
|
+
for (let i = 0; i < 5; i++)
|
|
200
|
+
h.notify('item/commandExecution/outputDelta', { itemId: 'large', delta: `${i}:` + 'x'.repeat(32 * 1024) });
|
|
201
|
+
h.notify('item/commandExecution/outputDelta', { itemId: 'large', delta: 'latest-tail' });
|
|
202
|
+
let entry = h.store.getSnapshot().entries.find(e => e.id === 'large');
|
|
203
|
+
expect(entry.content).toContain('[TRUNCATED]');
|
|
204
|
+
expect(entry.content).toContain('latest-tail');
|
|
205
|
+
expect(entry.content.length).toBeLessThan(34 * 1024);
|
|
206
|
+
h.notify('item/completed', { item: { id: 'large', type: 'commandExecution', command: 'large output', status: 'completed', aggregatedOutput: 'x'.repeat(256 * 1024) + 'final-tail' } });
|
|
207
|
+
entry = h.store.getSnapshot().entries.find(e => e.id === 'large');
|
|
208
|
+
expect(entry).toMatchObject({ id: original.id, timestamp: original.timestamp, metadata: { status: 'success' } });
|
|
209
|
+
expect(entry.content).toContain('final-tail');
|
|
210
|
+
expect(entry.content.length).toBeLessThan(34 * 1024);
|
|
211
|
+
h.control.close();
|
|
212
|
+
});
|
|
213
|
+
it('accepts turn/started after the turn/start response, but never another turn identity', async () => {
|
|
214
|
+
const h = setup(undefined, true);
|
|
215
|
+
await h.start();
|
|
216
|
+
expect(h.requested).toHaveLength(1);
|
|
217
|
+
h.notify('turn/started', { turn: { id: 'native-turn' } });
|
|
218
|
+
expect(h.failed).not.toHaveBeenCalled();
|
|
219
|
+
h.notify('turn/started', { turn: { id: 'another-turn' } });
|
|
220
|
+
expect(h.failed).toHaveBeenCalledWith(expect.objectContaining({ code: 'control_protocol_invalid' }));
|
|
221
|
+
});
|
|
222
|
+
it('rejects duplicates during a queued write and rechecks authorization at delivery', async () => {
|
|
223
|
+
const h = setup();
|
|
224
|
+
await h.start();
|
|
225
|
+
h.approval();
|
|
226
|
+
let allowed = true;
|
|
227
|
+
let release;
|
|
228
|
+
h.write(async (_, current) => { await new Promise(r => { release = r; }); current?.(); });
|
|
229
|
+
const answer = h.control.resolve(h.requested[0].requestId, 'allow_once', () => { if (!allowed)
|
|
230
|
+
throw Object.assign(new Error('revoked'), { statusCode: 403 }); });
|
|
231
|
+
await expect(h.control.resolve(h.requested[0].requestId, 'allow_once')).rejects.toMatchObject({ code: 'permission_not_found' });
|
|
232
|
+
allowed = false;
|
|
233
|
+
release();
|
|
234
|
+
await expect(answer).rejects.toMatchObject({ statusCode: 403 });
|
|
235
|
+
expect(h.failed).toHaveBeenCalled();
|
|
236
|
+
});
|
|
237
|
+
it('never replays an uncertain allow after stdin failure', async () => {
|
|
238
|
+
const h = setup();
|
|
239
|
+
await h.start();
|
|
240
|
+
h.approval();
|
|
241
|
+
h.write(async () => { throw new Error('EPIPE'); });
|
|
242
|
+
await expect(h.control.resolve(h.requested[0].requestId, 'allow_once')).rejects.toThrow('EPIPE');
|
|
243
|
+
expect(h.failed).toHaveBeenCalledWith(expect.objectContaining({ code: 'control_write_failed' }));
|
|
244
|
+
await expect(h.control.resolve(h.requested[0].requestId, 'allow_once')).rejects.toMatchObject({ code: 'permission_not_found' });
|
|
245
|
+
});
|
|
246
|
+
it.each(['item/tool/requestUserInput', 'item/permissions/requestApproval', 'mcpServer/elicitation/request'])('keeps %s separate from tool execution approvals', async (method) => {
|
|
247
|
+
const h = setup();
|
|
248
|
+
await h.start();
|
|
249
|
+
h.approval('unsupported', method);
|
|
250
|
+
expect(h.failed).toHaveBeenCalledWith(expect.objectContaining({ code: 'native_interaction_unsupported' }));
|
|
251
|
+
expect(h.frames.some(m => m.result?.decision)).toBe(false);
|
|
252
|
+
});
|
|
253
|
+
it('rejects an approval belonging to another native turn', async () => {
|
|
254
|
+
const h = setup();
|
|
255
|
+
await h.start();
|
|
256
|
+
h.approval(0, undefined, { turnId: 'old-turn' });
|
|
257
|
+
expect(h.failed).toHaveBeenCalledWith(expect.objectContaining({ code: 'control_protocol_invalid' }));
|
|
258
|
+
});
|
|
259
|
+
it('bounds handshake and frame sizes, and consumes a valid final frame without newline', async () => {
|
|
260
|
+
vi.useFakeTimers();
|
|
261
|
+
try {
|
|
262
|
+
const h = setup();
|
|
263
|
+
h.write(async () => { });
|
|
264
|
+
const start = h.start();
|
|
265
|
+
void start.catch(() => { });
|
|
266
|
+
await vi.advanceTimersByTimeAsync(15000);
|
|
267
|
+
await expect(start).rejects.toMatchObject({ code: 'control_handshake_timeout' });
|
|
268
|
+
h.control.close();
|
|
269
|
+
}
|
|
270
|
+
finally {
|
|
271
|
+
vi.useRealTimers();
|
|
272
|
+
}
|
|
273
|
+
const h = setup();
|
|
274
|
+
await h.start();
|
|
275
|
+
const completed = vi.fn();
|
|
276
|
+
h.control.onTurnCompleted(completed);
|
|
277
|
+
h.control.processData(JSON.stringify({ method: 'turn/completed', params: { threadId: 'thread', turn: { id: 'native-turn', status: 'completed' } } }));
|
|
278
|
+
h.control.finish();
|
|
279
|
+
h.control.finish();
|
|
280
|
+
expect(completed).toHaveBeenCalledTimes(1);
|
|
281
|
+
h.control.close();
|
|
282
|
+
const oversized = setup();
|
|
283
|
+
oversized.control.processData('x'.repeat(8 * 1024 * 1024 + 1));
|
|
284
|
+
expect(oversized.failed).toHaveBeenCalled();
|
|
285
|
+
});
|
|
286
|
+
});
|
|
287
|
+
//# sourceMappingURL=codex-cli-control.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-cli-control.test.js","sourceRoot":"","sources":["../../../src/runtime/__tests__/codex-cli-control.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-cli-identity.test.d.ts","sourceRoot":"","sources":["../../../src/runtime/__tests__/codex-cli-identity.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,166 @@
|
|
|
1
|
+
import { chmodSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import os from 'node:os';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
|
5
|
+
import { CODEX_CLI_ORIGINATOR, detectCodexTerminal, formatCodexCliUserAgent, parseCodexVersion, resetCodexCliIdentityCache, resolveCodexCliUserAgent, resolveCodexVersion, } from '../acp/codex-cli-identity.js';
|
|
6
|
+
import { withCodexCliUserAgent } from '../acp/codex-provider-config.js';
|
|
7
|
+
const temporaryDirectories = [];
|
|
8
|
+
/**
|
|
9
|
+
* Create an executable `codex` shim that prints `codex-cli <version>` and
|
|
10
|
+
* records every invocation, so both the parse result and the cache behaviour
|
|
11
|
+
* are observable without mocking `node:child_process`.
|
|
12
|
+
*/
|
|
13
|
+
function createCodexShim(version) {
|
|
14
|
+
const directory = mkdtempSync(path.join(os.tmpdir(), 'codex-cli-identity-'));
|
|
15
|
+
temporaryDirectories.push(directory);
|
|
16
|
+
const callLog = path.join(directory, 'calls.log');
|
|
17
|
+
const executable = path.join(directory, process.platform === 'win32' ? 'codex.cmd' : 'codex');
|
|
18
|
+
const script = process.platform === 'win32'
|
|
19
|
+
? `@echo off\r\necho called>>"${callLog}"\r\necho codex-cli ${version}\r\n`
|
|
20
|
+
: `#!/bin/sh\necho called >> "${callLog}"\necho "codex-cli ${version}"\n`;
|
|
21
|
+
writeFileSync(executable, script);
|
|
22
|
+
if (process.platform !== 'win32')
|
|
23
|
+
chmodSync(executable, 0o755);
|
|
24
|
+
return { executable, callLog };
|
|
25
|
+
}
|
|
26
|
+
function readCallCount(callLog) {
|
|
27
|
+
try {
|
|
28
|
+
return readFileSync(callLog, 'utf8').split('\n').filter(Boolean).length;
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
return 0;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
beforeEach(() => {
|
|
35
|
+
resetCodexCliIdentityCache();
|
|
36
|
+
});
|
|
37
|
+
afterEach(() => {
|
|
38
|
+
while (temporaryDirectories.length > 0) {
|
|
39
|
+
rmSync(temporaryDirectories.pop(), { recursive: true, force: true });
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
describe('formatCodexCliUserAgent', () => {
|
|
43
|
+
it('matches the user-agent emitted by a native codex exec process', () => {
|
|
44
|
+
expect(formatCodexCliUserAgent({
|
|
45
|
+
clientName: CODEX_CLI_ORIGINATOR,
|
|
46
|
+
codexVersion: '0.156.0',
|
|
47
|
+
platform: 'Mac OS 15.6.1; arm64',
|
|
48
|
+
terminal: 'Apple_Terminal/455.1',
|
|
49
|
+
clientVersion: '0.156.0',
|
|
50
|
+
})).toBe('codex_exec/0.156.0 (Mac OS 15.6.1; arm64) Apple_Terminal/455.1 (codex_exec; 0.156.0)');
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
describe('detectCodexTerminal', () => {
|
|
54
|
+
it('prefers TERM_PROGRAM with its version', () => {
|
|
55
|
+
expect(detectCodexTerminal({ TERM_PROGRAM: 'Apple_Terminal', TERM_PROGRAM_VERSION: '455.1' }))
|
|
56
|
+
.toBe('Apple_Terminal/455.1');
|
|
57
|
+
});
|
|
58
|
+
it('omits the version separator when TERM_PROGRAM_VERSION is absent', () => {
|
|
59
|
+
expect(detectCodexTerminal({ TERM_PROGRAM: 'WezTerm' })).toBe('WezTerm');
|
|
60
|
+
});
|
|
61
|
+
it.each([
|
|
62
|
+
[{ WT_SESSION: 'session-id' }, 'WindowsTerminal'],
|
|
63
|
+
[{ TERM_SESSION_ID: 'session-id' }, 'Apple_Terminal'],
|
|
64
|
+
[{}, 'unknown'],
|
|
65
|
+
])('falls back for %j', (environment, expected) => {
|
|
66
|
+
expect(detectCodexTerminal(environment)).toBe(expected);
|
|
67
|
+
});
|
|
68
|
+
it('prefers TERM_PROGRAM over the session markers', () => {
|
|
69
|
+
expect(detectCodexTerminal({
|
|
70
|
+
TERM_PROGRAM: 'iTerm.app',
|
|
71
|
+
TERM_PROGRAM_VERSION: '3.5.14',
|
|
72
|
+
TERM_SESSION_ID: 'session-id',
|
|
73
|
+
WT_SESSION: 'windows-session',
|
|
74
|
+
})).toBe('iTerm.app/3.5.14');
|
|
75
|
+
});
|
|
76
|
+
});
|
|
77
|
+
describe('parseCodexVersion', () => {
|
|
78
|
+
it.each([
|
|
79
|
+
['codex-cli 0.156.0', '0.156.0'],
|
|
80
|
+
['codex-cli 0.157.0-alpha.9', '0.157.0-alpha.9'],
|
|
81
|
+
['', undefined],
|
|
82
|
+
['command not found', undefined],
|
|
83
|
+
])('parses %j', (output, expected) => {
|
|
84
|
+
expect(parseCodexVersion(output)).toBe(expected);
|
|
85
|
+
});
|
|
86
|
+
});
|
|
87
|
+
describe('resolveCodexVersion', () => {
|
|
88
|
+
it('returns undefined without a resolved runtime', async () => {
|
|
89
|
+
expect(await resolveCodexVersion(undefined, process.env)).toBeUndefined();
|
|
90
|
+
});
|
|
91
|
+
it('reads the version reported by the runtime and caches it per executable', async () => {
|
|
92
|
+
const { executable, callLog } = createCodexShim('9.9.9');
|
|
93
|
+
expect(await resolveCodexVersion(executable, process.env)).toBe('9.9.9');
|
|
94
|
+
expect(await resolveCodexVersion(executable, process.env)).toBe('9.9.9');
|
|
95
|
+
expect(readCallCount(callLog)).toBe(1);
|
|
96
|
+
});
|
|
97
|
+
it('returns undefined when the runtime cannot be probed', async () => {
|
|
98
|
+
expect(await resolveCodexVersion(path.join(os.tmpdir(), 'missing-codex-binary'), process.env))
|
|
99
|
+
.toBeUndefined();
|
|
100
|
+
});
|
|
101
|
+
});
|
|
102
|
+
describe('resolveCodexCliUserAgent', () => {
|
|
103
|
+
it('returns undefined without a resolved runtime', async () => {
|
|
104
|
+
expect(await resolveCodexCliUserAgent({ codexPath: undefined, environment: process.env }))
|
|
105
|
+
.toBeUndefined();
|
|
106
|
+
});
|
|
107
|
+
it('builds a native codex exec user-agent for the resolved runtime', async () => {
|
|
108
|
+
const { executable } = createCodexShim('9.9.9');
|
|
109
|
+
const userAgent = await resolveCodexCliUserAgent({
|
|
110
|
+
codexPath: executable,
|
|
111
|
+
environment: { ...process.env, TERM_PROGRAM: 'Apple_Terminal', TERM_PROGRAM_VERSION: '455.1' },
|
|
112
|
+
});
|
|
113
|
+
expect(userAgent).toMatch(/^codex_exec\/9\.9\.9 \(.+\) Apple_Terminal\/455\.1 \(codex_exec; 9\.9\.9\)$/);
|
|
114
|
+
expect(userAgent).not.toContain('codex-acp');
|
|
115
|
+
});
|
|
116
|
+
});
|
|
117
|
+
describe('withCodexCliUserAgent', () => {
|
|
118
|
+
const userAgent = 'codex_exec/0.156.0 (Mac OS 15.6.1; arm64) Apple_Terminal/455.1 (codex_exec; 0.156.0)';
|
|
119
|
+
const customConfig = JSON.stringify({
|
|
120
|
+
model: 'gpt-6-sol',
|
|
121
|
+
model_provider: 'agent-tower-openai-compatible',
|
|
122
|
+
model_providers: {
|
|
123
|
+
'agent-tower-openai-compatible': {
|
|
124
|
+
base_url: 'https://gateway.example/v1',
|
|
125
|
+
http_headers: { originator: 'codex_exec' },
|
|
126
|
+
},
|
|
127
|
+
},
|
|
128
|
+
});
|
|
129
|
+
it('adds the header next to the existing originator', () => {
|
|
130
|
+
expect(JSON.parse(withCodexCliUserAgent(customConfig, userAgent))).toMatchObject({
|
|
131
|
+
model_providers: {
|
|
132
|
+
'agent-tower-openai-compatible': {
|
|
133
|
+
http_headers: { originator: 'codex_exec', 'user-agent': userAgent },
|
|
134
|
+
},
|
|
135
|
+
},
|
|
136
|
+
});
|
|
137
|
+
});
|
|
138
|
+
it('keeps headers configured by the Provider itself', () => {
|
|
139
|
+
const configured = JSON.stringify({
|
|
140
|
+
model_provider: 'proxy',
|
|
141
|
+
model_providers: { proxy: { http_headers: { originator: 'stale', 'x-existing': 'keep' } } },
|
|
142
|
+
});
|
|
143
|
+
expect(JSON.parse(withCodexCliUserAgent(configured, userAgent))).toMatchObject({
|
|
144
|
+
model_providers: { proxy: { http_headers: { originator: 'stale', 'x-existing': 'keep', 'user-agent': userAgent } } },
|
|
145
|
+
});
|
|
146
|
+
});
|
|
147
|
+
it('never overrides a user-agent the Provider already set', () => {
|
|
148
|
+
const configured = JSON.stringify({
|
|
149
|
+
model_provider: 'proxy',
|
|
150
|
+
model_providers: { proxy: { http_headers: { 'user-agent': 'custom/1.0' } } },
|
|
151
|
+
});
|
|
152
|
+
expect(withCodexCliUserAgent(configured, userAgent)).toBe(configured);
|
|
153
|
+
});
|
|
154
|
+
it.each([
|
|
155
|
+
['no config', undefined],
|
|
156
|
+
['no runtime version', customConfig],
|
|
157
|
+
['invalid JSON', '{not json'],
|
|
158
|
+
['no active provider', JSON.stringify({ model_providers: { proxy: { http_headers: {} } } })],
|
|
159
|
+
['built-in provider without an entry', JSON.stringify({ model_provider: 'openai', model_providers: {} })],
|
|
160
|
+
['non-object model_providers', JSON.stringify({ model_provider: 'proxy', model_providers: 'nope' })],
|
|
161
|
+
])('leaves the config untouched for %s', (_label, configJson) => {
|
|
162
|
+
const result = withCodexCliUserAgent(configJson, _label === 'no runtime version' ? undefined : userAgent);
|
|
163
|
+
expect(result).toBe(configJson);
|
|
164
|
+
});
|
|
165
|
+
});
|
|
166
|
+
//# sourceMappingURL=codex-cli-identity.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-cli-identity.test.js","sourceRoot":"","sources":["../../../src/runtime/__tests__/codex-cli-identity.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import { ExecutionEnv } from '../../executors/execution-env.js';
|
|
|
7
7
|
import { which } from '../../utils/index.js';
|
|
8
8
|
import { codexAcpAgentDefinition } from '../acp/agents/codex.js';
|
|
9
9
|
import { resolveBundledCodexEntrypoint } from '../acp/agents/executable-resolution.js';
|
|
10
|
+
import { resetCodexCliIdentityCache } from '../acp/codex-cli-identity.js';
|
|
10
11
|
vi.mock('../../utils/index.js', () => ({ which: vi.fn() }));
|
|
11
12
|
vi.mock('../acp/agents/executable-resolution.js', () => ({
|
|
12
13
|
resolveBundledCodexEntrypoint: vi.fn(),
|
|
@@ -37,6 +38,7 @@ function setup(environment = {}) {
|
|
|
37
38
|
}
|
|
38
39
|
beforeEach(() => {
|
|
39
40
|
vi.resetAllMocks();
|
|
41
|
+
resetCodexCliIdentityCache();
|
|
40
42
|
vi.mocked(which).mockResolvedValue(null);
|
|
41
43
|
vi.mocked(resolveBundledCodexEntrypoint).mockReturnValue(bundledCodex);
|
|
42
44
|
});
|
|
@@ -121,5 +123,35 @@ describe('Codex ACP runtime resolution', () => {
|
|
|
121
123
|
expect(launch.env[pathKey]).toBe(environment[pathKey]);
|
|
122
124
|
expect(profile.environment).toEqual(environment);
|
|
123
125
|
});
|
|
126
|
+
it('presents the native codex exec client identity to custom model providers', async () => {
|
|
127
|
+
const directory = mkdtempSync(path.join(os.tmpdir(), 'codex-identity-launch-'));
|
|
128
|
+
const executable = path.join(directory, process.platform === 'win32' ? 'codex.cmd' : 'codex');
|
|
129
|
+
writeFileSync(executable, process.platform === 'win32'
|
|
130
|
+
? '@echo off\r\necho codex-cli 9.9.9\r\n'
|
|
131
|
+
: '#!/bin/sh\necho "codex-cli 9.9.9"\n');
|
|
132
|
+
if (process.platform !== 'win32')
|
|
133
|
+
chmodSync(executable, 0o755);
|
|
134
|
+
try {
|
|
135
|
+
vi.mocked(which).mockResolvedValue(executable);
|
|
136
|
+
const provider = {
|
|
137
|
+
id: 'codex-gateway',
|
|
138
|
+
name: 'Codex Gateway',
|
|
139
|
+
agentType: AgentType.CODEX,
|
|
140
|
+
runtimeType: RuntimeType.ACP,
|
|
141
|
+
env: { PATH: systemDirectory, TERM_PROGRAM: 'Apple_Terminal', TERM_PROGRAM_VERSION: '455.1' },
|
|
142
|
+
config: { model: 'gpt-6-sol' },
|
|
143
|
+
settings: 'openai_base_url = "https://gateway.example/v1"',
|
|
144
|
+
isDefault: false,
|
|
145
|
+
};
|
|
146
|
+
const profile = codexAcpAgentDefinition.projectProvider(provider, provider.env);
|
|
147
|
+
const launch = await codexAcpAgentDefinition.resolveLaunch(setup().input, profile);
|
|
148
|
+
const headers = JSON.parse(String(launch.env.CODEX_CONFIG)).model_providers['agent-tower-openai-compatible'].http_headers;
|
|
149
|
+
expect(headers.originator).toBe('codex_exec');
|
|
150
|
+
expect(headers['user-agent']).toMatch(/^codex_exec\/9\.9\.9 \(.+\) Apple_Terminal\/455\.1 \(codex_exec; 9\.9\.9\)$/);
|
|
151
|
+
}
|
|
152
|
+
finally {
|
|
153
|
+
rmSync(directory, { recursive: true, force: true });
|
|
154
|
+
}
|
|
155
|
+
});
|
|
124
156
|
});
|
|
125
157
|
//# sourceMappingURL=codex-runtime-resolution.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-runtime-resolution.test.js","sourceRoot":"","sources":["../../../src/runtime/__tests__/codex-runtime-resolution.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,WAAW,EAAiB,MAAM,qBAAqB,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-runtime-resolution.test.js","sourceRoot":"","sources":["../../../src/runtime/__tests__/codex-runtime-resolution.test.ts"],"names":[],"mappings":"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"}
|