@cloudcli-ai/cloudcli 1.37.1 → 1.37.3
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/assets/abnfDiagram-N423BO3Z-CJntskwA.js +1 -0
- package/dist/assets/arc-CIfH4uMN.js +1 -0
- package/dist/assets/architectureDiagram-T3A2C74G-_IpEkukg.js +36 -0
- package/dist/assets/blockDiagram-VBNYF7ZC-BttxrpgZ.js +132 -0
- package/dist/assets/c4Diagram-5PPSVZJV-g51dSRr1.js +10 -0
- package/dist/assets/channel-C5xU9jMw.js +1 -0
- package/dist/assets/chunk-2GRJ4B5K-D_-LbQUa.js +1 -0
- package/dist/assets/chunk-2Q5K7J3B-BtlHzwaO.js +1 -0
- package/dist/assets/chunk-5RXB4S5H-UzkpvpAT.js +231 -0
- package/dist/assets/chunk-5VM5RSS4-BKwx5Gag.js +15 -0
- package/dist/assets/chunk-6Q2QTUOP-D_KEBH5f.js +88 -0
- package/dist/assets/chunk-GF5L2VYU-rK2DGyto.js +206 -0
- package/dist/assets/chunk-JWPE2WC7-CeBl_N9i.js +1 -0
- package/dist/assets/chunk-KBJHAD2P-BiQLWVIr.js +1 -0
- package/dist/assets/chunk-RYQCIY6F-C1knVGV5.js +1 -0
- package/dist/assets/chunk-XXDRQBXY-CtKbJkvF.js +1 -0
- package/dist/assets/classDiagram-JCYQIIEL-CRrL3vp7.js +1 -0
- package/dist/assets/classDiagram-v2-OCEON4UE-CRrL3vp7.js +1 -0
- package/dist/assets/cose-bilkent-JH36ORCC-DjX8y40Z.js +1 -0
- package/dist/assets/cynefin-VYW2F7L2-DM6YeRba.js +178 -0
- package/dist/assets/cynefinDiagram-MW4NZA55-wZJ-vy5B.js +62 -0
- package/dist/assets/cytoscape.esm-C10L9Icf.js +331 -0
- package/dist/assets/dagre-VZM6K2ZE-BzP0ejkH.js +4 -0
- package/dist/assets/defaultLocale-DX6XiGOO.js +1 -0
- package/dist/assets/diagram-7IWD3JNH-BTL_j23J.js +30 -0
- package/dist/assets/diagram-B4RE2ZJO-Cf1Norgu.js +3 -0
- package/dist/assets/diagram-LBJQPF4R-DPiUEKr-.js +24 -0
- package/dist/assets/diagram-Q27KOJAE-CTcTpiz5.js +24 -0
- package/dist/assets/diagram-UB23O5K3-DPMSdYm0.js +41 -0
- package/dist/assets/ebnfDiagram-BXEA7PRR-7yvD6uiF.js +1 -0
- package/dist/assets/erDiagram-JOGREHBK-CfgeDoV6.js +85 -0
- package/dist/assets/flowDiagram-UKHOOZJN-B27ng5zu.js +156 -0
- package/dist/assets/ganttDiagram-PKOTCBZU-CcC6b_7t.js +292 -0
- package/dist/assets/gitGraphDiagram-DS77QQ5N-BX5kPGrO.js +106 -0
- package/dist/assets/graph-Cx-EqisW.js +1 -0
- package/dist/assets/index-BTDHQ6Id.css +32 -0
- package/dist/assets/index-sFfz8iBR.js +4931 -0
- package/dist/assets/infoDiagram-6WML65LV-CUP-SlN4.js +2 -0
- package/dist/assets/init-Gi6I4Gst.js +1 -0
- package/dist/assets/ishikawaDiagram-WSZJBQD7-BTTDhOpX.js +70 -0
- package/dist/assets/journeyDiagram-NVQOT4AX-ARXcc61m.js +139 -0
- package/dist/assets/kanban-definition-27J2QSJJ-BieMpqMA.js +89 -0
- package/dist/assets/layout-D6BstSzF.js +1 -0
- package/dist/assets/linear-61vxjRnP.js +1 -0
- package/dist/assets/map-CV9uif0g.js +1 -0
- package/dist/assets/mermaid.core-nhnwkfQx.js +312 -0
- package/dist/assets/mindmap-definition-FAOFIHXS-Cm6x5vT1.js +96 -0
- package/dist/assets/ordinal-Cboi1Yqb.js +1 -0
- package/dist/assets/pegDiagram-VL7TDLO6-CcYBq_9H.js +1 -0
- package/dist/assets/pieDiagram-7S7Q4E2Y-CfvIjfzo.js +39 -0
- package/dist/assets/quadrantDiagram-CIZ2JOQS-SgYoWPNb.js +7 -0
- package/dist/assets/railroadDiagram-AXF67PYL-D2Mu5E_f.js +1 -0
- package/dist/assets/requirementDiagram-LRYGKXZP-Azwe_k4Q.js +84 -0
- package/dist/assets/sankeyDiagram-W5VNT64P-DN1Ju3PA.js +40 -0
- package/dist/assets/sequenceDiagram-SI44F4Z6-Bj4qC34S.js +162 -0
- package/dist/assets/server.browser-CtX3Hdl5.js +27 -0
- package/dist/assets/sizeCapture-X5ZJPWSS-Co4PdklG.js +1 -0
- package/dist/assets/stateDiagram-OKZ733FA-nOvL9dRC.js +1 -0
- package/dist/assets/stateDiagram-v2-UEYNNEHI-DNv8ppw7.js +1 -0
- package/dist/assets/swimlanes-SLNWSIFB-CCK3wMid.js +2 -0
- package/dist/assets/swimlanesDiagram-ULZ7WXOC-DnfbNQEp.js +8 -0
- package/dist/assets/timeline-definition-Z64GVDOM-BC29RNFm.js +120 -0
- package/dist/assets/{vendor-codemirror-OwyKSvPE.js → vendor-codemirror-CYrSt7-U.js} +18 -18
- package/dist/assets/vennDiagram-T6HMQDX7-pZlZCtEo.js +34 -0
- package/dist/assets/wardleyDiagram-T6FBY63Y-De8k2-zM.js +78 -0
- package/dist/assets/xychartDiagram-ELKLHX3M-Bk8ykH0w.js +7 -0
- package/dist/index.html +3 -3
- package/dist-server/server/index.js +8 -5
- package/dist-server/server/index.js.map +1 -1
- package/dist-server/server/modules/agent/agent.module.js +2 -1
- package/dist-server/server/modules/agent/agent.module.js.map +1 -1
- package/dist-server/server/modules/agent/agent.routes.js +2 -2
- package/dist-server/server/modules/agent/agent.routes.js.map +1 -1
- package/dist-server/server/modules/agent/tests/agent.routes.test.js +30 -1
- package/dist-server/server/modules/agent/tests/agent.routes.test.js.map +1 -1
- package/dist-server/server/modules/auth/auth.middleware.js +1 -1
- package/dist-server/server/modules/auth/auth.middleware.js.map +1 -1
- package/dist-server/server/modules/browser-use/browser-use-runtime.js +10 -0
- package/dist-server/server/modules/browser-use/browser-use-runtime.js.map +1 -0
- 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/browser-use/browser-use.service.js +3 -6
- package/dist-server/server/modules/browser-use/browser-use.service.js.map +1 -1
- package/dist-server/server/modules/browser-use/index.js +2 -0
- package/dist-server/server/modules/browser-use/index.js.map +1 -1
- package/dist-server/server/modules/cli/cli.js +9 -3
- package/dist-server/server/modules/cli/cli.js.map +1 -1
- package/dist-server/server/modules/cli/cli.module.js +0 -1
- package/dist-server/server/modules/cli/cli.module.js.map +1 -1
- package/dist-server/server/modules/cli/cli.service.js +0 -18
- package/dist-server/server/modules/cli/cli.service.js.map +1 -1
- package/dist-server/server/modules/cli/tests/cli-environment-bootstrap.test.js +154 -0
- package/dist-server/server/modules/cli/tests/cli-environment-bootstrap.test.js.map +1 -0
- package/dist-server/server/modules/cli/tests/cli.service.test.js +0 -3
- package/dist-server/server/modules/cli/tests/cli.service.test.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 +32 -1
- package/dist-server/server/modules/database/migrations.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 +137 -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 +92 -0
- package/dist-server/server/modules/database/schema.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.service.js +18 -10
- 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 +62 -11
- package/dist-server/server/modules/file-tree/tests/file-tree.service.test.js.map +1 -1
- package/dist-server/server/modules/git/git-branch.service.js +15 -0
- package/dist-server/server/modules/git/git-branch.service.js.map +1 -0
- package/dist-server/server/modules/git/git.routes.js +15 -7
- package/dist-server/server/modules/git/git.routes.js.map +1 -1
- package/dist-server/server/modules/git/tests/git-branch.service.test.js +52 -0
- package/dist-server/server/modules/git/tests/git-branch.service.test.js.map +1 -0
- package/dist-server/server/modules/git/tests/git-init.routes.test.js +84 -0
- package/dist-server/server/modules/git/tests/git-init.routes.test.js.map +1 -1
- package/dist-server/server/modules/notifications/index.js +3 -1
- package/dist-server/server/modules/notifications/index.js.map +1 -1
- package/dist-server/server/modules/notifications/services/notification-orchestrator.service.js +22 -1
- package/dist-server/server/modules/notifications/services/notification-orchestrator.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/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 +20 -1
- 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 +35 -6
- 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 +422 -86
- package/dist-server/server/modules/providers/list/claude/claude-runtime.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude-sessions.provider.js +388 -50
- 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 +16 -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 +60 -49
- 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 +1565 -432
- 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-runtime.provider.js +8 -6
- 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 +258 -6
- package/dist-server/server/modules/providers/list/opencode/opencode-models.provider.js.map +1 -1
- package/dist-server/server/modules/providers/provider.routes.js +29 -0
- package/dist-server/server/modules/providers/provider.routes.js.map +1 -1
- package/dist-server/server/modules/providers/services/provider-capabilities.service.js +14 -0
- package/dist-server/server/modules/providers/services/provider-capabilities.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 +63 -7
- 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 +87 -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 +179 -9
- package/dist-server/server/modules/providers/services/sessions.service.js.map +1 -1
- package/dist-server/server/modules/providers/tests/claude-auth.test.js +52 -0
- package/dist-server/server/modules/providers/tests/claude-auth.test.js.map +1 -1
- 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-sessions.test.js +465 -39
- package/dist-server/server/modules/providers/tests/claude-sessions.test.js.map +1 -1
- 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-runtime.test.js +51 -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 +304 -15
- package/dist-server/server/modules/providers/tests/codex-sessions.test.js.map +1 -1
- package/dist-server/server/modules/providers/tests/opencode-models.test.js +117 -4
- package/dist-server/server/modules/providers/tests/opencode-models.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 +35 -0
- 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 +120 -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 +45 -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 +163 -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 +255 -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 +10 -44
- 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 +166 -9
- 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 +9 -3
- package/dist-server/server/modules/websocket/services/shell-websocket.service.js.map +1 -1
- 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/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 +80 -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/utils.js +42 -0
- package/dist-server/server/shared/utils.js.map +1 -1
- package/package.json +23 -16
- package/scripts/promote-dist-server.mjs +50 -0
- package/server/index.ts +12 -6
- package/server/modules/agent/agent.module.ts +2 -1
- package/server/modules/agent/agent.routes.ts +2 -2
- package/server/modules/agent/tests/agent.routes.test.ts +33 -1
- package/server/modules/auth/auth.middleware.ts +2 -2
- package/server/modules/browser-use/browser-use-runtime.ts +10 -0
- package/server/modules/browser-use/browser-use.routes.ts +96 -33
- package/server/modules/browser-use/browser-use.service.ts +5 -8
- package/server/modules/browser-use/index.ts +3 -0
- package/server/modules/cli/cli.module.ts +0 -1
- package/server/modules/cli/cli.service.ts +0 -20
- package/server/modules/cli/cli.ts +9 -3
- package/server/modules/cli/tests/cli-environment-bootstrap.test.ts +186 -0
- package/server/modules/cli/tests/cli.service.test.ts +0 -3
- package/server/modules/database/connection.ts +2 -1
- package/server/modules/database/index.ts +10 -0
- package/server/modules/database/migrations.ts +37 -0
- 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 +196 -3
- package/server/modules/database/repositories/user-preferences.db.ts +80 -0
- package/server/modules/database/schema.ts +96 -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.service.ts +21 -10
- package/server/modules/file-tree/tests/file-tree.service.test.ts +65 -11
- package/server/modules/git/git-branch.service.ts +43 -0
- package/server/modules/git/git.routes.ts +16 -9
- package/server/modules/git/tests/git-branch.service.test.ts +60 -0
- package/server/modules/git/tests/git-init.routes.test.ts +83 -0
- package/server/modules/notifications/index.ts +2 -0
- package/server/modules/notifications/services/notification-orchestrator.service.js +24 -1
- 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/providers/index.ts +4 -0
- package/server/modules/providers/list/claude/claude-auth.provider.ts +21 -1
- package/server/modules/providers/list/claude/claude-fork.provider.ts +57 -0
- package/server/modules/providers/list/claude/claude-models.provider.ts +38 -6
- package/server/modules/providers/list/claude/claude-runtime.provider.js +463 -93
- package/server/modules/providers/list/claude/claude-sessions.provider.ts +478 -54
- 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 +16 -0
- package/server/modules/providers/list/codex/{codex-runtime.provider.js → codex-runtime.provider.ts} +93 -66
- package/server/modules/providers/list/codex/codex-session-synchronizer.provider.ts +9 -0
- package/server/modules/providers/list/codex/codex-sessions.provider.ts +1806 -477
- package/server/modules/providers/list/codex/codex.provider.ts +3 -0
- package/server/modules/providers/list/cursor/cursor-runtime.provider.js +8 -6
- package/server/modules/providers/list/cursor/cursor-session-synchronizer.provider.ts +0 -1
- package/server/modules/providers/list/opencode/opencode-models.provider.ts +279 -6
- package/server/modules/providers/provider.routes.ts +36 -0
- package/server/modules/providers/services/provider-capabilities.service.ts +23 -0
- package/server/modules/providers/services/provider-token-usage.service.ts +166 -39
- package/server/modules/providers/services/session-conversations-search.service.ts +94 -7
- package/server/modules/providers/services/session-history-cache.service.ts +139 -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 +201 -9
- package/server/modules/providers/tests/claude-auth.test.ts +58 -0
- package/server/modules/providers/tests/claude-models.test.ts +87 -0
- package/server/modules/providers/tests/claude-sessions.test.ts +552 -40
- 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-runtime.test.ts +58 -0
- package/server/modules/providers/tests/codex-session-fork.test.ts +59 -0
- package/server/modules/providers/tests/codex-sessions.test.ts +337 -15
- package/server/modules/providers/tests/opencode-models.test.ts +166 -8
- package/server/modules/providers/tests/provider-token-usage.service.test.ts +188 -1
- package/server/modules/providers/tests/provider.routes.test.ts +61 -0
- package/server/modules/providers/tests/session-fork.test.ts +173 -0
- package/server/modules/providers/tests/session-history-cache.service.test.ts +143 -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 +67 -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 +203 -0
- package/server/modules/scheduled-messages/services/scheduled-messages.service.ts +121 -0
- package/server/modules/scheduled-messages/tests/scheduled-messages.test.ts +310 -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/index.ts +8 -0
- package/server/modules/websocket/services/chat-run-registry.service.ts +17 -50
- package/server/modules/websocket/services/chat-session-writer.service.ts +36 -6
- package/server/modules/websocket/services/chat-websocket.service.ts +244 -15
- package/server/modules/websocket/services/session-upsert-broadcast.service.ts +108 -0
- package/server/modules/websocket/services/shell-websocket.service.ts +10 -3
- 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/session-upsert-broadcast.test.ts +138 -0
- package/server/modules/websocket/tests/shell-websocket.service.test.ts +108 -0
- package/server/shared/claude-cli-path.ts +24 -6
- package/server/shared/index.ts +3 -0
- package/server/shared/interfaces.ts +62 -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/types.ts +123 -3
- package/server/shared/utils.ts +50 -0
- package/server/tsconfig.json +6 -2
- package/README.de.md +0 -257
- package/README.ja.md +0 -249
- package/README.ko.md +0 -249
- package/README.ru.md +0 -257
- package/README.tr.md +0 -258
- package/README.zh-CN.md +0 -249
- package/README.zh-TW.md +0 -249
- package/dist/assets/index-D3jfzuKN.css +0 -32
- package/dist/assets/index-DTMWjJj8.js +0 -1550
- package/dist-server/server/constants/config.js +0 -6
- package/dist-server/server/constants/config.js.map +0 -1
- package/server/constants/config.ts +0 -5
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import test from 'node:test';
|
|
3
|
+
import { extractCumulativeTokenBudget, extractTokenBudget, } from '../../../modules/providers/list/claude/claude-runtime.provider.js';
|
|
4
|
+
test('assistant usage produces a cumulative budget', () => {
|
|
5
|
+
const budget = extractTokenBudget({
|
|
6
|
+
type: 'assistant',
|
|
7
|
+
message: {
|
|
8
|
+
usage: {
|
|
9
|
+
input_tokens: 12,
|
|
10
|
+
cache_read_input_tokens: 40_000,
|
|
11
|
+
cache_creation_input_tokens: 2_000,
|
|
12
|
+
output_tokens: 500,
|
|
13
|
+
},
|
|
14
|
+
},
|
|
15
|
+
});
|
|
16
|
+
assert.ok(budget);
|
|
17
|
+
assert.equal(budget.inputTokens, 42_012);
|
|
18
|
+
assert.equal(budget.outputTokens, 500);
|
|
19
|
+
assert.equal(budget.used, 42_512);
|
|
20
|
+
});
|
|
21
|
+
test('system task events with tool-usage shaped usage emit no budget', () => {
|
|
22
|
+
// task_progress/task_notification carry usage {total_tokens, tool_uses,
|
|
23
|
+
// duration_ms}; reading Anthropic keys off it produced a used: 0 budget
|
|
24
|
+
// that flashed "0" in the composer mid-generation.
|
|
25
|
+
const budget = extractTokenBudget({
|
|
26
|
+
type: 'system',
|
|
27
|
+
subtype: 'task_progress',
|
|
28
|
+
task_id: 't-1',
|
|
29
|
+
usage: { total_tokens: 5_000, tool_uses: 3, duration_ms: 1_200 },
|
|
30
|
+
});
|
|
31
|
+
assert.equal(budget, null);
|
|
32
|
+
});
|
|
33
|
+
test('subagent messages emit no budget for the parent session', () => {
|
|
34
|
+
// A subagent's usage is its own context window; surfacing it made the
|
|
35
|
+
// session counter drop to the subagent's number and bounce back.
|
|
36
|
+
const budget = extractTokenBudget({
|
|
37
|
+
type: 'assistant',
|
|
38
|
+
parent_tool_use_id: 'toolu_123',
|
|
39
|
+
message: { usage: { input_tokens: 900, output_tokens: 10 } },
|
|
40
|
+
});
|
|
41
|
+
assert.equal(budget, null);
|
|
42
|
+
});
|
|
43
|
+
test('a turn-ending result emits no budget', () => {
|
|
44
|
+
// `result.usage` is the turn's bill: every request it made, summed, each
|
|
45
|
+
// subagent's included. A four-request turn therefore reports roughly four
|
|
46
|
+
// times the context the conversation holds, so publishing it made the
|
|
47
|
+
// counter leap when the turn ended and fall back on the next turn's first
|
|
48
|
+
// assistant message.
|
|
49
|
+
const budget = extractTokenBudget({
|
|
50
|
+
type: 'result',
|
|
51
|
+
usage: {
|
|
52
|
+
input_tokens: 18,
|
|
53
|
+
cache_creation_input_tokens: 8_138,
|
|
54
|
+
cache_read_input_tokens: 40_460,
|
|
55
|
+
output_tokens: 166,
|
|
56
|
+
},
|
|
57
|
+
modelUsage: {
|
|
58
|
+
'claude-sonnet-5': { inputTokens: 929, outputTokens: 177 },
|
|
59
|
+
},
|
|
60
|
+
});
|
|
61
|
+
assert.equal(budget, null);
|
|
62
|
+
});
|
|
63
|
+
test('the cumulative reader stays available for SDK builds with no assistant usage', () => {
|
|
64
|
+
const fromUsage = extractCumulativeTokenBudget({
|
|
65
|
+
type: 'result',
|
|
66
|
+
usage: { input_tokens: 18, cache_read_input_tokens: 40_460, output_tokens: 166 },
|
|
67
|
+
});
|
|
68
|
+
assert.ok(fromUsage);
|
|
69
|
+
assert.equal(fromUsage.used, 40_644);
|
|
70
|
+
const fromModelUsage = extractCumulativeTokenBudget({
|
|
71
|
+
type: 'result',
|
|
72
|
+
modelUsage: {
|
|
73
|
+
'claude-sonnet-5': { cumulativeInputTokens: 1_000, cumulativeOutputTokens: 200 },
|
|
74
|
+
},
|
|
75
|
+
});
|
|
76
|
+
assert.ok(fromModelUsage);
|
|
77
|
+
assert.equal(fromModelUsage.used, 1_200);
|
|
78
|
+
});
|
|
79
|
+
test('the cumulative reader ignores anything that is not a result', () => {
|
|
80
|
+
assert.equal(extractCumulativeTokenBudget({
|
|
81
|
+
type: 'assistant',
|
|
82
|
+
message: { usage: { input_tokens: 10, output_tokens: 2 } },
|
|
83
|
+
}), null);
|
|
84
|
+
});
|
|
85
|
+
//# sourceMappingURL=claude-token-budget.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"claude-token-budget.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/claude-token-budget.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,338 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import { existsSync } from 'node:fs';
|
|
3
|
+
import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
|
|
4
|
+
import { createRequire } from 'node:module';
|
|
5
|
+
import os from 'node:os';
|
|
6
|
+
import path from 'node:path';
|
|
7
|
+
import test from 'node:test';
|
|
8
|
+
import { closeConnection, initializeDatabase, sessionsDb } from '../../../modules/database/index.js';
|
|
9
|
+
import { codexAppServer } from '../../../modules/providers/list/codex/codex-app-server.client.js';
|
|
10
|
+
import { CodexSessionSynchronizer } from '../../../modules/providers/list/codex/codex-session-synchronizer.provider.js';
|
|
11
|
+
import { CodexSessionsProvider } from '../../../modules/providers/list/codex/codex-sessions.provider.js';
|
|
12
|
+
/**
|
|
13
|
+
* Codex rows carry no id of their own, so an edit addresses the enclosing
|
|
14
|
+
* *turn*. These cover the two halves of that: that the reader can name the
|
|
15
|
+
* turn a prompt belongs to, and that a turn the thread has retired is never
|
|
16
|
+
* offered as one.
|
|
17
|
+
*/
|
|
18
|
+
const patchHomeDir = (nextHomeDir) => {
|
|
19
|
+
const original = os.homedir;
|
|
20
|
+
os.homedir = () => nextHomeDir;
|
|
21
|
+
return () => {
|
|
22
|
+
os.homedir = original;
|
|
23
|
+
};
|
|
24
|
+
};
|
|
25
|
+
async function withIsolatedDatabase(runTest) {
|
|
26
|
+
const previousDatabasePath = process.env.DATABASE_PATH;
|
|
27
|
+
const tempDirectory = await mkdtemp(path.join(os.tmpdir(), 'codex-edit-db-'));
|
|
28
|
+
closeConnection();
|
|
29
|
+
process.env.DATABASE_PATH = path.join(tempDirectory, 'auth.db');
|
|
30
|
+
await initializeDatabase();
|
|
31
|
+
try {
|
|
32
|
+
await runTest();
|
|
33
|
+
}
|
|
34
|
+
finally {
|
|
35
|
+
closeConnection();
|
|
36
|
+
if (previousDatabasePath === undefined) {
|
|
37
|
+
delete process.env.DATABASE_PATH;
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
process.env.DATABASE_PATH = previousDatabasePath;
|
|
41
|
+
}
|
|
42
|
+
await rm(tempDirectory, { recursive: true, force: true });
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
/** One completed turn: the bracket rows that name it, plus its prompt(s). */
|
|
46
|
+
function turn(turnId, prompts) {
|
|
47
|
+
return [
|
|
48
|
+
{ type: 'event_msg', payload: { type: 'task_started', turn_id: turnId } },
|
|
49
|
+
{ type: 'turn_context', payload: { turn_id: turnId, cwd: '/tmp' } },
|
|
50
|
+
...prompts.map((message) => ({ type: 'event_msg', payload: { type: 'user_message', message } })),
|
|
51
|
+
{ type: 'event_msg', payload: { type: 'agent_message', message: `answer to ${prompts[0]}` } },
|
|
52
|
+
{ type: 'event_msg', payload: { type: 'task_complete', turn_id: turnId } },
|
|
53
|
+
];
|
|
54
|
+
}
|
|
55
|
+
async function writeRollout(homeDir, threadId, workspacePath, rows) {
|
|
56
|
+
const sessionsDir = path.join(homeDir, '.codex', 'sessions', '2026', '07', '07');
|
|
57
|
+
await mkdir(sessionsDir, { recursive: true });
|
|
58
|
+
const lines = [
|
|
59
|
+
JSON.stringify({ type: 'session_meta', payload: { id: threadId, cwd: workspacePath } }),
|
|
60
|
+
...rows.map((row) => JSON.stringify(row)),
|
|
61
|
+
];
|
|
62
|
+
const filePath = path.join(sessionsDir, `rollout-${threadId}.jsonl`);
|
|
63
|
+
await writeFile(filePath, `${lines.join('\n')}\n`, 'utf8');
|
|
64
|
+
return filePath;
|
|
65
|
+
}
|
|
66
|
+
/** Stands up an indexed Codex session from a set of transcript rows. */
|
|
67
|
+
async function withIndexedSession(rows, runTest) {
|
|
68
|
+
const tempRoot = await mkdtemp(path.join(os.tmpdir(), 'codex-edit-'));
|
|
69
|
+
const workspacePath = path.join(tempRoot, 'workspace');
|
|
70
|
+
await mkdir(workspacePath, { recursive: true });
|
|
71
|
+
const restoreHomeDir = patchHomeDir(tempRoot);
|
|
72
|
+
try {
|
|
73
|
+
await writeRollout(tempRoot, 'thread-1', workspacePath, rows);
|
|
74
|
+
await withIsolatedDatabase(async () => {
|
|
75
|
+
await new CodexSessionSynchronizer().synchronize();
|
|
76
|
+
await runTest({ sessionId: 'thread-1', workspacePath, homeDir: tempRoot });
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
finally {
|
|
80
|
+
restoreHomeDir();
|
|
81
|
+
await rm(tempRoot, { recursive: true, force: true });
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
const THREE_TURNS = [
|
|
85
|
+
...turn('turn-a', ['first prompt']),
|
|
86
|
+
...turn('turn-b', ['second prompt']),
|
|
87
|
+
...turn('turn-c', ['third prompt']),
|
|
88
|
+
];
|
|
89
|
+
test('every Codex prompt is anchored to the turn that contains it', { concurrency: false }, async () => {
|
|
90
|
+
await withIndexedSession(THREE_TURNS, async ({ sessionId }) => {
|
|
91
|
+
const history = await new CodexSessionsProvider().fetchHistory(sessionId);
|
|
92
|
+
const prompts = history.messages.filter((message) => message.role === 'user');
|
|
93
|
+
assert.deepEqual(prompts.map((message) => [message.content, message.transcriptAnchorId]), [
|
|
94
|
+
['first prompt', 'turn-a'],
|
|
95
|
+
['second prompt', 'turn-b'],
|
|
96
|
+
['third prompt', 'turn-c'],
|
|
97
|
+
]);
|
|
98
|
+
// An anchor on an answer would put a pencil on a message that cannot be
|
|
99
|
+
// edited, so only prompts carry one.
|
|
100
|
+
assert.equal(history.messages.some((message) => message.role !== 'user' && message.transcriptAnchorId), false);
|
|
101
|
+
});
|
|
102
|
+
});
|
|
103
|
+
test('only the first prompt of a turn is anchored', { concurrency: false }, async () => {
|
|
104
|
+
// A follow-up typed while a turn is running is recorded inside that same
|
|
105
|
+
// turn. The cut is per turn, so anchoring the follow-up would silently take
|
|
106
|
+
// the prompt before it as well.
|
|
107
|
+
await withIndexedSession(turn('turn-a', ['first prompt', 'queued follow-up']), async ({ sessionId }) => {
|
|
108
|
+
const history = await new CodexSessionsProvider().fetchHistory(sessionId);
|
|
109
|
+
const prompts = history.messages.filter((message) => message.role === 'user');
|
|
110
|
+
assert.deepEqual(prompts.map((message) => [message.content, message.transcriptAnchorId]), [
|
|
111
|
+
['first prompt', 'turn-a'],
|
|
112
|
+
['queued follow-up', undefined],
|
|
113
|
+
]);
|
|
114
|
+
});
|
|
115
|
+
});
|
|
116
|
+
test('a turn the thread rolled back keeps its rows but loses its anchor', { concurrency: false }, async () => {
|
|
117
|
+
const rows = [
|
|
118
|
+
...turn('turn-a', ['first prompt']),
|
|
119
|
+
...turn('turn-b', ['abandoned prompt']),
|
|
120
|
+
{ type: 'event_msg', payload: { type: 'thread_rolled_back', num_turns: 1 } },
|
|
121
|
+
...turn('turn-c', ['replacement prompt']),
|
|
122
|
+
];
|
|
123
|
+
await withIndexedSession(rows, async ({ sessionId }) => {
|
|
124
|
+
const provider = new CodexSessionsProvider();
|
|
125
|
+
const history = await provider.fetchHistory(sessionId);
|
|
126
|
+
const prompts = history.messages.filter((message) => message.role === 'user');
|
|
127
|
+
assert.deepEqual(prompts.map((message) => [message.content, message.transcriptAnchorId]), [
|
|
128
|
+
['first prompt', 'turn-a'],
|
|
129
|
+
// Still rendered — it is what the conversation looked like — but the
|
|
130
|
+
// turn is gone from the thread and the fork endpoint would reject it.
|
|
131
|
+
['abandoned prompt', undefined],
|
|
132
|
+
['replacement prompt', 'turn-c'],
|
|
133
|
+
]);
|
|
134
|
+
assert.deepEqual(await provider.resolveEditAnchor(sessionId, 'turn-b'), { found: false, resumeThroughId: null });
|
|
135
|
+
// turn-b is out of the sequence, so turn-c resumes through turn-a.
|
|
136
|
+
assert.deepEqual(await provider.resolveEditAnchor(sessionId, 'turn-c'), { found: true, resumeThroughId: 'turn-a' });
|
|
137
|
+
});
|
|
138
|
+
});
|
|
139
|
+
test('the edit anchor resolves to the turn before the one being replaced', { concurrency: false }, async () => {
|
|
140
|
+
await withIndexedSession(THREE_TURNS, async ({ sessionId }) => {
|
|
141
|
+
const provider = new CodexSessionsProvider();
|
|
142
|
+
assert.deepEqual(await provider.resolveEditAnchor(sessionId, 'turn-c'), { found: true, resumeThroughId: 'turn-b' });
|
|
143
|
+
// Nothing precedes the first prompt, so the conversation starts over.
|
|
144
|
+
assert.deepEqual(await provider.resolveEditAnchor(sessionId, 'turn-a'), { found: true, resumeThroughId: null });
|
|
145
|
+
assert.deepEqual(await provider.resolveEditAnchor(sessionId, 'turn-nope'), { found: false, resumeThroughId: null });
|
|
146
|
+
});
|
|
147
|
+
});
|
|
148
|
+
test('rewinding a Codex session moves it onto the branch and retires the old thread', { concurrency: false }, async () => {
|
|
149
|
+
await withIndexedSession(THREE_TURNS, async ({ sessionId, homeDir, workspacePath }) => {
|
|
150
|
+
const forkPath = path.join(homeDir, '.codex', 'sessions', '2026', '07', '08', 'rollout-thread-2.jsonl');
|
|
151
|
+
await mkdir(path.dirname(forkPath), { recursive: true });
|
|
152
|
+
await writeFile(forkPath, `${JSON.stringify({ type: 'session_meta', payload: { id: 'thread-2', cwd: workspacePath } })}\n`, 'utf8');
|
|
153
|
+
const realForkThread = codexAppServer.forkThread;
|
|
154
|
+
const forkCalls = [];
|
|
155
|
+
codexAppServer.forkThread = async (input) => {
|
|
156
|
+
forkCalls.push(input);
|
|
157
|
+
return { threadId: 'thread-2', path: forkPath };
|
|
158
|
+
};
|
|
159
|
+
try {
|
|
160
|
+
await new CodexSessionsProvider().rewindSession(sessionId, 'turn-b');
|
|
161
|
+
}
|
|
162
|
+
finally {
|
|
163
|
+
codexAppServer.forkThread = realForkThread;
|
|
164
|
+
}
|
|
165
|
+
assert.deepEqual(forkCalls, [{ threadId: 'thread-1', lastTurnId: 'turn-b', cwd: workspacePath }]);
|
|
166
|
+
const session = sessionsDb.getSessionById(sessionId);
|
|
167
|
+
assert.equal(session?.provider_session_id, 'thread-2');
|
|
168
|
+
// Not `COALESCE`d onto the old path: the session reads its transcript from
|
|
169
|
+
// here, and leaving it on the pre-edit file would serve the conversation
|
|
170
|
+
// the user just edited away from, for good.
|
|
171
|
+
assert.equal(session?.jsonl_path, forkPath);
|
|
172
|
+
assert.equal(sessionsDb.isProviderSessionSuperseded('thread-1', 'codex'), true);
|
|
173
|
+
});
|
|
174
|
+
});
|
|
175
|
+
test('editing the first prompt starts the conversation over', { concurrency: false }, async () => {
|
|
176
|
+
await withIndexedSession(THREE_TURNS, async ({ sessionId }) => {
|
|
177
|
+
const realForkThread = codexAppServer.forkThread;
|
|
178
|
+
let forked = false;
|
|
179
|
+
codexAppServer.forkThread = async () => {
|
|
180
|
+
forked = true;
|
|
181
|
+
throw new Error('a fork of no turns should never be attempted');
|
|
182
|
+
};
|
|
183
|
+
try {
|
|
184
|
+
await new CodexSessionsProvider().rewindSession(sessionId, null);
|
|
185
|
+
}
|
|
186
|
+
finally {
|
|
187
|
+
codexAppServer.forkThread = realForkThread;
|
|
188
|
+
}
|
|
189
|
+
assert.equal(forked, false);
|
|
190
|
+
const session = sessionsDb.getSessionById(sessionId);
|
|
191
|
+
assert.equal(session?.provider_session_id, null);
|
|
192
|
+
assert.equal(session?.jsonl_path, null);
|
|
193
|
+
assert.equal(sessionsDb.isProviderSessionSuperseded('thread-1', 'codex'), true);
|
|
194
|
+
});
|
|
195
|
+
});
|
|
196
|
+
test('the indexer does not hand back a thread a session was edited off', { concurrency: false }, async () => {
|
|
197
|
+
await withIndexedSession(THREE_TURNS, async ({ sessionId, homeDir, workspacePath }) => {
|
|
198
|
+
const forkPath = path.join(homeDir, '.codex', 'sessions', '2026', '07', '08', 'rollout-thread-2.jsonl');
|
|
199
|
+
await mkdir(path.dirname(forkPath), { recursive: true });
|
|
200
|
+
await writeFile(forkPath, `${JSON.stringify({ type: 'session_meta', payload: { id: 'thread-2', cwd: workspacePath } })}\n`, 'utf8');
|
|
201
|
+
const realForkThread = codexAppServer.forkThread;
|
|
202
|
+
codexAppServer.forkThread = async () => ({ threadId: 'thread-2', path: forkPath });
|
|
203
|
+
try {
|
|
204
|
+
await new CodexSessionsProvider().rewindSession(sessionId, 'turn-b');
|
|
205
|
+
}
|
|
206
|
+
finally {
|
|
207
|
+
codexAppServer.forkThread = realForkThread;
|
|
208
|
+
}
|
|
209
|
+
// The pre-edit transcript is still on disk on purpose. A full rescan finds
|
|
210
|
+
// it again, and for a session discovered from disk — whose app id is its
|
|
211
|
+
// original thread id — reindexing it would point the row straight back at
|
|
212
|
+
// the conversation the edit replaced.
|
|
213
|
+
await new CodexSessionSynchronizer().synchronize();
|
|
214
|
+
const session = sessionsDb.getSessionById(sessionId);
|
|
215
|
+
assert.equal(session?.provider_session_id, 'thread-2');
|
|
216
|
+
assert.equal(session?.jsonl_path, forkPath);
|
|
217
|
+
});
|
|
218
|
+
});
|
|
219
|
+
test('deleting an edited session removes every transcript it lived in', { concurrency: false }, async () => {
|
|
220
|
+
await withIndexedSession(THREE_TURNS, async ({ sessionId, homeDir, workspacePath }) => {
|
|
221
|
+
const { sessionsService } = await import('../../../modules/providers/services/sessions.service.js');
|
|
222
|
+
const preEditPath = sessionsDb.getSessionById(sessionId)?.jsonl_path;
|
|
223
|
+
const forkPath = path.join(homeDir, '.codex', 'sessions', '2026', '07', '08', 'rollout-thread-2.jsonl');
|
|
224
|
+
await mkdir(path.dirname(forkPath), { recursive: true });
|
|
225
|
+
await writeFile(forkPath, `${JSON.stringify({ type: 'session_meta', payload: { id: 'thread-2', cwd: workspacePath } })}\n`, 'utf8');
|
|
226
|
+
const realForkThread = codexAppServer.forkThread;
|
|
227
|
+
codexAppServer.forkThread = async () => ({ threadId: 'thread-2', path: forkPath });
|
|
228
|
+
try {
|
|
229
|
+
await new CodexSessionsProvider().rewindSession(sessionId, 'turn-b');
|
|
230
|
+
}
|
|
231
|
+
finally {
|
|
232
|
+
codexAppServer.forkThread = realForkThread;
|
|
233
|
+
}
|
|
234
|
+
await sessionsService.deleteOrArchiveSessionById(sessionId, { force: true, deletedFromDisk: true });
|
|
235
|
+
// The row only ever points at the newest transcript, so deleting from that
|
|
236
|
+
// alone would leave the replaced turns on disk — and unreachable, because
|
|
237
|
+
// the indexer refuses a superseded thread.
|
|
238
|
+
assert.equal(existsSync(forkPath), false);
|
|
239
|
+
assert.equal(existsSync(preEditPath), false);
|
|
240
|
+
assert.equal(sessionsDb.isProviderSessionSuperseded('thread-1', 'codex'), false);
|
|
241
|
+
});
|
|
242
|
+
});
|
|
243
|
+
test('a session detached by an edit reports no token usage of its own', { concurrency: false }, async () => {
|
|
244
|
+
const spentTurns = [
|
|
245
|
+
...THREE_TURNS,
|
|
246
|
+
{
|
|
247
|
+
type: 'event_msg',
|
|
248
|
+
payload: {
|
|
249
|
+
type: 'token_count',
|
|
250
|
+
info: {
|
|
251
|
+
total_token_usage: { input_tokens: 100_000, output_tokens: 25_000, total_tokens: 125_000 },
|
|
252
|
+
model_context_window: 200_000,
|
|
253
|
+
},
|
|
254
|
+
},
|
|
255
|
+
},
|
|
256
|
+
];
|
|
257
|
+
await withIndexedSession(spentTurns, async ({ sessionId }) => {
|
|
258
|
+
const { createProviderTokenUsageService } = await import('../../../modules/providers/services/provider-token-usage.service.js');
|
|
259
|
+
const service = createProviderTokenUsageService();
|
|
260
|
+
assert.equal((await service.getSessionTokenUsage(sessionId)).used, 125_000);
|
|
261
|
+
await new CodexSessionsProvider().rewindSession(sessionId, null);
|
|
262
|
+
// A session discovered from disk is keyed by its own thread id, so the
|
|
263
|
+
// "no provider id was ever recorded" fallback resolves the very thread the
|
|
264
|
+
// edit discarded — by filename, which still matches — and an empty
|
|
265
|
+
// conversation reports the spent context of the one it replaced.
|
|
266
|
+
const usage = await service.getSessionTokenUsage(sessionId);
|
|
267
|
+
assert.equal(usage.used, 0);
|
|
268
|
+
assert.equal(usage.inputTokens, 0);
|
|
269
|
+
});
|
|
270
|
+
});
|
|
271
|
+
/**
|
|
272
|
+
* Everything above stubs the app-server. This one runs the real thing, because
|
|
273
|
+
* the whole feature rests on a protocol this repo does not own: that
|
|
274
|
+
* `thread/fork` exists without asking for experimental capabilities, that
|
|
275
|
+
* `lastTurnId` is inclusive, and that the copy is a rollout of its own rather
|
|
276
|
+
* than a pointer at the original.
|
|
277
|
+
*/
|
|
278
|
+
test('codex app-server forks a real thread at a turn', { concurrency: false }, async (t) => {
|
|
279
|
+
const require_ = createRequire(import.meta.url);
|
|
280
|
+
try {
|
|
281
|
+
require_.resolve('@openai/codex/bin/codex.js');
|
|
282
|
+
}
|
|
283
|
+
catch {
|
|
284
|
+
t.skip('the Codex CLI package is not installed');
|
|
285
|
+
return;
|
|
286
|
+
}
|
|
287
|
+
const fixture = path.join(process.cwd(), 'temp-jsonls/codex/ask and todolist', 'rollout-2026-08-22T20-24-44-01a02a80-dfb9-7882-8013-00e41955e656.jsonl');
|
|
288
|
+
const { readFile } = await import('node:fs/promises');
|
|
289
|
+
let transcript;
|
|
290
|
+
try {
|
|
291
|
+
transcript = await readFile(fixture, 'utf8');
|
|
292
|
+
}
|
|
293
|
+
catch {
|
|
294
|
+
t.skip('the committed Codex rollout fixture is not available');
|
|
295
|
+
return;
|
|
296
|
+
}
|
|
297
|
+
const tempRoot = await mkdtemp(path.join(os.tmpdir(), 'codex-appserver-'));
|
|
298
|
+
const previousCodexHome = process.env.CODEX_HOME;
|
|
299
|
+
process.env.CODEX_HOME = tempRoot;
|
|
300
|
+
try {
|
|
301
|
+
const sessionsDir = path.join(tempRoot, 'sessions', '2026', '08', '22');
|
|
302
|
+
await mkdir(sessionsDir, { recursive: true });
|
|
303
|
+
await writeFile(path.join(sessionsDir, path.basename(fixture)), transcript, 'utf8');
|
|
304
|
+
const workspacePath = path.join(tempRoot, 'workspace');
|
|
305
|
+
await mkdir(workspacePath, { recursive: true });
|
|
306
|
+
const fork = await codexAppServer.forkThread({
|
|
307
|
+
threadId: '01a02a80-dfb9-7882-8013-00e41955e656',
|
|
308
|
+
// The fixture's second turn; the third must not survive the cut.
|
|
309
|
+
lastTurnId: '01a02a81-2427-7853-b5e2-6eee36690146',
|
|
310
|
+
cwd: workspacePath,
|
|
311
|
+
});
|
|
312
|
+
assert.notEqual(fork.threadId, '01a02a80-dfb9-7882-8013-00e41955e656');
|
|
313
|
+
const copy = await readFile(fork.path, 'utf8');
|
|
314
|
+
const prompts = copy
|
|
315
|
+
.split('\n')
|
|
316
|
+
.filter(Boolean)
|
|
317
|
+
.map((line) => JSON.parse(line))
|
|
318
|
+
.filter((row) => row.type === 'event_msg' && row.payload?.type === 'user_message')
|
|
319
|
+
.map((row) => String(row.payload?.message ?? '').trim());
|
|
320
|
+
assert.deepEqual(prompts, [
|
|
321
|
+
'ask me a question using ur ask tool...wanted to check somehting',
|
|
322
|
+
'anytning...just wanted to test',
|
|
323
|
+
]);
|
|
324
|
+
// The source is a copy source, not a move source.
|
|
325
|
+
const source = await readFile(path.join(sessionsDir, path.basename(fixture)), 'utf8');
|
|
326
|
+
assert.equal(source, transcript);
|
|
327
|
+
}
|
|
328
|
+
finally {
|
|
329
|
+
if (previousCodexHome === undefined) {
|
|
330
|
+
delete process.env.CODEX_HOME;
|
|
331
|
+
}
|
|
332
|
+
else {
|
|
333
|
+
process.env.CODEX_HOME = previousCodexHome;
|
|
334
|
+
}
|
|
335
|
+
await rm(tempRoot, { recursive: true, force: true });
|
|
336
|
+
}
|
|
337
|
+
});
|
|
338
|
+
//# sourceMappingURL=codex-message-editing.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-message-editing.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/codex-message-editing.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import test from 'node:test';
|
|
3
|
+
import { Codex } from '@openai/codex-sdk';
|
|
4
|
+
import { codexRuntime } from '../../../modules/providers/list/codex/codex-runtime.provider.js';
|
|
5
|
+
for (const resumed of [false, true]) {
|
|
6
|
+
for (const permissionMode of [undefined, 'default', 'unknown', 'acceptEdits', 'bypassPermissions']) {
|
|
7
|
+
test(`Codex ${resumed ? 'resumes' : 'starts'} with supported permissions (${permissionMode ?? 'omitted'})`, async (t) => {
|
|
8
|
+
let capturedOptions;
|
|
9
|
+
let capturedPrompt;
|
|
10
|
+
const messages = [];
|
|
11
|
+
const thread = {
|
|
12
|
+
id: 'native-thread',
|
|
13
|
+
async runStreamed(prompt) {
|
|
14
|
+
capturedPrompt = prompt;
|
|
15
|
+
return { events: (async function* () {
|
|
16
|
+
yield { type: 'thread.started', thread_id: 'native-thread' };
|
|
17
|
+
})() };
|
|
18
|
+
},
|
|
19
|
+
};
|
|
20
|
+
const start = t.mock.method(Codex.prototype, 'startThread', (options) => {
|
|
21
|
+
capturedOptions = options;
|
|
22
|
+
return thread;
|
|
23
|
+
});
|
|
24
|
+
const resume = t.mock.method(Codex.prototype, 'resumeThread', (id, options) => {
|
|
25
|
+
assert.equal(id, 'native-thread');
|
|
26
|
+
capturedOptions = options;
|
|
27
|
+
return thread;
|
|
28
|
+
});
|
|
29
|
+
const context = {
|
|
30
|
+
resolveProviderSessionId: () => resumed ? 'native-thread' : null,
|
|
31
|
+
resolveResumeModel: async () => 'test-model',
|
|
32
|
+
getProviderModels: async () => ({ OPTIONS: [], DEFAULT: 'test-model' }),
|
|
33
|
+
normalizeMessage: () => [],
|
|
34
|
+
isProviderInstalled: async () => true,
|
|
35
|
+
};
|
|
36
|
+
await codexRuntime.run('hey there', {
|
|
37
|
+
sessionId: resumed ? 'app-session' : undefined,
|
|
38
|
+
permissionMode,
|
|
39
|
+
cwd: process.cwd(),
|
|
40
|
+
}, { isWebSocketWriter: true, send: (message) => messages.push(message) }, context);
|
|
41
|
+
assert.equal(start.mock.callCount(), resumed ? 0 : 1);
|
|
42
|
+
assert.equal(resume.mock.callCount(), resumed ? 1 : 0);
|
|
43
|
+
assert.equal(capturedPrompt, 'hey there');
|
|
44
|
+
assert.equal(capturedOptions?.sandboxMode, permissionMode === 'bypassPermissions' ? 'danger-full-access' : 'workspace-write');
|
|
45
|
+
assert.equal(capturedOptions?.approvalPolicy, permissionMode === 'acceptEdits' || permissionMode === 'bypassPermissions' ? 'never' : 'on-request');
|
|
46
|
+
assert.ok(messages.some((message) => message.kind === 'complete' && message.exitCode === 0));
|
|
47
|
+
assert.ok(!messages.some((message) => message.kind === 'error'));
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=codex-runtime.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-runtime.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/codex-runtime.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import test from 'node:test';
|
|
3
|
+
import { codexAppServer } from '../../../modules/providers/list/codex/codex-app-server.client.js';
|
|
4
|
+
import { CodexForkProvider } from '../../../modules/providers/list/codex/codex-fork.provider.js';
|
|
5
|
+
/**
|
|
6
|
+
* The fork endpoint itself is exercised against the real `codex app-server` in
|
|
7
|
+
* codex-message-editing.test.ts, which is where the rewind that depends on it
|
|
8
|
+
* lives. What is left for the fork provider is the mapping either side of it.
|
|
9
|
+
*/
|
|
10
|
+
test('a Codex fork asks for the whole thread when no anchor is given', { concurrency: false }, async () => {
|
|
11
|
+
const realForkThread = codexAppServer.forkThread;
|
|
12
|
+
const forkCalls = [];
|
|
13
|
+
codexAppServer.forkThread = async (input) => {
|
|
14
|
+
forkCalls.push(input);
|
|
15
|
+
return { threadId: 'thread-2', path: '/tmp/rollout-thread-2.jsonl' };
|
|
16
|
+
};
|
|
17
|
+
try {
|
|
18
|
+
const forked = await new CodexForkProvider().forkSession({
|
|
19
|
+
providerSessionId: 'thread-1',
|
|
20
|
+
jsonlPath: '/tmp/rollout-thread-1.jsonl',
|
|
21
|
+
projectPath: '/tmp/workspace',
|
|
22
|
+
title: 'ignored by codex',
|
|
23
|
+
});
|
|
24
|
+
assert.deepEqual(forked, { providerSessionId: 'thread-2', jsonlPath: '/tmp/rollout-thread-2.jsonl' });
|
|
25
|
+
}
|
|
26
|
+
finally {
|
|
27
|
+
codexAppServer.forkThread = realForkThread;
|
|
28
|
+
}
|
|
29
|
+
assert.deepEqual(forkCalls, [{ threadId: 'thread-1', lastTurnId: undefined, cwd: '/tmp/workspace' }]);
|
|
30
|
+
});
|
|
31
|
+
test('forking from a message cuts through that message\'s turn', async () => {
|
|
32
|
+
const realForkThread = codexAppServer.forkThread;
|
|
33
|
+
const forkCalls = [];
|
|
34
|
+
codexAppServer.forkThread = async (input) => {
|
|
35
|
+
forkCalls.push(input);
|
|
36
|
+
return { threadId: 'thread-2', path: '/tmp/rollout-thread-2.jsonl' };
|
|
37
|
+
};
|
|
38
|
+
try {
|
|
39
|
+
await new CodexForkProvider().forkSession({
|
|
40
|
+
providerSessionId: 'thread-1',
|
|
41
|
+
jsonlPath: '/tmp/rollout-thread-1.jsonl',
|
|
42
|
+
projectPath: '/tmp/workspace',
|
|
43
|
+
upToAnchorId: 'turn-b',
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
finally {
|
|
47
|
+
codexAppServer.forkThread = realForkThread;
|
|
48
|
+
}
|
|
49
|
+
// Inclusive of the turn it names, so the branch keeps the message that was
|
|
50
|
+
// forked from *and* the answer it got. A turn is written as one thing; there
|
|
51
|
+
// is no cut that stops between them.
|
|
52
|
+
assert.deepEqual(forkCalls, [{ threadId: 'thread-1', lastTurnId: 'turn-b', cwd: '/tmp/workspace' }]);
|
|
53
|
+
});
|
|
54
|
+
//# sourceMappingURL=codex-session-fork.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex-session-fork.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/codex-session-fork.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,cAAc,EAAE,MAAM,2DAA2D,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,MAAM,uDAAuD,CAAC;AAE1F;;;;GAIG;AAEH,IAAI,CAAC,gEAAgE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,KAAK,IAAI,EAAE;IACxG,MAAM,cAAc,GAAG,cAAc,CAAC,UAAU,CAAC;IACjD,MAAM,SAAS,GAAc,EAAE,CAAC;IAChC,cAAc,CAAC,UAAU,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE;QAC1C,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,6BAA6B,EAAE,CAAC;IACvE,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,iBAAiB,EAAE,CAAC,WAAW,CAAC;YACvD,iBAAiB,EAAE,UAAU;YAC7B,SAAS,EAAE,6BAA6B;YACxC,WAAW,EAAE,gBAAgB;YAC7B,KAAK,EAAE,kBAAkB;SAC1B,CAAC,CAAC;QACH,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,iBAAiB,EAAE,UAAU,EAAE,SAAS,EAAE,6BAA6B,EAAE,CAAC,CAAC;IACxG,CAAC;YAAS,CAAC;QACT,cAAc,CAAC,UAAU,GAAG,cAAc,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;AACxG,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;IAC1E,MAAM,cAAc,GAAG,cAAc,CAAC,UAAU,CAAC;IACjD,MAAM,SAAS,GAAc,EAAE,CAAC;IAChC,cAAc,CAAC,UAAU,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE;QAC1C,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,6BAA6B,EAAE,CAAC;IACvE,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,IAAI,iBAAiB,EAAE,CAAC,WAAW,CAAC;YACxC,iBAAiB,EAAE,UAAU;YAC7B,SAAS,EAAE,6BAA6B;YACxC,WAAW,EAAE,gBAAgB;YAC7B,YAAY,EAAE,QAAQ;SACvB,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,cAAc,CAAC,UAAU,GAAG,cAAc,CAAC;IAC7C,CAAC;IAED,2EAA2E;IAC3E,6EAA6E;IAC7E,qCAAqC;IACrC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;AACvG,CAAC,CAAC,CAAC"}
|