@cloudcli-ai/cloudcli 1.37.2 → 1.37.4
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 +269 -0
- package/dist/assets/{abnfDiagram-N423BO3Z-C4UAoHJb.js → abnfDiagram-N423BO3Z-Dmkwx38H.js} +1 -1
- package/dist/assets/{arc-B8jF-ja9.js → arc-DLe9AYuO.js} +1 -1
- package/dist/assets/{architectureDiagram-T3A2C74G-C_Wur_CU.js → architectureDiagram-T3A2C74G-CBbbbNUW.js} +1 -1
- package/dist/assets/{blockDiagram-VBNYF7ZC-Cq4P1i8t.js → blockDiagram-VBNYF7ZC-CaMEaWu4.js} +1 -1
- package/dist/assets/{c4Diagram-5PPSVZJV-C1wG4eUj.js → c4Diagram-5PPSVZJV-DhjMgNnR.js} +1 -1
- package/dist/assets/channel-CWrmwsir.js +1 -0
- package/dist/assets/{chunk-2GRJ4B5K-B8fnBG6E.js → chunk-2GRJ4B5K-yjl3-F-i.js} +1 -1
- package/dist/assets/{chunk-2Q5K7J3B-WdfPooPJ.js → chunk-2Q5K7J3B-DsAYaWEP.js} +1 -1
- package/dist/assets/{chunk-5RXB4S5H-DhZJuG2E.js → chunk-5RXB4S5H-Bt5qmqOX.js} +1 -1
- package/dist/assets/{chunk-5VM5RSS4-B0rjslal.js → chunk-5VM5RSS4-yWrWVvUt.js} +1 -1
- package/dist/assets/{chunk-6Q2QTUOP-CG2Oj4jL.js → chunk-6Q2QTUOP-Dt66K5xb.js} +1 -1
- package/dist/assets/{chunk-GF5L2VYU-rrl2lRxY.js → chunk-GF5L2VYU-DA0vzaj4.js} +1 -1
- package/dist/assets/{chunk-JWPE2WC7-CjVbrVMA.js → chunk-JWPE2WC7-CUkbx96V.js} +1 -1
- package/dist/assets/{chunk-KBJHAD2P-CRzKgU8S.js → chunk-KBJHAD2P-DWKxx1WH.js} +1 -1
- package/dist/assets/{chunk-RYQCIY6F-DBz4GTZF.js → chunk-RYQCIY6F-BqluplN0.js} +1 -1
- package/dist/assets/{chunk-XXDRQBXY-wHxalsXk.js → chunk-XXDRQBXY-DelKg3Xf.js} +1 -1
- package/dist/assets/classDiagram-JCYQIIEL-COAGCC6w.js +1 -0
- package/dist/assets/classDiagram-v2-OCEON4UE-COAGCC6w.js +1 -0
- package/dist/assets/{cose-bilkent-JH36ORCC-s1hygY8e.js → cose-bilkent-JH36ORCC-DHV93-Em.js} +1 -1
- package/dist/assets/{cynefin-VYW2F7L2-C4LGV15i.js → cynefin-VYW2F7L2-B9HZgoGX.js} +1 -1
- package/dist/assets/{cynefinDiagram-MW4NZA55-C5uhu7B3.js → cynefinDiagram-MW4NZA55-hFjjEQg8.js} +1 -1
- package/dist/assets/{dagre-VZM6K2ZE-B-OBTewm.js → dagre-VZM6K2ZE-CpeVOC7V.js} +1 -1
- package/dist/assets/{diagram-7IWD3JNH-BjGKQxih.js → diagram-7IWD3JNH-D0H1UoRA.js} +1 -1
- package/dist/assets/{diagram-B4RE2ZJO-BMKz1X2L.js → diagram-B4RE2ZJO-6Y7BQUup.js} +1 -1
- package/dist/assets/{diagram-LBJQPF4R-DNh-GhKC.js → diagram-LBJQPF4R-C0nNOwht.js} +1 -1
- package/dist/assets/{diagram-Q27KOJAE-BaTG9jPT.js → diagram-Q27KOJAE-En6QlOVX.js} +1 -1
- package/dist/assets/{diagram-UB23O5K3-BUwo2OvJ.js → diagram-UB23O5K3-CmPiNeGD.js} +1 -1
- package/dist/assets/{ebnfDiagram-BXEA7PRR-DAZgfzX2.js → ebnfDiagram-BXEA7PRR-Bygzp1Qt.js} +1 -1
- package/dist/assets/{erDiagram-JOGREHBK-1w1CcGEb.js → erDiagram-JOGREHBK-CwScRfzl.js} +1 -1
- package/dist/assets/{flowDiagram-UKHOOZJN-D4EII8Jj.js → flowDiagram-UKHOOZJN-bKX-0xP6.js} +1 -1
- package/dist/assets/{ganttDiagram-PKOTCBZU-ChvJZAgB.js → ganttDiagram-PKOTCBZU-DtZPKXGd.js} +1 -1
- package/dist/assets/{gitGraphDiagram-DS77QQ5N-DtOn41S8.js → gitGraphDiagram-DS77QQ5N-CUOtdL1o.js} +1 -1
- package/dist/assets/index-CdjIFxM2.js +5004 -0
- package/dist/assets/index-DgafhGTF.css +32 -0
- package/dist/assets/{infoDiagram-6WML65LV-DN_PVEJZ.js → infoDiagram-6WML65LV-ciRQTS0h.js} +1 -1
- package/dist/assets/{ishikawaDiagram-WSZJBQD7-DbkF1kXb.js → ishikawaDiagram-WSZJBQD7-CgjhQZ84.js} +1 -1
- package/dist/assets/{journeyDiagram-NVQOT4AX-pJwmhddE.js → journeyDiagram-NVQOT4AX-BsbQSeIW.js} +1 -1
- package/dist/assets/{kanban-definition-27J2QSJJ-PPAPgNp5.js → kanban-definition-27J2QSJJ-CrwzY9Jw.js} +1 -1
- package/dist/assets/{linear-iPR-J9f7.js → linear-BUaCDr6l.js} +1 -1
- package/dist/assets/{mermaid.core-BEUL86Z6.js → mermaid.core-ClgdUU0j.js} +5 -5
- package/dist/assets/{mindmap-definition-FAOFIHXS-BvZoBib7.js → mindmap-definition-FAOFIHXS-BictljY1.js} +1 -1
- package/dist/assets/{pegDiagram-VL7TDLO6-DhYreaUd.js → pegDiagram-VL7TDLO6-BXdByy_U.js} +1 -1
- package/dist/assets/{pieDiagram-7S7Q4E2Y-CrOHlyD0.js → pieDiagram-7S7Q4E2Y-uZsMfkRX.js} +1 -1
- package/dist/assets/{quadrantDiagram-CIZ2JOQS-D4g5yH3t.js → quadrantDiagram-CIZ2JOQS-7lCv4QIj.js} +1 -1
- package/dist/assets/{railroadDiagram-AXF67PYL-Dj39lHlf.js → railroadDiagram-AXF67PYL-07dxIWbi.js} +1 -1
- package/dist/assets/{requirementDiagram-LRYGKXZP-1AS4Zgm_.js → requirementDiagram-LRYGKXZP-Cb31Yv1_.js} +1 -1
- package/dist/assets/{sankeyDiagram-W5VNT64P-CKlMn19P.js → sankeyDiagram-W5VNT64P-X0YPSyF9.js} +1 -1
- package/dist/assets/{sequenceDiagram-SI44F4Z6-B_j3qyvo.js → sequenceDiagram-SI44F4Z6-BdBxSIlP.js} +1 -1
- package/dist/assets/server.browser-CtX3Hdl5.js +27 -0
- package/dist/assets/{sizeCapture-X5ZJPWSS-Bp2Op16v.js → sizeCapture-X5ZJPWSS-DQM5xAyD.js} +1 -1
- package/dist/assets/{stateDiagram-OKZ733FA-C0cN6DoY.js → stateDiagram-OKZ733FA-DJ3xkLUF.js} +1 -1
- package/dist/assets/stateDiagram-v2-UEYNNEHI-vAaE4zNo.js +1 -0
- package/dist/assets/{swimlanes-SLNWSIFB-BEvXOV9b.js → swimlanes-SLNWSIFB-rjfYdW0w.js} +2 -2
- package/dist/assets/swimlanesDiagram-ULZ7WXOC-TV2IF4Nq.js +8 -0
- package/dist/assets/{timeline-definition-Z64GVDOM-zdJQinvZ.js → timeline-definition-Z64GVDOM-DZMra5do.js} +1 -1
- package/dist/assets/{vendor-codemirror-OwyKSvPE.js → vendor-codemirror-CYrSt7-U.js} +18 -18
- package/dist/assets/{vennDiagram-T6HMQDX7-DuF1uZMY.js → vennDiagram-T6HMQDX7-BevD8uu0.js} +1 -1
- package/dist/assets/{wardleyDiagram-T6FBY63Y-B9AlLQup.js → wardleyDiagram-T6FBY63Y-DsIyXB7z.js} +1 -1
- package/dist/assets/{xychartDiagram-ELKLHX3M-DTJX48Qg.js → xychartDiagram-ELKLHX3M-G3PlF3ko.js} +1 -1
- package/dist/index.html +3 -3
- package/dist-server/server/index.js +11 -4
- package/dist-server/server/index.js.map +1 -1
- package/dist-server/server/modules/agent/agent.module.js +9 -2
- package/dist-server/server/modules/agent/agent.module.js.map +1 -1
- package/dist-server/server/modules/agent/agent.routes.js +177 -130
- package/dist-server/server/modules/agent/agent.routes.js.map +1 -1
- package/dist-server/server/modules/agent/tests/agent-run-registration.test.js +306 -0
- package/dist-server/server/modules/agent/tests/agent-run-registration.test.js.map +1 -0
- package/dist-server/server/modules/agent/tests/agent.routes.test.js +48 -2
- package/dist-server/server/modules/agent/tests/agent.routes.test.js.map +1 -1
- package/dist-server/server/modules/browser-use/browser-use.routes.js +39 -33
- package/dist-server/server/modules/browser-use/browser-use.routes.js.map +1 -1
- package/dist-server/server/modules/database/connection.js +1 -1
- package/dist-server/server/modules/database/connection.js.map +1 -1
- package/dist-server/server/modules/database/index.js +5 -0
- package/dist-server/server/modules/database/index.js.map +1 -1
- package/dist-server/server/modules/database/migrations.js +45 -1
- package/dist-server/server/modules/database/migrations.js.map +1 -1
- package/dist-server/server/modules/database/repositories/provider-models.js +60 -6
- package/dist-server/server/modules/database/repositories/provider-models.js.map +1 -1
- package/dist-server/server/modules/database/repositories/scheduled-messages.db.js +71 -0
- package/dist-server/server/modules/database/repositories/scheduled-messages.db.js.map +1 -0
- package/dist-server/server/modules/database/repositories/session-drafts.db.js +105 -0
- package/dist-server/server/modules/database/repositories/session-drafts.db.js.map +1 -0
- package/dist-server/server/modules/database/repositories/sessions.db.js +144 -5
- package/dist-server/server/modules/database/repositories/sessions.db.js.map +1 -1
- package/dist-server/server/modules/database/repositories/user-preferences.db.js +65 -0
- package/dist-server/server/modules/database/repositories/user-preferences.db.js.map +1 -0
- package/dist-server/server/modules/database/schema.js +99 -0
- package/dist-server/server/modules/database/schema.js.map +1 -1
- package/dist-server/server/modules/database/tests/provider-models.db.integration.test.js +99 -0
- package/dist-server/server/modules/database/tests/provider-models.db.integration.test.js.map +1 -1
- package/dist-server/server/modules/database/tests/sessions.db.integration.test.js +39 -0
- package/dist-server/server/modules/database/tests/sessions.db.integration.test.js.map +1 -1
- package/dist-server/server/modules/database/tests/user-preferences.db.integration.test.js +105 -0
- package/dist-server/server/modules/database/tests/user-preferences.db.integration.test.js.map +1 -0
- package/dist-server/server/modules/file-tree/file-tree.module.js +2 -1
- package/dist-server/server/modules/file-tree/file-tree.module.js.map +1 -1
- package/dist-server/server/modules/file-tree/file-tree.service.js +44 -7
- package/dist-server/server/modules/file-tree/file-tree.service.js.map +1 -1
- package/dist-server/server/modules/file-tree/tests/file-tree.service.test.js +126 -1
- package/dist-server/server/modules/file-tree/tests/file-tree.service.test.js.map +1 -1
- package/dist-server/server/modules/git/git-branch-diff.service.js +142 -0
- package/dist-server/server/modules/git/git-branch-diff.service.js.map +1 -0
- package/dist-server/server/modules/git/git-branch.service.js.map +1 -1
- package/dist-server/server/modules/git/git.routes.js +92 -5
- package/dist-server/server/modules/git/git.routes.js.map +1 -1
- package/dist-server/server/modules/git/tests/git-branch-diff.service.test.js +160 -0
- package/dist-server/server/modules/git/tests/git-branch-diff.service.test.js.map +1 -0
- package/dist-server/server/modules/projects/project-clone.routes.js +108 -0
- package/dist-server/server/modules/projects/project-clone.routes.js.map +1 -0
- package/dist-server/server/modules/projects/projects.routes.js +13 -66
- package/dist-server/server/modules/projects/projects.routes.js.map +1 -1
- package/dist-server/server/modules/projects/services/project-clone-request.service.js +36 -0
- package/dist-server/server/modules/projects/services/project-clone-request.service.js.map +1 -0
- package/dist-server/server/modules/projects/services/project-clone.service.js +86 -32
- package/dist-server/server/modules/projects/services/project-clone.service.js.map +1 -1
- package/dist-server/server/modules/projects/services/project-delete.service.js +12 -1
- package/dist-server/server/modules/projects/services/project-delete.service.js.map +1 -1
- package/dist-server/server/modules/projects/services/project-star.service.js +2 -2
- package/dist-server/server/modules/projects/services/project-star.service.js.map +1 -1
- package/dist-server/server/modules/projects/tests/project-clone.routes.test.js +191 -0
- package/dist-server/server/modules/projects/tests/project-clone.routes.test.js.map +1 -0
- package/dist-server/server/modules/projects/tests/project-clone.service.test.js +275 -0
- package/dist-server/server/modules/projects/tests/project-clone.service.test.js.map +1 -1
- package/dist-server/server/modules/providers/index.js +3 -0
- package/dist-server/server/modules/providers/index.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude-auth.provider.js +62 -9
- package/dist-server/server/modules/providers/list/claude/claude-auth.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude-fork.provider.js +46 -0
- package/dist-server/server/modules/providers/list/claude/claude-fork.provider.js.map +1 -0
- package/dist-server/server/modules/providers/list/claude/claude-models.provider.js +31 -12
- package/dist-server/server/modules/providers/list/claude/claude-models.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude-runtime.provider.js +472 -53
- package/dist-server/server/modules/providers/list/claude/claude-runtime.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude-session-synchronizer.provider.js +38 -11
- package/dist-server/server/modules/providers/list/claude/claude-session-synchronizer.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude-sessions.provider.js +1007 -60
- package/dist-server/server/modules/providers/list/claude/claude-sessions.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude-skills.provider.js +4 -1
- package/dist-server/server/modules/providers/list/claude/claude-skills.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude.provider.js +2 -0
- package/dist-server/server/modules/providers/list/claude/claude.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-app-server.client.js +204 -0
- package/dist-server/server/modules/providers/list/codex/codex-app-server.client.js.map +1 -0
- package/dist-server/server/modules/providers/list/codex/codex-fork.provider.js +32 -0
- package/dist-server/server/modules/providers/list/codex/codex-fork.provider.js.map +1 -0
- package/dist-server/server/modules/providers/list/codex/codex-models.provider.js +47 -0
- package/dist-server/server/modules/providers/list/codex/codex-models.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-runtime.provider.js +71 -53
- package/dist-server/server/modules/providers/list/codex/codex-runtime.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-session-synchronizer.provider.js +8 -0
- package/dist-server/server/modules/providers/list/codex/codex-session-synchronizer.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-sessions.provider.js +1621 -431
- package/dist-server/server/modules/providers/list/codex/codex-sessions.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex.provider.js +2 -0
- package/dist-server/server/modules/providers/list/codex/codex.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/cursor/cursor-auth.provider.js +9 -2
- package/dist-server/server/modules/providers/list/cursor/cursor-auth.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/cursor/cursor-runtime.provider.js +16 -8
- package/dist-server/server/modules/providers/list/cursor/cursor-runtime.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/cursor/cursor-session-synchronizer.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/opencode/opencode-models.provider.js +274 -9
- package/dist-server/server/modules/providers/list/opencode/opencode-models.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/opencode/opencode-runtime.provider.js +5 -2
- package/dist-server/server/modules/providers/list/opencode/opencode-runtime.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.js +19 -2
- package/dist-server/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.js.map +1 -1
- package/dist-server/server/modules/providers/provider.routes.js +134 -2
- package/dist-server/server/modules/providers/provider.routes.js.map +1 -1
- package/dist-server/server/modules/providers/services/claude-cli-liveness.service.js +100 -0
- package/dist-server/server/modules/providers/services/claude-cli-liveness.service.js.map +1 -0
- package/dist-server/server/modules/providers/services/claude-settings-permissions.service.js +97 -0
- package/dist-server/server/modules/providers/services/claude-settings-permissions.service.js.map +1 -0
- package/dist-server/server/modules/providers/services/provider-capabilities.service.js +23 -1
- package/dist-server/server/modules/providers/services/provider-capabilities.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/provider-models.service.js +59 -5
- 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 +8 -0
- package/dist-server/server/modules/providers/services/provider-runtime.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/provider-token-usage.service.js +139 -35
- package/dist-server/server/modules/providers/services/provider-token-usage.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/session-conversations-search.service.js +2 -4
- package/dist-server/server/modules/providers/services/session-conversations-search.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/session-history-cache.service.js +91 -0
- package/dist-server/server/modules/providers/services/session-history-cache.service.js.map +1 -0
- package/dist-server/server/modules/providers/services/session-synchronizer.service.js +105 -32
- package/dist-server/server/modules/providers/services/session-synchronizer.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/sessions-watcher.service.js +3 -60
- package/dist-server/server/modules/providers/services/sessions-watcher.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/sessions.service.js +252 -12
- package/dist-server/server/modules/providers/services/sessions.service.js.map +1 -1
- package/dist-server/server/modules/providers/tests/claude-auth.test.js +183 -0
- package/dist-server/server/modules/providers/tests/claude-auth.test.js.map +1 -1
- package/dist-server/server/modules/providers/tests/claude-background-work.test.js +172 -0
- package/dist-server/server/modules/providers/tests/claude-background-work.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/claude-compaction.test.js +84 -0
- package/dist-server/server/modules/providers/tests/claude-compaction.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/claude-message-model.test.js +123 -0
- package/dist-server/server/modules/providers/tests/claude-message-model.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/claude-models.test.js +39 -0
- package/dist-server/server/modules/providers/tests/claude-models.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/claude-runtime-hold.test.js +265 -0
- package/dist-server/server/modules/providers/tests/claude-runtime-hold.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/claude-sessions.test.js +1815 -33
- package/dist-server/server/modules/providers/tests/claude-sessions.test.js.map +1 -1
- package/dist-server/server/modules/providers/tests/claude-settings-permissions.test.js +228 -0
- package/dist-server/server/modules/providers/tests/claude-settings-permissions.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/claude-subagent-echo.test.js +16 -0
- package/dist-server/server/modules/providers/tests/claude-subagent-echo.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/claude-token-budget.test.js +85 -0
- package/dist-server/server/modules/providers/tests/claude-token-budget.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/codex-message-editing.test.js +338 -0
- package/dist-server/server/modules/providers/tests/codex-message-editing.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/codex-models.test.js +25 -0
- package/dist-server/server/modules/providers/tests/codex-models.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/codex-runtime.test.js +83 -0
- package/dist-server/server/modules/providers/tests/codex-runtime.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/codex-session-fork.test.js +54 -0
- package/dist-server/server/modules/providers/tests/codex-session-fork.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/codex-sessions.test.js +354 -15
- package/dist-server/server/modules/providers/tests/codex-sessions.test.js.map +1 -1
- package/dist-server/server/modules/providers/tests/cursor-auth.test.js +167 -0
- package/dist-server/server/modules/providers/tests/cursor-auth.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/opencode-models.test.js +196 -4
- package/dist-server/server/modules/providers/tests/opencode-models.test.js.map +1 -1
- package/dist-server/server/modules/providers/tests/opencode-sessions.test.js +19 -1
- package/dist-server/server/modules/providers/tests/opencode-sessions.test.js.map +1 -1
- package/dist-server/server/modules/providers/tests/provider-capabilities.service.test.js +30 -0
- package/dist-server/server/modules/providers/tests/provider-capabilities.service.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/provider-models.service.test.js +79 -1
- package/dist-server/server/modules/providers/tests/provider-models.service.test.js.map +1 -1
- package/dist-server/server/modules/providers/tests/provider-token-usage.service.test.js +164 -1
- package/dist-server/server/modules/providers/tests/provider-token-usage.service.test.js.map +1 -1
- package/dist-server/server/modules/providers/tests/provider.routes.test.js +190 -1
- package/dist-server/server/modules/providers/tests/provider.routes.test.js.map +1 -1
- package/dist-server/server/modules/providers/tests/session-fork.test.js +113 -0
- package/dist-server/server/modules/providers/tests/session-fork.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/session-history-cache.service.test.js +139 -0
- package/dist-server/server/modules/providers/tests/session-history-cache.service.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/session-orphan-prune.test.js +90 -0
- package/dist-server/server/modules/providers/tests/session-orphan-prune.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/session-synchronizer-coalescing.test.js +122 -0
- package/dist-server/server/modules/providers/tests/session-synchronizer-coalescing.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/sessions.service.test.js +219 -1
- package/dist-server/server/modules/providers/tests/sessions.service.test.js.map +1 -1
- package/dist-server/server/modules/providers/tests/skills.test.js +15 -3
- package/dist-server/server/modules/providers/tests/skills.test.js.map +1 -1
- package/dist-server/server/modules/scheduled-messages/index.js +5 -0
- package/dist-server/server/modules/scheduled-messages/index.js.map +1 -0
- package/dist-server/server/modules/scheduled-messages/scheduled-messages.routes.js +47 -0
- package/dist-server/server/modules/scheduled-messages/scheduled-messages.routes.js.map +1 -0
- package/dist-server/server/modules/scheduled-messages/services/scheduled-message-dispatcher.service.js +175 -0
- package/dist-server/server/modules/scheduled-messages/services/scheduled-message-dispatcher.service.js.map +1 -0
- package/dist-server/server/modules/scheduled-messages/services/scheduled-messages.service.js +95 -0
- package/dist-server/server/modules/scheduled-messages/services/scheduled-messages.service.js.map +1 -0
- package/dist-server/server/modules/scheduled-messages/tests/scheduled-messages.test.js +290 -0
- package/dist-server/server/modules/scheduled-messages/tests/scheduled-messages.test.js.map +1 -0
- package/dist-server/server/modules/taskmaster/taskmaster.routes.js +23 -23
- package/dist-server/server/modules/taskmaster/taskmaster.routes.js.map +1 -1
- package/dist-server/server/modules/taskmaster/tests/taskmaster.routes.test.js +48 -0
- package/dist-server/server/modules/taskmaster/tests/taskmaster.routes.test.js.map +1 -1
- package/dist-server/server/modules/user/tests/user.service.test.js +70 -0
- package/dist-server/server/modules/user/tests/user.service.test.js.map +1 -1
- package/dist-server/server/modules/user/user.module.js +10 -1
- package/dist-server/server/modules/user/user.module.js.map +1 -1
- package/dist-server/server/modules/user/user.routes.js +44 -0
- package/dist-server/server/modules/user/user.routes.js.map +1 -1
- package/dist-server/server/modules/user/user.service.js +75 -0
- package/dist-server/server/modules/user/user.service.js.map +1 -1
- package/dist-server/server/modules/voice/tests/voice.service.test.js +3 -2
- package/dist-server/server/modules/voice/tests/voice.service.test.js.map +1 -1
- package/dist-server/server/modules/websocket/index.js +7 -0
- package/dist-server/server/modules/websocket/index.js.map +1 -1
- package/dist-server/server/modules/websocket/services/chat-run-registry.service.js +37 -49
- package/dist-server/server/modules/websocket/services/chat-run-registry.service.js.map +1 -1
- package/dist-server/server/modules/websocket/services/chat-session-writer.service.js +35 -5
- package/dist-server/server/modules/websocket/services/chat-session-writer.service.js.map +1 -1
- package/dist-server/server/modules/websocket/services/chat-websocket.service.js +204 -10
- package/dist-server/server/modules/websocket/services/chat-websocket.service.js.map +1 -1
- package/dist-server/server/modules/websocket/services/session-upsert-broadcast.service.js +94 -0
- package/dist-server/server/modules/websocket/services/session-upsert-broadcast.service.js.map +1 -0
- package/dist-server/server/modules/websocket/services/shell-websocket.service.js +236 -20
- package/dist-server/server/modules/websocket/services/shell-websocket.service.js.map +1 -1
- package/dist-server/server/modules/websocket/tests/chat-background-subscribe.test.js +137 -0
- package/dist-server/server/modules/websocket/tests/chat-background-subscribe.test.js.map +1 -0
- package/dist-server/server/modules/websocket/tests/chat-edit-send.test.js +263 -0
- package/dist-server/server/modules/websocket/tests/chat-edit-send.test.js.map +1 -0
- package/dist-server/server/modules/websocket/tests/chat-run-registry.test.js +29 -3
- package/dist-server/server/modules/websocket/tests/chat-run-registry.test.js.map +1 -1
- package/dist-server/server/modules/websocket/tests/chat-stop-task.test.js +96 -0
- package/dist-server/server/modules/websocket/tests/chat-stop-task.test.js.map +1 -0
- package/dist-server/server/modules/websocket/tests/session-upsert-broadcast.test.js +106 -0
- package/dist-server/server/modules/websocket/tests/session-upsert-broadcast.test.js.map +1 -0
- package/dist-server/server/modules/websocket/tests/shell-websocket.service.test.js +500 -0
- package/dist-server/server/modules/websocket/tests/shell-websocket.service.test.js.map +1 -1
- package/dist-server/server/shared/claude-cli-path.js +22 -5
- package/dist-server/server/shared/claude-cli-path.js.map +1 -1
- package/dist-server/server/shared/index.js +3 -0
- package/dist-server/server/shared/index.js.map +1 -0
- package/dist-server/server/shared/message-unification.js +376 -0
- package/dist-server/server/shared/message-unification.js.map +1 -0
- package/dist-server/server/shared/tests/claude-cli-path.test.js +45 -1
- package/dist-server/server/shared/tests/claude-cli-path.test.js.map +1 -1
- package/dist-server/server/shared/tests/message-unification.test.js +174 -0
- package/dist-server/server/shared/tests/message-unification.test.js.map +1 -0
- package/dist-server/server/shared/tests/read-only-roots.test.js +124 -0
- package/dist-server/server/shared/tests/read-only-roots.test.js.map +1 -0
- package/dist-server/server/shared/tests/strip-ansi-sequences.test.js +31 -0
- package/dist-server/server/shared/tests/strip-ansi-sequences.test.js.map +1 -0
- package/dist-server/server/shared/utils.js +160 -0
- package/dist-server/server/shared/utils.js.map +1 -1
- package/electron/desktopWindow.js +6 -0
- package/electron/viewHost.js +25 -2
- package/package.json +20 -17
- package/server/index.ts +16 -5
- package/server/modules/agent/agent.module.ts +11 -1
- package/server/modules/agent/agent.routes.ts +200 -142
- package/server/modules/agent/tests/agent-run-registration.test.ts +348 -0
- package/server/modules/agent/tests/agent.routes.test.ts +51 -2
- package/server/modules/browser-use/browser-use.routes.ts +96 -33
- package/server/modules/database/connection.ts +2 -1
- package/server/modules/database/index.ts +10 -0
- package/server/modules/database/migrations.ts +51 -0
- package/server/modules/database/repositories/provider-models.ts +79 -6
- package/server/modules/database/repositories/scheduled-messages.db.ts +127 -0
- package/server/modules/database/repositories/session-drafts.db.ts +171 -0
- package/server/modules/database/repositories/sessions.db.ts +204 -3
- package/server/modules/database/repositories/user-preferences.db.ts +80 -0
- package/server/modules/database/schema.ts +103 -0
- package/server/modules/database/tests/provider-models.db.integration.test.ts +113 -0
- package/server/modules/database/tests/sessions.db.integration.test.ts +52 -0
- package/server/modules/database/tests/user-preferences.db.integration.test.ts +135 -0
- package/server/modules/file-tree/file-tree.module.ts +2 -1
- package/server/modules/file-tree/file-tree.service.ts +49 -7
- package/server/modules/file-tree/tests/file-tree.service.test.ts +163 -1
- package/server/modules/git/git-branch-diff.service.ts +204 -0
- package/server/modules/git/git-branch.service.ts +2 -12
- package/server/modules/git/git.routes.ts +100 -6
- package/server/modules/git/tests/git-branch-diff.service.test.ts +210 -0
- package/server/modules/projects/project-clone.routes.ts +142 -0
- package/server/modules/projects/projects.routes.ts +16 -81
- package/server/modules/projects/services/project-clone-request.service.ts +56 -0
- package/server/modules/projects/services/project-clone.service.ts +102 -34
- package/server/modules/projects/services/project-delete.service.ts +13 -1
- package/server/modules/projects/services/project-star.service.ts +2 -2
- package/server/modules/projects/tests/project-clone.routes.test.ts +246 -0
- package/server/modules/projects/tests/project-clone.service.test.ts +376 -0
- package/server/modules/providers/index.ts +4 -0
- package/server/modules/providers/list/claude/claude-auth.provider.ts +81 -11
- package/server/modules/providers/list/claude/claude-fork.provider.ts +57 -0
- package/server/modules/providers/list/claude/claude-models.provider.ts +37 -17
- package/server/modules/providers/list/claude/claude-runtime.provider.js +510 -54
- package/server/modules/providers/list/claude/claude-session-synchronizer.provider.ts +40 -14
- package/server/modules/providers/list/claude/claude-sessions.provider.ts +1195 -63
- package/server/modules/providers/list/claude/claude-skills.provider.ts +4 -1
- package/server/modules/providers/list/claude/claude.provider.ts +3 -0
- package/server/modules/providers/list/codex/codex-app-server.client.ts +243 -0
- package/server/modules/providers/list/codex/codex-fork.provider.ts +40 -0
- package/server/modules/providers/list/codex/codex-models.provider.ts +47 -0
- package/server/modules/providers/list/codex/{codex-runtime.provider.js → codex-runtime.provider.ts} +105 -70
- package/server/modules/providers/list/codex/codex-session-synchronizer.provider.ts +9 -0
- package/server/modules/providers/list/codex/codex-sessions.provider.ts +1847 -455
- package/server/modules/providers/list/codex/codex.provider.ts +3 -0
- package/server/modules/providers/list/cursor/cursor-auth.provider.ts +10 -2
- package/server/modules/providers/list/cursor/cursor-runtime.provider.js +17 -8
- package/server/modules/providers/list/cursor/cursor-session-synchronizer.provider.ts +0 -1
- package/server/modules/providers/list/opencode/opencode-models.provider.ts +297 -9
- package/server/modules/providers/list/opencode/opencode-runtime.provider.js +5 -2
- package/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.ts +30 -2
- package/server/modules/providers/provider.routes.ts +162 -2
- package/server/modules/providers/services/claude-cli-liveness.service.ts +121 -0
- package/server/modules/providers/services/claude-settings-permissions.service.ts +127 -0
- package/server/modules/providers/services/provider-capabilities.service.ts +40 -1
- package/server/modules/providers/services/provider-models.service.ts +71 -4
- package/server/modules/providers/services/provider-runtime.service.ts +11 -0
- package/server/modules/providers/services/provider-token-usage.service.ts +166 -39
- package/server/modules/providers/services/session-conversations-search.service.ts +2 -5
- package/server/modules/providers/services/session-history-cache.service.ts +150 -0
- package/server/modules/providers/services/session-synchronizer.service.ts +125 -38
- package/server/modules/providers/services/sessions-watcher.service.ts +3 -64
- package/server/modules/providers/services/sessions.service.ts +309 -17
- package/server/modules/providers/tests/claude-auth.test.ts +208 -0
- package/server/modules/providers/tests/claude-background-work.test.ts +213 -0
- package/server/modules/providers/tests/claude-compaction.test.ts +101 -0
- package/server/modules/providers/tests/claude-message-model.test.ts +160 -0
- package/server/modules/providers/tests/claude-models.test.ts +87 -0
- package/server/modules/providers/tests/claude-runtime-hold.test.ts +309 -0
- package/server/modules/providers/tests/claude-sessions.test.ts +2167 -37
- package/server/modules/providers/tests/claude-settings-permissions.test.ts +271 -0
- package/server/modules/providers/tests/claude-subagent-echo.test.ts +25 -0
- package/server/modules/providers/tests/claude-token-budget.test.ts +104 -0
- package/server/modules/providers/tests/codex-message-editing.test.ts +419 -0
- package/server/modules/providers/tests/codex-models.test.ts +37 -0
- package/server/modules/providers/tests/codex-runtime.test.ts +94 -0
- package/server/modules/providers/tests/codex-session-fork.test.ts +59 -0
- package/server/modules/providers/tests/codex-sessions.test.ts +396 -15
- package/server/modules/providers/tests/cursor-auth.test.ts +187 -0
- package/server/modules/providers/tests/opencode-models.test.ts +266 -8
- package/server/modules/providers/tests/opencode-sessions.test.ts +40 -1
- package/server/modules/providers/tests/provider-capabilities.service.test.ts +37 -0
- package/server/modules/providers/tests/provider-models.service.test.ts +99 -1
- package/server/modules/providers/tests/provider-token-usage.service.test.ts +188 -1
- package/server/modules/providers/tests/provider.routes.test.ts +230 -1
- package/server/modules/providers/tests/session-fork.test.ts +173 -0
- package/server/modules/providers/tests/session-history-cache.service.test.ts +165 -0
- package/server/modules/providers/tests/session-orphan-prune.test.ts +107 -0
- package/server/modules/providers/tests/session-synchronizer-coalescing.test.ts +136 -0
- package/server/modules/providers/tests/sessions.service.test.ts +303 -1
- package/server/modules/providers/tests/skills.test.ts +21 -5
- package/server/modules/scheduled-messages/index.ts +8 -0
- package/server/modules/scheduled-messages/scheduled-messages.routes.ts +68 -0
- package/server/modules/scheduled-messages/services/scheduled-message-dispatcher.service.ts +216 -0
- package/server/modules/scheduled-messages/services/scheduled-messages.service.ts +121 -0
- package/server/modules/scheduled-messages/tests/scheduled-messages.test.ts +354 -0
- package/server/modules/taskmaster/taskmaster.routes.ts +23 -33
- package/server/modules/taskmaster/tests/taskmaster.routes.test.ts +57 -0
- package/server/modules/user/tests/user.service.test.ts +90 -0
- package/server/modules/user/user.module.ts +10 -1
- package/server/modules/user/user.routes.ts +44 -0
- package/server/modules/user/user.service.ts +105 -0
- package/server/modules/voice/tests/voice.service.test.ts +3 -2
- package/server/modules/websocket/README.md +4 -2
- package/server/modules/websocket/index.ts +8 -0
- package/server/modules/websocket/services/chat-run-registry.service.ts +45 -54
- package/server/modules/websocket/services/chat-session-writer.service.ts +36 -6
- package/server/modules/websocket/services/chat-websocket.service.ts +302 -16
- package/server/modules/websocket/services/session-upsert-broadcast.service.ts +108 -0
- package/server/modules/websocket/services/shell-websocket.service.ts +276 -22
- package/server/modules/websocket/tests/chat-background-subscribe.test.ts +167 -0
- package/server/modules/websocket/tests/chat-edit-send.test.ts +309 -0
- package/server/modules/websocket/tests/chat-run-registry.test.ts +34 -3
- package/server/modules/websocket/tests/chat-stop-task.test.ts +127 -0
- package/server/modules/websocket/tests/session-upsert-broadcast.test.ts +138 -0
- package/server/modules/websocket/tests/shell-websocket.service.test.ts +629 -0
- package/server/shared/claude-cli-path.ts +24 -6
- package/server/shared/index.ts +3 -0
- package/server/shared/interfaces.ts +91 -0
- package/server/shared/message-unification.ts +449 -0
- package/server/shared/tests/claude-cli-path.test.ts +58 -1
- package/server/shared/tests/message-unification.test.ts +218 -0
- package/server/shared/tests/read-only-roots.test.ts +139 -0
- package/server/shared/tests/strip-ansi-sequences.test.ts +42 -0
- package/server/shared/types.ts +382 -7
- package/server/shared/utils.ts +176 -0
- package/dist/assets/channel-_falYbU1.js +0 -1
- package/dist/assets/classDiagram-JCYQIIEL-Dn-3CfpR.js +0 -1
- package/dist/assets/classDiagram-v2-OCEON4UE-Dn-3CfpR.js +0 -1
- package/dist/assets/index-CzPLBvXT.css +0 -32
- package/dist/assets/index-DFkBBuSA.js +0 -1549
- package/dist/assets/stateDiagram-v2-UEYNNEHI-BvBxUUrZ.js +0 -1
- package/dist/assets/swimlanesDiagram-ULZ7WXOC-CsE-x4YK.js +0 -8
|
@@ -2,9 +2,11 @@ import { randomUUID } from 'node:crypto';
|
|
|
2
2
|
import fsp from 'node:fs/promises';
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
import { projectsDb, sessionsDb } from '../../../modules/database/index.js';
|
|
5
|
-
import { chatRunRegistry } from '../../../modules/websocket/index.js';
|
|
5
|
+
import { broadcastSessionUpserted, chatRunRegistry } from '../../../modules/websocket/index.js';
|
|
6
6
|
import { providerRegistry } from '../../../modules/providers/provider.registry.js';
|
|
7
|
-
import {
|
|
7
|
+
import { listBusyClaudeCliSessions } from '../../../modules/providers/services/claude-cli-liveness.service.js';
|
|
8
|
+
import { sessionHistoryCache } from '../../../modules/providers/services/session-history-cache.service.js';
|
|
9
|
+
import { AppError, sliceTailPage } from '../../../shared/utils.js';
|
|
8
10
|
const MAX_CLOUDCLI_SESSION_NAME_WORDS = 4;
|
|
9
11
|
function buildCloudCliSessionName(initialMessage) {
|
|
10
12
|
const words = initialMessage.trim().split(/\s+/).filter(Boolean);
|
|
@@ -57,13 +59,57 @@ export const sessionsService = {
|
|
|
57
59
|
return providerRegistry.listProviders().map((provider) => provider.id);
|
|
58
60
|
},
|
|
59
61
|
/**
|
|
60
|
-
* Returns app-facing ids for provider runs that are currently processing
|
|
62
|
+
* Returns app-facing ids for provider runs that are currently processing,
|
|
63
|
+
* plus every session whose background work outlived its turn.
|
|
61
64
|
*
|
|
62
65
|
* This is intentionally status-only: callers that only need sidebar activity
|
|
63
66
|
* indicators should not attach to chat streams or request replayed messages.
|
|
64
67
|
*/
|
|
65
|
-
listRunningSessions() {
|
|
66
|
-
|
|
68
|
+
async listRunningSessions() {
|
|
69
|
+
const entries = chatRunRegistry.listRunningRuns();
|
|
70
|
+
const runningById = new Map(entries.map((entry) => [entry.sessionId, entry]));
|
|
71
|
+
for (const provider of providerRegistry.listProviders()) {
|
|
72
|
+
for (const { sessionId, tasks } of provider.runtime.listBackgroundWork?.() ?? []) {
|
|
73
|
+
const running = runningById.get(sessionId);
|
|
74
|
+
if (running) {
|
|
75
|
+
running.tasks = tasks;
|
|
76
|
+
continue;
|
|
77
|
+
}
|
|
78
|
+
entries.push({
|
|
79
|
+
sessionId,
|
|
80
|
+
provider: provider.id,
|
|
81
|
+
startedAt: Math.min(...tasks.map((task) => task.startedAt)),
|
|
82
|
+
// The completed run stays in the registry for a while, and a client
|
|
83
|
+
// that subscribes with its lastSeq replays the tail it missed.
|
|
84
|
+
lastSeq: chatRunRegistry.getRun(sessionId)?.lastSeq ?? 0,
|
|
85
|
+
background: true,
|
|
86
|
+
canInterrupt: false,
|
|
87
|
+
tasks,
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
// The chat-run registry only knows about turns CloudCLI drives itself, so
|
|
92
|
+
// without this a session working under the Claude CLI — including one
|
|
93
|
+
// CloudCLI spawned for its own Shell view — looks idle. A session already
|
|
94
|
+
// listed above keeps its richer entry.
|
|
95
|
+
for (const live of await listBusyClaudeCliSessions()) {
|
|
96
|
+
const session = sessionsDb.getSessionByProviderSessionId(live.providerSessionId);
|
|
97
|
+
if (!session || runningById.has(session.session_id)) {
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
entries.push({
|
|
101
|
+
sessionId: session.session_id,
|
|
102
|
+
provider: session.provider,
|
|
103
|
+
startedAt: live.startedAt,
|
|
104
|
+
lastSeq: chatRunRegistry.getRun(session.session_id)?.lastSeq ?? 0,
|
|
105
|
+
// There is no run here to abort: the turn belongs to a CLI process
|
|
106
|
+
// CloudCLI does not own, so it can be reported but not interrupted.
|
|
107
|
+
canInterrupt: false,
|
|
108
|
+
statusText: 'Running in the Claude CLI',
|
|
109
|
+
});
|
|
110
|
+
runningById.set(session.session_id, entries[entries.length - 1]);
|
|
111
|
+
}
|
|
112
|
+
return entries;
|
|
67
113
|
},
|
|
68
114
|
/**
|
|
69
115
|
* Returns the active conversation feed in true global activity order.
|
|
@@ -145,6 +191,68 @@ export const sessionsService = {
|
|
|
145
191
|
sessionName,
|
|
146
192
|
};
|
|
147
193
|
},
|
|
194
|
+
/**
|
|
195
|
+
* Branches a session into an independent one containing its conversation up
|
|
196
|
+
* to `upToAnchorId` (the whole thing when omitted).
|
|
197
|
+
*
|
|
198
|
+
* The source is left completely untouched — this is the "try two approaches"
|
|
199
|
+
* action, not a destructive one.
|
|
200
|
+
*/
|
|
201
|
+
async forkSessionById(sessionId, options = {}) {
|
|
202
|
+
const source = sessionsDb.getSessionById(sessionId);
|
|
203
|
+
if (!source) {
|
|
204
|
+
throw new AppError(`Session "${sessionId}" was not found.`, {
|
|
205
|
+
code: 'SESSION_NOT_FOUND',
|
|
206
|
+
statusCode: 404,
|
|
207
|
+
});
|
|
208
|
+
}
|
|
209
|
+
const provider = source.provider;
|
|
210
|
+
const fork = providerRegistry.resolveProvider(provider).fork;
|
|
211
|
+
if (!fork) {
|
|
212
|
+
throw new AppError(`Sessions cannot be forked for provider "${provider}".`, {
|
|
213
|
+
code: 'FORK_NOT_SUPPORTED',
|
|
214
|
+
statusCode: 409,
|
|
215
|
+
});
|
|
216
|
+
}
|
|
217
|
+
// A session that has never run has no transcript to copy, so there is
|
|
218
|
+
// nothing a fork of it could resume from.
|
|
219
|
+
if (!source.provider_session_id || !source.jsonl_path) {
|
|
220
|
+
throw new AppError('This session has not produced a transcript yet.', {
|
|
221
|
+
code: 'FORK_SOURCE_NOT_READY',
|
|
222
|
+
statusCode: 409,
|
|
223
|
+
});
|
|
224
|
+
}
|
|
225
|
+
const sessionName = options.title?.trim()
|
|
226
|
+
|| `${source.custom_name?.trim() || 'Session'} (fork)`;
|
|
227
|
+
const forked = await fork.forkSession({
|
|
228
|
+
providerSessionId: source.provider_session_id,
|
|
229
|
+
jsonlPath: source.jsonl_path,
|
|
230
|
+
projectPath: source.project_path ?? '',
|
|
231
|
+
upToAnchorId: options.upToAnchorId,
|
|
232
|
+
title: sessionName,
|
|
233
|
+
});
|
|
234
|
+
const forkSessionId = randomUUID();
|
|
235
|
+
sessionsDb.createForkedSession({
|
|
236
|
+
sessionId: forkSessionId,
|
|
237
|
+
provider,
|
|
238
|
+
projectPath: source.project_path ?? '',
|
|
239
|
+
customName: sessionName,
|
|
240
|
+
providerSessionId: forked.providerSessionId,
|
|
241
|
+
jsonlPath: forked.jsonlPath,
|
|
242
|
+
forkedFromSessionId: sessionId,
|
|
243
|
+
// A fork that silently dropped to the catalog default would answer
|
|
244
|
+
// differently from the conversation it was branched from.
|
|
245
|
+
model: source.model,
|
|
246
|
+
effort: source.effort,
|
|
247
|
+
});
|
|
248
|
+
await broadcastSessionUpserted(forkSessionId);
|
|
249
|
+
return {
|
|
250
|
+
sessionId: forkSessionId,
|
|
251
|
+
provider,
|
|
252
|
+
projectPath: source.project_path ?? '',
|
|
253
|
+
sessionName,
|
|
254
|
+
};
|
|
255
|
+
},
|
|
148
256
|
/**
|
|
149
257
|
* Resolves the provider-native id only for an explicit user copy action.
|
|
150
258
|
* Normal session payloads continue to expose only the stable app id.
|
|
@@ -174,6 +282,63 @@ export const sessionsService = {
|
|
|
174
282
|
* and every returned message is remapped back to the app session id so
|
|
175
283
|
* provider ids never reach the frontend.
|
|
176
284
|
*/
|
|
285
|
+
/**
|
|
286
|
+
* Resolves where a conversation must resume from so that one already-sent
|
|
287
|
+
* message, and everything after it, is replaced.
|
|
288
|
+
*
|
|
289
|
+
* Returns `null` when the provider cannot do this at all, which is how the
|
|
290
|
+
* chat gateway knows to refuse the request rather than silently sending the
|
|
291
|
+
* edit as a new message at the end of the conversation.
|
|
292
|
+
*/
|
|
293
|
+
async resolveEditAnchor(sessionId, anchorId) {
|
|
294
|
+
const session = sessionsDb.getSessionById(sessionId);
|
|
295
|
+
if (!session) {
|
|
296
|
+
throw new AppError(`Session "${sessionId}" was not found.`, {
|
|
297
|
+
code: 'SESSION_NOT_FOUND',
|
|
298
|
+
statusCode: 404,
|
|
299
|
+
});
|
|
300
|
+
}
|
|
301
|
+
const sessions = providerRegistry.resolveProvider(session.provider).sessions;
|
|
302
|
+
if (!sessions.resolveEditAnchor) {
|
|
303
|
+
return null;
|
|
304
|
+
}
|
|
305
|
+
return sessions.resolveEditAnchor(sessionId, anchorId);
|
|
306
|
+
},
|
|
307
|
+
/**
|
|
308
|
+
* Whether editing a message on this session's provider means rewinding it on
|
|
309
|
+
* disk first, rather than handing the anchor to the runtime as a resume
|
|
310
|
+
* option.
|
|
311
|
+
*
|
|
312
|
+
* Answering this without doing anything is the point: the rewind moves the
|
|
313
|
+
* session onto a different provider transcript and cannot be undone, so the
|
|
314
|
+
* gateway has to know which shape the run takes before it commits to one.
|
|
315
|
+
*/
|
|
316
|
+
providerRewindsForEdit(sessionId) {
|
|
317
|
+
const session = sessionsDb.getSessionById(sessionId);
|
|
318
|
+
if (!session) {
|
|
319
|
+
throw new AppError(`Session "${sessionId}" was not found.`, {
|
|
320
|
+
code: 'SESSION_NOT_FOUND',
|
|
321
|
+
statusCode: 404,
|
|
322
|
+
});
|
|
323
|
+
}
|
|
324
|
+
return Boolean(providerRegistry.resolveProvider(session.provider).sessions.rewindSession);
|
|
325
|
+
},
|
|
326
|
+
/**
|
|
327
|
+
* Rewinds a session on disk so `keepThroughId` is the last row it holds.
|
|
328
|
+
*
|
|
329
|
+
* Only call this once the run is admitted — see `providerRewindsForEdit`.
|
|
330
|
+
*/
|
|
331
|
+
async rewindSessionForEdit(sessionId, keepThroughId) {
|
|
332
|
+
const session = sessionsDb.getSessionById(sessionId);
|
|
333
|
+
if (!session) {
|
|
334
|
+
throw new AppError(`Session "${sessionId}" was not found.`, {
|
|
335
|
+
code: 'SESSION_NOT_FOUND',
|
|
336
|
+
statusCode: 404,
|
|
337
|
+
});
|
|
338
|
+
}
|
|
339
|
+
const sessions = providerRegistry.resolveProvider(session.provider).sessions;
|
|
340
|
+
await sessions.rewindSession?.(sessionId, keepThroughId);
|
|
341
|
+
},
|
|
177
342
|
async fetchHistory(sessionId, options = {}) {
|
|
178
343
|
const session = sessionsDb.getSessionById(sessionId);
|
|
179
344
|
if (!session) {
|
|
@@ -194,12 +359,50 @@ export const sessionsService = {
|
|
|
194
359
|
};
|
|
195
360
|
}
|
|
196
361
|
const provider = session.provider;
|
|
197
|
-
const
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
362
|
+
const providerSessions = providerRegistry.resolveProvider(provider).sessions;
|
|
363
|
+
const providerSessionId = session.provider_session_id;
|
|
364
|
+
const projectPath = session.project_path ?? '';
|
|
365
|
+
const requestedLimit = options.limit ?? null;
|
|
366
|
+
const requestedOffset = options.offset ?? 0;
|
|
367
|
+
// Claude and Codex history readers parse `jsonl_path` itself, so a page
|
|
368
|
+
// can be sliced from the stat-validated full-transcript cache instead of
|
|
369
|
+
// re-parsing the whole file per request. Cursor and OpenCode read their
|
|
370
|
+
// messages from elsewhere (store.db / shared SQLite), so that file's stat
|
|
371
|
+
// says nothing about their history — they stay on the direct path.
|
|
372
|
+
const transcriptPath = provider === 'claude' || provider === 'codex'
|
|
373
|
+
? session.jsonl_path
|
|
374
|
+
: null;
|
|
375
|
+
const fullHistory = await sessionHistoryCache.getFullHistory({
|
|
376
|
+
sessionId,
|
|
377
|
+
transcriptPath,
|
|
378
|
+
loadFull: () => providerSessions.fetchHistory(sessionId, {
|
|
379
|
+
limit: null,
|
|
380
|
+
offset: 0,
|
|
381
|
+
projectPath,
|
|
382
|
+
providerSessionId,
|
|
383
|
+
}),
|
|
202
384
|
});
|
|
385
|
+
let result;
|
|
386
|
+
if (fullHistory) {
|
|
387
|
+
// Providers slice with this same helper, so a cached page is identical
|
|
388
|
+
// to what a direct `(limit, offset)` read would have returned.
|
|
389
|
+
const { page, hasMore } = sliceTailPage(fullHistory.messages, requestedLimit, Math.max(0, requestedOffset));
|
|
390
|
+
result = {
|
|
391
|
+
...fullHistory,
|
|
392
|
+
messages: page,
|
|
393
|
+
hasMore,
|
|
394
|
+
offset: requestedOffset,
|
|
395
|
+
limit: requestedLimit,
|
|
396
|
+
};
|
|
397
|
+
}
|
|
398
|
+
else {
|
|
399
|
+
result = await providerSessions.fetchHistory(sessionId, {
|
|
400
|
+
limit: requestedLimit,
|
|
401
|
+
offset: requestedOffset,
|
|
402
|
+
projectPath,
|
|
403
|
+
providerSessionId,
|
|
404
|
+
});
|
|
405
|
+
}
|
|
203
406
|
return {
|
|
204
407
|
...result,
|
|
205
408
|
messages: result.messages.map((message) => ({
|
|
@@ -208,6 +411,31 @@ export const sessionsService = {
|
|
|
208
411
|
})),
|
|
209
412
|
};
|
|
210
413
|
},
|
|
414
|
+
/**
|
|
415
|
+
* Reads what one agent of a workflow run did, for the card that opened it.
|
|
416
|
+
*
|
|
417
|
+
* Not found covers both a provider that spawns no workflow agents and a run
|
|
418
|
+
* that left no transcript for this agent: either way there is nothing to
|
|
419
|
+
* show, and the card says so in one line.
|
|
420
|
+
*/
|
|
421
|
+
async readWorkflowAgentActivity(sessionId, runId, agentId) {
|
|
422
|
+
const session = sessionsDb.getSessionById(sessionId);
|
|
423
|
+
if (!session) {
|
|
424
|
+
throw new AppError(`Session "${sessionId}" was not found.`, {
|
|
425
|
+
code: 'SESSION_NOT_FOUND',
|
|
426
|
+
statusCode: 404,
|
|
427
|
+
});
|
|
428
|
+
}
|
|
429
|
+
const sessions = providerRegistry.resolveProvider(session.provider).sessions;
|
|
430
|
+
const activity = await sessions.readWorkflowAgentActivity?.(sessionId, runId, agentId);
|
|
431
|
+
if (!activity) {
|
|
432
|
+
throw new AppError(`Workflow agent "${agentId}" was not found.`, {
|
|
433
|
+
code: 'WORKFLOW_AGENT_NOT_FOUND',
|
|
434
|
+
statusCode: 404,
|
|
435
|
+
});
|
|
436
|
+
}
|
|
437
|
+
return activity;
|
|
438
|
+
},
|
|
211
439
|
/**
|
|
212
440
|
* Resolves one session (by app id, falling back to the provider-native id)
|
|
213
441
|
* to its metadata plus the owning project.
|
|
@@ -301,9 +529,21 @@ export const sessionsService = {
|
|
|
301
529
|
};
|
|
302
530
|
}
|
|
303
531
|
let removedFromDisk = false;
|
|
304
|
-
if (options.deletedFromDisk
|
|
305
|
-
|
|
532
|
+
if (options.deletedFromDisk) {
|
|
533
|
+
// Every file the conversation has lived in, not just the one the row
|
|
534
|
+
// points at now: editing a message on a provider that rewinds by
|
|
535
|
+
// branching moves the session onto a copy and leaves the earlier
|
|
536
|
+
// transcript behind. Deleting only the current one would leave the
|
|
537
|
+
// replaced turns on disk, and unreachable through the app.
|
|
538
|
+
const transcripts = [
|
|
539
|
+
...(session.jsonl_path ? [session.jsonl_path] : []),
|
|
540
|
+
...sessionsDb.getSupersededTranscriptPaths(sessionId),
|
|
541
|
+
];
|
|
542
|
+
for (const transcript of transcripts) {
|
|
543
|
+
removedFromDisk = (await removeFileIfExists(transcript)) || removedFromDisk;
|
|
544
|
+
}
|
|
306
545
|
}
|
|
546
|
+
sessionsDb.clearSupersededProviderSessions(sessionId);
|
|
307
547
|
const deleted = sessionsDb.deleteSessionById(sessionId);
|
|
308
548
|
if (!deleted) {
|
|
309
549
|
throw new AppError(`Session "${sessionId}" was not found.`, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/sessions.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sessions.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/sessions.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,21 @@ import path from 'node:path';
|
|
|
5
5
|
import test from 'node:test';
|
|
6
6
|
import { ClaudeProviderAuth } from '../../../modules/providers/list/claude/claude-auth.provider.js';
|
|
7
7
|
const checkCredentials = (auth) => auth.checkCredentials();
|
|
8
|
+
// getStatus() is the public API the route serves, but it first shells out to
|
|
9
|
+
// `claude --version`. Stubbing checkInstalled() lets the test cover the mapping
|
|
10
|
+
// from checkCredentials() to the wire shape without the CLI.
|
|
11
|
+
const getStatusWithCliInstalled = (auth) => {
|
|
12
|
+
auth.checkInstalled = () => true;
|
|
13
|
+
return auth.getStatus();
|
|
14
|
+
};
|
|
15
|
+
const validSubscriptionCredentials = (email) => ({
|
|
16
|
+
claudeAiOauth: {
|
|
17
|
+
accessToken: 'valid-token',
|
|
18
|
+
refreshToken: 'live-refresh-token',
|
|
19
|
+
expiresAt: Date.now() + 60 * 60 * 1000,
|
|
20
|
+
},
|
|
21
|
+
...(email ? { email } : {}),
|
|
22
|
+
});
|
|
8
23
|
const ENV_KEYS = ['CLAUDE_CODE_OAUTH_TOKEN', 'ANTHROPIC_API_KEY', 'ANTHROPIC_AUTH_TOKEN'];
|
|
9
24
|
const withEnv = async (overrides, fn) => {
|
|
10
25
|
const original = {};
|
|
@@ -110,6 +125,58 @@ test('checkCredentials: no CLAUDE_CODE_OAUTH_TOKEN, expired credentials file rep
|
|
|
110
125
|
});
|
|
111
126
|
});
|
|
112
127
|
});
|
|
128
|
+
test('checkCredentials: expired access token with a live refresh token is still authenticated', async () => {
|
|
129
|
+
await withTempHome(async (homeDir) => {
|
|
130
|
+
await writeCredentialsFile(homeDir, {
|
|
131
|
+
claudeAiOauth: {
|
|
132
|
+
accessToken: 'stale-token',
|
|
133
|
+
refreshToken: 'live-refresh-token',
|
|
134
|
+
expiresAt: 1_000_000_000_000,
|
|
135
|
+
refreshTokenExpiresAt: Date.now() + 30 * 24 * 60 * 60 * 1000,
|
|
136
|
+
},
|
|
137
|
+
email: 'someone@example.com',
|
|
138
|
+
});
|
|
139
|
+
await withEnv({}, async () => {
|
|
140
|
+
const status = await checkCredentials(new ClaudeProviderAuth());
|
|
141
|
+
assert.equal(status.authenticated, true);
|
|
142
|
+
assert.equal(status.method, 'credentials_file');
|
|
143
|
+
assert.equal(status.email, 'someone@example.com');
|
|
144
|
+
});
|
|
145
|
+
});
|
|
146
|
+
});
|
|
147
|
+
test('checkCredentials: expired access token with a refresh token that has no recorded expiry is authenticated', async () => {
|
|
148
|
+
await withTempHome(async (homeDir) => {
|
|
149
|
+
await writeCredentialsFile(homeDir, {
|
|
150
|
+
claudeAiOauth: {
|
|
151
|
+
accessToken: 'stale-token',
|
|
152
|
+
refreshToken: 'live-refresh-token',
|
|
153
|
+
expiresAt: 1_000_000_000_000,
|
|
154
|
+
},
|
|
155
|
+
});
|
|
156
|
+
await withEnv({}, async () => {
|
|
157
|
+
const status = await checkCredentials(new ClaudeProviderAuth());
|
|
158
|
+
assert.equal(status.authenticated, true);
|
|
159
|
+
assert.equal(status.method, 'credentials_file');
|
|
160
|
+
});
|
|
161
|
+
});
|
|
162
|
+
});
|
|
163
|
+
test('checkCredentials: expired access token with an expired refresh token reports not authenticated', async () => {
|
|
164
|
+
await withTempHome(async (homeDir) => {
|
|
165
|
+
await writeCredentialsFile(homeDir, {
|
|
166
|
+
claudeAiOauth: {
|
|
167
|
+
accessToken: 'stale-token',
|
|
168
|
+
refreshToken: 'stale-refresh-token',
|
|
169
|
+
expiresAt: 1_000_000_000_000,
|
|
170
|
+
refreshTokenExpiresAt: 1_000_000_000_000,
|
|
171
|
+
},
|
|
172
|
+
});
|
|
173
|
+
await withEnv({}, async () => {
|
|
174
|
+
const status = await checkCredentials(new ClaudeProviderAuth());
|
|
175
|
+
assert.equal(status.authenticated, false);
|
|
176
|
+
assert.match(status.error ?? '', /expired/i);
|
|
177
|
+
});
|
|
178
|
+
});
|
|
179
|
+
});
|
|
113
180
|
test('checkCredentials: ANTHROPIC_API_KEY takes precedence over CLAUDE_CODE_OAUTH_TOKEN', async () => {
|
|
114
181
|
await withTempHome(async () => {
|
|
115
182
|
await withEnv({ ANTHROPIC_API_KEY: 'test-api-key', CLAUDE_CODE_OAUTH_TOKEN: 'test-oauth-token' }, async () => {
|
|
@@ -119,4 +186,120 @@ test('checkCredentials: ANTHROPIC_API_KEY takes precedence over CLAUDE_CODE_OAUT
|
|
|
119
186
|
});
|
|
120
187
|
});
|
|
121
188
|
});
|
|
189
|
+
// Issue #568: Claude Code silently prefers ANTHROPIC_API_KEY / ANTHROPIC_AUTH_TOKEN
|
|
190
|
+
// over the `claude /login` subscription, billing every request to the key. The
|
|
191
|
+
// status must say so — and only when a usable login is really being bypassed.
|
|
192
|
+
test('checkCredentials: ANTHROPIC_API_KEY in the process env alongside a valid subscription login reports the override', async () => {
|
|
193
|
+
await withTempHome(async (homeDir) => {
|
|
194
|
+
await writeCredentialsFile(homeDir, validSubscriptionCredentials('someone@example.com'));
|
|
195
|
+
await withEnv({ ANTHROPIC_API_KEY: 'test-api-key' }, async () => {
|
|
196
|
+
const status = await checkCredentials(new ClaudeProviderAuth());
|
|
197
|
+
// The existing fields are untouched: the key still wins and keeps its label.
|
|
198
|
+
assert.equal(status.authenticated, true);
|
|
199
|
+
assert.equal(status.method, 'api_key');
|
|
200
|
+
assert.equal(status.email, 'API Key Auth');
|
|
201
|
+
assert.deepEqual(status.subscriptionOverride, {
|
|
202
|
+
variable: 'ANTHROPIC_API_KEY',
|
|
203
|
+
source: 'process_env',
|
|
204
|
+
subscriptionEmail: 'someone@example.com',
|
|
205
|
+
});
|
|
206
|
+
});
|
|
207
|
+
});
|
|
208
|
+
});
|
|
209
|
+
test('checkCredentials: ANTHROPIC_AUTH_TOKEN in the process env alongside a valid subscription login names the auth token', async () => {
|
|
210
|
+
await withTempHome(async (homeDir) => {
|
|
211
|
+
await writeCredentialsFile(homeDir, validSubscriptionCredentials());
|
|
212
|
+
await withEnv({ ANTHROPIC_AUTH_TOKEN: 'test-auth-token', ANTHROPIC_API_KEY: 'test-api-key' }, async () => {
|
|
213
|
+
const status = await checkCredentials(new ClaudeProviderAuth());
|
|
214
|
+
assert.equal(status.method, 'api_key');
|
|
215
|
+
assert.equal(status.email, 'Auth Token');
|
|
216
|
+
assert.deepEqual(status.subscriptionOverride, {
|
|
217
|
+
variable: 'ANTHROPIC_AUTH_TOKEN',
|
|
218
|
+
source: 'process_env',
|
|
219
|
+
subscriptionEmail: null,
|
|
220
|
+
});
|
|
221
|
+
});
|
|
222
|
+
});
|
|
223
|
+
});
|
|
224
|
+
test('checkCredentials: ANTHROPIC_API_KEY in settings.json env alongside a valid subscription login points at settings.json', async () => {
|
|
225
|
+
await withTempHome(async (homeDir) => {
|
|
226
|
+
await writeSettingsFile(homeDir, { ANTHROPIC_API_KEY: 'test-api-key-from-settings' });
|
|
227
|
+
await writeCredentialsFile(homeDir, validSubscriptionCredentials('someone@example.com'));
|
|
228
|
+
await withEnv({}, async () => {
|
|
229
|
+
const status = await checkCredentials(new ClaudeProviderAuth());
|
|
230
|
+
assert.equal(status.method, 'api_key');
|
|
231
|
+
assert.equal(status.email, 'API Key Auth');
|
|
232
|
+
assert.deepEqual(status.subscriptionOverride, {
|
|
233
|
+
variable: 'ANTHROPIC_API_KEY',
|
|
234
|
+
source: 'settings_file',
|
|
235
|
+
subscriptionEmail: 'someone@example.com',
|
|
236
|
+
});
|
|
237
|
+
});
|
|
238
|
+
});
|
|
239
|
+
});
|
|
240
|
+
test('checkCredentials: ANTHROPIC_API_KEY with no credentials file reports no override', async () => {
|
|
241
|
+
await withTempHome(async () => {
|
|
242
|
+
await withEnv({ ANTHROPIC_API_KEY: 'test-api-key' }, async () => {
|
|
243
|
+
const status = await checkCredentials(new ClaudeProviderAuth());
|
|
244
|
+
assert.equal(status.authenticated, true);
|
|
245
|
+
assert.equal(status.method, 'api_key');
|
|
246
|
+
assert.equal(status.subscriptionOverride, undefined);
|
|
247
|
+
});
|
|
248
|
+
});
|
|
249
|
+
});
|
|
250
|
+
test('checkCredentials: ANTHROPIC_API_KEY with an expired subscription login reports no override', async () => {
|
|
251
|
+
await withTempHome(async (homeDir) => {
|
|
252
|
+
// Nothing usable is being bypassed here, so warning would only confuse.
|
|
253
|
+
await writeCredentialsFile(homeDir, {
|
|
254
|
+
claudeAiOauth: {
|
|
255
|
+
accessToken: 'stale-token',
|
|
256
|
+
refreshToken: 'stale-refresh-token',
|
|
257
|
+
expiresAt: 1_000_000_000_000,
|
|
258
|
+
refreshTokenExpiresAt: 1_000_000_000_000,
|
|
259
|
+
},
|
|
260
|
+
});
|
|
261
|
+
await withEnv({ ANTHROPIC_API_KEY: 'test-api-key' }, async () => {
|
|
262
|
+
const status = await checkCredentials(new ClaudeProviderAuth());
|
|
263
|
+
assert.equal(status.authenticated, true);
|
|
264
|
+
assert.equal(status.method, 'api_key');
|
|
265
|
+
assert.equal(status.subscriptionOverride, undefined);
|
|
266
|
+
});
|
|
267
|
+
});
|
|
268
|
+
});
|
|
269
|
+
test('checkCredentials: a valid subscription login with no API key reports credentials_file and no override', async () => {
|
|
270
|
+
await withTempHome(async (homeDir) => {
|
|
271
|
+
await writeCredentialsFile(homeDir, validSubscriptionCredentials('someone@example.com'));
|
|
272
|
+
await withEnv({}, async () => {
|
|
273
|
+
const status = await checkCredentials(new ClaudeProviderAuth());
|
|
274
|
+
assert.equal(status.authenticated, true);
|
|
275
|
+
assert.equal(status.method, 'credentials_file');
|
|
276
|
+
assert.equal(status.email, 'someone@example.com');
|
|
277
|
+
assert.equal(status.subscriptionOverride, undefined);
|
|
278
|
+
});
|
|
279
|
+
});
|
|
280
|
+
});
|
|
281
|
+
test('getStatus: passes the subscription override through to the wire shape, and omits the key when there is none', async () => {
|
|
282
|
+
await withTempHome(async (homeDir) => {
|
|
283
|
+
await writeCredentialsFile(homeDir, validSubscriptionCredentials('someone@example.com'));
|
|
284
|
+
await withEnv({ ANTHROPIC_API_KEY: 'test-api-key' }, async () => {
|
|
285
|
+
const status = await getStatusWithCliInstalled(new ClaudeProviderAuth());
|
|
286
|
+
assert.equal(status.installed, true);
|
|
287
|
+
assert.equal(status.provider, 'claude');
|
|
288
|
+
assert.equal(status.authenticated, true);
|
|
289
|
+
assert.equal(status.method, 'api_key');
|
|
290
|
+
assert.equal(status.email, 'API Key Auth');
|
|
291
|
+
assert.deepEqual(status.subscriptionOverride, {
|
|
292
|
+
variable: 'ANTHROPIC_API_KEY',
|
|
293
|
+
source: 'process_env',
|
|
294
|
+
subscriptionEmail: 'someone@example.com',
|
|
295
|
+
});
|
|
296
|
+
});
|
|
297
|
+
await withEnv({}, async () => {
|
|
298
|
+
const status = await getStatusWithCliInstalled(new ClaudeProviderAuth());
|
|
299
|
+
assert.equal(status.method, 'credentials_file');
|
|
300
|
+
// Omitted, not null: existing JSON consumers see exactly the old payload.
|
|
301
|
+
assert.equal('subscriptionOverride' in status, false);
|
|
302
|
+
});
|
|
303
|
+
});
|
|
304
|
+
});
|
|
122
305
|
//# sourceMappingURL=claude-auth.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-auth.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/claude-auth.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"claude-auth.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/claude-auth.test.ts"],"names":[],"mappings":"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"}
|