@yalehwang/cloudpit 2.0.0 → 3.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/api-docs.html +3 -3
- package/dist/assets/{abnfDiagram-N423BO3Z-D5yLnMt9.js → abnfDiagram-N423BO3Z-D7Xt05gV.js} +1 -1
- package/dist/assets/{abnfDiagram-N423BO3Z-bTHtQIhR.js → abnfDiagram-N423BO3Z-dmPRRPEm.js} +1 -1
- package/dist/assets/{arc-1DmrBEyG.js → arc-B7W3R5qH.js} +1 -1
- package/dist/assets/{arc-BlGK--01.js → arc-BHMlIcaQ.js} +1 -1
- package/dist/assets/{architectureDiagram-T3A2C74G--lzbKBn9.js → architectureDiagram-T3A2C74G-CUUpAoN0.js} +1 -1
- package/dist/assets/{architectureDiagram-T3A2C74G-7lKNAbUU.js → architectureDiagram-T3A2C74G-DpXhbHxu.js} +1 -1
- package/dist/assets/{blockDiagram-VBNYF7ZC-17cdO9zs.js → blockDiagram-VBNYF7ZC-Bf0yfNxj.js} +1 -1
- package/dist/assets/{blockDiagram-VBNYF7ZC-BPavJfDj.js → blockDiagram-VBNYF7ZC-Cki9AOhc.js} +1 -1
- package/dist/assets/{c4Diagram-5PPSVZJV-Bm1-2w3b.js → c4Diagram-5PPSVZJV-DK2RqNDO.js} +1 -1
- package/dist/assets/{c4Diagram-5PPSVZJV-aHvFL3Wb.js → c4Diagram-5PPSVZJV-DyhTF0e5.js} +1 -1
- package/dist/assets/channel-DTLMNzbH.js +1 -0
- package/dist/assets/channel-DiqxUuPf.js +1 -0
- package/dist/assets/{chunk-2GRJ4B5K-D7WqZewM.js → chunk-2GRJ4B5K-BYtByJbf.js} +1 -1
- package/dist/assets/{chunk-2GRJ4B5K-DbwzBiPF.js → chunk-2GRJ4B5K-CksFgocc.js} +1 -1
- package/dist/assets/{chunk-2Q5K7J3B-DdCr89uy.js → chunk-2Q5K7J3B-D2kQa5TZ.js} +1 -1
- package/dist/assets/{chunk-2Q5K7J3B-TFd0ECKO.js → chunk-2Q5K7J3B-NSSX86FA.js} +1 -1
- package/dist/assets/{chunk-5RXB4S5H-BdhRBpEi.js → chunk-5RXB4S5H-DNNYC8_t.js} +1 -1
- package/dist/assets/{chunk-5RXB4S5H-D0SQ3nIe.js → chunk-5RXB4S5H-Rx0YaqNI.js} +1 -1
- package/dist/assets/{chunk-5VM5RSS4-B9Lv3cWR.js → chunk-5VM5RSS4-B1k4I4CX.js} +1 -1
- package/dist/assets/{chunk-5VM5RSS4-DioqTIvB.js → chunk-5VM5RSS4-CsvQj3QC.js} +1 -1
- package/dist/assets/{chunk-6Q2QTUOP-09bwlcIv.js → chunk-6Q2QTUOP-48-dEgAs.js} +1 -1
- package/dist/assets/{chunk-6Q2QTUOP-JuhPJZZL.js → chunk-6Q2QTUOP-DCMSW5_0.js} +1 -1
- package/dist/assets/{chunk-GF5L2VYU-C6f2SgCw.js → chunk-GF5L2VYU-CGyvOsdN.js} +1 -1
- package/dist/assets/{chunk-GF5L2VYU-DzD9aOyp.js → chunk-GF5L2VYU-YXe113hp.js} +1 -1
- package/dist/assets/{chunk-JWPE2WC7-BggnWNZv.js → chunk-JWPE2WC7-BT7vCW4x.js} +1 -1
- package/dist/assets/{chunk-JWPE2WC7-Dte_Ax9K.js → chunk-JWPE2WC7-D2K1Oywq.js} +1 -1
- package/dist/assets/{chunk-KBJHAD2P-9TCQV92m.js → chunk-KBJHAD2P-CQZWamtE.js} +1 -1
- package/dist/assets/{chunk-KBJHAD2P-DDnJp7kJ.js → chunk-KBJHAD2P-gpEwZrNy.js} +1 -1
- package/dist/assets/{chunk-RYQCIY6F-CE2Y4D_h.js → chunk-RYQCIY6F-BI0fMtjY.js} +1 -1
- package/dist/assets/{chunk-RYQCIY6F-DsgFSTNw.js → chunk-RYQCIY6F-vguRdb4F.js} +1 -1
- package/dist/assets/{chunk-XXDRQBXY-B1FIfsqq.js → chunk-XXDRQBXY-B99qH1_w.js} +1 -1
- package/dist/assets/{chunk-XXDRQBXY-B4YfaqTO.js → chunk-XXDRQBXY-DZLJnbBB.js} +1 -1
- package/dist/assets/classDiagram-JCYQIIEL-BaV-s6x8.js +1 -0
- package/dist/assets/classDiagram-JCYQIIEL-D4M03B4L.js +1 -0
- package/dist/assets/classDiagram-v2-OCEON4UE-BaV-s6x8.js +1 -0
- package/dist/assets/classDiagram-v2-OCEON4UE-D4M03B4L.js +1 -0
- package/dist/assets/{cose-bilkent-JH36ORCC-C1AG5Pib.js → cose-bilkent-JH36ORCC-EsVnz-E6.js} +1 -1
- package/dist/assets/{cose-bilkent-JH36ORCC-lMwWDibI.js → cose-bilkent-JH36ORCC-VI2OjCIx.js} +1 -1
- package/dist/assets/{cynefin-VYW2F7L2-BlabniRL.js → cynefin-VYW2F7L2-BVYg0ixs.js} +1 -1
- package/dist/assets/{cynefin-VYW2F7L2-W-c-z4IW.js → cynefin-VYW2F7L2-BnHmA5I2.js} +1 -1
- package/dist/assets/{cynefinDiagram-MW4NZA55-BtTep_pq.js → cynefinDiagram-MW4NZA55-B-OCRLIw.js} +1 -1
- package/dist/assets/{cynefinDiagram-MW4NZA55-Due6EIPh.js → cynefinDiagram-MW4NZA55-ItLlzjDR.js} +1 -1
- package/dist/assets/{dagre-VZM6K2ZE-CWLaFfdt.js → dagre-VZM6K2ZE-DkVDkAWJ.js} +1 -1
- package/dist/assets/{dagre-VZM6K2ZE-DZldvqiQ.js → dagre-VZM6K2ZE-bYR4z8-Z.js} +1 -1
- package/dist/assets/{diagram-7IWD3JNH-RnmUHYwN.js → diagram-7IWD3JNH-DjXMue67.js} +1 -1
- package/dist/assets/{diagram-7IWD3JNH-Di-7-nSA.js → diagram-7IWD3JNH-FNEXlm5k.js} +1 -1
- package/dist/assets/{diagram-B4RE2ZJO-Wybyn8fw.js → diagram-B4RE2ZJO-73NYiO_P.js} +1 -1
- package/dist/assets/{diagram-B4RE2ZJO-mrK79C2E.js → diagram-B4RE2ZJO-dB4QHq0D.js} +1 -1
- package/dist/assets/{diagram-LBJQPF4R-JY6FqSFu.js → diagram-LBJQPF4R-DyKT610O.js} +1 -1
- package/dist/assets/{diagram-LBJQPF4R-sWhu2VLy.js → diagram-LBJQPF4R-rMgmnjvd.js} +1 -1
- package/dist/assets/{diagram-Q27KOJAE-BJ4T0WGp.js → diagram-Q27KOJAE-BvsfmmQt.js} +1 -1
- package/dist/assets/{diagram-Q27KOJAE-DyGT9KhB.js → diagram-Q27KOJAE-c6DEjLQX.js} +1 -1
- package/dist/assets/{diagram-UB23O5K3-oXFJAndB.js → diagram-UB23O5K3-BMo2VXVb.js} +1 -1
- package/dist/assets/{diagram-UB23O5K3-tTd8qwEM.js → diagram-UB23O5K3-DRMKefnZ.js} +1 -1
- package/dist/assets/{ebnfDiagram-BXEA7PRR-DV67cBe6.js → ebnfDiagram-BXEA7PRR-BrOAekWh.js} +1 -1
- package/dist/assets/{ebnfDiagram-BXEA7PRR-OQGm8tPs.js → ebnfDiagram-BXEA7PRR-YmQkylwV.js} +1 -1
- package/dist/assets/{elk-BRx4gEGg.js → elk-Hz3WRESK.js} +1 -1
- package/dist/assets/{elk-CdAQJ-NA.js → elk-tPSZwRVB.js} +1 -1
- package/dist/assets/{erDiagram-JOGREHBK-BhD2xZ2I.js → erDiagram-JOGREHBK-BlaZnoQi.js} +1 -1
- package/dist/assets/{erDiagram-JOGREHBK-BqP8DqqW.js → erDiagram-JOGREHBK-CRCfRUXt.js} +1 -1
- package/dist/assets/{flowDiagram-UKHOOZJN-B4AjZxPJ.js → flowDiagram-UKHOOZJN-DQ1gbjxo.js} +1 -1
- package/dist/assets/{flowDiagram-UKHOOZJN-CP_1WsW4.js → flowDiagram-UKHOOZJN-Dinlbmds.js} +1 -1
- package/dist/assets/{ganttDiagram-PKOTCBZU-BMk6nngr.js → ganttDiagram-PKOTCBZU-CMGpcBZO.js} +1 -1
- package/dist/assets/{ganttDiagram-PKOTCBZU-B_ce39Ld.js → ganttDiagram-PKOTCBZU-Eh94zuPI.js} +1 -1
- package/dist/assets/{gitGraphDiagram-DS77QQ5N-CnZA42iA.js → gitGraphDiagram-DS77QQ5N-Bp8xIZbk.js} +1 -1
- package/dist/assets/{gitGraphDiagram-DS77QQ5N-DqEz_iTn.js → gitGraphDiagram-DS77QQ5N-Cu-b4YNw.js} +1 -1
- package/dist/assets/index-51e8fagd.css +32 -0
- package/dist/assets/{index-D5nLH7qP.js → index-CQE9C6k6.js} +356 -356
- package/dist/assets/{index-CqyOGerp.js → index-S8ow0XfK.js} +356 -356
- package/dist/assets/{infoDiagram-6WML65LV-BQf7m4X4.js → infoDiagram-6WML65LV-CClEEtTq.js} +1 -1
- package/dist/assets/{infoDiagram-6WML65LV-Dntf4YFM.js → infoDiagram-6WML65LV-QmHeojgl.js} +1 -1
- package/dist/assets/{ishikawaDiagram-WSZJBQD7-BDjsldAI.js → ishikawaDiagram-WSZJBQD7-BemSj9lN.js} +1 -1
- package/dist/assets/{ishikawaDiagram-WSZJBQD7-BqXpJeoL.js → ishikawaDiagram-WSZJBQD7-nw48g1vr.js} +1 -1
- package/dist/assets/{journeyDiagram-NVQOT4AX-CBcFzP2M.js → journeyDiagram-NVQOT4AX-DeNtO6OU.js} +1 -1
- package/dist/assets/{journeyDiagram-NVQOT4AX-DoWKjgKd.js → journeyDiagram-NVQOT4AX-q1lCfOYn.js} +1 -1
- package/dist/assets/{kanban-definition-27J2QSJJ-9bspl7j-.js → kanban-definition-27J2QSJJ-Bzhu6hql.js} +1 -1
- package/dist/assets/{kanban-definition-27J2QSJJ-Cjxa-Fbb.js → kanban-definition-27J2QSJJ-VfvD33YG.js} +1 -1
- package/dist/assets/{linear-YogAXmU_.js → linear-C0Kwu3Yp.js} +1 -1
- package/dist/assets/{linear-lIhI5Y8l.js → linear-CbM_4-fP.js} +1 -1
- package/dist/assets/{mermaid.core-2Spxcrg7.js → mermaid.core-G2huIsXn.js} +5 -5
- package/dist/assets/{mermaid.core-BxxInCBm.js → mermaid.core-fvTQFUX1.js} +5 -5
- package/dist/assets/{mindmap-definition-FAOFIHXS-DblO5EG4.js → mindmap-definition-FAOFIHXS-BONvuyvz.js} +1 -1
- package/dist/assets/{mindmap-definition-FAOFIHXS-_nlvJ9VK.js → mindmap-definition-FAOFIHXS-BzYawGKQ.js} +1 -1
- package/dist/assets/{pegDiagram-VL7TDLO6-BBJFPAZG.js → pegDiagram-VL7TDLO6-Df2HAKGH.js} +1 -1
- package/dist/assets/{pegDiagram-VL7TDLO6-DhRH7YRf.js → pegDiagram-VL7TDLO6-DnMwBHn_.js} +1 -1
- package/dist/assets/{pieDiagram-7S7Q4E2Y-4Qy7Nk4U.js → pieDiagram-7S7Q4E2Y-Cd3-a-dM.js} +1 -1
- package/dist/assets/{pieDiagram-7S7Q4E2Y-BUtdeYBT.js → pieDiagram-7S7Q4E2Y-LV6TOhOD.js} +1 -1
- package/dist/assets/{quadrantDiagram-CIZ2JOQS-BUoIDY1r.js → quadrantDiagram-CIZ2JOQS-8VOnA3FV.js} +1 -1
- package/dist/assets/{quadrantDiagram-CIZ2JOQS-D90kdHA1.js → quadrantDiagram-CIZ2JOQS-CnwxFPxh.js} +1 -1
- package/dist/assets/{railroadDiagram-AXF67PYL-CJf9--tj.js → railroadDiagram-AXF67PYL-CXBFj3Iu.js} +1 -1
- package/dist/assets/{railroadDiagram-AXF67PYL-D3S1oliC.js → railroadDiagram-AXF67PYL-DLoAPcsb.js} +1 -1
- package/dist/assets/{requirementDiagram-LRYGKXZP-C04jhjS6.js → requirementDiagram-LRYGKXZP-LrVlZXSz.js} +1 -1
- package/dist/assets/{requirementDiagram-LRYGKXZP-cQaGai5h.js → requirementDiagram-LRYGKXZP-pakITowN.js} +1 -1
- package/dist/assets/{sankeyDiagram-W5VNT64P-AT4cTVbY.js → sankeyDiagram-W5VNT64P-BIQQ8A1I.js} +1 -1
- package/dist/assets/{sankeyDiagram-W5VNT64P-DfFUdqYO.js → sankeyDiagram-W5VNT64P-C6QWOxNM.js} +1 -1
- package/dist/assets/{sequenceDiagram-SI44F4Z6-DbjhG030.js → sequenceDiagram-SI44F4Z6-CpHBe2CG.js} +1 -1
- package/dist/assets/{sequenceDiagram-SI44F4Z6-DKjdupix.js → sequenceDiagram-SI44F4Z6-cnLxaxcV.js} +1 -1
- package/dist/assets/{sizeCapture-X5ZJPWSS-CCcKLP8m.js → sizeCapture-X5ZJPWSS-3g-1onHD.js} +1 -1
- package/dist/assets/{sizeCapture-X5ZJPWSS-DGxRWxeo.js → sizeCapture-X5ZJPWSS-4U6b3PSL.js} +1 -1
- package/dist/assets/{stateDiagram-OKZ733FA-D7wGCNb7.js → stateDiagram-OKZ733FA-CFwVDdlY.js} +1 -1
- package/dist/assets/{stateDiagram-OKZ733FA-qdMAailp.js → stateDiagram-OKZ733FA-CKVGJcM2.js} +1 -1
- package/dist/assets/{stateDiagram-v2-UEYNNEHI-BbmmtA9w.js → stateDiagram-v2-UEYNNEHI-Dnbk8ftm.js} +1 -1
- package/dist/assets/{stateDiagram-v2-UEYNNEHI-Diz_hFvh.js → stateDiagram-v2-UEYNNEHI-rlA-woxH.js} +1 -1
- package/dist/assets/{swimlanes-SLNWSIFB-CZgIPz6I.js → swimlanes-SLNWSIFB-DCwz8-mf.js} +2 -2
- package/dist/assets/{swimlanes-SLNWSIFB-B16H-6OU.js → swimlanes-SLNWSIFB-M9Oumwnl.js} +2 -2
- package/dist/assets/swimlanesDiagram-ULZ7WXOC-CTtTyW6-.js +8 -0
- package/dist/assets/swimlanesDiagram-ULZ7WXOC-Caohx6WZ.js +8 -0
- package/dist/assets/{timeline-definition-Z64GVDOM-7r7OVlrT.js → timeline-definition-Z64GVDOM-BVmfjoWH.js} +1 -1
- package/dist/assets/{timeline-definition-Z64GVDOM-nhnkS_wy.js → timeline-definition-Z64GVDOM-DyXvto1l.js} +1 -1
- package/dist/assets/{vennDiagram-T6HMQDX7-B1piFYrz.js → vennDiagram-T6HMQDX7-CNe6zorb.js} +1 -1
- package/dist/assets/{vennDiagram-T6HMQDX7-x8SJTFhK.js → vennDiagram-T6HMQDX7-DyzOWKx3.js} +1 -1
- package/dist/assets/{wardleyDiagram-T6FBY63Y-BdD4GExj.js → wardleyDiagram-T6FBY63Y-D5YvMVwa.js} +1 -1
- package/dist/assets/{wardleyDiagram-T6FBY63Y-C90xqNVS.js → wardleyDiagram-T6FBY63Y-DXo8BCrA.js} +1 -1
- package/dist/assets/{xychartDiagram-ELKLHX3M--Ndoz0Cq.js → xychartDiagram-ELKLHX3M-CIBffVxC.js} +1 -1
- package/dist/assets/{xychartDiagram-ELKLHX3M-BAKns-7o.js → xychartDiagram-ELKLHX3M-XlsWelDb.js} +1 -1
- package/dist/build-info.json +2 -2
- package/dist/convert-icons.md +10 -46
- package/dist/favicon.png +0 -0
- package/dist/favicon.svg +1 -9
- package/dist/generate-icons.js +67 -47
- package/dist/icons/icon-128x128.png +0 -0
- package/dist/icons/icon-144x144.png +0 -0
- package/dist/icons/icon-152x152.png +0 -0
- package/dist/icons/icon-192x192.png +0 -0
- package/dist/icons/icon-384x384.png +0 -0
- package/dist/icons/icon-512x512.png +0 -0
- package/dist/icons/icon-72x72.png +0 -0
- package/dist/icons/icon-96x96.png +0 -0
- package/dist/index.html +2 -2
- package/dist/logo-128.png +0 -0
- package/dist/logo-256.png +0 -0
- package/dist/logo-32.png +0 -0
- package/dist/logo-512.png +0 -0
- package/dist/logo-64.png +0 -0
- package/dist/logo-source.png +0 -0
- package/dist/logo.svg +1 -17
- package/dist/sw.js +7 -9
- package/dist-server/build-info.json +2 -2
- package/dist-server/server/load-env.js +12 -4
- package/dist-server/server/load-env.js.map +1 -1
- package/dist-server/server/modules/browser-use/browser-use.service.js +33 -11
- package/dist-server/server/modules/browser-use/browser-use.service.js.map +1 -1
- package/dist-server/server/modules/browser-use/index.js +4 -4
- package/dist-server/server/modules/browser-use/index.js.map +1 -1
- package/dist-server/server/modules/browser-use/mcp-server-names.js +6 -4
- package/dist-server/server/modules/browser-use/mcp-server-names.js.map +1 -1
- package/dist-server/server/modules/browser-use/tests/browser-use.service.test.js +49 -1
- package/dist-server/server/modules/browser-use/tests/browser-use.service.test.js.map +1 -1
- package/dist-server/server/modules/cli/asset-migration-files.js +74 -0
- package/dist-server/server/modules/cli/asset-migration-files.js.map +1 -0
- package/dist-server/server/modules/cli/asset-migration-report.js +80 -0
- package/dist-server/server/modules/cli/asset-migration-report.js.map +1 -0
- package/dist-server/server/modules/cli/asset-migration-store.js +153 -0
- package/dist-server/server/modules/cli/asset-migration-store.js.map +1 -0
- package/dist-server/server/modules/cli/asset-migration.service.js +161 -0
- package/dist-server/server/modules/cli/asset-migration.service.js.map +1 -0
- package/dist-server/server/modules/cli/browser-use-mcp.js +9 -4
- package/dist-server/server/modules/cli/browser-use-mcp.js.map +1 -1
- package/dist-server/server/modules/cli/cli.module.js +21 -1
- package/dist-server/server/modules/cli/cli.module.js.map +1 -1
- package/dist-server/server/modules/cli/cli.service.js +6 -1
- package/dist-server/server/modules/cli/cli.service.js.map +1 -1
- package/dist-server/server/modules/cli/tests/asset-migration.service.test.js +275 -0
- package/dist-server/server/modules/cli/tests/asset-migration.service.test.js.map +1 -0
- package/dist-server/server/modules/cli/tests/browser-use-mcp-entry.test.js +157 -0
- package/dist-server/server/modules/cli/tests/browser-use-mcp-entry.test.js.map +1 -1
- package/dist-server/server/modules/cli/tests/cli-environment-bootstrap.test.js +1 -0
- package/dist-server/server/modules/cli/tests/cli-environment-bootstrap.test.js.map +1 -1
- package/dist-server/server/modules/cli/tests/cli.service.test.js +6 -1
- package/dist-server/server/modules/cli/tests/cli.service.test.js.map +1 -1
- package/dist-server/server/modules/cockpit/cockpit-brief-prompt.js +1 -1
- package/dist-server/server/modules/cockpit/cockpit-card-actions.js +19 -3
- package/dist-server/server/modules/cockpit/cockpit-card-actions.js.map +1 -1
- package/dist-server/server/modules/cockpit/cockpit-card-feedback-store.js +94 -9
- package/dist-server/server/modules/cockpit/cockpit-card-feedback-store.js.map +1 -1
- package/dist-server/server/modules/cockpit/cockpit-card-registry.js +1 -1
- package/dist-server/server/modules/cockpit/cockpit-fleet-card-projection.js +3 -0
- package/dist-server/server/modules/cockpit/cockpit-fleet-card-projection.js.map +1 -1
- package/dist-server/server/modules/cockpit/cockpit-knowledge-reading.js +16 -0
- package/dist-server/server/modules/cockpit/cockpit-knowledge-reading.js.map +1 -1
- package/dist-server/server/modules/cockpit/cockpit.module.js +1 -1
- package/dist-server/server/modules/cockpit/tests/cockpit-card-feedback.test.js +96 -1
- package/dist-server/server/modules/cockpit/tests/cockpit-card-feedback.test.js.map +1 -1
- package/dist-server/server/modules/cockpit/tests/cockpit-fleet-card-provider.test.js +2 -2
- package/dist-server/server/modules/cockpit/tests/cockpit-knowledge-decision-handoff.test.js +169 -3
- package/dist-server/server/modules/cockpit/tests/cockpit-knowledge-decision-handoff.test.js.map +1 -1
- package/dist-server/server/modules/context-events/context-event-writer.js +5 -5
- package/dist-server/server/modules/context-events/context-events.module.js +2 -2
- package/dist-server/server/modules/context-events/session-ask-stream-reader.js +1 -1
- package/dist-server/server/modules/context-events/session-blocked-events.js +3 -3
- package/dist-server/server/modules/context-events/tests/session-ask-event-writer.test.js +1 -1
- package/dist-server/server/modules/context-events/tests/session-blocked-events.test.js +3 -3
- package/dist-server/server/modules/context-events/tests/session-run-events.test.js +1 -1
- package/dist-server/server/modules/database/migrations.js +23 -1
- package/dist-server/server/modules/database/migrations.js.map +1 -1
- package/dist-server/server/modules/database/repositories/sessions.db.js +25 -4
- package/dist-server/server/modules/database/repositories/sessions.db.js.map +1 -1
- package/dist-server/server/modules/database/repositories/voice-user-identifiers.db.js +1 -1
- package/dist-server/server/modules/database/schema.js +16 -2
- package/dist-server/server/modules/database/schema.js.map +1 -1
- package/dist-server/server/modules/database/tests/migrations-ensure-columns.test.js +2 -0
- package/dist-server/server/modules/database/tests/migrations-ensure-columns.test.js.map +1 -1
- package/dist-server/server/modules/database/tests/sessions-provider-mapping.test.js +2 -2
- package/dist-server/server/modules/debug-agent/tests/debug-agent-permission-popup.test.js +2 -2
- package/dist-server/server/modules/liaison/liaison-deliver.service.js +3 -3
- package/dist-server/server/modules/liaison/liaison.module.js +1 -1
- package/dist-server/server/modules/mcp-gateway/mcp-gateway.auth.js +3 -2
- package/dist-server/server/modules/mcp-gateway/mcp-gateway.auth.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/mcp-self-target.js +2 -2
- package/dist-server/server/modules/mcp-gateway/mcp-session-send.js +7 -0
- package/dist-server/server/modules/mcp-gateway/mcp-session-send.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/mcp-tool-annotations.js +4 -4
- package/dist-server/server/modules/mcp-gateway/oauth-metadata.gate.js +4 -2
- package/dist-server/server/modules/mcp-gateway/oauth-metadata.gate.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/knowledge-effective-config-proof.test.js +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/knowledge-peer-correlation-proof.test.js +2 -2
- package/dist-server/server/modules/mcp-gateway/tests/mcp-approvals.test.js +3 -2
- package/dist-server/server/modules/mcp-gateway/tests/mcp-approvals.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-audit-route.test.js +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-audit.test.js +4 -4
- package/dist-server/server/modules/mcp-gateway/tests/mcp-auth.test.js +3 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-auth.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-cancel-queued.test.js +3 -2
- package/dist-server/server/modules/mcp-gateway/tests/mcp-cancel-queued.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-cockpit-tools.test.js +7 -3
- package/dist-server/server/modules/mcp-gateway/tests/mcp-cockpit-tools.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-correlation-id.test.js +8 -8
- package/dist-server/server/modules/mcp-gateway/tests/mcp-draft.test.js +3 -2
- package/dist-server/server/modules/mcp-gateway/tests/mcp-draft.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-english-only.test.js +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-gateway-wiring.test.js +2 -2
- package/dist-server/server/modules/mcp-gateway/tests/mcp-insufficient-scope.test.js +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-insufficient-scope.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-knowledge-facts.test.js +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-not-found-semantics.test.js +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-not-found-semantics.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-oauth-challenge.test.js +3 -2
- package/dist-server/server/modules/mcp-gateway/tests/mcp-oauth-challenge.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-overview.test.js +2 -2
- package/dist-server/server/modules/mcp-gateway/tests/mcp-pending-interaction.test.js +2 -2
- package/dist-server/server/modules/mcp-gateway/tests/mcp-read-tools.test.js +3 -3
- package/dist-server/server/modules/mcp-gateway/tests/mcp-read-tools.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-run-get.test.js +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-self-target.test.js +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-self-target.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-session-background.test.js +2 -2
- package/dist-server/server/modules/mcp-gateway/tests/mcp-session-background.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-session-host-control.test.js +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-session-host-control.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-session-lifecycle.test.js +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-session-lifecycle.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-session-reconfigure.test.js +2 -2
- package/dist-server/server/modules/mcp-gateway/tests/mcp-session-reconfigure.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-session-search-pruning.test.js +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-session-search.test.js +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-session-send.test.js +2 -2
- package/dist-server/server/modules/mcp-gateway/tests/mcp-session-send.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-ui-last-opened.test.js +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-usage-stats.test.js +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-usage-stats.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/mcp-write-notification.test.js +2 -2
- package/dist-server/server/modules/mcp-gateway/tests/mcp-write-notification.test.js.map +1 -1
- package/dist-server/server/modules/mcp-gateway/tests/oauth-flow.e2e.test.js +3 -3
- package/dist-server/server/modules/notifications/services/notification-orchestrator.service.js +1 -1
- package/dist-server/server/modules/oauth/access-tokens.service.js +8 -8
- package/dist-server/server/modules/oauth/oauth-consent.service.js +20 -15
- package/dist-server/server/modules/oauth/oauth-consent.service.js.map +1 -1
- package/dist-server/server/modules/oauth/tests/access-token-scopes.test.js +54 -34
- package/dist-server/server/modules/oauth/tests/access-token-scopes.test.js.map +1 -1
- package/dist-server/server/modules/oauth/tests/access-tokens.service.test.js +35 -14
- package/dist-server/server/modules/oauth/tests/access-tokens.service.test.js.map +1 -1
- package/dist-server/server/modules/oauth/tests/oauth-consent-page.test.js +27 -22
- package/dist-server/server/modules/oauth/tests/oauth-consent-page.test.js.map +1 -1
- package/dist-server/server/modules/oauth/tests/oauth-consent-ratelimit.test.js +2 -2
- package/dist-server/server/modules/oauth/tests/token-info.routes.test.js +2 -2
- package/dist-server/server/modules/oauth/tests/token-info.routes.test.js.map +1 -1
- package/dist-server/server/modules/observation/blind-spots.js +1 -1
- package/dist-server/server/modules/observation/observation-store.js +50 -17
- package/dist-server/server/modules/observation/observation-store.js.map +1 -1
- package/dist-server/server/modules/observation/observation-uri.js +31 -19
- package/dist-server/server/modules/observation/observation-uri.js.map +1 -1
- package/dist-server/server/modules/observation/observation.routes.js +1 -1
- package/dist-server/server/modules/observation/project-truth.js +1 -1
- package/dist-server/server/modules/observation/session-ask-decision-answer.js +2 -1
- package/dist-server/server/modules/observation/session-ask-decision-answer.js.map +1 -1
- package/dist-server/server/modules/observation/session-digest-llm.js +7 -1
- package/dist-server/server/modules/observation/session-digest-llm.js.map +1 -1
- package/dist-server/server/modules/observation/session-digest.js +39 -5
- package/dist-server/server/modules/observation/session-digest.js.map +1 -1
- package/dist-server/server/modules/observation/tests/architecture-delta.test.js +1 -1
- package/dist-server/server/modules/observation/tests/observation-routes.test.js +9 -0
- package/dist-server/server/modules/observation/tests/observation-routes.test.js.map +1 -1
- package/dist-server/server/modules/observation/tests/observation-store.test.js +38 -0
- package/dist-server/server/modules/observation/tests/observation-store.test.js.map +1 -1
- package/dist-server/server/modules/observation/tests/project-truth.test.js +2 -2
- package/dist-server/server/modules/observation/tests/session-ask-decision-digest.test.js +150 -0
- package/dist-server/server/modules/observation/tests/session-ask-decision-digest.test.js.map +1 -1
- package/dist-server/server/modules/observation/tests/session-digest.test.js +24 -1
- package/dist-server/server/modules/observation/tests/session-digest.test.js.map +1 -1
- package/dist-server/server/modules/providers/index.js +9 -0
- package/dist-server/server/modules/providers/index.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude-host-driver.provider.js +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-app-server.client.js +22 -3
- package/dist-server/server/modules/providers/list/codex/codex-app-server.client.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-app-server.connection.js +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-host-driver.contract.js +11 -9
- package/dist-server/server/modules/providers/list/codex/codex-host-driver.contract.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-host-driver.provider.js +15 -1
- package/dist-server/server/modules/providers/list/codex/codex-host-driver.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-models.provider.js +14 -3
- package/dist-server/server/modules/providers/list/codex/codex-models.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-provider-injection.js +248 -0
- package/dist-server/server/modules/providers/list/codex/codex-provider-injection.js.map +1 -0
- package/dist-server/server/modules/providers/list/codex/codex-resident-provider-launch.js +37 -0
- package/dist-server/server/modules/providers/list/codex/codex-resident-provider-launch.js.map +1 -0
- package/dist-server/server/modules/providers/list/codex/codex-runtime.provider.js +19 -1
- package/dist-server/server/modules/providers/list/codex/codex-runtime.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/cursor/cursor-models.provider.js +1 -1
- package/dist-server/server/modules/providers/list/opencode/opencode-models.provider.js +1 -1
- package/dist-server/server/modules/providers/provider.routes.js +23 -2
- package/dist-server/server/modules/providers/provider.routes.js.map +1 -1
- package/dist-server/server/modules/providers/services/provider-models.service.js +136 -106
- package/dist-server/server/modules/providers/services/provider-models.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/provider-runtime.service.js +3 -0
- package/dist-server/server/modules/providers/services/provider-runtime.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/session-model-resolver.js +106 -0
- package/dist-server/server/modules/providers/services/session-model-resolver.js.map +1 -0
- package/dist-server/server/modules/providers/services/session-provider-binding.js +89 -0
- package/dist-server/server/modules/providers/services/session-provider-binding.js.map +1 -0
- package/dist-server/server/modules/providers/services/sessions.service.js +5 -1
- package/dist-server/server/modules/providers/services/sessions.service.js.map +1 -1
- package/dist-server/server/modules/providers/tests/claude-resident-addressable.test.js +2 -2
- package/dist-server/server/modules/providers/tests/claude-session-name-authority.test.js +4 -4
- package/dist-server/server/modules/providers/tests/codex-app-server-protocol.test.js +1 -1
- package/dist-server/server/modules/providers/tests/codex-host-driver-persistent.test.js +2 -2
- package/dist-server/server/modules/providers/tests/codex-provider-model-binding.test.js +270 -0
- package/dist-server/server/modules/providers/tests/codex-provider-model-binding.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/codex-resident-provider-injection.test.js +484 -0
- package/dist-server/server/modules/providers/tests/codex-resident-provider-injection.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/codex-runtime-provider-injection.test.js +228 -0
- package/dist-server/server/modules/providers/tests/codex-runtime-provider-injection.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/codex-session-provider-binding.test.js +306 -0
- package/dist-server/server/modules/providers/tests/codex-session-provider-binding.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/codex-sessions.test.js +1 -1
- package/dist-server/server/modules/providers/tests/opencode-sessions.test.js +2 -2
- package/dist-server/server/modules/providers/tests/provider-models.service.test.js +15 -0
- package/dist-server/server/modules/providers/tests/provider-models.service.test.js.map +1 -1
- package/dist-server/server/modules/providers/tests/provider.routes.test.js +1 -1
- package/dist-server/server/modules/quay/index.js +1 -1
- package/dist-server/server/modules/quay/quay-fleet-cli.js +1 -1
- package/dist-server/server/modules/quay/quay-fleet-locator.js +2 -2
- package/dist-server/server/modules/quay/quay-fleet-project-id.js +7 -7
- package/dist-server/server/modules/quay/quay-fleet-registry.js +3 -3
- package/dist-server/server/modules/quay/quay-suite-fanin-reader.js +1 -1
- package/dist-server/server/modules/quay/quay-uri-resolve.js +6 -6
- package/dist-server/server/modules/quay/quay.module.js +3 -3
- package/dist-server/server/modules/quay/quay.routes.js +1 -1
- package/dist-server/server/modules/quay/quay.service.js +4 -4
- package/dist-server/server/modules/quay/tests/contracts/fleet-cli-contracts.test.js +3 -3
- package/dist-server/server/modules/quay/tests/contracts/shapes.js +9 -9
- package/dist-server/server/modules/quay/tests/quay-fleet-locator.test.js +1 -1
- package/dist-server/server/modules/quay/tests/quay-fleet-project-id.test.js +4 -4
- package/dist-server/server/modules/quay/tests/quay-uri-resolve.test.js +10 -10
- package/dist-server/server/modules/session-hosts/tests/resident-server-restart.test.js +1 -1
- package/dist-server/server/modules/settings/codex-mcp-gateway.settings.js +1 -1
- package/dist-server/server/modules/settings/codex-model-providers.schema.js +349 -0
- package/dist-server/server/modules/settings/codex-model-providers.schema.js.map +1 -0
- package/dist-server/server/modules/settings/codex-model-providers.service.js +199 -0
- package/dist-server/server/modules/settings/codex-model-providers.service.js.map +1 -0
- package/dist-server/server/modules/settings/codex-model-providers.settings.js +547 -0
- package/dist-server/server/modules/settings/codex-model-providers.settings.js.map +1 -0
- package/dist-server/server/modules/settings/codex-model-providers.store.js +200 -0
- package/dist-server/server/modules/settings/codex-model-providers.store.js.map +1 -0
- package/dist-server/server/modules/settings/index.js +10 -0
- package/dist-server/server/modules/settings/index.js.map +1 -1
- package/dist-server/server/modules/settings/server-settings-file.js +28 -32
- package/dist-server/server/modules/settings/server-settings-file.js.map +1 -1
- package/dist-server/server/modules/settings/server-settings.js +2 -2
- package/dist-server/server/modules/settings/server-settings.js.map +1 -1
- package/dist-server/server/modules/settings/settings.module.js +35 -0
- package/dist-server/server/modules/settings/settings.module.js.map +1 -1
- package/dist-server/server/modules/settings/settings.routes.js +42 -0
- package/dist-server/server/modules/settings/settings.routes.js.map +1 -1
- package/dist-server/server/modules/settings/settings.service.js +8 -21
- package/dist-server/server/modules/settings/settings.service.js.map +1 -1
- package/dist-server/server/modules/settings/tests/cockpit-session-start-settings.routes.test.js +1 -0
- package/dist-server/server/modules/settings/tests/cockpit-session-start-settings.routes.test.js.map +1 -1
- package/dist-server/server/modules/settings/tests/codex-model-providers-settings.test.js +336 -0
- package/dist-server/server/modules/settings/tests/codex-model-providers-settings.test.js.map +1 -0
- package/dist-server/server/modules/settings/tests/codex-provider-advanced.test.js +466 -0
- package/dist-server/server/modules/settings/tests/codex-provider-advanced.test.js.map +1 -0
- package/dist-server/server/modules/settings/tests/codex-provider-import.test.js +475 -0
- package/dist-server/server/modules/settings/tests/codex-provider-import.test.js.map +1 -0
- package/dist-server/server/modules/voice/tests/voice-lexicon.test.js +9 -9
- package/dist-server/server/modules/voice/tests/voice-lexicon.test.js.map +1 -1
- package/dist-server/server/modules/voice/voice-lexicon.js +1 -1
- package/dist-server/server/modules/websocket/services/chat-control.service.js +21 -1
- package/dist-server/server/modules/websocket/services/chat-control.service.js.map +1 -1
- package/dist-server/server/modules/websocket/services/chat-websocket.service.js +25 -1
- package/dist-server/server/modules/websocket/services/chat-websocket.service.js.map +1 -1
- package/dist-server/server/modules/websocket/tests/chat-background-task.test.js +18 -1
- package/dist-server/server/modules/websocket/tests/chat-background-task.test.js.map +1 -1
- package/dist-server/server/modules/websocket/tests/chat-stop-task.test.js +18 -1
- package/dist-server/server/modules/websocket/tests/chat-stop-task.test.js.map +1 -1
- package/dist-server/server/modules/worktrees/services/worktree-list.service.js +1 -1
- package/dist-server/server/modules/worktrees/services/worktree-open.service.js +1 -1
- package/dist-server/server/modules/worktrees/services/worktree-remove.service.js +1 -1
- package/dist-server/server/shared/brand.js +18 -20
- package/dist-server/server/shared/brand.js.map +1 -1
- package/dist-server/server/shared/data-root-migration.js +3 -2
- package/dist-server/server/shared/data-root-migration.js.map +1 -1
- package/dist-server/server/shared/data-root.js +54 -59
- package/dist-server/server/shared/data-root.js.map +1 -1
- package/dist-server/server/shared/mcp-contract/types.js +20 -15
- package/dist-server/server/shared/mcp-contract/types.js.map +1 -1
- package/dist-server/server/shared/ports/codex-provider-registry.port.js +66 -0
- package/dist-server/server/shared/ports/codex-provider-registry.port.js.map +1 -0
- package/dist-server/server/shared/settings-file.js +120 -6
- package/dist-server/server/shared/settings-file.js.map +1 -1
- package/dist-server/server/shared/tests/cloudpit-brand-env.test.js +76 -34
- package/dist-server/server/shared/tests/cloudpit-brand-env.test.js.map +1 -1
- package/dist-server/server/shared/tests/cloudpit-data-root.test.js +35 -18
- package/dist-server/server/shared/tests/cloudpit-data-root.test.js.map +1 -1
- package/dist-server/server/shared/tests/cloudpit-goal-exit-gate.test.js +153 -17
- package/dist-server/server/shared/tests/cloudpit-goal-exit-gate.test.js.map +1 -1
- package/dist-server/server/shared/tests/cloudpit-runtime-flip.test.js +116 -114
- package/dist-server/server/shared/tests/cloudpit-runtime-flip.test.js.map +1 -1
- package/dist-server/server/shared/tests/frontend-import-cycle-budget.test.js +9 -1
- package/dist-server/server/shared/tests/frontend-import-cycle-budget.test.js.map +1 -1
- package/dist-server/server/shared/tests/quay-test-script.test.js +40 -6
- package/dist-server/server/shared/tests/quay-test-script.test.js.map +1 -1
- package/dist-server/server/shared/tests/settings-file.test.js +58 -2
- package/dist-server/server/shared/tests/settings-file.test.js.map +1 -1
- package/dist-server/server/shared/types.js.map +1 -1
- package/dist-server/server/shared/utils.js +1 -1
- package/electron/appIdMigration.js +467 -0
- package/electron/assets/logo-macos.icns +0 -0
- package/electron/assets/logo-macos.png +0 -0
- package/electron/assets/logo-windows.ico +0 -0
- package/electron/brandEnv.js +64 -0
- package/electron/cloud.js +3 -3
- package/electron/desktopNotifications.js +1 -1
- package/electron/launcher/index.html +1 -1
- package/electron/localServer.js +41 -7
- package/electron/main.js +33 -15
- package/electron/scripts/generate-macos-icon.js +34 -28
- package/electron/scripts/generate-windows-icon.js +66 -0
- package/electron/serverInstaller.js +20 -11
- package/electron/tests/cloudpit-appid-migration.test.mjs +514 -0
- package/electron/tests/cloudpit-brand-env-wiring.test.mjs +324 -0
- package/electron/tests/cloudpit-desktop-identity.test.mjs +42 -19
- package/electron/tests/cloudpit-runtime-identity-surfaces.test.mjs +10 -4
- package/electron/tests/cloudpit-userdata-migration.test.mjs +18 -5
- package/electron/userDataMigration.js +3 -0
- package/package.json +7 -6
- package/public/api-docs.html +3 -3
- package/scripts/brand-allowlist-check.mjs +233 -12
- package/scripts/brand-allowlist-check.test.mjs +270 -1
- package/scripts/cloudpit-distribution-check.mjs +57 -23
- package/scripts/cloudpit-distribution-check.test.mjs +42 -9
- package/scripts/codex-protocol-smoke.mjs +1 -1
- package/scripts/isolated-instance.sh +1 -1
- package/scripts/mcp-smoke.mjs +2 -2
- package/scripts/release/tests/fork-release-workflows.test.mjs +45 -0
- package/scripts/release/tests/server-installer-bundle-url.test.mjs +57 -9
- package/scripts/restart-when-idle.sh +1 -1
- package/scripts/shadow-prediction-report.mjs +1 -1
- package/scripts/suite-duration-baseline.tsv +45 -0
- package/scripts/ui-scenario.mjs +195 -0
- package/scripts/ui-scenarios/codex-provider-import.json +63 -0
- package/scripts/ui-scenarios/codex-provider-settings.json +77 -0
- package/scripts/voice-capture-process-check.false-forms.test.mjs +1 -1
- package/scripts/voice-phase0-report.test.mjs +1 -1
- package/server/load-env.ts +15 -4
- package/server/modules/browser-use/browser-use.service.ts +45 -14
- package/server/modules/browser-use/index.ts +3 -4
- package/server/modules/browser-use/mcp-server-names.ts +6 -5
- package/server/modules/browser-use/tests/browser-use.service.test.ts +63 -1
- package/server/modules/cli/asset-migration-files.ts +96 -0
- package/server/modules/cli/asset-migration-report.ts +123 -0
- package/server/modules/cli/asset-migration-store.ts +228 -0
- package/server/modules/cli/asset-migration.service.ts +236 -0
- package/server/modules/cli/browser-use-mcp.ts +9 -4
- package/server/modules/cli/cli.module.ts +21 -1
- package/server/modules/cli/cli.service.ts +14 -1
- package/server/modules/cli/tests/asset-migration.service.test.ts +349 -0
- package/server/modules/cli/tests/browser-use-mcp-entry.test.ts +202 -0
- package/server/modules/cli/tests/cli-environment-bootstrap.test.ts +1 -0
- package/server/modules/cli/tests/cli.service.test.ts +6 -1
- package/server/modules/cockpit/cockpit-brief-prompt.ts +1 -1
- package/server/modules/cockpit/cockpit-card-actions.ts +20 -3
- package/server/modules/cockpit/cockpit-card-feedback-store.ts +104 -9
- package/server/modules/cockpit/cockpit-card-registry.ts +2 -2
- package/server/modules/cockpit/cockpit-fleet-card-projection.ts +3 -0
- package/server/modules/cockpit/cockpit-fleet-executor.ts +1 -1
- package/server/modules/cockpit/cockpit-knowledge-reading.ts +17 -0
- package/server/modules/cockpit/cockpit.module.ts +2 -2
- package/server/modules/cockpit/cockpit.reducer.ts +1 -1
- package/server/modules/cockpit/tests/cockpit-card-feedback.test.ts +116 -1
- package/server/modules/cockpit/tests/cockpit-fleet-card-provider.test.ts +2 -2
- package/server/modules/cockpit/tests/cockpit-knowledge-decision-handoff.test.ts +205 -3
- package/server/modules/context-events/context-event-writer.ts +6 -6
- package/server/modules/context-events/context-events.module.ts +2 -2
- package/server/modules/context-events/session-ask-stream-reader.ts +1 -1
- package/server/modules/context-events/session-blocked-events.ts +3 -3
- package/server/modules/context-events/tests/session-ask-event-writer.test.ts +1 -1
- package/server/modules/context-events/tests/session-blocked-events.test.ts +3 -3
- package/server/modules/context-events/tests/session-run-events.test.ts +1 -1
- package/server/modules/database/migrations.ts +24 -1
- package/server/modules/database/repositories/sessions.db.ts +41 -4
- package/server/modules/database/repositories/voice-user-identifiers.db.ts +1 -1
- package/server/modules/database/schema.ts +16 -2
- package/server/modules/database/tests/migrations-ensure-columns.test.ts +2 -0
- package/server/modules/database/tests/sessions-provider-mapping.test.ts +2 -2
- package/server/modules/debug-agent/tests/debug-agent-permission-popup.test.ts +2 -2
- package/server/modules/liaison/liaison-deliver.service.ts +4 -4
- package/server/modules/liaison/liaison.module.ts +1 -1
- package/server/modules/mcp-gateway/mcp-gateway.auth.ts +3 -2
- package/server/modules/mcp-gateway/mcp-self-target.ts +2 -2
- package/server/modules/mcp-gateway/mcp-session-send.ts +21 -2
- package/server/modules/mcp-gateway/mcp-tool-annotations.ts +4 -4
- package/server/modules/mcp-gateway/oauth-metadata.gate.ts +4 -5
- package/server/modules/mcp-gateway/tests/knowledge-effective-config-proof.test.ts +1 -1
- package/server/modules/mcp-gateway/tests/knowledge-peer-correlation-proof.test.ts +2 -2
- package/server/modules/mcp-gateway/tests/mcp-approvals.test.ts +3 -2
- package/server/modules/mcp-gateway/tests/mcp-audit-route.test.ts +1 -1
- package/server/modules/mcp-gateway/tests/mcp-audit.test.ts +4 -4
- package/server/modules/mcp-gateway/tests/mcp-auth.test.ts +3 -1
- package/server/modules/mcp-gateway/tests/mcp-cancel-queued.test.ts +3 -2
- package/server/modules/mcp-gateway/tests/mcp-cockpit-tools.test.ts +7 -3
- package/server/modules/mcp-gateway/tests/mcp-correlation-id.test.ts +8 -8
- package/server/modules/mcp-gateway/tests/mcp-draft.test.ts +3 -2
- package/server/modules/mcp-gateway/tests/mcp-english-only.test.ts +1 -1
- package/server/modules/mcp-gateway/tests/mcp-gateway-wiring.test.ts +2 -2
- package/server/modules/mcp-gateway/tests/mcp-insufficient-scope.test.ts +1 -1
- package/server/modules/mcp-gateway/tests/mcp-knowledge-facts.test.ts +1 -1
- package/server/modules/mcp-gateway/tests/mcp-not-found-semantics.test.ts +1 -1
- package/server/modules/mcp-gateway/tests/mcp-oauth-challenge.test.ts +3 -2
- package/server/modules/mcp-gateway/tests/mcp-overview.test.ts +2 -2
- package/server/modules/mcp-gateway/tests/mcp-pending-interaction.test.ts +2 -2
- package/server/modules/mcp-gateway/tests/mcp-read-tools.test.ts +3 -3
- package/server/modules/mcp-gateway/tests/mcp-run-get.test.ts +1 -1
- package/server/modules/mcp-gateway/tests/mcp-self-target.test.ts +1 -1
- package/server/modules/mcp-gateway/tests/mcp-session-background.test.ts +2 -2
- package/server/modules/mcp-gateway/tests/mcp-session-host-control.test.ts +1 -1
- package/server/modules/mcp-gateway/tests/mcp-session-lifecycle.test.ts +1 -1
- package/server/modules/mcp-gateway/tests/mcp-session-reconfigure.test.ts +2 -2
- package/server/modules/mcp-gateway/tests/mcp-session-search-pruning.test.ts +1 -1
- package/server/modules/mcp-gateway/tests/mcp-session-search.test.ts +1 -1
- package/server/modules/mcp-gateway/tests/mcp-session-send.test.ts +2 -2
- package/server/modules/mcp-gateway/tests/mcp-ui-last-opened.test.ts +1 -1
- package/server/modules/mcp-gateway/tests/mcp-usage-stats.test.ts +1 -1
- package/server/modules/mcp-gateway/tests/mcp-write-notification.test.ts +2 -2
- package/server/modules/mcp-gateway/tests/oauth-flow.e2e.test.ts +3 -3
- package/server/modules/notifications/services/notification-orchestrator.service.js +1 -1
- package/server/modules/oauth/access-tokens.service.ts +8 -8
- package/server/modules/oauth/oauth-consent.service.ts +20 -15
- package/server/modules/oauth/tests/access-token-scopes.test.ts +55 -34
- package/server/modules/oauth/tests/access-tokens.service.test.ts +50 -14
- package/server/modules/oauth/tests/oauth-consent-page.test.ts +29 -21
- package/server/modules/oauth/tests/oauth-consent-ratelimit.test.ts +2 -2
- package/server/modules/oauth/tests/token-info.routes.test.ts +2 -2
- package/server/modules/observation/architecture-delta.producer.ts +1 -1
- package/server/modules/observation/blind-spots.ts +1 -1
- package/server/modules/observation/observation-store.ts +54 -16
- package/server/modules/observation/observation-uri.ts +34 -21
- package/server/modules/observation/observation.routes.ts +1 -1
- package/server/modules/observation/project-truth.ts +3 -3
- package/server/modules/observation/session-ask-decision-answer.ts +2 -1
- package/server/modules/observation/session-digest-llm.ts +7 -1
- package/server/modules/observation/session-digest.ts +39 -5
- package/server/modules/observation/tests/architecture-delta.test.ts +1 -1
- package/server/modules/observation/tests/observation-routes.test.ts +13 -0
- package/server/modules/observation/tests/observation-store.test.ts +58 -0
- package/server/modules/observation/tests/project-truth.test.ts +2 -2
- package/server/modules/observation/tests/session-ask-decision-digest.test.ts +189 -0
- package/server/modules/observation/tests/session-digest.test.ts +43 -0
- package/server/modules/providers/index.ts +13 -0
- package/server/modules/providers/list/claude/claude-host-driver.provider.ts +1 -1
- package/server/modules/providers/list/codex/codex-app-server.client.ts +37 -5
- package/server/modules/providers/list/codex/codex-app-server.connection.ts +1 -1
- package/server/modules/providers/list/codex/codex-host-driver.contract.ts +18 -9
- package/server/modules/providers/list/codex/codex-host-driver.provider.ts +15 -1
- package/server/modules/providers/list/codex/codex-models.provider.ts +16 -3
- package/server/modules/providers/list/codex/codex-provider-injection.ts +323 -0
- package/server/modules/providers/list/codex/codex-resident-provider-launch.ts +71 -0
- package/server/modules/providers/list/codex/codex-runtime.provider.ts +20 -1
- package/server/modules/providers/list/cursor/cursor-models.provider.ts +1 -1
- package/server/modules/providers/list/opencode/opencode-models.provider.ts +1 -1
- package/server/modules/providers/provider.routes.ts +23 -2
- package/server/modules/providers/services/provider-models.service.ts +187 -124
- package/server/modules/providers/services/provider-runtime.service.ts +3 -0
- package/server/modules/providers/services/session-model-resolver.ts +180 -0
- package/server/modules/providers/services/session-provider-binding.ts +176 -0
- package/server/modules/providers/services/sessions.service.ts +5 -1
- package/server/modules/providers/tests/claude-resident-addressable.test.ts +2 -2
- package/server/modules/providers/tests/claude-session-name-authority.test.ts +4 -4
- package/server/modules/providers/tests/codex-app-server-protocol.test.ts +1 -1
- package/server/modules/providers/tests/codex-host-driver-persistent.test.ts +2 -2
- package/server/modules/providers/tests/codex-provider-model-binding.test.ts +345 -0
- package/server/modules/providers/tests/codex-resident-provider-injection.test.ts +561 -0
- package/server/modules/providers/tests/codex-runtime-provider-injection.test.ts +269 -0
- package/server/modules/providers/tests/codex-session-provider-binding.test.ts +386 -0
- package/server/modules/providers/tests/codex-sessions.test.ts +1 -1
- package/server/modules/providers/tests/opencode-sessions.test.ts +2 -2
- package/server/modules/providers/tests/provider-models.service.test.ts +15 -0
- package/server/modules/providers/tests/provider.routes.test.ts +1 -1
- package/server/modules/quay/index.ts +1 -1
- package/server/modules/quay/quay-dispatch-carrier.ts +1 -1
- package/server/modules/quay/quay-fleet-cli.ts +1 -1
- package/server/modules/quay/quay-fleet-locator.ts +2 -2
- package/server/modules/quay/quay-fleet-project-id.ts +14 -14
- package/server/modules/quay/quay-fleet-registry.ts +8 -8
- package/server/modules/quay/quay-suite-fanin-reader.ts +1 -1
- package/server/modules/quay/quay-uri-resolve.ts +8 -8
- package/server/modules/quay/quay.module.ts +3 -3
- package/server/modules/quay/quay.routes.ts +1 -1
- package/server/modules/quay/quay.service.ts +6 -6
- package/server/modules/quay/session-task-chain.service.ts +1 -1
- package/server/modules/quay/tests/contracts/fleet-cli-contracts.test.ts +3 -3
- package/server/modules/quay/tests/contracts/shapes.ts +10 -10
- package/server/modules/quay/tests/quay-fleet-locator.test.ts +1 -1
- package/server/modules/quay/tests/quay-fleet-project-id.test.ts +6 -6
- package/server/modules/quay/tests/quay-uri-resolve.test.ts +10 -10
- package/server/modules/session-hosts/tests/resident-server-restart.test.ts +1 -1
- package/server/modules/settings/codex-mcp-gateway.settings.ts +1 -1
- package/server/modules/settings/codex-model-providers.schema.ts +460 -0
- package/server/modules/settings/codex-model-providers.service.ts +235 -0
- package/server/modules/settings/codex-model-providers.settings.ts +713 -0
- package/server/modules/settings/codex-model-providers.store.ts +244 -0
- package/server/modules/settings/index.ts +18 -0
- package/server/modules/settings/server-settings-file.ts +29 -41
- package/server/modules/settings/server-settings.ts +2 -3
- package/server/modules/settings/settings.module.ts +41 -0
- package/server/modules/settings/settings.routes.ts +37 -0
- package/server/modules/settings/settings.service.ts +21 -26
- package/server/modules/settings/tests/cockpit-session-start-settings.routes.test.ts +1 -0
- package/server/modules/settings/tests/codex-model-providers-settings.test.ts +413 -0
- package/server/modules/settings/tests/codex-provider-advanced.test.ts +540 -0
- package/server/modules/settings/tests/codex-provider-import.test.ts +621 -0
- package/server/modules/voice/tests/voice-lexicon.test.ts +10 -10
- package/server/modules/voice/voice-lexicon.ts +1 -1
- package/server/modules/websocket/services/chat-control.service.ts +35 -2
- package/server/modules/websocket/services/chat-websocket.service.ts +25 -1
- package/server/modules/websocket/tests/chat-background-task.test.ts +17 -1
- package/server/modules/websocket/tests/chat-stop-task.test.ts +17 -1
- package/server/modules/worktrees/services/worktree-list.service.ts +1 -1
- package/server/modules/worktrees/services/worktree-open.service.ts +1 -1
- package/server/modules/worktrees/services/worktree-remove.service.ts +1 -1
- package/server/shared/brand.ts +24 -38
- package/server/shared/data-root-migration.ts +3 -2
- package/server/shared/data-root.ts +73 -79
- package/server/shared/interfaces.ts +1 -1
- package/server/shared/mcp-contract/types.ts +20 -15
- package/server/shared/ports/codex-provider-registry.port.ts +133 -0
- package/server/shared/ports/session-blocked-events.port.ts +1 -1
- package/server/shared/ports/session-run-events.port.ts +2 -2
- package/server/shared/settings-file.ts +167 -6
- package/server/shared/tests/architecture-ratchet.baseline.json +15 -15
- package/server/shared/tests/cloudpit-brand-env.test.ts +106 -36
- package/server/shared/tests/cloudpit-data-root.test.ts +42 -18
- package/server/shared/tests/cloudpit-goal-exit-gate.baseline.json +6 -2
- package/server/shared/tests/cloudpit-goal-exit-gate.test.ts +179 -17
- package/server/shared/tests/cloudpit-runtime-flip.test.ts +162 -123
- package/server/shared/tests/frontend-import-cycle-budget.baseline.json +8 -6
- package/server/shared/tests/frontend-import-cycle-budget.test.ts +9 -1
- package/server/shared/tests/quay-test-script.test.ts +40 -6
- package/server/shared/tests/settings-file.test.ts +83 -1
- package/server/shared/types.ts +121 -8
- package/server/shared/utils.ts +1 -1
- package/dist/assets/channel-D7XqNTJC.js +0 -1
- package/dist/assets/channel-sbQyI1an.js +0 -1
- package/dist/assets/classDiagram-JCYQIIEL-DHudi-zH.js +0 -1
- package/dist/assets/classDiagram-JCYQIIEL-DV7ybJJG.js +0 -1
- package/dist/assets/classDiagram-v2-OCEON4UE-DHudi-zH.js +0 -1
- package/dist/assets/classDiagram-v2-OCEON4UE-DV7ybJJG.js +0 -1
- package/dist/assets/index-BsACp0s2.css +0 -32
- package/dist/assets/swimlanesDiagram-ULZ7WXOC-CNMNp6YA.js +0 -8
- package/dist/assets/swimlanesDiagram-ULZ7WXOC-DOjtDEUW.js +0 -8
- package/dist/icons/icon-128x128.svg +0 -12
- package/dist/icons/icon-144x144.svg +0 -12
- package/dist/icons/icon-152x152.svg +0 -12
- package/dist/icons/icon-192x192.svg +0 -12
- package/dist/icons/icon-384x384.svg +0 -12
- package/dist/icons/icon-512x512.svg +0 -12
- package/dist/icons/icon-72x72.svg +0 -12
- package/dist/icons/icon-96x96.svg +0 -12
- package/dist/icons/icon-template.svg +0 -12
|
@@ -0,0 +1,228 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Per-run Codex SDK provider injection (AC-464).
|
|
3
|
+
*
|
|
4
|
+
* The runtime used to always construct `new Codex()` with no options, so a
|
|
5
|
+
* model bound to a project upstream provider still dialled Codex's global
|
|
6
|
+
* default. This criterion pins the three readings that make the binding real:
|
|
7
|
+
*
|
|
8
|
+
* - POSITIVE: a model whose public config carries `codexProviderId` compiles
|
|
9
|
+
* `config.model_provider` + `config.model_providers.<id>` (base_url,
|
|
10
|
+
* env_key, wire_api) and passes the token-file secret in the child env
|
|
11
|
+
* under `env_key`. The REAL Codex SDK spawns the REAL bundled CLI, which
|
|
12
|
+
* POSTs to a local mock `/v1/responses`; the mock asserts the request's
|
|
13
|
+
* `Authorization` header is `Bearer <token-file secret>`.
|
|
14
|
+
* - ISOLATION: a host sentinel variable present in `process.env` is absent
|
|
15
|
+
* from the child env, while plumbing (PATH/HOME) survives.
|
|
16
|
+
* - NEGATIVE: a model with no `codexProviderId` still constructs `new Codex()`
|
|
17
|
+
* with neither `config` nor `env`; a model bound to an unknown provider is
|
|
18
|
+
* refused with a readable line and never falls back to the default endpoint.
|
|
19
|
+
*/
|
|
20
|
+
import assert from 'node:assert/strict';
|
|
21
|
+
import http from 'node:http';
|
|
22
|
+
import { mkdtemp, rm, writeFile } from 'node:fs/promises';
|
|
23
|
+
import os from 'node:os';
|
|
24
|
+
import path from 'node:path';
|
|
25
|
+
import test from 'node:test';
|
|
26
|
+
import { Codex } from '@openai/codex-sdk';
|
|
27
|
+
import { codexRuntime } from '../../../modules/providers/list/codex/codex-runtime.provider.js';
|
|
28
|
+
import { createCodexModelProvidersSource, } from '../../../modules/settings/index.js';
|
|
29
|
+
import { installCodexProviderRegistryPort, } from '../../../shared/ports/codex-provider-registry.port.js';
|
|
30
|
+
const HOST_SENTINEL_KEY = 'CC_CODEX_HOST_SENTINEL';
|
|
31
|
+
const HOST_SENTINEL_VALUE = 'host-secret-that-must-not-reach-the-child';
|
|
32
|
+
const PROVIDER_ID = 'bob';
|
|
33
|
+
const ENV_KEY = 'BOB_API_KEY';
|
|
34
|
+
const TOKEN_SECRET = 'token-file-secret-4242';
|
|
35
|
+
/**
|
|
36
|
+
* A local Responses-API mock. A 400 is deliberate: Codex 0.166 treats it as a
|
|
37
|
+
* terminal client error (no 5xx retry/backoff), so the criterion settles in
|
|
38
|
+
* well under a second while still exercising the real HTTP path — including the
|
|
39
|
+
* `Authorization` header the provider's `env_key` produces.
|
|
40
|
+
*/
|
|
41
|
+
async function startMockResponsesApi() {
|
|
42
|
+
const requests = [];
|
|
43
|
+
const server = http.createServer((request, response) => {
|
|
44
|
+
requests.push({
|
|
45
|
+
url: request.url ?? '',
|
|
46
|
+
authorization: typeof request.headers.authorization === 'string'
|
|
47
|
+
? request.headers.authorization
|
|
48
|
+
: undefined,
|
|
49
|
+
});
|
|
50
|
+
request.resume();
|
|
51
|
+
response.writeHead(400, { 'content-type': 'application/json' });
|
|
52
|
+
response.end(JSON.stringify({ error: { message: 'mock: provider injection criterion' } }));
|
|
53
|
+
});
|
|
54
|
+
await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve));
|
|
55
|
+
const { port } = server.address();
|
|
56
|
+
return {
|
|
57
|
+
requests,
|
|
58
|
+
baseUrl: `http://127.0.0.1:${port}/v1`,
|
|
59
|
+
close: () => new Promise((resolve, reject) => {
|
|
60
|
+
server.close((error) => (error ? reject(error) : resolve()));
|
|
61
|
+
}),
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Writes the production settings document + token file, then installs the real
|
|
66
|
+
* settings source in the shared registry port. Nothing about the resolution is
|
|
67
|
+
* stubbed: the runtime reads the JSON and the 0600 token file through the same
|
|
68
|
+
* `resolve()` the production composition root installs.
|
|
69
|
+
*/
|
|
70
|
+
async function withProviderRegistry(baseUrl, run) {
|
|
71
|
+
const directory = await mkdtemp(path.join(os.tmpdir(), 'codex-perrun-injection-'));
|
|
72
|
+
const settingsPath = path.join(directory, 'codex.settings.json');
|
|
73
|
+
const tokenFile = path.join(directory, 'bob.token');
|
|
74
|
+
await writeFile(tokenFile, TOKEN_SECRET, { encoding: 'utf8', mode: 0o600 });
|
|
75
|
+
await writeFile(settingsPath, JSON.stringify({
|
|
76
|
+
modelProviders: {
|
|
77
|
+
[PROVIDER_ID]: {
|
|
78
|
+
name: 'Bob Upstream',
|
|
79
|
+
baseUrl,
|
|
80
|
+
envKey: ENV_KEY,
|
|
81
|
+
tokenFile,
|
|
82
|
+
},
|
|
83
|
+
},
|
|
84
|
+
}), 'utf8');
|
|
85
|
+
const source = createCodexModelProvidersSource({ settingsPath, env: {}, homeDir: directory });
|
|
86
|
+
installCodexProviderRegistryPort({
|
|
87
|
+
read: () => ({
|
|
88
|
+
providers: source.read().providers.map((provider) => ({ id: provider.id })),
|
|
89
|
+
reservedIds: [],
|
|
90
|
+
}),
|
|
91
|
+
resolve: (id) => source.resolve(id),
|
|
92
|
+
});
|
|
93
|
+
try {
|
|
94
|
+
await run(directory);
|
|
95
|
+
}
|
|
96
|
+
finally {
|
|
97
|
+
await rm(directory, { recursive: true, force: true });
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
/** A context whose single model option carries (or omits) a provider binding. */
|
|
101
|
+
function contextForModel(modelId, codexProviderId) {
|
|
102
|
+
return {
|
|
103
|
+
resolveProviderSessionId: () => null,
|
|
104
|
+
resolveResumeModel: async () => modelId,
|
|
105
|
+
getProviderModels: async () => ({
|
|
106
|
+
OPTIONS: [{
|
|
107
|
+
value: modelId,
|
|
108
|
+
label: modelId,
|
|
109
|
+
isCustom: true,
|
|
110
|
+
config: codexProviderId === undefined
|
|
111
|
+
? { env: [] }
|
|
112
|
+
: { codexProviderId, env: [] },
|
|
113
|
+
}],
|
|
114
|
+
DEFAULT: modelId,
|
|
115
|
+
}),
|
|
116
|
+
normalizeMessage: () => [],
|
|
117
|
+
isProviderInstalled: async () => true,
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
/**
|
|
121
|
+
* Captures the options the runtime handed the REAL SDK constructor while
|
|
122
|
+
* letting the original `startThread` run, so the CLI still starts for real.
|
|
123
|
+
*/
|
|
124
|
+
function captureCodexOptions(t) {
|
|
125
|
+
let captured;
|
|
126
|
+
const originalStartThread = Codex.prototype.startThread;
|
|
127
|
+
t.mock.method(Codex.prototype, 'startThread', function startThread(options) {
|
|
128
|
+
captured = this.options;
|
|
129
|
+
return originalStartThread.call(this, options);
|
|
130
|
+
});
|
|
131
|
+
return {
|
|
132
|
+
options: () => {
|
|
133
|
+
assert.ok(captured, 'the runtime must construct the SDK through startThread');
|
|
134
|
+
return captured;
|
|
135
|
+
},
|
|
136
|
+
};
|
|
137
|
+
}
|
|
138
|
+
test('AC-464: a bound model launches the real SDK under its provider and the token file supplies Authorization', async (t) => {
|
|
139
|
+
const mock = await startMockResponsesApi();
|
|
140
|
+
const previousHome = process.env.HOME;
|
|
141
|
+
process.env[HOST_SENTINEL_KEY] = HOST_SENTINEL_VALUE;
|
|
142
|
+
try {
|
|
143
|
+
await withProviderRegistry(mock.baseUrl, async (home) => {
|
|
144
|
+
// Keep the real CLI's session/config writes inside the criterion's temp
|
|
145
|
+
// directory instead of the operator's ~/.codex.
|
|
146
|
+
process.env.HOME = home;
|
|
147
|
+
const capture = captureCodexOptions(t);
|
|
148
|
+
const messages = [];
|
|
149
|
+
await codexRuntime.run('hello provider', {
|
|
150
|
+
sessionId: 'codex-perrun-injection',
|
|
151
|
+
model: 'bound-model',
|
|
152
|
+
cwd: home,
|
|
153
|
+
permissionMode: 'bypassPermissions',
|
|
154
|
+
}, { isWebSocketWriter: true, send: (message) => messages.push(message) }, contextForModel('bound-model', PROVIDER_ID));
|
|
155
|
+
const options = capture.options();
|
|
156
|
+
assert.deepEqual(options.config, {
|
|
157
|
+
model_provider: PROVIDER_ID,
|
|
158
|
+
model_providers: {
|
|
159
|
+
[PROVIDER_ID]: {
|
|
160
|
+
name: 'Bob Upstream',
|
|
161
|
+
base_url: mock.baseUrl,
|
|
162
|
+
env_key: ENV_KEY,
|
|
163
|
+
wire_api: 'responses',
|
|
164
|
+
},
|
|
165
|
+
},
|
|
166
|
+
});
|
|
167
|
+
assert.equal(options.env?.[ENV_KEY], TOKEN_SECRET);
|
|
168
|
+
assert.equal(options.env?.[HOST_SENTINEL_KEY], undefined, 'a host sentinel must not reach the child');
|
|
169
|
+
// The real bundled CLI actually spoke to the mock: the secret arrived as
|
|
170
|
+
// the bearer token, which is the end-to-end reading the config alone
|
|
171
|
+
// cannot prove.
|
|
172
|
+
assert.ok(mock.requests.length >= 1, `the real CLI must call the mock; messages=${JSON.stringify(messages)}`);
|
|
173
|
+
assert.equal(mock.requests[0].url, '/v1/responses');
|
|
174
|
+
assert.equal(mock.requests[0].authorization, `Bearer ${TOKEN_SECRET}`);
|
|
175
|
+
});
|
|
176
|
+
}
|
|
177
|
+
finally {
|
|
178
|
+
if (previousHome === undefined)
|
|
179
|
+
delete process.env.HOME;
|
|
180
|
+
else
|
|
181
|
+
process.env.HOME = previousHome;
|
|
182
|
+
delete process.env[HOST_SENTINEL_KEY];
|
|
183
|
+
await mock.close();
|
|
184
|
+
}
|
|
185
|
+
});
|
|
186
|
+
test('AC-464: an unbound model keeps the previous no-options construction', async (t) => {
|
|
187
|
+
let captured;
|
|
188
|
+
const fakeThread = {
|
|
189
|
+
id: 'native-thread',
|
|
190
|
+
async runStreamed() {
|
|
191
|
+
return { events: (async function* () { })() };
|
|
192
|
+
},
|
|
193
|
+
};
|
|
194
|
+
// No CLI is needed for the negative reading: the question is what the runtime
|
|
195
|
+
// handed the constructor, and the SDK stores it on the instance.
|
|
196
|
+
t.mock.method(Codex.prototype, 'startThread', function startThread() {
|
|
197
|
+
captured = this.options;
|
|
198
|
+
return fakeThread;
|
|
199
|
+
});
|
|
200
|
+
await codexRuntime.run('hello default', {
|
|
201
|
+
model: 'unbound-model',
|
|
202
|
+
cwd: os.tmpdir(),
|
|
203
|
+
}, { isWebSocketWriter: true, send: () => { } }, contextForModel('unbound-model'));
|
|
204
|
+
assert.ok(captured, 'the runtime must construct the SDK through startThread');
|
|
205
|
+
assert.equal(captured.config, undefined);
|
|
206
|
+
assert.equal(captured.env, undefined);
|
|
207
|
+
});
|
|
208
|
+
test('AC-464: a model bound to an unknown provider fails readably and never dials the default', async (t) => {
|
|
209
|
+
const mock = await startMockResponsesApi();
|
|
210
|
+
try {
|
|
211
|
+
await withProviderRegistry(mock.baseUrl, async (home) => {
|
|
212
|
+
const messages = [];
|
|
213
|
+
await codexRuntime.run('hello nobody', {
|
|
214
|
+
model: 'dangling-model',
|
|
215
|
+
cwd: home,
|
|
216
|
+
}, { isWebSocketWriter: true, send: (message) => messages.push(message) }, contextForModel('dangling-model', 'nobody'));
|
|
217
|
+
const error = messages.find((message) => message.kind === 'error');
|
|
218
|
+
assert.ok(error, `an unresolvable provider must surface an error; messages=${JSON.stringify(messages)}`);
|
|
219
|
+
assert.match(String(error.content), /nobody/);
|
|
220
|
+
assert.match(String(error.content), /not configured/);
|
|
221
|
+
assert.equal(mock.requests.length, 0, 'a refusal must not spawn the CLI against any endpoint');
|
|
222
|
+
});
|
|
223
|
+
}
|
|
224
|
+
finally {
|
|
225
|
+
await mock.close();
|
|
226
|
+
}
|
|
227
|
+
});
|
|
228
|
+
//# sourceMappingURL=codex-runtime-provider-injection.test.js.map
|
package/dist-server/server/modules/providers/tests/codex-runtime-provider-injection.test.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-runtime-provider-injection.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/codex-runtime-provider-injection.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,306 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import { once } from 'node:events';
|
|
3
|
+
import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
|
|
4
|
+
import os from 'node:os';
|
|
5
|
+
import path from 'node:path';
|
|
6
|
+
import test from 'node:test';
|
|
7
|
+
import express from 'express';
|
|
8
|
+
import { closeConnection, getConnection, initializeDatabase, providerModelsDb, sessionsDb, } from '../../../modules/database/index.js';
|
|
9
|
+
import providerRouter from '../../../modules/providers/provider.routes.js';
|
|
10
|
+
import { providerModelsService } from '../../../modules/providers/index.js';
|
|
11
|
+
import { sessionsService } from '../../../modules/providers/services/sessions.service.js';
|
|
12
|
+
import { providerRegistry } from '../../../modules/providers/provider.registry.js';
|
|
13
|
+
import { installCodexProviderRegistryPort, } from '../../../shared/ports/codex-provider-registry.port.js';
|
|
14
|
+
import { AppError } from '../../../shared/utils.js';
|
|
15
|
+
/**
|
|
16
|
+
* A session records the upstream provider its model is bound to (AC-462).
|
|
17
|
+
*
|
|
18
|
+
* Legs:
|
|
19
|
+
* 1. the sessions row gains `model_provider_id`, and the first send records the
|
|
20
|
+
* provider the selected model entry declares (`codexProviderId`);
|
|
21
|
+
* 2. a model that declares no provider leaves the session unbound;
|
|
22
|
+
* 3. moving a bound session to a selection that runs under a DIFFERENT provider
|
|
23
|
+
* is refused with the fork/new-session action, and nothing is written; the
|
|
24
|
+
* same provider with another model is an ordinary switch;
|
|
25
|
+
* 4. a provider that was deleted or renamed is MARKED — the recorded model is
|
|
26
|
+
* still the one the conversation ran with, never the catalog default — and a
|
|
27
|
+
* fresh binding to it is refused;
|
|
28
|
+
* 5. a row that recorded no binding (a session from before the column, or one
|
|
29
|
+
* that only ever ran unbound) can still establish one;
|
|
30
|
+
* 6. the HTTP route answers the refusal with the same code and message;
|
|
31
|
+
* 7. a fork inherits the binding, because its source thread started under it;
|
|
32
|
+
* 8. the pre-admission send guard refuses the same switch before a run exists.
|
|
33
|
+
*
|
|
34
|
+
* WHY THESE READ THE SERVICE, NOT A COPY OF ITS LOGIC. `setSessionModel` is the
|
|
35
|
+
* funnel every send passes through (`chat.send`, `chat.edit-send`, the
|
|
36
|
+
* active-model route and the MCP reconfigure tool), so a green run over it is a
|
|
37
|
+
* reading of the guard every entry point shares. The registry is a shared port
|
|
38
|
+
* installed by the settings module in production; these legs install a fake
|
|
39
|
+
* reading and mutate its ids to model a deleted or renamed provider.
|
|
40
|
+
*/
|
|
41
|
+
const BOUND_BOB = 'bound-bob-model';
|
|
42
|
+
const BOUND_BOB_SECOND = 'bound-bob-second-model';
|
|
43
|
+
const BOUND_ALICE = 'bound-alice-model';
|
|
44
|
+
const UNBOUND = 'plain-unbound-model';
|
|
45
|
+
const createRegistry = () => {
|
|
46
|
+
const providerIds = new Set(['bob', 'alice']);
|
|
47
|
+
const read = () => ({
|
|
48
|
+
providers: [...providerIds].map((id) => ({ id })),
|
|
49
|
+
reservedIds: ['openai', 'ollama', 'lmstudio'],
|
|
50
|
+
});
|
|
51
|
+
return { providerIds, read };
|
|
52
|
+
};
|
|
53
|
+
async function withBindingWorkspace(run) {
|
|
54
|
+
const previousDatabasePath = process.env.DATABASE_PATH;
|
|
55
|
+
const directory = await mkdtemp(path.join(os.tmpdir(), 'codex-session-provider-binding-'));
|
|
56
|
+
const workspacePath = path.join(directory, 'workspace');
|
|
57
|
+
await mkdir(workspacePath, { recursive: true });
|
|
58
|
+
const { providerIds, read } = createRegistry();
|
|
59
|
+
closeConnection();
|
|
60
|
+
process.env.DATABASE_PATH = path.join(directory, 'auth.db');
|
|
61
|
+
await writeFile(process.env.DATABASE_PATH, '');
|
|
62
|
+
await initializeDatabase();
|
|
63
|
+
// Installed before the first write: the service reads this port lazily, so
|
|
64
|
+
// every leg below is judged against the registry this test states.
|
|
65
|
+
installCodexProviderRegistryPort({ read });
|
|
66
|
+
const app = express().use(express.json()).use('/api/providers', providerRouter);
|
|
67
|
+
app.use((error, _req, res, _next) => {
|
|
68
|
+
if (error instanceof AppError) {
|
|
69
|
+
res.status(error.statusCode).json({
|
|
70
|
+
success: false,
|
|
71
|
+
error: { code: error.code, message: error.message },
|
|
72
|
+
});
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
res.status(500).json({ success: false, error: { code: 'INTERNAL_ERROR' } });
|
|
76
|
+
});
|
|
77
|
+
const server = app.listen(0, '127.0.0.1');
|
|
78
|
+
await once(server, 'listening');
|
|
79
|
+
try {
|
|
80
|
+
const address = server.address();
|
|
81
|
+
await run({ baseUrl: `http://127.0.0.1:${address.port}`, workspacePath, providerIds });
|
|
82
|
+
}
|
|
83
|
+
finally {
|
|
84
|
+
await new Promise((resolve, reject) => {
|
|
85
|
+
server.close((error) => error ? reject(error) : resolve());
|
|
86
|
+
});
|
|
87
|
+
closeConnection();
|
|
88
|
+
if (previousDatabasePath === undefined) {
|
|
89
|
+
delete process.env.DATABASE_PATH;
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
process.env.DATABASE_PATH = previousDatabasePath;
|
|
93
|
+
}
|
|
94
|
+
await rm(directory, { recursive: true, force: true });
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
/** Seeds one custom Codex model entry; `providerId` is its `codexProviderId`. */
|
|
98
|
+
function seedModel(modelId, providerId) {
|
|
99
|
+
providerModelsDb.createCustomProviderModel('codex', {
|
|
100
|
+
id: modelId,
|
|
101
|
+
model: modelId,
|
|
102
|
+
config: providerId === undefined ? { env: [] } : { env: [], codexProviderId: providerId },
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
/** Seeds the app row a send would write to. */
|
|
106
|
+
function seedSession(sessionId, workspacePath, provider = 'codex') {
|
|
107
|
+
sessionsDb.createAppSession(sessionId, provider, workspacePath, 'Binding session');
|
|
108
|
+
}
|
|
109
|
+
function sessionColumns() {
|
|
110
|
+
return getConnection().prepare('PRAGMA table_info(sessions)').all()
|
|
111
|
+
.map((column) => column.name);
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* The refusal a provider switch must produce: 409, the recorded id, what the
|
|
115
|
+
* requested selection would run under, and the way out.
|
|
116
|
+
*/
|
|
117
|
+
function providerSwitchRefusal(expectedTarget) {
|
|
118
|
+
return (error) => {
|
|
119
|
+
assert.ok(error instanceof AppError, `expected an AppError, got ${String(error)}`);
|
|
120
|
+
assert.equal(error.statusCode, 409);
|
|
121
|
+
assert.equal(error.code, 'SESSION_PROVIDER_MISMATCH');
|
|
122
|
+
assert.match(error.message, /"bob"/);
|
|
123
|
+
assert.match(error.message, expectedTarget);
|
|
124
|
+
assert.match(error.message, /fork this session/i);
|
|
125
|
+
assert.match(error.message, /start a new one/i);
|
|
126
|
+
return true;
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
test('the first send records the upstream provider its model is bound to, and readers carry it', async () => {
|
|
130
|
+
await withBindingWorkspace(async ({ workspacePath }) => {
|
|
131
|
+
assert.ok(sessionColumns().includes('model_provider_id'), 'the sessions table must carry the column this feature records into');
|
|
132
|
+
seedModel(BOUND_BOB, 'bob');
|
|
133
|
+
seedSession('first-send', workspacePath);
|
|
134
|
+
const stored = providerModelsService.setSessionModel('codex', 'first-send', BOUND_BOB);
|
|
135
|
+
assert.equal(sessionsDb.getSessionById('first-send')?.model_provider_id, 'bob');
|
|
136
|
+
assert.equal(stored?.modelProviderId, 'bob');
|
|
137
|
+
assert.equal(stored?.modelProviderProblem, null);
|
|
138
|
+
const resolved = await providerModelsService.resolveSessionModel('codex', { sessionId: 'first-send' });
|
|
139
|
+
assert.equal(resolved.model, BOUND_BOB);
|
|
140
|
+
assert.equal(resolved.modelProviderId, 'bob');
|
|
141
|
+
assert.equal(resolved.modelProviderProblem, null);
|
|
142
|
+
assert.equal(resolved.source, 'session');
|
|
143
|
+
// Write-once: a later write cannot move the conversation behind the guard.
|
|
144
|
+
assert.equal(sessionsDb.setSessionModelProviderId('first-send', 'alice'), false);
|
|
145
|
+
assert.equal(sessionsDb.getSessionById('first-send')?.model_provider_id, 'bob');
|
|
146
|
+
});
|
|
147
|
+
});
|
|
148
|
+
test('a model that declares no provider leaves the session unbound', async () => {
|
|
149
|
+
await withBindingWorkspace(async ({ workspacePath }) => {
|
|
150
|
+
seedModel(UNBOUND);
|
|
151
|
+
seedSession('unbound-session', workspacePath);
|
|
152
|
+
const stored = providerModelsService.setSessionModel('codex', 'unbound-session', UNBOUND);
|
|
153
|
+
assert.equal(sessionsDb.getSessionById('unbound-session')?.model_provider_id, null);
|
|
154
|
+
assert.equal(stored?.modelProviderId, null);
|
|
155
|
+
assert.equal(stored?.modelProviderProblem, null);
|
|
156
|
+
const resolved = await providerModelsService.resolveSessionModel('codex', { sessionId: 'unbound-session' });
|
|
157
|
+
assert.equal(resolved.model, UNBOUND);
|
|
158
|
+
assert.equal(resolved.modelProviderId, null);
|
|
159
|
+
assert.equal(resolved.modelProviderProblem, null);
|
|
160
|
+
});
|
|
161
|
+
});
|
|
162
|
+
test('moving a bound session to another provider is refused with the fork action; the same provider is not', async () => {
|
|
163
|
+
await withBindingWorkspace(async ({ workspacePath }) => {
|
|
164
|
+
seedModel(BOUND_BOB, 'bob');
|
|
165
|
+
seedModel(BOUND_BOB_SECOND, 'bob');
|
|
166
|
+
seedModel(BOUND_ALICE, 'alice');
|
|
167
|
+
seedModel(UNBOUND);
|
|
168
|
+
seedSession('bound-session', workspacePath);
|
|
169
|
+
providerModelsService.setSessionModel('codex', 'bound-session', BOUND_BOB);
|
|
170
|
+
// Another provider's model — including a model that would inherit the
|
|
171
|
+
// process-global provider (NULL) — is a provider switch, not a model switch.
|
|
172
|
+
assert.throws(() => providerModelsService.setSessionModel('codex', 'bound-session', BOUND_ALICE), providerSwitchRefusal(/"alice"/));
|
|
173
|
+
assert.throws(() => providerModelsService.setSessionModel('codex', 'bound-session', UNBOUND), providerSwitchRefusal(/inherits the provider default/));
|
|
174
|
+
// Nothing was written by either refusal.
|
|
175
|
+
const unchanged = sessionsDb.getSessionById('bound-session');
|
|
176
|
+
assert.equal(unchanged?.model, BOUND_BOB);
|
|
177
|
+
assert.equal(unchanged?.model_provider_id, 'bob');
|
|
178
|
+
// Another model on the SAME provider is an ordinary switch.
|
|
179
|
+
providerModelsService.setSessionModel('codex', 'bound-session', BOUND_BOB_SECOND);
|
|
180
|
+
const switched = sessionsDb.getSessionById('bound-session');
|
|
181
|
+
assert.equal(switched?.model, BOUND_BOB_SECOND);
|
|
182
|
+
assert.equal(switched?.model_provider_id, 'bob');
|
|
183
|
+
});
|
|
184
|
+
});
|
|
185
|
+
test('a deleted or renamed provider is marked, and the session keeps the model it ran with', async () => {
|
|
186
|
+
await withBindingWorkspace(async ({ workspacePath, providerIds }) => {
|
|
187
|
+
seedModel(BOUND_BOB, 'bob');
|
|
188
|
+
seedSession('orphaned-session', workspacePath);
|
|
189
|
+
providerModelsService.setSessionModel('codex', 'orphaned-session', BOUND_BOB);
|
|
190
|
+
const before = await providerModelsService.resolveSessionModel('codex', { sessionId: 'orphaned-session' });
|
|
191
|
+
assert.equal(before.modelProviderProblem, null, 'a provider that still exists is not marked');
|
|
192
|
+
// Renaming the provider is a full-file replacement of the registry: the old
|
|
193
|
+
// id disappears, exactly as a delete would.
|
|
194
|
+
providerIds.delete('bob');
|
|
195
|
+
providerIds.add('robert');
|
|
196
|
+
const after = await providerModelsService.resolveSessionModel('codex', { sessionId: 'orphaned-session' });
|
|
197
|
+
// The model is the recorded one, NOT the catalog default: a provider that
|
|
198
|
+
// disappeared must not make the session look like it never picked a model.
|
|
199
|
+
assert.equal(after.model, BOUND_BOB);
|
|
200
|
+
assert.equal(after.modelProviderId, 'bob');
|
|
201
|
+
assert.ok(after.modelProviderProblem);
|
|
202
|
+
assert.match(after.modelProviderProblem, /"bob"/);
|
|
203
|
+
assert.match(after.modelProviderProblem, /no longer defined/);
|
|
204
|
+
assert.match(after.modelProviderProblem, /fork this session/i);
|
|
205
|
+
// The row itself is untouched by the read.
|
|
206
|
+
const row = sessionsDb.getSessionById('orphaned-session');
|
|
207
|
+
assert.equal(row?.model, BOUND_BOB);
|
|
208
|
+
assert.equal(row?.model_provider_id, 'bob');
|
|
209
|
+
// A fresh binding to the retired provider is refused, and writes nothing.
|
|
210
|
+
seedSession('fresh-session', workspacePath);
|
|
211
|
+
assert.throws(() => providerModelsService.setSessionModel('codex', 'fresh-session', BOUND_BOB), (error) => error instanceof AppError
|
|
212
|
+
&& error.statusCode === 409
|
|
213
|
+
&& error.code === 'SESSION_PROVIDER_UNKNOWN'
|
|
214
|
+
&& /"bob"/.test(error.message)
|
|
215
|
+
&& /no longer exists/.test(error.message));
|
|
216
|
+
const fresh = sessionsDb.getSessionById('fresh-session');
|
|
217
|
+
assert.equal(fresh?.model_provider_id, null);
|
|
218
|
+
});
|
|
219
|
+
});
|
|
220
|
+
test('a row that recorded no binding can still establish one', async () => {
|
|
221
|
+
await withBindingWorkspace(async ({ workspacePath }) => {
|
|
222
|
+
seedModel(UNBOUND);
|
|
223
|
+
seedModel(BOUND_BOB, 'bob');
|
|
224
|
+
seedSession('legacy-session', workspacePath);
|
|
225
|
+
// A session from before the column: it has a model, but no provider id.
|
|
226
|
+
sessionsDb.setSessionModel('legacy-session', UNBOUND);
|
|
227
|
+
assert.equal(sessionsDb.getSessionById('legacy-session')?.model_provider_id, null);
|
|
228
|
+
const stored = providerModelsService.setSessionModel('codex', 'legacy-session', BOUND_BOB);
|
|
229
|
+
assert.equal(stored?.modelProviderId, 'bob');
|
|
230
|
+
assert.equal(sessionsDb.getSessionById('legacy-session')?.model_provider_id, 'bob');
|
|
231
|
+
});
|
|
232
|
+
});
|
|
233
|
+
test('the active-model route answers the refusal with the same readable code', async () => {
|
|
234
|
+
await withBindingWorkspace(async ({ baseUrl, workspacePath }) => {
|
|
235
|
+
seedModel(BOUND_BOB, 'bob');
|
|
236
|
+
seedModel(BOUND_ALICE, 'alice');
|
|
237
|
+
seedSession('route-session', workspacePath);
|
|
238
|
+
providerModelsService.setSessionModel('codex', 'route-session', BOUND_BOB);
|
|
239
|
+
const refused = await fetch(`${baseUrl}/api/providers/codex/sessions/route-session/active-model`, {
|
|
240
|
+
method: 'POST',
|
|
241
|
+
headers: { 'content-type': 'application/json' },
|
|
242
|
+
body: JSON.stringify({ model: BOUND_ALICE }),
|
|
243
|
+
});
|
|
244
|
+
const refusedBody = await refused.json();
|
|
245
|
+
assert.equal(refused.status, 409);
|
|
246
|
+
assert.equal(refusedBody.error?.code, 'SESSION_PROVIDER_MISMATCH');
|
|
247
|
+
assert.match(String(refusedBody.error?.message), /fork this session/i);
|
|
248
|
+
assert.equal(sessionsDb.getSessionById('route-session')?.model, BOUND_BOB);
|
|
249
|
+
const reading = await fetch(`${baseUrl}/api/providers/codex/sessions/route-session/active-model`);
|
|
250
|
+
const readingBody = await reading.json();
|
|
251
|
+
assert.equal(readingBody.data.model, BOUND_BOB);
|
|
252
|
+
assert.equal(readingBody.data.modelProviderId, 'bob');
|
|
253
|
+
assert.equal(readingBody.data.modelProviderProblem, null);
|
|
254
|
+
});
|
|
255
|
+
});
|
|
256
|
+
test('a fork inherits the upstream provider binding of the conversation it branched from', async () => {
|
|
257
|
+
await withBindingWorkspace(async ({ workspacePath }) => {
|
|
258
|
+
const sourcePath = path.join(workspacePath, 'native-source.jsonl');
|
|
259
|
+
const forkedPath = path.join(workspacePath, 'native-fork.jsonl');
|
|
260
|
+
await writeFile(sourcePath, '{}\n', 'utf8');
|
|
261
|
+
await writeFile(forkedPath, '{}\n', 'utf8');
|
|
262
|
+
seedSession('fork-source', workspacePath, 'claude');
|
|
263
|
+
sessionsDb.assignProviderSessionId('fork-source', 'native-source');
|
|
264
|
+
getConnection()
|
|
265
|
+
.prepare('UPDATE sessions SET jsonl_path = ? WHERE session_id = ?')
|
|
266
|
+
.run(sourcePath, 'fork-source');
|
|
267
|
+
sessionsDb.setSessionModelProviderId('fork-source', 'bob');
|
|
268
|
+
const claude = providerRegistry.resolveProvider('claude');
|
|
269
|
+
const realFork = claude.fork;
|
|
270
|
+
Object.defineProperty(claude, 'fork', {
|
|
271
|
+
configurable: true,
|
|
272
|
+
writable: true,
|
|
273
|
+
value: {
|
|
274
|
+
forkSession: async () => ({ providerSessionId: 'native-fork', jsonlPath: forkedPath }),
|
|
275
|
+
},
|
|
276
|
+
});
|
|
277
|
+
try {
|
|
278
|
+
const result = await sessionsService.forkSessionById('fork-source');
|
|
279
|
+
// The branch resumes a thread the provider started under `bob`; dropping
|
|
280
|
+
// the binding would make that resume the mismatch this column prevents.
|
|
281
|
+
assert.equal(sessionsDb.getSessionById(result.sessionId)?.model_provider_id, 'bob');
|
|
282
|
+
}
|
|
283
|
+
finally {
|
|
284
|
+
Object.defineProperty(claude, 'fork', { configurable: true, writable: true, value: realFork });
|
|
285
|
+
}
|
|
286
|
+
});
|
|
287
|
+
});
|
|
288
|
+
test('the pre-admission send guard refuses the switch and passes the first send', async () => {
|
|
289
|
+
await withBindingWorkspace(async ({ workspacePath }) => {
|
|
290
|
+
seedModel(BOUND_BOB, 'bob');
|
|
291
|
+
seedModel(BOUND_ALICE, 'alice');
|
|
292
|
+
seedSession('guard-session', workspacePath);
|
|
293
|
+
// A session with no recorded binding: the first send is exactly where one
|
|
294
|
+
// is allowed to be established, so the guard passes.
|
|
295
|
+
assert.doesNotThrow(() => {
|
|
296
|
+
providerModelsService.assertSessionProviderSwitch('codex', 'guard-session', BOUND_BOB);
|
|
297
|
+
});
|
|
298
|
+
providerModelsService.setSessionModel('codex', 'guard-session', BOUND_BOB);
|
|
299
|
+
assert.throws(() => providerModelsService.assertSessionProviderSwitch('codex', 'guard-session', BOUND_ALICE), providerSwitchRefusal(/"alice"/));
|
|
300
|
+
// Same provider, another model: nothing for the guard to refuse.
|
|
301
|
+
assert.doesNotThrow(() => {
|
|
302
|
+
providerModelsService.assertSessionProviderSwitch('codex', 'guard-session', BOUND_BOB);
|
|
303
|
+
});
|
|
304
|
+
});
|
|
305
|
+
});
|
|
306
|
+
//# sourceMappingURL=codex-session-provider-binding.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-session-provider-binding.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/codex-session-provider-binding.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,OAA2D,MAAM,SAAS,CAAC;AAElF,OAAO,EACL,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,UAAU,GACX,MAAM,6BAA6B,CAAC;AACrC,OAAO,cAAc,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EACL,gCAAgC,GAEjC,MAAM,gDAAgD,CAAC;AAExD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,MAAM,SAAS,GAAG,iBAAiB,CAAC;AACpC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC;AAClD,MAAM,WAAW,GAAG,mBAAmB,CAAC;AACxC,MAAM,OAAO,GAAG,qBAAqB,CAAC;AAStC,MAAM,cAAc,GAAG,GAA2E,EAAE;IAClG,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,GAAiC,EAAE,CAAC,CAAC;QAChD,SAAS,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACjD,WAAW,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC;KAC9C,CAAC,CAAC;IACH,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;AAC/B,CAAC,CAAC;AAEF,KAAK,UAAU,oBAAoB,CAAC,GAAiD;IACnF,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;IACvD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,iCAAiC,CAAC,CAAC,CAAC;IAC3F,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACxD,MAAM,KAAK,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,cAAc,EAAE,CAAC;IAE/C,eAAe,EAAE,CAAC;IAClB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC5D,MAAM,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IAC/C,MAAM,kBAAkB,EAAE,CAAC;IAC3B,2EAA2E;IAC3E,mEAAmE;IACnE,gCAAgC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAE3C,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;IAChF,GAAG,CAAC,GAAG,CAAC,CAAC,KAAc,EAAE,IAAa,EAAE,GAAa,EAAE,KAAmB,EAAE,EAAE;QAC5E,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;YAC9B,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC;gBAChC,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE;aACpD,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IAC1C,MAAM,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAEhC,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAiB,CAAC;QAChD,MAAM,GAAG,CAAC,EAAE,OAAO,EAAE,oBAAoB,OAAO,CAAC,IAAI,EAAE,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC,CAAC;IACzF,CAAC;YAAS,CAAC;QACT,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QACH,eAAe,EAAE,CAAC;QAClB,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;YACvC,OAAO,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,oBAAoB,CAAC;QACnD,CAAC;QACD,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,CAAC;AACH,CAAC;AAED,iFAAiF;AACjF,SAAS,SAAS,CAAC,OAAe,EAAE,UAAmB;IACrD,gBAAgB,CAAC,yBAAyB,CAAC,OAAO,EAAE;QAClD,EAAE,EAAE,OAAO;QACX,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,eAAe,EAAE,UAAU,EAAE;KAC1F,CAAC,CAAC;AACL,CAAC;AAED,+CAA+C;AAC/C,SAAS,WAAW,CAAC,SAAiB,EAAE,aAAqB,EAAE,QAAQ,GAAG,OAAO;IAC/E,UAAU,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;AACrF,CAAC;AAED,SAAS,cAAc;IACrB,OAAQ,aAAa,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC,GAAG,EAA8B;SAC7F,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC;AAED;;;GAGG;AACH,SAAS,qBAAqB,CAAC,cAAsB;IACnD,OAAO,CAAC,KAAc,EAAW,EAAE;QACjC,MAAM,CAAC,EAAE,CAAC,KAAK,YAAY,QAAQ,EAAE,6BAA6B,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACnF,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QACpC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,2BAA2B,CAAC,CAAC;QACtD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAC5C,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;QAClD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,IAAI,CAAC,0FAA0F,EAAE,KAAK,IAAI,EAAE;IAC1G,MAAM,oBAAoB,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE;QACrD,MAAM,CAAC,EAAE,CACP,cAAc,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAC9C,oEAAoE,CACrE,CAAC;QAEF,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC5B,WAAW,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QAEzC,MAAM,MAAM,GAAG,qBAAqB,CAAC,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QAEvF,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAC;QAChF,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;QAC7C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,oBAAoB,EAAE,IAAI,CAAC,CAAC;QAEjD,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,mBAAmB,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,CAAC;QACvG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACxC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;QAC9C,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;QAClD,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAEzC,2EAA2E;QAC3E,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,yBAAyB,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;QACjF,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;IAC9E,MAAM,oBAAoB,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE;QACrD,SAAS,CAAC,OAAO,CAAC,CAAC;QACnB,WAAW,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;QAE9C,MAAM,MAAM,GAAG,qBAAqB,CAAC,eAAe,CAAC,OAAO,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;QAE1F,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC;QACpF,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;QAC5C,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,oBAAoB,EAAE,IAAI,CAAC,CAAC;QAEjD,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,mBAAmB,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;QAC5G,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC7C,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sGAAsG,EAAE,KAAK,IAAI,EAAE;IACtH,MAAM,oBAAoB,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE;QACrD,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC5B,SAAS,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QACnC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAChC,SAAS,CAAC,OAAO,CAAC,CAAC;QACnB,WAAW,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QAC5C,qBAAqB,CAAC,eAAe,CAAC,OAAO,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;QAE3E,sEAAsE;QACtE,6EAA6E;QAC7E,MAAM,CAAC,MAAM,CACX,GAAG,EAAE,CAAC,qBAAqB,CAAC,eAAe,CAAC,OAAO,EAAE,eAAe,EAAE,WAAW,CAAC,EAClF,qBAAqB,CAAC,SAAS,CAAC,CACjC,CAAC;QACF,MAAM,CAAC,MAAM,CACX,GAAG,EAAE,CAAC,qBAAqB,CAAC,eAAe,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,CAAC,EAC9E,qBAAqB,CAAC,+BAA+B,CAAC,CACvD,CAAC;QAEF,yCAAyC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;QAC7D,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAC;QAElD,4DAA4D;QAC5D,qBAAqB,CAAC,eAAe,CAAC,OAAO,EAAE,eAAe,EAAE,gBAAgB,CAAC,CAAC;QAClF,MAAM,QAAQ,GAAG,UAAU,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;QAC5D,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC;QAChD,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sFAAsF,EAAE,KAAK,IAAI,EAAE;IACtG,MAAM,oBAAoB,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,WAAW,EAAE,EAAE,EAAE;QAClE,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC5B,WAAW,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;QAC/C,qBAAqB,CAAC,eAAe,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,CAAC,CAAC;QAE9E,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,mBAAmB,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC,CAAC;QAC3G,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,oBAAoB,EAAE,IAAI,EAAE,4CAA4C,CAAC,CAAC;QAE9F,4EAA4E;QAC5E,4CAA4C;QAC5C,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1B,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE1B,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,mBAAmB,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC,CAAC;QAC1G,0EAA0E;QAC1E,2EAA2E;QAC3E,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;QAC3C,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;QAClD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,mBAAmB,CAAC,CAAC;QAC9D,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,CAAC;QAE/D,2CAA2C;QAC3C,MAAM,GAAG,GAAG,UAAU,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;QAC1D,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QACpC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAC;QAE5C,0EAA0E;QAC1E,WAAW,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,CACX,GAAG,EAAE,CAAC,qBAAqB,CAAC,eAAe,CAAC,OAAO,EAAE,eAAe,EAAE,SAAS,CAAC,EAChF,CAAC,KAAc,EAAE,EAAE,CAAC,KAAK,YAAY,QAAQ;eACxC,KAAK,CAAC,UAAU,KAAK,GAAG;eACxB,KAAK,CAAC,IAAI,KAAK,0BAA0B;eACzC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;eAC3B,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAC5C,CAAC;QACF,MAAM,KAAK,GAAG,UAAU,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;QACzD,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;IACxE,MAAM,oBAAoB,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE;QACrD,SAAS,CAAC,OAAO,CAAC,CAAC;QACnB,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC5B,WAAW,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;QAE7C,wEAAwE;QACxE,UAAU,CAAC,eAAe,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QACtD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC;QAEnF,MAAM,MAAM,GAAG,qBAAqB,CAAC,eAAe,CAAC,OAAO,EAAE,gBAAgB,EAAE,SAAS,CAAC,CAAC;QAE3F,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;QAC7C,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAC;IACtF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wEAAwE,EAAE,KAAK,IAAI,EAAE;IACxF,MAAM,oBAAoB,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE;QAC9D,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC5B,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAChC,WAAW,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QAC5C,qBAAqB,CAAC,eAAe,CAAC,OAAO,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;QAE3E,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,0DAA0D,EAAE;YAChG,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;SAC7C,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,IAAI,EAAqD,CAAC;QAE5F,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAClC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE,2BAA2B,CAAC,CAAC;QACnE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,oBAAoB,CAAC,CAAC;QACvE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAE3E,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,0DAA0D,CAAC,CAAC;QAClG,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,IAAI,EAErC,CAAC;QACF,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAChD,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;QACtD,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oFAAoF,EAAE,KAAK,IAAI,EAAE;IACpG,MAAM,oBAAoB,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE;QACrD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC;QACnE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,mBAAmB,CAAC,CAAC;QACjE,MAAM,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5C,MAAM,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAE5C,WAAW,CAAC,aAAa,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;QACpD,UAAU,CAAC,uBAAuB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;QACnE,aAAa,EAAE;aACZ,OAAO,CAAC,yDAAyD,CAAC;aAClE,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAClC,UAAU,CAAC,yBAAyB,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QAE3D,MAAM,MAAM,GAAG,gBAAgB,CAAC,eAAe,CAAC,QAAQ,CAA6B,CAAC;QACtF,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC;QAC7B,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE;YACpC,YAAY,EAAE,IAAI;YAClB,QAAQ,EAAE,IAAI;YACd,KAAK,EAAE;gBACL,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,iBAAiB,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;aACtE;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;YACpE,yEAAyE;YACzE,wEAAwE;YACxE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAC;QACtF,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACjG,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;IAC3F,MAAM,oBAAoB,CAAC,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE;QACrD,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC5B,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAChC,WAAW,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QAE5C,0EAA0E;QAC1E,qDAAqD;QACrD,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE;YACvB,qBAAqB,CAAC,2BAA2B,CAAC,OAAO,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;QACzF,CAAC,CAAC,CAAC;QAEH,qBAAqB,CAAC,eAAe,CAAC,OAAO,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;QAE3E,MAAM,CAAC,MAAM,CACX,GAAG,EAAE,CAAC,qBAAqB,CAAC,2BAA2B,CAAC,OAAO,EAAE,eAAe,EAAE,WAAW,CAAC,EAC9F,qBAAqB,CAAC,SAAS,CAAC,CACjC,CAAC;QACF,iEAAiE;QACjE,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE;YACvB,qBAAqB,CAAC,2BAA2B,CAAC,OAAO,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;QACzF,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -56,7 +56,7 @@ const writeCodexTranscript = async (homeDir, codexSessionId, workspacePath, firs
|
|
|
56
56
|
await writeFile(filePath, `${lines.join('\n')}\n`, 'utf8');
|
|
57
57
|
return filePath;
|
|
58
58
|
};
|
|
59
|
-
test('Codex synchronizer preserves the title assigned when
|
|
59
|
+
test('Codex synchronizer preserves the title assigned when Cloudpit creates a session', { concurrency: false }, async () => {
|
|
60
60
|
const tempRoot = await mkdtemp(path.join(os.tmpdir(), 'codex-session-sync-app-'));
|
|
61
61
|
const workspacePath = path.join(tempRoot, 'workspace');
|
|
62
62
|
await mkdir(workspacePath, { recursive: true });
|
|
@@ -393,13 +393,13 @@ const seedOpenCodeSession = async (homeDir, workspacePath, options) => {
|
|
|
393
393
|
db.close();
|
|
394
394
|
}
|
|
395
395
|
};
|
|
396
|
-
test('OpenCode synchronizer preserves the title assigned when
|
|
396
|
+
test('OpenCode synchronizer preserves the title assigned when Cloudpit creates a session', { concurrency: false }, async () => {
|
|
397
397
|
const tempRoot = await mkdtemp(path.join(os.tmpdir(), 'opencode-session-sync-app-'));
|
|
398
398
|
const workspacePath = path.join(tempRoot, 'workspace');
|
|
399
399
|
await mkdir(workspacePath, { recursive: true });
|
|
400
400
|
const restoreHomeDir = patchHomeDir(tempRoot);
|
|
401
401
|
try {
|
|
402
|
-
// Both provider-owned values differ from the
|
|
402
|
+
// Both provider-owned values differ from the Cloudpit title so either one
|
|
403
403
|
// leaking through would change the assertion below.
|
|
404
404
|
await seedOpenCodeSession(tempRoot, workspacePath, {
|
|
405
405
|
sessionId: 'oc-app-1',
|
|
@@ -21,6 +21,8 @@ const createSessionStore = (rows = {}, efforts = {}, permissionModes = {}) => {
|
|
|
21
21
|
model,
|
|
22
22
|
effort: efforts[sessionId] ?? null,
|
|
23
23
|
permission_mode: permissionModes[sessionId] ?? null,
|
|
24
|
+
// The upstream provider a session is bound to; NULL until recorded.
|
|
25
|
+
model_provider_id: null,
|
|
24
26
|
},
|
|
25
27
|
]));
|
|
26
28
|
return {
|
|
@@ -32,6 +34,15 @@ const createSessionStore = (rows = {}, efforts = {}, permissionModes = {}) => {
|
|
|
32
34
|
session.model = model;
|
|
33
35
|
}
|
|
34
36
|
},
|
|
37
|
+
// Write-once, like the column: a second call cannot move the binding.
|
|
38
|
+
setSessionModelProviderId: (sessionId, modelProviderId) => {
|
|
39
|
+
const session = sessions.get(sessionId);
|
|
40
|
+
if (!session || session.model_provider_id) {
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
43
|
+
session.model_provider_id = modelProviderId;
|
|
44
|
+
return true;
|
|
45
|
+
},
|
|
35
46
|
setSessionEffort: (sessionId, effort) => {
|
|
36
47
|
const session = sessions.get(sessionId);
|
|
37
48
|
if (session) {
|
|
@@ -308,6 +319,10 @@ test('setSessionModel records the model on the session row', () => {
|
|
|
308
319
|
model: 'opus',
|
|
309
320
|
effort: null,
|
|
310
321
|
permissionMode: null,
|
|
322
|
+
// The fixture installs no provider registry and binds no model entry, so
|
|
323
|
+
// no upstream provider is recorded and there is nothing to mark.
|
|
324
|
+
modelProviderId: null,
|
|
325
|
+
modelProviderProblem: null,
|
|
311
326
|
source: 'session',
|
|
312
327
|
});
|
|
313
328
|
assert.equal(sessions.sessions.get('session-1')?.model, 'opus');
|