@cloudcli-ai/cloudcli 1.36.2 → 1.37.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/assets/index-DSlds633.css +32 -0
- package/dist/assets/{index-CDGzV0LN.js → index-eGqPeIEu.js} +375 -267
- package/dist/index.html +2 -2
- package/dist-server/server/constants/config.js.map +1 -1
- package/dist-server/server/index.js +73 -1224
- package/dist-server/server/index.js.map +1 -1
- package/dist-server/server/load-env.js +17 -4
- package/dist-server/server/load-env.js.map +1 -1
- package/dist-server/server/modules/agent/agent.module.js +37 -0
- package/dist-server/server/modules/agent/agent.module.js.map +1 -0
- package/dist-server/server/modules/agent/agent.routes.js +1161 -0
- package/dist-server/server/modules/agent/agent.routes.js.map +1 -0
- package/dist-server/server/modules/agent/index.js +3 -0
- package/dist-server/server/modules/agent/index.js.map +1 -0
- package/dist-server/server/modules/agent/tests/agent.routes.test.js +176 -0
- package/dist-server/server/modules/agent/tests/agent.routes.test.js.map +1 -0
- package/dist-server/server/modules/assets/assets.routes.js +56 -15
- package/dist-server/server/modules/assets/assets.routes.js.map +1 -1
- package/dist-server/server/modules/assets/index.js +2 -2
- package/dist-server/server/modules/assets/index.js.map +1 -1
- package/dist-server/server/modules/assets/services/image-assets.service.js +39 -1
- package/dist-server/server/modules/assets/services/image-assets.service.js.map +1 -1
- package/dist-server/server/modules/assets/tests/image-assets.service.test.js +21 -1
- package/dist-server/server/modules/assets/tests/image-assets.service.test.js.map +1 -1
- package/dist-server/server/{middleware/auth.js → modules/auth/auth.middleware.js} +30 -8
- package/dist-server/server/modules/auth/auth.middleware.js.map +1 -0
- package/dist-server/server/modules/auth/auth.module.js +29 -0
- package/dist-server/server/modules/auth/auth.module.js.map +1 -0
- package/dist-server/server/modules/auth/auth.routes.js +45 -0
- package/dist-server/server/modules/auth/auth.routes.js.map +1 -0
- package/dist-server/server/modules/auth/auth.service.js +113 -0
- package/dist-server/server/modules/auth/auth.service.js.map +1 -0
- package/dist-server/server/modules/auth/index.js +9 -0
- package/dist-server/server/modules/auth/index.js.map +1 -0
- package/dist-server/server/modules/auth/tests/auth.service.test.js +80 -0
- package/dist-server/server/modules/auth/tests/auth.service.test.js.map +1 -0
- package/dist-server/server/{browser-use-mcp.js → modules/browser-use/browser-use-mcp.js} +3 -1
- package/dist-server/server/modules/browser-use/browser-use-mcp.js.map +1 -0
- package/dist-server/server/modules/browser-use/browser-use.service.js +3 -4
- package/dist-server/server/modules/browser-use/browser-use.service.js.map +1 -1
- package/dist-server/server/modules/browser-use/index.js +9 -0
- package/dist-server/server/modules/browser-use/index.js.map +1 -0
- package/dist-server/server/modules/cli/cli.js +11 -0
- package/dist-server/server/modules/cli/cli.js.map +1 -0
- package/dist-server/server/modules/cli/cli.module.js +86 -0
- package/dist-server/server/modules/cli/cli.module.js.map +1 -0
- package/dist-server/server/modules/cli/cli.service.js +244 -0
- package/dist-server/server/modules/cli/cli.service.js.map +1 -0
- package/dist-server/server/modules/cli/index.js +3 -0
- package/dist-server/server/modules/cli/index.js.map +1 -0
- package/dist-server/server/modules/cli/sandbox.service.js +332 -0
- package/dist-server/server/modules/cli/sandbox.service.js.map +1 -0
- package/dist-server/server/modules/cli/tests/cli.service.test.js +78 -0
- package/dist-server/server/modules/cli/tests/cli.service.test.js.map +1 -0
- package/dist-server/server/modules/cli/tests/sandbox.service.test.js +55 -0
- package/dist-server/server/modules/cli/tests/sandbox.service.test.js.map +1 -0
- package/dist-server/server/modules/commands/commands.module.js +20 -0
- package/dist-server/server/modules/commands/commands.module.js.map +1 -0
- package/dist-server/server/modules/commands/commands.routes.js +497 -0
- package/dist-server/server/modules/commands/commands.routes.js.map +1 -0
- package/dist-server/server/modules/commands/index.js +3 -0
- package/dist-server/server/modules/commands/index.js.map +1 -0
- package/dist-server/server/modules/commands/tests/commands.test.js +96 -0
- package/dist-server/server/modules/commands/tests/commands.test.js.map +1 -0
- package/dist-server/server/modules/database/index.js +1 -0
- package/dist-server/server/modules/database/index.js.map +1 -1
- package/dist-server/server/modules/database/migrations.js +13 -0
- package/dist-server/server/modules/database/migrations.js.map +1 -1
- package/dist-server/server/modules/database/repositories/sessions.db.js +14 -1
- package/dist-server/server/modules/database/repositories/sessions.db.js.map +1 -1
- package/dist-server/server/modules/database/schema.js +4 -0
- package/dist-server/server/modules/database/schema.js.map +1 -1
- package/dist-server/server/modules/file-tree/file-tree.module.js +91 -0
- package/dist-server/server/modules/file-tree/file-tree.module.js.map +1 -0
- package/dist-server/server/modules/file-tree/file-tree.routes.js +208 -0
- package/dist-server/server/modules/file-tree/file-tree.routes.js.map +1 -0
- package/dist-server/server/modules/file-tree/file-tree.service.js +544 -0
- package/dist-server/server/modules/file-tree/file-tree.service.js.map +1 -0
- package/dist-server/server/modules/file-tree/index.js +3 -0
- package/dist-server/server/modules/file-tree/index.js.map +1 -0
- package/dist-server/server/modules/file-tree/tests/file-tree.routes.test.js +123 -0
- package/dist-server/server/modules/file-tree/tests/file-tree.routes.test.js.map +1 -0
- package/dist-server/server/modules/file-tree/tests/file-tree.service.test.js +184 -0
- package/dist-server/server/modules/file-tree/tests/file-tree.service.test.js.map +1 -0
- package/dist-server/server/modules/git/git-parsing.service.js +61 -0
- package/dist-server/server/modules/git/git-parsing.service.js.map +1 -0
- package/dist-server/server/modules/git/git.module.js +14 -0
- package/dist-server/server/modules/git/git.module.js.map +1 -0
- package/dist-server/server/modules/git/git.routes.js +1339 -0
- package/dist-server/server/modules/git/git.routes.js.map +1 -0
- package/dist-server/server/modules/git/index.js +3 -0
- package/dist-server/server/modules/git/index.js.map +1 -0
- package/dist-server/server/modules/git/tests/git-init.routes.test.js +48 -0
- package/dist-server/server/modules/git/tests/git-init.routes.test.js.map +1 -0
- package/dist-server/server/{routes → modules/git/tests}/git.test.js +1 -1
- package/dist-server/server/modules/git/tests/git.test.js.map +1 -0
- package/dist-server/server/modules/notifications/index.js +15 -1
- package/dist-server/server/modules/notifications/index.js.map +1 -1
- package/dist-server/server/modules/notifications/tests/notification-orchestrator.integration.test.js +44 -0
- package/dist-server/server/modules/notifications/tests/notification-orchestrator.integration.test.js.map +1 -0
- package/dist-server/server/{services/vapid-keys.js → modules/notifications/vapid-keys.service.js} +3 -2
- package/dist-server/server/modules/notifications/vapid-keys.service.js.map +1 -0
- package/dist-server/server/modules/plugins/index.js +9 -0
- package/dist-server/server/modules/plugins/index.js.map +1 -0
- package/dist-server/server/{utils/plugin-process-manager.js → modules/plugins/plugin-process.service.js} +3 -2
- package/dist-server/server/modules/plugins/plugin-process.service.js.map +1 -0
- package/dist-server/server/{utils/plugin-loader.js → modules/plugins/plugin-registry.service.js} +2 -1
- package/dist-server/server/modules/plugins/plugin-registry.service.js.map +1 -0
- package/dist-server/server/modules/plugins/plugins.module.js +30 -0
- package/dist-server/server/modules/plugins/plugins.module.js.map +1 -0
- package/dist-server/server/modules/plugins/plugins.routes.js +70 -0
- package/dist-server/server/modules/plugins/plugins.routes.js.map +1 -0
- package/dist-server/server/modules/plugins/plugins.service.js +123 -0
- package/dist-server/server/modules/plugins/plugins.service.js.map +1 -0
- package/dist-server/server/modules/plugins/tests/plugins.service.test.js +28 -0
- package/dist-server/server/modules/plugins/tests/plugins.service.test.js.map +1 -0
- package/dist-server/server/modules/projects/index.js +5 -0
- package/dist-server/server/modules/projects/index.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 +6 -0
- package/dist-server/server/modules/providers/list/claude/claude-auth.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude-models.provider.js +1 -4
- package/dist-server/server/modules/providers/list/claude/claude-models.provider.js.map +1 -1
- package/dist-server/server/{claude-sdk.js → modules/providers/list/claude/claude-runtime.provider.js} +62 -41
- package/dist-server/server/modules/providers/list/claude/claude-runtime.provider.js.map +1 -0
- package/dist-server/server/modules/providers/list/claude/claude-session-synchronizer.provider.js +6 -4
- 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 +23 -4
- package/dist-server/server/modules/providers/list/claude/claude-sessions.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-models.provider.js +1 -4
- package/dist-server/server/modules/providers/list/codex/codex-models.provider.js.map +1 -1
- package/dist-server/server/{openai-codex.js → modules/providers/list/codex/codex-runtime.provider.js} +48 -34
- package/dist-server/server/modules/providers/list/codex/codex-runtime.provider.js.map +1 -0
- package/dist-server/server/modules/providers/list/codex/codex-session-synchronizer.provider.js +19 -1
- 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 +290 -6
- package/dist-server/server/modules/providers/list/codex/codex-sessions.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-skills.provider.js +5 -0
- package/dist-server/server/modules/providers/list/codex/codex-skills.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-models.provider.js +1 -4
- package/dist-server/server/modules/providers/list/cursor/cursor-models.provider.js.map +1 -1
- package/dist-server/server/{cursor-cli.js → modules/providers/list/cursor/cursor-runtime.provider.js} +40 -28
- package/dist-server/server/modules/providers/list/cursor/cursor-runtime.provider.js.map +1 -0
- package/dist-server/server/modules/providers/list/cursor/cursor-sessions.provider.js +21 -14
- package/dist-server/server/modules/providers/list/cursor/cursor-sessions.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/cursor/cursor.provider.js +2 -0
- package/dist-server/server/modules/providers/list/cursor/cursor.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/opencode/opencode-models.provider.js +7 -5
- package/dist-server/server/modules/providers/list/opencode/opencode-models.provider.js.map +1 -1
- package/dist-server/server/{opencode-cli.js → modules/providers/list/opencode/opencode-runtime.provider.js} +38 -25
- package/dist-server/server/modules/providers/list/opencode/opencode-runtime.provider.js.map +1 -0
- package/dist-server/server/{opencode-cli.test.js → modules/providers/list/opencode/opencode-runtime.provider.test.js} +27 -4
- package/dist-server/server/modules/providers/list/opencode/opencode-runtime.provider.test.js.map +1 -0
- package/dist-server/server/modules/providers/list/opencode/opencode-sessions.provider.js +11 -5
- package/dist-server/server/modules/providers/list/opencode/opencode-sessions.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/opencode/opencode.provider.js +2 -0
- package/dist-server/server/modules/providers/list/opencode/opencode.provider.js.map +1 -1
- package/dist-server/server/modules/providers/provider.routes.js +33 -9
- package/dist-server/server/modules/providers/provider.routes.js.map +1 -1
- package/dist-server/server/modules/providers/services/provider-capabilities.service.js +5 -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 +110 -15
- 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 +66 -0
- package/dist-server/server/modules/providers/services/provider-runtime.service.js.map +1 -0
- package/dist-server/server/modules/providers/services/provider-token-usage.service.js +268 -0
- package/dist-server/server/modules/providers/services/provider-token-usage.service.js.map +1 -0
- package/dist-server/server/modules/providers/services/sessions-watcher.service.js +2 -0
- package/dist-server/server/modules/providers/services/sessions-watcher.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/sessions.service.js +54 -0
- package/dist-server/server/modules/providers/services/sessions.service.js.map +1 -1
- package/dist-server/server/modules/providers/shared/base/abstract.provider.js +2 -3
- package/dist-server/server/modules/providers/shared/base/abstract.provider.js.map +1 -1
- package/dist-server/server/modules/providers/tests/claude-auth.test.js +122 -0
- package/dist-server/server/modules/providers/tests/claude-auth.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/claude-sessions.test.js +44 -0
- package/dist-server/server/modules/providers/tests/claude-sessions.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/codex-sessions.test.js +70 -0
- package/dist-server/server/modules/providers/tests/codex-sessions.test.js.map +1 -1
- package/dist-server/server/modules/providers/tests/{provider-image-history.test.js → provider-attachment-history.test.js} +60 -2
- package/dist-server/server/modules/providers/tests/provider-attachment-history.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/provider-models.service.test.js +148 -61
- package/dist-server/server/modules/providers/tests/provider-models.service.test.js.map +1 -1
- package/dist-server/server/modules/providers/tests/provider-runtime.service.test.js +130 -0
- package/dist-server/server/modules/providers/tests/provider-runtime.service.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/provider-token-usage.service.test.js +165 -0
- package/dist-server/server/modules/providers/tests/provider-token-usage.service.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/sessions-details.test.js +62 -0
- package/dist-server/server/modules/providers/tests/sessions-details.test.js.map +1 -0
- package/dist-server/server/modules/providers/tests/skills.test.js +4 -2
- package/dist-server/server/modules/providers/tests/skills.test.js.map +1 -1
- package/dist-server/server/modules/settings/index.js +3 -0
- package/dist-server/server/modules/settings/index.js.map +1 -0
- package/dist-server/server/modules/settings/settings.module.js +35 -0
- package/dist-server/server/modules/settings/settings.module.js.map +1 -0
- package/dist-server/server/modules/settings/settings.routes.js +34 -0
- package/dist-server/server/modules/settings/settings.routes.js.map +1 -0
- package/dist-server/server/modules/settings/settings.service.js +116 -0
- package/dist-server/server/modules/settings/settings.service.js.map +1 -0
- package/dist-server/server/modules/settings/tests/settings.service.test.js +48 -0
- package/dist-server/server/modules/settings/tests/settings.service.test.js.map +1 -0
- package/dist-server/server/modules/system/index.js +3 -0
- package/dist-server/server/modules/system/index.js.map +1 -0
- package/dist-server/server/modules/system/system.module.js +44 -0
- package/dist-server/server/modules/system/system.module.js.map +1 -0
- package/dist-server/server/modules/system/system.routes.js +16 -0
- package/dist-server/server/modules/system/system.routes.js.map +1 -0
- package/dist-server/server/modules/system/system.service.js +45 -0
- package/dist-server/server/modules/system/system.service.js.map +1 -0
- package/dist-server/server/modules/system/tests/system.service.test.js +100 -0
- package/dist-server/server/modules/system/tests/system.service.test.js.map +1 -0
- package/dist-server/server/modules/taskmaster/index.js +3 -0
- package/dist-server/server/modules/taskmaster/index.js.map +1 -0
- package/dist-server/server/modules/taskmaster/taskmaster.module.js +20 -0
- package/dist-server/server/modules/taskmaster/taskmaster.module.js.map +1 -0
- package/dist-server/server/modules/taskmaster/taskmaster.routes.js +1372 -0
- package/dist-server/server/modules/taskmaster/taskmaster.routes.js.map +1 -0
- package/dist-server/server/modules/taskmaster/taskmaster.service.js +107 -0
- package/dist-server/server/modules/taskmaster/taskmaster.service.js.map +1 -0
- package/dist-server/server/modules/taskmaster/tests/taskmaster.routes.test.js +132 -0
- package/dist-server/server/modules/taskmaster/tests/taskmaster.routes.test.js.map +1 -0
- package/dist-server/server/modules/taskmaster/tests/taskmaster.service.test.js +85 -0
- package/dist-server/server/modules/taskmaster/tests/taskmaster.service.test.js.map +1 -0
- package/dist-server/server/modules/user/index.js +3 -0
- package/dist-server/server/modules/user/index.js.map +1 -0
- package/dist-server/server/modules/user/tests/user.service.test.js +53 -0
- package/dist-server/server/modules/user/tests/user.service.test.js.map +1 -0
- package/dist-server/server/modules/user/user.module.js +47 -0
- package/dist-server/server/modules/user/user.module.js.map +1 -0
- package/dist-server/server/modules/user/user.routes.js +44 -0
- package/dist-server/server/modules/user/user.routes.js.map +1 -0
- package/dist-server/server/modules/user/user.service.js +59 -0
- package/dist-server/server/modules/user/user.service.js.map +1 -0
- package/dist-server/server/modules/voice/index.js +3 -0
- package/dist-server/server/modules/voice/index.js.map +1 -0
- package/dist-server/server/modules/voice/tests/voice.service.test.js +86 -0
- package/dist-server/server/modules/voice/tests/voice.service.test.js.map +1 -0
- package/dist-server/server/modules/voice/voice.module.js +44 -0
- package/dist-server/server/modules/voice/voice.module.js.map +1 -0
- package/dist-server/server/modules/voice/voice.routes.js +87 -0
- package/dist-server/server/modules/voice/voice.routes.js.map +1 -0
- package/dist-server/server/modules/voice/voice.service.js +148 -0
- package/dist-server/server/modules/voice/voice.service.js.map +1 -0
- package/dist-server/server/modules/websocket/services/chat-session-writer.service.js +2 -2
- package/dist-server/server/modules/websocket/services/chat-websocket.service.js +40 -29
- package/dist-server/server/modules/websocket/services/chat-websocket.service.js.map +1 -1
- package/dist-server/server/modules/websocket/services/shell-websocket.service.js +76 -8
- package/dist-server/server/modules/websocket/services/shell-websocket.service.js.map +1 -1
- package/dist-server/server/modules/websocket/services/websocket-server.service.js +51 -20
- package/dist-server/server/modules/websocket/services/websocket-server.service.js.map +1 -1
- package/dist-server/server/modules/websocket/tests/{chat-image-filter.test.js → chat-attachment-filter.test.js} +10 -3
- package/dist-server/server/modules/websocket/tests/chat-attachment-filter.test.js.map +1 -0
- package/dist-server/server/modules/websocket/tests/shell-websocket.service.test.js +97 -0
- package/dist-server/server/modules/websocket/tests/shell-websocket.service.test.js.map +1 -0
- package/dist-server/server/modules/websocket/tests/websocket-heartbeat.service.test.js +61 -0
- package/dist-server/server/modules/websocket/tests/websocket-heartbeat.service.test.js.map +1 -0
- package/dist-server/server/modules/worktrees/index.js +3 -0
- package/dist-server/server/modules/worktrees/index.js.map +1 -0
- package/dist-server/server/modules/worktrees/services/worktree-create-and-open.service.js +37 -0
- package/dist-server/server/modules/worktrees/services/worktree-create-and-open.service.js.map +1 -0
- package/dist-server/server/modules/worktrees/services/worktree-create.service.js +67 -0
- package/dist-server/server/modules/worktrees/services/worktree-create.service.js.map +1 -0
- package/dist-server/server/modules/worktrees/services/worktree-git.service.js +172 -0
- package/dist-server/server/modules/worktrees/services/worktree-git.service.js.map +1 -0
- package/dist-server/server/modules/worktrees/services/worktree-list.service.js +91 -0
- package/dist-server/server/modules/worktrees/services/worktree-list.service.js.map +1 -0
- package/dist-server/server/modules/worktrees/services/worktree-merge.service.js +118 -0
- package/dist-server/server/modules/worktrees/services/worktree-merge.service.js.map +1 -0
- package/dist-server/server/modules/worktrees/services/worktree-open.service.js +58 -0
- package/dist-server/server/modules/worktrees/services/worktree-open.service.js.map +1 -0
- package/dist-server/server/modules/worktrees/services/worktree-remove.service.js +65 -0
- package/dist-server/server/modules/worktrees/services/worktree-remove.service.js.map +1 -0
- package/dist-server/server/modules/worktrees/tests/worktree-create-and-open.service.test.js +58 -0
- package/dist-server/server/modules/worktrees/tests/worktree-create-and-open.service.test.js.map +1 -0
- package/dist-server/server/modules/worktrees/tests/worktree-create.service.test.js +85 -0
- package/dist-server/server/modules/worktrees/tests/worktree-create.service.test.js.map +1 -0
- package/dist-server/server/modules/worktrees/tests/worktree-git.service.test.js +58 -0
- package/dist-server/server/modules/worktrees/tests/worktree-git.service.test.js.map +1 -0
- package/dist-server/server/modules/worktrees/tests/worktree-list.service.test.js +34 -0
- package/dist-server/server/modules/worktrees/tests/worktree-list.service.test.js.map +1 -0
- package/dist-server/server/modules/worktrees/tests/worktree-merge.service.test.js +137 -0
- package/dist-server/server/modules/worktrees/tests/worktree-merge.service.test.js.map +1 -0
- package/dist-server/server/modules/worktrees/tests/worktree-open.service.test.js +99 -0
- package/dist-server/server/modules/worktrees/tests/worktree-open.service.test.js.map +1 -0
- package/dist-server/server/modules/worktrees/tests/worktree-remove.service.test.js +157 -0
- package/dist-server/server/modules/worktrees/tests/worktree-remove.service.test.js.map +1 -0
- package/dist-server/server/modules/worktrees/tests/worktrees.routes.test.js +167 -0
- package/dist-server/server/modules/worktrees/tests/worktrees.routes.test.js.map +1 -0
- package/dist-server/server/modules/worktrees/worktrees.module.js +97 -0
- package/dist-server/server/modules/worktrees/worktrees.module.js.map +1 -0
- package/dist-server/server/modules/worktrees/worktrees.routes.js +84 -0
- package/dist-server/server/modules/worktrees/worktrees.routes.js.map +1 -0
- package/dist-server/server/shared/image-attachments.js +90 -17
- package/dist-server/server/shared/image-attachments.js.map +1 -1
- package/dist-server/server/shared/tests/image-attachments.test.js +43 -1
- package/dist-server/server/shared/tests/image-attachments.test.js.map +1 -1
- package/dist-server/server/shared/utils.js +66 -142
- package/dist-server/server/shared/utils.js.map +1 -1
- package/electron/localServer.js +1 -2
- package/package.json +8 -4
- package/server/index.ts +401 -0
- package/server/{load-env.js → load-env.ts} +18 -5
- package/server/modules/agent/agent.module.ts +51 -0
- package/server/modules/agent/agent.routes.ts +1287 -0
- package/server/modules/agent/index.ts +2 -0
- package/server/modules/agent/tests/agent.routes.test.ts +205 -0
- package/server/modules/assets/assets.routes.ts +63 -16
- package/server/modules/assets/index.ts +2 -2
- package/server/modules/assets/services/image-assets.service.ts +46 -1
- package/server/modules/assets/tests/image-assets.service.test.ts +28 -0
- package/server/{middleware/auth.js → modules/auth/auth.middleware.ts} +38 -7
- package/server/modules/auth/auth.module.ts +38 -0
- package/server/modules/auth/auth.routes.ts +57 -0
- package/server/modules/auth/auth.service.ts +155 -0
- package/server/modules/auth/index.ts +9 -0
- package/server/modules/auth/tests/auth.service.test.ts +95 -0
- package/server/{browser-use-mcp.ts → modules/browser-use/browser-use-mcp.ts} +3 -1
- package/server/modules/browser-use/browser-use.service.ts +3 -4
- package/server/modules/browser-use/index.ts +8 -0
- package/server/modules/cli/cli.module.ts +96 -0
- package/server/modules/cli/cli.service.ts +281 -0
- package/server/modules/cli/cli.ts +13 -0
- package/server/modules/cli/index.ts +2 -0
- package/server/modules/cli/sandbox.service.ts +413 -0
- package/server/modules/cli/tests/cli.service.test.ts +91 -0
- package/server/modules/cli/tests/sandbox.service.test.ts +61 -0
- package/server/modules/commands/commands.module.ts +22 -0
- package/server/{routes/commands.js → modules/commands/commands.routes.ts} +44 -36
- package/server/modules/commands/index.ts +2 -0
- package/server/modules/commands/tests/commands.test.ts +119 -0
- package/server/modules/database/index.ts +1 -0
- package/server/modules/database/migrations.ts +15 -0
- package/server/modules/database/repositories/sessions.db.ts +19 -1
- package/server/modules/database/schema.ts +4 -0
- package/server/modules/file-tree/file-tree.module.ts +112 -0
- package/server/modules/file-tree/file-tree.routes.ts +258 -0
- package/server/modules/file-tree/file-tree.service.ts +616 -0
- package/server/modules/file-tree/index.ts +2 -0
- package/server/modules/file-tree/tests/file-tree.routes.test.ts +157 -0
- package/server/modules/file-tree/tests/file-tree.service.test.ts +220 -0
- package/server/modules/git/git-parsing.service.ts +66 -0
- package/server/modules/git/git.module.ts +22 -0
- package/server/{routes/git.js → modules/git/git.routes.ts} +91 -132
- package/server/modules/git/index.ts +2 -0
- package/server/modules/git/tests/git-init.routes.test.ts +52 -0
- package/server/{routes/git.test.js → modules/git/tests/git.test.ts} +3 -3
- package/server/modules/notifications/index.ts +9 -0
- package/server/modules/notifications/tests/notification-orchestrator.integration.test.ts +55 -0
- package/server/{services/vapid-keys.js → modules/notifications/vapid-keys.service.ts} +3 -1
- package/server/modules/plugins/index.ts +9 -0
- package/server/{utils/plugin-process-manager.js → modules/plugins/plugin-process.service.ts} +3 -1
- package/server/{utils/plugin-loader.js → modules/plugins/plugin-registry.service.ts} +1 -0
- package/server/modules/plugins/plugins.module.ts +33 -0
- package/server/modules/plugins/plugins.routes.ts +66 -0
- package/server/modules/plugins/plugins.service.ts +147 -0
- package/server/modules/plugins/tests/plugins.service.test.ts +32 -0
- package/server/modules/projects/index.ts +5 -0
- package/server/modules/providers/README.md +41 -9
- package/server/modules/providers/index.ts +4 -0
- package/server/modules/providers/list/claude/claude-auth.provider.ts +8 -0
- package/server/modules/providers/list/claude/claude-models.provider.ts +1 -12
- package/server/{claude-sdk.js → modules/providers/list/claude/claude-runtime.provider.js} +66 -44
- package/server/modules/providers/list/claude/claude-session-synchronizer.provider.ts +6 -4
- package/server/modules/providers/list/claude/claude-sessions.provider.ts +27 -4
- package/server/modules/providers/list/claude/claude.provider.ts +3 -0
- package/server/modules/providers/list/codex/codex-models.provider.ts +0 -9
- package/server/{openai-codex.js → modules/providers/list/codex/codex-runtime.provider.js} +54 -36
- package/server/modules/providers/list/codex/codex-session-synchronizer.provider.ts +21 -1
- package/server/modules/providers/list/codex/codex-sessions.provider.ts +331 -7
- package/server/modules/providers/list/codex/codex-skills.provider.ts +5 -0
- package/server/modules/providers/list/codex/codex.provider.ts +3 -0
- package/server/modules/providers/list/cursor/cursor-models.provider.ts +0 -9
- package/server/{cursor-cli.js → modules/providers/list/cursor/cursor-runtime.provider.js} +58 -27
- package/server/modules/providers/list/cursor/cursor-sessions.provider.ts +26 -15
- package/server/modules/providers/list/cursor/cursor.provider.ts +3 -0
- package/server/modules/providers/list/opencode/opencode-models.provider.ts +7 -10
- package/server/{opencode-cli.js → modules/providers/list/opencode/opencode-runtime.provider.js} +56 -28
- package/server/{opencode-cli.test.js → modules/providers/list/opencode/opencode-runtime.provider.test.js} +41 -3
- package/server/modules/providers/list/opencode/opencode-sessions.provider.ts +13 -5
- package/server/modules/providers/list/opencode/opencode.provider.ts +3 -0
- package/server/modules/providers/provider.routes.ts +47 -10
- package/server/modules/providers/services/provider-capabilities.service.ts +7 -1
- package/server/modules/providers/services/provider-models.service.ts +131 -23
- package/server/modules/providers/services/provider-runtime.service.ts +109 -0
- package/server/modules/providers/services/provider-token-usage.service.ts +357 -0
- package/server/modules/providers/services/sessions-watcher.service.ts +2 -0
- package/server/modules/providers/services/sessions.service.ts +79 -0
- package/server/modules/providers/shared/base/abstract.provider.ts +4 -3
- package/server/modules/providers/tests/claude-auth.test.ts +150 -0
- package/server/modules/providers/tests/claude-sessions.test.ts +61 -0
- package/server/modules/providers/tests/codex-sessions.test.ts +81 -0
- package/server/modules/providers/tests/{provider-image-history.test.ts → provider-attachment-history.test.ts} +68 -1
- package/server/modules/providers/tests/provider-models.service.test.ts +450 -349
- package/server/modules/providers/tests/provider-runtime.service.test.ts +142 -0
- package/server/modules/providers/tests/provider-token-usage.service.test.ts +185 -0
- package/server/modules/providers/tests/sessions-details.test.ts +73 -0
- package/server/modules/providers/tests/skills.test.ts +9 -2
- package/server/modules/settings/index.ts +2 -0
- package/server/modules/settings/settings.module.ts +50 -0
- package/server/modules/settings/settings.routes.ts +51 -0
- package/server/modules/settings/settings.service.ts +186 -0
- package/server/modules/settings/tests/settings.service.test.ts +54 -0
- package/server/modules/system/index.ts +2 -0
- package/server/modules/system/system.module.ts +62 -0
- package/server/modules/system/system.routes.ts +21 -0
- package/server/modules/system/system.service.ts +76 -0
- package/server/modules/system/tests/system.service.test.ts +118 -0
- package/server/modules/taskmaster/index.ts +2 -0
- package/server/modules/taskmaster/taskmaster.module.ts +24 -0
- package/server/modules/taskmaster/taskmaster.routes.ts +1482 -0
- package/server/modules/taskmaster/taskmaster.service.ts +132 -0
- package/server/modules/taskmaster/tests/taskmaster.routes.test.ts +144 -0
- package/server/modules/taskmaster/tests/taskmaster.service.test.ts +97 -0
- package/server/modules/user/index.ts +2 -0
- package/server/modules/user/tests/user.service.test.ts +61 -0
- package/server/modules/user/user.module.ts +58 -0
- package/server/modules/user/user.routes.ts +50 -0
- package/server/modules/user/user.service.ts +85 -0
- package/server/modules/voice/index.ts +2 -0
- package/server/modules/voice/tests/voice.service.test.ts +98 -0
- package/server/modules/voice/voice.module.ts +47 -0
- package/server/modules/voice/voice.routes.ts +113 -0
- package/server/modules/voice/voice.service.ts +192 -0
- package/server/modules/websocket/README.md +7 -7
- package/server/modules/websocket/services/chat-session-writer.service.ts +2 -2
- package/server/modules/websocket/services/chat-websocket.service.ts +73 -61
- package/server/modules/websocket/services/shell-websocket.service.ts +88 -12
- package/server/modules/websocket/services/websocket-server.service.ts +63 -19
- package/server/modules/websocket/tests/{chat-image-filter.test.ts → chat-attachment-filter.test.ts} +17 -2
- package/server/modules/websocket/tests/shell-websocket.service.test.ts +119 -0
- package/server/modules/websocket/tests/websocket-heartbeat.service.test.ts +78 -0
- package/server/modules/worktrees/index.ts +2 -0
- package/server/modules/worktrees/services/worktree-create-and-open.service.ts +53 -0
- package/server/modules/worktrees/services/worktree-create.service.ts +104 -0
- package/server/modules/worktrees/services/worktree-git.service.ts +207 -0
- package/server/modules/worktrees/services/worktree-list.service.ts +143 -0
- package/server/modules/worktrees/services/worktree-merge.service.ts +157 -0
- package/server/modules/worktrees/services/worktree-open.service.ts +85 -0
- package/server/modules/worktrees/services/worktree-remove.service.ts +88 -0
- package/server/modules/worktrees/tests/worktree-create-and-open.service.test.ts +68 -0
- package/server/modules/worktrees/tests/worktree-create.service.test.ts +142 -0
- package/server/modules/worktrees/tests/worktree-git.service.test.ts +84 -0
- package/server/modules/worktrees/tests/worktree-list.service.test.ts +45 -0
- package/server/modules/worktrees/tests/worktree-merge.service.test.ts +213 -0
- package/server/modules/worktrees/tests/worktree-open.service.test.ts +122 -0
- package/server/modules/worktrees/tests/worktree-remove.service.test.ts +227 -0
- package/server/modules/worktrees/tests/worktrees.routes.test.ts +199 -0
- package/server/modules/worktrees/worktrees.module.ts +113 -0
- package/server/modules/worktrees/worktrees.routes.ts +116 -0
- package/server/shared/image-attachments.ts +112 -18
- package/server/shared/interfaces.ts +29 -19
- package/server/shared/tests/image-attachments.test.ts +55 -0
- package/server/shared/types.ts +658 -21
- package/server/shared/utils.ts +77 -212
- package/dist/assets/index-DLmhQ15L.css +0 -32
- package/dist-server/server/browser-use-mcp.js.map +0 -1
- package/dist-server/server/claude-sdk.js.map +0 -1
- package/dist-server/server/cli.js +0 -647
- package/dist-server/server/cli.js.map +0 -1
- package/dist-server/server/cursor-cli.js.map +0 -1
- package/dist-server/server/middleware/auth.js.map +0 -1
- package/dist-server/server/modules/providers/tests/provider-image-history.test.js.map +0 -1
- package/dist-server/server/modules/websocket/tests/chat-image-filter.test.js.map +0 -1
- package/dist-server/server/openai-codex.js.map +0 -1
- package/dist-server/server/opencode-cli.js.map +0 -1
- package/dist-server/server/opencode-cli.test.js.map +0 -1
- package/dist-server/server/routes/agent.js +0 -1155
- package/dist-server/server/routes/agent.js.map +0 -1
- package/dist-server/server/routes/auth.js +0 -119
- package/dist-server/server/routes/auth.js.map +0 -1
- package/dist-server/server/routes/commands.js +0 -492
- package/dist-server/server/routes/commands.js.map +0 -1
- package/dist-server/server/routes/cursor.js +0 -49
- package/dist-server/server/routes/cursor.js.map +0 -1
- package/dist-server/server/routes/git.js +0 -1389
- package/dist-server/server/routes/git.js.map +0 -1
- package/dist-server/server/routes/git.test.js.map +0 -1
- package/dist-server/server/routes/mcp-utils.js +0 -29
- package/dist-server/server/routes/mcp-utils.js.map +0 -1
- package/dist-server/server/routes/plugins.js +0 -266
- package/dist-server/server/routes/plugins.js.map +0 -1
- package/dist-server/server/routes/settings.js +0 -249
- package/dist-server/server/routes/settings.js.map +0 -1
- package/dist-server/server/routes/taskmaster.js +0 -1362
- package/dist-server/server/routes/taskmaster.js.map +0 -1
- package/dist-server/server/routes/tests/commands.test.js +0 -76
- package/dist-server/server/routes/tests/commands.test.js.map +0 -1
- package/dist-server/server/routes/user.js +0 -116
- package/dist-server/server/routes/user.js.map +0 -1
- package/dist-server/server/services/notification-orchestrator.js +0 -2
- package/dist-server/server/services/notification-orchestrator.js.map +0 -1
- package/dist-server/server/services/tests/notification-orchestrator.test.js +0 -64
- package/dist-server/server/services/tests/notification-orchestrator.test.js.map +0 -1
- package/dist-server/server/services/vapid-keys.js.map +0 -1
- package/dist-server/server/utils/colors.js +0 -20
- package/dist-server/server/utils/colors.js.map +0 -1
- package/dist-server/server/utils/commandParser.js +0 -255
- package/dist-server/server/utils/commandParser.js.map +0 -1
- package/dist-server/server/utils/gitConfig.js +0 -37
- package/dist-server/server/utils/gitConfig.js.map +0 -1
- package/dist-server/server/utils/mcp-detector.js +0 -134
- package/dist-server/server/utils/mcp-detector.js.map +0 -1
- package/dist-server/server/utils/plugin-loader.js.map +0 -1
- package/dist-server/server/utils/plugin-process-manager.js.map +0 -1
- package/dist-server/server/utils/runtime-paths.js +0 -30
- package/dist-server/server/utils/runtime-paths.js.map +0 -1
- package/dist-server/server/utils/taskmaster-websocket.js +0 -124
- package/dist-server/server/utils/taskmaster-websocket.js.map +0 -1
- package/dist-server/server/utils/url-detection.js +0 -58
- package/dist-server/server/utils/url-detection.js.map +0 -1
- package/dist-server/server/voice-proxy.js +0 -226
- package/dist-server/server/voice-proxy.js.map +0 -1
- package/server/cli.js +0 -695
- package/server/index.js +0 -1651
- package/server/routes/agent.js +0 -1257
- package/server/routes/auth.js +0 -137
- package/server/routes/cursor.js +0 -52
- package/server/routes/mcp-utils.js +0 -31
- package/server/routes/plugins.js +0 -307
- package/server/routes/settings.js +0 -282
- package/server/routes/taskmaster.js +0 -1470
- package/server/routes/tests/commands.test.js +0 -82
- package/server/routes/user.js +0 -124
- package/server/services/notification-orchestrator.js +0 -7
- package/server/services/tests/notification-orchestrator.test.js +0 -80
- package/server/utils/colors.js +0 -21
- package/server/utils/commandParser.js +0 -305
- package/server/utils/gitConfig.js +0 -35
- package/server/utils/mcp-detector.js +0 -147
- package/server/utils/runtime-paths.js +0 -37
- package/server/utils/taskmaster-websocket.js +0 -135
- package/server/utils/url-detection.js +0 -71
- package/server/voice-proxy.js +0 -224
- /package/server/constants/{config.js → config.ts} +0 -0
|
@@ -10,6 +10,7 @@ const PROVIDER_CAPABILITIES = {
|
|
|
10
10
|
permissionModes: ['default', 'auto', 'acceptEdits', 'bypassPermissions', 'plan'],
|
|
11
11
|
defaultPermissionMode: 'default',
|
|
12
12
|
supportsImages: true,
|
|
13
|
+
supportsFiles: true,
|
|
13
14
|
supportsAbort: true,
|
|
14
15
|
supportsPermissionRequests: true,
|
|
15
16
|
supportsTokenUsage: true,
|
|
@@ -20,6 +21,7 @@ const PROVIDER_CAPABILITIES = {
|
|
|
20
21
|
permissionModes: ['default', 'acceptEdits', 'bypassPermissions', 'plan'],
|
|
21
22
|
defaultPermissionMode: 'default',
|
|
22
23
|
supportsImages: true,
|
|
24
|
+
supportsFiles: true,
|
|
23
25
|
supportsAbort: true,
|
|
24
26
|
supportsPermissionRequests: false,
|
|
25
27
|
supportsTokenUsage: false,
|
|
@@ -30,6 +32,7 @@ const PROVIDER_CAPABILITIES = {
|
|
|
30
32
|
permissionModes: ['default', 'acceptEdits', 'bypassPermissions'],
|
|
31
33
|
defaultPermissionMode: 'default',
|
|
32
34
|
supportsImages: true,
|
|
35
|
+
supportsFiles: true,
|
|
33
36
|
supportsAbort: true,
|
|
34
37
|
supportsPermissionRequests: false,
|
|
35
38
|
supportsTokenUsage: true,
|
|
@@ -39,10 +42,11 @@ const PROVIDER_CAPABILITIES = {
|
|
|
39
42
|
provider: 'opencode',
|
|
40
43
|
// Mapped by the runtime onto OpenCode's controls: `--agent plan` (plan),
|
|
41
44
|
// `--auto` (bypassPermissions) and the OPENCODE_PERMISSION env var
|
|
42
|
-
// (acceptEdits). See resolveOpenCodePermissionOptions in
|
|
45
|
+
// (acceptEdits). See resolveOpenCodePermissionOptions in the OpenCode runtime adapter.
|
|
43
46
|
permissionModes: ['default', 'acceptEdits', 'bypassPermissions', 'plan'],
|
|
44
47
|
defaultPermissionMode: 'default',
|
|
45
48
|
supportsImages: true,
|
|
49
|
+
supportsFiles: true,
|
|
46
50
|
supportsAbort: true,
|
|
47
51
|
supportsPermissionRequests: false,
|
|
48
52
|
supportsTokenUsage: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-capabilities.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/provider-capabilities.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"provider-capabilities.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/provider-capabilities.service.ts"],"names":[],"mappings":"AA6BA;;;;;GAKG;AACH,MAAM,qBAAqB,GAA8C;IACvE,MAAM,EAAE;QACN,QAAQ,EAAE,QAAQ;QAClB,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,CAAC;QAChF,qBAAqB,EAAE,SAAS;QAChC,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,IAAI;QACnB,aAAa,EAAE,IAAI;QACnB,0BAA0B,EAAE,IAAI;QAChC,kBAAkB,EAAE,IAAI;QACxB,cAAc,EAAE,IAAI;KACrB;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,QAAQ;QAClB,eAAe,EAAE,CAAC,SAAS,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,CAAC;QACxE,qBAAqB,EAAE,SAAS;QAChC,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,IAAI;QACnB,aAAa,EAAE,IAAI;QACnB,0BAA0B,EAAE,KAAK;QACjC,kBAAkB,EAAE,KAAK;QACzB,cAAc,EAAE,KAAK;KACtB;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,OAAO;QACjB,eAAe,EAAE,CAAC,SAAS,EAAE,aAAa,EAAE,mBAAmB,CAAC;QAChE,qBAAqB,EAAE,SAAS;QAChC,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,IAAI;QACnB,aAAa,EAAE,IAAI;QACnB,0BAA0B,EAAE,KAAK;QACjC,kBAAkB,EAAE,IAAI;QACxB,cAAc,EAAE,IAAI;KACrB;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,UAAU;QACpB,yEAAyE;QACzE,mEAAmE;QACnE,uFAAuF;QACvF,eAAe,EAAE,CAAC,SAAS,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,CAAC;QACxE,qBAAqB,EAAE,SAAS;QAChC,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,IAAI;QACnB,aAAa,EAAE,IAAI;QACnB,0BAA0B,EAAE,KAAK;QACjC,kBAAkB,EAAE,IAAI;QACxB,cAAc,EAAE,IAAI;KACrB;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,uBAAuB,CAAC,QAAqB;QAC3C,OAAO,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,2BAA2B;QACzB,OAAO,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAC9C,CAAC;CACF,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { mkdir, readFile, writeFile } from 'node:fs/promises';
|
|
2
2
|
import os from 'node:os';
|
|
3
3
|
import path from 'node:path';
|
|
4
|
+
import { sessionsDb } from '../../../modules/database/index.js';
|
|
4
5
|
import { providerRegistry } from '../../../modules/providers/provider.registry.js';
|
|
5
|
-
import { readProviderSessionActiveModelChange } from '../../../shared/utils.js';
|
|
6
6
|
export const PROVIDER_MODELS_CACHE_TTL_MS = 3 * 24 * 60 * 60 * 1000;
|
|
7
7
|
const PROVIDER_MODELS_CACHE_VERSION = 2;
|
|
8
8
|
const UNCACHED_PROVIDERS = new Set(['claude']);
|
|
@@ -64,7 +64,7 @@ const writeProviderModelsCacheFile = async (cachePath, entries, now) => {
|
|
|
64
64
|
export const createProviderModelsService = (dependencies = {}) => {
|
|
65
65
|
const resolveProvider = dependencies.resolveProvider ?? providerRegistry.resolveProvider;
|
|
66
66
|
const cachePath = dependencies.cachePath ?? getProviderModelsCachePath();
|
|
67
|
-
const
|
|
67
|
+
const sessions = dependencies.sessions ?? sessionsDb;
|
|
68
68
|
const now = dependencies.now ?? (() => Date.now());
|
|
69
69
|
const memoryCache = new Map();
|
|
70
70
|
const pendingRequests = new Map();
|
|
@@ -192,20 +192,116 @@ export const createProviderModelsService = (dependencies = {}) => {
|
|
|
192
192
|
return loadAndCacheModels(provider);
|
|
193
193
|
};
|
|
194
194
|
const getCurrentActiveModel = async (provider, sessionId) => resolveProvider(provider).models.getCurrentActiveModel(sessionId);
|
|
195
|
-
const
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
}
|
|
195
|
+
const readRecordedSessionModel = (sessionId) => {
|
|
196
|
+
const session = sessions.getSessionById(sessionId);
|
|
197
|
+
return session?.model?.trim() || null;
|
|
198
|
+
};
|
|
199
|
+
/**
|
|
200
|
+
* Records the model one session runs with.
|
|
201
|
+
*
|
|
202
|
+
* Called from the active-model route when the user picks a model and from
|
|
203
|
+
* `chat.send` on every turn, so the row always matches what the session last
|
|
204
|
+
* ran with. Sessions the app has not created yet (no row) are ignored rather
|
|
205
|
+
* than treated as an error: the client keeps its own pending selection and
|
|
206
|
+
* the value lands on the row with the first send.
|
|
207
|
+
*/
|
|
208
|
+
const setSessionModel = (provider, sessionId, model) => {
|
|
209
|
+
const normalizedSessionId = sessionId.trim();
|
|
210
|
+
const normalizedModel = model.trim();
|
|
211
|
+
if (!normalizedSessionId || !normalizedModel) {
|
|
212
|
+
return null;
|
|
213
|
+
}
|
|
214
|
+
if (!sessions.getSessionById(normalizedSessionId)) {
|
|
215
|
+
return null;
|
|
216
|
+
}
|
|
217
|
+
sessions.setSessionModel(normalizedSessionId, normalizedModel);
|
|
218
|
+
return {
|
|
219
|
+
provider,
|
|
220
|
+
sessionId: normalizedSessionId,
|
|
221
|
+
model: normalizedModel,
|
|
222
|
+
source: 'session',
|
|
223
|
+
};
|
|
224
|
+
};
|
|
225
|
+
/**
|
|
226
|
+
* Answers "which model is this session using?" for every display surface.
|
|
227
|
+
*
|
|
228
|
+
* Precedence, highest first:
|
|
229
|
+
* 1. the model recorded on the session row — the user's pick, or whatever
|
|
230
|
+
* the last send used;
|
|
231
|
+
* 2. the provider's own session state, for sessions started outside the app
|
|
232
|
+
* that we have never recorded a model for;
|
|
233
|
+
* 3. `requestedModel`, the client's current default, for a chat that has no
|
|
234
|
+
* session yet;
|
|
235
|
+
* 4. the provider catalog default.
|
|
236
|
+
*/
|
|
237
|
+
const resolveSessionModel = async (provider, options = {}) => {
|
|
238
|
+
const normalizedSessionId = typeof options.sessionId === 'string' ? options.sessionId.trim() : '';
|
|
239
|
+
const normalizedRequestedModel = typeof options.requestedModel === 'string'
|
|
240
|
+
? options.requestedModel.trim()
|
|
241
|
+
: '';
|
|
242
|
+
if (normalizedSessionId) {
|
|
243
|
+
const recordedModel = readRecordedSessionModel(normalizedSessionId);
|
|
244
|
+
if (recordedModel) {
|
|
245
|
+
return {
|
|
246
|
+
provider,
|
|
247
|
+
sessionId: normalizedSessionId,
|
|
248
|
+
model: recordedModel,
|
|
249
|
+
source: 'session',
|
|
250
|
+
};
|
|
251
|
+
}
|
|
252
|
+
// Never sent on through the app. Ask the provider what its own session
|
|
253
|
+
// state says before falling back to anything client-supplied.
|
|
254
|
+
const catalog = (await getProviderModels(provider)).models;
|
|
255
|
+
const providerModel = await getCurrentActiveModel(provider, normalizedSessionId);
|
|
256
|
+
const resolvedProviderModel = providerModel.model?.trim();
|
|
257
|
+
if (resolvedProviderModel && resolvedProviderModel !== catalog.DEFAULT) {
|
|
258
|
+
return {
|
|
259
|
+
provider,
|
|
260
|
+
sessionId: normalizedSessionId,
|
|
261
|
+
model: resolvedProviderModel,
|
|
262
|
+
source: 'provider',
|
|
263
|
+
};
|
|
264
|
+
}
|
|
265
|
+
return {
|
|
266
|
+
provider,
|
|
267
|
+
sessionId: normalizedSessionId,
|
|
268
|
+
model: normalizedRequestedModel || catalog.DEFAULT,
|
|
269
|
+
source: normalizedRequestedModel ? 'session' : 'default',
|
|
270
|
+
};
|
|
271
|
+
}
|
|
272
|
+
if (normalizedRequestedModel) {
|
|
273
|
+
return {
|
|
274
|
+
provider,
|
|
275
|
+
sessionId: null,
|
|
276
|
+
model: normalizedRequestedModel,
|
|
277
|
+
source: 'session',
|
|
278
|
+
};
|
|
279
|
+
}
|
|
280
|
+
const catalog = (await getProviderModels(provider)).models;
|
|
281
|
+
return {
|
|
282
|
+
provider,
|
|
283
|
+
sessionId: null,
|
|
284
|
+
model: catalog.DEFAULT,
|
|
285
|
+
source: 'default',
|
|
286
|
+
};
|
|
287
|
+
};
|
|
288
|
+
/**
|
|
289
|
+
* Picks the model one run should use, for provider runtime adapters.
|
|
290
|
+
*
|
|
291
|
+
* Deliberately narrower than `resolveSessionModel`: the provider's own
|
|
292
|
+
* session state is not consulted here. Codex reports a global config value
|
|
293
|
+
* from `getCurrentActiveModel`, which would silently override the model the
|
|
294
|
+
* user picked in the composer on every single run.
|
|
295
|
+
*/
|
|
199
296
|
const resolveResumeModel = async (provider, sessionId, requestedModel) => {
|
|
297
|
+
void provider;
|
|
200
298
|
const normalizedRequestedModel = typeof requestedModel === 'string' ? requestedModel.trim() : '';
|
|
201
|
-
|
|
299
|
+
const normalizedSessionId = sessionId?.trim();
|
|
300
|
+
if (!normalizedSessionId) {
|
|
202
301
|
return normalizedRequestedModel || undefined;
|
|
203
302
|
}
|
|
204
|
-
const
|
|
205
|
-
|
|
206
|
-
return changedModel.model.trim();
|
|
207
|
-
}
|
|
208
|
-
return normalizedRequestedModel || undefined;
|
|
303
|
+
const recordedModel = readRecordedSessionModel(normalizedSessionId);
|
|
304
|
+
return recordedModel || normalizedRequestedModel || undefined;
|
|
209
305
|
};
|
|
210
306
|
const clearCache = () => {
|
|
211
307
|
memoryCache.clear();
|
|
@@ -215,9 +311,8 @@ export const createProviderModelsService = (dependencies = {}) => {
|
|
|
215
311
|
};
|
|
216
312
|
return {
|
|
217
313
|
getProviderModels,
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
changeActiveModel,
|
|
314
|
+
setSessionModel,
|
|
315
|
+
resolveSessionModel,
|
|
221
316
|
resolveResumeModel,
|
|
222
317
|
clearCache,
|
|
223
318
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-models.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/provider-models.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"provider-models.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/provider-models.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { providerRegistry } from '../../../modules/providers/provider.registry.js';
|
|
2
|
+
import { providerModelsService } from '../../../modules/providers/services/provider-models.service.js';
|
|
3
|
+
import { sessionsService } from '../../../modules/providers/services/sessions.service.js';
|
|
4
|
+
const defaultDependencies = {
|
|
5
|
+
listProviders: () => providerRegistry.listProviders(),
|
|
6
|
+
resolveProvider: (provider) => providerRegistry.resolveProvider(provider),
|
|
7
|
+
resolveProviderSessionId: (sessionId) => sessionsService.resolveProviderSessionId(sessionId),
|
|
8
|
+
resolveResumeModel: (provider, sessionId, requestedModel) => providerModelsService.resolveResumeModel(provider, sessionId, requestedModel),
|
|
9
|
+
getProviderModels: (provider, options) => providerModelsService.getProviderModels(provider, options),
|
|
10
|
+
};
|
|
11
|
+
/**
|
|
12
|
+
* Creates the application-facing provider runtime dispatcher.
|
|
13
|
+
*
|
|
14
|
+
* The provider registry owns each concrete runtime. This service supplies the
|
|
15
|
+
* registry-backed model/session lookups at execution time so runtime adapters
|
|
16
|
+
* never import services that resolve back through the registry.
|
|
17
|
+
*/
|
|
18
|
+
export function createProviderRuntimeService(dependencyOverrides = {}) {
|
|
19
|
+
const dependencies = { ...defaultDependencies, ...dependencyOverrides };
|
|
20
|
+
const createRuntimeContext = (provider) => ({
|
|
21
|
+
resolveProviderSessionId: dependencies.resolveProviderSessionId,
|
|
22
|
+
resolveResumeModel: (sessionId, requestedModel) => dependencies.resolveResumeModel(provider.id, sessionId, requestedModel),
|
|
23
|
+
getProviderModels: async () => (await dependencies.getProviderModels(provider.id)).models,
|
|
24
|
+
normalizeMessage: (raw, sessionId) => provider.sessions.normalizeMessage(raw, sessionId),
|
|
25
|
+
async isProviderInstalled() {
|
|
26
|
+
try {
|
|
27
|
+
return (await provider.auth.getStatus()).installed;
|
|
28
|
+
}
|
|
29
|
+
catch {
|
|
30
|
+
// Preserve the runtime's original error when installation probing fails.
|
|
31
|
+
return true;
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
});
|
|
35
|
+
const run = (providerName, command, options, writer) => {
|
|
36
|
+
const provider = dependencies.resolveProvider(providerName);
|
|
37
|
+
return provider.runtime.run(command, options, writer, createRuntimeContext(provider));
|
|
38
|
+
};
|
|
39
|
+
return {
|
|
40
|
+
run,
|
|
41
|
+
hasRuntime(providerName) {
|
|
42
|
+
try {
|
|
43
|
+
return Boolean(dependencies.resolveProvider(providerName).runtime);
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
getRunner(provider) {
|
|
50
|
+
return (command, options, writer) => run(provider, command, options, writer);
|
|
51
|
+
},
|
|
52
|
+
async abort(providerName, sessionId) {
|
|
53
|
+
return Boolean(await dependencies.resolveProvider(providerName).runtime.abort(sessionId));
|
|
54
|
+
},
|
|
55
|
+
resolveToolApproval(requestId, decision) {
|
|
56
|
+
for (const provider of dependencies.listProviders()) {
|
|
57
|
+
provider.runtime.permissions?.resolve(requestId, decision);
|
|
58
|
+
}
|
|
59
|
+
},
|
|
60
|
+
getPendingApprovalsForSession(sessionId) {
|
|
61
|
+
return dependencies.listProviders().flatMap((provider) => provider.runtime.permissions?.listPending(sessionId) ?? []);
|
|
62
|
+
},
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
export const providerRuntimeService = createProviderRuntimeService();
|
|
66
|
+
//# sourceMappingURL=provider-runtime.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-runtime.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/provider-runtime.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,268 @@
|
|
|
1
|
+
import fsSync from 'node:fs';
|
|
2
|
+
import fsp from 'node:fs/promises';
|
|
3
|
+
import os from 'node:os';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import Database from 'better-sqlite3';
|
|
6
|
+
import { sessionsDb } from '../../../modules/database/index.js';
|
|
7
|
+
import { AppError, getOpenCodeDatabasePath } from '../../../shared/utils.js';
|
|
8
|
+
const defaultDependencies = {
|
|
9
|
+
getSessionById: (sessionId) => sessionsDb.getSessionById(sessionId),
|
|
10
|
+
getHomeDirectory: () => os.homedir(),
|
|
11
|
+
getOpenCodeDatabasePath,
|
|
12
|
+
fileExists: (filePath) => fsSync.existsSync(filePath),
|
|
13
|
+
readDirectory: (directoryPath) => fsp.readdir(directoryPath, { withFileTypes: true }),
|
|
14
|
+
readTextFile: (filePath) => fsp.readFile(filePath, 'utf8'),
|
|
15
|
+
getClaudeContextWindow: () => process.env.CONTEXT_WINDOW,
|
|
16
|
+
};
|
|
17
|
+
function readUsageNumber(value) {
|
|
18
|
+
const parsedValue = Number(value);
|
|
19
|
+
return Number.isFinite(parsedValue) ? parsedValue : 0;
|
|
20
|
+
}
|
|
21
|
+
async function findCodexSessionFile(directoryPath, providerSessionId, dependencies) {
|
|
22
|
+
let entries;
|
|
23
|
+
try {
|
|
24
|
+
entries = await dependencies.readDirectory(directoryPath);
|
|
25
|
+
}
|
|
26
|
+
catch {
|
|
27
|
+
// Codex session folders are date-partitioned and can disappear while a
|
|
28
|
+
// cleanup is running. An unreadable branch is simply not a match.
|
|
29
|
+
return null;
|
|
30
|
+
}
|
|
31
|
+
for (const entry of entries) {
|
|
32
|
+
const entryPath = path.join(directoryPath, entry.name);
|
|
33
|
+
if (entry.isDirectory()) {
|
|
34
|
+
const nestedMatch = await findCodexSessionFile(entryPath, providerSessionId, dependencies);
|
|
35
|
+
if (nestedMatch) {
|
|
36
|
+
return nestedMatch;
|
|
37
|
+
}
|
|
38
|
+
continue;
|
|
39
|
+
}
|
|
40
|
+
if (entry.name.includes(providerSessionId) && entry.name.endsWith('.jsonl')) {
|
|
41
|
+
return entryPath;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
return null;
|
|
45
|
+
}
|
|
46
|
+
function readCodexTokenUsage(fileContent) {
|
|
47
|
+
let inputTokens = 0;
|
|
48
|
+
let outputTokens = 0;
|
|
49
|
+
let totalTokens = 0;
|
|
50
|
+
let contextWindow = 200_000;
|
|
51
|
+
const lines = fileContent.trim().split('\n');
|
|
52
|
+
for (let index = lines.length - 1; index >= 0; index -= 1) {
|
|
53
|
+
try {
|
|
54
|
+
const entry = JSON.parse(lines[index]);
|
|
55
|
+
const tokenInfo = entry.type === 'event_msg' && entry.payload?.type === 'token_count'
|
|
56
|
+
? entry.payload.info
|
|
57
|
+
: null;
|
|
58
|
+
if (!tokenInfo) {
|
|
59
|
+
continue;
|
|
60
|
+
}
|
|
61
|
+
if (tokenInfo.total_token_usage) {
|
|
62
|
+
inputTokens = readUsageNumber(tokenInfo.total_token_usage.input_tokens);
|
|
63
|
+
outputTokens = readUsageNumber(tokenInfo.total_token_usage.output_tokens);
|
|
64
|
+
totalTokens = readUsageNumber(tokenInfo.total_token_usage.total_tokens)
|
|
65
|
+
|| inputTokens + outputTokens;
|
|
66
|
+
}
|
|
67
|
+
contextWindow = readUsageNumber(tokenInfo.model_context_window) || contextWindow;
|
|
68
|
+
break;
|
|
69
|
+
}
|
|
70
|
+
catch {
|
|
71
|
+
// A provider may be writing the last JSONL line while this read happens.
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
return {
|
|
75
|
+
used: totalTokens,
|
|
76
|
+
total: contextWindow,
|
|
77
|
+
inputTokens,
|
|
78
|
+
outputTokens,
|
|
79
|
+
breakdown: { input: inputTokens, output: outputTokens },
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
function readClaudeTokenUsage(fileContent, configuredContextWindow) {
|
|
83
|
+
let inputTokens = 0;
|
|
84
|
+
let outputTokens = 0;
|
|
85
|
+
let cacheReadTokens = 0;
|
|
86
|
+
let cacheCreationTokens = 0;
|
|
87
|
+
const lines = fileContent.trim().split('\n');
|
|
88
|
+
for (let index = lines.length - 1; index >= 0; index -= 1) {
|
|
89
|
+
try {
|
|
90
|
+
const entry = JSON.parse(lines[index]);
|
|
91
|
+
const usage = entry.type === 'assistant' ? entry.message?.usage : null;
|
|
92
|
+
if (!usage) {
|
|
93
|
+
continue;
|
|
94
|
+
}
|
|
95
|
+
const directInputTokens = readUsageNumber(usage.input_tokens ?? usage.inputTokens);
|
|
96
|
+
cacheReadTokens = readUsageNumber(usage.cache_read_input_tokens ?? usage.cacheReadInputTokens ?? usage.cacheReadTokens);
|
|
97
|
+
cacheCreationTokens = readUsageNumber(usage.cache_creation_input_tokens
|
|
98
|
+
?? usage.cacheCreationInputTokens
|
|
99
|
+
?? usage.cacheCreationTokens);
|
|
100
|
+
inputTokens = directInputTokens + cacheReadTokens + cacheCreationTokens;
|
|
101
|
+
outputTokens = readUsageNumber(usage.output_tokens ?? usage.outputTokens);
|
|
102
|
+
break;
|
|
103
|
+
}
|
|
104
|
+
catch {
|
|
105
|
+
// Skip malformed lines without discarding usage from earlier messages.
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
const parsedContextWindow = Number.parseInt(configuredContextWindow ?? '', 10);
|
|
109
|
+
const contextWindow = Number.isFinite(parsedContextWindow) ? parsedContextWindow : 160_000;
|
|
110
|
+
const cacheTokens = cacheReadTokens + cacheCreationTokens;
|
|
111
|
+
return {
|
|
112
|
+
used: inputTokens + outputTokens,
|
|
113
|
+
total: contextWindow,
|
|
114
|
+
inputTokens,
|
|
115
|
+
outputTokens,
|
|
116
|
+
cacheReadTokens,
|
|
117
|
+
cacheCreationTokens,
|
|
118
|
+
cacheTokens,
|
|
119
|
+
breakdown: { input: inputTokens, output: outputTokens },
|
|
120
|
+
};
|
|
121
|
+
}
|
|
122
|
+
function readOpenCodeTokenUsage(databasePath, providerSessionId) {
|
|
123
|
+
const database = new Database(databasePath, { readonly: true, fileMustExist: true });
|
|
124
|
+
try {
|
|
125
|
+
const columns = database.prepare('PRAGMA table_info(session)').all();
|
|
126
|
+
const columnNames = new Set(columns.map((column) => column.name));
|
|
127
|
+
const requiredColumns = [
|
|
128
|
+
'tokens_input',
|
|
129
|
+
'tokens_output',
|
|
130
|
+
'tokens_reasoning',
|
|
131
|
+
'tokens_cache_read',
|
|
132
|
+
'tokens_cache_write',
|
|
133
|
+
];
|
|
134
|
+
if (!requiredColumns.every((column) => columnNames.has(column))) {
|
|
135
|
+
return {
|
|
136
|
+
used: 0,
|
|
137
|
+
inputTokens: 0,
|
|
138
|
+
outputTokens: 0,
|
|
139
|
+
breakdown: { input: 0, output: 0 },
|
|
140
|
+
unsupported: true,
|
|
141
|
+
message: 'Token usage tracking is not available in this OpenCode database schema',
|
|
142
|
+
};
|
|
143
|
+
}
|
|
144
|
+
const row = database.prepare(`
|
|
145
|
+
SELECT
|
|
146
|
+
tokens_input AS inputTokens,
|
|
147
|
+
tokens_output AS outputTokens,
|
|
148
|
+
tokens_reasoning AS reasoningTokens,
|
|
149
|
+
tokens_cache_read AS cacheReadTokens,
|
|
150
|
+
tokens_cache_write AS cacheWriteTokens
|
|
151
|
+
FROM session
|
|
152
|
+
WHERE id = ?
|
|
153
|
+
`).get(providerSessionId);
|
|
154
|
+
if (!row) {
|
|
155
|
+
throw new AppError('OpenCode session was not found.', {
|
|
156
|
+
code: 'OPENCODE_SESSION_NOT_FOUND',
|
|
157
|
+
statusCode: 404,
|
|
158
|
+
});
|
|
159
|
+
}
|
|
160
|
+
const inputTokens = readUsageNumber(row.inputTokens) + readUsageNumber(row.cacheReadTokens);
|
|
161
|
+
const outputTokens = readUsageNumber(row.outputTokens);
|
|
162
|
+
const used = readUsageNumber(row.inputTokens)
|
|
163
|
+
+ outputTokens
|
|
164
|
+
+ readUsageNumber(row.reasoningTokens)
|
|
165
|
+
+ readUsageNumber(row.cacheReadTokens)
|
|
166
|
+
+ readUsageNumber(row.cacheWriteTokens);
|
|
167
|
+
return {
|
|
168
|
+
used,
|
|
169
|
+
inputTokens,
|
|
170
|
+
outputTokens,
|
|
171
|
+
breakdown: { input: inputTokens, output: outputTokens },
|
|
172
|
+
};
|
|
173
|
+
}
|
|
174
|
+
finally {
|
|
175
|
+
database.close();
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
/**
|
|
179
|
+
* Creates the provider token-usage service used by the provider routes. The
|
|
180
|
+
* provider test suite supplies isolated filesystem and session dependencies so
|
|
181
|
+
* every calculator can be exercised without touching a developer's real data.
|
|
182
|
+
*/
|
|
183
|
+
export function createProviderTokenUsageService(dependencyOverrides = {}) {
|
|
184
|
+
const dependencies = { ...defaultDependencies, ...dependencyOverrides };
|
|
185
|
+
return {
|
|
186
|
+
/**
|
|
187
|
+
* Resolves all provider-specific storage details from one app-facing
|
|
188
|
+
* session id, then returns the latest usage snapshot for that provider.
|
|
189
|
+
*/
|
|
190
|
+
async getSessionTokenUsage(sessionId) {
|
|
191
|
+
const session = dependencies.getSessionById(sessionId);
|
|
192
|
+
if (!session) {
|
|
193
|
+
throw new AppError(`Session "${sessionId}" was not found.`, {
|
|
194
|
+
code: 'SESSION_NOT_FOUND',
|
|
195
|
+
statusCode: 404,
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
const providerSessionId = session.provider_session_id || sessionId;
|
|
199
|
+
if (session.provider === 'cursor') {
|
|
200
|
+
return {
|
|
201
|
+
used: 0,
|
|
202
|
+
total: 0,
|
|
203
|
+
inputTokens: 0,
|
|
204
|
+
outputTokens: 0,
|
|
205
|
+
breakdown: { input: 0, output: 0 },
|
|
206
|
+
unsupported: true,
|
|
207
|
+
message: 'Token usage tracking not available for Cursor sessions',
|
|
208
|
+
};
|
|
209
|
+
}
|
|
210
|
+
if (session.provider === 'opencode') {
|
|
211
|
+
const databasePath = dependencies.getOpenCodeDatabasePath();
|
|
212
|
+
if (!dependencies.fileExists(databasePath)) {
|
|
213
|
+
throw new AppError('OpenCode database was not found.', {
|
|
214
|
+
code: 'OPENCODE_DATABASE_NOT_FOUND',
|
|
215
|
+
statusCode: 404,
|
|
216
|
+
});
|
|
217
|
+
}
|
|
218
|
+
return readOpenCodeTokenUsage(databasePath, providerSessionId);
|
|
219
|
+
}
|
|
220
|
+
if (session.provider === 'codex') {
|
|
221
|
+
const indexedFilePath = session.jsonl_path && dependencies.fileExists(session.jsonl_path)
|
|
222
|
+
? session.jsonl_path
|
|
223
|
+
: null;
|
|
224
|
+
const sessionFilePath = indexedFilePath ?? await findCodexSessionFile(path.join(dependencies.getHomeDirectory(), '.codex', 'sessions'), providerSessionId, dependencies);
|
|
225
|
+
if (!sessionFilePath) {
|
|
226
|
+
throw new AppError(`Codex session file for "${sessionId}" was not found.`, {
|
|
227
|
+
code: 'CODEX_SESSION_FILE_NOT_FOUND',
|
|
228
|
+
statusCode: 404,
|
|
229
|
+
});
|
|
230
|
+
}
|
|
231
|
+
const fileContent = await dependencies.readTextFile(sessionFilePath);
|
|
232
|
+
return readCodexTokenUsage(fileContent);
|
|
233
|
+
}
|
|
234
|
+
let sessionFilePath = session.jsonl_path;
|
|
235
|
+
if (!sessionFilePath) {
|
|
236
|
+
if (!session.project_path) {
|
|
237
|
+
throw new AppError(`Session file for "${sessionId}" was not found.`, {
|
|
238
|
+
code: 'SESSION_FILE_NOT_FOUND',
|
|
239
|
+
statusCode: 404,
|
|
240
|
+
});
|
|
241
|
+
}
|
|
242
|
+
const encodedProjectPath = session.project_path.replace(/[^a-zA-Z0-9-]/g, '-');
|
|
243
|
+
const projectDirectory = path.join(dependencies.getHomeDirectory(), '.claude', 'projects', encodedProjectPath);
|
|
244
|
+
sessionFilePath = path.join(projectDirectory, `${providerSessionId}.jsonl`);
|
|
245
|
+
const relativePath = path.relative(path.resolve(projectDirectory), path.resolve(sessionFilePath));
|
|
246
|
+
if (relativePath.startsWith('..') || path.isAbsolute(relativePath)) {
|
|
247
|
+
throw new AppError('Resolved session path is invalid.', {
|
|
248
|
+
code: 'INVALID_SESSION_PATH',
|
|
249
|
+
statusCode: 400,
|
|
250
|
+
});
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
if (!dependencies.fileExists(sessionFilePath)) {
|
|
254
|
+
throw new AppError(`Session file for "${sessionId}" was not found.`, {
|
|
255
|
+
code: 'SESSION_FILE_NOT_FOUND',
|
|
256
|
+
statusCode: 404,
|
|
257
|
+
});
|
|
258
|
+
}
|
|
259
|
+
const fileContent = await dependencies.readTextFile(sessionFilePath);
|
|
260
|
+
return readClaudeTokenUsage(fileContent, dependencies.getClaudeContextWindow());
|
|
261
|
+
},
|
|
262
|
+
};
|
|
263
|
+
}
|
|
264
|
+
/**
|
|
265
|
+
* Used by the provider routes to serve token usage from only an app session id.
|
|
266
|
+
*/
|
|
267
|
+
export const providerTokenUsageService = createProviderTokenUsageService();
|
|
268
|
+
//# sourceMappingURL=provider-token-usage.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-token-usage.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/provider-token-usage.service.ts"],"names":[],"mappings":"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"}
|