diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7a4f9a9f..33dab3f0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Setup Node.js uses: actions/setup-node@v6 @@ -24,7 +24,7 @@ jobs: node-version: "20" - name: Setup pnpm - uses: pnpm/action-setup@v5 + uses: pnpm/action-setup@v6 with: version: 10.12.3 run_install: false @@ -58,7 +58,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Setup Rust uses: dtolnay/rust-toolchain@stable diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml new file mode 100644 index 000000000..40ebefb1d --- /dev/null +++ b/.github/workflows/claude.yml @@ -0,0 +1,61 @@ +name: Claude + +on: + issue_comment: + types: [created] + pull_request_review_comment: + types: [created] + pull_request_review: + types: [submitted] + issues: + types: [opened, assigned] + +jobs: + claude: + if: | + ((github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude') && + (github.event.comment.author_association == 'OWNER' || + github.event.comment.author_association == 'MEMBER' || + github.event.comment.author_association == 'COLLABORATOR')) + || + (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude') && + (github.event.comment.author_association == 'OWNER' || + github.event.comment.author_association == 'MEMBER' || + github.event.comment.author_association == 'COLLABORATOR')) + || + (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude') && + (github.event.review.author_association == 'OWNER' || + github.event.review.author_association == 'MEMBER' || + github.event.review.author_association == 'COLLABORATOR')) + || + (github.event_name == 'issues' && + (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')) && + (github.event.issue.author_association == 'OWNER' || + github.event.issue.author_association == 'MEMBER' || + github.event.issue.author_association == 'COLLABORATOR'))) + runs-on: ubuntu-latest + permissions: + contents: read + pull-requests: write + issues: write + id-token: write + steps: + - name: Checkout + uses: actions/checkout@v6 + with: + fetch-depth: 1 + ref: ${{ github.event.pull_request.head.sha || github.sha }} + + - name: Run Claude (review only) + uses: anthropics/claude-code-action@v1 + with: + claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }} + claude_args: >- + --model claude-opus-4-7 + --disallowedTools Edit,Write,MultiEdit,NotebookEdit + --append-system-prompt "You are reviewing PRs for cc-switch — a small open-source Tauri 2.0 + React + TypeScript desktop app maintained by a single developer who values pragmatism over perfection. + ONLY flag HIGH SIGNAL issues. An issue qualifies only if it meets at least one of: code that fails to compile/parse/run; code that will definitely produce wrong results; a security vulnerability with a concrete trigger (SSRF, injection, unsafe deserialization, credential or data leaks); database/migration correctness (schema mismatch, data loss on upgrade, broken SCHEMA_VERSION transition); cross-platform breakage (Windows/macOS/Linux specific); clear, quotable violations of CLAUDE.md. + Each finding must include a confidence score from 0 to 100. Do NOT post any finding scored below 80. Each finding must carry a severity tag — Important (bug that should be fixed before merge), Nit (minor, worth fixing but not blocking), or Pre-existing (exists already, not introduced by this PR). + DO NOT flag any of the following: pedantic nitpicks a senior engineer would not raise; anything a linter, typechecker, pnpm format, or cargo fmt would catch; missing test coverage unless CLAUDE.md explicitly mandates it; style, naming, or 'could be more idiomatic' suggestions; speculative future-proofing ('what if X is added later'); issues on lines the PR did not modify; potential bugs for which you cannot construct a concrete failure scenario; positive feedback or 'what is well done' sections. + OUTPUT RULES: Cap Nit-level findings at 5 per review. If you found more nits, append 'plus N similar nits' to the summary instead of listing them inline. If only nits were found, lead the review with 'No blocking issues.' If nothing material is wrong, say 'LGTM' explicitly and stop — approval with zero comments is a valid and expected outcome for most PRs. Do NOT post a final APPROVE or REQUEST CHANGES verdict; leave the merge decision to the maintainer. + Never modify files, push commits, or create PRs." diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e06dcfdf..391587ef8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Setup Node.js uses: actions/setup-node@v6 @@ -74,7 +74,7 @@ jobs: || sudo apt-get install -y --no-install-recommends libsoup2.4-dev - name: Setup pnpm - uses: pnpm/action-setup@v5 + uses: pnpm/action-setup@v6 with: version: 10.12.3 run_install: false @@ -535,7 +535,7 @@ jobs: ls -la release-assets - name: Upload Release Assets - uses: softprops/action-gh-release@v2 + uses: softprops/action-gh-release@v3 with: tag_name: ${{ github.ref_name }} name: CC Switch ${{ github.ref_name }} @@ -543,6 +543,8 @@ jobs: body: | ## CC Switch ${{ github.ref_name }} + 🌐 **Only Official Website / 唯一官方网站 / 唯一の公式サイト**: [ccswitch.io](https://ccswitch.io) + Claude Code 供应商切换工具 ### 下载 diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 7ef7572ea..0ba9148cb 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -13,7 +13,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v9 + - uses: actions/stale@v10 with: # --- Timing --- days-before-stale: 60 diff --git a/.gitignore b/.gitignore index e5f979d23..9b145a06d 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ copilot-api .history CODEBUDDY.md .github +mainWindow.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 04cb925ff..795d7f5fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,140 @@ All notable changes to CC Switch will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] + +### Fixed + +- **OpenAI Responses API usage parsing robustness**: Hardened `build_anthropic_usage_from_responses()` and the Responses → Anthropic SSE translator so a missing or malformed upstream `usage` no longer produces `"usage": null` in `message_delta`. This unblocks strict Anthropic clients (notably the VSCode Claude Code extension) that crashed with "Cannot read properties of null (reading 'output_tokens')" against providers such as Codex OAuth and DashScope's `compatible-mode/v1/responses` endpoint. Added OpenAI field-name fallbacks (`prompt_tokens` / `completion_tokens`), null/empty/partial object handling, and preserved cache token fields even when input/output tokens are missing (#2422). + +## [3.14.1] - 2026-04-23 + +Development since v3.14.0 focuses on Codex OAuth stability, tray usage visibility, Skills import/install reliability, Gemini session restore paths, and simplifying Hermes configuration health handling. + +**Stats**: 13 commits | 48 files changed | +1,883 insertions | -808 deletions + +### Added + +- **Tray Usage Visibility**: System tray submenus now show cached usage for the current Claude / Codex / Gemini provider, including subscription and script-based usage summaries with utilization color markers. Tray-triggered refreshes are throttled, limited to visible apps, and synchronized back into React Query so the main window and tray share fresh usage data (#2184). +- **Tray Coding-Plan Usage (Kimi / Zhipu / MiniMax)**: System tray now renders 5-hour + weekly window usage for Chinese coding-plan providers using the same `🟢 h12% w80%` two-window layout as official subscription badges (worst utilization drives the emoji). Creating a Claude provider whose `ANTHROPIC_BASE_URL` matches a known coding-plan host now auto-injects `meta.usage_script`, so the tray lights up without opening the Usage Script modal. Existing `usage_script` values are preserved on update. +- **Codex OAuth FAST Mode**: Added an explicit FAST mode toggle for Codex OAuth-backed Claude providers. When enabled, converted Responses requests send `service_tier="priority"` for lower latency; the toggle stays off by default to avoid unexpectedly increasing ChatGPT quota consumption (#2210). + +### Changed + +- **Session and Settings Layout Polish**: Hardened the scroll-area viewport with width containment to fix horizontal overflow, and tightened app bottom spacing plus settings footer spacing so long session/settings views fit more cleanly (#2201). + +### Removed + +- **Hermes Config Health Scanner**: Removed the in-app Hermes config health scanner, warning banner, `scan_hermes_config_health` command, `HermesHealthWarning` type, and `HermesWriteOutcome.warnings` payload. CC Switch now keeps the Hermes surface focused on active provider display, provider switching defaults, memory editing, and launching the Hermes Web UI for deep configuration. + +### Fixed + +- **Codex OAuth Cache Routing**: Stabilized ChatGPT Codex reverse-proxy cache identity by using client-provided session IDs for `prompt_cache_key` and Codex session headers, preserving explicit cache keys, and avoiding generated UUID cache churn (#2218). +- **Codex OAuth Responses SSE Aggregation**: Non-streaming Anthropic clients now receive JSON even when the ChatGPT Codex upstream forces OpenAI Responses SSE; CC Switch aggregates the upstream SSE events before running the non-streaming transform (#2235). +- **Codex OAuth Stream Check Parity**: Stream checks now build Codex OAuth test requests with the same `store: false`, encrypted reasoning include, and provider FAST mode setting as production proxy requests (#2210). +- **Codex Model Extraction**: Replaced first-line regex matching with TOML parsing when reading Codex config models, so multiline TOML is handled correctly (#2227). +- **Model Quick-Set / One-Click Config**: Model quick-set updates now apply against the latest provider form config, preventing stale state from making one-click configuration fail (#2249). +- **Skills Import Duplicates**: The Skills import dialog disables actions while import is pending and the installed-skills cache deduplicates imported results by ID, preventing double-clicks from adding duplicate installed entries (#2139, #2211). +- **Root-Level Skill Repos**: Skill install and update flows now consistently resolve three source patterns: direct nested paths, install-name recursive search, and repository-root `SKILL.md` sources (#2231). +- **Gemini Session Restore Paths**: Gemini session scanning now reads `.project_root` metadata so restore flows can pass the original project directory when available (#2240). +- **Provider Hover Names**: Provider icons now expose the provider name on hover for inline SVG, image URL, and fallback initials render paths (#2237). + +## [3.14.0] - 2026-04-21 + +Development since v3.13.0 focuses on onboarding Hermes Agent as a first-class managed app, rolling out Claude Opus 4.7 across the preset matrix, adding a Gemini Native API proxy, and sharpening session, usage, and proxy workflows. + +**Stats**: 100 commits | 219 files changed | +20,548 insertions | -3,569 deletions + +### Added + +- **Hermes Agent Support (6th Managed App)**: Added Hermes Agent as a first-class managed app with database migration v9→v10, full Rust command surface, YAML-backed `~/.hermes/config.yaml` read/write with atomic backups, MCP sync, Skills sync, session manager with SQLite + JSONL support, and dedicated frontend panels. Supports four API protocols (`chat_completions`, `anthropic_messages`, `codex_responses`, `bedrock_converse`) aligned with Hermes Agent 0.10.0 schema. Read-only rendering for providers owned by the user-authored `providers:` dict, with deep configuration delegated to the Hermes Web UI. +- **Hermes Memory Panel**: Added a Memory panel for editing `MEMORY.md` and `USER.md` directly from CC Switch, with an enable switch, character-count limits, and a live save flow. Replaces the Prompts entry for Hermes. +- **Hermes Provider Presets**: Added ~50 Hermes provider presets spanning Nous Research, Shengsuanyun, OpenRouter, DeepSeek, Together AI, StepFun, Zhipu GLM, Bailian, Kimi, MiniMax, DouBao, BaiLing, ModelScope, KAT-Coder, PackyCode, Cubence, AIGoCode, RightCode, AICodeMirror, AICoding, CrazyRouter, SSSAiCode, Micu, CTok.ai, DDSHub, E-FlowCode, LionCCAPI, PIPELLM, Compshare, SiliconFlow, AiHubMix, DMXAPI, TheRouter, Novita, Nvidia, and Xiaomi MiMo. +- **Claude Opus 4.7 Support**: Added Claude Opus 4.7 with adaptive thinking whitelisting, per-million pricing seed, and Bedrock SKU (`anthropic.claude-opus-4-7` / `global.anthropic.claude-opus-4-7`, dropping the legacy `-v1` suffix). Migrated all aggregator and Bedrock presets to Opus 4.7 as the default Opus model. +- **Claude `max` Effort Tier**: Upgraded the Claude effort dropdown from `high` to `max` for extended reasoning capacity. +- **Gemini Native API Proxy**: Added `api_format = "gemini_native"` so the proxy can forward to Google's `generateContent` API with full streaming, schema conversion, and shadow request support. Adds `gemini_url.rs`, `gemini_schema.rs`, `gemini_shadow.rs`, `streaming_gemini.rs`, and `transform_gemini.rs` under the proxy providers module. +- **GitHub Copilot Enterprise Server**: Added GHES authentication and endpoint configuration for Copilot-backed Claude providers, plus thinking-block stripping before upstream to preserve premium interaction quota. +- **Session List Virtualization**: Virtualized the session list via `@tanstack/react-virtual` so long conversations (thousands of records) scroll smoothly; long session messages are now collapsed by default to reduce text layout cost. +- **Codex / OpenClaw Session Title Extraction**: Added meaningful title auto-extraction for Codex and OpenClaw sessions with 2-line display; strips OpenClaw `message_id` suffix noise. +- **Usage Date Range Picker**: Added a date range selector to the usage dashboard with preset tabs (Today / 1d / 7d / 14d / 30d), a custom date + time calendar picker, and a page-jump input on paginated lists. +- **Model Mapping Quick-Set**: Added a quick-set button next to model mapping fields in provider forms for faster edits. +- **Stream Check Error Classification**: Classified Stream Check errors and surfaced them as color-coded toasts; refreshed default probe models and added explicit detection for "model not found" responses. +- **Block Official Provider Switching During Local Routing**: Blocks switching to official providers while Local Routing is active, since routing official API traffic through the local proxy carries account-suspension risk. A warning toast surfaces the block. +- **Pricing Database Refresh (v8 → v9)**: Added ~50 new model pricing entries and corrected stale prices via a reseed-on-migration step, including Claude 4.7, Opus 4.7 Adaptive Thinking, Grok 4, Qwen 3.5/3.6, MiniMax M2.5/M2.7, Doubao Seed 2.0 series, and GLM-5/5.1. DeepSeek and Kimi K2.5 prices updated. +- **Application-Level Window Controls**: Added an opt-in setting to render CC Switch's own minimize / toggle-maximize / close buttons instead of the system decorations, materially improving the experience on Linux Wayland where compositor-drawn buttons can become inert. +- **Hermes in Unified Skills Management**: Added Hermes to the unified Skills surface; skill install, enable, and filter now cover the Hermes app alongside Claude / Codex / Gemini / OpenCode / OpenClaw. +- **OpenClaw Config Directory Override**: Added a settings option to point CC Switch at a custom `openclaw.json` location. +- **Hermes Config Directory Override**: Added a settings option to point CC Switch at a custom `~/.hermes/config.yaml` location, backed by data-driven dispatch. +- **StepFun Step Plan Preset**: Added StepFun Step Plan (EN/ZH) provider presets. +- **New API Usage Script Template**: Added a User-Agent header to the New API usage script template for better upstream compatibility. +- **Launch Hermes Dashboard from Toolbar**: When the Hermes Web UI probe fails, the toolbar entry now offers to run `hermes dashboard` in the user's preferred terminal via a temp bash/batch script. `hermes dashboard` opens the browser itself once ready, so no polling is required. Also corrects the stale `hermes web` hint in the offline toast (the real command is `hermes dashboard`) and reorders Linux terminal detection to try `which` before stat'ing `/usr/bin`, `/bin`, `/usr/local/bin`. +- **LemonData Provider Preset (All Six Apps)**: Registered LemonData as a third-party partner preset across Claude, Codex, Gemini, OpenCode, OpenClaw, and Hermes, with icon assets and zh/en/ja partner-promotion copy. Claude uses `ANTHROPIC_API_KEY` auth; OpenAI-compatible apps target `gpt-5.4`. +- **DDSHub Codex Preset**: Added a Codex-compatible endpoint for DDSHub at the same host as its Claude service; base URL omits the `/v1` suffix because the gateway auto-routes OpenAI SDK paths. + +### Changed + +- **"Local Proxy Takeover" → "Local Routing"**: Unified terminology across UI copy, README, and docs in all three locales. Functional behavior is unchanged. +- **Hermes `Auto` api_mode Removed**: Users must now pick an explicit protocol; new deeplinks default to `chat_completions`. Eliminates URL-based heuristic surprises. +- **Hermes Provider Form**: Added an API mode dropdown and per-provider model editor; bound per-provider models to the top-level `model:` when switching active providers. +- **Hermes Deep Config Delegation**: Deep YAML knobs are now delegated to the Hermes Web UI via a direct launch action, rather than duplicated in the CC Switch form. +- **`ANTHROPIC_REASONING_MODEL` Removed from Claude Quick-Set**: Decoupled the reasoning capability from model selection; the legacy field is no longer surfaced in the quick-set form. +- **Per-Provider Proxy Config Removed**: Consolidated into global Local Routing; the provider-level proxy toggle and associated storage are gone. +- **Unified Toolbar Icon Button Width**: Normalized icon-button widths across Claude / Codex / Gemini / OpenCode / OpenClaw / Hermes panels for a consistent header look. +- **Rust Toolchain Pinned to 1.95**: Adopted clippy 1.95 suggestions across the workspace and pinned the toolchain to prevent nightly drift. +- **Tray Menu ID Constant**: The tray identifier moved from the hardcoded string `"main"` to a `TRAY_ID` constant (`"cc-switch"`) across all call sites. +- **Copilot Request Classification**: Refined request routing inside the Copilot optimizer to further reduce unnecessary premium interaction consumption. +- **Usage Script Intranet Support**: Removed private-IP / suspicious-hostname blocking from usage scripts, unblocking enterprise intranet, Docker, and self-hosted API endpoints. Built-in templates still enforce HTTPS (except localhost) and same-origin checks; custom templates remain user-controlled with those request-URL checks skipped. +- **Failover Queue Notes**: Provider notes now appear in failover queue selectors and queue rows for easier identification across multi-provider queues. +- **Hermes Toolbar Layout**: Swapped the Hermes Web UI button from `ExternalLink` to `LayoutDashboard` (clicking may spawn `hermes dashboard` rather than just opening a URL), and moved MCP to the final toolbar slot so Hermes matches the Claude / Codex / Gemini / OpenCode layout. + +### Fixed + +- **Header Auto-Compact Latching After Maximize**: The toolbar no longer stays compacted after maximize/restore; compaction now reevaluates on size changes. +- **Hermes YAML Pollution & OAuth MCP Auth Drop**: Round-tripping through CC Switch no longer drops OAuth MCP `auth` blocks or pollutes unrelated YAML keys; guard tests added via `tests/hermes_roundtrip.rs`. +- **Hermes Active Provider Display**: Hermes UI now correctly surfaces the active provider and wires add / enable / remove actions. +- **Hermes Provider Persistence**: Providers persist under `custom_providers:` so `api_mode` and `model` survive restarts and config reloads. +- **Codex `cache_control` Preservation**: Preserve `cache_control` when merging system prompts during Codex format conversion (#1946). +- **Claude Prompt Cache Key Leak**: Stopped sending prompt cache keys during Claude chat conversions (#2003). +- **Proxy Hop-by-Hop Header Stripping**: Strip hop-by-hop response headers (Connection, Keep-Alive, Transfer-Encoding, etc.) per RFC 7230. +- **Permissive Proxy CORS Removed**: Removed the permissive CORS layer from the proxy (#1915). +- **Copilot Premium Consumption**: Further reduced unnecessary Copilot premium interaction consumption during pass-through traffic. +- **Backend Error Details in Proxy Toast**: Surface backend error payload details in proxy-related toast messages instead of a generic failure string. +- **Usage Log Deduplication**: Deduplicated proxy and session-log usage records so the same request is no longer double-counted; synced the request log time range with the dashboard's 1d / 7d / 30d selector. +- **Common Config Checkbox Persistence**: Checkbox state for Claude / Codex / Gemini common-config toggles now persists correctly across reopens. +- **Claude Plugin `settings.json` Sync**: Editing the current provider now syncs back to `settings.json` for the Claude plugin path. +- **Google Official Gemini Env Preservation**: Saving the Google Official Gemini provider no longer clobbers the `env` block. +- **OpenCode JSON5 Parser for Trailing Commas**: OpenCode config reads now tolerate trailing commas via a JSON5 parser. +- **Preset Refreshes**: Refreshed stale context windows for DeepSeek and Claude 1M; refreshed stale model IDs; backfilled Hermes model lists; fixed the Nous endpoint and replaced the Hermes placeholder icon with Nous brand artwork; pruned unused official Hermes presets. +- **Auto-Expand Collapsed Messages on Search Hit**: Collapsed messages now auto-expand when a search match lands inside hidden content. +- **Unknown Subscription Quota Tiers Hidden**: Provider cards no longer render unknown subscription quota tiers. +- **Weekly Limit Label Unified**: Aligned the weekly_limit tier label with the official 7-day naming across locales. +- **Root-Level Skill Repo Install**: Fixed skill installation when the repository root itself is a skill. +- **Session ID Parsing Clippy**: Removed a redundant closure in session ID parsing (clippy warning). +- **Usage Log Stat Dedup**: Deduplicated proxy-sourced and session-log-sourced usage records for accurate totals. +- **Stream Check Default Models Refresh**: Updated stream-check default probe models to match each vendor's current lineup. +- **Skills Import Sync**: Imported Skills are now immediately synced into enabled app directories instead of only being recorded in the database, so the UI no longer shows "installed" while the target app directory is missing the skill. +- **Ghostty Session Restore**: Fixed Ghostty session restore launch by using shell execution with `--working-directory`, avoiding `cwd` escaping issues when the path contains spaces or special characters. +- **Hermes Health Check Borrowing OpenClaw Schema**: Hermes providers were routed through `check_additive_app_stream` (the OpenClaw dispatcher), which reads camelCase `baseUrl` / `apiKey` / `api` and surfaced "OpenClaw provider is missing baseUrl" even when every Hermes field was filled. Introduced `check_hermes_stream` with Hermes-specific extractors that map `api_mode` (`chat_completions` / `anthropic_messages` / `codex_responses`) to the matching `check_claude_stream` `api_format`, and returns `bedrock_converse` as unsupported. `api_mode` is now resolved before URL / API key extraction, so `bedrock_converse` users see the real cause rather than a misleading "missing base_url". +- **Usage Query Modal for Hermes & OpenClaw**: `getProviderCredentials` now reads flat `settingsConfig` fields for Hermes (snake_case `base_url` / `api_key`) and OpenClaw (camelCase `baseUrl` / `apiKey`), so the "official balance" template auto-selects for matching providers like SiliconFlow. Also refactored the BALANCE and TOKEN_PLAN test paths to reuse the precomputed `providerCredentials` instead of re-reading `env.ANTHROPIC_*` directly, fixing the "empty key" error for non-Claude apps even when the key was configured. + +### Docs + +- **README Sponsor Updates**: Updated SiliconFlow signup bonus to ¥16, trimmed the SSSAiCode sponsor blurb, updated partner logos, and added LemonData as a new sponsor. +- **Global Proxy Hint Clarified**: Clarified the global proxy hint about local routing across all three locales. +- **Takeover → Routing Rename**: Renamed takeover docs to routing and updated anchors across all languages. +- **PIPELLM Website URL**: Updated the PIPELLM sponsor website URL to `code.pipellm.ai`. + +### Breaking + +- **Hermes requires explicit `api_mode`**: The `Auto` mode is gone; imported or deeplinked providers default to `chat_completions`. Users with prior `Auto` configs will be prompted to pick a protocol. +- **`ANTHROPIC_REASONING_MODEL` removed from Claude quick-set**: The legacy field is no longer exposed; existing settings are cleaned up automatically. +- **Per-provider proxy configuration removed**: Migrate to the global Local Routing setting. Existing per-provider proxy values are ignored. +- **Database schema bumped v9 → v10**: Adds `enabled_hermes` columns to `mcp_servers` and `skills` (auto-migrated with `DEFAULT 0`; no data loss). +- **Pricing table reseeded (v8 → v9)**: The `model_pricing` table is cleared and reseeded on first launch to pick up new models and corrected prices. +- **XCodeAPI preset removed**: Users of the XCodeAPI preset should switch to another provider. + +--- + ## [3.13.0] - 2026-04-10 Development since v3.12.3 focuses on quota visibility, provider workflow upgrades, stronger proxy compatibility, and lower-overhead tray / session workflows. diff --git a/README.md b/README.md index 19bcf0a76..dc616bd31 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # CC Switch -### The All-in-One Manager for Claude Code, Codex, Gemini CLI, OpenCode & OpenClaw +### The All-in-One Manager for Claude Code, Codex, Gemini CLI, OpenCode, OpenClaw & Hermes Agent [![Version](https://img.shields.io/github/v/release/farion1231/cc-switch?color=blue&label=version)](https://github.com/farion1231/cc-switch/releases) [![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-lightgrey.svg)](https://github.com/farion1231/cc-switch/releases) @@ -11,6 +11,8 @@ farion1231%2Fcc-switch | Trendshift +### 🌐 The Only Official Website: **[ccswitch.io](https://ccswitch.io)** + English | [中文](README_ZH.md) | [日本語](README_JA.md) | [Changelog](CHANGELOG.md) @@ -42,21 +44,33 @@ MiniMax-M2.7 is a next-generation large language model designed for autonomous e -Shengsuanyun +Shengsuanyun Thanks to Shengsuanyun for sponsoring this project! Shengsuanyun is a super factory serving AI Native Teams — an industrial-grade AI task parallel execution platform. Its model marketplace aggregates Claude, ChatGPT, Gemini, and other domestic and international LLM and multimedia model capabilities with direct supply. Absolutely no reverse engineering or dilution — platform-wide model SLA availability reaches 99.7%, with monitoring dashboards showing green across the board. It also offers enterprise-grade custom gateways for fine-grained team cost and permission management, smart routing, security protection, and BYOK (Bring Your Own Key) hosting. The platform charges on a pay-per-use and tokens plan (coming soon) basis, with invoicing available. Register via this link as a new user to receive ¥10 in credits plus a 10% bonus on your first top-up. - -SiliconFlow -Thanks to SiliconFlow for sponsoring this project! SiliconFlow is a high-performance AI infrastructure and model API platform, providing fast and reliable access to language, speech, image, and video models in one place. With pay-as-you-go billing, broad multimodal model support, high-speed inference, and enterprise-grade stability, SiliconFlow helps developers and teams build and scale AI applications more efficiently. Register via this link and complete real-name verification to receive ¥20 in bonus credit, usable across models on the platform. SiliconFlow is also now compatible with OpenClaw, allowing users to connect a SiliconFlow API key and call major AI models for free. - - AICodeMirror Thanks to AICodeMirror for sponsoring this project! AICodeMirror provides official high-stability relay services for Claude Code / Codex / Gemini CLI, with enterprise-grade concurrency, fast invoicing, and 24/7 dedicated technical support. Claude Code / Codex / Gemini official channels at 38% / 2% / 9% of original price, with extra discounts on top-ups! AICodeMirror offers special benefits for CC Switch users: register via this link to enjoy 20% off your first top-up, and enterprise customers can get up to 25% off! + +PatewayAI +Thanks to PatewayAI for sponsoring this project! PatewayAI is an API relay service provider built for heavy AI developers, focused on directly relaying official high-quality model APIs. It offers the full Claude lineup and the Codex series, 100% sourced from official channels — no dilution, no fakes, verification welcome. Billing is transparent and every token-level invoice can be audited line by line. +It also supports enterprise-grade concurrency and provides a dedicated management platform for enterprise customers — formal contracts and invoicing are available; visit the official website for contact details. +Register now via this link to receive $3 in trial credit. Top-ups go as low as 60% of the original price, with a two-way referral bonus of up to $150! + + + +BytePlus +Thanks to Dola seed for sponsoring this project! Dola Seed 2.0 is a full‑modal general large model independently developed by ByteDance for the global market. Built on a unified multimodal architecture, it supports joint understanding and generation of text, images, audio, and video. It natively enables agent collaboration, with strong reasoning, long‑task execution, tool integration, and coding capabilities. It is widely applicable to smart cockpits, personal assistants, education, customer support, marketing, retail, and other scenarios. It excels in multimodal perception, end‑to‑end complex task delivery, stable interaction, and data security, and is readily accessible and deployable via the ModelArk platform.Register via this link to get 500,000 tokens of free inference quota per model. + + + +SiliconFlow +Thanks to SiliconFlow for sponsoring this project! SiliconFlow is a high-performance AI infrastructure and model API platform, providing fast and reliable access to language, speech, image, and video models in one place. With pay-as-you-go billing, broad multimodal model support, high-speed inference, and enterprise-grade stability, SiliconFlow helps developers and teams build and scale AI applications more efficiently. Register via this link and complete real-name verification to receive ¥16 in bonus credit, usable across models on the platform. SiliconFlow is also now compatible with OpenClaw, allowing users to connect a SiliconFlow API key and call major AI models for free. + + Cubence Thanks to Cubence for sponsoring this project! Cubence is a reliable and efficient API relay service provider, offering relay services for Claude Code, Codex, Gemini, and more with flexible billing options including pay-as-you-go and monthly plans. Cubence provides special discounts for CC Switch users: register using this link and enter the "CCSWITCH" promo code during recharge to get 10% off every top-up! @@ -69,7 +83,7 @@ Claude Code / Codex / Gemini official channels at 38% / 2% / 9% of original pric Compshare -Thanks to Compshare for sponsoring this project! Compshare is UCloud's AI cloud platform, providing stable and comprehensive domestic and international model APIs with just one key. Featuring cost-effective monthly and pay-as-you-go Coding Plan packages at 60-80% off official prices. Supports Claude Code, Codex, and API access. Enterprise-grade high concurrency, 24/7 technical support, and self-service invoicing. Users who register via this link will receive a free 5 CNY platform trial credit! +Thanks to Compshare for sponsoring this project! Compshare is UCloud's AI cloud platform, providing stable and comprehensive domestic and international model APIs with just one key. Featuring cost-effective monthly and per-use domestic-model Coding Plan packages, alongside stable officially-relayed overseas models. Supports Claude Code, Codex, and API access. Enterprise-grade high concurrency, 24/7 technical support, and self-service invoicing. Users who register via this link will receive a free 5 CNY platform trial credit! @@ -79,22 +93,22 @@ Claude Code / Codex / Gemini official channels at 38% / 2% / 9% of original pric Crazyrouter -Thanks to Crazyrouter for sponsoring this project! Crazyrouter is a high-performance AI API aggregation platform — one API key for 300+ models including Claude Code, Codex, Gemini CLI, and more. All models at 55% of official pricing with auto-failover, smart routing, and unlimited concurrency. Crazyrouter offers an exclusive deal for CC Switch users: register via this link to get $2 free credit instantly, plus enter promo code `CCSWITCH` on your first top-up for an extra 30% bonus credit! +Thanks to Crazyrouter for sponsoring this project! Crazyrouter is a high-performance AI API aggregation platform — one API key for 300+ models including Claude Code, Codex, Gemini CLI, and more. All models at 55% of official pricing with auto-failover, smart routing, and unlimited concurrency. Crazyrouter offers an exclusive deal for CC Switch users: register via this link and contact customer support to claim $2 free credit, plus enter promo code `CCSWITCH` on your first top-up for an extra 30% bonus credit! RightCode -Thank you to Right Code for sponsoring this project! Right Code reliably provides routing services for models such as Claude Code, Codex, and Gemini. It features a highly cost-effective Codex monthly subscription plan and supports quota rollovers—unused quota from one day can be carried over and used the next day. Invoices are available upon top-up. Enterprise and team users can receive dedicated one-on-one support. Right Code also offers an exclusive discount for CC Switch users: register via this link, and with every top-up you will receive pay-as-you-go credit equivalent to 25% of the amount paid. +Thank you to Right Code for sponsoring this project! Right Code reliably provides routing services for models such as Claude Code, Codex, and Gemini, with both pay-as-you-go and monthly subscription billing options available. Invoices are available upon top-up, and enterprise and team users can receive dedicated one-on-one support. Right Code also offers an exclusive discount for CC Switch users: register via this link, and with every top-up you will receive pay-as-you-go credit equivalent to 5% of the amount paid. SSSAiCode -Thanks to SSSAiCode for sponsoring this project! SSSAiCode is a stable and reliable API relay service, dedicated to providing stable, reliable, and affordable Claude and Codex model services, offering high cost-effective official Claude service at just ¥0.5/$ equivalent, supporting monthly and pay-as-you-go billing plans with same-day fast invoicing. SSSAiCode offers a special deal for CC Switch users: register via this link to enjoy $10 extra credit on every top-up! +Thanks to SSSAiCode for sponsoring this project! SSSAiCode is a stable and reliable API relay service, dedicated to providing stable, reliable, and affordable Claude and Codex model services, with same-day fast invoicing. SSSAiCode offers a special deal for CC Switch users: register via this link to enjoy $10 extra credit on every top-up! -Micu -Thanks to Micu API for sponsoring this project! Micu API is a global LLM relay service provider dedicated to delivering the best cost-performance ratio with high stability. Backed by a registered enterprise for core assurance, eliminating any risk of service discontinuation, with fast official invoicing support! We champion "zero cost to try": top up from as low as ¥1 with no minimum, and get fee-free refunds anytime! Micu API offers an exclusive deal for CC Switch users: register via this link and enter promo code "ccswitch" when topping up to enjoy a 10% discount! +Micu +Thanks to Micu API for sponsoring this project! Micu API is a global LLM relay service provider dedicated to delivering the best cost-performance ratio with high stability. Backed by a registered enterprise for core assurance, eliminating any risk of service discontinuation, with fast official invoicing support! We champion "zero cost to try": top up from as low as ¥1 with no minimum, and get fee-free refunds anytime! Micu API offers an exclusive deal for CC Switch users: register via this link and enter promo code "ccswitch" when topping up to enjoy a 10% discount! @@ -108,13 +122,13 @@ Claude Code / Codex / Gemini official channels at 38% / 2% / 9% of original pric -ChefShop -Thanks to ChefShop AI for sponsoring this project! ChefShop AI is a premium account service provider tailored for heavy AI subscription users. The platform offers official top-up and stable account services for mainstream large models including ChatGPT Plus/Pro, Claude Max, Grok Super/Heavy, and Gemini. Click here to purchase! +LionCC +Thanks to LionCC for sponsoring this project! LionCC is built for Vibe Coders who pursue the ultimate development experience. We provide stable, low-latency, and competitively priced computing services for Claude Code, Codex, and OpenClaw, saving up to 50% in costs. After registering, add customer service on WeChat (HSQBJ088888888) with the code "cc-switch" to receive $10 in free credits (10 million tokens). For other collaborations, follow the blog @LionCC.ai. Click here to register! -LionCC -Thanks to LionCC for sponsoring this project! LionCC is built for Vibe Coders who pursue the ultimate development experience. We provide stable, low-latency, and competitively priced computing services for Claude Code, Codex, and OpenClaw, saving up to 50% in costs. After registering, add customer service on WeChat (HSQBJ088888888) with the code "cc-switch" to receive $10 in free credits (10 million tokens). For other collaborations, follow the blog @LionCC.ai. Click here to register! +ClaudeAPI +This project is sponsored by Claude API. Direct Claude API access — connect Claude Code and Agent apps in 3 minutes. New users can claim a free trial credit.Powered by official Anthropic API keys + AWS Bedrock official channels. No reverse engineering, no model degradation. Full support for Opus / Sonnet / Haiku model lineup, with official capabilities preserved including Tool Use, 1M context window, and more. Built for Claude Code power users, Agent engineers, and enterprise engineering teams. Invoicing and dedicated team support available. Click here to register! @@ -123,6 +137,16 @@ Claude Code / Codex / Gemini official channels at 38% / 2% / 9% of original pric Exclusive benefit for CC Switch users: Register via the link below and enjoy an extra 10% credit on your first recharge (please contact the group admin to claim after recharging)! + +ClaudeCN +Thanks to ClaudeCN for sponsoring this project! ClaudeCN is an enterprise-grade AI gateway platform operated by a registered company. It delivers high-availability commercial API access to popular models including Claude, GPT, and DeepSeek, and is built around formal enterprise procurement workflows — corporate bank transfers, signed contracts, and full compliance. Register via this link! + + + +RunAPI +Thanks to RunAPI for sponsoring this project! RunAPI is a high-performance and reliable AI model API gateway — one API key gives you access to 150+ mainstream models including OpenAI, Claude, Gemini, DeepSeek, and Grok, with prices as low as 10% of the official rate and excellent stability. It works seamlessly with Claude Code, OpenClaw, and other tools. Exclusive benefit for CC Switch users: register and contact customer support to claim a free ¥14 credit. Register via this link! + + diff --git a/README_JA.md b/README_JA.md index 3e10dd639..3692eb7f5 100644 --- a/README_JA.md +++ b/README_JA.md @@ -2,7 +2,7 @@ # CC Switch -### Claude Code、Codex、Gemini CLI、OpenCode、OpenClaw のオールインワン管理ツール +### Claude Code、Codex、Gemini CLI、OpenCode、OpenClaw、Hermes Agent のオールインワン管理ツール [![Version](https://img.shields.io/github/v/release/farion1231/cc-switch?color=blue&label=version)](https://github.com/farion1231/cc-switch/releases) [![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-lightgrey.svg)](https://github.com/farion1231/cc-switch/releases) @@ -11,6 +11,8 @@ farion1231%2Fcc-switch | Trendshift +### 🌐 唯一の公式サイト：**[ccswitch.io](https://ccswitch.io)** + [English](README.md) | [中文](README_ZH.md) | 日本語 | [Changelog](CHANGELOG.md) @@ -42,21 +44,33 @@ MiniMax-M2.7 は、自律的進化と実世界の生産性向上のために設 -Shengsuanyun +Shengsuanyun 胜算雲（Shengsuanyun）のご支援に感謝します！胜算雲は AI ネイティブチーム向けのスーパーファクトリーであり、産業グレードの AI タスク並列実行プラットフォームです。モデルマーケットプレイスでは Claude、ChatGPT、Gemini をはじめとする国内外の LLM およびマルチメディアモデルの計算リソースを集約・直接提供。リバースエンジニアリングや品質低下は一切なく、プラットフォーム全体のモデル SLA 可用性は 99.7% に達し、監視ダッシュボードは常時グリーン表示です。さらにエンタープライズ向けカスタムゲートウェイを提供し、チームのきめ細かなコスト・権限管理、スマートルーティング、セキュリティ保護、BYOK（自社キー持ち込み）ホスティングを実現します。従量課金およびトークンプラン（近日公開）対応で、請求書発行にも対応。このリンクから新規登録すると 10 元分のクレジットと初回チャージ 10% ボーナスが付与されます。 - -SiliconFlow -SiliconFlow のご支援に感謝します！SiliconFlow は高性能 AI インフラストラクチャおよびモデル API プラットフォームで、言語・音声・画像・動画モデルへの高速かつ信頼性の高いアクセスをワンストップで提供します。従量課金制、豊富なマルチモーダルモデル対応、高速推論、エンタープライズグレードの安定性を備え、開発者やチームがより効率的に AI アプリケーションを構築・拡張できるようサポートします。このリンクから登録し、本人確認を完了すると、プラットフォーム内の全モデルで利用可能な ¥20 のボーナスクレジットが付与されます。SiliconFlow は OpenClaw にも対応しており、SiliconFlow の API キーを接続することで主要な AI モデルを無料で呼び出すことができます。 - - AICodeMirror AICodeMirror のご支援に感謝します！AICodeMirror は Claude Code / Codex / Gemini CLI の公式高安定リレーサービスを提供しており、エンタープライズ級の同時接続、迅速な請求書発行、24時間年中無休の専用テクニカルサポートを備えています。 Claude Code / Codex / Gemini 公式チャンネルが最安で元価格の 38% / 2% / 9%、チャージ時にはさらに割引！AICodeMirror は CC Switch ユーザー向けに特別特典を用意：このリンクから登録すると初回チャージ 20% オフ、法人のお客様は最大 25% オフ！ + +PatewayAI +PatewayAI のご支援に感謝します！PatewayAI はヘビーな AI 開発者向けに、公式直結の高品質モデル API 中継サービスを専門に提供するプロバイダーです。Claude シリーズ全モデルおよび Codex シリーズに対応し、100% 公式ソースから直接提供。混ぜ物・水増しは一切なく、検証も歓迎します。課金は透明で、トークン単位の請求書を 1 件ずつ照合可能です。 +エンタープライズ級の高同時接続にも対応し、法人のお客様には専用の管理プラットフォームを提供。正式契約および請求書発行に対応しており、詳細は公式サイトの連絡先よりお問い合わせください。 +現在、このリンクからご登録いただくと $3 のトライアルクレジットを進呈。チャージは最安で元価格の 60%、友達紹介は双方にボーナスが付与され、紹介報酬は最大 $150！ + + + +BytePlus +Dola seed のご支援に感謝します！Dola Seed 2.0 は ByteDance がグローバル市場向けに独自開発したフルモーダル汎用大規模モデルです。統一されたマルチモーダルアーキテクチャを基盤に、テキスト・画像・音声・動画の統合的な理解と生成をサポートします。エージェント連携をネイティブに実現し、強力な推論、長時間タスクの実行、ツール統合、コーディング能力を備えています。スマートコックピット、パーソナルアシスタント、教育、カスタマーサポート、マーケティング、リテールなど幅広いシナリオに適用可能で、マルチモーダル認識、エンドツーエンドの複雑なタスク遂行、安定したインタラクション、データセキュリティに優れ、ModelArk プラットフォームを通じて手軽に利用・デプロイできます。このリンクからご登録いただくと、モデルごとに 500,000 トークンの無料推論クォータを進呈します。 + + + +SiliconFlow +SiliconFlow のご支援に感謝します！SiliconFlow は高性能 AI インフラストラクチャおよびモデル API プラットフォームで、言語・音声・画像・動画モデルへの高速かつ信頼性の高いアクセスをワンストップで提供します。従量課金制、豊富なマルチモーダルモデル対応、高速推論、エンタープライズグレードの安定性を備え、開発者やチームがより効率的に AI アプリケーションを構築・拡張できるようサポートします。このリンクから登録し、本人確認を完了すると、プラットフォーム内の全モデルで利用可能な ¥16 のボーナスクレジットが付与されます。SiliconFlow は OpenClaw にも対応しており、SiliconFlow の API キーを接続することで主要な AI モデルを無料で呼び出すことができます。 + + Cubence Cubence のご支援に感謝します！Cubence は Claude Code、Codex、Gemini などのリレーサービスを提供する信頼性の高い API 中継プラットフォームで、従量課金や月額プランなど柔軟な料金体系を提供しています。CC Switch ユーザー向けの特別割引：このリンクで登録し、チャージ時に「CCSWITCH」クーポンを入力すると、毎回 10% オフになります！ @@ -69,11 +83,9 @@ Claude Code / Codex / Gemini 公式チャンネルが最安で元価格の 38% / Compshare -Compshare のご支援に感謝します！Compshare は UCloud 傘下の AI クラウドプラットフォームで、国内外の安定した包括的なモデル API を 1 つのキーだけで利用可能。月額・従量課金のコストパフォーマンスに優れた Coding Plan パッケージを提供し、公式価格の 60〜80% オフで利用できます。Claude Code、Codex および API アクセスに対応。エンタープライズ級の高同時接続、24 時間年中無休のテクニカルサポート、セルフサービス請求書発行に対応。こちらのリンクから登録すると、無料で 5 元分のプラットフォーム体験クレジットがもらえます！ +Compshare のご支援に感謝します！Compshare は UCloud 傘下の AI クラウドプラットフォームで、国内外の安定した包括的なモデル API を 1 つのキーだけで利用可能。月額・都度課金のコストパフォーマンスに優れた国内モデル Coding Plan パッケージを提供し、公式リレーによる安定した海外モデルも利用できます。Claude Code、Codex および API アクセスに対応。エンタープライズ級の高同時接続、24 時間年中無休のテクニカルサポート、セルフサービス請求書発行に対応。こちらのリンクから登録すると、無料で 5 元分のプラットフォーム体験クレジットがもらえます！ - - AICoding AICoding.sh のご支援に感謝します！AICoding.sh —— グローバル AI モデル API 超お得な中継サービス！Claude Code 81% オフ、GPT 99% オフ！数百社の企業に高コストパフォーマンスの AI サービスを提供。Claude Code、GPT、Gemini および国内主要モデルに対応、エンタープライズ級の高同時接続、迅速な請求書発行、24 時間年中無休の専属テクニカルサポート。こちらのリンクから登録した CC Switch ユーザーは、初回チャージ 10% オフ！ @@ -81,44 +93,43 @@ Claude Code / Codex / Gemini 公式チャンネルが最安で元価格の 38% / Crazyrouter -Crazyrouter のご支援に感謝します！Crazyrouter は高性能 AI API アグリゲーションプラットフォームです。1 つの API キーで Claude Code、Codex、Gemini CLI など 300 以上のモデルにアクセス可能。全モデルが公式価格の 55% で利用でき、自動フェイルオーバー、スマートルーティング、無制限同時接続に対応。CC Switch ユーザー向けの限定特典：こちらのリンクから登録すると $2 の無料クレジット を即時進呈。さらに初回チャージ時にプロモコード `CCSWITCH` を入力すると 30% のボーナスクレジット が追加されます！ +Crazyrouter のご支援に感謝します！Crazyrouter は高性能 AI API アグリゲーションプラットフォームです。1 つの API キーで Claude Code、Codex、Gemini CLI など 300 以上のモデルにアクセス可能。全モデルが公式価格の 55% で利用でき、自動フェイルオーバー、スマートルーティング、無制限同時接続に対応。CC Switch ユーザー向けの限定特典：こちらのリンクから登録後、カスタマーサポートまでご連絡いただくと $2 の無料クレジット を受け取れます。さらに初回チャージ時にプロモコード `CCSWITCH` を入力すると 30% のボーナスクレジット が追加されます！ RightCode -本プロジェクトへのご支援として、Right Code にご協賛いただき誠にありがとうございます。Right Code は、Claude Code、Codex、Gemini などのモデルに対応した中継（プロキシ）サービスを安定して出しています。特に高いコストパフォーマンスを誇る Codex の月刊プランを主力としており、未使用分の利用枠を翌日に繰り越して利用できる（繰越対応）점이特长です。チャージ（入金）後に請求書の発行が可能で、企業・チーム向けには専任担当による個別対応も行っています。さらに CC Switch ユーザー向けの特別優待として、こちらのリンクからご登録くと、チャージのたびに実支払額の 25% 相当の従量課金クレジットが付与されます。 +本プロジェクトへのご支援として、Right Code にご協賛いただき誠にありがとうございます。Right Code は、Claude Code、Codex、Gemini などのモデル向け中継サービスを安定して提供しており、従量課金と月額プランの 2 つの料金体系から選択できます。チャージ後に請求書の発行が可能で、法人・チームのお客様には専任担当による個別対応も行っています。さらに、CC Switch ユーザー向けの特別優待として、こちらのリンクから登録すると、チャージのたびに実際の支払額の 5% 相当の従量課金クレジットが付与されます。 SSSAiCode -SSSAiCode のご支援に感謝します！SSSAiCode は安定性と信頼性に優れた API 中継サービスで、安定的で信頼性が高く、手頃な価格の Claude・Codex モデルサービスを提供しています。高コストパフォーマンスの公式 Claude サービスを 0.5￥/$ 換算で提供、月額制・Paygo など多様な課金方式に対応し、当日の迅速な請求書発行をサポート。CC Switch ユーザー向けの特別特典：こちらのリンクから登録すると、毎回のチャージで $10 の追加ボーナスを受けられます！ +SSSAiCode のご支援に感謝します！SSSAiCode は安定性と信頼性に優れた API 中継サービスで、安定的で信頼性が高く、手頃な価格の Claude・Codex モデルサービスを提供しています。当日の迅速な請求書発行をサポート。CC Switch ユーザー向けの特別特典：こちらのリンクから登録すると、毎回のチャージで $10 の追加ボーナスを受けられます！ -Micu -Micu API のご支援に感謝します！Micu API は、最高のコストパフォーマンスと高い安定性を追求するグローバル大規模言語モデル中継サービスプロバイダーです。法人企業がバックアップしており、サービス停止のリスクを排除、迅速な正規請求書発行に対応！「試行コストゼロ」をモットーに、最低 1 元からチャージ可能で手数料無料、いつでも返金可能！CC Switch ユーザー向けの限定特典：こちらのリンクから登録し、チャージ時にプロモコード「ccswitch」を入力すると 10% 割引 が適用されます！ +Micu +Micu API のご支援に感謝します！Micu API は、最高のコストパフォーマンスと高い安定性を追求するグローバル大規模言語モデル中継サービスプロバイダーです。法人企業がバックアップしており、サービス停止のリスクを排除、迅速な正規請求書発行に対応！「試行コストゼロ」をモットーに、最低 1 元からチャージ可能で手数料無料、いつでも返金可能！CC Switch ユーザー向けの限定特典：こちらのリンクから登録し、チャージ時にプロモコード「ccswitch」を入力すると 10% 割引 が適用されます！ LemonData LemonData のご支援に感謝します！LemonData は高性能 AI API アグリゲーションプラットフォームで、GPT、Claude、Gemini、DeepSeek など 300 以上のモデルに 1 つの API キーでアクセス可能。全モデルが公式価格の 30〜70% オフで自動フェイルオーバー、スマートルーティング、無制限同時接続に対応。新規ユーザーは登録だけで即座に $1 の無料クレジットを獲得 — こちらのリンクから登録してボーナスを獲得し、すぐに開発を始めましょう！ - CTok CTok.ai のご支援に感謝します！CTok.ai はワンストップ AI プログラミングツールサービスプラットフォームの構築に取り組んでいます。Claude Code のプロフェッショナルプランと技術コミュニティサービスを提供し、Google Gemini や OpenAI Codex にも対応しています。丁寧に設計されたプランと専門的な技術コミュニティを通じて、開発者に安定したサービス保証と継続的な技術サポートを提供し、AI アシストプログラミングを真の生産性ツールにします。こちらから登録してください！ - -ChefShop -ChefShop AI のご支援に感謝します！ChefShop AI は、AI ヘビーユーザー向けにカスタマイズされたプレミアムアカウントサービスプロバイダーです。ChatGPT Plus/Pro、Claude Max、Grok Super/Heavy、Gemini など主流の大規模モデルの公式チャージと安定したアカウントサービスを提供しています。こちらから購入してください！ - - LionCC LionCC のご支援に感謝します！LionCC は究極の開発体験を追求する「Vibe Coders」のために生まれました。Claude Code、Codex、OpenClaw 向けに安定・低遅延・お得な価格の計算リソースサービスを提供し、最大 50% のコスト削減を実現します。登録後、カスタマーサービスの WeChat（HSQBJ088888888）を追加し、合言葉「cc-switch」を送信すると、10 ドル分のクレジット（1,000 万トークン）がもらえます。その他のコラボレーションについてはブログ @LionCC.ai をフォローしてください。こちらから登録してください！ + +ClaudeAPI +本プロジェクトは Claude API がスポンサーです。Claude API 直結 — わずか 3 分で Claude Code や Agent アプリに接続可能。新規ユーザーにはテストクレジットを提供しています。Anthropic 公式キーおよび AWS Bedrock 公式チャネルに基づいており、リバースエンジニアリングや性能劣化はありません。Opus / Sonnet / Haiku の全モデルラインナップをサポートし、Tool Use や 1M コンテキストなどの公式機能をすべて保持しています。Claude Code ヘビーユーザー、Agent エンジニア、企業技術チームに最適です。請求書発行およびチーム対応が可能です。こちらから登録してください！ + + DDS 本プロジェクトのスポンサーである DDS に感謝いたします！ DDS（呆呆獣 / DDS Hub）は、Claude に特化した信頼性とパフォーマンスの高い API プロキシサービスです。個人および企業ユーザーの皆様に、圧倒的なコストパフォーマンスを誇る Claude 直結アクセラレーションサービスを提供しています。Claude Haiku / Opus / Sonnet などのフルスペックモデルを完全サポートし、安定した低遅延のアクセスを実現します。 @@ -126,6 +137,16 @@ Claude Code / Codex / Gemini 公式チャンネルが最安で元価格の 38% / CC Switch ユーザー限定特典： 専用リンクからご登録いただくと、初回チャージ時に 10% の追加ボーナスクレジット をプレゼントいたします！（※チャージ完了後、グループ管理人へご連絡の上お受け取りください。） + +ClaudeCN +本プロジェクトのスポンサーである ClaudeCN に感謝いたします！ClaudeCN は、実体のある企業によって運営されるエンタープライズ向け AI ゲートウェイプラットフォームです。Claude、GPT、DeepSeek など主要モデルへの高可用な商用 API アクセスを提供し、企業の調達プロセスにも対応 — 法人振込や正式契約に対応し、コンプライアンス面でも安心してご利用いただけます。こちらからご登録ください！ + + + +RunAPI +本プロジェクトのスポンサーである RunAPI に感謝いたします！RunAPI は高効率で安定した AI モデル API ゲートウェイです。一つの API Key で、OpenAI、Claude、Gemini、DeepSeek、Grok など 150 種類以上の主要モデルにアクセス可能。料金は公式価格の最大 10%、安定性にも優れ、Claude Code や OpenClaw などのツールとシームレスに連携できます。CC Switch ユーザー限定特典：ご登録後にカスタマーサポートへご連絡いただくと、14 元の無料クレジットを進呈いたします。こちらからご登録ください！ + + diff --git a/README_ZH.md b/README_ZH.md index 386d32d36..178c5d76f 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -2,7 +2,7 @@ # CC Switch -### Claude Code、Codex、Gemini CLI、OpenCode 和 OpenClaw 的全方位管理工具 +### Claude Code、Codex、Gemini CLI、OpenCode、OpenClaw 和 Hermes Agent 的全方位管理工具 [![Version](https://img.shields.io/github/v/release/farion1231/cc-switch?color=blue&label=version)](https://github.com/farion1231/cc-switch/releases) [![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20macOS%20%7C%20Linux-lightgrey.svg)](https://github.com/farion1231/cc-switch/releases) @@ -11,6 +11,8 @@ farion1231%2Fcc-switch | Trendshift +### 🌐 唯一官方网站：**[ccswitch.io](https://ccswitch.io)** + [English](README.md) | 中文 | [日本語](README_JA.md) | [更新日志](CHANGELOG.md) @@ -42,21 +44,33 @@ MiniMax M2.7 是 MiniMax 首个深度参与自我迭代的模型，可自主构 -Shengsuanyun +Shengsuanyun 感谢胜算云赞助了本项目！胜算云是专为AI Native Teams服务的超级工厂，工业级AI任务并行执行平台，模型商城集采直供聚合接入了Claude、Chatgpt、Gemini等海内外LLM及图片视频多媒体模型算力，绝无逆向掺水、全站模型SLA可用性高达99.7%、监测接口日常全绿。更有企业级专属定制网关，实现团队精细化成本与权限管控，智能路由+安全防护+BYOK企业自带密钥托管。平台按量及tokens plan（即将上线）计费，可开票，使用此链接注册新用户可获10元模力及首充10%赠送。 - -SiliconFlow -感谢硅基流动赞助了本项目！硅基流动是一个高性能 AI 基础设施与模型 API 平台，一站式提供语言、语音、图像、视频等多模态模型的快速、可靠访问。平台支持按量计费、丰富的多模态模型选择、高速推理和企业级稳定性，帮助开发者和团队更高效地构建和扩展 AI 应用。通过此链接注册并完成实名认证，即可获得 ¥20 奖励金，可在平台内跨模型使用。硅基流动现已兼容 OpenClaw，用户可接入硅基流动 API Key 免费调用主流 AI 模型。 - - AICodeMirror 感谢 AICodeMirror 赞助了本项目！AICodeMirror 提供 Claude Code / Codex / Gemini CLI 官方高稳定中转服务，支持企业级高并发、极速开票、7×24 专属技术支持。 Claude Code / Codex / Gemini 官方渠道低至 3.8 / 0.2 / 0.9 折，充值更有折上折！AICodeMirror 为 CCSwitch 的用户提供了特别福利，通过此链接注册的用户，可享受首充8折，企业客户最高可享 7.5 折！ + +PatewayAI +感谢 PatewayAI 赞助了本项目！PatewayAI 是一家面向重度 AI 开发者、专注官方直连高品质模型 API 中转服务商。提供 Claude 全系列与 Codex 系列模型，100% 官方源直供，不掺假不注水，欢迎检验。计费透明，Token 级账单可逐笔核验。 +同时支持企业级高并发，并为企业客户提供了专业的管理平台，企业客户可签订正式合同并开具发票，更多详情进入官网获取联系方式。 +现在通过此链接注册即送 $3 试用额度，用户充值低至 6 折，邀请好友双向赠送，邀请奖励可达 $150！ + + + +HuoShan +感谢火山方舟Agent Plan 模型赞助了本项目！方舟Agent Plan 模型订阅套餐集成了包含Doubao-Seed、Doubao-Seedance、Doubao-Seedream等在内的字节跳动自研SOTA级模型，覆盖文本、代码、图像、视频等多模态任务。同时支持一站式接入DeepSeek V4、GLM 5.1等主流大模型。超全模态模型与 Harness 升级一步到位，深度支持 Agent 框架与 AI 编程工具。方舟 Agent Plan 为 CC Switch 的用户提供了专属福利：通过此链接订阅方舟AgentPlan，新客户首月40元起！ + + + +SiliconFlow +感谢硅基流动赞助了本项目！硅基流动是一个高性能 AI 基础设施与模型 API 平台，一站式提供语言、语音、图像、视频等多模态模型的快速、可靠访问。平台支持按量计费、丰富的多模态模型选择、高速推理和企业级稳定性，帮助开发者和团队更高效地构建和扩展 AI 应用。通过此链接注册并完成实名认证，即可获得 ¥16 奖励金，可在平台内跨模型使用。硅基流动现已兼容 OpenClaw，用户可接入硅基流动 API Key 免费调用主流 AI 模型。 + + Cubence 感谢 Cubence 赞助本项目！Cubence 是一家可靠高效的 API 中继服务提供商，提供对 Claude Code、Codex、Gemini 等模型的中继服务，并提供按量、包月等灵活的计费方式。Cubence 为 CC Switch 的用户提供了特别优惠：使用 此链接 注册，并在充值时输入 "CCSWITCH" 优惠码，每次充值均可享受九折优惠！ @@ -70,7 +84,7 @@ Claude Code / Codex / Gemini 官方渠道低至 3.8 / 0.2 / 0.9 折，充值更 优云智算 -感谢优云智算赞助了本项目！优云智算是UCloud旗下AI云平台，提供稳定、全面的国内外模型API，仅一个key即可调用。主打包月、按量的高性价比 Coding Plan 套餐，基于官方2~5折优惠。支持接入 Claude Code、Codex 及 API 调用。支持企业高并发、7*24技术支持、自助开票。通过此链接注册的用户，可得免费5元平台体验金！ +感谢优云智算赞助了本项目！优云智算是UCloud旗下AI云平台，提供稳定、全面的国内外模型API，仅一个key即可调用。主打包月、按次的高性价比 国模Coding Plan套餐，同时提供官转稳定海外模型。支持接入 Claude Code、Codex 及 API 调用。支持企业高并发、7*24技术支持、自助开票。通过此链接注册的用户，可得免费5元平台体验金！ @@ -80,49 +94,58 @@ Claude Code / Codex / Gemini 官方渠道低至 3.8 / 0.2 / 0.9 折，充值更 Crazyrouter -感谢 Crazyrouter 赞助了本项目！Crazyrouter 是一个高性能 AI API 聚合平台——一个 API Key 即可访问 300+ 模型，包括 Claude Code、Codex、Gemini CLI 等。全部模型低至官方定价的 55%，支持自动故障转移、智能路由和无限并发。Crazyrouter 为 CC Switch 用户提供了专属优惠：通过此链接注册即可获得 $2 免费额度，首次充值时输入优惠码 `CCSWITCH` 还可获得额外 30% 奖励额度！ +感谢 Crazyrouter 赞助了本项目！Crazyrouter 是一个高性能 AI API 聚合平台——一个 API Key 即可访问 300+ 模型，包括 Claude Code、Codex、Gemini CLI 等。全部模型低至官方定价的 55%，支持自动故障转移、智能路由和无限并发。Crazyrouter 为 CC Switch 用户提供了专属优惠：通过此链接注册后联系客服即可领取 $2 免费额度，首次充值时输入优惠码 `CCSWITCH` 还可获得额外 30% 奖励额度！ RightCode -感谢 Right Code 赞助了本项目！Right Code 稳定提供 Claude Code、Codex、Gemini 等模型的中转服务。主打极高性价比的Codex包月套餐，提供额度转结，套餐当天用不完的额度，第二天还能接着用！充值即可开票，企业、团队用户一对一对接。同时为 CC Switch 的用户提供了特别优惠：通过此链接注册，每次充值均可获得实付金额25%的按量额度！ +感谢 Right Code 赞助了本项目！Right Code 稳定提供 Claude Code、Codex、Gemini 等模型的中转服务，并可选按量、包月两种计费模式。充值即可开票，企业、团队用户一对一对接。同时为 CC Switch 的用户提供了特别优惠：通过此链接注册，每次充值均可获得实付金额5%的按量额度！ SSSAiCode -感谢 SSSAiCode 赞助了本项目！SSSAiCode 是一家稳定可靠的API中转站，致力于提供稳定、可靠、平价的Claude、CodeX模型服务，提供高性价比折合0.5￥/$的官方Claude服务，支持包月、Paygo多种计费方式、支持当日快速开票，SSSAiCode为本软件的用户提供特别优惠，使用此链接注册每次充值均可享受10$的额外奖励！ +感谢 SSSAiCode 赞助了本项目！SSSAiCode 是一家稳定可靠的API中转站，致力于提供稳定、可靠、平价的Claude、CodeX模型服务，支持当日快速开票，SSSAiCode为本软件的用户提供特别优惠，使用此链接注册每次充值均可享受10$的额外奖励！ -Micu -感谢 米醋API 赞助了本项目！米醋API 是一家致力于提供极致性价比与高稳定性的全球大模型中转服务商。米醋API 背后有实体企业做核心保障，杜绝跑路风险，支持极速正规开票！我们主打“试错零成本”：1 元起充低门槛，0 手续费随时退款！米醋API 为本软件的用户提供了特别优惠，使用此链接注册并在充值时填写"ccswitch"优惠码可享九折优惠！ +Micu +感谢 米醋API 赞助了本项目！米醋API 是一家致力于提供极致性价比与高稳定性的全球大模型中转服务商。米醋API 背后有实体企业做核心保障，杜绝跑路风险，支持极速正规开票！我们主打“试错零成本”：1 元起充低门槛，0 手续费随时退款！米醋API 为本软件的用户提供了特别优惠，使用此链接注册并在充值时填写"ccswitch"优惠码可享九折优惠！ LemonData 感谢 LemonData 赞助了本项目！LemonData 是一个高性能 AI API 聚合平台——一个 API Key 即可访问 GPT、Claude、Gemini、DeepSeek 等 300+ 模型。所有模型定价为官方价格的 30%-70%，支持自动故障转移、智能路由和无限并发。新用户注册即获 $1 免费额度——通过此链接注册即可领取奖励，立即开始开发！ - CTok 感谢 CTok.ai 赞助了本项目！CTok.ai 致力于打造一站式 AI 编程工具服务平台。我们提供 Claude Code 专业套餐及技术社群服务，同时支持 Google Gemini 和 OpenAI Codex。通过精心设计的套餐方案和专业的技术社群，为开发者提供稳定的服务保障和持续的技术支持，让 AI 辅助编程真正成为开发者的生产力工具。点击这里注册！ - -ChefShop -感谢 厨师长AI小铺 赞助了本项目！厨师长AI小铺 是一家专为 AI 重度订阅用户量身定制的优质账号服务商。平台提供涵盖 ChatGPT Plus/Pro、Claude Max、Grok Super/Heavy 以及 Gemini 等主流大模型的官方代充与稳定成品账号服务。点击这里购买！ - - LionCC 感谢 LionCC 狮子API 赞助了本项目！LionCC 专为追求极致开发体验的”Vibe Coders”而生。我们提供稳定、低延迟、优惠价格的 Claude Code、Codex 及 OpenClaw 算力服务，可节约 50% 成本。注册后添加客服微信 HSQBJ088888888，发暗号 cc-switch 备注即可送 10 美金额度（1000 万 token 算力）。其他项目合作关注博客 @LionCC.ai，点击这里注册！ + +ClaudeAPI +本项目由 Claude API 赞助。Claude API 直连，三分钟接入 Claude Code 与 Agent 应用 新用户可领取测试额度。基于 Anthropic 官方 Key + AWS Bedrock 官方渠道，非逆向、非降智，支持 Opus / Sonnet / Haiku 全系列模型，保留 Tool Use、1M 上下文等官方能力。适合 Claude Code 深度用户、Agent 工程师与企业技术团队，支持开票和团队对接。点击这里注册！ + + DDS 感谢 DDS 赞助本项目！呆呆兽是一家专注 Claude 的可靠高效 API 中转站，为个人和企业用户提供极具性价比的国内 Claude 直连加速服务。支持 Claude Haiku / Opus / Sonnet 等满血模型。充值满 1000 元即可开具发票，企业客户更可享受定制化分组和技术支持服务。CC Switch 用户专属福利：通过此链接注册后，首单充值可额外赠送 10% 额度（充值后请联系群主领取）！ + +ClaudeCN +感谢 ClaudeCN 赞助本项目！ClaudeCN 由是一家实体企业运营的企业级AI中转平台。平台可提供高可用性的商用API服务，提供Claude、GPT、Deepseek等热门模型，支持企业采购流程，可对公打款、签约，服务合规有保障。点击此链接注册！ + + + +RunAPI +感谢 RunAPI 赞助本项目！RunAPI 是高效稳定的 AI 模型 API 中转平台，一个 API Key 即可访问 OpenAI、Claude、Gemini、DeepSeek、Grok 等 150+ 主流模型，低至 1 折，极其稳定，可以无缝兼容 Claude Code、OpenClaw 等工具。RunAPI为CC switch的用户提供了特别福利，注册后联系客服可以领取14元额度，点击此链接注册！ + + diff --git a/assets/partners/logos/aicoding.jpg b/assets/partners/logos/aicoding.jpg index 6f5704ead..2b7862a00 100644 Binary files a/assets/partners/logos/aicoding.jpg and b/assets/partners/logos/aicoding.jpg differ diff --git a/assets/partners/logos/aigocode.png b/assets/partners/logos/aigocode.png index 6dd5965ac..5c6ca8058 100644 Binary files a/assets/partners/logos/aigocode.png and b/assets/partners/logos/aigocode.png differ diff --git a/assets/partners/logos/byteplus.png b/assets/partners/logos/byteplus.png new file mode 100644 index 000000000..723cca359 Binary files /dev/null and b/assets/partners/logos/byteplus.png differ diff --git a/assets/partners/logos/chefshop.png b/assets/partners/logos/chefshop.png index 85fe37f23..f90e65b97 100644 Binary files a/assets/partners/logos/chefshop.png and b/assets/partners/logos/chefshop.png differ diff --git a/assets/partners/logos/claudeapi.png b/assets/partners/logos/claudeapi.png new file mode 100644 index 000000000..dfb14a9c2 Binary files /dev/null and b/assets/partners/logos/claudeapi.png differ diff --git a/assets/partners/logos/claudecn.jpg b/assets/partners/logos/claudecn.jpg new file mode 100644 index 000000000..ac7ec2c43 Binary files /dev/null and b/assets/partners/logos/claudecn.jpg differ diff --git a/assets/partners/logos/crazyrouter.jpg b/assets/partners/logos/crazyrouter.jpg index c3f7b110a..927f51291 100644 Binary files a/assets/partners/logos/crazyrouter.jpg and b/assets/partners/logos/crazyrouter.jpg differ diff --git a/assets/partners/logos/crazyrouter.png b/assets/partners/logos/crazyrouter.png index ffa5456df..cee01c85f 100644 Binary files a/assets/partners/logos/crazyrouter.png and b/assets/partners/logos/crazyrouter.png differ diff --git a/assets/partners/logos/ctok.png b/assets/partners/logos/ctok.png index cf6fcf170..4b6e5ac66 100644 Binary files a/assets/partners/logos/ctok.png and b/assets/partners/logos/ctok.png differ diff --git a/assets/partners/logos/cubence.png b/assets/partners/logos/cubence.png index c61f12f61..30ba163ab 100644 Binary files a/assets/partners/logos/cubence.png and b/assets/partners/logos/cubence.png differ diff --git a/assets/partners/logos/dds.png b/assets/partners/logos/dds.png index ded569ea1..dedbd8c4a 100644 Binary files a/assets/partners/logos/dds.png and b/assets/partners/logos/dds.png differ diff --git a/assets/partners/logos/dmx-en.jpg b/assets/partners/logos/dmx-en.jpg index 1587fc26e..2891adadc 100644 Binary files a/assets/partners/logos/dmx-en.jpg and b/assets/partners/logos/dmx-en.jpg differ diff --git a/assets/partners/logos/huoshan.png b/assets/partners/logos/huoshan.png new file mode 100644 index 000000000..cf4c22f23 Binary files /dev/null and b/assets/partners/logos/huoshan.png differ diff --git a/assets/partners/logos/lemondata.png b/assets/partners/logos/lemondata.png index e12222540..b645b4b14 100644 Binary files a/assets/partners/logos/lemondata.png and b/assets/partners/logos/lemondata.png differ diff --git a/assets/partners/logos/lioncc.png b/assets/partners/logos/lioncc.png index 3f7975e04..6c7eb416b 100644 Binary files a/assets/partners/logos/lioncc.png and b/assets/partners/logos/lioncc.png differ diff --git a/assets/partners/logos/packycode.png b/assets/partners/logos/packycode.png index 4fc7eecc7..0a1c21f89 100644 Binary files a/assets/partners/logos/packycode.png and b/assets/partners/logos/packycode.png differ diff --git a/assets/partners/logos/pateway.png b/assets/partners/logos/pateway.png new file mode 100644 index 000000000..040d0e344 Binary files /dev/null and b/assets/partners/logos/pateway.png differ diff --git a/assets/partners/logos/runapi.jpg b/assets/partners/logos/runapi.jpg new file mode 100644 index 000000000..d7461509f Binary files /dev/null and b/assets/partners/logos/runapi.jpg differ diff --git a/assets/partners/logos/shengsuanyun.png b/assets/partners/logos/shengsuanyun.png new file mode 100644 index 000000000..9981a2f9b Binary files /dev/null and b/assets/partners/logos/shengsuanyun.png differ diff --git a/assets/partners/logos/silicon_en.jpg b/assets/partners/logos/silicon_en.jpg index 217f35790..23f44ae5d 100644 Binary files a/assets/partners/logos/silicon_en.jpg and b/assets/partners/logos/silicon_en.jpg differ diff --git a/assets/partners/logos/silicon_zh.jpg b/assets/partners/logos/silicon_zh.jpg index dee35e857..229fe101d 100644 Binary files a/assets/partners/logos/silicon_zh.jpg and b/assets/partners/logos/silicon_zh.jpg differ diff --git a/assets/partners/logos/sssaicode.png b/assets/partners/logos/sssaicode.png index 8bda311f0..7c125cfe8 100644 Binary files a/assets/partners/logos/sssaicode.png and b/assets/partners/logos/sssaicode.png differ diff --git a/assets/partners/logos/ucloud.png b/assets/partners/logos/ucloud.png index 9db7346b2..676744271 100644 Binary files a/assets/partners/logos/ucloud.png and b/assets/partners/logos/ucloud.png differ diff --git a/docs/release-notes/v3.14.0-en.md b/docs/release-notes/v3.14.0-en.md new file mode 100644 index 000000000..0760a24fd --- /dev/null +++ b/docs/release-notes/v3.14.0-en.md @@ -0,0 +1,469 @@ +# CC Switch v3.14.0 + +> Hermes Agent becomes the 6th managed app, Claude Opus 4.7 rolls out across the preset matrix, Gemini Native API proxy, "Local Routing" rename, and application-level window controls + +**[中文版 →](v3.14.0-zh.md) | [日本語版 →](v3.14.0-ja.md)** + +--- + +## Overview + +CC Switch v3.14.0 is a major release centered on onboarding **Hermes Agent as the 6th first-class managed app** and rolling out **Claude Opus 4.7** across the full aggregator and Bedrock preset matrix. Hermes support covers a database v9 → v10 migration, a complete Rust command surface, YAML-backed `~/.hermes/config.yaml` read/write with atomic backups, MCP sync, Skills sync, SQLite + JSONL session management, and dedicated frontend panels including a Memory editor. All four API protocols aligned with Hermes Agent 0.10.0 (`chat_completions`, `anthropic_messages`, `codex_responses`, `bedrock_converse`) are selectable. Providers owned by the user-authored `providers:` dict are rendered as read-only cards, and deep YAML configuration is delegated directly to the Hermes Web UI. + +Beyond Hermes, this release adds a **Gemini Native API proxy** (`api_format = "gemini_native"`) so the proxy can forward directly to Google's `generateContent` endpoint with full streaming, schema conversion, and shadow request support; renames the legacy "Local Proxy Takeover" to **Local Routing** across UI copy, README, and docs in all three locales; introduces **application-level window controls**, an opt-in setting that materially improves the experience on Linux Wayland where compositor-drawn buttons can become inert; and bundles late additions for launching `hermes dashboard` from the toolbar, a LemonData preset across all six apps, a DDSHub Codex endpoint, plus several Hermes health-check and Usage modal fixes. + +On the session side, the message list is **virtualized** via `@tanstack/react-virtual` so conversations with thousands of records scroll smoothly and long messages collapse by default; the Usage dashboard adds a **date range picker** (Today / 1d / 7d / 14d / 30d + custom date-time calendar) and a page-jump input; **Stream Check error classification** now surfaces color-coded toasts with refreshed default probe models and an explicit "model not found" branch; and switching to official providers is **blocked while Local Routing is active** to avoid account-suspension risk. The pricing database is reseeded from v8 → v9 with ~50 new model entries (Claude 4.7, Opus 4.7 Adaptive Thinking, Grok 4, Qwen 3.5/3.6, MiniMax M2.5/M2.7, Doubao Seed 2.0 series, GLM-5/5.1 and others) and corrected stale prices. + +**Release Date**: 2026-04-21 + +**Update Scale**: 100 commits | 219 files changed | +20,548 / -3,569 lines + +--- + +## Highlights + +- **Hermes Agent Support (6th Managed App)**: Database v9 → v10 migration, full Rust command surface, YAML read/write with atomic backups, MCP sync, Skills sync, SQLite + JSONL session management, dedicated frontend panels, and four API protocols (`chat_completions` / `anthropic_messages` / `codex_responses` / `bedrock_converse`) +- **Claude Opus 4.7 Rollout**: Adaptive thinking whitelisting, per-million pricing seed, Bedrock SKU (`anthropic.claude-opus-4-7` / `global.anthropic.claude-opus-4-7`, dropping the legacy `-v1` suffix); all aggregator and Bedrock presets migrated to Opus 4.7 as the default Opus model +- **Claude `max` Effort Tier**: Effort dropdown upgraded from `high` to `max` +- **Gemini Native API Proxy**: New `api_format = "gemini_native"` forwards directly to Google's `generateContent` with full streaming / schema conversion / shadow request support +- **GitHub Copilot Enterprise Server**: GHES authentication and endpoint configuration for Copilot-backed Claude providers +- **Copilot Premium Consumption Deep Optimization**: Proactive thinking-block stripping before forwarding, `tool_result` classification fix, subagent detection, `x-interaction-id` billing merge, orphan `tool_result` sanitization, and default warmup downgrade — a systematic reduction in premium interaction consumption +- **Session List Virtualization**: Long conversations scroll smoothly and long messages collapse by default to reduce text layout cost +- **Codex / OpenClaw Session Title Extraction**: Meaningful title extraction with 2-line display; strips OpenClaw `message_id` suffix noise +- **Usage Date Range Picker**: Today / 1d / 7d / 14d / 30d preset tabs + custom date-time calendar; page-jump input on paginated lists +- **Stream Check Error Classification**: Color-coded error toasts; refreshed default probe models; explicit "model not found" detection +- **Block Official Provider Switching During Local Routing**: Routing official API traffic through the local proxy carries account-suspension risk — switches are blocked with a warning toast +- **Pricing Database Refresh (v8 → v9)**: ~50 new model entries and corrected stale prices +- **Application-Level Window Controls**: Opt-in setting to render CC Switch's own min/max/close buttons, materially improving Linux Wayland experience +- **Hermes in Unified Skills Management**: Skill install, enable, and filter now cover Hermes +- **Hermes / OpenClaw Config Directory Override**: Point CC Switch at a custom `~/.hermes/config.yaml` or `openclaw.json` location +- **Launch Hermes Dashboard from Toolbar**: When the Hermes Web UI probe fails, the toolbar entry offers to run `hermes dashboard` in the user's preferred terminal +- **New Partner Presets**: LemonData across all six apps; DDSHub Codex endpoint; StepFun Step Plan + +--- + +## Added + +### Hermes Agent Support (6th Managed App) + +CC Switch now treats Hermes Agent as a first-class managed app alongside Claude / Codex / Gemini / OpenCode / OpenClaw. + +- **Database Migration v9 → v10**: Adds `enabled_hermes` columns to `mcp_servers` and `skills` tables (`DEFAULT 0`, auto-migrated, no data loss) +- **YAML Configuration Read/Write**: `~/.hermes/config.yaml` read/write with atomic backups; `tests/hermes_roundtrip.rs` guards against dropped OAuth MCP `auth` blocks or pollution of unrelated YAML keys +- **Four API Protocols**: Aligned with Hermes Agent 0.10.0 — `chat_completions` / `anthropic_messages` / `codex_responses` / `bedrock_converse`; new deeplinks default to `chat_completions` +- **User `providers:` Dict Read-Only Rendering**: User-authored providers in the YAML appear as read-only cards in CC Switch; deep configuration delegates to the Hermes Web UI +- **Additive Switching**: Unlike Claude / Codex's "override" style, all Hermes providers coexist in the same YAML + +### Hermes Memory Panel + +- New Memory panel for editing `MEMORY.md` / `USER.md` directly, with an enable switch, character-count limits, and a live save flow +- Replaces the Prompts entry for Hermes + +### Hermes Provider Presets (~50) + +- Covers Nous Research, Shengsuanyun, OpenRouter, DeepSeek, Together AI, StepFun, Zhipu GLM, Bailian, Kimi, MiniMax, DouBao, BaiLing, ModelScope, KAT-Coder, PackyCode, Cubence, AIGoCode, RightCode, AICodeMirror, AICoding, CrazyRouter, SSSAiCode, Micu, CTok.ai, DDSHub, E-FlowCode, LionCCAPI, PIPELLM, Compshare, SiliconFlow, AiHubMix, DMXAPI, TheRouter, Novita, Nvidia, and Xiaomi MiMo + +### Launch Hermes Dashboard from Toolbar + +- When the Hermes Web UI probe fails, the toolbar entry opens a confirm dialog offering to run `hermes dashboard` in the user's preferred terminal +- Spawned via a temp bash / batch script; `hermes dashboard` opens the browser itself once ready, so no polling is required +- The Memory panel and Health banner keep the existing toast behavior +- Also corrects the stale `hermes web` hint in the offline toast (the real command is `hermes dashboard`) +- Linux terminal detection reordered to try `which` before stat'ing `/usr/bin`, `/bin`, `/usr/local/bin` + +### Claude Opus 4.7 Support + +- New Claude Opus 4.7 with adaptive thinking whitelisting, per-million pricing seed, and Bedrock SKU (`anthropic.claude-opus-4-7` / `global.anthropic.claude-opus-4-7`, dropping the legacy `-v1` suffix) +- All aggregator and Bedrock presets migrated to Opus 4.7 as the default Opus model + +### Claude `max` Effort Tier + +- Claude effort dropdown upgraded from `high` to `max` for extended reasoning capacity + +### Gemini Native API Proxy + +- New `api_format = "gemini_native"` so the proxy can forward directly to Google's `generateContent` API (#1918, thanks @yovinchen) +- Full streaming, schema conversion, and shadow request support +- Adds `gemini_url.rs`, `gemini_schema.rs`, `gemini_shadow.rs`, `streaming_gemini.rs`, and `transform_gemini.rs` under the proxy providers module + +### GitHub Copilot Enterprise Server (GHES) + +- GHES authentication and endpoint configuration for Copilot-backed Claude providers (#2175, thanks @hotelbe) + +### Session List Virtualization + +- Virtualized the session list via `@tanstack/react-virtual` so long conversations (thousands of records) scroll smoothly +- Long session messages are collapsed by default to reduce text layout cost + +### Codex / OpenClaw Session Title Extraction + +- Meaningful title auto-extraction for Codex and OpenClaw sessions with 2-line display +- Strips OpenClaw `message_id` suffix noise + +### Usage Date Range Picker + +- New date range selector on the usage dashboard with preset tabs (Today / 1d / 7d / 14d / 30d) + custom date + time calendar (#2002, thanks @yovinchen) +- Page-jump input added on paginated lists + +### Model Mapping Quick-Set + +- New quick-set button next to model mapping fields in provider forms for faster edits (#2179, thanks @lispking) + +### Stream Check Error Classification + +- Stream Check errors are classified and surfaced as color-coded toasts +- Refreshed default probe models to match each vendor's current lineup +- Explicit detection for "model not found" responses + +### Block Official Provider Switching During Local Routing + +- Switching to official providers is blocked while Local Routing is active, with a warning toast +- Reason: routing official API traffic through the local proxy carries account-suspension risk + +### Pricing Database Refresh (v8 → v9) + +- Reseed-on-migration pricing table +- ~50 new model pricing entries including Claude 4.7, Opus 4.7 Adaptive Thinking, Grok 4, Qwen 3.5/3.6, MiniMax M2.5/M2.7, Doubao Seed 2.0 series, GLM-5/5.1 +- Corrected stale prices for DeepSeek, Kimi K2.5, and others + +### Application-Level Window Controls + +- Opt-in setting to render CC Switch's own minimize / toggle-maximize / close buttons instead of system decorations (#1119, thanks @git1677967754) +- Materially improves the experience on Linux Wayland where compositor-drawn buttons can become inert + +### Hermes in Unified Skills Management + +- Hermes is added to the unified Skills surface +- Skill install, enable, and filter now cover the Hermes app alongside Claude / Codex / Gemini / OpenCode / OpenClaw + +### OpenClaw Config Directory Override + +- New settings option to point CC Switch at a custom `openclaw.json` location (#1518, thanks @mrFranklin) + +### Hermes Config Directory Override + +- New settings option to point CC Switch at a custom `~/.hermes/config.yaml` location, backed by data-driven dispatch + +### StepFun Step Plan Preset + +- StepFun Step Plan (EN / ZH) provider presets (#2155, thanks @hengm3467) + +### New API Usage Script Template + +- Added a User-Agent header to the New API usage script template for better upstream compatibility + +### LemonData Provider Preset (All Six Apps) + +- LemonData registered as a third-party partner preset across Claude, Codex, Gemini, OpenCode, OpenClaw, and Hermes +- Icon assets and zh / en / ja partner-promotion copy +- Claude preset uses `ANTHROPIC_API_KEY` auth; OpenAI-compatible apps target `gpt-5.4` + +### DDSHub Codex Preset + +- Added a Codex-compatible endpoint for DDSHub at the same host as its Claude service +- Base URL omits the `/v1` suffix because the gateway auto-routes OpenAI SDK paths + +--- + +## Changed + +### "Local Proxy Takeover" → "Local Routing" + +- Unified the terminology across UI copy, README, and docs in all three locales +- Functional behavior is unchanged + +### Hermes `Auto` api_mode Removed + +- Users must pick an explicit protocol; new deeplinks default to `chat_completions` +- Eliminates URL-based heuristic surprises + +### Hermes Provider Form + +- Added an API mode dropdown and per-provider model editor +- Binds per-provider models to the top-level `model:` when switching active providers + +### Hermes Deep Config Delegation + +- Deep YAML knobs are no longer duplicated in the CC Switch form — they are delegated to the Hermes Web UI via a direct launch action + +### Hermes Toolbar Layout + +- Swapped the Hermes Web UI button from `ExternalLink` to `LayoutDashboard` (clicking may spawn `hermes dashboard` rather than just opening a URL) +- Moved MCP to the final toolbar slot so Hermes matches the Claude / Codex / Gemini / OpenCode layout + +### `ANTHROPIC_REASONING_MODEL` Removed from Claude Quick-Set + +- Decoupled the reasoning capability from model selection; the legacy field is no longer surfaced in the quick-set form + +### Per-Provider Proxy Config Removed + +- Consolidated into global Local Routing +- Provider-level proxy toggle and associated storage are gone + +### Unified Toolbar Icon Button Width + +- Normalized icon-button widths across Claude / Codex / Gemini / OpenCode / OpenClaw / Hermes panels for a consistent header look + +### Rust Toolchain Pinned to 1.95 + +- Adopted clippy 1.95 suggestions across the workspace and pinned the toolchain to prevent nightly drift + +### Tray Menu ID Constant + +- The tray identifier moved from the hardcoded string `"main"` to a `TRAY_ID` constant (`"cc-switch"`) across all call sites (#1978, thanks @lidaxian121) + +### Copilot Premium Consumption Deep Optimization + +A systematic overhaul to reduce Copilot reverse-proxy premium interaction consumption across multiple dimensions: + +- **Proactive Thinking Block Stripping Before Forwarding**: Anthropic's `thinking` / `redacted_thinking` blocks are rejected by OpenAI-compatible endpoints. Previously, the request failed upstream, burning one premium interaction before the `thinking_rectifier` could retry. A new proactive strip step (Copilot optimization pipeline step 3.5, after `tool_result` merging) eliminates that wasted interaction +- **Request Classification Fix**: Messages containing `tool_result` are now classified as agent continuation instead of user-initiated, preventing every tool call from being falsely counted as a premium interaction +- **Subagent Detection**: Identifies subagents via `__SUBAGENT_MARKER__` with `metadata._agent_` fallback, setting `x-interaction-type=conversation-subagent` +- **Deterministic `x-interaction-id` Billing Merge**: Derives `x-interaction-id` from the session ID so multiple requests within the same session collapse into a single billing interaction +- **Orphan `tool_result` Sanitization**: Cleans up orphan `tool_result` entries to prevent upstream errors that would trigger retries and duplicate billing +- **Warmup Downgrade Enabled by Default**: Uses `gpt-5-mini` as the default downgrade model +- **Optimization Pipeline Reorder**: classify → sanitize → merge → warmup, so classification sees raw `tool_result` semantics +- Fixed a `CopilotOptimizerConfig` default-value inconsistency (unified to `gpt-5-mini`) + +### Usage Script Intranet Support + +- Removed private-IP / suspicious-hostname blocking from usage scripts, unblocking enterprise intranet, Docker, and self-hosted API endpoints +- Built-in templates still enforce HTTPS (except localhost) and same-origin checks; custom templates remain user-controlled with those request-URL checks skipped + +### Failover Queue Notes + +- Provider notes now appear in failover queue selectors and queue rows for easier identification across multi-provider queues (#2138, thanks @Coconut-Fish) + +--- + +## Fixed + +### Header Auto-Compact Latching After Maximize + +- The toolbar no longer stays compacted after maximize/restore; compaction now reevaluates on size changes + +### Hermes YAML Pollution & OAuth MCP `auth` Drop + +- Round-tripping through CC Switch no longer drops OAuth MCP `auth` blocks or pollutes unrelated YAML keys +- Guard tests added via `tests/hermes_roundtrip.rs` + +### Hermes Active Provider Display + +- Hermes UI now correctly surfaces the active provider and wires add / enable / remove actions + +### Hermes Provider Persistence + +- Providers persist under `custom_providers:` so `api_mode` and `model` survive restarts and config reloads + +### Hermes Health Check Borrowing OpenClaw Schema + +- Hermes providers were routed through `check_additive_app_stream` (the OpenClaw dispatcher), which reads camelCase `baseUrl` / `apiKey` / `api` and surfaced "OpenClaw provider is missing baseUrl" even when every Hermes field was filled +- Introduced `check_hermes_stream` with Hermes-specific extractors that map `api_mode` (`chat_completions` / `anthropic_messages` / `codex_responses`) to the matching `check_claude_stream` `api_format`; `bedrock_converse` returns as unsupported +- `api_mode` is now resolved before URL / API key extraction, so `bedrock_converse` users see the real cause rather than a misleading "missing base_url" + +### Usage Query Modal for Hermes & OpenClaw + +- `getProviderCredentials` now reads flat `settingsConfig` fields for Hermes (snake_case `base_url` / `api_key`) and OpenClaw (camelCase `baseUrl` / `apiKey`), so the "official balance" template auto-selects for matching providers like SiliconFlow +- Refactored the BALANCE and TOKEN_PLAN test paths to reuse the precomputed `providerCredentials` instead of re-reading `env.ANTHROPIC_*` directly, fixing the "empty key" error for non-Claude apps even when the key was configured + +### Codex `cache_control` Preservation + +- Preserve `cache_control` when merging system prompts during Codex format conversion (#1946, thanks @yovinchen) + +### Claude Prompt Cache Key Leak + +- Stopped sending prompt cache keys during Claude chat conversions (#2003, thanks @yovinchen) + +### Proxy Hop-by-Hop Header Stripping + +- Strip hop-by-hop response headers (Connection, Keep-Alive, Transfer-Encoding, etc.) per RFC 7230 (#2060, thanks @yovinchen) + +### Permissive Proxy CORS Removed + +- Removed the permissive CORS layer from the proxy (#1915, thanks @zerone0x) + +### Backend Error Details in Proxy Toast + +- Surface backend error payload details in proxy-related toast messages instead of a generic failure string + +### Usage Log Deduplication + +- Deduplicated proxy and session-log usage records so the same request is no longer double-counted +- Synced the request log time range with the dashboard's 1d / 7d / 30d selector + +### Common Config Checkbox Persistence + +- Checkbox state for Claude / Codex / Gemini common-config toggles now persists correctly across reopens (#2191, thanks @zxZeng) + +### Claude Plugin `settings.json` Sync + +- Editing the current provider now syncs back to `settings.json` for the Claude plugin path (#1905, thanks @chengww5217) + +### Google Official Gemini Env Preservation + +- Saving the Google Official Gemini provider no longer clobbers the `env` block + +### OpenCode JSON5 Parser for Trailing Commas + +- OpenCode config reads now tolerate trailing commas via a JSON5 parser (#2023, thanks @wwminger) + +### Preset Refreshes + +- Refreshed stale context windows for DeepSeek and Claude 1M +- Refreshed stale model IDs; backfilled Hermes model lists +- Fixed the Nous endpoint and replaced the Hermes placeholder icon with Nous brand artwork +- Pruned unused official Hermes presets + +### Auto-Expand Collapsed Messages on Search Hit + +- Collapsed messages now auto-expand when a search match lands inside hidden content + +### Unknown Subscription Quota Tiers Hidden + +- Provider cards no longer render unknown subscription quota tiers + +### Weekly Limit Label Unified + +- Aligned the `weekly_limit` tier label with the official 7-day naming across locales + +### Root-Level Skill Repo Install + +- Fixed skill installation when the repository root itself is a skill + +### Session ID Parsing Clippy + +- Removed a redundant closure in session ID parsing (clippy warning) + +### Stream Check Default Models Refresh + +- Updated stream-check default probe models to match each vendor's current lineup + +### Skills Import Sync + +- Imported Skills are now immediately synced into enabled app directories instead of only being recorded in the database (#2101, thanks @yaoguohh) +- The UI no longer shows "installed" while the target app directory is missing the skill + +### Ghostty Session Restore + +- Fixed Ghostty session restore launch by using shell execution with `--working-directory` (#1976, thanks @Suda202) +- Avoids `cwd` escaping issues when the path contains spaces or special characters + +--- + +## Docs + +### README Sponsor Updates + +- Updated SiliconFlow signup bonus to ¥16 +- Trimmed the SSSAiCode sponsor blurb +- Updated partner logos +- Added LemonData as a new sponsor + +### Global Proxy Hint Clarified + +- Clarified the global proxy hint about local routing across all three locales + +### Takeover → Routing Rename + +- Renamed takeover docs to routing and updated anchors across all languages + +### PIPELLM Website URL + +- Updated the PIPELLM sponsor website URL to `code.pipellm.ai` + +--- + +## ⚠️ Breaking Changes + +### Hermes requires explicit `api_mode` + +- The `Auto` mode is gone; imported or deeplinked providers default to `chat_completions` +- Users with prior `Auto` configs will be prompted to pick a protocol + +### `ANTHROPIC_REASONING_MODEL` removed from Claude quick-set + +- The legacy field is no longer exposed; existing settings are cleaned up automatically + +### Per-provider proxy configuration removed + +- Migrate to the global Local Routing setting +- Existing per-provider proxy values are ignored + +### Database schema v9 → v10 + +- Adds `enabled_hermes` columns to `mcp_servers` and `skills` +- Auto-migrated with `DEFAULT 0`; no data loss + +### Pricing table reseeded (v8 → v9) + +- The `model_pricing` table is cleared and reseeded on first launch to pick up new models and corrected prices + +### XCodeAPI preset removed + +- Users of the XCodeAPI preset should switch to another provider + +--- + +## ⚠️ Risk Notice + +This release inherits the risk notices originally introduced in v3.12.3 / v3.13.0 for reverse-proxy-style features. + +**GitHub Copilot Reverse Proxy**: Using Copilot's reverse-proxy path may violate GitHub / Microsoft's terms of service. See [v3.12.3 release notes](v3.12.3-en.md#️-risk-notice). + +**Codex OAuth Reverse Proxy**: Using the Codex OAuth reverse proxy with a ChatGPT subscription may violate OpenAI's terms of service. See [v3.13.0 release notes](v3.13.0-en.md#️-risk-notice). + +By enabling these features, users **accept all associated risks**. CC Switch is not responsible for any account restrictions, warnings, or service suspensions that result from using these features. + +--- + +## Download & Installation + +Visit [Releases](https://github.com/farion1231/cc-switch/releases/latest) to download the appropriate version. + +### System Requirements + +| OS | Minimum Version | Architecture | +| ------- | ----------------------- | ----------------------------------- | +| Windows | Windows 10 or later | x64 | +| macOS | macOS 12 (Monterey) or later | Intel (x64) / Apple Silicon (arm64) | +| Linux | See table below | x64 | + +### Windows + +| File | Description | +| ---------------------------------------- | ----------------------------------------------- | +| `CC-Switch-v3.14.0-Windows.msi` | **Recommended** - MSI installer, supports auto-update | +| `CC-Switch-v3.14.0-Windows-Portable.zip` | Portable, extract and run, no registry writes | + +### macOS + +| File | Description | +| -------------------------------- | -------------------------------------------------------- | +| `CC-Switch-v3.14.0-macOS.dmg` | **Recommended** - DMG installer, drag into Applications | +| `CC-Switch-v3.14.0-macOS.zip` | Extract and drag into Applications, Universal Binary | +| `CC-Switch-v3.14.0-macOS.tar.gz` | For Homebrew installation and auto-update | + +> macOS builds are Apple code-signed and notarized — install directly. + +### Homebrew (macOS) + +```bash +brew tap farion1231/ccswitch +brew install --cask cc-switch +``` + +Update: + +```bash +brew upgrade --cask cc-switch +``` + +### Linux + +| Distribution | Recommended | Installation | +| --------------------------------------- | ----------- | ---------------------------------------------------------------------- | +| Ubuntu / Debian / Linux Mint / Pop!\_OS | `.deb` | `sudo dpkg -i CC-Switch-*.deb` or `sudo apt install ./CC-Switch-*.deb` | +| Fedora / RHEL / CentOS / Rocky Linux | `.rpm` | `sudo rpm -i CC-Switch-*.rpm` or `sudo dnf install ./CC-Switch-*.rpm` | +| openSUSE | `.rpm` | `sudo zypper install ./CC-Switch-*.rpm` | +| Arch Linux / Manjaro | `.AppImage` | Add execute permission and run, or use AUR | +| Other distros / not sure | `.AppImage` | `chmod +x CC-Switch-*.AppImage && ./CC-Switch-*.AppImage` | diff --git a/docs/release-notes/v3.14.0-ja.md b/docs/release-notes/v3.14.0-ja.md new file mode 100644 index 000000000..2f0abf721 --- /dev/null +++ b/docs/release-notes/v3.14.0-ja.md @@ -0,0 +1,469 @@ +# CC Switch v3.14.0 + +> Hermes Agent が 6 番目の管理対象アプリに、Claude Opus 4.7 をプリセットマトリクス全体へ展開、Gemini Native API プロキシ、「Local Routing」への名称統一、アプリケーションレベルのウィンドウコントロール + +**[中文版 →](v3.14.0-zh.md) | [English →](v3.14.0-en.md)** + +--- + +## 概要 + +CC Switch v3.14.0 は、**Hermes Agent を 6 番目の一等管理対象アプリケーション**として CC Switch に取り込み、**Claude Opus 4.7** をアグリゲーターおよび Bedrock プリセットのマトリクス全体に展開することを中心に据えた大型リリースです。Hermes サポートは、データベース v9 → v10 マイグレーション、完全な Rust コマンド面、アトミックバックアップ付きの YAML ベースな `~/.hermes/config.yaml` 読み書き、MCP 同期、Skills 同期、SQLite + JSONL セッション管理、および Memory エディターを含む専用のフロントエンドパネルをカバーします。Hermes Agent 0.10.0 スキーマに整合する 4 つの API プロトコル（`chat_completions`、`anthropic_messages`、`codex_responses`、`bedrock_converse`）すべてを選択可能です。ユーザーが直接記述した `providers:` dict のエントリは読み取り専用カードとして表示され、深い YAML 設定は Hermes Web UI に委譲されます。 + +Hermes に加えて、本リリースでは **Gemini Native API プロキシ**（`api_format = "gemini_native"`）を追加し、プロキシがリクエストを Google の `generateContent` エンドポイントに直接転送できるようにしました（完全なストリーミング、スキーマ変換、シャドウリクエストをサポート）。また、旧「Local Proxy Takeover」を三言語の UI / README / ドキュメント全体で **Local Routing** に統一リネームし、コンポジターが描画するボタンが無反応になり得る Linux Wayland などのシーンで、CC Switch が自前で最小化 / 最大化 / 閉じるボタンを描画できるオプション「**アプリケーションレベルのウィンドウコントロール**」を導入しました。さらにリリース直前に、ツールバーからの `hermes dashboard` 直接起動、LemonData の全アプリプリセット、DDSHub の Codex エンドポイント、および複数の Hermes ヘルスチェックと Usage モーダルの修正が追加されました。 + +セッション側では、`@tanstack/react-virtual` によるセッションリストの**仮想化**で数千件のレコードを持つ長い会話も滑らかにスクロールでき、長いメッセージはデフォルトで折り畳まれます。Usage ダッシュボードには**日付範囲ピッカー**（今日 / 1d / 7d / 14d / 30d + カスタム日時カレンダー）とページジャンプ入力が追加され、**Stream Check エラー分類**は色分けされたトーストで提示され、デフォルトの探索モデルが更新され、「モデルが見つからない」レスポンスを個別に識別するようになりました。また、Local Routing が有効な間に公式プロバイダーへの切り替えを**強制的にブロック**する保護を追加し、公式 API トラフィックがローカルプロキシを経由することによるアカウント停止リスクを防ぎます。Pricing データベースは v8 → v9 で再シードされ、約 50 件の新しいモデルエントリ（Claude 4.7、Opus 4.7 Adaptive Thinking、Grok 4、Qwen 3.5/3.6、MiniMax M2.5/M2.7、Doubao Seed 2.0 系列、GLM-5/5.1 など）を追加し、いくつかの古い価格を修正しました。 + +**リリース日**: 2026-04-21 + +**更新規模**: 100 commits | 219 files changed | +20,548 / -3,569 lines + +--- + +## ハイライト + +- **Hermes Agent サポート（6 番目の管理対象アプリ）**: データベース v9 → v10 マイグレーション、完全な Rust コマンド面、アトミックバックアップ付き YAML 読み書き、MCP 同期、Skills 同期、SQLite + JSONL セッション管理、専用フロントエンドパネル、4 つの API プロトコル（`chat_completions` / `anthropic_messages` / `codex_responses` / `bedrock_converse`） +- **Claude Opus 4.7 の全面展開**: 適応的思考のホワイトリスト、百万トークン単位の価格シード、Bedrock SKU（`anthropic.claude-opus-4-7` / `global.anthropic.claude-opus-4-7`、旧 `-v1` サフィックスを廃止）、全アグリゲーター / Bedrock プリセットを Opus 4.7 をデフォルト Opus モデルに移行 +- **Claude `max` エフォートティア**: エフォートのドロップダウンを `high` から `max` に引き上げ +- **Gemini Native API プロキシ**: 新しい `api_format = "gemini_native"` により、プロキシが Google の `generateContent` に直接転送可能に（完全なストリーミング / スキーマ変換 / シャドウリクエスト対応） +- **GitHub Copilot Enterprise Server**: Copilot ベースの Claude プロバイダーに GHES 認証とエンドポイント設定を追加 +- **Copilot 交互消費の大幅最適化**: 転送前の thinking ブロック主動削除、`tool_result` メッセージ分類修正、subagent 検出、`x-interaction-id` 課金マージ、孤立 `tool_result` のサニタイズ、Warmup ダウングレードのデフォルト有効化など、premium 交互消費を系統的に削減 +- **セッションリスト仮想化**: 長い会話が滑らかにスクロール。長いメッセージはデフォルトで折り畳まれ、テキストレイアウトコストを削減 +- **Codex / OpenClaw セッションタイトル抽出**: 意味のあるタイトルを自動抽出（2 行表示）、OpenClaw の `message_id` 末尾ノイズを除去 +- **Usage 日付範囲ピッカー**: Today / 1d / 7d / 14d / 30d プリセットタブ + カスタム日時カレンダー。ページネーションリストにページジャンプ入力 +- **Stream Check エラー分類**: エラーを分類し色分けトーストで提示。デフォルト探索モデル更新。「モデルが見つからない」レスポンスを明示的に検出 +- **Local Routing 有効時の公式プロバイダー切り替えブロック**: 公式 API トラフィックをローカルプロキシ経由で流すとアカウント停止のリスクがあるため、切り替えを強制ブロックして警告トーストを表示 +- **Pricing データベース刷新（v8 → v9）**: 約 50 件の新しいモデルエントリを追加し、古い価格を修正 +- **アプリケーションレベルのウィンドウコントロール**: CC Switch が自前で最小化 / 最大化トグル / 閉じるボタンを描画するオプション設定。Linux Wayland での体験を大きく改善 +- **統一 Skills 管理への Hermes 追加**: Skill のインストール / 有効化 / フィルターが Hermes をカバー +- **Hermes / OpenClaw 設定ディレクトリのカスタマイズ**: 設定で `~/.hermes/config.yaml` や `openclaw.json` のカスタム位置を指定可能 +- **ツールバーからの Hermes Dashboard 起動**: Hermes Web UI のプローブに失敗した際、ツールバーエントリからユーザーの優先ターミナルで `hermes dashboard` を実行可能 +- **新パートナープリセット**: LemonData を全 6 アプリにわたって追加、DDSHub の Codex エンドポイント、StepFun Step Plan + +--- + +## 新機能 + +### Hermes Agent サポート（6 番目の管理対象アプリ） + +CC Switch は Hermes Agent を Claude / Codex / Gemini / OpenCode / OpenClaw と並ぶ一等の管理対象アプリとして初めてサポートします。 + +- **データベースマイグレーション v9 → v10**: `mcp_servers` と `skills` テーブルに `enabled_hermes` カラムを追加（`DEFAULT 0`、自動マイグレーション、データ損失なし） +- **YAML 設定の読み書き**: `~/.hermes/config.yaml` をアトミックバックアップ付きで読み書き。`tests/hermes_roundtrip.rs` が OAuth MCP `auth` ブロックの消失や無関係なキーの汚染を防止 +- **4 つの API プロトコル**: Hermes Agent 0.10.0 と整合する `chat_completions` / `anthropic_messages` / `codex_responses` / `bedrock_converse`。新しいディープリンクはデフォルトで `chat_completions` +- **ユーザー `providers:` dict の読み取り専用表示**: YAML に手書きされたプロバイダーエントリは CC Switch で読み取り専用カードとして表示され、深い設定は Hermes Web UI に委譲 +- **加算的な切り替え**: Claude / Codex の「上書き」型切り替えと異なり、Hermes ではすべてのプロバイダーが同じ YAML に共存 + +### Hermes Memory パネル + +- `MEMORY.md` / `USER.md` を直接編集できる Memory パネルを追加（有効化スイッチ、文字数制限、ライブ保存フロー付き） +- Hermes の Prompts エントリを置き換え + +### Hermes プロバイダープリセット（約 50 個） + +- Nous Research、Shengsuanyun（胜算云）、OpenRouter、DeepSeek、Together AI、StepFun、Zhipu GLM、Bailian（百炼）、Kimi、MiniMax、DouBao（豆包）、BaiLing（百灵）、ModelScope（魔搭）、KAT-Coder、PackyCode、Cubence、AIGoCode、RightCode、AICodeMirror、AICoding、CrazyRouter、SSSAiCode、Micu、CTok.ai、DDSHub、E-FlowCode、LionCCAPI、PIPELLM、Compshare、SiliconFlow、AiHubMix、DMXAPI、TheRouter、Novita、Nvidia、Xiaomi MiMo をカバー + +### ツールバーからの Hermes Dashboard 起動 + +- Hermes Web UI のプローブに失敗した際、ツールバーエントリがユーザーの優先ターミナルで `hermes dashboard` を実行する確認ダイアログを表示 +- 一時 bash / batch スクリプト経由で起動。`hermes dashboard` 自身が準備完了後にブラウザを開くため、ポーリングは不要 +- Memory パネルと Health バナーは既存のトースト動作を維持 +- オフラインのトーストにあった古い `hermes web` のヒントも修正（正しいコマンドは `hermes dashboard`） +- Linux ターミナル検出の順序を変更し、`/usr/bin`、`/bin`、`/usr/local/bin` を stat する前に `which` を試すように + +### Claude Opus 4.7 サポート + +- Claude Opus 4.7 を追加。適応的思考のホワイトリスト、百万トークン単位の価格シード、Bedrock SKU（`anthropic.claude-opus-4-7` / `global.anthropic.claude-opus-4-7`、旧 `-v1` サフィックスを廃止） +- 全アグリゲーター / Bedrock プリセットをデフォルト Opus モデルとして Opus 4.7 に移行 + +### Claude `max` エフォートティア + +- Claude エフォートドロップダウンを `high` から `max` に引き上げ、より強力な推論容量を解放 + +### Gemini Native API プロキシ + +- 新しい `api_format = "gemini_native"` により、プロキシが Google の `generateContent` API に直接転送可能 (#1918, 感謝 @yovinchen) +- 完全なストリーミング、スキーマ変換、シャドウリクエストに対応 +- proxy providers モジュール下に `gemini_url.rs`、`gemini_schema.rs`、`gemini_shadow.rs`、`streaming_gemini.rs`、`transform_gemini.rs` を追加 + +### GitHub Copilot Enterprise Server（GHES） + +- Copilot ベースの Claude プロバイダーに GHES 認証とエンドポイント設定を追加 (#2175, 感謝 @hotelbe) + +### セッションリスト仮想化 + +- `@tanstack/react-virtual` によりセッションリストを仮想化。数千件のレコードを持つ長い会話も滑らかにスクロール +- 長いセッションメッセージはデフォルトで折り畳まれ、テキストレイアウトコストを削減 + +### Codex / OpenClaw セッションタイトル抽出 + +- Codex と OpenClaw セッションから意味のあるタイトルを自動抽出し、2 行表示 +- OpenClaw の `message_id` 末尾ノイズを除去 + +### Usage 日付範囲ピッカー + +- Usage ダッシュボードに日付範囲セレクターを追加。プリセットタブ（Today / 1d / 7d / 14d / 30d）+ カスタム日時カレンダー (#2002, 感謝 @yovinchen) +- ページネーションリストにページジャンプ入力を追加 + +### モデルマッピングのクイック入力 + +- プロバイダーフォームのモデルマッピングフィールドの横にクイック入力ボタンを追加し、編集を高速化 (#2179, 感謝 @lispking) + +### Stream Check エラー分類 + +- Stream Check エラーを分類し、色分けトーストとして提示 +- デフォルトの探索モデルを各ベンダーの現行ラインナップに合わせて更新 +- 「モデルが見つからない」レスポンスを明示的に検出 + +### Local Routing 有効時の公式プロバイダー切り替えブロック + +- Local Routing が有効な状態で公式プロバイダーに切り替えようとすると、強制的にブロックされ警告トーストが表示される +- 理由: 公式 API トラフィックをローカルプロキシ経由で流すとアカウント停止のリスクがあるため + +### Pricing データベース刷新（v8 → v9） + +- マイグレーション時に定価テーブルを再シード +- Claude 4.7、Opus 4.7 Adaptive Thinking、Grok 4、Qwen 3.5/3.6、MiniMax M2.5/M2.7、Doubao Seed 2.0 系列、GLM-5/5.1 などを含む約 50 件の新しいモデルエントリを追加 +- DeepSeek、Kimi K2.5 などの古い価格を修正 + +### アプリケーションレベルのウィンドウコントロール + +- CC Switch が自前で最小化 / 最大化トグル / 閉じるボタンを描画するオプション設定を追加。システム装飾の代わりに使用 (#1119, 感謝 @git1677967754) +- コンポジター描画ボタンが無反応になり得る Linux Wayland での体験を大きく改善 + +### 統一 Skills 管理への Hermes 追加 + +- 統一 Skills サーフェスに Hermes を追加 +- Skill のインストール / 有効化 / フィルターが、Claude / Codex / Gemini / OpenCode / OpenClaw と並んで Hermes アプリをカバー + +### OpenClaw 設定ディレクトリのカスタマイズ + +- CC Switch が参照する `openclaw.json` のカスタム位置を設定できるオプションを追加 (#1518, 感謝 @mrFranklin) + +### Hermes 設定ディレクトリのカスタマイズ + +- CC Switch が参照する `~/.hermes/config.yaml` のカスタム位置を設定できるオプションを追加。データ駆動 dispatch でサポート + +### StepFun Step Plan プリセット + +- StepFun Step Plan（EN / ZH）プロバイダープリセットを追加 (#2155, 感謝 @hengm3467) + +### New API 用量スクリプトテンプレート + +- New API の用量スクリプトテンプレートに User-Agent ヘッダーを追加し、上流互換性を向上 + +### LemonData プロバイダープリセット（全 6 アプリ） + +- LemonData をサードパーティパートナープリセットとして Claude、Codex、Gemini、OpenCode、OpenClaw、Hermes の全 6 アプリに登録 +- アイコンアセットと zh / en / ja 三言語のパートナー推奨文面を追加 +- Claude プリセットは `ANTHROPIC_API_KEY` 認証を使用。OpenAI 互換アプリは `gpt-5.4` をターゲット + +### DDSHub Codex プリセット + +- DDSHub の Codex 互換エンドポイントを追加（Claude サービスと同じホスト） +- ベース URL は `/v1` サフィックスを省略（ゲートウェイが OpenAI SDK パスを自動ルーティング） + +--- + +## 変更 + +### 「Local Proxy Takeover」→「Local Routing」 + +- 三言語の UI 文言、README、ドキュメント全体で用語を統一リネーム +- 機能的な動作は変更なし + +### Hermes `Auto` api_mode の削除 + +- ユーザーは明示的にプロトコルを選択する必要あり。新しいディープリンクはデフォルトで `chat_completions` +- URL ベースのヒューリスティックによる意外な挙動を排除 + +### Hermes プロバイダーフォーム + +- API モードドロップダウンとプロバイダー単位のモデルエディターを追加 +- アクティブなプロバイダーを切り替える際、プロバイダー単位のモデルをトップレベルの `model:` にバインド + +### Hermes 深い設定の委譲 + +- 深い YAML 設定は CC Switch フォームで重複させず、「Hermes Web UI を起動」ボタン経由で Web UI に直接委譲 + +### Hermes ツールバーレイアウト + +- Hermes Web UI ボタンのアイコンを `ExternalLink` から `LayoutDashboard` に変更（クリック時に単に URL を開くのではなく `hermes dashboard` を起動する場合があるため、パネル型アイコンのほうが意味的に正確） +- MCP をツールバーの末尾に移動し、Hermes のレイアウトを Claude / Codex / Gemini / OpenCode と揃える + +### Claude Quick-Set から `ANTHROPIC_REASONING_MODEL` を削除 + +- 推論能力とモデル選択を分離。レガシーフィールドは Quick-Set フォームから除外 + +### プロバイダー単位のプロキシ設定を削除 + +- グローバルな Local Routing に統合 +- プロバイダー単位のプロキシトグルと関連ストレージは削除済み + +### ツールバーアイコンボタン幅の統一 + +- Claude / Codex / Gemini / OpenCode / OpenClaw / Hermes パネルの間でアイコンボタン幅を正規化し、ヘッダーの見た目を統一 + +### Rust Toolchain を 1.95 にピン留め + +- ワークスペース全体で clippy 1.95 の提案を採用し、nightly ドリフトを防ぐためツールチェーンをピン留め + +### トレイメニュー ID 定数 + +- トレイ識別子をハードコーディング文字列 `"main"` から `TRAY_ID` 定数（`"cc-switch"`）に移行。すべての呼び出し箇所で同期 (#1978, 感謝 @lidaxian121) + +### Copilot 交互消費の大幅最適化 + +Copilot リバースプロキシの premium 交互消費を削減するための系統的な最適化。以下の複数の改善をカバー: + +- **転送前に thinking ブロックを主動削除**: Anthropic の `thinking` / `redacted_thinking` ブロックは OpenAI 互換エンドポイントに拒否される。従来は上流でリクエストが失敗して premium 交互を 1 回消費した後、`thinking_rectifier` によってリトライされていた。新しい主動削除ステップ（Copilot 最適化パイプラインの 3.5 ステップ目、`tool_result` マージ後）により、この無駄な premium 消費を直接解消 +- **リクエスト分類の修正**: `tool_result` を含むメッセージをユーザー発起の新規リクエストではなく、エージェント継続として分類。ツール呼び出しが毎回 premium 交互としてカウントされる問題を防止 +- **subagent 検出**: `__SUBAGENT_MARKER__` と `metadata._agent_` フォールバックで subagent を識別し、`x-interaction-type=conversation-subagent` を設定 +- **決定論的 `x-interaction-id` による課金マージ**: セッション ID から `x-interaction-id` を導出し、同一セッション内の複数リクエストを 1 回の課金交互に統合 +- **孤立 `tool_result` のサニタイズ**: 孤立した `tool_result` を整理し、上流エラーによるリトライおよび重複課金を防止 +- **Warmup ダウングレードをデフォルトで有効化**: `gpt-5-mini` をデフォルトのダウングレードモデルとして使用 +- **最適化パイプラインの並び替え**: classify → sanitize → merge → warmup の順序で、分類が生の `tool_result` セマンティクスを参照可能に +- `CopilotOptimizerConfig` のデフォルト値の不一致を修正（`gpt-5-mini` に統一） + +### 用量スクリプトのイントラネットサポート + +- 用量スクリプトからプライベート IP / 不審なホスト名のブロッキングを削除し、エンタープライズイントラネット、Docker、自己ホスト API エンドポイントを解放 +- ビルトインテンプレートは引き続き HTTPS（localhost を除く）と同一オリジンチェックを強制。カスタムテンプレートはユーザー制御のまま、リクエスト URL のチェックをスキップ + +### Failover キューの備考表示 + +- プロバイダーの備考が failover キューセレクターとキュー行に表示され、マルチプロバイダーキューでの識別が容易に (#2138, 感謝 @Coconut-Fish) + +--- + +## バグ修正 + +### 最大化後のツールバー自動折り畳みラッチ + +- ウィンドウの最大化 / 復元後、ツールバーが折り畳まれたままになる問題を修正。折り畳み判定はサイズ変更時に再評価される + +### Hermes YAML 汚染と OAuth MCP `auth` 消失 + +- CC Switch 経由でラウンドトリップしても OAuth MCP `auth` ブロックが消失したり、無関係な YAML キーが汚染されたりしなくなった +- `tests/hermes_roundtrip.rs` をガードテストとして追加 + +### Hermes アクティブプロバイダー表示 + +- Hermes UI がアクティブプロバイダーを正しく表示するようになり、追加 / 有効化 / 削除アクションが正しく動作 + +### Hermes プロバイダーの永続化 + +- プロバイダーは `custom_providers:` の下に永続化され、`api_mode` と `model` が再起動 / 設定再読み込みを生き延びる + +### Hermes ヘルスチェックが OpenClaw のスキーマを流用していた問題 + +- 以前 Hermes プロバイダーは `check_additive_app_stream`（OpenClaw のディスパッチャー）にルーティングされており、これは camelCase の `baseUrl` / `apiKey` / `api` を読むため、Hermes フィールドをすべて記入しても "OpenClaw provider is missing baseUrl" と表示されていた +- `check_hermes_stream` を導入し、Hermes 専用のエクストラクターで `api_mode`（`chat_completions` / `anthropic_messages` / `codex_responses`）を対応する `check_claude_stream` の `api_format` にマッピング。`bedrock_converse` は非対応として返す +- URL / API キーの抽出前に `api_mode` を解決することで、`bedrock_converse` を選んだユーザーには「missing base_url」という誤解を招くメッセージではなく実際の原因が表示される + +### Hermes / OpenClaw 向け Usage クエリモーダル + +- `getProviderCredentials` が Hermes（snake_case の `base_url` / `api_key`）と OpenClaw（camelCase の `baseUrl` / `apiKey`）のフラットな `settingsConfig` フィールドを読むようになり、SiliconFlow などマッチするプロバイダーで「official balance」テンプレートが自動選択される +- BALANCE と TOKEN_PLAN テストパスをリファクタリングし、`env.ANTHROPIC_*` を直接再読するのではなく、事前計算された `providerCredentials` を再利用するように変更。これにより非 Claude アプリでキーが設定されていても「empty key」エラーが出ていた問題を修正 + +### Codex `cache_control` 保持 + +- Codex フォーマット変換中に system prompt をマージする際の `cache_control` を保持 (#1946, 感謝 @yovinchen) + +### Claude プロンプトキャッシュキーのリーク + +- Claude chat 変換時にプロンプトキャッシュキーを送信しないように修正 (#2003, 感謝 @yovinchen) + +### プロキシ Hop-by-Hop レスポンスヘッダーの削除 + +- RFC 7230 に従ってプロキシレスポンスの hop-by-hop ヘッダー（Connection、Keep-Alive、Transfer-Encoding など）を削除 (#2060, 感謝 @yovinchen) + +### プロキシの寛容な CORS レイヤー削除 + +- プロキシの寛容な CORS レイヤーを削除 (#1915, 感謝 @zerone0x) + +### プロキシトーストでのバックエンドエラー詳細表示 + +- プロキシ関連のトーストメッセージで、汎用的な失敗文字列ではなくバックエンドのエラーペイロードの詳細を表示 + +### Usage ログの重複排除 + +- プロキシとセッションログの用量レコードを重複排除し、同じリクエストが二重にカウントされないように修正 +- リクエストログの時間範囲をダッシュボードの 1d / 7d / 30d セレクターと同期 + +### Common Config チェックボックスの永続化 + +- Claude / Codex / Gemini の common-config トグルのチェック状態が再オープンをまたいで正しく保持されるように修正 (#2191, 感謝 @zxZeng) + +### Claude プラグイン `settings.json` 同期 + +- 現在のプロバイダーを編集すると、Claude プラグインパスの `settings.json` に同期されるように修正 (#1905, 感謝 @chengww5217) + +### Google Official Gemini の env 保持 + +- Google Official Gemini プロバイダーを保存しても `env` ブロックが消えないように修正 + +### OpenCode の JSON5 による末尾カンマ解析 + +- OpenCode 設定読み取りが JSON5 パーサーにより末尾カンマを許容するように修正 (#2023, 感謝 @wwminger) + +### プリセットの刷新 + +- DeepSeek と Claude 1M の古いコンテキストウィンドウを刷新 +- 古いモデル ID を刷新。Hermes のモデルリストをバックフィル +- Nous エンドポイントを修正し、Hermes のプレースホルダーアイコンを Nous ブランドのアートワークに置き換え +- 未使用の公式 Hermes プリセットを整理 + +### 検索ヒット時の折り畳みメッセージの自動展開 + +- 隠されたコンテンツ内部で検索マッチが発生した場合、折り畳みメッセージを自動展開してマッチを示す + +### 不明なサブスクリプション配額ティアの非表示 + +- プロバイダーカードは不明なサブスクリプション配額ティアを表示しないように変更 + +### weekly_limit ラベルの統一 + +- `weekly_limit` ティアラベルを公式の「7 日」命名にロケール間で揃えた + +### ルートレベルの Skill リポジトリインストール + +- リポジトリのルート自体が skill の場合のインストール失敗を修正 + +### Session ID 解析の clippy 警告 + +- session ID 解析内の冗長なクロージャを削除（clippy 警告） + +### Stream Check デフォルトモデルの刷新 + +- Stream Check のデフォルト探索モデルを各ベンダーの現行ラインナップに合わせて更新 + +### Skills インポートの同期 + +- インポートされた Skills はデータベースに記録されるだけでなく、有効化されたアプリディレクトリにも即座に同期されるように変更 (#2101, 感謝 @yaoguohh) +- UI が「インストール済み」と表示しているのに対象アプリディレクトリに skill が存在しない状態を解消 + +### Ghostty セッション復元 + +- Ghostty セッション復元の起動を `--working-directory` 付きのシェル実行に変更 (#1976, 感謝 @Suda202) +- パスにスペースや特殊文字が含まれる場合の `cwd` エスケープ問題を回避 + +--- + +## ドキュメント + +### README スポンサー更新 + +- SiliconFlow のサインアップボーナスを ¥16 に更新 +- SSSAiCode のスポンサー文面を簡潔化 +- パートナーロゴを更新 +- 新しいスポンサーとして LemonData を追加 + +### グローバルプロキシヒントの明確化 + +- 三言語でグローバルプロキシと Local Routing の関係を明確化 + +### Takeover → Routing ドキュメントのリネーム + +- テイクオーバー関連ドキュメントを三言語で routing にリネームし、アンカーを同期更新 + +### PIPELLM ウェブサイト URL + +- PIPELLM スポンサーのウェブサイト URL を `code.pipellm.ai` に更新 + +--- + +## ⚠️ 重要な変更（Breaking） + +### Hermes は明示的な `api_mode` が必須 + +- `Auto` モードは廃止。インポートまたはディープリンクで取得したプロバイダーはデフォルトで `chat_completions` +- 既存の `Auto` 設定のユーザーはプロトコルを選択するよう促される + +### Claude Quick-Set から `ANTHROPIC_REASONING_MODEL` を削除 + +- レガシーフィールドは公開されなくなった。既存の設定は自動的にクリーンアップされる + +### プロバイダー単位のプロキシ設定を削除 + +- グローバル Local Routing 設定に移行 +- 既存のプロバイダー単位のプロキシ値は無視される + +### データベーススキーマ v9 → v10 + +- `mcp_servers` と `skills` に `enabled_hermes` カラムを追加 +- `DEFAULT 0` で自動マイグレーション、データ損失なし + +### Pricing テーブルの再シード（v8 → v9） + +- 新しいモデルと修正済み価格を取り込むため、初回起動時に `model_pricing` テーブルがクリアされ再シードされる + +### XCodeAPI プリセットの削除 + +- XCodeAPI プリセットを使用していたユーザーは別のプロバイダーに切り替える必要がある + +--- + +## ⚠️ リスクに関する注意事項 + +本リリースは、リバースプロキシ型機能について v3.12.3 / v3.13.0 で提起された既存のリスク注意事項を継承します。 + +**GitHub Copilot リバースプロキシ**: Copilot のリバースプロキシパスを使用すると、GitHub / Microsoft の利用規約に違反する可能性があります。詳細は [v3.12.3 リリースノート](v3.12.3-ja.md#️-リスクに関する注意事項) を参照してください。 + +**Codex OAuth リバースプロキシ**: ChatGPT サブスクリプションで Codex OAuth リバースプロキシを使用すると、OpenAI の利用規約に違反する可能性があります。詳細は [v3.13.0 リリースノート](v3.13.0-ja.md#️-リスクに関する注意事項) を参照してください。 + +これらの機能を有効にすることで、ユーザーは**すべての関連リスクを自己責任で受諾**したものとみなされます。CC Switch はこれらの機能の使用に起因するアカウントの制限、警告、サービス停止について一切の責任を負いません。 + +--- + +## ダウンロード・インストール + +[Releases](https://github.com/farion1231/cc-switch/releases/latest) から対応バージョンをダウンロードしてください。 + +### システム要件 + +| OS | 最小バージョン | アーキテクチャ | +| ------- | ---------------------------- | ----------------------------------- | +| Windows | Windows 10 以降 | x64 | +| macOS | macOS 12 (Monterey) 以降 | Intel (x64) / Apple Silicon (arm64) | +| Linux | 下表参照 | x64 | + +### Windows + +| ファイル | 説明 | +| ---------------------------------------- | ------------------------------------------- | +| `CC-Switch-v3.14.0-Windows.msi` | **推奨** - MSI インストーラー、自動更新対応 | +| `CC-Switch-v3.14.0-Windows-Portable.zip` | ポータブル版、解凍して実行、レジストリ不要 | + +### macOS + +| ファイル | 説明 | +| -------------------------------- | -------------------------------------------------------- | +| `CC-Switch-v3.14.0-macOS.dmg` | **推奨** - DMG インストーラー、Applications にドラッグ | +| `CC-Switch-v3.14.0-macOS.zip` | 解凍して Applications にドラッグ、Universal Binary | +| `CC-Switch-v3.14.0-macOS.tar.gz` | Homebrew インストールと自動更新用 | + +> macOS 版は Apple のコード署名および公証済みで、直接インストールして使用できます。 + +### Homebrew（macOS） + +```bash +brew tap farion1231/ccswitch +brew install --cask cc-switch +``` + +更新: + +```bash +brew upgrade --cask cc-switch +``` + +### Linux + +| ディストリビューション | 推奨形式 | インストール方法 | +| --------------------------------------- | ----------- | ---------------------------------------------------------------------- | +| Ubuntu / Debian / Linux Mint / Pop!\_OS | `.deb` | `sudo dpkg -i CC-Switch-*.deb` または `sudo apt install ./CC-Switch-*.deb` | +| Fedora / RHEL / CentOS / Rocky Linux | `.rpm` | `sudo rpm -i CC-Switch-*.rpm` または `sudo dnf install ./CC-Switch-*.rpm` | +| openSUSE | `.rpm` | `sudo zypper install ./CC-Switch-*.rpm` | +| Arch Linux / Manjaro | `.AppImage` | 実行権限を付与して実行、または AUR を使用 | +| その他のディストリビューション / 不明 | `.AppImage` | `chmod +x CC-Switch-*.AppImage && ./CC-Switch-*.AppImage` | diff --git a/docs/release-notes/v3.14.0-zh.md b/docs/release-notes/v3.14.0-zh.md new file mode 100644 index 000000000..7f2a0d585 --- /dev/null +++ b/docs/release-notes/v3.14.0-zh.md @@ -0,0 +1,468 @@ +# CC Switch v3.14.0 + +> Hermes Agent 成为第 6 个受管应用、Claude Opus 4.7 全面接入、Gemini Native API 代理、Local Routing 统一重命名、应用级窗口控件 + +**[English →](v3.14.0-en.md) | [日本語版 →](v3.14.0-ja.md)** + +--- + +## 概览 + +CC Switch v3.14.0 是一次大版本更新，核心焦点是把 **Hermes Agent 作为第 6 个一等受管应用**接入 CC Switch，并把 **Claude Opus 4.7** 铺设到全部聚合器与 Bedrock 预设矩阵。Hermes 支持覆盖数据库 v9 → v10 迁移、完整的 Rust 命令面、基于 YAML 的 `~/.hermes/config.yaml` 读写（含原子备份）、MCP 同步、Skills 同步、SQLite + JSONL 会话管理，以及专属的前端面板和 Memory 编辑面板；与 Hermes Agent 0.10.0 schema 对齐的四种协议（`chat_completions`、`anthropic_messages`、`codex_responses`、`bedrock_converse`）全部可选。用户自行维护的 `providers:` dict 条目以只读卡片形式呈现，深度 YAML 配置则直接委托给 Hermes Web UI。 + +除了 Hermes，本次还新增了 **Gemini Native API 代理**（`api_format = "gemini_native"`），让代理可以把请求直接转发到 Google 的 `generateContent` 端点，完整支持流式、schema 转换和 shadow 请求；把老的 "Local Proxy Takeover" 在三语 UI / README / 文档中统一重命名为 **Local Routing**；新增 **应用级窗口控件**，在 Linux Wayland 等合成器绘制按钮失灵的场景下可选让 CC Switch 自绘最小化 / 最大化 / 关闭按钮；并在本版本发布前额外合入了从工具栏直接启动 `hermes dashboard`、LemonData 全应用预设、DDSHub Codex 端点以及若干 Hermes 健康检查与 Usage 模态框的修复。 + +会话侧通过 `@tanstack/react-virtual` **虚拟化会话列表**，让上千条记录的长会话也能流畅滚动，长消息默认折叠；Usage 面板新增**日期范围选择器**（今日 / 1d / 7d / 14d / 30d + 自定义日期时间）和翻页输入；**Stream Check 错误分类**以彩色 toast 呈现，默认探测模型重新梳理，"模型不存在"响应被单独识别；并新增在 Local Routing 激活时**阻止切换到官方供应商**的保护，以免官方流量被引入本地代理造成账号风险。Pricing 数据库 v8 → v9 重新种入约 50 个新模型条目（包括 Claude 4.7、Opus 4.7 Adaptive Thinking、Grok 4、Qwen 3.5/3.6、MiniMax M2.5/M2.7、Doubao Seed 2.0 系列、GLM-5/5.1 等），并修正了多项陈旧价格。 + +**发布日期**：2026-04-21 + +**更新规模**：100 commits | 219 files changed | +20,548 / -3,569 lines + +--- + +## 重点内容 + +- **Hermes Agent 支持（第 6 个受管应用）**：数据库 v9 → v10 迁移、完整 Rust 命令面、YAML 读写带原子备份、MCP 同步、Skills 同步、SQLite + JSONL 会话管理、专属前端面板、四种 API 协议（`chat_completions` / `anthropic_messages` / `codex_responses` / `bedrock_converse`） +- **Claude Opus 4.7 全面接入**：自适应思维白名单、按百万 token 定价种子、Bedrock SKU（`anthropic.claude-opus-4-7` / `global.anthropic.claude-opus-4-7`，丢弃老 `-v1` 后缀），全部聚合器 / Bedrock 预设升级为默认 Opus 模型 +- **Claude `max` 推理力度**：推理下拉从 `high` 升级到 `max` +- **Gemini Native API 代理**：新增 `api_format = "gemini_native"`，代理可直达 Google `generateContent`，完整流式 / schema 转换 / shadow 请求 +- **GitHub Copilot 企业版**：为 Copilot 型 Claude 供应商新增 GHES 认证与端点配置 +- **Copilot 次数消耗深度优化**：转发前主动剥离 thinking 块、`tool_result` 消息归类修正、subagent 检测、`x-interaction-id` 合并计费、orphan `tool_result` 清理、默认启用 warmup 降级 —— 系统性降低 premium 交互消耗 +- **会话列表虚拟化**：长会话流畅滚动，长消息默认折叠降低文字布局成本 +- **Codex / OpenClaw 会话标题提取**：自动抽取有意义标题，两行显示，剥离 OpenClaw `message_id` 尾噪声 +- **Usage 日期范围选择器**：Today / 1d / 7d / 14d / 30d 预设 + 自定义日期时间日历；分页列表支持页码跳转输入 +- **Stream Check 错误分类**：错误按类别分色 toast；默认探测模型刷新；单独识别 "model not found" +- **Local Routing 激活时阻止官方供应商切换**：官方流量走本地代理有账号暂停风险，强制拦截并 toast 警告 +- **Pricing 数据库刷新（v8 → v9）**：新增 ~50 条模型条目并修正陈旧价格 +- **应用级窗口控件**：可选让 CC Switch 自绘 min/max/close，显著改善 Linux Wayland 体验 +- **Hermes 接入统一 Skills 管理**：Skills 安装 / 启用 / 过滤现覆盖 Hermes +- **Hermes / OpenClaw 配置目录自定义**：在设置里指定 `~/.hermes/config.yaml` 或 `openclaw.json` 的自定义位置 +- **从工具栏启动 Hermes Dashboard**：Web UI 探测失败时，点击可在用户首选终端中启动 `hermes dashboard` +- **新合作伙伴预设**：LemonData 覆盖全部 6 个应用；DDSHub 新增 Codex 端点；StepFun Step Plan + +--- + +## 新功能 + +### Hermes Agent 支持（第 6 个受管应用） + +CC Switch 首次支持 Hermes Agent 作为一等受管应用，与 Claude / Codex / Gemini / OpenCode / OpenClaw 并列。 + +- **数据库迁移 v9 → v10**：为 `mcp_servers` 和 `skills` 表新增 `enabled_hermes` 列（`DEFAULT 0` 自动迁移，无数据丢失） +- **YAML 配置读写**：`~/.hermes/config.yaml` 读写带原子备份；`tests/hermes_roundtrip.rs` 守护不损坏不相关键和 OAuth MCP `auth` 块 +- **四种 API 协议**：与 Hermes Agent 0.10.0 对齐的 `chat_completions` / `anthropic_messages` / `codex_responses` / `bedrock_converse`；新 deeplink 默认为 `chat_completions` +- **用户 `providers:` dict 只读呈现**：用户在 YAML 里手写的 providers 条目在 CC Switch 中以只读卡片展示，深度配置跳转到 Hermes Web UI +- **累加式切换**：与 Claude / Codex 的"覆盖式"切换不同，Hermes 所有供应商共存于同一 YAML + +### Hermes Memory 面板 + +- 新增 Memory 面板直接编辑 `MEMORY.md` / `USER.md`，带启用开关、字符数限制和保存流 +- 替换 Hermes 的 Prompts 入口 + +### Hermes 供应商预设（约 50 个） + +- 覆盖 Nous Research、胜算云、OpenRouter、DeepSeek、Together AI、StepFun、智谱 GLM、百炼、Kimi、MiniMax、豆包、百灵、魔搭、KAT-Coder、PackyCode、Cubence、AIGoCode、RightCode、AICodeMirror、AICoding、CrazyRouter、SSSAiCode、Micu、CTok.ai、DDSHub、E-FlowCode、LionCCAPI、PIPELLM、Compshare、SiliconFlow、AiHubMix、DMXAPI、TheRouter、Novita、Nvidia、小米 MiMo + +### 从工具栏启动 Hermes Dashboard + +- Hermes Web UI 探测失败时，工具栏按钮改为弹出确认框，提供在用户首选终端里运行 `hermes dashboard` +- 通过临时 bash / batch 脚本启动，`hermes dashboard` 就绪后自动打开浏览器，无需轮询 +- Memory 面板和 Health banner 保留原有 toast 行为 +- 顺便修正了离线 toast 里过时的 `hermes web` 提示（正确命令是 `hermes dashboard`） +- Linux 终端探测改为先 `which` 后 stat，提升兼容性 + +### Claude Opus 4.7 支持 + +- 新增 Claude Opus 4.7 及其自适应思维白名单、按百万 token 定价种子、Bedrock SKU（`anthropic.claude-opus-4-7` / `global.anthropic.claude-opus-4-7`，丢弃老 `-v1` 后缀） +- 全部聚合器 / Bedrock 预设升级为默认 Opus 模型 + +### Claude `max` 推理力度 + +- Claude 推理下拉从 `high` 升级到 `max`，解锁更强的思考容量 + +### Gemini Native API 代理 + +- 新增 `api_format = "gemini_native"`，代理可直接转发到 Google `generateContent` API (#1918, 感谢 @yovinchen) +- 完整支持流式、schema 转换、shadow 请求 +- 在 proxy providers 模块下新增 `gemini_url.rs`、`gemini_schema.rs`、`gemini_shadow.rs`、`streaming_gemini.rs`、`transform_gemini.rs` + +### GitHub Copilot 企业版（GHES） + +- 为 Copilot 型 Claude 供应商新增 GHES 认证与端点配置 (#2175, 感谢 @hotelbe) + +### 会话列表虚拟化 + +- 通过 `@tanstack/react-virtual` 虚拟化会话列表，上千条记录流畅滚动 +- 长会话消息默认折叠，减少文字布局开销 + +### Codex / OpenClaw 会话标题提取 + +- Codex 和 OpenClaw 会话自动抽取有意义的标题，两行显示 +- 剥离 OpenClaw `message_id` 后缀噪声 + +### Usage 日期范围选择器 + +- Usage 面板新增日期范围选择器，预设 Tab（Today / 1d / 7d / 14d / 30d）+ 自定义日期 + 时间日历 (#2002, 感谢 @yovinchen) +- 分页列表新增页码跳转输入 + +### 模型映射快速填入 + +- 供应商表单的模型映射字段旁新增快速填入按钮，加快编辑 (#2179, 感谢 @lispking) + +### Stream Check 错误分类 + +- 按类别为 Stream Check 错误上色并以 toast 呈现 +- 刷新所有厂商默认探测模型到当前主力机型 +- 对 "model not found" 响应做单独识别 + +### Local Routing 激活时阻止官方供应商切换 + +- 在 Local Routing 激活状态下，切换到官方供应商会被强制拦截并弹出警告 toast +- 原因：官方 API 流量经由本地代理存在账号暂停风险 + +### Pricing 数据库刷新（v8 → v9） + +- 迁移时重新种入定价表 +- 新增约 50 条模型条目，覆盖 Claude 4.7、Opus 4.7 Adaptive Thinking、Grok 4、Qwen 3.5/3.6、MiniMax M2.5/M2.7、Doubao Seed 2.0 系列、GLM-5/5.1 +- 修正 DeepSeek、Kimi K2.5 等陈旧价格 + +### 应用级窗口控件 + +- 新增可选设置，让 CC Switch 自绘最小化 / 切换最大化 / 关闭按钮，代替系统装饰 (#1119, 感谢 @git1677967754) +- 在合成器按钮可能失灵的 Linux Wayland 上显著改善体验 + +### Hermes 接入统一 Skills 管理 + +- 统一的 Skills 界面新增 Hermes +- Skills 安装 / 启用 / 过滤现覆盖 Hermes，与 Claude / Codex / Gemini / OpenCode / OpenClaw 并列 + +### OpenClaw 配置目录自定义 + +- 新增设置项，允许把 CC Switch 指向自定义的 `openclaw.json` 位置 (#1518, 感谢 @mrFranklin) + +### Hermes 配置目录自定义 + +- 新增设置项，允许把 CC Switch 指向自定义的 `~/.hermes/config.yaml` 位置，底层通过数据驱动 dispatch + +### StepFun Step Plan 预设 + +- 新增 StepFun Step Plan（EN / ZH）供应商预设 (#2155, 感谢 @hengm3467) + +### New API 用量脚本模板 + +- 为 New API 用量脚本模板新增 User-Agent 头，提升上游兼容性 + +### LemonData 全应用预设 + +- LemonData 作为第三方合作伙伴预设覆盖 Claude / Codex / Gemini / OpenCode / OpenClaw / Hermes 全部 6 个应用 +- 含图标资源和 zh / en / ja 三语合作伙伴推广文案 +- Claude 预设使用 `ANTHROPIC_API_KEY` 认证，OpenAI 兼容应用目标为 `gpt-5.4` + +### DDSHub Codex 预设 + +- 新增 DDSHub 的 Codex 兼容端点（与 Claude 服务同 host） +- base URL 省略 `/v1` 后缀，由网关自动路由 OpenAI SDK 路径 + +--- + +## 变更 + +### "Local Proxy Takeover" → "Local Routing" + +- 三语 UI 文案、README、文档中全部统一重命名 +- 功能行为保持不变 + +### Hermes `Auto` api_mode 移除 + +- 用户必须显式选择协议；新 deeplink 默认为 `chat_completions` +- 消除了基于 URL 的启发式识别带来的意外 + +### Hermes 供应商表单 + +- 新增 API mode 下拉和按供应商的模型编辑器 +- 切换激活供应商时，把按供应商的模型绑定到顶层 `model:` + +### Hermes 深度配置委托 + +- 深度 YAML 配置不再在 CC Switch 表单里重复，直接通过"启动 Hermes Web UI"按钮交给 Web UI + +### Hermes 工具栏布局 + +- Web UI 按钮图标从 `ExternalLink` 换成 `LayoutDashboard` —— 点击可能启动 `hermes dashboard` 而非仅仅打开 URL，面板式图标语义更准 +- MCP 移到工具栏末尾，与 Claude / Codex / Gemini / OpenCode 的布局对齐 + +### Claude Quick-Set 移除 `ANTHROPIC_REASONING_MODEL` + +- 把推理能力和模型选择解耦，quick-set 表单不再暴露该遗留字段 + +### 按供应商代理配置移除 + +- 统一到全局的 Local Routing +- 按供应商的代理开关和存储都已移除 + +### 统一工具栏图标按钮宽度 + +- 在 Claude / Codex / Gemini / OpenCode / OpenClaw / Hermes 面板之间规格化图标按钮宽度，表头视觉一致 + +### Rust Toolchain 锁定 1.95 + +- 全仓库采纳 clippy 1.95 建议并锁定 toolchain，防止 nightly 漂移 + +### 托盘菜单 ID 常量 + +- 托盘标识符从硬编码字符串 `"main"` 改为 `TRAY_ID` 常量（`"cc-switch"`），所有调用点同步 (#1978, 感谢 @lidaxian121) + +### Copilot 次数消耗深度优化 + +一次系统性优化专门降低 Copilot 反向代理的 premium 交互消耗，涵盖以下多项改进： + +- **转发前主动剥离 thinking 块**：Anthropic 的 `thinking` / `redacted_thinking` 块会被 OpenAI 兼容端点拒绝，过去一次请求先失败消耗一次 premium 交互、再由 `thinking_rectifier` 触发重试。新增主动剥离步骤（Copilot 优化管线第 3.5 步，位于 `tool_result` 合并之后），直接省掉那一次无谓的 premium 消耗 +- **请求分类修正**：含 `tool_result` 的消息归类为代理继续，而不是用户发起的新请求 —— 避免每次工具调用都被错误计入 premium 次数 +- **subagent 检测**：通过 `__SUBAGENT_MARKER__` 和 `metadata._agent_` 回退识别 subagent，设置 `x-interaction-type=conversation-subagent` +- **确定性 `x-interaction-id` 合并计费**：从 session ID 推导 `x-interaction-id`，把同一会话内的多次请求合并为一次计费交互 +- **Orphan `tool_result` 清理**：清理孤立的 `tool_result`，避免触发上游错误导致重试和重复计费 +- **Warmup 降级默认开启**：使用 `gpt-5-mini` 作为默认降级模型 +- **优化管线重排**：classify → sanitize → merge → warmup，让分类看到原始 `tool_result` 语义 +- 修复 `CopilotOptimizerConfig` 默认值不一致（统一到 `gpt-5-mini`） + +### 用量脚本内网支持 + +- 移除 usage script 的私网 IP / 可疑主机名屏蔽，解锁企业内网、Docker、自建 API 端点 +- 内置模板仍强制 HTTPS（localhost 除外）和同源检查；自定义模板仍由用户控制，这类请求 URL 检查跳过 + +### Failover 队列备注 + +- 供应商备注现在在 failover 队列选择器和队列行中显示，方便在多供应商队列里识别 (#2138, 感谢 @Coconut-Fish) + +--- + +## Bug 修复 + +### 工具栏最大化后持续折叠 + +- 窗口最大化 / 还原后，工具栏不再卡在折叠状态；折叠判定会随尺寸变化重新计算 + +### Hermes YAML 污染与 OAuth MCP `auth` 丢失 + +- 经 CC Switch 往返写入不再丢失 OAuth MCP `auth` 块、也不污染不相关的 YAML 键 +- 新增 `tests/hermes_roundtrip.rs` 作为守护测试 + +### Hermes 激活供应商展示 + +- Hermes UI 现在正确展示激活供应商，并连通添加 / 启用 / 移除动作 + +### Hermes 供应商持久化 + +- 供应商持久化到 `custom_providers:` 下，`api_mode` 和 `model` 可跨重启 / 配置重载存活 + +### Hermes 健康检查错借 OpenClaw schema + +- 以前 Hermes 供应商被路由到 `check_additive_app_stream`（OpenClaw 的调度器），后者读 camelCase 的 `baseUrl` / `apiKey` / `api`，导致即便 Hermes 字段全填还是报 "OpenClaw provider is missing baseUrl" +- 新增 `check_hermes_stream`，用 Hermes 专用提取器把 `api_mode`（`chat_completions` / `anthropic_messages` / `codex_responses`）映射到对应的 `check_claude_stream` `api_format`，`bedrock_converse` 明确标记为不支持 +- 先解析 `api_mode` 再抽 URL / API key，让 `bedrock_converse` 用户看到真实原因，而不是误导性的 "missing base_url" + +### Usage 查询模态框支持 Hermes / OpenClaw + +- `getProviderCredentials` 新增对 Hermes（snake_case `base_url` / `api_key`）和 OpenClaw（camelCase `baseUrl` / `apiKey`）的扁平 `settingsConfig` 字段读取，让 SiliconFlow 等匹配供应商自动选中 "official balance" 模板 +- 重构 BALANCE 和 TOKEN_PLAN 测试路径复用 `providerCredentials`，不再直接读 `env.ANTHROPIC_*`，修正了非 Claude 应用即使配置了 key 也报 "empty key" 的问题 + +### Codex `cache_control` 保留 + +- 在 Codex 格式转换合并 system prompt 时保留 `cache_control` (#1946, 感谢 @yovinchen) + +### Claude prompt cache key 泄漏 + +- Claude chat 转换时不再发送 prompt cache key (#2003, 感谢 @yovinchen) + +### 代理逐跳响应头剥离 + +- 按 RFC 7230 剥离代理响应的 hop-by-hop 头（Connection、Keep-Alive、Transfer-Encoding 等） (#2060, 感谢 @yovinchen) + +### 代理 CORS 层移除 + +- 移除代理中过于宽松的 CORS 层 (#1915, 感谢 @zerone0x) + +### 代理 toast 显示后端错误详情 + +- 代理相关 toast 现在展示后端错误 payload 的详情，而不是一句笼统的失败 + +### Usage 日志去重 + +- 代理和会话日志的用量记录去重，相同请求不再被重复计数 +- 请求日志时间范围与面板的 1d / 7d / 30d 选择器同步 + +### Common Config 勾选持久化 + +- Claude / Codex / Gemini common-config 勾选状态重开后正确保留 (#2191, 感谢 @zxZeng) + +### Claude 插件 `settings.json` 同步 + +- 编辑当前供应商时，会同步回 Claude 插件路径下的 `settings.json` (#1905, 感谢 @chengww5217) + +### Google Official Gemini env 保留 + +- 保存 Google Official Gemini 供应商时不再清空 `env` 块 + +### OpenCode JSON5 尾逗号解析 + +- OpenCode 配置读取容忍尾逗号（JSON5） (#2023, 感谢 @wwminger) + +### 预设刷新 + +- 刷新 DeepSeek 和 Claude 1M 的陈旧 context 窗口 +- 刷新陈旧模型 ID，回填 Hermes 模型列表 +- 修正 Nous 端点，Hermes 占位图替换为 Nous 品牌图 +- 移除未使用的官方 Hermes 预设 + +### 搜索命中时折叠消息自动展开 + +- 搜索匹配落在折叠内容内部时，消息自动展开以定位匹配 + +### 未知订阅配额等级隐藏 + +- 供应商卡片不再渲染未知订阅配额等级 + +### weekly_limit 标签统一 + +- 跨语言把 `weekly_limit` 等级标签对齐到官方的"7 天"命名 + +### 根级 Skill 仓库安装 + +- 修复当仓库根本身就是一个 skill 时的安装失败 + +### Session ID 解析 clippy + +- 移除 session ID 解析里的冗余闭包（clippy 警告） + +### Stream Check 默认探测模型刷新 + +- 默认探测模型更新到每家厂商当前主力 + +### Skills 导入同步 + +- 导入的 Skills 即时同步到启用应用目录，不再仅记录在数据库里导致 UI 显示"已安装"但目标目录空缺 (#2101, 感谢 @yaoguohh) + +### Ghostty 会话恢复 + +- 改为通过 shell 执行 + `--working-directory` 启动 Ghostty 会话恢复 (#1976, 感谢 @Suda202) +- 避免路径含空格 / 特殊字符时 `cwd` 转义问题 + +--- + +## 文档 + +### README 赞助商更新 + +- SiliconFlow 注册赠送更新为 ¥16 +- 精简 SSSAiCode 赞助文案 +- 更新合作伙伴 logo +- 新增 LemonData 赞助商 + +### 全局代理提示澄清 + +- 三语澄清全局代理与 Local Routing 的关系 + +### Takeover → Routing 文档重命名 + +- 接管相关文档在三语下重命名为 routing，同步更新锚点 + +### PIPELLM 网站 URL + +- PIPELLM 赞助商网站 URL 更新为 `code.pipellm.ai` + +--- + +## ⚠️ 重要变更（Breaking） + +### Hermes 必须显式 `api_mode` + +- `Auto` 模式移除；导入或 deeplink 得到的供应商默认落到 `chat_completions` +- 既有 `Auto` 配置的用户会被提示选择协议 + +### Claude Quick-Set 移除 `ANTHROPIC_REASONING_MODEL` + +- 该遗留字段不再暴露；既有设置自动清理 + +### 按供应商代理配置移除 + +- 迁移到全局 Local Routing 设置 +- 既有按供应商代理值被忽略 + +### 数据库 schema v9 → v10 + +- 为 `mcp_servers` 和 `skills` 表新增 `enabled_hermes` 列 +- 自动迁移，`DEFAULT 0`，无数据丢失 + +### Pricing 表 v8 → v9 重置 + +- 首次启动时 `model_pricing` 表被清空并重新种入，以应用新模型和修正后的价格 + +### XCodeAPI 预设移除 + +- 使用 XCodeAPI 预设的用户请迁移到其它供应商 + +--- + +## ⚠️ 风险提示 + +本版本在涉及反向代理类功能上沿用 v3.12.3 / v3.13.0 提出的风险提示。 + +**GitHub Copilot 反向代理**：使用 Copilot 的反代路径可能违反 GitHub / Microsoft 服务条款。详情见 [v3.12.3 release notes](v3.12.3-zh.md#️-风险提示)。 + +**Codex OAuth 反向代理**：使用 ChatGPT 订阅的 Codex OAuth 反代可能违反 OpenAI 服务条款，详情见 [v3.13.0 release notes](v3.13.0-zh.md#️-风险提示)。 + +用户启用上述功能即表示**自行承担所有风险**。CC Switch 不对因使用这些功能而导致的任何账号限制、警告或服务暂停承担责任。 + +--- + +## 下载与安装 + +访问 [Releases](https://github.com/farion1231/cc-switch/releases/latest) 下载对应版本。 + +### 系统要求 + +| 系统 | 最低版本 | 架构 | +| ------- | -------------------------- | ----------------------------------- | +| Windows | Windows 10 及以上 | x64 | +| macOS | macOS 12 (Monterey) 及以上 | Intel (x64) / Apple Silicon (arm64) | +| Linux | 见下表 | x64 | + +### Windows + +| 文件 | 说明 | +| ---------------------------------------- | ----------------------------------- | +| `CC-Switch-v3.14.0-Windows.msi` | **推荐** - MSI 安装包，支持自动更新 | +| `CC-Switch-v3.14.0-Windows-Portable.zip` | 便携版，解压即用，不写入注册表 | + +### macOS + +| 文件 | 说明 | +| -------------------------------- | --------------------------------------------- | +| `CC-Switch-v3.14.0-macOS.dmg` | **推荐** - DMG 安装包，拖入 Applications 即可 | +| `CC-Switch-v3.14.0-macOS.zip` | 解压后拖入 Applications，Universal Binary | +| `CC-Switch-v3.14.0-macOS.tar.gz` | 用于 Homebrew 安装和自动更新 | + +> macOS 版本已通过 Apple 代码签名和公证，可直接安装使用。 + +### Homebrew（macOS） + +```bash +brew tap farion1231/ccswitch +brew install --cask cc-switch +``` + +更新： + +```bash +brew upgrade --cask cc-switch +``` + +### Linux + +| 发行版 | 推荐格式 | 安装方式 | +| --------------------------------------- | ----------- | ---------------------------------------------------------------------- | +| Ubuntu / Debian / Linux Mint / Pop!\_OS | `.deb` | `sudo dpkg -i CC-Switch-*.deb` 或 `sudo apt install ./CC-Switch-*.deb` | +| Fedora / RHEL / CentOS / Rocky Linux | `.rpm` | `sudo rpm -i CC-Switch-*.rpm` 或 `sudo dnf install ./CC-Switch-*.rpm` | +| openSUSE | `.rpm` | `sudo zypper install ./CC-Switch-*.rpm` | +| Arch Linux / Manjaro | `.AppImage` | 添加执行权限后直接运行，或使用 AUR | +| 其他发行版 / 不确定 | `.AppImage` | `chmod +x CC-Switch-*.AppImage && ./CC-Switch-*.AppImage` | diff --git a/docs/release-notes/v3.14.1-en.md b/docs/release-notes/v3.14.1-en.md new file mode 100644 index 000000000..f32abcf0a --- /dev/null +++ b/docs/release-notes/v3.14.1-en.md @@ -0,0 +1,185 @@ +# CC Switch v3.14.1 + +> Tray usage visibility, Codex OAuth stability fixes, Skills import/install reliability, and removal of the Hermes config health scanner + +**[中文版 →](v3.14.1-zh.md) | [日本語版 →](v3.14.1-ja.md)** + +--- + +## Overview + +CC Switch v3.14.1 is a patch release following v3.14.0, focused on **Codex OAuth reverse-proxy stability**, **tray usage visibility**, **Skills import / install reliability**, **Gemini session restore paths**, and **simplifying Hermes configuration health handling**. + +For the first time, the system tray surfaces **cached usage** for the current Claude / Codex / Gemini provider directly in its submenus — including subscription summaries and usage-script summaries with color-coded utilization markers. For Chinese coding-plan providers like Kimi / Zhipu / MiniMax, the tray additionally renders a **5-hour + weekly window** layout in the `🟢 h12% w80%` style (worst utilization drives the emoji), semantically identical to the official subscription badges. Creating a Claude provider whose `ANTHROPIC_BASE_URL` matches a known coding-plan host now auto-injects `meta.usage_script` so the tray lights up without opening the Usage Script modal. + +Several Codex OAuth reverse-proxy stability issues are addressed this release: client-provided session IDs are now used as both `prompt_cache_key` and the Codex session header to avoid UUID-driven cache churn; non-streaming Anthropic clients receive proper JSON responses even when the ChatGPT Codex upstream forces OpenAI Responses SSE; and Stream Check now builds probes with the same `store: false`, encrypted reasoning include, and provider FAST mode setting as production requests, eliminating the "check fails but it actually works" mismatch. Paired with a new explicit **FAST mode toggle**, users can now opt into `service_tier="priority"` on Codex OAuth-backed Claude providers, trading latency against ChatGPT quota consumption on their own terms. + +Additionally, the in-app **Hermes config health scanner** and its warning banner are removed (along with the `scan_hermes_config_health` command, `HermesHealthWarning` type, and `HermesWriteOutcome.warnings` payload), refocusing the Hermes surface on active provider display, switching defaults, memory editing, and launching the Hermes Web UI — deep configuration health is now Hermes's own responsibility. + +**Release Date**: 2026-04-23 + +**Update Scale**: 13 commits | 48 files changed | +1,883 / -808 lines + +--- + +## Highlights + +- **Tray Usage Visibility**: Claude / Codex / Gemini tray submenus show cached usage for the current provider, including subscription and script-based summaries with color markers; refreshes are throttled, limited to visible apps, and synchronized back into React Query (#2184, thanks @TuYv) +- **Tray Coding-Plan Usage (Kimi / Zhipu / MiniMax)**: The tray renders 5-hour + weekly window usage using the `🟢 h12% w80%` layout; Claude providers whose base URL matches a known host auto-inject `meta.usage_script` +- **Codex OAuth FAST Mode**: New explicit FAST mode toggle for Codex OAuth-backed Claude providers; when enabled, converted Responses requests send `service_tier="priority"`. Off by default (#2210, thanks @JesusDR01) +- **Codex OAuth Stability**: Fixed reverse-proxy cache routing (#2218, thanks @majiayu000), Responses SSE aggregation (#2235, thanks @xpfo-go), and Stream Check parity with production (#2210, thanks @JesusDR01) +- **Hermes Config Health Scanner Removed**: Refocuses the Hermes surface on provider management, memory editing, and launching the Web UI — no longer duplicates deep configuration health judgments +- **Skills Import / Install Reliability**: Import dialog disables actions while pending and deduplicates results by ID (#2211, thanks @TuYv); model quick-set / one-click config applies against the latest form state (#2249, thanks @Coconut-Fish); root-level `SKILL.md` repo installs are stable (#2231, thanks @santugege) +- **Gemini Session Restore Paths**: Session scanning reads `.project_root` metadata and passes the original project directory back into restore flows (#2240, thanks @tisonkun) +- **Session / Settings Layout Polish**: Hardened the scroll-area viewport with width containment to fix horizontal overflow; tightened app bottom and settings footer spacing (#2201, thanks @Coconut-Fish) + +--- + +## Added + +### Tray Usage Visibility + +- System tray submenus now show **cached usage** for the current Claude / Codex / Gemini provider (#2184, thanks @TuYv) +- Includes subscription quota summaries and usage-script summaries with color-coded utilization markers +- Tray-triggered refreshes are **throttled**, **limited to visible apps**, and synchronized back into React Query so the main window and tray share the same usage data + +### Tray Coding-Plan Usage (Kimi / Zhipu / MiniMax) + +- The tray renders **5-hour + weekly window** usage for Chinese coding-plan providers +- Uses the same `🟢 h12% w80%` two-window layout as official subscription badges (worst utilization drives the emoji color) +- Creating a Claude provider whose `ANTHROPIC_BASE_URL` matches a known coding-plan host **auto-injects** `meta.usage_script`, so the tray lights up without opening the Usage Script modal +- Existing `usage_script` values are **preserved on update**, never clobbering user customizations + +### Codex OAuth FAST Mode + +- New explicit FAST mode toggle for Codex OAuth-backed Claude providers (#2210, thanks @JesusDR01) +- When enabled, converted Responses requests send `service_tier="priority"` for lower latency +- Off by default to avoid unexpectedly increasing ChatGPT quota consumption + +--- + +## Changed + +### Session and Settings Layout Polish + +- Hardened the scroll-area viewport with width containment to fix horizontal overflow (#2201, thanks @Coconut-Fish) +- Tightened app bottom and settings footer spacing so long session / settings views fit more cleanly + +--- + +## Removed + +### Hermes Config Health Scanner + +- Removed the in-app Hermes config health scanner and its warning banner +- Removed the `scan_hermes_config_health` command, `HermesHealthWarning` type, and `HermesWriteOutcome.warnings` payload +- The CC Switch Hermes surface now focuses on its core job: active provider display, default provider switching, memory editing, and launching the Hermes Web UI for deep configuration + +--- + +## Fixed + +### Codex OAuth Cache Routing + +- Use the client-provided session ID as both `prompt_cache_key` and the Codex session header, preserving explicit cache keys (#2218, thanks @majiayu000) +- Stop generating UUIDs that caused cache-identity churn, stabilizing the ChatGPT Codex reverse-proxy cache identity + +### Codex OAuth Responses SSE Aggregation + +- Non-streaming Anthropic clients now receive proper JSON even when the ChatGPT Codex upstream forces OpenAI Responses SSE (#2235, thanks @xpfo-go) +- CC Switch aggregates the upstream SSE events before running the non-streaming transform + +### Codex OAuth Stream Check Parity + +- Stream Check now builds Codex OAuth probe requests with the same `store: false`, encrypted reasoning include, and provider FAST mode setting as production proxy traffic (#2210, thanks @JesusDR01) +- Eliminates the "check fails but it actually works" mismatch + +### Codex Model Extraction + +- Reading the `model` field from Codex config now uses TOML parsing instead of first-line regex matching (#2227, thanks @nmsn) +- Multiline TOML is handled correctly + +### Model Quick-Set / One-Click Config + +- Model quick-set now applies against the **latest** provider form config (#2249, thanks @Coconut-Fish) +- Fixes stale form state preventing one-click configuration from succeeding + +### Skills Import Duplicates + +- The Skills import dialog disables actions while import is pending (#2211, thanks @TuYv) +- The installed-skills cache deduplicates imported results by ID, preventing double-clicks from adding duplicate installed entries (#2139) + +### Root-Level Skill Repos + +- Skill install and update flows now consistently resolve three source patterns: direct nested paths, install-name recursive search, and repository-root `SKILL.md` sources (#2231, thanks @santugege) + +### Gemini Session Restore Paths + +- Gemini session scanning now reads `.project_root` metadata (#2240, thanks @tisonkun) +- Restore flows can pass the original project directory when available + +### Provider Hover Names + +- Provider icons now expose the provider name on hover for inline SVG, image URL, and fallback initials render paths (#2237, thanks @tisonkun) + +--- + +## Notes & Caveats + +- **Hermes Health Scanner Removed**: If you were relying on CC Switch to surface deep Hermes YAML configuration issues, switch to the "Launch Hermes Web UI" toolbar button and inspect them in Hermes's own panel. Day-to-day provider management, switching, memory editing, and MCP / Skills sync continue to be handled by CC Switch. +- **Codex OAuth FAST Mode Off by Default**: Only turn it on if you accept potentially increased ChatGPT quota consumption in exchange for lower latency. +- **Tray Cached Usage**: Refreshes are throttled and limited to the currently visible app to avoid unnecessary upstream API calls; values are synchronized into React Query so the main window and tray stay in sync. + +--- + +## Download & Installation + +Visit [Releases](https://github.com/farion1231/cc-switch/releases/latest) to download the appropriate version. + +### System Requirements + +| OS | Minimum Version | Architecture | +| ------- | ---------------------------- | ----------------------------------- | +| Windows | Windows 10 or later | x64 | +| macOS | macOS 12 (Monterey) or later | Intel (x64) / Apple Silicon (arm64) | +| Linux | See table below | x64 | + +### Windows + +| File | Description | +| ---------------------------------------- | ----------------------------------------------------- | +| `CC-Switch-v3.14.1-Windows.msi` | **Recommended** - MSI installer, supports auto-update | +| `CC-Switch-v3.14.1-Windows-Portable.zip` | Portable, extract and run, no registry writes | + +### macOS + +| File | Description | +| -------------------------------- | ------------------------------------------------------- | +| `CC-Switch-v3.14.1-macOS.dmg` | **Recommended** - DMG installer, drag into Applications | +| `CC-Switch-v3.14.1-macOS.zip` | Extract and drag into Applications, Universal Binary | +| `CC-Switch-v3.14.1-macOS.tar.gz` | For Homebrew installation and auto-update | + +> macOS builds are Apple code-signed and notarized — install directly. + +### Homebrew (macOS) + +```bash +brew tap farion1231/ccswitch +brew install --cask cc-switch +``` + +Update: + +```bash +brew upgrade --cask cc-switch +``` + +### Linux + +| Distribution | Recommended | Installation | +| --------------------------------------- | ----------- | ---------------------------------------------------------------------- | +| Ubuntu / Debian / Linux Mint / Pop!\_OS | `.deb` | `sudo dpkg -i CC-Switch-*.deb` or `sudo apt install ./CC-Switch-*.deb` | +| Fedora / RHEL / CentOS / Rocky Linux | `.rpm` | `sudo rpm -i CC-Switch-*.rpm` or `sudo dnf install ./CC-Switch-*.rpm` | +| openSUSE | `.rpm` | `sudo zypper install ./CC-Switch-*.rpm` | +| Arch Linux / Manjaro | `.AppImage` | Add execute permission and run, or use AUR | +| Other distros / not sure | `.AppImage` | `chmod +x CC-Switch-*.AppImage && ./CC-Switch-*.AppImage` | diff --git a/docs/release-notes/v3.14.1-ja.md b/docs/release-notes/v3.14.1-ja.md new file mode 100644 index 000000000..3e604dede --- /dev/null +++ b/docs/release-notes/v3.14.1-ja.md @@ -0,0 +1,185 @@ +# CC Switch v3.14.1 + +> トレイでの用量可視化、Codex OAuth の複数の安定性修正、Skills インポート/インストールの信頼性向上、Hermes 設定ヘルススキャナーの削除 + +**[中文版 →](v3.14.1-zh.md) | [English →](v3.14.1-en.md)** + +--- + +## 概要 + +CC Switch v3.14.1 は v3.14.0 に続くパッチリリースで、**Codex OAuth リバースプロキシの安定性**、**トレイでの用量可視化**、**Skills インポート / インストールの信頼性**、**Gemini セッション復元パス**、および **Hermes 設定ヘルス処理の簡素化**を中心に据えています。 + +システムトレイは初めて、現在の Claude / Codex / Gemini プロバイダーの**キャッシュ済み用量**をサブメニューに直接表示するようになりました — サブスクリプション要約と用量スクリプト要約を、使用率に応じた色分けマーカーとともに表示します。Kimi / Zhipu / MiniMax のような中国系コーディングプランプロバイダーには、公式サブスクリプションバッジと同じ `🟢 h12% w80%` スタイルで **5 時間 + 週次ウィンドウ**の 2 ウィンドウレイアウトを追加描画します（より厳しい方の使用率が絵文字色を決定）。`ANTHROPIC_BASE_URL` が既知のコーディングプランホストに一致する Claude プロバイダーを作成すると、`meta.usage_script` が自動注入されるため、Usage Script モーダルを開かなくてもトレイが点灯します。 + +Codex OAuth 側では、複数のリバースプロキシ安定性の問題を修正しました: クライアント提供の session ID を `prompt_cache_key` と Codex session ヘッダーの両方に使用し、UUID 生成によるキャッシュ揺らぎを回避。ChatGPT Codex 上流が OpenAI Responses SSE を強制する場合でも、非ストリーミングの Anthropic クライアントが適切な JSON レスポンスを受け取れるようになりました。Stream Check は、本番環境と同じ `store: false`、暗号化 reasoning include、およびプロバイダーの FAST モード設定でプローブを構築するようになり、「検出は失敗するのに実際は動く」というズレが解消されました。新しい明示的な **FAST モードトグル**と組み合わせることで、ユーザーは Codex OAuth バックの Claude プロバイダーで `service_tier="priority"` を選択的に送信でき、レイテンシと ChatGPT 配額消費の間で自分で選べるようになりました。 + +さらに、CC Switch 内蔵の **Hermes 設定ヘルススキャナー**と警告バナー（および対応する `scan_hermes_config_health` コマンド、`HermesHealthWarning` 型、`HermesWriteOutcome.warnings` ペイロード）を削除し、Hermes サーフェスをアクティブプロバイダー表示、デフォルト切り替え、Memory 編集、および Hermes Web UI の起動に再フォーカスしました — 深い設定ヘルスは Hermes 自身の責任になります。 + +**リリース日**: 2026-04-23 + +**更新規模**: 13 commits | 48 files changed | +1,883 / -808 lines + +--- + +## ハイライト + +- **トレイでの用量可視化**: Claude / Codex / Gemini のトレイサブメニューに、現在のプロバイダーのキャッシュ済み用量（サブスクリプション要約とスクリプト要約、色分けマーカー付き）を表示。リフレッシュはスロットル、可視アプリに限定、React Query に同期 (#2184, 感謝 @TuYv) +- **トレイのコーディングプラン用量（Kimi / Zhipu / MiniMax）**: トレイが 5 時間 + 週次ウィンドウの用量を `🟢 h12% w80%` レイアウトで描画。既知のホストにマッチする Claude プロバイダーは `meta.usage_script` を自動注入 +- **Codex OAuth FAST モード**: Codex OAuth バックの Claude プロバイダーに明示的な FAST モードトグルを追加。有効時は変換された Responses リクエストに `service_tier="priority"` を送信、デフォルトは OFF (#2210, 感謝 @JesusDR01) +- **Codex OAuth 安定性**: リバースプロキシのキャッシュルーティング (#2218, 感謝 @majiayu000)、Responses SSE 集約 (#2235, 感謝 @xpfo-go)、Stream Check と本番の一致性 (#2210, 感謝 @JesusDR01) を修正 +- **Hermes 設定ヘルススキャナー削除**: Hermes サーフェスをプロバイダー管理、Memory 編集、Web UI 起動に再フォーカス。深い設定ヘルス判定を重複して担わなくなる +- **Skills インポート / インストールの信頼性**: インポート中はダイアログのアクションを無効化し、結果を ID で重複排除 (#2211, 感謝 @TuYv); ワンクリック設定は最新のフォーム状態に基づいて適用 (#2249, 感謝 @Coconut-Fish); ルートレベルの `SKILL.md` リポジトリインストールが安定 (#2231, 感謝 @santugege) +- **Gemini セッション復元パス**: セッションスキャン時に `.project_root` メタデータを読み、元のプロジェクトディレクトリを復元フローに渡す (#2240, 感謝 @tisonkun) +- **セッション / 設定レイアウトの磨き込み**: スクロールエリアビューポートに幅制約を追加して横方向のはみ出しを修正。アプリ下部と設定フッター間隔をよりタイトに (#2201, 感謝 @Coconut-Fish) + +--- + +## 新機能 + +### トレイでの用量可視化 + +- システムトレイサブメニューに、現在の Claude / Codex / Gemini プロバイダーの**キャッシュ済み用量**を表示 (#2184, 感謝 @TuYv) +- サブスクリプション配額要約と用量スクリプト要約を含み、使用率に応じた色分けマーカー付き +- トレイ起因のリフレッシュは**スロットル**、**可視アプリに限定**、React Query に同期されるため、メインウィンドウとトレイが同じ用量データを共有 + +### トレイのコーディングプラン用量（Kimi / Zhipu / MiniMax） + +- 中国系コーディングプランプロバイダー向けに、トレイが **5 時間 + 週次ウィンドウ**の用量を描画 +- 公式サブスクリプションバッジと同じ `🟢 h12% w80%` の 2 ウィンドウレイアウトを使用（より厳しい使用率が絵文字色を決定） +- `ANTHROPIC_BASE_URL` が既知のコーディングプランホストにマッチする Claude プロバイダーを作成すると、`meta.usage_script` が**自動注入**され、Usage Script モーダルを開かなくてもトレイが点灯 +- 更新時は既存の `usage_script` 値を**保持**し、ユーザーカスタマイズを上書きしない + +### Codex OAuth FAST モード + +- Codex OAuth バックの Claude プロバイダーに明示的な FAST モードトグルを追加 (#2210, 感謝 @JesusDR01) +- 有効時は変換された Responses リクエストに `service_tier="priority"` を送信してレイテンシを低減 +- 予期せぬ ChatGPT 配額消費の増加を避けるため、デフォルトは OFF + +--- + +## 変更 + +### セッション・設定レイアウトの磨き込み + +- スクロールエリアビューポートに幅制約を追加して横方向のはみ出しを修正 (#2201, 感謝 @Coconut-Fish) +- アプリ下部と設定フッター間隔をよりタイトにし、長いセッション / 設定ビューをすっきり表示 + +--- + +## 削除 + +### Hermes 設定ヘルススキャナー + +- アプリ内の Hermes 設定ヘルススキャナーと警告バナーを削除 +- `scan_hermes_config_health` コマンド、`HermesHealthWarning` 型、`HermesWriteOutcome.warnings` ペイロードを削除 +- CC Switch の Hermes サーフェスは本来の役割に回帰: アクティブプロバイダー表示、デフォルトプロバイダー切り替え、Memory 編集、および深い設定用の Hermes Web UI 起動 + +--- + +## バグ修正 + +### Codex OAuth キャッシュルーティング + +- クライアント提供の session ID を `prompt_cache_key` と Codex session ヘッダーの両方に使用し、明示的なキャッシュキーを保持 (#2218, 感謝 @majiayu000) +- キャッシュアイデンティティの揺らぎを引き起こしていた UUID 生成を停止し、ChatGPT Codex リバースプロキシのキャッシュアイデンティティを安定化 + +### Codex OAuth Responses SSE 集約 + +- ChatGPT Codex 上流が OpenAI Responses SSE を強制する場合でも、非ストリーミングの Anthropic クライアントが適切な JSON を受け取れるように修正 (#2235, 感謝 @xpfo-go) +- CC Switch が非ストリーミング変換を実行する前に上流 SSE イベントを集約 + +### Codex OAuth Stream Check の一致性 + +- Stream Check が構築する Codex OAuth プローブリクエストは、本番プロキシと同じ `store: false`、暗号化 reasoning include、プロバイダー FAST モード設定を使用するように修正 (#2210, 感謝 @JesusDR01) +- 「検出は失敗するのに実際は動く」ズレを解消 + +### Codex モデル抽出 + +- Codex 設定の `model` フィールドを読む際、先頭行の正規表現マッチではなく TOML パーサーを使用するように変更 (#2227, 感謝 @nmsn) +- 複数行 TOML も正しく処理 + +### モデルのクイック入力 / ワンクリック設定 + +- モデルクイック入力は**最新の**プロバイダーフォーム設定に対して適用されるように修正 (#2249, 感謝 @Coconut-Fish) +- 古いフォーム状態によってワンクリック設定が失敗する問題を修正 + +### Skills インポートの重複排除 + +- Skills インポートダイアログは、インポート中にすべてのアクションボタンを無効化 (#2211, 感謝 @TuYv) +- インストール済み Skills のキャッシュを ID で重複排除し、ダブルクリックによる重複したインストール済みエントリを防止 (#2139) + +### ルートレベルの Skill リポジトリ + +- Skill のインストールと更新フローが 3 つのソースパターンを一貫して解決: 直接ネストパス、install-name の再帰検索、およびリポジトリルートの `SKILL.md` ソース (#2231, 感謝 @santugege) + +### Gemini セッション復元パス + +- Gemini セッションスキャンが `.project_root` メタデータを読み取るように修正 (#2240, 感謝 @tisonkun) +- 復元フローは利用可能な場合に元のプロジェクトディレクトリを渡せる + +### プロバイダー名のホバー表示 + +- プロバイダーアイコンは、inline SVG、画像 URL、およびフォールバックの頭文字レンダリングパスで、ホバー時にプロバイダー名を表示 (#2237, 感謝 @tisonkun) + +--- + +## 備考・注意事項 + +- **Hermes ヘルススキャナー削除済み**: Hermes YAML の深い設定の問題提示を CC Switch に頼っていた場合は、ツールバーの「Hermes Web UI を起動」ボタンから Hermes 自身のパネルで確認してください。日常のプロバイダー管理、切り替え、Memory 編集、MCP / Skills 同期は引き続き CC Switch が担います。 +- **Codex OAuth FAST モードはデフォルト OFF**: レイテンシ低減と引き換えに ChatGPT 配額消費が増える可能性を許容する場合にのみ有効化してください。 +- **トレイのキャッシュ用量**: リフレッシュはスロットル済み、かつ現在可視のアプリに限定されており、不要な上流 API 呼び出しを回避します。値は React Query に同期されるため、メインウィンドウとトレイで同じ値が見えます。 + +--- + +## ダウンロード・インストール + +[Releases](https://github.com/farion1231/cc-switch/releases/latest) から対応バージョンをダウンロードしてください。 + +### システム要件 + +| OS | 最小バージョン | アーキテクチャ | +| ------- | ------------------------ | ----------------------------------- | +| Windows | Windows 10 以降 | x64 | +| macOS | macOS 12 (Monterey) 以降 | Intel (x64) / Apple Silicon (arm64) | +| Linux | 下表参照 | x64 | + +### Windows + +| ファイル | 説明 | +| ---------------------------------------- | ------------------------------------------- | +| `CC-Switch-v3.14.1-Windows.msi` | **推奨** - MSI インストーラー、自動更新対応 | +| `CC-Switch-v3.14.1-Windows-Portable.zip` | ポータブル版、解凍して実行、レジストリ不要 | + +### macOS + +| ファイル | 説明 | +| -------------------------------- | ------------------------------------------------------ | +| `CC-Switch-v3.14.1-macOS.dmg` | **推奨** - DMG インストーラー、Applications にドラッグ | +| `CC-Switch-v3.14.1-macOS.zip` | 解凍して Applications にドラッグ、Universal Binary | +| `CC-Switch-v3.14.1-macOS.tar.gz` | Homebrew インストールと自動更新用 | + +> macOS 版は Apple のコード署名および公証済みで、直接インストールして使用できます。 + +### Homebrew（macOS） + +```bash +brew tap farion1231/ccswitch +brew install --cask cc-switch +``` + +更新: + +```bash +brew upgrade --cask cc-switch +``` + +### Linux + +| ディストリビューション | 推奨形式 | インストール方法 | +| --------------------------------------- | ----------- | -------------------------------------------------------------------------- | +| Ubuntu / Debian / Linux Mint / Pop!\_OS | `.deb` | `sudo dpkg -i CC-Switch-*.deb` または `sudo apt install ./CC-Switch-*.deb` | +| Fedora / RHEL / CentOS / Rocky Linux | `.rpm` | `sudo rpm -i CC-Switch-*.rpm` または `sudo dnf install ./CC-Switch-*.rpm` | +| openSUSE | `.rpm` | `sudo zypper install ./CC-Switch-*.rpm` | +| Arch Linux / Manjaro | `.AppImage` | 実行権限を付与して実行、または AUR を使用 | +| その他のディストリビューション / 不明 | `.AppImage` | `chmod +x CC-Switch-*.AppImage && ./CC-Switch-*.AppImage` | diff --git a/docs/release-notes/v3.14.1-zh.md b/docs/release-notes/v3.14.1-zh.md new file mode 100644 index 000000000..e9acec9ca --- /dev/null +++ b/docs/release-notes/v3.14.1-zh.md @@ -0,0 +1,185 @@ +# CC Switch v3.14.1 + +> 托盘用量可见化、Codex OAuth 多项稳定性修复、Skills 导入/安装可靠性提升、Hermes 配置健康扫描器移除 + +**[English →](v3.14.1-en.md) | [日本語版 →](v3.14.1-ja.md)** + +--- + +## 概览 + +CC Switch v3.14.1 是 v3.14.0 之后的一次补丁版本，围绕 **Codex OAuth 反代稳定性**、**托盘用量可见化**、**Skills 导入 / 安装可靠性**、**Gemini 会话恢复路径**，以及**简化 Hermes 配置健康处理**展开。 + +系统托盘第一次把当前 Claude / Codex / Gemini 供应商的**缓存用量**直接呈现在子菜单里——包含订阅额度摘要和用量脚本摘要，并用颜色标记利用率；针对 Kimi / 智谱 / MiniMax 这类中国编码套餐供应商，托盘还会额外渲染 `🟢 h12% w80%` 风格的 **5 小时 + 周窗口**双窗口排版，语义与官方订阅徽章完全一致（取更紧的那个驱动 emoji）。创建 Claude 供应商时，如果 `ANTHROPIC_BASE_URL` 命中已知的编码套餐 host，会自动注入 `meta.usage_script`，托盘可以不打开 Usage Script 模态框就直接点亮。 + +Codex OAuth 侧修复了多项反代稳定性问题：使用客户端自带的 session ID 作为 `prompt_cache_key` 和 Codex session 头，避免生成 UUID 造成缓存抖动，显著提高缓存命中率；非流式 Anthropic 客户端在 ChatGPT Codex 上游强制 OpenAI Responses SSE 时也能正确拿到 JSON 响应；Stream Check 现在会以和生产一致的 `store: false`、encrypted reasoning include 以及供应商 FAST 模式构造探测请求，避免出现"检测失败但实际能用"的错位。配合新增的 **FAST 模式显式开关**，让用户可以在 Codex OAuth 型 Claude 供应商上按需发 `service_tier="priority"`，在延迟和 ChatGPT 配额消耗之间自己选。 + +另外，移除了 CC Switch 内置的 **Hermes 配置健康扫描器**及其警告横幅（以及对应的 `scan_hermes_config_health` 命令、`HermesHealthWarning` 类型和 `HermesWriteOutcome.warnings` 载荷），把 Hermes 面板聚焦回当前供应商展示、默认切换、Memory 编辑和启动 Hermes Web UI，深度配置健康度由 Hermes 自己负责。 + +**发布日期**：2026-04-23 + +**更新规模**：13 commits | 48 files changed | +1,883 / -808 lines + +--- + +## 重点内容 + +- **托盘用量可见化**：Claude / Codex / Gemini 托盘子菜单展示当前供应商缓存用量，含订阅与脚本摘要及颜色标记；刷新带节流、仅针对可见应用、并回写到 React Query (#2184, 感谢 @TuYv) +- **托盘编码套餐用量（Kimi / 智谱 / MiniMax）**：托盘渲染 5 小时 + 周窗口双窗口用量，沿用 `🟢 h12% w80%` 排版；命中已知 host 的 Claude 供应商自动注入 `meta.usage_script` +- **Codex OAuth FAST 模式**：为 Codex OAuth 型 Claude 供应商新增显式 FAST 开关，开启后转换后的 Responses 请求发 `service_tier="priority"`，默认关闭 (#2210, 感谢 @JesusDR01) +- **Codex OAuth 稳定性**：修复反代缓存路由 (#2218, 感谢 @majiayu000)、Responses SSE 聚合 (#2235, 感谢 @xpfo-go)、Stream Check 与生产一致性 (#2210, 感谢 @JesusDR01) +- **Hermes 配置健康扫描器移除**：把 Hermes 面板聚焦回供应商管理、Memory 编辑和 Web UI 启动，不再重复承担深度配置健康判断 +- **Skills 导入 / 安装可靠性**：导入过程中禁用操作按钮、结果按 ID 去重 (#2211, 感谢 @TuYv)；一键配置基于最新表单状态 (#2249, 感谢 @Coconut-Fish)；根级 `SKILL.md` 仓库安装稳定 (#2231, 感谢 @santugege) +- **Gemini 会话恢复路径**：扫描会话时读取 `.project_root` 元数据，把原始项目目录带回恢复流程 (#2240, 感谢 @tisonkun) +- **Session / 设置布局打磨**：滚动区域视口加宽度约束修复横向溢出，应用底部和设置页底部间距更紧凑 (#2201, 感谢 @Coconut-Fish) + +--- + +## 新功能 + +### 托盘用量可见化 + +- 系统托盘子菜单新增当前 Claude / Codex / Gemini 供应商的**缓存用量**展示 (#2184, 感谢 @TuYv) +- 包含订阅额度摘要和用量脚本摘要，并用颜色标记利用率 +- 托盘触发的刷新**带节流**、**只覆盖可见应用**，并同步回 React Query，主窗口和托盘共享同一份用量数据 + +### 托盘编码套餐用量（Kimi / 智谱 / MiniMax） + +- 托盘为中国编码套餐供应商渲染 **5 小时 + 周窗口**双窗口用量 +- 使用与官方订阅徽章一致的 `🟢 h12% w80%` 两窗口排版，取更紧的那个利用率驱动 emoji 颜色 +- 创建 Claude 供应商时，如果 `ANTHROPIC_BASE_URL` 匹配已知编码套餐 host，会**自动注入** `meta.usage_script`，托盘不打开 Usage Script 模态框也能直接点亮 +- 更新时会**保留已有** `usage_script` 值，不覆盖用户自定义 + +### Codex OAuth FAST 模式 + +- 为 Codex OAuth 型 Claude 供应商新增显式 FAST 模式开关 (#2210, 感谢 @JesusDR01) +- 开启时，转换后的 Responses 请求会发 `service_tier="priority"` 以降低延迟 +- 默认关闭，避免意外增加 ChatGPT 配额消耗 + +--- + +## 变更 + +### Session 与设置布局打磨 + +- 滚动区域视口加上宽度约束，修复横向溢出 (#2201, 感谢 @Coconut-Fish) +- 应用底部和设置页底部间距更紧凑，让长 Session / 设置视图看起来更干净 + +--- + +## 移除 + +### Hermes 配置健康扫描器 + +- 移除应用内的 Hermes 配置健康扫描器和警告横幅 +- 移除 `scan_hermes_config_health` 命令、`HermesHealthWarning` 类型以及 `HermesWriteOutcome.warnings` 载荷 +- CC Switch 的 Hermes 面板回归核心职责：当前供应商展示、切换默认供应商、Memory 编辑、以及启动 Hermes Web UI 处理深度配置 + +--- + +## 修复 + +### Codex OAuth 缓存路由 + +- 使用客户端自带的 session ID 作为 `prompt_cache_key` 和 Codex session 头，保留显式缓存 key (#2218, 感谢 @majiayu000) +- 停止生成 UUID 导致的缓存抖动，让 ChatGPT Codex 反代的缓存身份更稳定 + +### Codex OAuth Responses SSE 聚合 + +- ChatGPT Codex 上游强制 OpenAI Responses SSE 时，非流式 Anthropic 客户端也能正确拿到 JSON (#2235, 感谢 @xpfo-go) +- CC Switch 会在非流式转换之前先聚合上游 SSE 事件 + +### Codex OAuth Stream Check 对齐 + +- Stream Check 构造的 Codex OAuth 测试请求现在与生产代理一致，使用相同的 `store: false`、加密 reasoning include 和供应商 FAST 模式设置 (#2210, 感谢 @JesusDR01) +- 避免"检测失败但实际能用"的错位 + +### Codex 模型提取 + +- 读取 Codex 配置的 `model` 字段时，改用 TOML 解析替代首行正则匹配 (#2227, 感谢 @nmsn) +- 多行 TOML 也能正确处理 + +### 模型快速填入 / 一键配置 + +- 模型快速填入现在基于**最新的**供应商表单配置应用 (#2249, 感谢 @Coconut-Fish) +- 修复陈旧表单状态导致一键配置失败的问题 + +### Skills 导入去重 + +- Skills 导入对话框在导入进行时禁用所有操作按钮 (#2211, 感谢 @TuYv) +- 已安装 Skills 的缓存按 ID 去重，避免双击造成重复的已安装条目 (#2139) + +### 根级 Skill 仓库 + +- Skill 的安装与更新流程现在能一致地识别三种源路径：直接嵌套路径、按 install-name 递归搜索、以及仓库根的 `SKILL.md` 源 (#2231, 感谢 @santugege) + +### Gemini 会话恢复路径 + +- Gemini 会话扫描时读取 `.project_root` 元数据 (#2240, 感谢 @tisonkun) +- 恢复流程可以在可用时把原始项目目录传回 + +### 供应商名悬浮提示 + +- 供应商图标在 inline SVG、图像 URL、以及首字母回退渲染路径下都会在 hover 时展示供应商名称 (#2237, 感谢 @tisonkun) + +--- + +## 说明与注意事项 + +- **Hermes 健康扫描器已移除**：如果你依赖 CC Switch 提示 Hermes YAML 的深度配置问题，请改为通过工具栏的"启动 Hermes Web UI"按钮在 Hermes 原生面板里查看。日常供应商管理、切换、Memory 编辑、MCP 与 Skills 同步仍然由 CC Switch 负责。 +- **Codex OAuth FAST 模式默认关闭**：只有在你接受可能增加 ChatGPT 配额消耗换取更低延迟时，才需要打开。 +- **托盘缓存用量**：刷新带节流，只覆盖当前显示的应用，避免无必要的上游 API 调用；数据会回写到 React Query，因此主窗口和托盘看到的值一致。 + +--- + +## 下载与安装 + +访问 [Releases](https://github.com/farion1231/cc-switch/releases/latest) 下载对应版本。 + +### 系统要求 + +| 系统 | 最低版本 | 架构 | +| ------- | -------------------------- | ----------------------------------- | +| Windows | Windows 10 及以上 | x64 | +| macOS | macOS 12 (Monterey) 及以上 | Intel (x64) / Apple Silicon (arm64) | +| Linux | 见下表 | x64 | + +### Windows + +| 文件 | 说明 | +| ---------------------------------------- | ----------------------------------- | +| `CC-Switch-v3.14.1-Windows.msi` | **推荐** - MSI 安装包，支持自动更新 | +| `CC-Switch-v3.14.1-Windows-Portable.zip` | 便携版，解压即用，不写入注册表 | + +### macOS + +| 文件 | 说明 | +| -------------------------------- | --------------------------------------------- | +| `CC-Switch-v3.14.1-macOS.dmg` | **推荐** - DMG 安装包，拖入 Applications 即可 | +| `CC-Switch-v3.14.1-macOS.zip` | 解压后拖入 Applications，Universal Binary | +| `CC-Switch-v3.14.1-macOS.tar.gz` | 用于 Homebrew 安装和自动更新 | + +> macOS 版本已通过 Apple 代码签名和公证，可直接安装使用。 + +### Homebrew（macOS） + +```bash +brew tap farion1231/ccswitch +brew install --cask cc-switch +``` + +更新： + +```bash +brew upgrade --cask cc-switch +``` + +### Linux + +| 发行版 | 推荐格式 | 安装方式 | +| --------------------------------------- | ----------- | ---------------------------------------------------------------------- | +| Ubuntu / Debian / Linux Mint / Pop!\_OS | `.deb` | `sudo dpkg -i CC-Switch-*.deb` 或 `sudo apt install ./CC-Switch-*.deb` | +| Fedora / RHEL / CentOS / Rocky Linux | `.rpm` | `sudo rpm -i CC-Switch-*.rpm` 或 `sudo dnf install ./CC-Switch-*.rpm` | +| openSUSE | `.rpm` | `sudo zypper install ./CC-Switch-*.rpm` | +| Arch Linux / Manjaro | `.AppImage` | 添加执行权限后直接运行，或使用 AUR | +| 其他发行版 / 不确定 | `.AppImage` | `chmod +x CC-Switch-*.AppImage && ./CC-Switch-*.AppImage` | diff --git a/docs/user-manual/en/2-providers/2.1-add.md b/docs/user-manual/en/2-providers/2.1-add.md index d8e2a4ad6..49960efdc 100644 --- a/docs/user-manual/en/2-providers/2.1-add.md +++ b/docs/user-manual/en/2-providers/2.1-add.md @@ -509,7 +509,7 @@ When editing Claude providers, a set of **quick toggles** is available above the | **Hide Attribution** | Clears commit/PR attribution metadata | Sets `attribution: {commit: "", pr: ""}` | | **Enable Teammates** | Enables the agent teams feature | Sets `env.CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS = "1"` | | **Enable Tool Search** | Enables tool search functionality | Sets `env.ENABLE_TOOL_SEARCH = "true"` | -| **High Effort** | Sets effort level to high | Sets `effortLevel = "high"` | +| **Max Effort** | Sets effort level to max | Sets `env.CLAUDE_CODE_EFFORT_LEVEL = "max"` | | **Disable Auto Upgrade** | Prevents Claude Code auto-updates | Sets `env.DISABLE_AUTOUPDATER = "1"` | When a toggle is unchecked, its corresponding config entry is removed entirely. Changes are reflected in the JSON editor in real-time. diff --git a/docs/user-manual/en/4-proxy/4.4-usage.md b/docs/user-manual/en/4-proxy/4.4-usage.md index cc3c8af1d..ca148c788 100644 --- a/docs/user-manual/en/4-proxy/4.4-usage.md +++ b/docs/user-manual/en/4-proxy/4.4-usage.md @@ -277,15 +277,16 @@ CC Switch includes preset official prices for common models (per million tokens) **Chinese Provider Models**: > Note: Currency follows each provider's official pricing page. StepFun is currently listed in USD. +> +> **DeepSeek compatibility**: Legacy model IDs `deepseek-chat` / `deepseek-reasoner` now alias to `deepseek-v4-flash` (non-thinking / thinking modes) and are billed at v4-flash rates. | Model | Input | Output | Cache Read | |-------|-------|--------|------------| | **StepFun** | | | | | step-3.5-flash | $0.10 | $0.30 | $0.02 | | **DeepSeek** | | | | -| deepseek-v3.2 | ¥2.00 | ¥3.00 | ¥0.40 | -| deepseek-v3.1 | ¥4.00 | ¥12.00 | ¥0.80 | -| deepseek-v3 | ¥2.00 | ¥8.00 | ¥0.40 | +| deepseek-v4-flash | ¥1.00 | ¥2.00 | ¥0.20 | +| deepseek-v4-pro | ¥12.00 | ¥24.00 | ¥1.00 | | **Kimi (Moonshot)** | | | | | kimi-k2-thinking | ¥4.00 | ¥16.00 | ¥1.00 | | kimi-k2 | ¥4.00 | ¥16.00 | ¥1.00 | diff --git a/docs/user-manual/ja/2-providers/2.1-add.md b/docs/user-manual/ja/2-providers/2.1-add.md index 63bd9bf71..d8bc7e058 100644 --- a/docs/user-manual/ja/2-providers/2.1-add.md +++ b/docs/user-manual/ja/2-providers/2.1-add.md @@ -509,7 +509,7 @@ Claude プロバイダーの編集時、JSON エディタの上部に **クイ | **帰属情報を非表示** | コミット/PR の帰属メタデータをクリア | `attribution: {commit: "", pr: ""}` を設定 | | **チームメイトを有効化** | エージェントチーム機能を有効化 | `env.CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS = "1"` を設定 | | **ツール検索を有効化** | ツール検索機能を有効化 | `env.ENABLE_TOOL_SEARCH = "true"` を設定 | -| **高強度** | エフォートレベルを高に設定 | `effortLevel = "high"` を設定 | +| **最大強度思考** | エフォートレベルを max に設定 | `env.CLAUDE_CODE_EFFORT_LEVEL = "max"` を設定 | | **自動アップグレードを無効化** | Claude Code の自動更新を防止 | `env.DISABLE_AUTOUPDATER = "1"` を設定 | トグルのチェックを外すと、対応する設定エントリが完全に削除されます。変更は JSON エディタにリアルタイムで反映されます。 diff --git a/docs/user-manual/ja/4-proxy/4.4-usage.md b/docs/user-manual/ja/4-proxy/4.4-usage.md index 413a8e7ee..3f90789d8 100644 --- a/docs/user-manual/ja/4-proxy/4.4-usage.md +++ b/docs/user-manual/ja/4-proxy/4.4-usage.md @@ -277,15 +277,16 @@ CC Switch は一般的なモデルの公式価格（100 万 Token あたり） **中国メーカーのモデル**： > 注: 通貨は各プロバイダーの公式料金ページに従います。StepFun は現在 USD 表記です。 +> +> **DeepSeek 互換**: 旧モデル名 `deepseek-chat` / `deepseek-reasoner` は `deepseek-v4-flash`（非思考／思考モード）と等価になり、v4-flash 料金で課金されます。 | モデル | 入力 | 出力 | キャッシュ読取 | |------|------|------|----------| | **StepFun** | | | | | step-3.5-flash | $0.10 | $0.30 | $0.02 | | **DeepSeek** | | | | -| deepseek-v3.2 | ¥2.00 | ¥3.00 | ¥0.40 | -| deepseek-v3.1 | ¥4.00 | ¥12.00 | ¥0.80 | -| deepseek-v3 | ¥2.00 | ¥8.00 | ¥0.40 | +| deepseek-v4-flash | ¥1.00 | ¥2.00 | ¥0.20 | +| deepseek-v4-pro | ¥12.00 | ¥24.00 | ¥1.00 | | **Kimi (月之暗面)** | | | | | kimi-k2-thinking | ¥4.00 | ¥16.00 | ¥1.00 | | kimi-k2 | ¥4.00 | ¥16.00 | ¥1.00 | diff --git a/docs/user-manual/zh/2-providers/2.1-add.md b/docs/user-manual/zh/2-providers/2.1-add.md index b44b6f0d4..ea1fd02cb 100644 --- a/docs/user-manual/zh/2-providers/2.1-add.md +++ b/docs/user-manual/zh/2-providers/2.1-add.md @@ -509,7 +509,7 @@ v3.13.0 起新增的高级选项。默认情况下，CC Switch 会把配置的 ` | **隐藏署名** | 清除提交/PR 的署名元数据 | 设置 `attribution: {commit: "", pr: ""}` | | **启用 Teammates** | 启用 Agent 团队功能 | 设置 `env.CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS = "1"` | | **启用工具搜索** | 启用工具搜索功能 | 设置 `env.ENABLE_TOOL_SEARCH = "true"` | -| **高效能模式** | 将 effort 级别设为 high | 设置 `effortLevel = "high"` | +| **最大强度思考** | 将 effort 级别设为 max | 设置 `env.CLAUDE_CODE_EFFORT_LEVEL = "max"` | | **禁用自动更新** | 阻止 Claude Code 自动更新 | 设置 `env.DISABLE_AUTOUPDATER = "1"` | 取消勾选开关时，对应的配置项会被完全移除。更改会实时反映在 JSON 编辑器中。 diff --git a/docs/user-manual/zh/4-proxy/4.4-usage.md b/docs/user-manual/zh/4-proxy/4.4-usage.md index 7e0b79ab0..d3cec1982 100644 --- a/docs/user-manual/zh/4-proxy/4.4-usage.md +++ b/docs/user-manual/zh/4-proxy/4.4-usage.md @@ -277,15 +277,16 @@ CC Switch 预设了常用模型的官方价格（每百万 Token）。v3.13.0 **中国厂商模型**： > 注：币种遵循各供应商官方定价页面。StepFun 当前按美元列出。 +> +> **DeepSeek 兼容**：旧模型名 `deepseek-chat` / `deepseek-reasoner` 现等价于 `deepseek-v4-flash`（非思考/思考模式），按 v4-flash 价格计费。 | 模型 | 输入 | 输出 | 缓存读取 | |------|------|------|----------| | **StepFun** | | | | | step-3.5-flash | $0.10 | $0.30 | $0.02 | | **DeepSeek** | | | | -| deepseek-v3.2 | ¥2.00 | ¥3.00 | ¥0.40 | -| deepseek-v3.1 | ¥4.00 | ¥12.00 | ¥0.80 | -| deepseek-v3 | ¥2.00 | ¥8.00 | ¥0.40 | +| deepseek-v4-flash | ¥1.00 | ¥2.00 | ¥0.20 | +| deepseek-v4-pro | ¥12.00 | ¥24.00 | ¥1.00 | | **Kimi (月之暗面)** | | | | | kimi-k2-thinking | ¥4.00 | ¥16.00 | ¥1.00 | | kimi-k2 | ¥4.00 | ¥16.00 | ¥1.00 | diff --git a/package.json b/package.json index d07ecbf96..7e7acd3d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cc-switch", - "version": "3.13.0", + "version": "3.14.1", "description": "All-in-One Assistant for Claude Code, Codex & Gemini CLI", "type": "module", "scripts": { diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 000000000..e396bd016 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "1.95" +components = ["rustfmt", "clippy"] +profile = "minimal" diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 1443b2388..99440be48 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -735,7 +735,7 @@ dependencies = [ [[package]] name = "cc-switch" -version = "3.13.0" +version = "3.14.1" dependencies = [ "anyhow", "arboard", @@ -785,6 +785,7 @@ dependencies = [ "tauri-plugin-single-instance", "tauri-plugin-store", "tauri-plugin-updater", + "tauri-plugin-window-state", "tempfile", "thiserror 2.0.18", "tokio", @@ -5687,6 +5688,21 @@ dependencies = [ "zip 4.6.1", ] +[[package]] +name = "tauri-plugin-window-state" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73736611e14142408d15353e21e3cca2f12a3cfb523ad0ce85999b6d2ef1a704" +dependencies = [ + "bitflags 2.11.0", + "log", + "serde", + "serde_json", + "tauri", + "tauri-plugin", + "thiserror 2.0.18", +] + [[package]] name = "tauri-runtime" version = "2.10.1" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index e62bc1e36..857cacfe9 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cc-switch" -version = "3.13.0" +version = "3.14.1" description = "All-in-One Assistant for Claude Code, Codex & Gemini CLI" authors = ["Jason Young"] license = "MIT" @@ -35,6 +35,7 @@ tauri-plugin-updater = "2" tauri-plugin-dialog = "2" tauri-plugin-store = "2" tauri-plugin-deep-link = "2" +tauri-plugin-window-state = "2" dirs = "5.0" toml = "0.8" toml_edit = "0.22" diff --git a/src-tauri/src/app_config.rs b/src-tauri/src/app_config.rs index 4a9fc7539..2af5333f6 100644 --- a/src-tauri/src/app_config.rs +++ b/src-tauri/src/app_config.rs @@ -15,6 +15,8 @@ pub struct McpApps { pub gemini: bool, #[serde(default)] pub opencode: bool, + #[serde(default)] + pub hermes: bool, } impl McpApps { @@ -26,6 +28,8 @@ impl McpApps { AppType::Gemini => self.gemini, AppType::OpenCode => self.opencode, AppType::OpenClaw => false, // OpenClaw doesn't support MCP + AppType::Hermes => self.hermes, + AppType::ClaudeDesktop => false, } } @@ -37,6 +41,8 @@ impl McpApps { AppType::Gemini => self.gemini = enabled, AppType::OpenCode => self.opencode = enabled, AppType::OpenClaw => {} // OpenClaw doesn't support MCP, ignore + AppType::Hermes => self.hermes = enabled, + AppType::ClaudeDesktop => {} // Claude Desktop 3P provider config doesn't support MCP here } } @@ -55,12 +61,15 @@ impl McpApps { if self.opencode { apps.push(AppType::OpenCode); } + if self.hermes { + apps.push(AppType::Hermes); + } apps } /// 检查是否所有应用都未启用 pub fn is_empty(&self) -> bool { - !self.claude && !self.codex && !self.gemini && !self.opencode + !self.claude && !self.codex && !self.gemini && !self.opencode && !self.hermes } } @@ -75,6 +84,8 @@ pub struct SkillApps { pub gemini: bool, #[serde(default)] pub opencode: bool, + #[serde(default)] + pub hermes: bool, } impl SkillApps { @@ -85,7 +96,9 @@ impl SkillApps { AppType::Codex => self.codex, AppType::Gemini => self.gemini, AppType::OpenCode => self.opencode, + AppType::Hermes => self.hermes, AppType::OpenClaw => false, // OpenClaw doesn't support Skills + AppType::ClaudeDesktop => false, } } @@ -96,7 +109,9 @@ impl SkillApps { AppType::Codex => self.codex = enabled, AppType::Gemini => self.gemini = enabled, AppType::OpenCode => self.opencode = enabled, + AppType::Hermes => self.hermes = enabled, AppType::OpenClaw => {} // OpenClaw doesn't support Skills, ignore + AppType::ClaudeDesktop => {} // Claude Desktop 3P profiles don't use CC Switch skill sync } } @@ -115,12 +130,15 @@ impl SkillApps { if self.opencode { apps.push(AppType::OpenCode); } + if self.hermes { + apps.push(AppType::Hermes); + } apps } /// 检查是否所有应用都未启用 pub fn is_empty(&self) -> bool { - !self.claude && !self.codex && !self.gemini && !self.opencode + !self.claude && !self.codex && !self.gemini && !self.opencode && !self.hermes } /// 仅启用指定应用（其他应用设为禁用） @@ -241,6 +259,14 @@ pub struct McpRoot { /// 旧的分应用存储（v3.6.x 及以前，保留用于迁移） #[serde(default, skip_serializing_if = "McpConfig::is_empty")] pub claude: McpConfig, + #[serde( + rename = "claude-desktop", + alias = "claudeDesktop", + alias = "claude_desktop", + default, + skip_serializing_if = "McpConfig::is_empty" + )] + pub claude_desktop: McpConfig, #[serde(default, skip_serializing_if = "McpConfig::is_empty")] pub codex: McpConfig, #[serde(default, skip_serializing_if = "McpConfig::is_empty")] @@ -251,6 +277,9 @@ pub struct McpRoot { /// OpenClaw MCP 配置（v4.1.0+，实际使用 openclaw.json） #[serde(default, skip_serializing_if = "McpConfig::is_empty")] pub openclaw: McpConfig, + /// Hermes MCP 配置（实际使用 config.yaml） + #[serde(default, skip_serializing_if = "McpConfig::is_empty")] + pub hermes: McpConfig, } impl Default for McpRoot { @@ -260,10 +289,12 @@ impl Default for McpRoot { servers: Some(HashMap::new()), // 旧结构保持空，仅用于反序列化旧配置时的迁移 claude: McpConfig::default(), + claude_desktop: McpConfig::default(), codex: McpConfig::default(), gemini: McpConfig::default(), opencode: McpConfig::default(), openclaw: McpConfig::default(), + hermes: McpConfig::default(), } } } @@ -280,6 +311,13 @@ pub struct PromptConfig { pub struct PromptRoot { #[serde(default)] pub claude: PromptConfig, + #[serde( + rename = "claude-desktop", + alias = "claudeDesktop", + alias = "claude_desktop", + default + )] + pub claude_desktop: PromptConfig, #[serde(default)] pub codex: PromptConfig, #[serde(default)] @@ -288,6 +326,8 @@ pub struct PromptRoot { pub opencode: PromptConfig, #[serde(default)] pub openclaw: PromptConfig, + #[serde(default)] + pub hermes: PromptConfig, } use crate::config::{copy_file, get_app_config_dir, get_app_config_path, write_json_file}; @@ -296,43 +336,57 @@ use crate::prompt_files::prompt_file_path; use crate::provider::ProviderManager; /// 应用类型 -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] +#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)] #[serde(rename_all = "lowercase")] pub enum AppType { Claude, + #[serde( + rename = "claude-desktop", + alias = "claude_desktop", + alias = "claudeDesktop" + )] + ClaudeDesktop, Codex, Gemini, OpenCode, OpenClaw, + Hermes, } impl AppType { pub fn as_str(&self) -> &str { match self { AppType::Claude => "claude", + AppType::ClaudeDesktop => "claude-desktop", AppType::Codex => "codex", AppType::Gemini => "gemini", AppType::OpenCode => "opencode", AppType::OpenClaw => "openclaw", + AppType::Hermes => "hermes", } } /// Check if this app uses additive mode /// /// - Switch mode (false): Only the current provider is written to live config (Claude, Codex, Gemini) - /// - Additive mode (true): All providers are written to live config (OpenCode, OpenClaw) + /// - Additive mode (true): All providers are written to live config (OpenCode, OpenClaw, Hermes) pub fn is_additive_mode(&self) -> bool { - matches!(self, AppType::OpenCode | AppType::OpenClaw) + matches!( + self, + AppType::OpenCode | AppType::OpenClaw | AppType::Hermes + ) } /// Return an iterator over all app types pub fn all() -> impl Iterator { [ AppType::Claude, + AppType::ClaudeDesktop, AppType::Codex, AppType::Gemini, AppType::OpenCode, AppType::OpenClaw, + AppType::Hermes, ] .into_iter() } @@ -345,14 +399,16 @@ impl FromStr for AppType { let normalized = s.trim().to_lowercase(); match normalized.as_str() { "claude" => Ok(AppType::Claude), + "claude-desktop" | "claude_desktop" | "claudedesktop" => Ok(AppType::ClaudeDesktop), "codex" => Ok(AppType::Codex), "gemini" => Ok(AppType::Gemini), "opencode" => Ok(AppType::OpenCode), "openclaw" => Ok(AppType::OpenClaw), + "hermes" => Ok(AppType::Hermes), other => Err(AppError::localized( "unsupported_app", - format!("不支持的应用标识: '{other}'。可选值: claude, codex, gemini, opencode, openclaw。"), - format!("Unsupported app id: '{other}'. Allowed: claude, codex, gemini, opencode, openclaw."), + format!("不支持的应用标识: '{other}'。可选值: claude, claude-desktop, codex, gemini, opencode, openclaw, hermes。"), + format!("Unsupported app id: '{other}'. Allowed: claude, claude-desktop, codex, gemini, opencode, openclaw, hermes."), )), } } @@ -375,6 +431,9 @@ pub struct CommonConfigSnippets { #[serde(default, skip_serializing_if = "Option::is_none")] pub openclaw: Option, + + #[serde(default, skip_serializing_if = "Option::is_none")] + pub hermes: Option, } impl CommonConfigSnippets { @@ -382,10 +441,12 @@ impl CommonConfigSnippets { pub fn get(&self, app: &AppType) -> Option<&String> { match app { AppType::Claude => self.claude.as_ref(), + AppType::ClaudeDesktop => None, AppType::Codex => self.codex.as_ref(), AppType::Gemini => self.gemini.as_ref(), AppType::OpenCode => self.opencode.as_ref(), AppType::OpenClaw => self.openclaw.as_ref(), + AppType::Hermes => self.hermes.as_ref(), } } @@ -393,10 +454,12 @@ impl CommonConfigSnippets { pub fn set(&mut self, app: &AppType, snippet: Option) { match app { AppType::Claude => self.claude = snippet, + AppType::ClaudeDesktop => {} AppType::Codex => self.codex = snippet, AppType::Gemini => self.gemini = snippet, AppType::OpenCode => self.opencode = snippet, AppType::OpenClaw => self.openclaw = snippet, + AppType::Hermes => self.hermes = snippet, } } } @@ -434,10 +497,12 @@ impl Default for MultiAppConfig { fn default() -> Self { let mut apps = HashMap::new(); apps.insert("claude".to_string(), ProviderManager::default()); + apps.insert("claude-desktop".to_string(), ProviderManager::default()); apps.insert("codex".to_string(), ProviderManager::default()); apps.insert("gemini".to_string(), ProviderManager::default()); apps.insert("opencode".to_string(), ProviderManager::default()); apps.insert("openclaw".to_string(), ProviderManager::default()); + apps.insert("hermes".to_string(), ProviderManager::default()); Self { version: 2, @@ -594,10 +659,12 @@ impl MultiAppConfig { pub fn mcp_for(&self, app: &AppType) -> &McpConfig { match app { AppType::Claude => &self.mcp.claude, + AppType::ClaudeDesktop => &self.mcp.claude_desktop, AppType::Codex => &self.mcp.codex, AppType::Gemini => &self.mcp.gemini, AppType::OpenCode => &self.mcp.opencode, AppType::OpenClaw => &self.mcp.openclaw, + AppType::Hermes => &self.mcp.hermes, } } @@ -605,10 +672,12 @@ impl MultiAppConfig { pub fn mcp_for_mut(&mut self, app: &AppType) -> &mut McpConfig { match app { AppType::Claude => &mut self.mcp.claude, + AppType::ClaudeDesktop => &mut self.mcp.claude_desktop, AppType::Codex => &mut self.mcp.codex, AppType::Gemini => &mut self.mcp.gemini, AppType::OpenCode => &mut self.mcp.opencode, AppType::OpenClaw => &mut self.mcp.openclaw, + AppType::Hermes => &mut self.mcp.hermes, } } @@ -624,6 +693,7 @@ impl MultiAppConfig { Self::auto_import_prompt_if_exists(&mut config, AppType::Gemini)?; Self::auto_import_prompt_if_exists(&mut config, AppType::OpenCode)?; Self::auto_import_prompt_if_exists(&mut config, AppType::OpenClaw)?; + Self::auto_import_prompt_if_exists(&mut config, AppType::Hermes)?; Ok(config) } @@ -641,10 +711,12 @@ impl MultiAppConfig { fn maybe_auto_import_prompts_for_existing_config(&mut self) -> Result { // 如果任一应用已经有提示词配置，说明用户已经在使用 Prompt 功能，避免再次自动导入 if !self.prompts.claude.prompts.is_empty() + || !self.prompts.claude_desktop.prompts.is_empty() || !self.prompts.codex.prompts.is_empty() || !self.prompts.gemini.prompts.is_empty() || !self.prompts.opencode.prompts.is_empty() || !self.prompts.openclaw.prompts.is_empty() + || !self.prompts.hermes.prompts.is_empty() { return Ok(false); } @@ -658,6 +730,7 @@ impl MultiAppConfig { AppType::Gemini, AppType::OpenCode, AppType::OpenClaw, + AppType::Hermes, ] { // 复用已有的单应用导入逻辑 if Self::auto_import_prompt_if_exists(self, app)? { @@ -725,10 +798,12 @@ impl MultiAppConfig { // 插入到对应的应用配置中 let prompts = match app { AppType::Claude => &mut config.prompts.claude.prompts, + AppType::ClaudeDesktop => &mut config.prompts.claude_desktop.prompts, AppType::Codex => &mut config.prompts.codex.prompts, AppType::Gemini => &mut config.prompts.gemini.prompts, AppType::OpenCode => &mut config.prompts.opencode.prompts, AppType::OpenClaw => &mut config.prompts.openclaw.prompts, + AppType::Hermes => &mut config.prompts.hermes.prompts, }; prompts.insert(id, prompt); @@ -765,10 +840,12 @@ impl MultiAppConfig { ] { let old_servers = match app { AppType::Claude => &self.mcp.claude.servers, + AppType::ClaudeDesktop => continue, // Claude Desktop 3P profiles don't use MCP here AppType::Codex => &self.mcp.codex.servers, AppType::Gemini => &self.mcp.gemini.servers, AppType::OpenCode => &self.mcp.opencode.servers, AppType::OpenClaw => continue, // OpenClaw MCP is still in development, skip + AppType::Hermes => continue, // Hermes didn't exist in v3.6.x, skip }; for (id, entry) in old_servers { @@ -884,6 +961,23 @@ mod tests { use std::fs; use tempfile::TempDir; + #[test] + fn app_type_parses_claude_desktop_aliases() { + assert_eq!( + "claude-desktop".parse::().unwrap(), + AppType::ClaudeDesktop + ); + assert_eq!( + "claude_desktop".parse::().unwrap(), + AppType::ClaudeDesktop + ); + assert_eq!( + "claudeDesktop".parse::().unwrap(), + AppType::ClaudeDesktop + ); + assert_eq!(AppType::ClaudeDesktop.as_str(), "claude-desktop"); + } + struct TempHome { #[allow(dead_code)] // 字段通过 Drop trait 管理临时目录生命周期 dir: TempDir, diff --git a/src-tauri/src/claude_desktop_config.rs b/src-tauri/src/claude_desktop_config.rs new file mode 100644 index 000000000..96095710e --- /dev/null +++ b/src-tauri/src/claude_desktop_config.rs @@ -0,0 +1,1358 @@ +use serde::Serialize; +use serde_json::{json, Value}; +use std::fs; +use std::path::{Path, PathBuf}; + +#[cfg(any(target_os = "macos", windows))] +use crate::config::get_home_dir; +use crate::config::{atomic_write, delete_file, read_json_file, write_json_file}; +use crate::database::Database; +use crate::database::CLAUDE_DESKTOP_OFFICIAL_PROVIDER_ID; +use crate::error::AppError; +use crate::provider::{ClaudeDesktopMode, Provider}; + +pub const PROFILE_ID: &str = "00000000-0000-4000-8000-000000157210"; +pub const PROFILE_NAME: &str = "CC Switch"; + +#[cfg(any(target_os = "macos", windows, test))] +const CONFIG_FILE: &str = "claude_desktop_config.json"; +#[cfg(any(target_os = "macos", windows, test))] +const CONFIG_LIBRARY_DIR: &str = "configLibrary"; +const GATEWAY_TOKEN_SETTING_KEY: &str = "claude_desktop_gateway_token"; +const CLAUDE_DESKTOP_PROXY_PREFIX: &str = "/claude-desktop"; +const DEFAULT_CREATED_AT: &str = "2024-01-01T00:00:00Z"; +const ONE_M_CONTEXT_SUFFIX: &str = " [1M]"; + +#[derive(Debug, Clone, Copy, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct ClaudeDesktopDefaultRoute { + pub route_id: &'static str, + pub env_key: &'static str, + pub display_name: &'static str, + #[serde(rename = "supports1m")] + pub supports_1m: bool, +} + +pub const DEFAULT_PROXY_ROUTES: &[ClaudeDesktopDefaultRoute] = &[ + ClaudeDesktopDefaultRoute { + route_id: "claude-sonnet-4-6", + env_key: "ANTHROPIC_DEFAULT_SONNET_MODEL", + display_name: "Sonnet", + supports_1m: true, + }, + ClaudeDesktopDefaultRoute { + route_id: "claude-opus-4-7", + env_key: "ANTHROPIC_DEFAULT_OPUS_MODEL", + display_name: "Opus", + supports_1m: true, + }, + ClaudeDesktopDefaultRoute { + route_id: "claude-haiku-4-5", + env_key: "ANTHROPIC_DEFAULT_HAIKU_MODEL", + display_name: "Haiku", + supports_1m: true, + }, +]; + +#[derive(Debug, Clone)] +struct ClaudeDesktopPaths { + normal_config_path: PathBuf, + threep_config_path: PathBuf, + config_library_path: PathBuf, + profile_path: PathBuf, + meta_path: PathBuf, +} + +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct DirectGatewayCredentials { + pub base_url: String, + pub api_key: String, +} + +#[derive(Debug, Clone)] +struct FileSnapshot { + path: PathBuf, + content: Option>, +} + +#[derive(Debug, Clone, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct ClaudeDesktopStatus { + pub supported: bool, + pub configured: bool, + pub applied_id: Option, + pub profile_path: Option, + pub config_library_path: Option, + pub mode: Option, + pub expected_base_url: Option, + pub actual_base_url: Option, + pub proxy_running: bool, + pub stale_raw_models: bool, + pub missing_route_mappings: bool, + pub gateway_token_configured: bool, +} + +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct ResolvedModelRoute { + pub route_id: String, + pub upstream_model: String, + pub display_name: Option, + pub supports_1m: bool, +} + +pub fn apply_provider(db: &Database, provider: &Provider) -> Result<(), AppError> { + let paths = current_platform_paths()?; + apply_provider_to_paths(db, provider, &paths) +} + +pub fn get_status(db: &Database, proxy_running: bool) -> Result { + if !is_supported_platform() { + return Ok(ClaudeDesktopStatus { + supported: false, + configured: false, + applied_id: None, + profile_path: None, + config_library_path: None, + mode: None, + expected_base_url: None, + actual_base_url: None, + proxy_running, + stale_raw_models: false, + missing_route_mappings: false, + gateway_token_configured: false, + }); + } + + let paths = current_platform_paths()?; + let applied_id = read_applied_id(&paths.meta_path); + let configured = paths.profile_path.exists() || meta_has_profile_entry(&paths.meta_path); + let profile = read_json_or_empty(&paths.profile_path).unwrap_or_else(|_| json!({})); + let actual_base_url = profile + .get("inferenceGatewayBaseUrl") + .and_then(Value::as_str) + .map(str::to_string); + let stale_raw_models = profile + .get("inferenceModels") + .and_then(Value::as_array) + .map(|models| { + models.iter().any(|item| { + item.as_str() + .or_else(|| item.get("name").and_then(Value::as_str)) + .is_some_and(|model| !is_claude_safe_model_id(model)) + }) + }) + .unwrap_or(false); + let gateway_token_configured = db + .get_setting(GATEWAY_TOKEN_SETTING_KEY) + .ok() + .flatten() + .is_some_and(|token| !token.trim().is_empty()); + let current_provider = crate::settings::get_effective_current_provider( + db, + &crate::app_config::AppType::ClaudeDesktop, + ) + .ok() + .flatten() + .and_then(|id| db.get_provider_by_id(&id, "claude-desktop").ok().flatten()); + let mode = current_provider.as_ref().map(provider_mode); + let expected_base_url = match mode { + Some(ClaudeDesktopMode::Proxy) => proxy_gateway_base_url_from_db(db).ok(), + Some(ClaudeDesktopMode::Direct) => current_provider + .as_ref() + .and_then(|provider| direct_gateway_credentials(provider).ok()) + .map(|credentials| credentials.base_url), + None => None, + }; + let missing_route_mappings = current_provider.as_ref().is_some_and(|provider| { + matches!(provider_mode(provider), ClaudeDesktopMode::Proxy) + && proxy_model_routes(provider).is_err() + }); + + Ok(ClaudeDesktopStatus { + supported: true, + configured, + applied_id, + profile_path: Some(paths.profile_path.display().to_string()), + config_library_path: Some(paths.config_library_path.display().to_string()), + mode, + expected_base_url, + actual_base_url, + proxy_running, + stale_raw_models, + missing_route_mappings, + gateway_token_configured, + }) +} + +pub fn get_config_library_path() -> Result { + Ok(current_platform_paths()?.config_library_path) +} + +pub fn default_proxy_routes() -> Vec { + DEFAULT_PROXY_ROUTES.to_vec() +} + +pub fn is_compatible_direct_provider(provider: &Provider) -> bool { + validate_direct_provider(provider).is_ok() +} + +pub fn is_official_provider(provider: &Provider) -> bool { + provider.id == CLAUDE_DESKTOP_OFFICIAL_PROVIDER_ID +} + +pub fn provider_mode(provider: &Provider) -> ClaudeDesktopMode { + provider + .meta + .as_ref() + .and_then(|meta| meta.claude_desktop_mode.clone()) + .unwrap_or(ClaudeDesktopMode::Direct) +} + +pub fn is_claude_safe_model_id(model: &str) -> bool { + let normalized = strip_one_m_context_suffix(model).to_ascii_lowercase(); + normalized.starts_with("claude-") || normalized.starts_with("anthropic/claude-") +} + +fn strip_one_m_context_suffix(model: &str) -> String { + let trimmed = model.trim(); + let lower = trimmed.to_ascii_lowercase(); + if lower.ends_with("[1m]") { + trimmed[..trimmed.len().saturating_sub("[1M]".len())] + .trim_end() + .to_string() + } else { + trimmed.to_string() + } +} + +fn has_one_m_context_suffix(model: &str) -> bool { + model.trim().to_ascii_lowercase().ends_with("[1m]") +} + +fn desktop_model_id(model_id: &str, supports_1m: bool) -> String { + let normalized = strip_one_m_context_suffix(model_id); + if supports_1m { + format!("{normalized}{ONE_M_CONTEXT_SUFFIX}") + } else { + normalized + } +} + +fn upstream_model_id(model_id: &str, supports_1m: bool) -> String { + desktop_model_id(model_id, supports_1m) +} + +pub fn get_or_create_gateway_token(db: &Database) -> Result { + if let Some(token) = db.get_setting(GATEWAY_TOKEN_SETTING_KEY)? { + let trimmed = token.trim(); + if !trimmed.is_empty() { + return Ok(trimmed.to_string()); + } + } + + let token = format!("ccs-{}", uuid::Uuid::new_v4().simple()); + db.set_setting(GATEWAY_TOKEN_SETTING_KEY, &token)?; + Ok(token) +} + +pub fn direct_gateway_credentials( + provider: &Provider, +) -> Result { + let env = provider + .settings_config + .get("env") + .and_then(Value::as_object) + .ok_or_else(|| { + AppError::localized( + "claude_desktop.provider.env_missing", + "Claude Desktop 直连供应商缺少 env 配置", + "Claude Desktop direct provider is missing env configuration", + ) + })?; + + let base_url = env + .get("ANTHROPIC_BASE_URL") + .and_then(Value::as_str) + .map(str::trim) + .filter(|value| !value.is_empty()) + .ok_or_else(|| { + AppError::localized( + "claude_desktop.provider.base_url_missing", + "Claude Desktop 直连供应商缺少 ANTHROPIC_BASE_URL", + "Claude Desktop direct provider is missing ANTHROPIC_BASE_URL", + ) + })? + .to_string(); + + let api_key = env + .get("ANTHROPIC_AUTH_TOKEN") + .and_then(Value::as_str) + .map(str::trim) + .filter(|value| !value.is_empty()) + .ok_or_else(|| { + AppError::localized( + "claude_desktop.provider.auth_token_missing", + "Claude Desktop 直连供应商缺少 ANTHROPIC_AUTH_TOKEN（Bearer Token）", + "Claude Desktop direct provider is missing ANTHROPIC_AUTH_TOKEN (Bearer Token)", + ) + })? + .to_string(); + + Ok(DirectGatewayCredentials { base_url, api_key }) +} + +pub fn validate_direct_provider(provider: &Provider) -> Result<(), AppError> { + if is_official_provider(provider) { + return Ok(()); + } + + if !provider.settings_config.is_object() { + return Err(AppError::localized( + "claude_desktop.provider.settings_not_object", + "Claude Desktop 直连供应商配置必须是 JSON 对象", + "Claude Desktop direct provider configuration must be a JSON object", + )); + } + + if let Some(meta) = provider.meta.as_ref() { + if let Some(api_format) = meta.api_format.as_deref() { + if !api_format.trim().is_empty() && api_format != "anthropic" { + return Err(AppError::localized( + "claude_desktop.provider.api_format_unsupported", + "Claude Desktop 第一阶段只支持原生 Anthropic Messages API", + "Claude Desktop phase 1 only supports native Anthropic Messages API", + )); + } + } + + if matches!( + meta.claude_desktop_mode.as_ref(), + Some(ClaudeDesktopMode::Proxy) + ) { + return Err(AppError::localized( + "claude_desktop.provider.mode_unsupported", + "该供应商是 Claude Desktop 本地路由模式，不能按直连模式写入", + "This Claude Desktop provider uses proxy mode and cannot be written as direct mode", + )); + } + + if matches!( + meta.provider_type.as_deref(), + Some("github_copilot") | Some("codex_oauth") + ) { + return Err(AppError::localized( + "claude_desktop.provider.type_unsupported", + "Claude Desktop 直连模式不支持需要本地代理转换的供应商", + "Claude Desktop direct mode does not support providers that require local proxy conversion", + )); + } + + if meta.is_full_url == Some(true) { + return Err(AppError::localized( + "claude_desktop.provider.full_url_unsupported", + "Claude Desktop 直连模式不支持完整 URL 端点配置", + "Claude Desktop direct mode does not support full URL endpoint configuration", + )); + } + } + + direct_inference_model_ids(provider)?; + direct_gateway_credentials(provider)?; + Ok(()) +} + +pub fn validate_proxy_provider(provider: &Provider) -> Result<(), AppError> { + if is_official_provider(provider) { + return Ok(()); + } + + if !provider.settings_config.is_object() { + return Err(AppError::localized( + "claude_desktop.provider.settings_not_object", + "Claude Desktop 本地路由供应商配置必须是 JSON 对象", + "Claude Desktop proxy provider configuration must be a JSON object", + )); + } + + if let Some(meta) = provider.meta.as_ref() { + if matches!( + meta.provider_type.as_deref(), + Some("github_copilot") | Some("codex_oauth") + ) { + return Err(AppError::localized( + "claude_desktop.provider.type_unsupported", + "Claude Desktop 本地路由模式暂不支持 Copilot 或 Codex OAuth 供应商", + "Claude Desktop proxy mode does not support Copilot or Codex OAuth providers yet", + )); + } + + if let Some(api_format) = meta.api_format.as_deref() { + if !matches!( + api_format, + "" | "anthropic" | "openai_chat" | "openai_responses" | "gemini_native" + ) { + return Err(AppError::localized( + "claude_desktop.provider.api_format_unsupported", + format!("Claude Desktop 本地路由模式不支持 API 格式: {api_format}"), + format!("Claude Desktop proxy mode does not support API format: {api_format}"), + )); + } + } + } + + proxy_model_routes(provider)?; + + if !has_proxy_base_url_and_key(provider) { + return Err(AppError::localized( + "claude_desktop.provider.credentials_missing", + "Claude Desktop 本地路由供应商缺少 Base URL 或 API Key", + "Claude Desktop proxy provider is missing Base URL or API key", + )); + } + + Ok(()) +} + +fn has_proxy_base_url_and_key(provider: &Provider) -> bool { + let env = provider.settings_config.get("env"); + let has_base_url = env + .and_then(|value| value.get("ANTHROPIC_BASE_URL")) + .or_else(|| provider.settings_config.get("base_url")) + .or_else(|| provider.settings_config.get("baseURL")) + .or_else(|| provider.settings_config.get("apiEndpoint")) + .and_then(Value::as_str) + .map(str::trim) + .is_some_and(|value| !value.is_empty()); + + let has_key = env + .and_then(|value| { + [ + "ANTHROPIC_AUTH_TOKEN", + "ANTHROPIC_API_KEY", + "OPENROUTER_API_KEY", + "OPENAI_API_KEY", + "GEMINI_API_KEY", + ] + .into_iter() + .find_map(|key| value.get(key)) + }) + .or_else(|| provider.settings_config.get("apiKey")) + .or_else(|| provider.settings_config.get("api_key")) + .and_then(Value::as_str) + .map(str::trim) + .is_some_and(|value| !value.is_empty()); + + has_base_url && has_key +} + +pub fn validate_provider(provider: &Provider) -> Result<(), AppError> { + if is_official_provider(provider) { + return Ok(()); + } + + match provider_mode(provider) { + ClaudeDesktopMode::Direct => validate_direct_provider(provider), + ClaudeDesktopMode::Proxy => validate_proxy_provider(provider), + } +} + +pub fn direct_inference_model_ids(provider: &Provider) -> Result, AppError> { + let Some(routes) = provider + .meta + .as_ref() + .map(|meta| &meta.claude_desktop_model_routes) + else { + return Ok(Vec::new()); + }; + + let mut result = Vec::new(); + for (route_id, route) in routes { + let supports_1m = route.supports_1m.unwrap_or(false) || has_one_m_context_suffix(route_id); + let route_id = strip_one_m_context_suffix(route_id); + if route_id.is_empty() { + continue; + } + if !is_claude_safe_model_id(&route_id) { + return Err(AppError::localized( + "claude_desktop.provider.route_invalid", + format!("Claude Desktop 直连模型必须使用 claude-* 或 anthropic/claude-* 名称: {route_id}"), + format!("Claude Desktop direct model must use a claude-* or anthropic/claude-* name: {route_id}"), + )); + } + result.push(desktop_model_id(&route_id, supports_1m)); + } + + result.sort(); + result.dedup(); + Ok(result) +} + +pub fn proxy_model_routes(provider: &Provider) -> Result, AppError> { + let routes = provider + .meta + .as_ref() + .map(|meta| &meta.claude_desktop_model_routes) + .ok_or_else(|| { + AppError::localized( + "claude_desktop.provider.routes_missing", + "Claude Desktop 本地路由模式缺少模型路由映射", + "Claude Desktop proxy mode is missing model route mappings", + ) + })?; + + let mut result = Vec::new(); + for (route_id, route) in routes { + let supports_1m = route.supports_1m.unwrap_or(false) || has_one_m_context_suffix(route_id); + let route_id = strip_one_m_context_suffix(route_id); + let upstream_model = route.model.trim(); + if route_id.is_empty() || upstream_model.is_empty() { + continue; + } + if !is_claude_safe_model_id(&route_id) { + return Err(AppError::localized( + "claude_desktop.provider.route_invalid", + format!("Claude Desktop 模型路由必须使用 claude-* 或 anthropic/claude-* 名称: {route_id}"), + format!("Claude Desktop model route must use a claude-* or anthropic/claude-* name: {route_id}"), + )); + } + result.push(ResolvedModelRoute { + route_id: desktop_model_id(&route_id, supports_1m), + upstream_model: upstream_model_id(upstream_model, supports_1m), + display_name: route.display_name.clone(), + supports_1m, + }); + } + + result.sort_by(|a, b| a.route_id.cmp(&b.route_id)); + result.dedup_by(|a, b| a.route_id == b.route_id); + + if result.is_empty() { + return Err(AppError::localized( + "claude_desktop.provider.routes_missing", + "Claude Desktop 本地路由模式至少需要一个模型路由映射", + "Claude Desktop proxy mode requires at least one model route mapping", + )); + } + + Ok(result) +} + +pub fn model_list_response(provider: &Provider) -> Result { + let routes = proxy_model_routes(provider)?; + let data: Vec = routes + .iter() + .map(|route| { + let model_id = desktop_model_id(&route.route_id, route.supports_1m); + let mut item = json!({ + "type": "model", + "id": model_id, + "display_name": route.display_name.as_deref().unwrap_or(&route.route_id), + "created_at": DEFAULT_CREATED_AT, + }); + if route.supports_1m { + item["supports1m"] = json!(true); + } + item + }) + .collect(); + let first_id = data + .first() + .and_then(|item| item.get("id")) + .and_then(Value::as_str) + .map(str::to_string); + let last_id = data + .last() + .and_then(|item| item.get("id")) + .and_then(Value::as_str) + .map(str::to_string); + + Ok(json!({ + "data": data, + "has_more": false, + "first_id": first_id, + "last_id": last_id, + })) +} + +pub fn map_proxy_request_model(mut body: Value, provider: &Provider) -> Result { + let requested = body + .get("model") + .and_then(Value::as_str) + .map(str::trim) + .map(str::to_string) + .filter(|value| !value.is_empty()) + .ok_or_else(|| { + AppError::localized( + "claude_desktop.provider.model_missing", + "Claude Desktop 请求缺少 model 字段", + "Claude Desktop request is missing the model field", + ) + })?; + + let routes = proxy_model_routes(provider)?; + let route = routes.iter().find(|r| r.route_id == requested).or_else(|| { + let base = strip_one_m_context_suffix(&requested); + routes + .iter() + .find(|r| strip_one_m_context_suffix(&r.route_id) == base) + }); + let Some(route) = route else { + return Err(AppError::localized( + "claude_desktop.provider.route_unknown", + format!("Claude Desktop 模型路由未配置: {requested}"), + format!("Claude Desktop model route is not configured: {requested}"), + )); + }; + + body["model"] = json!(route.upstream_model); + Ok(body) +} + +pub fn proxy_gateway_base_url_from_db(db: &Database) -> Result { + // get_proxy_config is async-tagged but its body is fully synchronous (rusqlite + // under a Mutex), so block_on cannot deadlock the calling thread. + let config = futures::executor::block_on(db.get_proxy_config())?; + Ok(format!( + "{}{}", + proxy_origin_from_parts(&config.listen_address, config.listen_port), + CLAUDE_DESKTOP_PROXY_PREFIX + )) +} + +fn apply_provider_to_paths( + db: &Database, + provider: &Provider, + paths: &ClaudeDesktopPaths, +) -> Result<(), AppError> { + if is_official_provider(provider) { + return restore_official_at_paths(paths); + } + + validate_provider(provider)?; + with_rollback(paths, |paths| { + apply_provider_to_paths_inner(db, provider, paths) + }) +} + +fn restore_official_at_paths(paths: &ClaudeDesktopPaths) -> Result<(), AppError> { + with_rollback(paths, restore_official_at_paths_inner) +} + +fn with_rollback(paths: &ClaudeDesktopPaths, op: F) -> Result<(), AppError> +where + F: FnOnce(&ClaudeDesktopPaths) -> Result<(), AppError>, +{ + let snapshots = snapshot_files(paths)?; + match op(paths) { + Ok(()) => Ok(()), + Err(err) => match restore_snapshots(&snapshots) { + Ok(()) => Err(err), + Err(rollback_err) => { + log::error!("Failed to rollback Claude Desktop config after error: {rollback_err}"); + Err(AppError::Message(format!( + "{err}; rollback failed: {rollback_err}" + ))) + } + }, + } +} + +fn apply_provider_to_paths_inner( + db: &Database, + provider: &Provider, + paths: &ClaudeDesktopPaths, +) -> Result<(), AppError> { + let profile = match provider_mode(provider) { + ClaudeDesktopMode::Direct => { + let credentials = direct_gateway_credentials(provider)?; + let model_ids = direct_inference_model_ids(provider)?; + build_gateway_profile( + &credentials.base_url, + &credentials.api_key, + (!model_ids.is_empty()).then_some(model_ids.as_slice()), + ) + } + ClaudeDesktopMode::Proxy => { + let base_url = proxy_gateway_base_url_from_db(db)?; + let api_key = get_or_create_gateway_token(db)?; + let routes = proxy_model_routes(provider)?; + let model_ids = routes + .iter() + .map(|route| desktop_model_id(&route.route_id, route.supports_1m)) + .collect::>(); + build_gateway_profile(&base_url, &api_key, Some(model_ids.as_slice())) + } + }; + + write_deployment_mode(&paths.normal_config_path, "3p")?; + write_deployment_mode(&paths.threep_config_path, "3p")?; + write_json_file(&paths.profile_path, &profile)?; + write_meta(&paths.meta_path, Some(PROFILE_ID))?; + + Ok(()) +} + +fn restore_official_at_paths_inner(paths: &ClaudeDesktopPaths) -> Result<(), AppError> { + write_deployment_mode(&paths.normal_config_path, "1p")?; + write_deployment_mode(&paths.threep_config_path, "1p")?; + remove_cc_switch_enterprise_config(&paths.threep_config_path)?; + + if paths.profile_path.exists() { + delete_file(&paths.profile_path)?; + } + write_meta(&paths.meta_path, None)?; + + Ok(()) +} + +fn build_gateway_profile(base_url: &str, api_key: &str, model_ids: Option<&[String]>) -> Value { + let mut profile = json!({ + "disableDeploymentModeChooser": true, + "inferenceGatewayApiKey": api_key, + "inferenceGatewayAuthScheme": "bearer", + "inferenceGatewayBaseUrl": base_url, + "inferenceProvider": "gateway" + }); + + if let Some(model_ids) = model_ids { + profile["inferenceModels"] = Value::Array( + model_ids + .iter() + .map(|model_id| Value::String(model_id.clone())) + .collect(), + ); + } + + profile +} + +fn read_json_or_empty(path: &Path) -> Result { + let value = if path.exists() { + read_json_file(path)? + } else { + json!({}) + }; + + if value.is_object() { + Ok(value) + } else { + Ok(json!({})) + } +} + +fn snapshot_files(paths: &ClaudeDesktopPaths) -> Result, AppError> { + [ + &paths.normal_config_path, + &paths.threep_config_path, + &paths.profile_path, + &paths.meta_path, + ] + .into_iter() + .map(|path| { + let content = if path.exists() { + Some(fs::read(path).map_err(|e| AppError::io(path, e))?) + } else { + None + }; + Ok(FileSnapshot { + path: path.clone(), + content, + }) + }) + .collect() +} + +fn restore_snapshots(snapshots: &[FileSnapshot]) -> Result<(), AppError> { + for snapshot in snapshots { + match &snapshot.content { + Some(content) => { + if let Some(parent) = snapshot.path.parent() { + fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?; + } + atomic_write(&snapshot.path, content)?; + } + None => { + delete_file(&snapshot.path)?; + } + } + } + Ok(()) +} + +fn write_deployment_mode(path: &Path, mode: &str) -> Result<(), AppError> { + let mut value = read_json_or_empty(path)?; + if !value.is_object() { + value = json!({}); + } + if let Some(obj) = value.as_object_mut() { + obj.insert( + "deploymentMode".to_string(), + Value::String(mode.to_string()), + ); + } + write_json_file(path, &value) +} + +fn remove_cc_switch_enterprise_config(path: &Path) -> Result<(), AppError> { + if !path.exists() { + return Ok(()); + } + + let mut value = read_json_or_empty(path)?; + let Some(obj) = value.as_object_mut() else { + return Ok(()); + }; + let Some(enterprise) = obj + .get_mut("enterpriseConfig") + .and_then(Value::as_object_mut) + else { + return Ok(()); + }; + + for key in [ + "disableDeploymentModeChooser", + "inferenceGatewayApiKey", + "inferenceGatewayAuthScheme", + "inferenceGatewayBaseUrl", + "inferenceProvider", + ] { + enterprise.remove(key); + } + + if enterprise.is_empty() { + obj.remove("enterpriseConfig"); + } + + write_json_file(path, &value) +} + +fn write_meta(path: &Path, applied_profile_id: Option<&str>) -> Result<(), AppError> { + let mut value = read_json_or_empty(path)?; + if !value.is_object() { + value = json!({}); + } + + let obj = value.as_object_mut().expect("just normalized to object"); + let mut entries = obj + .get("entries") + .and_then(Value::as_array) + .cloned() + .unwrap_or_default(); + + entries.retain(|entry| entry.get("id").and_then(Value::as_str) != Some(PROFILE_ID)); + + match applied_profile_id { + Some(id) => { + entries.push(json!({ + "id": PROFILE_ID, + "name": PROFILE_NAME + })); + obj.insert("appliedId".to_string(), Value::String(id.to_string())); + } + None => { + let should_clear_applied = obj + .get("appliedId") + .and_then(Value::as_str) + .is_some_and(|id| id == PROFILE_ID); + if should_clear_applied { + if let Some(next_id) = entries + .iter() + .find_map(|entry| entry.get("id").and_then(Value::as_str)) + { + obj.insert("appliedId".to_string(), Value::String(next_id.to_string())); + } else { + obj.remove("appliedId"); + } + } + } + } + + obj.insert("entries".to_string(), Value::Array(entries)); + write_json_file(path, &value) +} + +fn read_applied_id(path: &Path) -> Option { + read_json_or_empty(path).ok().and_then(|value| { + value + .get("appliedId") + .and_then(Value::as_str) + .map(str::to_string) + }) +} + +fn meta_has_profile_entry(path: &Path) -> bool { + read_json_or_empty(path) + .ok() + .and_then(|value| value.get("entries").and_then(Value::as_array).cloned()) + .is_some_and(|entries| { + entries + .iter() + .any(|entry| entry.get("id").and_then(Value::as_str) == Some(PROFILE_ID)) + }) +} + +fn is_supported_platform() -> bool { + cfg!(any(target_os = "macos", windows)) +} + +#[allow(clippy::needless_return)] +fn current_platform_paths() -> Result { + #[cfg(target_os = "macos")] + { + return Ok(macos_paths_from_home(&get_home_dir())); + } + + #[cfg(windows)] + { + let local_app_data = windows_local_app_data_dir(); + return Ok(windows_paths_from_local_app_data(&local_app_data)); + } + + #[cfg(not(any(target_os = "macos", windows)))] + { + Err(unsupported_platform_error()) + } +} + +#[cfg(target_os = "macos")] +fn macos_paths_from_home(home: &Path) -> ClaudeDesktopPaths { + let app_support = home.join("Library").join("Application Support"); + paths_from_dirs(app_support.join("Claude"), app_support.join("Claude-3p")) +} + +#[cfg(windows)] +fn windows_local_app_data_dir() -> PathBuf { + std::env::var_os("LOCALAPPDATA") + .map(PathBuf::from) + .unwrap_or_else(|| get_home_dir().join("AppData").join("Local")) +} + +#[cfg(windows)] +fn windows_paths_from_local_app_data(local_app_data: &Path) -> ClaudeDesktopPaths { + let normal_dir = pick_windows_claude_dir(local_app_data, false) + .unwrap_or_else(|| local_app_data.join("Claude")); + let threep_dir = pick_windows_claude_dir(local_app_data, true) + .unwrap_or_else(|| local_app_data.join("Claude-3p")); + paths_from_dirs(normal_dir, threep_dir) +} + +#[cfg(windows)] +fn pick_windows_claude_dir(local_app_data: &Path, threep: bool) -> Option { + let exact_name = if threep { "Claude-3p" } else { "Claude" }; + let exact = local_app_data.join(exact_name); + if exact.exists() { + return Some(exact); + } + + let mut candidates: Vec = std::fs::read_dir(local_app_data) + .ok()? + .filter_map(Result::ok) + .map(|entry| entry.path()) + .filter(|path| path.is_dir()) + .filter(|path| { + let Some(name) = path.file_name().and_then(|value| value.to_str()) else { + return false; + }; + let starts = name.starts_with("Claude"); + let is_threep = name.contains("-3p"); + starts && is_threep == threep + }) + .collect(); + candidates.sort(); + candidates.into_iter().next() +} + +#[cfg(any(target_os = "macos", windows, test))] +fn paths_from_dirs(normal_dir: PathBuf, threep_dir: PathBuf) -> ClaudeDesktopPaths { + let config_library_path = threep_dir.join(CONFIG_LIBRARY_DIR); + let profile_path = config_library_path.join(format!("{PROFILE_ID}.json")); + let meta_path = config_library_path.join("_meta.json"); + + ClaudeDesktopPaths { + normal_config_path: normal_dir.join(CONFIG_FILE), + threep_config_path: threep_dir.join(CONFIG_FILE), + config_library_path, + profile_path, + meta_path, + } +} + +fn proxy_origin_from_parts(listen_address: &str, listen_port: u16) -> String { + let connect_host = match listen_address { + "0.0.0.0" => "127.0.0.1", + "::" => "::1", + value => value, + }; + let connect_host_for_url = if connect_host.contains(':') && !connect_host.starts_with('[') { + format!("[{connect_host}]") + } else { + connect_host.to_string() + }; + + format!("http://{}:{}", connect_host_for_url, listen_port) +} + +#[cfg(not(any(target_os = "macos", windows)))] +fn unsupported_platform_error() -> AppError { + AppError::localized( + "claude_desktop.unsupported_platform", + "当前平台暂不支持 Claude Desktop 3P 配置。第一阶段仅支持 macOS 和 Windows。", + "Claude Desktop 3P configuration is not supported on this platform yet. Phase 1 only supports macOS and Windows.", + ) +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::database::Database; + use crate::provider::{ClaudeDesktopModelRoute, ProviderMeta}; + use serde_json::json; + use tempfile::TempDir; + + fn test_paths(home: &Path) -> ClaudeDesktopPaths { + paths_from_dirs( + home.join("Library") + .join("Application Support") + .join("Claude"), + home.join("Library") + .join("Application Support") + .join("Claude-3p"), + ) + } + + fn test_db() -> Database { + Database::memory().expect("memory db") + } + + fn direct_provider(id: &str) -> Provider { + let mut provider = Provider::with_id( + id.to_string(), + "Direct".to_string(), + json!({ + "env": { + "ANTHROPIC_BASE_URL": "https://gateway.example.com", + "ANTHROPIC_AUTH_TOKEN": "test-token", + "ANTHROPIC_MODEL": "ignored-by-desktop" + } + }), + Some("https://example.com".to_string()), + ); + provider.meta = Some(ProviderMeta { + api_format: Some("anthropic".to_string()), + ..Default::default() + }); + provider + } + + fn official_provider() -> Provider { + let mut provider = Provider::with_id( + CLAUDE_DESKTOP_OFFICIAL_PROVIDER_ID.to_string(), + "Claude Desktop Official".to_string(), + json!({"env": {}}), + Some("https://claude.ai/download".to_string()), + ); + provider.category = Some("official".to_string()); + provider + } + + fn proxy_provider(id: &str) -> Provider { + let mut provider = direct_provider(id); + provider.name = "Proxy".to_string(); + provider.meta = Some(ProviderMeta { + claude_desktop_mode: Some(ClaudeDesktopMode::Proxy), + api_format: Some("openai_chat".to_string()), + claude_desktop_model_routes: std::collections::HashMap::from([( + "claude-sonnet-4-6".to_string(), + ClaudeDesktopModelRoute { + model: "kimi-k2".to_string(), + display_name: Some("Kimi".to_string()), + supports_1m: Some(true), + }, + )]), + ..Default::default() + }); + provider + } + + fn direct_provider_with_models(id: &str) -> Provider { + let mut provider = direct_provider(id); + provider.meta = Some(ProviderMeta { + claude_desktop_mode: Some(ClaudeDesktopMode::Direct), + api_format: Some("anthropic".to_string()), + claude_desktop_model_routes: std::collections::HashMap::from([( + "claude-deepseek-chat".to_string(), + ClaudeDesktopModelRoute { + model: "claude-deepseek-chat".to_string(), + display_name: Some("DeepSeek".to_string()), + supports_1m: Some(true), + }, + )]), + ..Default::default() + }); + provider + } + + #[test] + fn claude_desktop_apply_writes_3p_profile_and_meta() { + let temp = TempDir::new().expect("tempdir"); + let paths = test_paths(temp.path()); + let provider = direct_provider("direct"); + let db = test_db(); + + apply_provider_to_paths(&db, &provider, &paths).expect("apply provider"); + + let normal: Value = read_json_file(&paths.normal_config_path).expect("read normal config"); + let threep: Value = read_json_file(&paths.threep_config_path).expect("read 3p config"); + let profile: Value = read_json_file(&paths.profile_path).expect("read profile"); + let meta: Value = read_json_file(&paths.meta_path).expect("read meta"); + + assert_eq!(normal["deploymentMode"], json!("3p")); + assert_eq!(threep["deploymentMode"], json!("3p")); + assert_eq!(profile["inferenceProvider"], json!("gateway")); + assert_eq!( + profile["inferenceGatewayBaseUrl"], + json!("https://gateway.example.com") + ); + assert_eq!(profile["inferenceGatewayApiKey"], json!("test-token")); + assert_eq!(profile["inferenceGatewayAuthScheme"], json!("bearer")); + assert_eq!(profile["disableDeploymentModeChooser"], json!(true)); + assert!(profile.get("inferenceModels").is_none()); + assert_eq!(meta["appliedId"], json!(PROFILE_ID)); + assert!(meta["entries"] + .as_array() + .expect("entries") + .iter() + .any(|entry| entry["id"] == json!(PROFILE_ID) && entry["name"] == json!(PROFILE_NAME))); + } + + #[test] + fn claude_desktop_direct_can_write_optional_safe_model_ids() { + let temp = TempDir::new().expect("tempdir"); + let paths = test_paths(temp.path()); + let provider = direct_provider_with_models("direct-models"); + let db = test_db(); + + apply_provider_to_paths(&db, &provider, &paths).expect("apply provider"); + + let profile: Value = read_json_file(&paths.profile_path).expect("read profile"); + assert_eq!( + profile["inferenceGatewayBaseUrl"], + json!("https://gateway.example.com") + ); + assert_eq!( + profile["inferenceModels"], + json!(["claude-deepseek-chat [1M]"]) + ); + } + + #[test] + fn claude_desktop_proxy_apply_writes_local_gateway_profile_with_safe_models() { + let temp = TempDir::new().expect("tempdir"); + let paths = test_paths(temp.path()); + let provider = proxy_provider("proxy"); + let db = test_db(); + + apply_provider_to_paths(&db, &provider, &paths).expect("apply proxy provider"); + + let profile: Value = read_json_file(&paths.profile_path).expect("read profile"); + assert_eq!( + profile["inferenceGatewayBaseUrl"], + json!("http://127.0.0.1:15721/claude-desktop") + ); + assert_eq!(profile["inferenceGatewayAuthScheme"], json!("bearer")); + assert_ne!(profile["inferenceGatewayApiKey"], json!("test-token")); + assert!(profile["inferenceGatewayApiKey"] + .as_str() + .expect("gateway token") + .starts_with("ccs-")); + assert_eq!( + profile["inferenceModels"], + json!(["claude-sonnet-4-6 [1M]"]) + ); + assert!(!profile.to_string().contains("kimi-k2")); + } + + #[test] + fn claude_desktop_proxy_maps_known_route_and_rejects_unknown_route() { + let provider = proxy_provider("proxy"); + + let mapped = map_proxy_request_model( + json!({"model": "claude-sonnet-4-6 [1M]", "messages": []}), + &provider, + ) + .expect("map route"); + assert_eq!(mapped["model"], json!("kimi-k2 [1M]")); + + let models = model_list_response(&provider).expect("model list"); + assert_eq!(models["data"][0]["id"], json!("claude-sonnet-4-6 [1M]")); + + let err = map_proxy_request_model(json!({"model": "claude-opus-4-7"}), &provider) + .expect_err("unknown route should fail"); + assert!(err.to_string().contains("claude-opus-4-7")); + } + + #[test] + fn claude_desktop_proxy_maps_route_without_1m_suffix() { + let provider = proxy_provider("proxy"); + + let mapped = map_proxy_request_model( + json!({"model": "claude-sonnet-4-6", "messages": []}), + &provider, + ) + .expect("base name should fallback-match the [1M] route"); + assert_eq!(mapped["model"], json!("kimi-k2 [1M]")); + } + + #[test] + fn claude_desktop_one_m_suffix_normalization_is_case_and_space_tolerant() { + assert!(is_claude_safe_model_id("claude-sonnet-4-6 [1m]")); + assert!(is_claude_safe_model_id(" claude-sonnet-4-6 [1M] ")); + assert_eq!( + strip_one_m_context_suffix(" claude-sonnet-4-6 [1m] "), + "claude-sonnet-4-6" + ); + assert_eq!( + desktop_model_id(" claude-sonnet-4-6 [1m] ", true), + "claude-sonnet-4-6 [1M]" + ); + } + + #[test] + fn claude_desktop_apply_rolls_back_when_profile_write_fails() { + let temp = TempDir::new().expect("tempdir"); + let paths = test_paths(temp.path()); + let provider = direct_provider("direct"); + let db = test_db(); + + write_json_file( + &paths.normal_config_path, + &json!({"deploymentMode": "1p", "normal": true}), + ) + .expect("write normal"); + write_json_file( + &paths.threep_config_path, + &json!({"deploymentMode": "1p", "threep": true}), + ) + .expect("write 3p"); + fs::write(&paths.config_library_path, "not a directory").expect("block profile parent"); + + apply_provider_to_paths(&db, &provider, &paths).expect_err("apply should fail"); + + let normal: Value = read_json_file(&paths.normal_config_path).expect("read normal config"); + let threep: Value = read_json_file(&paths.threep_config_path).expect("read 3p config"); + + assert_eq!(normal, json!({"deploymentMode": "1p", "normal": true})); + assert_eq!(threep, json!({"deploymentMode": "1p", "threep": true})); + assert!(!paths.profile_path.exists()); + } + + #[test] + fn claude_desktop_write_meta_recovers_non_object_meta_file() { + let temp = TempDir::new().expect("tempdir"); + let paths = test_paths(temp.path()); + if let Some(parent) = paths.meta_path.parent() { + fs::create_dir_all(parent).expect("create parent"); + } + fs::write(&paths.meta_path, "[]").expect("write invalid meta shape"); + + write_meta(&paths.meta_path, Some(PROFILE_ID)).expect("write meta"); + + let meta: Value = read_json_file(&paths.meta_path).expect("read meta"); + assert_eq!(meta["appliedId"], json!(PROFILE_ID)); + assert!(meta["entries"].as_array().is_some()); + } + + #[test] + fn claude_desktop_restore_switches_to_1p_and_removes_cc_switch_profile() { + let temp = TempDir::new().expect("tempdir"); + let paths = test_paths(temp.path()); + let provider = direct_provider("direct"); + let db = test_db(); + + apply_provider_to_paths(&db, &provider, &paths).expect("apply provider"); + restore_official_at_paths(&paths).expect("restore official"); + + let normal: Value = read_json_file(&paths.normal_config_path).expect("read normal config"); + let threep: Value = read_json_file(&paths.threep_config_path).expect("read 3p config"); + let meta: Value = read_json_file(&paths.meta_path).expect("read meta"); + + assert_eq!(normal["deploymentMode"], json!("1p")); + assert_eq!(threep["deploymentMode"], json!("1p")); + assert!(!paths.profile_path.exists()); + assert!(meta.get("appliedId").is_none()); + assert!(!meta["entries"] + .as_array() + .expect("entries") + .iter() + .any(|entry| entry["id"] == json!(PROFILE_ID))); + } + + #[test] + fn claude_desktop_official_provider_restores_1p_mode() { + let temp = TempDir::new().expect("tempdir"); + let paths = test_paths(temp.path()); + let direct = direct_provider("direct"); + let db = test_db(); + + apply_provider_to_paths(&db, &direct, &paths).expect("apply direct provider"); + apply_provider_to_paths(&db, &official_provider(), &paths) + .expect("restore official provider"); + + let normal: Value = read_json_file(&paths.normal_config_path).expect("read normal config"); + let threep: Value = read_json_file(&paths.threep_config_path).expect("read 3p config"); + let meta: Value = read_json_file(&paths.meta_path).expect("read meta"); + + assert_eq!(normal["deploymentMode"], json!("1p")); + assert_eq!(threep["deploymentMode"], json!("1p")); + assert!(!paths.profile_path.exists()); + assert!(meta.get("appliedId").is_none()); + } + + #[test] + fn claude_desktop_compatibility_filters_non_direct_providers() { + let direct = direct_provider("direct"); + assert!(is_compatible_direct_provider(&direct)); + + let claude_official = Provider::with_id( + "claude-official".to_string(), + "Claude Official".to_string(), + json!({"env": {}}), + Some("https://www.anthropic.com/claude-code".to_string()), + ); + assert!(!is_compatible_direct_provider(&claude_official)); + + let mut openai_format = direct_provider("openai"); + openai_format.meta = Some(ProviderMeta { + api_format: Some("openai_chat".to_string()), + ..Default::default() + }); + assert!(!is_compatible_direct_provider(&openai_format)); + + let mut copilot = direct_provider("copilot"); + copilot.meta = Some(ProviderMeta { + provider_type: Some("github_copilot".to_string()), + ..Default::default() + }); + assert!(!is_compatible_direct_provider(&copilot)); + + let mut full_url = direct_provider("full_url"); + full_url.meta = Some(ProviderMeta { + is_full_url: Some(true), + ..Default::default() + }); + assert!(!is_compatible_direct_provider(&full_url)); + + let missing_bearer = Provider::with_id( + "x-api-key".to_string(), + "x-api-key".to_string(), + json!({ + "env": { + "ANTHROPIC_BASE_URL": "https://gateway.example.com", + "ANTHROPIC_API_KEY": "sk-ant" + } + }), + None, + ); + assert!(!is_compatible_direct_provider(&missing_bearer)); + } +} diff --git a/src-tauri/src/codex_config.rs b/src-tauri/src/codex_config.rs index 98f6d06a0..af02c1b3c 100644 --- a/src-tauri/src/codex_config.rs +++ b/src-tauri/src/codex_config.rs @@ -11,6 +11,20 @@ use std::fs; use std::path::Path; use toml_edit::DocumentMut; +pub const CC_SWITCH_CODEX_MODEL_PROVIDER_ID: &str = "ccswitch"; + +/// Reserved built-in provider IDs from OpenAI Codex's config/model-provider +/// catalog. Keep in sync with Codex `RESERVED_MODEL_PROVIDER_IDS` and legacy +/// removed provider aliases. +const CODEX_RESERVED_MODEL_PROVIDER_IDS: &[&str] = &[ + "amazon-bedrock", + "openai", + "ollama", + "lmstudio", + "oss", + "ollama-chat", +]; + /// 获取 Codex 配置目录路径 pub fn get_codex_config_dir() -> PathBuf { if let Some(custom) = crate::settings::get_codex_override_dir() { @@ -137,6 +151,268 @@ pub fn read_and_validate_codex_config_text() -> Result { Ok(s) } +fn active_codex_model_provider_id(doc: &DocumentMut) -> Option { + doc.get("model_provider") + .and_then(|item| item.as_str()) + .map(str::trim) + .filter(|id| !id.is_empty()) + .map(str::to_string) +} + +fn is_custom_codex_model_provider_id(id: &str) -> bool { + let id = id.trim(); + !id.is_empty() + && !CODEX_RESERVED_MODEL_PROVIDER_IDS + .iter() + .any(|reserved| reserved.eq_ignore_ascii_case(id)) +} + +fn stable_codex_model_provider_id_from_config(config_text: &str) -> Option { + let doc = config_text.parse::().ok()?; + let provider_id = active_codex_model_provider_id(&doc)?; + + if is_custom_codex_model_provider_id(&provider_id) { + Some(provider_id) + } else { + None + } +} + +fn codex_model_provider_id_with_table_from_config( + config_text: &str, +) -> Result, AppError> { + if config_text.trim().is_empty() { + return Ok(None); + } + + let doc = config_text + .parse::() + .map_err(|e| AppError::Message(format!("Invalid Codex config.toml: {e}")))?; + let Some(provider_id) = active_codex_model_provider_id(&doc) else { + return Ok(None); + }; + + let has_provider_table = doc + .get("model_providers") + .and_then(|item| item.as_table()) + .and_then(|table| table.get(provider_id.as_str())) + .is_some(); + + Ok(has_provider_table.then_some(provider_id)) +} + +fn normalize_codex_live_config_model_provider_with_anchors<'a>( + config_text: &str, + anchor_config_texts: impl IntoIterator, +) -> Result { + if config_text.trim().is_empty() { + return Ok(config_text.to_string()); + } + + let mut doc = config_text + .parse::() + .map_err(|e| AppError::Message(format!("Invalid Codex config.toml: {e}")))?; + + let Some(source_provider_id) = active_codex_model_provider_id(&doc) else { + return Ok(config_text.to_string()); + }; + + let has_source_provider_table = doc + .get("model_providers") + .and_then(|item| item.as_table()) + .and_then(|table| table.get(source_provider_id.as_str())) + .is_some(); + if !has_source_provider_table { + return Ok(config_text.to_string()); + } + + let stable_provider_id = anchor_config_texts + .into_iter() + .find_map(stable_codex_model_provider_id_from_config) + .or_else(|| { + is_custom_codex_model_provider_id(&source_provider_id) + .then(|| source_provider_id.clone()) + }) + .unwrap_or_else(|| CC_SWITCH_CODEX_MODEL_PROVIDER_ID.to_string()); + + if stable_provider_id == source_provider_id { + return Ok(config_text.to_string()); + } + + if let Some(model_providers) = doc + .get_mut("model_providers") + .and_then(|item| item.as_table_mut()) + { + let Some(provider_table) = model_providers.remove(source_provider_id.as_str()) else { + return Ok(config_text.to_string()); + }; + model_providers[stable_provider_id.as_str()] = provider_table; + } + + rewrite_codex_profile_model_provider_refs(&mut doc, &source_provider_id, &stable_provider_id); + doc["model_provider"] = toml_edit::value(stable_provider_id.as_str()); + + Ok(doc.to_string()) +} + +fn rewrite_codex_profile_model_provider_refs( + doc: &mut DocumentMut, + source_provider_id: &str, + stable_provider_id: &str, +) { + let Some(profiles) = doc + .get_mut("profiles") + .and_then(|item| item.as_table_like_mut()) + else { + return; + }; + + let profile_keys: Vec = profiles.iter().map(|(key, _)| key.to_string()).collect(); + for profile_key in profile_keys { + let Some(profile_table) = profiles + .get_mut(&profile_key) + .and_then(|item| item.as_table_like_mut()) + else { + continue; + }; + + let references_source = profile_table + .get("model_provider") + .and_then(|item| item.as_str()) + == Some(source_provider_id); + if references_source { + profile_table.insert("model_provider", toml_edit::value(stable_provider_id)); + } + } +} + +/// Keep Codex's active `model_provider` stable across CC Switch provider changes. +/// +/// Codex stores and filters resume history by `model_provider`, so switching between +/// provider-specific ids like `rightcode` and `aihubmix` makes history appear to move. +/// We preserve an existing custom provider id when possible and only rewrite the +/// live config text that Codex sees at provider-driven write boundaries. +pub fn normalize_codex_settings_config_model_provider( + settings: &mut Value, + anchor_config_text: Option<&str>, +) -> Result<(), AppError> { + let Some(config_text) = settings + .get("config") + .and_then(|value| value.as_str()) + .map(str::to_string) + else { + return Ok(()); + }; + + let current_config_text = read_codex_config_text().ok(); + let anchors = anchor_config_text + .into_iter() + .chain(current_config_text.as_deref()); + let normalized = + normalize_codex_live_config_model_provider_with_anchors(&config_text, anchors)?; + + if let Some(obj) = settings.as_object_mut() { + obj.insert("config".to_string(), Value::String(normalized)); + } + + Ok(()) +} + +fn restore_codex_backfill_model_provider_id( + config_text: &str, + template_config_text: &str, +) -> Result { + let Some(template_provider_id) = + codex_model_provider_id_with_table_from_config(template_config_text)? + else { + return Ok(config_text.to_string()); + }; + + if config_text.trim().is_empty() { + return Ok(config_text.to_string()); + } + + let mut doc = config_text + .parse::() + .map_err(|e| AppError::Message(format!("Invalid Codex config.toml: {e}")))?; + let Some(live_provider_id) = active_codex_model_provider_id(&doc) else { + return Ok(config_text.to_string()); + }; + + if live_provider_id == template_provider_id { + return Ok(config_text.to_string()); + } + + if let Some(model_providers) = doc + .get_mut("model_providers") + .and_then(|item| item.as_table_mut()) + { + let Some(provider_table) = model_providers.remove(live_provider_id.as_str()) else { + return Ok(config_text.to_string()); + }; + model_providers[template_provider_id.as_str()] = provider_table; + } else { + return Ok(config_text.to_string()); + } + + rewrite_codex_profile_model_provider_refs(&mut doc, &live_provider_id, &template_provider_id); + doc["model_provider"] = toml_edit::value(template_provider_id.as_str()); + + Ok(doc.to_string()) +} + +/// Convert a Codex live config that was normalized for history stability back +/// to the provider-specific id used by the stored provider template. +pub fn restore_codex_settings_config_model_provider_for_backfill( + settings: &mut Value, + template_settings: &Value, +) -> Result<(), AppError> { + let Some(config_text) = settings + .get("config") + .and_then(|value| value.as_str()) + .map(str::to_string) + else { + return Ok(()); + }; + let Some(template_config_text) = template_settings + .get("config") + .and_then(|value| value.as_str()) + else { + return Ok(()); + }; + + let restored = restore_codex_backfill_model_provider_id(&config_text, template_config_text)?; + if let Some(obj) = settings.as_object_mut() { + obj.insert("config".to_string(), Value::String(restored)); + } + + Ok(()) +} + +/// Atomically write Codex live config after normalizing provider-specific ids. +/// +/// Use this for provider-driven live writes. Keep `write_codex_live_atomic` available +/// for exact restore/backup paths that must preserve the config text byte-for-byte. +pub fn write_codex_live_atomic_with_stable_provider( + auth: &Value, + config_text_opt: Option<&str>, +) -> Result<(), AppError> { + match config_text_opt { + Some(config_text) => { + let mut settings = serde_json::Map::new(); + settings.insert("config".to_string(), Value::String(config_text.to_string())); + let mut settings = Value::Object(settings); + normalize_codex_settings_config_model_provider(&mut settings, None)?; + let config_text = settings + .get("config") + .and_then(|value| value.as_str()) + .unwrap_or(config_text); + write_codex_live_atomic(auth, Some(config_text)) + } + None => write_codex_live_atomic(auth, None), + } +} + /// Update a field in Codex config.toml using toml_edit (syntax-preserving). /// /// Supported fields: @@ -254,6 +530,241 @@ pub fn remove_codex_toml_base_url_if(toml_str: &str, predicate: impl Fn(&str) -> mod tests { use super::*; + #[test] + fn normalize_live_config_preserves_current_custom_model_provider_id() { + let current = r#"model_provider = "rightcode" + +[model_providers.rightcode] +name = "RightCode" +base_url = "https://rightcode.example/v1" +wire_api = "responses" +"#; + let target = r#"model_provider = "aihubmix" +model = "gpt-5.4" + +[model_providers.aihubmix] +name = "AiHubMix" +base_url = "https://aihubmix.example/v1" +wire_api = "responses" +requires_openai_auth = true + +[mcp_servers.context7] +command = "npx" +"#; + + let result = + normalize_codex_live_config_model_provider_with_anchors(target, Some(current)).unwrap(); + let parsed: toml::Value = toml::from_str(&result).unwrap(); + + assert_eq!( + parsed.get("model_provider").and_then(|v| v.as_str()), + Some("rightcode") + ); + + let model_providers = parsed + .get("model_providers") + .and_then(|v| v.as_table()) + .expect("model_providers should exist"); + assert!( + model_providers.get("aihubmix").is_none(), + "source provider id should not remain in live config" + ); + + let stable_provider = model_providers + .get("rightcode") + .expect("stable provider table should exist"); + assert_eq!( + stable_provider.get("base_url").and_then(|v| v.as_str()), + Some("https://aihubmix.example/v1") + ); + assert!( + parsed.get("mcp_servers").is_some(), + "unrelated config should be preserved" + ); + } + + #[test] + fn normalize_live_config_uses_target_custom_provider_when_current_is_reserved() { + let current = r#"model_provider = "openai""#; + let target = r#"model_provider = "aihubmix" + +[model_providers.aihubmix] +name = "AiHubMix" +base_url = "https://aihubmix.example/v1" +wire_api = "responses" +"#; + + let result = + normalize_codex_live_config_model_provider_with_anchors(target, Some(current)).unwrap(); + let parsed: toml::Value = toml::from_str(&result).unwrap(); + + assert_eq!( + parsed.get("model_provider").and_then(|v| v.as_str()), + Some("aihubmix") + ); + assert!( + parsed + .get("model_providers") + .and_then(|v| v.get("aihubmix")) + .is_some(), + "target provider id should be kept when there is no reusable live custom id" + ); + } + + #[test] + fn normalize_live_config_leaves_official_empty_config_unchanged() { + let current = r#"model_provider = "rightcode" + +[model_providers.rightcode] +base_url = "https://rightcode.example/v1" +"#; + + let result = + normalize_codex_live_config_model_provider_with_anchors("", Some(current)).unwrap(); + + assert_eq!(result, ""); + } + + #[test] + fn normalize_live_config_rewrites_matching_profile_model_provider_refs() { + let current = r#"model_provider = "session_anchor" + +[model_providers.session_anchor] +name = "Session Anchor" +base_url = "https://anchor.example/v1" +wire_api = "responses" +"#; + let target = r#"model_provider = "vendor_alpha" +model = "gpt-5.4" +profile = "work" + +[model_providers.vendor_alpha] +name = "Vendor Alpha" +base_url = "https://alpha.example/v1" +wire_api = "responses" + +[profiles.work] +model_provider = "vendor_alpha" +model = "gpt-5.4" +"#; + + let result = + normalize_codex_live_config_model_provider_with_anchors(target, Some(current)).unwrap(); + let parsed: toml::Value = toml::from_str(&result).unwrap(); + + assert_eq!( + parsed.get("model_provider").and_then(|v| v.as_str()), + Some("session_anchor") + ); + assert_eq!( + parsed + .get("profiles") + .and_then(|v| v.get("work")) + .and_then(|v| v.get("model_provider")) + .and_then(|v| v.as_str()), + Some("session_anchor"), + "profile override matching the rewritten provider should stay valid" + ); + } + + #[test] + fn normalize_live_config_keeps_unrelated_profile_model_provider_refs() { + let current = r#"model_provider = "session_anchor" + +[model_providers.session_anchor] +name = "Session Anchor" +base_url = "https://anchor.example/v1" +wire_api = "responses" +"#; + let target = r#"model_provider = "vendor_alpha" +model = "gpt-5.4" + +[model_providers.vendor_alpha] +name = "Vendor Alpha" +base_url = "https://alpha.example/v1" +wire_api = "responses" + +[model_providers.local_profile] +name = "Local Profile" +base_url = "http://localhost:11434/v1" +wire_api = "responses" + +[profiles.local] +model_provider = "local_profile" +model = "local-model" +"#; + + let result = + normalize_codex_live_config_model_provider_with_anchors(target, Some(current)).unwrap(); + let parsed: toml::Value = toml::from_str(&result).unwrap(); + + assert_eq!( + parsed + .get("profiles") + .and_then(|v| v.get("local")) + .and_then(|v| v.get("model_provider")) + .and_then(|v| v.as_str()), + Some("local_profile"), + "unrelated profile provider references should be preserved" + ); + assert!( + parsed + .get("model_providers") + .and_then(|v| v.get("local_profile")) + .is_some(), + "unrelated provider tables should also remain available" + ); + } + + #[test] + fn normalize_live_config_keeps_stable_provider_across_repeated_switches() { + let anchor = r#"model_provider = "session_anchor" + +[model_providers.session_anchor] +name = "Session Anchor" +base_url = "https://anchor.example/v1" +wire_api = "responses" +"#; + let first_target = r#"model_provider = "vendor_alpha" + +[model_providers.vendor_alpha] +name = "Vendor Alpha" +base_url = "https://alpha.example/v1" +wire_api = "responses" +"#; + let second_target = r#"model_provider = "vendor_beta" + +[model_providers.vendor_beta] +name = "Vendor Beta" +base_url = "https://beta.example/v1" +wire_api = "responses" +"#; + + let first = + normalize_codex_live_config_model_provider_with_anchors(first_target, Some(anchor)) + .unwrap(); + let second = normalize_codex_live_config_model_provider_with_anchors( + second_target, + Some(first.as_str()), + ) + .unwrap(); + let parsed: toml::Value = toml::from_str(&second).unwrap(); + + assert_eq!( + parsed.get("model_provider").and_then(|v| v.as_str()), + Some("session_anchor"), + "stable provider id should not drift across repeated switches" + ); + assert_eq!( + parsed + .get("model_providers") + .and_then(|v| v.get("session_anchor")) + .and_then(|v| v.get("base_url")) + .and_then(|v| v.as_str()), + Some("https://beta.example/v1") + ); + } + #[test] fn base_url_writes_into_correct_model_provider_section() { let input = r#"model_provider = "any" diff --git a/src-tauri/src/commands/config.rs b/src-tauri/src/commands/config.rs index 60c0f1c79..05f6875ea 100644 --- a/src-tauri/src/commands/config.rs +++ b/src-tauri/src/commands/config.rs @@ -1,6 +1,6 @@ #![allow(non_snake_case)] -use tauri::AppHandle; +use tauri::{AppHandle, State}; use tauri_plugin_dialog::DialogExt; use tauri_plugin_opener::OpenerExt; @@ -8,6 +8,7 @@ use crate::app_config::AppType; use crate::codex_config; use crate::config::{self, get_claude_settings_path, ConfigStatus}; use crate::settings; +use crate::store::AppState; #[tauri::command] pub async fn get_claude_config_status() -> Result { @@ -62,9 +63,23 @@ fn validate_common_config_snippet(app_type: &str, snippet: &str) -> Result<(), S } #[tauri::command] -pub async fn get_config_status(app: String) -> Result { +pub async fn get_config_status( + state: State<'_, AppState>, + app: String, +) -> Result { match AppType::from_str(&app).map_err(|e| e.to_string())? { AppType::Claude => Ok(config::get_claude_config_status()), + AppType::ClaudeDesktop => { + let status = crate::claude_desktop_config::get_status( + state.db.as_ref(), + state.proxy_service.is_running().await, + ) + .map_err(|e| e.to_string())?; + Ok(ConfigStatus { + exists: status.configured, + path: status.config_library_path.unwrap_or_default(), + }) + } AppType::Codex => { let auth_path = codex_config::get_codex_auth_path(); let exists = auth_path.exists(); @@ -101,6 +116,15 @@ pub async fn get_config_status(app: String) -> Result { Ok(ConfigStatus { exists, path }) } + AppType::Hermes => { + let config_path = crate::hermes_config::get_hermes_config_path(); + let exists = config_path.exists(); + let path = crate::hermes_config::get_hermes_dir() + .to_string_lossy() + .to_string(); + + Ok(ConfigStatus { exists, path }) + } } } @@ -113,10 +137,14 @@ pub async fn get_claude_code_config_path() -> Result { pub async fn get_config_dir(app: String) -> Result { let dir = match AppType::from_str(&app).map_err(|e| e.to_string())? { AppType::Claude => config::get_claude_config_dir(), + AppType::ClaudeDesktop => { + crate::claude_desktop_config::get_config_library_path().map_err(|e| e.to_string())? + } AppType::Codex => codex_config::get_codex_config_dir(), AppType::Gemini => crate::gemini_config::get_gemini_dir(), AppType::OpenCode => crate::opencode_config::get_opencode_dir(), AppType::OpenClaw => crate::openclaw_config::get_openclaw_dir(), + AppType::Hermes => crate::hermes_config::get_hermes_dir(), }; Ok(dir.to_string_lossy().to_string()) @@ -126,10 +154,14 @@ pub async fn get_config_dir(app: String) -> Result { pub async fn open_config_folder(handle: AppHandle, app: String) -> Result { let config_dir = match AppType::from_str(&app).map_err(|e| e.to_string())? { AppType::Claude => config::get_claude_config_dir(), + AppType::ClaudeDesktop => { + crate::claude_desktop_config::get_config_library_path().map_err(|e| e.to_string())? + } AppType::Codex => codex_config::get_codex_config_dir(), AppType::Gemini => crate::gemini_config::get_gemini_dir(), AppType::OpenCode => crate::opencode_config::get_opencode_dir(), AppType::OpenClaw => crate::openclaw_config::get_openclaw_dir(), + AppType::Hermes => crate::hermes_config::get_hermes_dir(), }; if !config_dir.exists() { diff --git a/src-tauri/src/commands/failover.rs b/src-tauri/src/commands/failover.rs index d0aad3900..e4e48ddc1 100644 --- a/src-tauri/src/commands/failover.rs +++ b/src-tauri/src/commands/failover.rs @@ -162,7 +162,7 @@ pub async fn set_auto_failover_enabled( // 刷新托盘菜单，确保状态同步 if let Ok(new_menu) = crate::tray::create_tray_menu(&app, &state) { - if let Some(tray) = app.tray_by_id("main") { + if let Some(tray) = app.tray_by_id(crate::tray::TRAY_ID) { let _ = tray.set_menu(Some(new_menu)); } } diff --git a/src-tauri/src/commands/hermes.rs b/src-tauri/src/commands/hermes.rs new file mode 100644 index 000000000..4c7809cc3 --- /dev/null +++ b/src-tauri/src/commands/hermes.rs @@ -0,0 +1,143 @@ +use std::time::Duration; +use tauri::{AppHandle, State}; +use tauri_plugin_opener::OpenerExt; + +use crate::hermes_config; +use crate::store::AppState; + +/// Error string returned when `open_hermes_web_ui` cannot reach the Hermes +/// FastAPI server. Kept in sync with the `HERMES_WEB_OFFLINE_ERROR` constant +/// in `src/hooks/useHermes.ts` so the frontend can branch on it. +const HERMES_WEB_OFFLINE_ERROR: &str = "hermes_web_offline"; + +// ============================================================================ +// Hermes Provider Commands +// ============================================================================ + +/// Import providers from Hermes live config to database. +/// +/// Hermes uses additive mode — users may already have providers +/// configured in config.yaml. +#[tauri::command] +pub fn import_hermes_providers_from_live(state: State<'_, AppState>) -> Result { + crate::services::provider::import_hermes_providers_from_live(state.inner()) + .map_err(|e| e.to_string()) +} + +/// Get provider names in the Hermes live config. +#[tauri::command] +pub fn get_hermes_live_provider_ids() -> Result, String> { + hermes_config::get_providers() + .map(|providers| providers.keys().cloned().collect()) + .map_err(|e| e.to_string()) +} + +/// Get a single Hermes provider fragment from live config. +#[tauri::command] +pub fn get_hermes_live_provider( + #[allow(non_snake_case)] providerId: String, +) -> Result, String> { + hermes_config::get_provider(&providerId).map_err(|e| e.to_string()) +} + +// ============================================================================ +// Model Configuration Commands +// ============================================================================ + +/// Get Hermes model config (model section of config.yaml). Read-only — writes +/// happen implicitly through `apply_switch_defaults` when switching providers. +#[tauri::command] +pub fn get_hermes_model_config() -> Result, String> { + hermes_config::get_model_config().map_err(|e| e.to_string()) +} + +// ============================================================================ +// Memory Files Commands +// ============================================================================ + +#[tauri::command] +pub fn get_hermes_memory(kind: hermes_config::MemoryKind) -> Result { + hermes_config::read_memory(kind).map_err(|e| e.to_string()) +} + +#[tauri::command] +pub fn set_hermes_memory(kind: hermes_config::MemoryKind, content: String) -> Result<(), String> { + hermes_config::write_memory(kind, &content).map_err(|e| e.to_string()) +} + +#[tauri::command] +pub fn get_hermes_memory_limits() -> Result { + hermes_config::read_memory_limits().map_err(|e| e.to_string()) +} + +#[tauri::command] +pub fn set_hermes_memory_enabled( + kind: hermes_config::MemoryKind, + enabled: bool, +) -> Result { + hermes_config::set_memory_enabled(kind, enabled).map_err(|e| e.to_string()) +} + +// ============================================================================ +// Hermes Web UI launcher +// ============================================================================ + +/// Probe the local Hermes Web UI (FastAPI) and open it in the system browser. +/// +/// Port discovery priority: +/// 1. `HERMES_WEB_PORT` environment variable +/// 2. Default 9119 +/// +/// Hermes wraps all `/api/*` routes in a Bearer-token middleware, so a GET +/// against `/api/status` returning **either 200 or 401** confirms the server +/// is live. The session token lives only in the Hermes process memory and is +/// injected into the returned HTML via `window.__HERMES_SESSION_TOKEN__`, so +/// there is no need (and no way) for CC Switch to inject it — we just open +/// the URL and let Hermes handle auth. +#[tauri::command] +pub async fn open_hermes_web_ui(app: AppHandle, path: Option) -> Result<(), String> { + let port = std::env::var("HERMES_WEB_PORT") + .ok() + .and_then(|raw| raw.trim().parse::().ok()) + .unwrap_or(9119); + + let base = format!("http://127.0.0.1:{port}"); + + // Probe /api/status with a short timeout. Hermes returns 200 when open or + // 401 when the session token is required — either way the server is live. + // Only a connection error / timeout means the server isn't running. + let probe_url = format!("{base}/api/status"); + let client = reqwest::Client::builder() + .timeout(Duration::from_millis(1200)) + .no_proxy() + .build() + .map_err(|e| format!("failed to build probe client: {e}"))?; + + match client.get(&probe_url).send().await { + Ok(_) => {} + Err(_) => return Err(HERMES_WEB_OFFLINE_ERROR.to_string()), + } + + let target = match path.as_deref() { + Some(p) if p.starts_with('/') => format!("{base}{p}"), + Some(p) if !p.is_empty() => format!("{base}/{p}"), + _ => format!("{base}/"), + }; + + app.opener() + .open_url(&target, None::) + .map_err(|e| format!("failed to open Hermes Web UI: {e}")) +} + +/// Open the preferred terminal and run `hermes dashboard`. Non-blocking — +/// callers should reinvoke `open_hermes_web_ui` once the server is ready, +/// since Hermes startup can take several seconds and may fail outright if +/// the `hermes-agent[web]` extras are missing. +#[tauri::command] +pub async fn launch_hermes_dashboard() -> Result<(), String> { + tokio::task::spawn_blocking(|| { + crate::commands::misc::launch_terminal_running("hermes dashboard", "hermes_dashboard") + }) + .await + .map_err(|e| format!("launch task join error: {e}"))? +} diff --git a/src-tauri/src/commands/mcp.rs b/src-tauri/src/commands/mcp.rs index 8963584c8..5d2558e91 100644 --- a/src-tauri/src/commands/mcp.rs +++ b/src-tauri/src/commands/mcp.rs @@ -202,5 +202,6 @@ pub async fn import_mcp_from_apps(state: State<'_, AppState>) -> Result (Option, Option) { #[cfg(not(target_os = "windows"))] let output = { - Command::new("sh") - .arg("-c") + let shell = std::env::var("SHELL") + .ok() + .filter(|s| is_valid_shell(s)) + .unwrap_or_else(|| "sh".to_string()); + let flag = default_flag_for_shell(&shell); + Command::new(shell) + .arg(flag) .arg(format!("{tool} --version")) .output() }; @@ -345,7 +350,6 @@ fn is_valid_wsl_distro_name(name: &str) -> bool { } /// Validate that the given shell name is one of the allowed shells. -#[cfg(target_os = "windows")] fn is_valid_shell(shell: &str) -> bool { matches!( shell.rsplit('/').next().unwrap_or(shell), @@ -360,7 +364,6 @@ fn is_valid_shell_flag(flag: &str) -> bool { } /// Return the default invocation flag for the given shell. -#[cfg(target_os = "windows")] fn default_flag_for_shell(shell: &str) -> &'static str { match shell.rsplit('/').next().unwrap_or(shell) { "dash" | "sh" => "-c", @@ -781,7 +784,7 @@ fn extract_env_vars_from_config( // 处理 base_url: 根据应用类型添加对应的环境变量 let base_url_key = match app_type { - AppType::Claude => Some("ANTHROPIC_BASE_URL"), + AppType::Claude | AppType::ClaudeDesktop => Some("ANTHROPIC_BASE_URL"), AppType::Gemini => Some("GOOGLE_GEMINI_BASE_URL"), _ => None, }; @@ -944,6 +947,7 @@ exec bash --norc --noprofile // Note: Kitty doesn't need the -e flag, others do let result = match terminal { "iterm2" => launch_macos_iterm2(&script_file), + "warp" => launch_macos_warp(&script_file), "alacritty" => launch_macos_open_app("Alacritty", &script_file, true), "kitty" => launch_macos_open_app("kitty", &script_file, false), "ghostty" => launch_macos_open_app("Ghostty", &script_file, true), @@ -998,21 +1002,46 @@ end tell"#, /// macOS: iTerm2 #[cfg(target_os = "macos")] -fn launch_macos_iterm2(script_file: &std::path::Path) -> Result<(), String> { - use std::process::Command; - - let applescript = format!( - r#"tell application "iTerm" - activate - tell current window - create tab with default profile - tell current session - write text "bash '{}'" - end tell +fn build_macos_iterm2_applescript(script_file: &std::path::Path) -> String { + format!( + r#"set launcher_script to "bash '{}'" +set was_running to application "iTerm" is running +tell application "iTerm" + if was_running then + activate + if (count of windows) = 0 then + create window with default profile + else + tell current window + create tab with default profile + end tell + end if + else + activate + set waited to 0 + repeat while (count of windows) = 0 + delay 0.1 + set waited to waited + 1 + if waited >= 30 then exit repeat + end repeat + if (count of windows) = 0 then + create window with default profile + end if + end if + tell current session of current window + write text launcher_script end tell end tell"#, script_file.display() - ); + ) +} + +/// macOS: iTerm2 +#[cfg(target_os = "macos")] +fn launch_macos_iterm2(script_file: &std::path::Path) -> Result<(), String> { + use std::process::Command; + + let applescript = build_macos_iterm2_applescript(script_file); let output = Command::new("osascript") .arg("-e") @@ -1066,6 +1095,57 @@ fn launch_macos_open_app( Ok(()) } +#[cfg(target_os = "macos")] +fn launch_macos_warp(script_file: &std::path::Path) -> Result<(), String> { + use std::io::Write; + use std::os::unix::fs::PermissionsExt; + use std::process::Command; + + let mut cmd = Command::new("open"); + cmd.arg("-a").arg("Warp"); + + // Warp URI scheme cannot work well with script_file, because: + // + // 1. script_file's name ends up with .sh, so Warp would open the file rather than execute it + // 2. script_file has no execution permission, so we need to add one more indirection + let mut second_script_file = tempfile::Builder::new() + .disable_cleanup(true) + .permissions(std::fs::Permissions::from_mode(0o755)) + .tempfile() + .map_err(|e| format!("Failed to create temporary script file: {e}"))?; + + writeln!( + &mut second_script_file, + r#"#!/usr/bin/env sh + + rm -- "$0" + + exec bash {} + "#, + script_file.display(), + ) + .map_err(|e| format!("Failed to write to temporary script file for Warp: {e}"))?; + + let mut warp_url = url::Url::parse("warp://action/new_tab").unwrap(); + warp_url + .query_pairs_mut() + .append_pair("path", &second_script_file.path().to_string_lossy()); + let warp_url = warp_url.to_string(); + cmd.arg(warp_url); + + let output = cmd.output().map_err(|e| format!("启动 Warp 失败: {e}"))?; + if !output.status.success() { + let stderr = String::from_utf8_lossy(&output.stderr); + return Err(format!( + "Warp 启动失败 (exit code: {:?}): {}", + output.status.code(), + stderr + )); + } + + Ok(()) +} + /// Linux: 根据用户首选终端启动 #[cfg(target_os = "linux")] fn launch_linux_terminal(config_file: &std::path::Path, cwd: Option<&Path>) -> Result<(), String> { @@ -1310,6 +1390,189 @@ fn run_windows_start_command(args: &[&str], terminal_name: &str) -> Result<(), S Ok(()) } +/// 打开用户首选终端并在其中执行一条命令行。脚本尾部 `read -n 1` / `pause` +/// 是刻意设计的——让命令退出后窗口不要瞬间关闭，用户才看得到 `command +/// not found` / `ModuleNotFoundError` 这类诊断信息。 +/// +/// **Security**：`command_line` 会被原样拼进 shell/batch 脚本，调用方必须 +/// 保证它是可信字符串（当前只由后端硬编码调用）。 +pub(crate) fn launch_terminal_running(command_line: &str, label: &str) -> Result<(), String> { + let temp_dir = std::env::temp_dir(); + let pid = std::process::id(); + + #[cfg(any(target_os = "macos", target_os = "linux"))] + let (script_file, script_content) = { + let file = temp_dir.join(format!("cc_switch_{}_{}.sh", label, pid)); + let content = format!( + r#"#!/bin/bash +trap 'rm -f "{script_path}"' EXIT +echo "[cc-switch] Starting: {cmd}" +echo "" +{cmd} +echo "" +echo "[cc-switch] Command exited. Press any key to close." +read -n 1 -s +"#, + script_path = file.display(), + cmd = command_line, + ); + (file, content) + }; + + #[cfg(target_os = "macos")] + { + use std::os::unix::fs::PermissionsExt; + + std::fs::write(&script_file, &script_content) + .map_err(|e| format!("写入启动脚本失败: {e}"))?; + std::fs::set_permissions(&script_file, std::fs::Permissions::from_mode(0o755)) + .map_err(|e| format!("设置脚本权限失败: {e}"))?; + + let preferred = crate::settings::get_preferred_terminal(); + let terminal = preferred.as_deref().unwrap_or("terminal"); + + let result = match terminal { + "iterm2" => launch_macos_iterm2(&script_file), + "warp" => launch_macos_warp(&script_file), + "alacritty" => launch_macos_open_app("Alacritty", &script_file, true), + "kitty" => launch_macos_open_app("kitty", &script_file, false), + "ghostty" => launch_macos_open_app("Ghostty", &script_file, true), + "wezterm" => launch_macos_open_app("WezTerm", &script_file, true), + "kaku" => launch_macos_open_app("Kaku", &script_file, true), + _ => launch_macos_terminal_app(&script_file), + }; + + if result.is_err() && terminal != "terminal" { + log::warn!( + "首选终端 {} 启动失败，回退到 Terminal.app: {:?}", + terminal, + result.as_ref().err() + ); + return launch_macos_terminal_app(&script_file); + } + result + } + + #[cfg(target_os = "linux")] + { + use std::os::unix::fs::PermissionsExt; + use std::process::Command; + + std::fs::write(&script_file, &script_content) + .map_err(|e| format!("写入启动脚本失败: {e}"))?; + std::fs::set_permissions(&script_file, std::fs::Permissions::from_mode(0o755)) + .map_err(|e| format!("设置脚本权限失败: {e}"))?; + + let preferred = crate::settings::get_preferred_terminal(); + let default_terminals = [ + ("gnome-terminal", vec!["--"]), + ("konsole", vec!["-e"]), + ("xfce4-terminal", vec!["-e"]), + ("mate-terminal", vec!["--"]), + ("lxterminal", vec!["-e"]), + ("alacritty", vec!["-e"]), + ("kitty", vec!["-e"]), + ("ghostty", vec!["-e"]), + ]; + + let terminals_to_try: Vec<(&str, Vec<&str>)> = if let Some(ref pref) = preferred { + let pref_args = default_terminals + .iter() + .find(|(name, _)| *name == pref.as_str()) + .map(|(_, args)| args.to_vec()) + .unwrap_or_else(|| vec!["-e"]); + let mut list = vec![(pref.as_str(), pref_args)]; + for (name, args) in &default_terminals { + if *name != pref.as_str() { + list.push((*name, args.to_vec())); + } + } + list + } else { + default_terminals + .iter() + .map(|(name, args)| (*name, args.to_vec())) + .collect() + }; + + let mut last_error = String::from("未找到可用的终端"); + + for (terminal, args) in terminals_to_try { + let terminal_exists = which_command(terminal) + || ["/usr/bin", "/bin", "/usr/local/bin"] + .iter() + .any(|dir| std::path::Path::new(&format!("{}/{}", dir, terminal)).exists()); + + if terminal_exists { + let spawn_result = Command::new(terminal) + .args(&args) + .arg("bash") + .arg(script_file.to_string_lossy().as_ref()) + .spawn(); + match spawn_result { + Ok(_) => return Ok(()), + Err(e) => { + last_error = format!("执行 {} 失败: {}", terminal, e); + } + } + } + } + + let _ = std::fs::remove_file(&script_file); + Err(last_error) + } + + #[cfg(target_os = "windows")] + { + let preferred = crate::settings::get_preferred_terminal(); + let terminal = preferred.as_deref().unwrap_or("cmd"); + + let bat_file = temp_dir.join(format!("cc_switch_{}_{}.bat", label, pid)); + let content = format!( + "@echo off\r\necho [cc-switch] Starting: {cmd}\r\necho.\r\n{cmd}\r\necho.\r\necho [cc-switch] Command exited. Press any key to close.\r\npause >nul\r\ndel \"%~f0\" >nul 2>&1\r\n", + cmd = command_line, + ); + std::fs::write(&bat_file, &content).map_err(|e| format!("写入批处理文件失败: {e}"))?; + + let bat_path = bat_file.to_string_lossy(); + let ps_cmd = format!("& '{}'", bat_path); + + let result = match terminal { + "powershell" => run_windows_start_command( + &["powershell", "-NoExit", "-Command", &ps_cmd], + "PowerShell", + ), + "wt" => run_windows_start_command(&["wt", "cmd", "/K", &bat_path], "Windows Terminal"), + _ => run_windows_start_command(&["cmd", "/K", &bat_path], "cmd"), + }; + + let final_result = if result.is_err() && terminal != "cmd" { + log::warn!( + "首选终端 {} 启动失败，回退到 cmd: {:?}", + terminal, + result.as_ref().err() + ); + run_windows_start_command(&["cmd", "/K", &bat_path], "cmd") + } else { + result + }; + + // The .bat self-deletes (`del "%~f0"`) after it runs, but that only + // fires if *some* terminal actually launched it. If every attempt + // failed, sweep the temp file ourselves to avoid pollution. + if final_result.is_err() { + let _ = std::fs::remove_file(&bat_file); + } + final_result + } + + #[cfg(not(any(target_os = "macos", target_os = "linux", target_os = "windows")))] + { + let _ = (temp_dir, pid, command_line, label); + Err("不支持的操作系统".to_string()) + } +} + /// 设置窗口主题（Windows/macOS 标题栏颜色） /// theme: "dark" | "light" | "system" #[tauri::command] @@ -1328,7 +1591,7 @@ pub async fn set_window_theme(window: tauri::Window, theme: String) -> Result<() #[cfg(test)] mod tests { use super::*; - use std::path::PathBuf; + use std::path::{Path, PathBuf}; #[test] fn test_extract_version() { @@ -1416,7 +1679,7 @@ mod tests { let count = paths .iter() - .filter(|path| **path == PathBuf::from("/same/path")) + .filter(|path| path.as_path() == Path::new("/same/path")) .count(); assert_eq!(count, 1); } @@ -1428,7 +1691,7 @@ mod tests { let count = paths .iter() - .filter(|path| **path == PathBuf::from("/home/tester/.bun/bin")) + .filter(|path| path.as_path() == Path::new("/home/tester/.bun/bin")) .count(); assert_eq!(count, 1); } @@ -1489,6 +1752,43 @@ mod tests { assert_eq!(command, "cd '/tmp/project O'\"'\"'Brien' || exit 1\n"); } + #[cfg(target_os = "macos")] + #[test] + fn iterm2_applescript_cold_start_avoids_current_window_before_one_exists() { + let script = build_macos_iterm2_applescript(Path::new("/tmp/cc_switch_launcher.sh")); + + let cold_start_branch = script + .split("else\n activate") + .nth(1) + .expect("cold start branch should be present") + .split(" end if\n tell current session") + .next() + .expect("cold start branch should end before writing command"); + + assert!(cold_start_branch.contains("repeat while (count of windows) = 0")); + assert!(cold_start_branch.contains("create window with default profile")); + assert!(!cold_start_branch.contains("tell current window")); + assert!(!cold_start_branch.contains("create tab with default profile")); + } + + #[cfg(target_os = "macos")] + #[test] + fn iterm2_applescript_keeps_new_tab_behavior_for_existing_windows() { + let script = build_macos_iterm2_applescript(Path::new("/tmp/cc_switch_launcher.sh")); + + let running_branch = script + .split("if was_running then") + .nth(1) + .expect("already-running branch should be present") + .split("else\n activate") + .next() + .expect("already-running branch should end before cold start branch"); + + assert!(running_branch.contains("if (count of windows) = 0 then")); + assert!(running_branch.contains("create window with default profile")); + assert!(running_branch.contains("create tab with default profile")); + } + #[test] fn build_windows_cwd_command_str_uses_cd_for_drive_paths() { let command = build_windows_cwd_command_str(r"C:\work\repo"); diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs index 6bf8a8c73..6b8aff027 100644 --- a/src-tauri/src/commands/mod.rs +++ b/src-tauri/src/commands/mod.rs @@ -10,6 +10,7 @@ mod deeplink; mod env; mod failover; mod global_proxy; +mod hermes; mod import_export; mod mcp; mod misc; @@ -42,6 +43,7 @@ pub use deeplink::*; pub use env::*; pub use failover::*; pub use global_proxy::*; +pub use hermes::*; pub use import_export::*; pub use mcp::*; pub use misc::*; diff --git a/src-tauri/src/commands/model_fetch.rs b/src-tauri/src/commands/model_fetch.rs index f152da002..7064e965b 100644 --- a/src-tauri/src/commands/model_fetch.rs +++ b/src-tauri/src/commands/model_fetch.rs @@ -6,13 +6,20 @@ use crate::services::model_fetch::{self, FetchedModel}; /// 获取供应商的可用模型列表 /// -/// 使用 OpenAI 兼容的 GET /v1/models 端点。 -/// 主要面向第三方聚合站（硅基流动、OpenRouter 等）。 +/// 使用 OpenAI 兼容的 GET /v1/models 端点。优先使用 `models_url` 精确覆写； +/// 否则对 baseURL 生成候选列表（含「剥离 Anthropic 兼容子路径」兜底），按序尝试。 #[tauri::command(rename_all = "camelCase")] pub async fn fetch_models_for_config( base_url: String, api_key: String, is_full_url: Option, + models_url: Option, ) -> Result, String> { - model_fetch::fetch_models(&base_url, &api_key, is_full_url.unwrap_or(false)).await + model_fetch::fetch_models( + &base_url, + &api_key, + is_full_url.unwrap_or(false), + models_url.as_deref(), + ) + .await } diff --git a/src-tauri/src/commands/provider.rs b/src-tauri/src/commands/provider.rs index 565cc8bac..5fceb49c8 100644 --- a/src-tauri/src/commands/provider.rs +++ b/src-tauri/src/commands/provider.rs @@ -1,10 +1,10 @@ use indexmap::IndexMap; -use tauri::State; +use tauri::{Emitter, State}; use crate::app_config::AppType; use crate::commands::copilot::CopilotAuthState; use crate::error::AppError; -use crate::provider::Provider; +use crate::provider::{ClaudeDesktopMode, Provider}; use crate::services::{ EndpointLatency, ProviderService, ProviderSortUpdate, SpeedtestService, SwitchResult, }; @@ -150,22 +150,206 @@ pub fn import_default_config(state: State<'_, AppState>, app: String) -> Result< import_default_config_internal(&state, app_type).map_err(Into::into) } +#[tauri::command] +pub async fn get_claude_desktop_status( + state: State<'_, AppState>, +) -> Result { + let proxy_running = state.proxy_service.is_running().await; + crate::claude_desktop_config::get_status(state.db.as_ref(), proxy_running) + .map_err(|e| e.to_string()) +} + +#[tauri::command] +pub fn get_claude_desktop_default_routes( +) -> Vec { + crate::claude_desktop_config::default_proxy_routes() +} + +#[tauri::command] +pub fn import_claude_desktop_providers_from_claude( + state: State<'_, AppState>, +) -> Result { + let claude_providers = state + .db + .get_all_providers(AppType::Claude.as_str()) + .map_err(|e| e.to_string())?; + let existing_ids = state + .db + .get_provider_ids(AppType::ClaudeDesktop.as_str()) + .map_err(|e| e.to_string())?; + + let mut imported = 0usize; + for provider in claude_providers.values() { + if existing_ids.contains(&provider.id) { + continue; + } + + if matches!( + provider + .meta + .as_ref() + .and_then(|meta| meta.provider_type.as_deref()), + Some("github_copilot") | Some("codex_oauth") + ) { + continue; + } + + let mut desktop_provider = provider.clone(); + desktop_provider.in_failover_queue = false; + let meta = desktop_provider.meta.get_or_insert_with(Default::default); + + if crate::claude_desktop_config::is_compatible_direct_provider(provider) + && claude_provider_models_are_claude_safe(provider) + { + meta.claude_desktop_mode = Some(ClaudeDesktopMode::Direct); + } else if let Some(routes) = suggested_claude_desktop_routes(provider) { + meta.claude_desktop_mode = Some(ClaudeDesktopMode::Proxy); + meta.claude_desktop_model_routes = routes; + } else { + continue; + } + + state + .db + .save_provider(AppType::ClaudeDesktop.as_str(), &desktop_provider) + .map_err(|e| e.to_string())?; + imported += 1; + } + + Ok(imported) +} + +fn claude_provider_models_are_claude_safe(provider: &Provider) -> bool { + let Some(env) = provider + .settings_config + .get("env") + .and_then(|value| value.as_object()) + else { + return true; + }; + + [ + "ANTHROPIC_MODEL", + "ANTHROPIC_DEFAULT_HAIKU_MODEL", + "ANTHROPIC_DEFAULT_SONNET_MODEL", + "ANTHROPIC_DEFAULT_OPUS_MODEL", + ] + .into_iter() + .filter_map(|key| env.get(key).and_then(|value| value.as_str())) + .map(str::trim) + .filter(|value| !value.is_empty()) + .all(crate::claude_desktop_config::is_claude_safe_model_id) +} + +fn suggested_claude_desktop_routes( + provider: &Provider, +) -> Option> { + let env = provider + .settings_config + .get("env") + .and_then(|value| value.as_object())?; + let mut routes = std::collections::HashMap::new(); + + fn add_route( + routes: &mut std::collections::HashMap, + env: &serde_json::Map, + route_id: &str, + env_key: &str, + display_name: &str, + ) { + if let Some(model) = env + .get(env_key) + .and_then(|value| value.as_str()) + .map(str::trim) + .filter(|value| !value.is_empty()) + { + routes.insert( + route_id.to_string(), + crate::provider::ClaudeDesktopModelRoute { + model: model.to_string(), + display_name: Some(display_name.to_string()), + supports_1m: Some(true), + }, + ); + } + } + + for spec in crate::claude_desktop_config::DEFAULT_PROXY_ROUTES { + add_route( + &mut routes, + env, + spec.route_id, + spec.env_key, + spec.display_name, + ); + } + + let primary_route = crate::claude_desktop_config::DEFAULT_PROXY_ROUTES[0]; + if !routes.contains_key(primary_route.route_id) { + add_route( + &mut routes, + env, + primary_route.route_id, + "ANTHROPIC_MODEL", + primary_route.display_name, + ); + } + + (!routes.is_empty()).then_some(routes) +} + #[allow(non_snake_case)] #[tauri::command] pub async fn queryProviderUsage( + app_handle: tauri::AppHandle, state: State<'_, AppState>, copilot_state: State<'_, CopilotAuthState>, #[allow(non_snake_case)] providerId: String, // 使用 camelCase 匹配前端 app: String, ) -> Result { let app_type = AppType::from_str(&app).map_err(|e| e.to_string())?; + // inner 可能以两种形式失败： + // 1) 返回 Ok(UsageResult { success: false, .. }) —— 业务失败（401、脚本报错等） + // 2) 返回 Err(String) —— RPC/DB/Copilot fetch_usage 等 transport 层失败 + // 两种都要把"失败"写进 UsageCache 并刷新托盘，让 format_script_summary 的 + // success 守卫生效、suffix 自然消失，避免旧 success 快照长期滞留。 + // 同时保持原始 Err 返回给前端 React Query 的 onError 回调，不吞错误。 + let inner = + query_provider_usage_inner(&state, &copilot_state, app_type.clone(), &providerId).await; + let snapshot = match &inner { + Ok(r) => r.clone(), + Err(err_msg) => crate::provider::UsageResult { + success: false, + data: None, + error: Some(err_msg.clone()), + }, + }; + let payload = serde_json::json!({ + "kind": "script", + "appType": app_type.as_str(), + "providerId": &providerId, + "data": &snapshot, + }); + if let Err(e) = app_handle.emit("usage-cache-updated", payload) { + log::error!("emit usage-cache-updated (script) 失败: {e}"); + } + state.usage_cache.put_script(app_type, providerId, snapshot); + crate::tray::schedule_tray_refresh(&app_handle); + inner +} +async fn query_provider_usage_inner( + state: &AppState, + copilot_state: &CopilotAuthState, + app_type: AppType, + provider_id: &str, +) -> Result { // 从数据库读取供应商信息，检查特殊模板类型 let providers = state .db .get_all_providers(app_type.as_str()) .map_err(|e| format!("Failed to get providers: {e}"))?; - let provider = providers.get(&providerId); + let provider = providers.get(provider_id); let usage_script = provider .and_then(|p| p.meta.as_ref()) .and_then(|m| m.usage_script.as_ref()); @@ -294,7 +478,7 @@ pub async fn queryProviderUsage( } // ── 通用 JS 脚本路径 ── - ProviderService::query_usage(state.inner(), app_type, &providerId) + ProviderService::query_usage(state, app_type, provider_id) .await .map_err(|e| e.to_string()) } @@ -406,7 +590,7 @@ pub fn update_providers_sort_order( use crate::provider::UniversalProvider; use std::collections::HashMap; -use tauri::{AppHandle, Emitter}; +use tauri::AppHandle; #[derive(Clone, serde::Serialize)] pub struct UniversalProviderSyncedEvent { diff --git a/src-tauri/src/commands/proxy.rs b/src-tauri/src/commands/proxy.rs index fbab52858..f6feaf94d 100644 --- a/src-tauri/src/commands/proxy.rs +++ b/src-tauri/src/commands/proxy.rs @@ -15,6 +15,24 @@ pub async fn start_proxy_server( state.proxy_service.start().await } +/// 停止代理服务器（仅停止服务，不恢复/清理 Live 接管状态） +#[tauri::command] +pub async fn stop_proxy_server(state: tauri::State<'_, AppState>) -> Result<(), String> { + let takeover = state.proxy_service.get_takeover_status().await?; + if takeover.claude + || takeover.codex + || takeover.gemini + || takeover.opencode + || takeover.openclaw + { + return Err( + "仍有应用处于代理接管状态，请先在设置中关闭对应应用接管后再停止本地路由。".to_string(), + ); + } + + state.proxy_service.stop().await +} + /// 停止代理服务器（恢复 Live 配置） #[tauri::command] pub async fn stop_proxy_with_restore(state: tauri::State<'_, AppState>) -> Result<(), String> { diff --git a/src-tauri/src/commands/settings.rs b/src-tauri/src/commands/settings.rs index ef6f7b395..f67fbf227 100644 --- a/src-tauri/src/commands/settings.rs +++ b/src-tauri/src/commands/settings.rs @@ -42,6 +42,8 @@ pub async fn save_settings(settings: crate::settings::AppSettings) -> Result Result { + crate::save_window_state_before_exit(&app); + // 在后台延迟重启，让函数有时间返回响应 tauri::async_runtime::spawn(async move { tokio::time::sleep(tokio::time::Duration::from_millis(100)).await; @@ -85,13 +87,15 @@ mod tests { #[test] fn save_settings_should_preserve_existing_webdav_when_payload_omits_it() { - let mut existing = AppSettings::default(); - existing.webdav_sync = Some(WebDavSyncSettings { - base_url: "https://dav.example.com".to_string(), - username: "alice".to_string(), - password: "secret".to_string(), - ..WebDavSyncSettings::default() - }); + let existing = AppSettings { + webdav_sync: Some(WebDavSyncSettings { + base_url: "https://dav.example.com".to_string(), + username: "alice".to_string(), + password: "secret".to_string(), + ..WebDavSyncSettings::default() + }), + ..AppSettings::default() + }; let incoming = AppSettings::default(); let merged = merge_settings_for_save(incoming, &existing); @@ -105,21 +109,25 @@ mod tests { #[test] fn save_settings_should_keep_incoming_webdav_when_present() { - let mut existing = AppSettings::default(); - existing.webdav_sync = Some(WebDavSyncSettings { - base_url: "https://dav.old.example.com".to_string(), - username: "old".to_string(), - password: "old-pass".to_string(), - ..WebDavSyncSettings::default() - }); + let existing = AppSettings { + webdav_sync: Some(WebDavSyncSettings { + base_url: "https://dav.old.example.com".to_string(), + username: "old".to_string(), + password: "old-pass".to_string(), + ..WebDavSyncSettings::default() + }), + ..AppSettings::default() + }; - let mut incoming = AppSettings::default(); - incoming.webdav_sync = Some(WebDavSyncSettings { - base_url: "https://dav.new.example.com".to_string(), - username: "new".to_string(), - password: "new-pass".to_string(), - ..WebDavSyncSettings::default() - }); + let incoming = AppSettings { + webdav_sync: Some(WebDavSyncSettings { + base_url: "https://dav.new.example.com".to_string(), + username: "new".to_string(), + password: "new-pass".to_string(), + ..WebDavSyncSettings::default() + }), + ..AppSettings::default() + }; let merged = merge_settings_for_save(incoming, &existing); @@ -135,22 +143,26 @@ mod tests { /// must NOT overwrite the existing one. #[test] fn save_settings_should_preserve_password_when_incoming_has_empty_password() { - let mut existing = AppSettings::default(); - existing.webdav_sync = Some(WebDavSyncSettings { - base_url: "https://dav.example.com".to_string(), - username: "alice".to_string(), - password: "secret".to_string(), - ..WebDavSyncSettings::default() - }); + let existing = AppSettings { + webdav_sync: Some(WebDavSyncSettings { + base_url: "https://dav.example.com".to_string(), + username: "alice".to_string(), + password: "secret".to_string(), + ..WebDavSyncSettings::default() + }), + ..AppSettings::default() + }; // Simulate frontend sending settings with cleared password - let mut incoming = AppSettings::default(); - incoming.webdav_sync = Some(WebDavSyncSettings { - base_url: "https://dav.example.com".to_string(), - username: "alice".to_string(), - password: "".to_string(), - ..WebDavSyncSettings::default() - }); + let incoming = AppSettings { + webdav_sync: Some(WebDavSyncSettings { + base_url: "https://dav.example.com".to_string(), + username: "alice".to_string(), + password: "".to_string(), + ..WebDavSyncSettings::default() + }), + ..AppSettings::default() + }; let merged = merge_settings_for_save(incoming, &existing); @@ -165,21 +177,25 @@ mod tests { /// work without panicking and keep the empty state. #[test] fn save_settings_should_handle_both_empty_passwords() { - let mut existing = AppSettings::default(); - existing.webdav_sync = Some(WebDavSyncSettings { - base_url: "https://dav.example.com".to_string(), - username: "alice".to_string(), - password: "".to_string(), - ..WebDavSyncSettings::default() - }); + let existing = AppSettings { + webdav_sync: Some(WebDavSyncSettings { + base_url: "https://dav.example.com".to_string(), + username: "alice".to_string(), + password: "".to_string(), + ..WebDavSyncSettings::default() + }), + ..AppSettings::default() + }; - let mut incoming = AppSettings::default(); - incoming.webdav_sync = Some(WebDavSyncSettings { - base_url: "https://dav.example.com".to_string(), - username: "alice".to_string(), - password: "".to_string(), - ..WebDavSyncSettings::default() - }); + let incoming = AppSettings { + webdav_sync: Some(WebDavSyncSettings { + base_url: "https://dav.example.com".to_string(), + username: "alice".to_string(), + password: "".to_string(), + ..WebDavSyncSettings::default() + }), + ..AppSettings::default() + }; let merged = merge_settings_for_save(incoming, &existing); diff --git a/src-tauri/src/commands/skill.rs b/src-tauri/src/commands/skill.rs index 5bec2b17b..feb0bfc00 100644 --- a/src-tauri/src/commands/skill.rs +++ b/src-tauri/src/commands/skill.rs @@ -12,6 +12,7 @@ use crate::services::skill::{ SkillsShSearchResult, }; use crate::store::AppState; +use std::str::FromStr; use std::sync::Arc; use tauri::State; @@ -20,13 +21,7 @@ pub struct SkillServiceState(pub Arc); /// 解析 app 参数为 AppType fn parse_app_type(app: &str) -> Result { - match app.to_lowercase().as_str() { - "claude" => Ok(AppType::Claude), - "codex" => Ok(AppType::Codex), - "gemini" => Ok(AppType::Gemini), - "opencode" => Ok(AppType::OpenCode), - _ => Err(format!("不支持的 app 类型: {app}")), - } + AppType::from_str(app).map_err(|e| e.to_string()) } // ========== 统一管理命令 ========== diff --git a/src-tauri/src/commands/subscription.rs b/src-tauri/src/commands/subscription.rs index 00b456eb7..053045b71 100644 --- a/src-tauri/src/commands/subscription.rs +++ b/src-tauri/src/commands/subscription.rs @@ -1,10 +1,41 @@ -use crate::services::subscription::SubscriptionQuota; +use std::str::FromStr; +use tauri::{Emitter, State}; + +use crate::app_config::AppType; +use crate::services::subscription::{CredentialStatus, SubscriptionQuota}; +use crate::store::AppState; /// 查询官方订阅额度 /// /// 读取 CLI 工具已有的 OAuth 凭据并调用官方 API 获取使用额度。 -/// 不需要 AppState（不访问数据库），直接读文件 + 发 HTTP。 +/// 结果（无论业务失败还是 transport 层 Err）都会写入 `UsageCache`、通知托盘 +/// 刷新，并 emit `usage-cache-updated`，让前端 React Query 与托盘共享同一份 +/// 最新数据。失败快照写入后 `format_subscription_summary` 会通过 `success=false` +/// 守卫返回 `None`，托盘 suffix 自然消失，避免长期滞留旧配额数字。 +/// Err 原样向前端返回，React Query 的 onError 不会被吞掉。 #[tauri::command] -pub async fn get_subscription_quota(tool: String) -> Result { - crate::services::subscription::get_subscription_quota(&tool).await +pub async fn get_subscription_quota( + app: tauri::AppHandle, + state: State<'_, AppState>, + tool: String, +) -> Result { + let inner = crate::services::subscription::get_subscription_quota(&tool).await; + let snapshot = match &inner { + Ok(q) => q.clone(), + // transport 层 Err —— 凭据状态不明，用 Valid 表达"凭据没问题，是通信/parse 出错"。 + Err(err_msg) => SubscriptionQuota::error(&tool, CredentialStatus::Valid, err_msg.clone()), + }; + if let Ok(app_type) = AppType::from_str(&tool) { + let payload = serde_json::json!({ + "kind": "subscription", + "appType": app_type.as_str(), + "data": &snapshot, + }); + if let Err(e) = app.emit("usage-cache-updated", payload) { + log::error!("emit usage-cache-updated (subscription) 失败: {e}"); + } + state.usage_cache.put_subscription(app_type, snapshot); + crate::tray::schedule_tray_refresh(&app); + } + inner } diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs index 11a3c0758..085ca7724 100644 --- a/src-tauri/src/config.rs +++ b/src-tauri/src/config.rs @@ -1,4 +1,5 @@ use serde::{Deserialize, Serialize}; +use serde_json::{Map, Value}; use std::fs; use std::io::Write; use std::path::{Path, PathBuf}; @@ -159,15 +160,34 @@ pub fn read_json_file Deserialize<'a>>(path: &Path) -> Result Value { + match value { + Value::Object(map) => { + let mut sorted_map = Map::new(); + let mut keys: Vec<_> = map.keys().collect(); + keys.sort(); + for key in keys { + sorted_map.insert(key.clone(), sort_json_keys(&map[key])); + } + Value::Object(sorted_map) + } + Value::Array(arr) => Value::Array(arr.iter().map(sort_json_keys).collect()), + other => other.clone(), + } +} + +/// 写入 JSON 配置文件（键按字母排序，确保确定性输出） pub fn write_json_file(path: &Path, data: &T) -> Result<(), AppError> { // 确保目录存在 if let Some(parent) = path.parent() { fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?; } - let json = - serde_json::to_string_pretty(data).map_err(|e| AppError::JsonSerialize { source: e })?; + let value = serde_json::to_value(data).map_err(|e| AppError::JsonSerialize { source: e })?; + let sorted_value = sort_json_keys(&value); + let json = serde_json::to_string_pretty(&sorted_value) + .map_err(|e| AppError::JsonSerialize { source: e })?; atomic_write(path, json.as_bytes()) } @@ -271,6 +291,103 @@ mod tests { let override_dir = PathBuf::from("/"); assert!(derive_mcp_path_from_override(&override_dir).is_none()); } + + #[test] + fn sort_json_keys_sorts_top_level_object() { + let input = serde_json::json!({ + "z": 1, + "a": 2, + "m": 3, + }); + let sorted = sort_json_keys(&input); + let serialized = serde_json::to_string(&sorted).unwrap(); + assert_eq!(serialized, r#"{"a":2,"m":3,"z":1}"#); + } + + #[test] + fn sort_json_keys_recurses_into_nested_objects() { + let input = serde_json::json!({ + "outer_b": {"z": 1, "a": 2}, + "outer_a": {"y": 3, "b": 4}, + }); + let sorted = sort_json_keys(&input); + let serialized = serde_json::to_string(&sorted).unwrap(); + assert_eq!( + serialized, + r#"{"outer_a":{"b":4,"y":3},"outer_b":{"a":2,"z":1}}"# + ); + } + + #[test] + fn sort_json_keys_preserves_array_order() { + let input = serde_json::json!([3, 1, 2]); + let sorted = sort_json_keys(&input); + let serialized = serde_json::to_string(&sorted).unwrap(); + assert_eq!(serialized, "[3,1,2]"); + } + + #[test] + fn sort_json_keys_sorts_objects_inside_arrays_but_keeps_array_order() { + let input = serde_json::json!([ + {"z": 1, "a": 2}, + {"y": 3, "b": 4}, + ]); + let sorted = sort_json_keys(&input); + let serialized = serde_json::to_string(&sorted).unwrap(); + assert_eq!(serialized, r#"[{"a":2,"z":1},{"b":4,"y":3}]"#); + } + + #[test] + fn sort_json_keys_passes_through_primitives() { + let cases = vec![ + serde_json::json!("hello"), + serde_json::json!(42), + serde_json::json!(3.5), + serde_json::json!(true), + serde_json::json!(null), + ]; + for value in cases { + let sorted = sort_json_keys(&value); + assert_eq!(sorted, value); + } + } + + #[test] + fn sort_json_keys_handles_empty_collections() { + let empty_obj = serde_json::json!({}); + assert_eq!( + serde_json::to_string(&sort_json_keys(&empty_obj)).unwrap(), + "{}" + ); + + let empty_arr = serde_json::json!([]); + assert_eq!( + serde_json::to_string(&sort_json_keys(&empty_arr)).unwrap(), + "[]" + ); + } + + #[test] + fn sort_json_keys_produces_identical_output_for_different_insertion_orders() { + // 核心保证：同一逻辑配置无论键的插入顺序如何，写出的字节序列必须一致。 + let mut a = Map::new(); + a.insert("env".to_string(), serde_json::json!({"PATH": "/usr/bin"})); + a.insert("model".to_string(), serde_json::json!("claude-sonnet-4-5")); + a.insert("permissions".to_string(), serde_json::json!({"allow": []})); + + let mut b = Map::new(); + b.insert("permissions".to_string(), serde_json::json!({"allow": []})); + b.insert("model".to_string(), serde_json::json!("claude-sonnet-4-5")); + b.insert("env".to_string(), serde_json::json!({"PATH": "/usr/bin"})); + + let sorted_a = sort_json_keys(&Value::Object(a)); + let sorted_b = sort_json_keys(&Value::Object(b)); + + assert_eq!( + serde_json::to_string(&sorted_a).unwrap(), + serde_json::to_string(&sorted_b).unwrap(), + ); + } } /// 复制文件 diff --git a/src-tauri/src/database/backup.rs b/src-tauri/src/database/backup.rs index 9438615ba..776631b92 100644 --- a/src-tauri/src/database/backup.rs +++ b/src-tauri/src/database/backup.rs @@ -791,8 +791,10 @@ mod tests { std::fs::create_dir_all(&test_home).expect("create test home"); std::env::set_var("CC_SWITCH_TEST_HOME", &test_home); - let mut settings = AppSettings::default(); - settings.backup_interval_hours = Some(0); + let settings = AppSettings { + backup_interval_hours: Some(0), + ..AppSettings::default() + }; update_settings(settings).expect("disable auto backup"); let db = Database::memory()?; diff --git a/src-tauri/src/database/dao/mcp.rs b/src-tauri/src/database/dao/mcp.rs index d5c60163f..07eb199a3 100644 --- a/src-tauri/src/database/dao/mcp.rs +++ b/src-tauri/src/database/dao/mcp.rs @@ -13,7 +13,7 @@ impl Database { pub fn get_all_mcp_servers(&self) -> Result, AppError> { let conn = lock_conn!(self.conn); let mut stmt = conn.prepare( - "SELECT id, name, server_config, description, homepage, docs, tags, enabled_claude, enabled_codex, enabled_gemini, enabled_opencode + "SELECT id, name, server_config, description, homepage, docs, tags, enabled_claude, enabled_codex, enabled_gemini, enabled_opencode, enabled_hermes FROM mcp_servers ORDER BY name ASC, id ASC" ).map_err(|e| AppError::Database(e.to_string()))?; @@ -31,6 +31,7 @@ impl Database { let enabled_codex: bool = row.get(8)?; let enabled_gemini: bool = row.get(9)?; let enabled_opencode: bool = row.get(10)?; + let enabled_hermes: bool = row.get(11)?; let server = serde_json::from_str(&server_config_str).unwrap_or_default(); let tags = serde_json::from_str(&tags_str).unwrap_or_default(); @@ -46,6 +47,7 @@ impl Database { codex: enabled_codex, gemini: enabled_gemini, opencode: enabled_opencode, + hermes: enabled_hermes, }, description, homepage, @@ -70,8 +72,8 @@ impl Database { conn.execute( "INSERT OR REPLACE INTO mcp_servers ( id, name, server_config, description, homepage, docs, tags, - enabled_claude, enabled_codex, enabled_gemini, enabled_opencode - ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11)", + enabled_claude, enabled_codex, enabled_gemini, enabled_opencode, enabled_hermes + ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12)", params![ server.id, server.name, @@ -87,6 +89,7 @@ impl Database { server.apps.codex, server.apps.gemini, server.apps.opencode, + server.apps.hermes, ], ) .map_err(|e| AppError::Database(e.to_string()))?; diff --git a/src-tauri/src/database/dao/providers.rs b/src-tauri/src/database/dao/providers.rs index 69b4cc3d6..f51b06299 100644 --- a/src-tauri/src/database/dao/providers.rs +++ b/src-tauri/src/database/dao/providers.rs @@ -535,6 +535,22 @@ impl Database { Ok(ids) } + /// 判断指定 app 下是否已存在任意 provider。 + /// + /// 启动阶段的 live import 需要使用这个更严格的判断： + /// 只要该 app 已经有任何 provider（包括官方 seed），就不应再自动导入 `default`。 + pub fn has_any_provider_for_app(&self, app_type: &str) -> Result { + let conn = lock_conn!(self.conn); + let exists: bool = conn + .query_row( + "SELECT EXISTS(SELECT 1 FROM providers WHERE app_type = ?1)", + params![app_type], + |row| row.get(0), + ) + .map_err(|e| AppError::Database(e.to_string()))?; + Ok(exists) + } + /// 判断指定 app 下是否存在非官方种子的供应商。 /// /// 比 `get_all_providers` 轻量得多：只读 id 列、无 endpoint 子查询、首条命中即返回。 diff --git a/src-tauri/src/database/dao/providers_seed.rs b/src-tauri/src/database/dao/providers_seed.rs index 055e9d294..2babe36e2 100644 --- a/src-tauri/src/database/dao/providers_seed.rs +++ b/src-tauri/src/database/dao/providers_seed.rs @@ -10,6 +10,8 @@ use crate::app_config::AppType; +pub(crate) const CLAUDE_DESKTOP_OFFICIAL_PROVIDER_ID: &str = "claude-desktop-official"; + /// 单条官方供应商种子定义。 pub(crate) struct OfficialProviderSeed { pub id: &'static str, @@ -22,7 +24,7 @@ pub(crate) struct OfficialProviderSeed { pub settings_config_json: &'static str, } -/// Claude / Codex / Gemini 三个应用的官方预设。 +/// Claude / Claude Desktop / Codex / Gemini 的官方预设。 /// /// id 固定，便于幂等检查；name 直接用英文原名（与前端预设一致），不做 i18n。 pub(crate) const OFFICIAL_SEEDS: &[OfficialProviderSeed] = &[ @@ -36,6 +38,16 @@ pub(crate) const OFFICIAL_SEEDS: &[OfficialProviderSeed] = &[ // 空 env 让用户走 Claude CLI 默认认证流程 settings_config_json: r#"{"env":{}}"#, }, + OfficialProviderSeed { + id: CLAUDE_DESKTOP_OFFICIAL_PROVIDER_ID, + app_type: AppType::ClaudeDesktop, + name: "Claude Desktop Official", + website_url: "https://claude.ai/download", + icon: "anthropic", + icon_color: "#D4915D", + // 空 env 只是占位；切换该 provider 时会恢复 Claude Desktop 1P 模式 + settings_config_json: r#"{"env":{}}"#, + }, OfficialProviderSeed { id: "codex-official", app_type: AppType::Codex, @@ -64,3 +76,19 @@ pub(crate) const OFFICIAL_SEEDS: &[OfficialProviderSeed] = &[ pub(crate) fn is_official_seed_id(id: &str) -> bool { OFFICIAL_SEEDS.iter().any(|seed| seed.id == id) } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn official_seeds_include_claude_desktop() { + let seed = OFFICIAL_SEEDS + .iter() + .find(|seed| seed.id == CLAUDE_DESKTOP_OFFICIAL_PROVIDER_ID) + .expect("claude desktop official seed"); + + assert_eq!(seed.app_type, AppType::ClaudeDesktop); + assert!(is_official_seed_id(CLAUDE_DESKTOP_OFFICIAL_PROVIDER_ID)); + } +} diff --git a/src-tauri/src/database/dao/skills.rs b/src-tauri/src/database/dao/skills.rs index befedca12..9c94eb5ec 100644 --- a/src-tauri/src/database/dao/skills.rs +++ b/src-tauri/src/database/dao/skills.rs @@ -23,7 +23,7 @@ impl Database { .prepare( "SELECT id, name, description, directory, repo_owner, repo_name, repo_branch, readme_url, enabled_claude, enabled_codex, enabled_gemini, enabled_opencode, - installed_at, content_hash, updated_at + enabled_hermes, installed_at, content_hash, updated_at FROM skills ORDER BY name ASC", ) .map_err(|e| AppError::Database(e.to_string()))?; @@ -44,10 +44,11 @@ impl Database { codex: row.get(9)?, gemini: row.get(10)?, opencode: row.get(11)?, + hermes: row.get(12)?, }, - installed_at: row.get(12)?, - content_hash: row.get(13)?, - updated_at: row.get::<_, i64>(14).unwrap_or(0), + installed_at: row.get(13)?, + content_hash: row.get(14)?, + updated_at: row.get::<_, i64>(15).unwrap_or(0), }) }) .map_err(|e| AppError::Database(e.to_string()))?; @@ -67,7 +68,7 @@ impl Database { .prepare( "SELECT id, name, description, directory, repo_owner, repo_name, repo_branch, readme_url, enabled_claude, enabled_codex, enabled_gemini, enabled_opencode, - installed_at, content_hash, updated_at + enabled_hermes, installed_at, content_hash, updated_at FROM skills WHERE id = ?1", ) .map_err(|e| AppError::Database(e.to_string()))?; @@ -87,10 +88,11 @@ impl Database { codex: row.get(9)?, gemini: row.get(10)?, opencode: row.get(11)?, + hermes: row.get(12)?, }, - installed_at: row.get(12)?, - content_hash: row.get(13)?, - updated_at: row.get::<_, i64>(14).unwrap_or(0), + installed_at: row.get(13)?, + content_hash: row.get(14)?, + updated_at: row.get::<_, i64>(15).unwrap_or(0), }) }); @@ -107,9 +109,9 @@ impl Database { conn.execute( "INSERT OR REPLACE INTO skills (id, name, description, directory, repo_owner, repo_name, repo_branch, - readme_url, enabled_claude, enabled_codex, enabled_gemini, enabled_opencode, + readme_url, enabled_claude, enabled_codex, enabled_gemini, enabled_opencode, enabled_hermes, installed_at, content_hash, updated_at) - VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15)", + VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16)", params![ skill.id, skill.name, @@ -123,6 +125,7 @@ impl Database { skill.apps.codex, skill.apps.gemini, skill.apps.opencode, + skill.apps.hermes, skill.installed_at, skill.content_hash, skill.updated_at, @@ -154,8 +157,8 @@ impl Database { let conn = lock_conn!(self.conn); let affected = conn .execute( - "UPDATE skills SET enabled_claude = ?1, enabled_codex = ?2, enabled_gemini = ?3, enabled_opencode = ?4 WHERE id = ?5", - params![apps.claude, apps.codex, apps.gemini, apps.opencode, id], + "UPDATE skills SET enabled_claude = ?1, enabled_codex = ?2, enabled_gemini = ?3, enabled_opencode = ?4, enabled_hermes = ?5 WHERE id = ?6", + params![apps.claude, apps.codex, apps.gemini, apps.opencode, apps.hermes, id], ) .map_err(|e| AppError::Database(e.to_string()))?; Ok(affected > 0) diff --git a/src-tauri/src/database/dao/usage_rollup.rs b/src-tauri/src/database/dao/usage_rollup.rs index fffb8a3bf..fc5fdb371 100644 --- a/src-tauri/src/database/dao/usage_rollup.rs +++ b/src-tauri/src/database/dao/usage_rollup.rs @@ -4,6 +4,7 @@ use crate::database::{lock_conn, Database}; use crate::error::AppError; +use crate::services::usage_stats::effective_usage_log_filter; use chrono::{Duration, Local, TimeZone}; /// Compute the rollup/prune cutoff aligned to a local-day boundary. @@ -101,7 +102,8 @@ impl Database { fn do_rollup_and_prune(conn: &rusqlite::Connection, cutoff: i64) -> Result { // Aggregate old logs, merging with any pre-existing rollup rows via LEFT JOIN. - conn.execute( + let effective_filter = effective_usage_log_filter("l"); + let aggregation_sql = format!( "INSERT OR REPLACE INTO usage_daily_rollups (date, app_type, provider_id, model, request_count, success_count, @@ -124,27 +126,30 @@ impl Database { ELSE 0 END FROM ( SELECT - date(created_at, 'unixepoch', 'localtime') as d, - app_type as a, provider_id as p, model as m, + date(l.created_at, 'unixepoch', 'localtime') as d, + l.app_type as a, l.provider_id as p, l.model as m, COUNT(*) as new_req, - SUM(CASE WHEN status_code >= 200 AND status_code < 300 THEN 1 ELSE 0 END) as new_succ, - COALESCE(SUM(input_tokens), 0) as new_in, - COALESCE(SUM(output_tokens), 0) as new_out, - COALESCE(SUM(cache_read_tokens), 0) as new_cr, - COALESCE(SUM(cache_creation_tokens), 0) as new_cc, - COALESCE(SUM(CAST(total_cost_usd AS REAL)), 0) as new_cost, - COALESCE(AVG(latency_ms), 0) as new_lat - FROM proxy_request_logs WHERE created_at < ?1 + SUM(CASE WHEN l.status_code >= 200 AND l.status_code < 300 THEN 1 ELSE 0 END) as new_succ, + COALESCE(SUM(l.input_tokens), 0) as new_in, + COALESCE(SUM(l.output_tokens), 0) as new_out, + COALESCE(SUM(l.cache_read_tokens), 0) as new_cr, + COALESCE(SUM(l.cache_creation_tokens), 0) as new_cc, + COALESCE(SUM(CAST(l.total_cost_usd AS REAL)), 0) as new_cost, + COALESCE(AVG(l.latency_ms), 0) as new_lat + FROM proxy_request_logs l + WHERE l.created_at < ?1 AND {effective_filter} GROUP BY d, a, p, m ) agg LEFT JOIN usage_daily_rollups old ON old.date = agg.d AND old.app_type = agg.a - AND old.provider_id = agg.p AND old.model = agg.m", - [cutoff], - ) - .map_err(|e| AppError::Database(format!("Rollup aggregation failed: {e}")))?; + AND old.provider_id = agg.p AND old.model = agg.m" + ); - // Delete the aggregated detail rows + conn.execute(&aggregation_sql, [cutoff]) + .map_err(|e| AppError::Database(format!("Rollup aggregation failed: {e}")))?; + + // INSERT uses the effective-log filter to exclude duplicate session rows. + // DELETE intentionally prunes all old details so those duplicates are discarded. let deleted = conn .execute( "DELETE FROM proxy_request_logs WHERE created_at < ?1", @@ -254,6 +259,69 @@ mod tests { Ok(()) } + #[test] + fn test_rollup_uses_effective_usage_logs() -> Result<(), AppError> { + let db = Database::memory()?; + let now = chrono::Utc::now().timestamp(); + let old_ts = now - 40 * 86400; + + { + let conn = crate::database::lock_conn!(db.conn); + conn.execute( + "INSERT INTO proxy_request_logs ( + request_id, provider_id, app_type, model, request_model, + input_tokens, output_tokens, cache_read_tokens, cache_creation_tokens, + total_cost_usd, latency_ms, status_code, created_at, data_source + ) VALUES (?1, 'openai', 'codex', 'gpt-5.4', 'gpt-5.4', 100, 20, 10, 0, '0.10', 100, 200, ?2, 'proxy')", + rusqlite::params!["codex-proxy-old", old_ts], + )?; + conn.execute( + "INSERT INTO proxy_request_logs ( + request_id, provider_id, app_type, model, request_model, + input_tokens, output_tokens, cache_read_tokens, cache_creation_tokens, + total_cost_usd, latency_ms, status_code, created_at, data_source + ) VALUES (?1, '_codex_session', 'codex', 'gpt-5.4', 'gpt-5.4', 100, 20, 10, 0, '0.10', 0, 200, ?2, 'codex_session')", + rusqlite::params!["codex-session-old-dup", old_ts + 60], + )?; + } + + let deleted = db.rollup_and_prune(30)?; + assert_eq!(deleted, 2); + + let conn = crate::database::lock_conn!(db.conn); + let mut stmt = conn.prepare( + "SELECT provider_id, request_count, input_tokens, output_tokens, cache_read_tokens + FROM usage_daily_rollups WHERE app_type = 'codex'", + )?; + let rows = stmt + .query_map([], |row| { + Ok(( + row.get::<_, String>(0)?, + row.get::<_, i64>(1)?, + row.get::<_, i64>(2)?, + row.get::<_, i64>(3)?, + row.get::<_, i64>(4)?, + )) + })? + .collect::, _>>()?; + + assert_eq!(rows.len(), 1); + let (provider_id, request_count, input_tokens, output_tokens, cache_read_tokens) = &rows[0]; + assert_eq!(provider_id, "openai"); + assert_eq!(*request_count, 1); + assert_eq!(*input_tokens, 100); + assert_eq!(*output_tokens, 20); + assert_eq!(*cache_read_tokens, 10); + + let remaining: i64 = + conn.query_row("SELECT COUNT(*) FROM proxy_request_logs", [], |row| { + row.get(0) + })?; + assert_eq!(remaining, 0); + + Ok(()) + } + #[test] fn test_rollup_noop_when_no_old_data() -> Result<(), AppError> { let db = Database::memory()?; diff --git a/src-tauri/src/database/mod.rs b/src-tauri/src/database/mod.rs index 1c7618072..47c08695f 100644 --- a/src-tauri/src/database/mod.rs +++ b/src-tauri/src/database/mod.rs @@ -32,6 +32,7 @@ mod schema; mod tests; // DAO 类型导出供外部使用 +pub(crate) use dao::providers_seed::CLAUDE_DESKTOP_OFFICIAL_PROVIDER_ID; pub use dao::FailoverQueueItem; use crate::config::get_app_config_dir; @@ -44,7 +45,7 @@ use std::sync::Mutex; /// 当前 Schema 版本号 /// 每次修改表结构时递增，并在 schema.rs 中添加相应的迁移逻辑 -pub(crate) const SCHEMA_VERSION: i32 = 9; +pub(crate) const SCHEMA_VERSION: i32 = 10; /// 安全地序列化 JSON，避免 unwrap panic pub(crate) fn to_json_string(value: &T) -> Result { diff --git a/src-tauri/src/database/schema.rs b/src-tauri/src/database/schema.rs index 295641457..d28ccdca5 100644 --- a/src-tauri/src/database/schema.rs +++ b/src-tauri/src/database/schema.rs @@ -65,7 +65,8 @@ impl Database { id TEXT PRIMARY KEY, name TEXT NOT NULL, server_config TEXT NOT NULL, description TEXT, homepage TEXT, docs TEXT, tags TEXT NOT NULL DEFAULT '[]', enabled_claude BOOLEAN NOT NULL DEFAULT 0, enabled_codex BOOLEAN NOT NULL DEFAULT 0, - enabled_gemini BOOLEAN NOT NULL DEFAULT 0, enabled_opencode BOOLEAN NOT NULL DEFAULT 0 + enabled_gemini BOOLEAN NOT NULL DEFAULT 0, enabled_opencode BOOLEAN NOT NULL DEFAULT 0, + enabled_hermes BOOLEAN NOT NULL DEFAULT 0 )", [], ) @@ -93,6 +94,7 @@ impl Database { enabled_codex BOOLEAN NOT NULL DEFAULT 0, enabled_gemini BOOLEAN NOT NULL DEFAULT 0, enabled_opencode BOOLEAN NOT NULL DEFAULT 0, + enabled_hermes BOOLEAN NOT NULL DEFAULT 0, installed_at INTEGER NOT NULL DEFAULT 0, content_hash TEXT, updated_at INTEGER NOT NULL DEFAULT 0 @@ -212,6 +214,7 @@ impl Database { [], ) .map_err(|e| AppError::Database(e.to_string()))?; + Self::create_request_logs_usage_indexes_if_supported(conn)?; // 11. Model Pricing 表 conn.execute( @@ -423,6 +426,11 @@ impl Database { Self::migrate_v8_to_v9(conn)?; Self::set_user_version(conn, 9)?; } + 9 => { + log::info!("迁移数据库从 v9 到 v10（添加 Hermes Agent 支持）"); + Self::migrate_v9_to_v10(conn)?; + Self::set_user_version(conn, 10)?; + } _ => { return Err(AppError::Database(format!( "未知的数据库版本 {version}，无法迁移到 {SCHEMA_VERSION}" @@ -1100,6 +1108,7 @@ impl Database { "data_source", "TEXT NOT NULL DEFAULT 'proxy'", )?; + Self::create_request_logs_usage_indexes_if_supported(conn)?; } // 2. 创建会话日志同步状态表 @@ -1168,11 +1177,43 @@ impl Database { Ok(()) } + /// v9 -> v10 迁移：添加 Hermes Agent 支持 + fn migrate_v9_to_v10(conn: &Connection) -> Result<(), AppError> { + Self::add_column_if_missing( + conn, + "mcp_servers", + "enabled_hermes", + "BOOLEAN NOT NULL DEFAULT 0", + )?; + + // skills table may not exist in databases migrated from very old versions + if Self::table_exists(conn, "skills")? { + Self::add_column_if_missing( + conn, + "skills", + "enabled_hermes", + "BOOLEAN NOT NULL DEFAULT 0", + )?; + } + + log::info!("v9 -> v10 迁移完成：已添加 Hermes Agent 支持"); + Ok(()) + } + /// 插入默认模型定价数据 /// 格式: (model_id, display_name, input, output, cache_read, cache_creation) /// 注意: model_id 使用短横线格式（如 claude-haiku-4-5），与 API 返回的模型名称标准化后一致 fn seed_model_pricing(conn: &Connection) -> Result<(), AppError> { let pricing_data = [ + // Claude 4.7 系列 + ( + "claude-opus-4-7", + "Claude Opus 4.7", + "5", + "25", + "0.50", + "6.25", + ), // Claude 4.6 系列 ( "claude-opus-4-6-20260206", @@ -1257,6 +1298,13 @@ impl Database { "0.30", "3.75", ), + // GPT-5.5 系列 + ("gpt-5.5", "GPT-5.5", "5", "30", "0.50", "0"), + ("gpt-5.5-low", "GPT-5.5", "5", "30", "0.50", "0"), + ("gpt-5.5-medium", "GPT-5.5", "5", "30", "0.50", "0"), + ("gpt-5.5-high", "GPT-5.5", "5", "30", "0.50", "0"), + ("gpt-5.5-xhigh", "GPT-5.5", "5", "30", "0.50", "0"), + ("gpt-5.5-minimal", "GPT-5.5", "5", "30", "0.50", "0"), // GPT-5.4 系列 ("gpt-5.4", "GPT-5.4", "2.50", "15", "0.25", "0"), ("gpt-5.4-mini", "GPT-5.4 Mini", "0.75", "4.50", "0.075", "0"), @@ -1581,6 +1629,23 @@ impl Database { "0.14", "0", ), + // DeepSeek V4 系列（官方 CNY 按 1 USD ≈ 7.14 折算） + ( + "deepseek-v4-flash", + "DeepSeek V4 Flash", + "0.14", + "0.28", + "0.028", + "0", + ), + ( + "deepseek-v4-pro", + "DeepSeek V4 Pro", + "1.68", + "3.36", + "0.14", + "0", + ), // Kimi (月之暗面) ( "kimi-k2-thinking", @@ -1600,6 +1665,7 @@ impl Database { "0", ), ("kimi-k2.5", "Kimi K2.5", "0.60", "2.50", "0.10", "0"), + ("kimi-k2.6", "Kimi K2.6", "0.95", "4.00", "0.16", "0"), // MiniMax 系列 ("minimax-m2.1", "MiniMax M2.1", "0.27", "0.95", "0.03", "0"), ( @@ -1851,6 +1917,54 @@ impl Database { Ok(()) } + fn create_request_logs_usage_indexes_if_supported(conn: &Connection) -> Result<(), AppError> { + if !Self::table_exists(conn, "proxy_request_logs")? { + return Ok(()); + } + + let has_app_type = Self::has_column(conn, "proxy_request_logs", "app_type")?; + let has_created_at = Self::has_column(conn, "proxy_request_logs", "created_at")?; + if has_app_type && has_created_at { + conn.execute( + "CREATE INDEX IF NOT EXISTS idx_request_logs_app_created_at + ON proxy_request_logs(app_type, created_at DESC)", + [], + ) + .map_err(|e| AppError::Database(format!("创建使用量应用时间索引失败: {e}")))?; + } + + let required_columns = [ + "app_type", + "data_source", + "input_tokens", + "output_tokens", + "cache_read_tokens", + "created_at", + "cache_creation_tokens", + ]; + for column in required_columns { + if !Self::has_column(conn, "proxy_request_logs", column)? { + return Ok(()); + } + } + + conn.execute("DROP INDEX IF EXISTS idx_request_logs_dedup_lookup", []) + .map_err(|e| AppError::Database(format!("删除旧使用量去重索引失败: {e}")))?; + + // 查询层为了兼容历史 NULL data_source 行，会使用 + // COALESCE(data_source, 'proxy')。普通 data_source 索引无法匹配该表达式， + // 会让跨源去重子查询退化成大量扫描；表达式索引让 SQLite 能按同一表达式查找。 + conn.execute( + "CREATE INDEX IF NOT EXISTS idx_request_logs_dedup_lookup_expr + ON proxy_request_logs(app_type, COALESCE(data_source, 'proxy'), input_tokens, + output_tokens, cache_read_tokens, created_at, + cache_creation_tokens)", + [], + ) + .map_err(|e| AppError::Database(format!("创建使用量去重表达式索引失败: {e}")))?; + Ok(()) + } + fn validate_identifier(s: &str, kind: &str) -> Result<(), AppError> { if s.is_empty() { return Err(AppError::Database(format!("{kind} 不能为空"))); diff --git a/src-tauri/src/deeplink/mcp.rs b/src-tauri/src/deeplink/mcp.rs index 37df96579..822cd839d 100644 --- a/src-tauri/src/deeplink/mcp.rs +++ b/src-tauri/src/deeplink/mcp.rs @@ -167,6 +167,7 @@ pub(crate) fn parse_mcp_apps(apps_str: &str) -> Result { codex: false, gemini: false, opencode: false, + hermes: false, }; for app in apps_str.split(',') { @@ -179,6 +180,7 @@ pub(crate) fn parse_mcp_apps(apps_str: &str) -> Result { // OpenClaw doesn't support MCP, ignore silently log::debug!("OpenClaw doesn't support MCP, ignoring in apps parameter"); } + "hermes" => apps.hermes = true, other => { return Err(AppError::InvalidInput(format!( "Invalid app in 'apps': {other}" diff --git a/src-tauri/src/deeplink/mod.rs b/src-tauri/src/deeplink/mod.rs index 4bd3c8036..f883d3b8f 100644 --- a/src-tauri/src/deeplink/mod.rs +++ b/src-tauri/src/deeplink/mod.rs @@ -31,7 +31,7 @@ pub use skill::import_skill_from_deeplink; /// /// Represents a parsed ccswitch:// URL ready for processing. /// This struct contains all possible fields for all resource types. -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone, Default, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct DeepLinkImportRequest { /// Protocol version (e.g., "v1") diff --git a/src-tauri/src/deeplink/parser.rs b/src-tauri/src/deeplink/parser.rs index 290e30318..aca40fec6 100644 --- a/src-tauri/src/deeplink/parser.rs +++ b/src-tauri/src/deeplink/parser.rs @@ -81,10 +81,10 @@ fn parse_provider_deeplink( // Validate app type if !matches!( app.as_str(), - "claude" | "codex" | "gemini" | "opencode" | "openclaw" + "claude" | "codex" | "gemini" | "opencode" | "openclaw" | "hermes" ) { return Err(AppError::InvalidInput(format!( - "Invalid app type: must be 'claude', 'codex', 'gemini', 'opencode', or 'openclaw', got '{app}'" + "Invalid app type: must be 'claude', 'codex', 'gemini', 'opencode', 'openclaw', or 'hermes', got '{app}'" ))); } @@ -190,10 +190,10 @@ fn parse_prompt_deeplink( // Validate app type if !matches!( app.as_str(), - "claude" | "codex" | "gemini" | "opencode" | "openclaw" + "claude" | "codex" | "gemini" | "opencode" | "openclaw" | "hermes" ) { return Err(AppError::InvalidInput(format!( - "Invalid app type: must be 'claude', 'codex', 'gemini', 'opencode', or 'openclaw', got '{app}'" + "Invalid app type: must be 'claude', 'codex', 'gemini', 'opencode', 'openclaw', or 'hermes', got '{app}'" ))); } @@ -262,10 +262,10 @@ fn parse_mcp_deeplink( let trimmed = app.trim(); if !matches!( trimmed, - "claude" | "codex" | "gemini" | "opencode" | "openclaw" + "claude" | "codex" | "gemini" | "opencode" | "openclaw" | "hermes" ) { return Err(AppError::InvalidInput(format!( - "Invalid app in 'apps': must be 'claude', 'codex', 'gemini', 'opencode', or 'openclaw', got '{trimmed}'" + "Invalid app in 'apps': must be 'claude', 'codex', 'gemini', 'opencode', 'openclaw', or 'hermes', got '{trimmed}'" ))); } } diff --git a/src-tauri/src/deeplink/provider.rs b/src-tauri/src/deeplink/provider.rs index 87e07282f..d7ba9aed5 100644 --- a/src-tauri/src/deeplink/provider.rs +++ b/src-tauri/src/deeplink/provider.rs @@ -5,7 +5,7 @@ use super::utils::{decode_base64_param, infer_homepage_from_endpoint}; use super::DeepLinkImportRequest; use crate::error::AppError; -use crate::provider::{Provider, ProviderMeta, UsageScript}; +use crate::provider::{ClaudeDesktopMode, Provider, ProviderMeta, UsageScript}; use crate::services::ProviderService; use crate::store::AppState; use crate::AppType; @@ -142,15 +142,20 @@ pub(crate) fn build_provider_from_request( request: &DeepLinkImportRequest, ) -> Result { let settings_config = match app_type { - AppType::Claude => build_claude_settings(request), + AppType::Claude | AppType::ClaudeDesktop => build_claude_settings(request), AppType::Codex => build_codex_settings(request), AppType::Gemini => build_gemini_settings(request), AppType::OpenCode => build_opencode_settings(request), - AppType::OpenClaw => build_openclaw_settings(request), + AppType::OpenClaw => build_additive_app_settings(request), + AppType::Hermes => build_hermes_settings(request), }; // Build usage script configuration if provided - let meta = build_provider_meta(request)?; + let mut meta = build_provider_meta(request)?; + if matches!(app_type, AppType::ClaudeDesktop) { + meta.get_or_insert_with(ProviderMeta::default) + .claude_desktop_mode = Some(ClaudeDesktopMode::Direct); + } let provider = Provider { id: String::new(), // Will be generated by caller @@ -393,11 +398,11 @@ fn build_opencode_settings(request: &DeepLinkImportRequest) -> serde_json::Value }) } -fn build_openclaw_settings(request: &DeepLinkImportRequest) -> serde_json::Value { +/// Build settings for OpenClaw (camelCase live config). +/// Format: { baseUrl, apiKey, api, models } +fn build_additive_app_settings(request: &DeepLinkImportRequest) -> serde_json::Value { let endpoint = get_primary_endpoint(request); - // Build OpenClaw provider config - // Format: { baseUrl, apiKey, api, models } let mut config = serde_json::Map::new(); if !endpoint.is_empty() { @@ -408,10 +413,49 @@ fn build_openclaw_settings(request: &DeepLinkImportRequest) -> serde_json::Value config.insert("apiKey".to_string(), json!(api_key)); } - // Default to OpenAI-compatible API config.insert("api".to_string(), json!("openai-completions")); - // Build models array + if let Some(model) = &request.model { + config.insert( + "models".to_string(), + json!([{ "id": model, "name": model }]), + ); + } + + json!(config) +} + +/// Build Hermes provider settings (snake_case YAML-native fields). +/// +/// Hermes' `custom_providers:` entries use `base_url` / `api_key` / `api_mode` +/// (see `_VALID_CUSTOM_PROVIDER_FIELDS` in upstream `hermes_cli/config.py`). +/// Emitting camelCase here — as the OpenClaw path does — would poison the +/// YAML with unknown root fields the Hermes runtime ignores. +/// +/// `api_mode` is always written explicitly. Deeplinks have no field to carry +/// it, so we default to `chat_completions` (the most widely compatible +/// protocol) and let the user adjust via the UI after import. We never rely +/// on Hermes' built-in URL heuristics, which only recognize a handful of +/// official endpoints. +fn build_hermes_settings(request: &DeepLinkImportRequest) -> serde_json::Value { + let endpoint = get_primary_endpoint(request); + + let mut config = serde_json::Map::new(); + + if let Some(name) = request.name.as_deref().filter(|s| !s.is_empty()) { + config.insert("name".to_string(), json!(name)); + } + + if !endpoint.is_empty() { + config.insert("base_url".to_string(), json!(endpoint)); + } + + if let Some(api_key) = &request.api_key { + config.insert("api_key".to_string(), json!(api_key)); + } + + config.insert("api_mode".to_string(), json!("chat_completions")); + if let Some(model) = &request.model { config.insert( "models".to_string(), @@ -484,7 +528,7 @@ pub fn parse_and_merge_config( "codex" => merge_codex_config(&mut merged, &config_value)?, "gemini" => merge_gemini_config(&mut merged, &config_value)?, // Additive mode apps use JSON config directly; pass through as-is - "openclaw" | "opencode" => { + "openclaw" | "opencode" | "hermes" => { merge_additive_config(&mut merged, &config_value)?; } "" => { @@ -711,3 +755,89 @@ fn extract_codex_base_url(toml_value: &toml::Value) -> Option { } None } + +#[cfg(test)] +mod tests { + use super::*; + + fn hermes_request() -> DeepLinkImportRequest { + DeepLinkImportRequest { + resource: "provider".to_string(), + app: Some("hermes".to_string()), + name: Some("MyHermes".to_string()), + endpoint: Some("https://api.example.com/v1".to_string()), + api_key: Some("sk-test".to_string()), + model: Some("anthropic/claude-opus-4-7".to_string()), + ..Default::default() + } + } + + #[test] + fn build_hermes_settings_emits_snake_case() { + let settings = build_hermes_settings(&hermes_request()); + let obj = settings.as_object().expect("settings must be object"); + + assert_eq!(obj.get("name").unwrap(), "MyHermes"); + assert_eq!(obj.get("base_url").unwrap(), "https://api.example.com/v1"); + assert_eq!(obj.get("api_key").unwrap(), "sk-test"); + + // camelCase and legacy fields must NOT be present + assert!(obj.get("baseUrl").is_none(), "no camelCase baseUrl"); + assert!(obj.get("apiKey").is_none(), "no camelCase apiKey"); + assert!(obj.get("api").is_none(), "no legacy 'api' field"); + + // models array with the deeplink model id + let models = obj.get("models").unwrap().as_array().unwrap(); + assert_eq!(models.len(), 1); + assert_eq!(models[0]["id"], "anthropic/claude-opus-4-7"); + } + + #[test] + fn build_hermes_settings_writes_default_api_mode() { + let settings = build_hermes_settings(&hermes_request()); + assert_eq!( + settings.as_object().unwrap().get("api_mode").unwrap(), + "chat_completions", + "api_mode must be written explicitly so Hermes never falls back to URL auto-detection" + ); + } + + #[test] + fn build_hermes_settings_skips_missing_optional_fields() { + let request = DeepLinkImportRequest { + resource: "provider".to_string(), + app: Some("hermes".to_string()), + name: Some("Minimal".to_string()), + endpoint: None, + api_key: None, + model: None, + ..Default::default() + }; + let settings = build_hermes_settings(&request); + let obj = settings.as_object().unwrap(); + + assert_eq!(obj.get("name").unwrap(), "Minimal"); + assert!(obj.get("base_url").is_none()); + assert!(obj.get("api_key").is_none()); + assert!(obj.get("models").is_none()); + assert_eq!(obj.get("api_mode").unwrap(), "chat_completions"); + } + + #[test] + fn openclaw_still_uses_camel_case() { + // OpenClaw's live config natively uses camelCase; guard against a + // refactor accidentally flipping it to snake_case. + let request = DeepLinkImportRequest { + resource: "provider".to_string(), + app: Some("openclaw".to_string()), + name: Some("c".to_string()), + endpoint: Some("https://api.example.com".to_string()), + api_key: Some("k".to_string()), + ..Default::default() + }; + let settings = build_additive_app_settings(&request); + let obj = settings.as_object().unwrap(); + assert!(obj.contains_key("baseUrl")); + assert!(obj.contains_key("apiKey")); + } +} diff --git a/src-tauri/src/hermes_config.rs b/src-tauri/src/hermes_config.rs new file mode 100644 index 000000000..30f24267c --- /dev/null +++ b/src-tauri/src/hermes_config.rs @@ -0,0 +1,1947 @@ +//! Hermes Agent 配置文件读写模块 +//! +//! 处理 `~/.hermes/config.yaml` 配置文件的读写操作（YAML 格式）。 +//! Hermes 使用累加式供应商管理，所有供应商配置共存于同一配置文件中。 +//! +//! ## 配置结构示例 +//! +//! ```yaml +//! model: +//! default: "anthropic/claude-opus-4-7" +//! provider: "openrouter" +//! base_url: "https://openrouter.ai/api/v1" +//! +//! agent: +//! max_turns: 50 +//! reasoning_effort: "high" +//! +//! custom_providers: +//! - name: openrouter +//! base_url: https://openrouter.ai/api/v1 +//! api_key: sk-or-... +//! model: anthropic/claude-opus-4-7 +//! models: +//! anthropic/claude-opus-4-7: +//! context_length: 200000 +//! +//! mcp_servers: +//! filesystem: +//! command: npx +//! args: ["-y", "@modelcontextprotocol/server-filesystem"] +//! ``` + +use crate::config::{atomic_write, get_app_config_dir}; +use crate::error::AppError; +use crate::settings::{effective_backup_retain_count, get_hermes_override_dir}; +use chrono::Local; +use serde::{Deserialize, Serialize}; +use std::collections::HashMap; +use std::fs; +use std::path::{Path, PathBuf}; +use std::sync::{Mutex, OnceLock}; + +// ============================================================================ +// Path Functions +// ============================================================================ + +/// 获取 Hermes 配置目录 +/// +/// 默认路径: `~/.hermes/` +/// 可通过 settings.hermes_config_dir 覆盖 +pub fn get_hermes_dir() -> PathBuf { + if let Some(override_dir) = get_hermes_override_dir() { + return override_dir; + } + + crate::config::get_home_dir().join(".hermes") +} + +/// 获取 Hermes 配置文件路径 +/// +/// 返回 `~/.hermes/config.yaml` +pub fn get_hermes_config_path() -> PathBuf { + get_hermes_dir().join("config.yaml") +} + +fn hermes_write_lock() -> &'static Mutex<()> { + static LOCK: OnceLock> = OnceLock::new(); + LOCK.get_or_init(|| Mutex::new(())) +} + +// ============================================================================ +// Type Definitions +// ============================================================================ + +/// Hermes 写入结果 +#[derive(Debug, Clone, Serialize, Deserialize, Default)] +#[serde(rename_all = "camelCase")] +pub struct HermesWriteOutcome { + #[serde(skip_serializing_if = "Option::is_none")] + pub backup_path: Option, +} + +/// Hermes model section config +#[derive(Debug, Clone, Default, Serialize, Deserialize)] +pub struct HermesModelConfig { + #[serde(skip_serializing_if = "Option::is_none")] + pub default: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub provider: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub base_url: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub context_length: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub max_tokens: Option, + /// Preserve unknown fields for forward compatibility + #[serde(flatten)] + pub extra: HashMap, +} + +// ============================================================================ +// Core YAML Read Functions +// ============================================================================ + +/// 读取 Hermes 配置文件为 serde_yaml::Value +/// +/// 如果文件不存在，返回空 Mapping +pub fn read_hermes_config() -> Result { + let path = get_hermes_config_path(); + if !path.exists() { + return Ok(serde_yaml::Value::Mapping(serde_yaml::Mapping::new())); + } + + let content = fs::read_to_string(&path).map_err(|e| AppError::io(&path, e))?; + if content.trim().is_empty() { + return Ok(serde_yaml::Value::Mapping(serde_yaml::Mapping::new())); + } + + serde_yaml::from_str(&content) + .map_err(|e| AppError::Config(format!("Failed to parse Hermes config as YAML: {e}"))) +} + +// ============================================================================ +// YAML Section-Level Replacement +// ============================================================================ + +/// Check if a line is a YAML top-level key (mapping key at column 0). +/// +/// A top-level key line must: +/// - Start at column 0 (no leading whitespace) +/// - Not be empty or whitespace-only +/// - Not be a comment (starting with `#`) +/// - Not be a sequence item (starting with `-`) +/// - Contain `:` followed by space, tab, newline, or end-of-line +fn is_top_level_key_line(line: &str) -> bool { + if line.is_empty() { + return false; + } + let first_char = line.as_bytes()[0]; + if first_char == b' ' || first_char == b'\t' || first_char == b'#' || first_char == b'-' { + return false; + } + if let Some(colon_pos) = line.find(':') { + let after_colon = &line[colon_pos + 1..]; + after_colon.is_empty() || after_colon.starts_with(' ') || after_colon.starts_with('\t') + } else { + false + } +} + +/// Find the byte range of a top-level YAML section. +/// +/// A YAML top-level key is a line that starts at column 0 (no leading +/// whitespace), is not a comment, and contains `:` after the key name. +/// +/// Returns `(start_byte_inclusive, end_byte_exclusive)` or `None` if not found. +fn find_yaml_section_range(raw: &str, section_key: &str) -> Option<(usize, usize)> { + let target = format!("{}:", section_key); + let mut section_start = None; + let mut offset = 0; + + for line in raw.split('\n') { + if section_start.is_none() && is_top_level_key_line(line) && line.starts_with(&target) { + // Verify exact match: after "key:" must be whitespace or EOL + let after_target = &line[target.len()..]; + if after_target.is_empty() + || after_target.starts_with(' ') + || after_target.starts_with('\t') + || after_target.starts_with('\r') + { + section_start = Some(offset); + } + } else if section_start.is_some() && is_top_level_key_line(line) { + // Found the next top-level key — this is the end of our section + return Some((section_start.unwrap(), offset)); + } + offset += line.len() + 1; // +1 for the \n + } + + // Section extends to end of file + section_start.map(|start| (start, raw.len())) +} + +/// Serialize a section key + value into a YAML fragment like: +/// +/// ```yaml +/// model: +/// default: "anthropic/claude-opus-4-7" +/// provider: "openrouter" +/// ``` +fn serialize_yaml_section(key: &str, value: &serde_yaml::Value) -> Result { + let mut section = serde_yaml::Mapping::new(); + section.insert(serde_yaml::Value::String(key.to_string()), value.clone()); + let yaml_str = serde_yaml::to_string(&serde_yaml::Value::Mapping(section)) + .map_err(|e| AppError::Config(format!("Failed to serialize YAML section '{key}': {e}")))?; + Ok(yaml_str) +} + +/// Replace a YAML section in raw text, or append it if not found. +fn replace_yaml_section( + raw: &str, + section_key: &str, + value: &serde_yaml::Value, +) -> Result { + let serialized = serialize_yaml_section(section_key, value)?; + + if let Some((start, end)) = find_yaml_section_range(raw, section_key) { + let mut result = String::with_capacity(raw.len()); + result.push_str(&raw[..start]); + result.push_str(&serialized); + // Ensure proper separation between sections + let remainder = &raw[end..]; + if !serialized.ends_with('\n') && !remainder.is_empty() && !remainder.starts_with('\n') { + result.push('\n'); + } + result.push_str(remainder); + Ok(result) + } else { + // Section not found — append at end + let mut result = raw.to_string(); + if !result.is_empty() && !result.ends_with('\n') { + result.push('\n'); + } + result.push_str(&serialized); + if !result.ends_with('\n') { + result.push('\n'); + } + Ok(result) + } +} + +// ============================================================================ +// Backup & Cleanup +// ============================================================================ + +fn create_hermes_backup(source: &str) -> Result { + let backup_dir = get_app_config_dir().join("backups").join("hermes"); + fs::create_dir_all(&backup_dir).map_err(|e| AppError::io(&backup_dir, e))?; + + let base_id = format!("hermes_{}", Local::now().format("%Y%m%d_%H%M%S")); + let mut filename = format!("{base_id}.yaml"); + let mut backup_path = backup_dir.join(&filename); + let mut counter = 1; + + while backup_path.exists() { + filename = format!("{base_id}_{counter}.yaml"); + backup_path = backup_dir.join(&filename); + counter += 1; + } + + atomic_write(&backup_path, source.as_bytes())?; + cleanup_hermes_backups(&backup_dir)?; + Ok(backup_path) +} + +fn cleanup_hermes_backups(dir: &Path) -> Result<(), AppError> { + let retain = effective_backup_retain_count(); + let mut entries = fs::read_dir(dir) + .map_err(|e| AppError::io(dir, e))? + .filter_map(|entry| entry.ok()) + .filter(|entry| { + entry + .path() + .extension() + .map(|ext| ext == "yaml" || ext == "yml") + .unwrap_or(false) + }) + .collect::>(); + + if entries.len() <= retain { + return Ok(()); + } + + entries.sort_by_key(|entry| entry.metadata().and_then(|m| m.modified()).ok()); + let remove_count = entries.len().saturating_sub(retain); + for entry in entries.into_iter().take(remove_count) { + if let Err(err) = fs::remove_file(entry.path()) { + log::warn!( + "Failed to remove old Hermes config backup {}: {err}", + entry.path().display() + ); + } + } + + Ok(()) +} + +// ============================================================================ +// High-level Write Helper +// ============================================================================ + +/// Write a single top-level YAML section to config.yaml using section-level replacement. +/// +/// This preserves comments and unrelated sections while only modifying the +/// target section. +fn write_yaml_section_to_config( + section_key: &str, + value: &serde_yaml::Value, +) -> Result { + let _guard = hermes_write_lock().lock()?; + write_yaml_section_to_config_locked(section_key, value) +} + +/// Inner write helper — caller must already hold the write lock. +fn write_yaml_section_to_config_locked( + section_key: &str, + value: &serde_yaml::Value, +) -> Result { + let config_path = get_hermes_config_path(); + let raw = if config_path.exists() { + fs::read_to_string(&config_path).map_err(|e| AppError::io(&config_path, e))? + } else { + String::new() + }; + + let new_raw = replace_yaml_section(&raw, section_key, value)?; + + if new_raw == raw { + return Ok(HermesWriteOutcome::default()); + } + + let backup_path = if !raw.is_empty() { + Some(create_hermes_backup(&raw)?) + } else { + None + }; + + if let Some(parent) = config_path.parent() { + fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?; + } + + atomic_write(&config_path, new_raw.as_bytes())?; + + log::debug!( + "Hermes config section '{}' written to {:?}", + section_key, + config_path + ); + Ok(HermesWriteOutcome { + backup_path: backup_path.map(|p| p.display().to_string()), + }) +} + +// ============================================================================ +// Provider Functions +// ============================================================================ + +/// Convert a provider's `models` field from a UI-friendly array to the YAML +/// dict shape that Hermes expects. +/// +/// Input (from CC Switch UI / database): +/// ```json +/// "models": [{ "id": "foo", "context_length": 200000 }, { "id": "bar" }] +/// ``` +/// +/// Output (what we write to YAML): +/// ```json +/// "models": { "foo": { "context_length": 200000 }, "bar": {} } +/// ``` +/// +/// Entries with a missing or empty `id` are dropped. The top-level `id` key +/// is stripped from each value since it now lives on the parent as the map +/// key. Insertion order is preserved (serde_json uses IndexMap under the +/// `preserve_order` feature). +fn models_array_to_dict(array: Vec) -> serde_json::Value { + let mut map = serde_json::Map::new(); + for item in array { + let serde_json::Value::Object(mut obj) = item else { + continue; + }; + let Some(id) = obj + .remove("id") + .and_then(|v| v.as_str().map(|s| s.trim().to_string())) + .filter(|s| !s.is_empty()) + else { + continue; + }; + map.insert(id, serde_json::Value::Object(obj)); + } + serde_json::Value::Object(map) +} + +/// Inverse of [`models_array_to_dict`]. Converts the YAML dict shape back to +/// the UI-friendly ordered array, re-injecting `id` as an object field. +fn models_dict_to_array(dict: serde_json::Map) -> serde_json::Value { + let mut out = Vec::with_capacity(dict.len()); + for (id, value) in dict { + let mut obj = match value { + serde_json::Value::Object(obj) => obj, + serde_json::Value::Null => serde_json::Map::new(), + other => { + log::warn!("Unexpected Hermes model entry for '{id}': {other:?}, skipping"); + continue; + } + }; + obj.insert("id".to_string(), serde_json::Value::String(id)); + out.push(serde_json::Value::Object(obj)); + } + serde_json::Value::Array(out) +} + +/// Rewrite historical camelCase keys to Hermes' snake_case schema. +/// +/// Older DeepLink import paths emitted `baseUrl` / `apiKey` / `apiMode` / +/// `maxTokens` / `contextLength`, which do not belong to Hermes' +/// `_VALID_CUSTOM_PROVIDER_FIELDS` set. Writing those raw to YAML silently +/// poisons `custom_providers:` entries. This sanitiser runs defensively on +/// every `set_provider` call so stored data heals on the next activation; +/// unknown keys pass through untouched to keep forward-compat with new +/// Hermes fields (e.g. `request_timeout_seconds`). +fn sanitize_hermes_provider_keys(config: &mut serde_json::Value) { + const KEY_ALIASES: &[(&str, &str)] = &[ + ("baseUrl", "base_url"), + ("apiKey", "api_key"), + ("apiMode", "api_mode"), + ("maxTokens", "max_tokens"), + ("contextLength", "context_length"), + ]; + // Legacy DeepLink emitted `api: "openai-completions"` which is neither a + // Hermes field nor mappable to `api_mode`. `_cc_source` / `provider_key` + // are UI-only markers injected on read — they must never reach YAML. + const LEGACY_FIELDS_TO_DROP: &[&str] = &["api", PROVIDER_SOURCE_FIELD, "provider_key"]; + + let Some(obj) = config.as_object_mut() else { + return; + }; + + for (from, to) in KEY_ALIASES { + if let Some(val) = obj.remove(*from) { + // snake_case wins when both are present; stale camelCase is dropped. + obj.entry((*to).to_string()).or_insert(val); + } + } + + for field in LEGACY_FIELDS_TO_DROP { + obj.remove(*field); + } +} + +/// If `config.models` is a JSON array, convert it in-place to the dict shape. +/// No-op when `models` is absent or already a dict. +fn normalize_provider_models_for_write(config: &mut serde_json::Value) { + let Some(obj) = config.as_object_mut() else { + return; + }; + let Some(models_val) = obj.get_mut("models") else { + return; + }; + if models_val.is_array() { + let taken = std::mem::take(models_val); + if let serde_json::Value::Array(arr) = taken { + *models_val = models_array_to_dict(arr); + } + } +} + +/// If `config.models` is a JSON dict, convert it in-place to the ordered array +/// shape. No-op when `models` is absent or already an array. +fn denormalize_provider_models_for_read(config: &mut serde_json::Value) { + let Some(obj) = config.as_object_mut() else { + return; + }; + let Some(models_val) = obj.get_mut("models") else { + return; + }; + if models_val.is_object() { + let taken = std::mem::take(models_val); + if let serde_json::Value::Object(map) = taken { + *models_val = models_dict_to_array(map); + } + } +} + +/// Marker field injected on provider payloads sourced from Hermes v12+ +/// `providers:` dict. CC Switch treats those as read-only — writes have to +/// go through Hermes' own Web UI to keep its overlay semantics intact. +pub const PROVIDER_SOURCE_FIELD: &str = "_cc_source"; +pub const PROVIDER_SOURCE_CUSTOM_LIST: &str = "custom_providers"; +pub const PROVIDER_SOURCE_DICT: &str = "providers_dict"; + +/// Normalize a single entry from the v12+ `providers:` dict into the same +/// JSON shape that `custom_providers:` list entries take, mirroring upstream +/// `_normalize_custom_provider_entry` (hermes_cli/config.py). +/// +/// Returns `None` when the entry is not a mapping or lacks any usable name. +fn normalize_providers_dict_entry( + key: &str, + entry: &serde_yaml::Value, +) -> Result, AppError> { + if !entry.is_mapping() { + return Ok(None); + } + let mut json_val = yaml_to_json(entry)?; + let Some(obj) = json_val.as_object_mut() else { + return Ok(None); + }; + // Upstream prefers an explicit `name` when present, falling back to the + // dict key. Always round-trip it to a trimmed non-empty string. + let resolved_name = obj + .get("name") + .and_then(|v| v.as_str()) + .map(str::trim) + .filter(|s| !s.is_empty()) + .map(str::to_string) + .unwrap_or_else(|| key.trim().to_string()); + if resolved_name.is_empty() { + return Ok(None); + } + obj.insert("name".to_string(), serde_json::json!(resolved_name)); + obj.insert("provider_key".to_string(), serde_json::json!(key)); + obj.insert( + PROVIDER_SOURCE_FIELD.to_string(), + serde_json::json!(PROVIDER_SOURCE_DICT), + ); + Ok(Some(json_val)) +} + +/// Collect provider entries living under the v12+ `providers:` dict. +fn read_providers_dict_entries(config: &serde_yaml::Value) -> Vec<(String, serde_json::Value)> { + let Some(mapping) = config.get("providers").and_then(|v| v.as_mapping()) else { + return Vec::new(); + }; + let mut out = Vec::with_capacity(mapping.len()); + for (k, v) in mapping { + let Some(key_str) = k.as_str().map(str::trim).filter(|s| !s.is_empty()) else { + continue; + }; + match normalize_providers_dict_entry(key_str, v) { + Ok(Some(entry)) => { + let name = entry + .get("name") + .and_then(|n| n.as_str()) + .unwrap_or(key_str) + .to_string(); + out.push((name, entry)); + } + Ok(None) => { + log::debug!("Skipping Hermes providers['{key_str}']: not a mapping"); + } + Err(e) => { + log::warn!("Failed to normalize Hermes providers['{key_str}']: {e}"); + } + } + } + out +} + +/// Get all providers as a JSON map keyed by provider name. +/// +/// Unions two on-disk sources, matching upstream `get_compatible_custom_providers`: +/// - `custom_providers:` list entries (writable by CC Switch) +/// - `providers:` dict entries (v12+ schema, surfaced read-only with +/// `_cc_source = "providers_dict"` so the UI can disable edit/delete) +/// +/// When a name appears in both, the list entry wins (upstream dedup order), +/// keeping CC Switch free to edit it. Models are denormalized from the YAML +/// dict shape to the UI-friendly ordered array. +pub fn get_providers() -> Result, AppError> { + let config = read_hermes_config()?; + let mut map = serde_json::Map::new(); + + if let Some(seq) = config.get("custom_providers").and_then(|v| v.as_sequence()) { + for item in seq { + if let Some(name) = item.get("name").and_then(|n| n.as_str()) { + match yaml_to_json(item) { + Ok(mut json_val) => { + // Heal legacy camelCase records (from older DeepLink + // imports) before the UI sees them, so editing doesn't + // reveal stale `baseUrl` / `apiKey` fields. + sanitize_hermes_provider_keys(&mut json_val); + denormalize_provider_models_for_read(&mut json_val); + if let Some(obj) = json_val.as_object_mut() { + obj.insert( + PROVIDER_SOURCE_FIELD.to_string(), + serde_json::json!(PROVIDER_SOURCE_CUSTOM_LIST), + ); + } + map.insert(name.to_string(), json_val); + } + Err(e) => { + log::warn!("Failed to convert Hermes provider '{name}' to JSON: {e}"); + } + } + } + } + } + + for (name, mut entry) in read_providers_dict_entries(&config) { + if map.contains_key(&name) { + continue; // list wins over dict on duplicate names + } + denormalize_provider_models_for_read(&mut entry); + map.insert(name, entry); + } + + Ok(map) +} + +/// Reject writes that would target a dict-only overlay entry. +/// +/// `verb` is inlined into the user-facing error so both "edit" and "remove" +/// callers can share one implementation. +fn ensure_provider_writable( + config: &serde_yaml::Value, + name: &str, + verb: &str, +) -> Result<(), AppError> { + if is_dict_only_provider(config, name) { + return Err(AppError::Config(format!( + "Provider '{name}' is managed by Hermes' 'providers:' dict — {verb} via Hermes Web UI" + ))); + } + Ok(()) +} + +/// True when `name` appears in `providers:` dict but not in `custom_providers:` +/// list — i.e. it is a read-only overlay CC Switch must not touch. +fn is_dict_only_provider(config: &serde_yaml::Value, name: &str) -> bool { + let list_has = config + .get("custom_providers") + .and_then(|v| v.as_sequence()) + .map(|seq| { + seq.iter() + .any(|item| item.get("name").and_then(|n| n.as_str()) == Some(name)) + }) + .unwrap_or(false); + if list_has { + return false; + } + config + .get("providers") + .and_then(|v| v.as_mapping()) + .map(|m| { + m.iter().any(|(k, v)| { + let key_matches = k.as_str() == Some(name); + let name_matches = v + .get("name") + .and_then(|n| n.as_str()) + .map(|s| s == name) + .unwrap_or(false); + (key_matches || name_matches) && v.is_mapping() + }) + }) + .unwrap_or(false) +} + +/// Get a single custom provider by name. +pub fn get_provider(name: &str) -> Result, AppError> { + Ok(get_providers()?.get(name).cloned()) +} + +/// Set (upsert) a custom provider by name. +/// +/// Upserts into the `custom_providers:` YAML sequence (matched by `name`). +/// The entry includes: +/// - `name:` field matching the provider id +/// - singular `model:` field set to the first model id from the `models:` +/// dict — the Hermes runtime and `/model` picker both read this field +/// (runtime_provider.py reads it via `_normalize_custom_provider_entry`; +/// main.py:1436/1450 uses it for picker hints) +/// - plural `models:` dict carrying per-model `context_length` etc. +/// +/// The entire read-modify-write is done under the write lock to prevent +/// TOCTOU races. +pub fn set_provider( + name: &str, + provider_config: serde_json::Value, +) -> Result { + let _guard = hermes_write_lock().lock()?; + + let config = read_hermes_config()?; + ensure_provider_writable(&config, name, "edit")?; + let mut providers: Vec = config + .get("custom_providers") + .and_then(|v| v.as_sequence()) + .cloned() + .unwrap_or_default(); + + // Rewrite any historical camelCase keys (e.g. from older DeepLink imports) + // before touching models / YAML — avoids writing non-Hermes fields back. + let mut normalized = provider_config; + sanitize_hermes_provider_keys(&mut normalized); + + // Normalize `models` from UI array to Hermes YAML dict before serializing. + normalize_provider_models_for_write(&mut normalized); + + // Extract the first model id (now a key in the normalized dict) so we can + // propagate it to the singular `model:` field Hermes reads. + let first_model_id = normalized + .get("models") + .and_then(|v| v.as_object()) + .and_then(|obj| obj.keys().next()) + .cloned(); + + let mut yaml_val: serde_yaml::Value = json_to_yaml(&normalized)?; + if let serde_yaml::Value::Mapping(ref mut m) = yaml_val { + m.insert( + serde_yaml::Value::String("name".to_string()), + serde_yaml::Value::String(name.to_string()), + ); + if let Some(model_id) = first_model_id { + m.insert( + serde_yaml::Value::String("model".to_string()), + serde_yaml::Value::String(model_id), + ); + } else { + m.remove(serde_yaml::Value::String("model".to_string())); + } + } + + if let Some(existing) = providers + .iter_mut() + .find(|p| p.get("name").and_then(|n| n.as_str()) == Some(name)) + { + // Forward-compat: carry over any on-disk fields the UI payload didn't + // include. Hermes keeps evolving (e.g. `request_timeout_seconds`, + // `key_env`), and users may set those via Hermes Web UI — without + // this merge, a CC Switch edit to an unrelated field would silently + // strip them on write-back. + if let (Some(existing_map), serde_yaml::Value::Mapping(new_map)) = + (existing.as_mapping(), &mut yaml_val) + { + for (k, v) in existing_map { + new_map.entry(k.clone()).or_insert_with(|| v.clone()); + } + } + *existing = yaml_val; + } else { + providers.push(yaml_val); + } + + let providers_value = serde_yaml::Value::Sequence(providers); + write_yaml_section_to_config_locked("custom_providers", &providers_value) +} + +/// Remove a custom provider by name. +/// +/// Filters out the matching entry from the `custom_providers:` sequence. +/// No-op if the section is missing or no entry matches. The entire +/// read-modify-write is done under the write lock to prevent TOCTOU races. +pub fn remove_provider(name: &str) -> Result { + let _guard = hermes_write_lock().lock()?; + let config = read_hermes_config()?; + + ensure_provider_writable(&config, name, "remove")?; + + let mut providers: Vec = config + .get("custom_providers") + .and_then(|v| v.as_sequence()) + .cloned() + .unwrap_or_default(); + + let original_len = providers.len(); + providers.retain(|p| p.get("name").and_then(|n| n.as_str()) != Some(name)); + if providers.len() == original_len { + return Ok(HermesWriteOutcome::default()); + } + + let providers_value = serde_yaml::Value::Sequence(providers); + write_yaml_section_to_config_locked("custom_providers", &providers_value) +} + +// ============================================================================ +// Model Config Functions +// ============================================================================ + +/// Get the `model` section as a typed config. +pub fn get_model_config() -> Result, AppError> { + let config = read_hermes_config()?; + let Some(model_value) = config.get("model") else { + return Ok(None); + }; + let json_val = yaml_to_json(model_value)?; + let model = serde_json::from_value(json_val) + .map_err(|e| AppError::Config(format!("Failed to parse Hermes model config: {e}")))?; + Ok(Some(model)) +} + +/// Set the `model` section. +pub fn set_model_config(model: &HermesModelConfig) -> Result { + let json_val = + serde_json::to_value(model).map_err(|e| AppError::JsonSerialize { source: e })?; + let yaml_val = json_to_yaml(&json_val)?; + write_yaml_section_to_config("model", &yaml_val) +} + +/// Apply the top-level `model:` defaults when switching to a Hermes provider. +/// +/// `model.provider` is **always** updated to the new provider id — without +/// this, switching to a provider whose settings lack a `models` list would +/// leave the runtime routing requests to the previously active provider. +/// +/// `model.default` is only overwritten when the new provider declares at +/// least one model; otherwise the previous default is preserved so users +/// still have a runnable configuration (Hermes will surface a clear error +/// if the default no longer belongs to the active provider). +/// +/// Existing fields in `model:` (`context_length` / `max_tokens` / `base_url` +/// / `extra`) are preserved via struct-update. +pub fn apply_switch_defaults( + provider_id: &str, + settings_config: &serde_json::Value, +) -> Result { + let first_model_id = settings_config + .get("models") + .and_then(|v| v.as_array()) + .and_then(|arr| arr.first()) + .and_then(|m| m.get("id")) + .and_then(|id| id.as_str()) + .map(|s| s.trim().to_string()) + .filter(|s| !s.is_empty()); + + let current = get_model_config()?.unwrap_or_default(); + let merged = HermesModelConfig { + default: first_model_id.or(current.default.clone()), + provider: Some(provider_id.to_string()), + ..current + }; + set_model_config(&merged) +} + +// ============================================================================ +// MCP Section Access (for mcp/hermes.rs to use in Phase 4) +// ============================================================================ + +/// Get the `mcp_servers` section as a YAML Mapping. +pub fn get_mcp_servers_yaml() -> Result { + let config = read_hermes_config()?; + Ok(config + .get("mcp_servers") + .and_then(|v| v.as_mapping()) + .cloned() + .unwrap_or_default()) +} + +/// Atomically read-modify-write the `mcp_servers` section under the write lock. +/// +/// Prevents TOCTOU races when multiple sync operations run concurrently. +pub fn update_mcp_servers_yaml(updater: F) -> Result<(), AppError> +where + F: FnOnce(&mut serde_yaml::Mapping) -> Result<(), AppError>, +{ + let _guard = hermes_write_lock().lock()?; + let config = read_hermes_config()?; + let mut servers = config + .get("mcp_servers") + .and_then(|v| v.as_mapping()) + .cloned() + .unwrap_or_default(); + updater(&mut servers)?; + let value = serde_yaml::Value::Mapping(servers); + write_yaml_section_to_config_locked("mcp_servers", &value)?; + Ok(()) +} + +// ============================================================================ +// YAML ↔ JSON Conversion Helpers +// ============================================================================ + +/// Convert a `serde_yaml::Value` to a `serde_json::Value`. +pub(crate) fn yaml_to_json(yaml: &serde_yaml::Value) -> Result { + // Serialize YAML value to string, then parse as JSON value. + // This handles all type mappings correctly. + let yaml_str = serde_yaml::to_string(yaml) + .map_err(|e| AppError::Config(format!("Failed to serialize YAML value: {e}")))?; + serde_yaml::from_str::(&yaml_str) + .map_err(|e| AppError::Config(format!("Failed to convert YAML to JSON: {e}"))) +} + +/// Convert a `serde_json::Value` to a `serde_yaml::Value`. +pub(crate) fn json_to_yaml(json: &serde_json::Value) -> Result { + let json_str = serde_json::to_string(json) + .map_err(|e| AppError::Config(format!("Failed to serialize JSON value: {e}")))?; + serde_yaml::from_str(&json_str) + .map_err(|e| AppError::Config(format!("Failed to convert JSON to YAML: {e}"))) +} + +// ============================================================================ +// Memory Files (~/.hermes/memories/{MEMORY,USER}.md) +// ============================================================================ +// +// Hermes Agent persists two memory blobs on disk: +// - `MEMORY.md` — agent's personal notes, snapshotted into the system prompt +// - `USER.md` — user profile, same treatment +// Entries are separated by a `§` on its own line. Hermes' own Web UI only +// exposes on/off toggles and character budgets — it has no content editor. +// CC Switch fills that gap by reading/writing the whole file as a markdown +// blob. Character budgets (`memory_char_limit`, `user_char_limit`) and enable +// flags (`memory_enabled`, `user_profile_enabled`) live at the top level of +// `config.yaml`; Hermes truncates over-budget content at load time. + +/// Which of Hermes' two memory files to operate on. Tauri deserializes this +/// directly from the `"memory"` / `"user"` strings the frontend sends, so an +/// unknown value is rejected at the IPC boundary instead of deep in the stack. +#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize)] +#[serde(rename_all = "lowercase")] +pub enum MemoryKind { + Memory, + User, +} + +impl MemoryKind { + fn filename(self) -> &'static str { + match self { + Self::Memory => "MEMORY.md", + Self::User => "USER.md", + } + } +} + +fn memories_dir() -> PathBuf { + get_hermes_dir().join("memories") +} + +/// Read a Hermes memory file as a markdown blob. Returns an empty string +/// when the file doesn't exist yet (first-run case). +pub fn read_memory(kind: MemoryKind) -> Result { + let path = memories_dir().join(kind.filename()); + match fs::read_to_string(&path) { + Ok(content) => Ok(content), + Err(e) if e.kind() == std::io::ErrorKind::NotFound => Ok(String::new()), + Err(e) => Err(AppError::io(&path, e)), + } +} + +/// Atomically replace a Hermes memory file. `atomic_write` creates parent +/// directories as needed, so `~/.hermes/memories/` is materialized on first +/// write without a separate `create_dir_all` call. +pub fn write_memory(kind: MemoryKind, content: &str) -> Result<(), AppError> { + let path = memories_dir().join(kind.filename()); + atomic_write(&path, content.as_bytes()) +} + +/// Character budget + enable flags for the two memory blobs, as configured +/// in Hermes' `config.yaml`. Defaults mirror `~/.hermes`'s own defaults so +/// callers get a usable budget bar even before the user edits config.yaml. +#[derive(Debug, Clone, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct HermesMemoryLimits { + pub memory: usize, + pub user: usize, + pub memory_enabled: bool, + pub user_enabled: bool, +} + +impl Default for HermesMemoryLimits { + fn default() -> Self { + Self { + memory: 2200, + user: 1375, + memory_enabled: true, + user_enabled: true, + } + } +} + +/// Toggle the on/off flag for one of Hermes' two memory blobs, preserving all +/// other fields in the `memory:` section (character budgets, external provider +/// settings, etc.). Hermes stores the user-profile toggle under +/// `user_profile_enabled` (not `user_enabled`), so the mapping to on-disk keys +/// lives here rather than leaking to callers. +pub fn set_memory_enabled(kind: MemoryKind, enabled: bool) -> Result { + let _guard = hermes_write_lock().lock()?; + let config = read_hermes_config()?; + + let mut memory = match config.get("memory") { + Some(serde_yaml::Value::Mapping(m)) => m.clone(), + _ => serde_yaml::Mapping::new(), + }; + + let key = match kind { + MemoryKind::Memory => "memory_enabled", + MemoryKind::User => "user_profile_enabled", + }; + memory.insert( + serde_yaml::Value::String(key.to_string()), + serde_yaml::Value::Bool(enabled), + ); + + write_yaml_section_to_config_locked("memory", &serde_yaml::Value::Mapping(memory)) +} + +/// Read memory budgets + toggles from `config.yaml`. Missing/unparsable +/// fields fall back to `HermesMemoryLimits::default()` rather than erroring, +/// so an empty or partially-populated config still yields a usable UI. +pub fn read_memory_limits() -> Result { + let mut out = HermesMemoryLimits::default(); + let config = read_hermes_config()?; + let Some(memory) = config.get("memory") else { + return Ok(out); + }; + + if let Some(v) = memory.get("memory_char_limit").and_then(|v| v.as_u64()) { + out.memory = v as usize; + } + if let Some(v) = memory.get("user_char_limit").and_then(|v| v.as_u64()) { + out.user = v as usize; + } + if let Some(v) = memory.get("memory_enabled").and_then(|v| v.as_bool()) { + out.memory_enabled = v; + } + if let Some(v) = memory.get("user_profile_enabled").and_then(|v| v.as_bool()) { + out.user_enabled = v; + } + + Ok(out) +} + +// ============================================================================ +// Tests +// ============================================================================ + +#[cfg(test)] +mod tests { + use super::*; + use serial_test::serial; + use std::sync::{Mutex, OnceLock}; + + fn test_guard() -> std::sync::MutexGuard<'static, ()> { + static LOCK: OnceLock> = OnceLock::new(); + LOCK.get_or_init(|| Mutex::new(())) + .lock() + .unwrap_or_else(|err| err.into_inner()) + } + + /// Run a test with an isolated temp home directory. + /// + /// Saves and restores `CC_SWITCH_TEST_HOME` to avoid interfering with + /// parallel tests in other modules. + fn with_test_home(test_fn: impl FnOnce() -> T) -> T { + let _guard = test_guard(); + let tmp = tempfile::tempdir().unwrap(); + let old_test_home = std::env::var_os("CC_SWITCH_TEST_HOME"); + std::env::set_var("CC_SWITCH_TEST_HOME", tmp.path()); + let result = test_fn(); + match old_test_home { + Some(value) => std::env::set_var("CC_SWITCH_TEST_HOME", value), + None => std::env::remove_var("CC_SWITCH_TEST_HOME"), + } + result + } + + // ---- sanitize_hermes_provider_keys tests ---- + + #[test] + fn sanitize_rewrites_camel_case_aliases() { + let mut v = serde_json::json!({ + "name": "test", + "baseUrl": "https://api.example.com", + "apiKey": "sk-123", + "apiMode": "chat_completions", + "maxTokens": 8192, + "contextLength": 200000, + }); + sanitize_hermes_provider_keys(&mut v); + let obj = v.as_object().unwrap(); + assert_eq!(obj.get("base_url").unwrap(), "https://api.example.com"); + assert_eq!(obj.get("api_key").unwrap(), "sk-123"); + assert_eq!(obj.get("api_mode").unwrap(), "chat_completions"); + assert_eq!(obj.get("max_tokens").unwrap(), 8192); + assert_eq!(obj.get("context_length").unwrap(), 200000); + assert!(obj.get("baseUrl").is_none()); + assert!(obj.get("apiKey").is_none()); + } + + #[test] + fn sanitize_drops_stale_duplicate_when_snake_case_exists() { + let mut v = serde_json::json!({ + "baseUrl": "https://old.example.com", + "base_url": "https://new.example.com", + }); + sanitize_hermes_provider_keys(&mut v); + let obj = v.as_object().unwrap(); + // snake_case wins; stale camelCase is dropped + assert_eq!(obj.get("base_url").unwrap(), "https://new.example.com"); + assert!(obj.get("baseUrl").is_none()); + } + + #[test] + fn sanitize_drops_legacy_api_field() { + let mut v = serde_json::json!({ + "base_url": "https://api.example.com", + "api": "openai-completions", + }); + sanitize_hermes_provider_keys(&mut v); + let obj = v.as_object().unwrap(); + assert!(obj.get("api").is_none(), "legacy 'api' key must be removed"); + assert!(obj.get("base_url").is_some()); + } + + #[test] + fn sanitize_preserves_unknown_fields() { + let mut v = serde_json::json!({ + "base_url": "https://api.example.com", + "request_timeout_seconds": 300, + "rate_limit_delay": 1.5, + }); + sanitize_hermes_provider_keys(&mut v); + let obj = v.as_object().unwrap(); + // Forward-compat: Hermes' own new fields pass through untouched + assert_eq!(obj.get("request_timeout_seconds").unwrap(), 300); + assert_eq!(obj.get("rate_limit_delay").unwrap(), 1.5); + } + + #[test] + fn sanitize_noop_on_non_object() { + let mut v = serde_json::json!(["not", "an", "object"]); + sanitize_hermes_provider_keys(&mut v); + assert!(v.is_array()); + } + + // ---- find_yaml_section_range tests ---- + + #[test] + fn find_section_in_multi_section_yaml() { + let yaml = "\ +model: + default: gpt-4 + provider: openai +agent: + max_turns: 10 +custom_providers: + - name: foo +"; + let (start, end) = find_yaml_section_range(yaml, "agent").unwrap(); + let section = &yaml[start..end]; + assert!(section.starts_with("agent:")); + assert!(section.contains("max_turns")); + assert!(!section.contains("custom_providers")); + } + + #[test] + fn find_section_at_end_of_file() { + let yaml = "\ +model: + default: gpt-4 +agent: + max_turns: 10 +"; + let (start, end) = find_yaml_section_range(yaml, "agent").unwrap(); + let section = &yaml[start..end]; + assert!(section.starts_with("agent:")); + assert!(section.contains("max_turns")); + assert_eq!(end, yaml.len()); + } + + #[test] + fn find_section_not_found() { + let yaml = "\ +model: + default: gpt-4 +"; + assert!(find_yaml_section_range(yaml, "agent").is_none()); + } + + #[test] + fn find_section_with_comments_between() { + let yaml = "\ +model: + default: gpt-4 + +# This is a comment + # indented comment + +agent: + max_turns: 10 +"; + // model section should span from start to "agent:" + let (start, end) = find_yaml_section_range(yaml, "model").unwrap(); + let section = &yaml[start..end]; + assert!(section.starts_with("model:")); + // Comments and blank lines between sections are included in the prior section + assert!(section.contains("# This is a comment")); + } + + #[test] + fn find_section_with_empty_lines() { + let yaml = "\ +model: + default: gpt-4 + +agent: + max_turns: 10 +"; + let (start, end) = find_yaml_section_range(yaml, "model").unwrap(); + let section = &yaml[start..end]; + assert!(section.starts_with("model:")); + // Empty lines don't terminate a section + assert!(section.contains('\n')); + } + + #[test] + fn find_section_does_not_match_substring_key() { + let yaml = "\ +model_extra: + foo: bar +model: + default: gpt-4 +"; + let (start, _end) = find_yaml_section_range(yaml, "model").unwrap(); + let section = &yaml[start..]; + // Should match "model:", not "model_extra:" + assert!(section.starts_with("model:")); + assert!(!section.starts_with("model_extra:")); + } + + // ---- replace_yaml_section tests ---- + + #[test] + fn replace_existing_section() { + let yaml = "\ +model: + default: gpt-4 + provider: openai +agent: + max_turns: 10 +"; + let new_model = serde_yaml::Value::Mapping({ + let mut m = serde_yaml::Mapping::new(); + m.insert( + serde_yaml::Value::String("default".to_string()), + serde_yaml::Value::String("claude-opus-4-7".to_string()), + ); + m.insert( + serde_yaml::Value::String("provider".to_string()), + serde_yaml::Value::String("anthropic".to_string()), + ); + m + }); + + let result = replace_yaml_section(yaml, "model", &new_model).unwrap(); + // The result should still contain the agent section + assert!(result.contains("agent:")); + assert!(result.contains("max_turns")); + // And the model section should be updated + assert!(result.contains("claude-opus-4-7")); + assert!(result.contains("anthropic")); + assert!(!result.contains("gpt-4")); + assert!(!result.contains("openai")); + } + + #[test] + fn append_new_section() { + let yaml = "\ +model: + default: gpt-4 +"; + let new_agent = serde_yaml::Value::Mapping({ + let mut m = serde_yaml::Mapping::new(); + m.insert( + serde_yaml::Value::String("max_turns".to_string()), + serde_yaml::Value::Number(serde_yaml::Number::from(50)), + ); + m + }); + + let result = replace_yaml_section(yaml, "agent", &new_agent).unwrap(); + assert!(result.contains("model:")); + assert!(result.contains("gpt-4")); + assert!(result.contains("agent:")); + assert!(result.contains("max_turns: 50")); + } + + #[test] + fn replace_section_in_empty_file() { + let yaml = ""; + let new_model = serde_yaml::Value::Mapping({ + let mut m = serde_yaml::Mapping::new(); + m.insert( + serde_yaml::Value::String("default".to_string()), + serde_yaml::Value::String("gpt-4".to_string()), + ); + m + }); + + let result = replace_yaml_section(yaml, "model", &new_model).unwrap(); + assert!(result.contains("model:")); + assert!(result.contains("gpt-4")); + assert!(result.ends_with('\n')); + } + + // ---- Provider CRUD via mock config ---- + + #[test] + #[serial] + fn provider_crud_roundtrip() { + with_test_home(|| { + // Initially no providers + let providers = get_providers().unwrap(); + assert!(providers.is_empty()); + + // Add a provider + let config = serde_json::json!({ + "base_url": "https://openrouter.ai/api/v1", + "api_key": "sk-or-test" + }); + set_provider("openrouter", config).unwrap(); + + let providers = get_providers().unwrap(); + assert_eq!(providers.len(), 1); + assert!(providers.contains_key("openrouter")); + + let provider = get_provider("openrouter").unwrap().unwrap(); + assert_eq!(provider["base_url"], "https://openrouter.ai/api/v1"); + assert_eq!(provider["name"], "openrouter"); + + // Update the provider + let config2 = serde_json::json!({ + "base_url": "https://openrouter.ai/api/v2", + "api_key": "sk-or-updated" + }); + set_provider("openrouter", config2).unwrap(); + + let provider = get_provider("openrouter").unwrap().unwrap(); + assert_eq!(provider["base_url"], "https://openrouter.ai/api/v2"); + + // Remove the provider + remove_provider("openrouter").unwrap(); + let providers = get_providers().unwrap(); + assert!(providers.is_empty()); + }); + } + + #[test] + #[serial] + fn set_provider_preserves_unknown_fields_on_update() { + // Hermes keeps adding provider-level fields (e.g. + // `request_timeout_seconds`, `key_env`). Users may set those via + // Hermes Web UI; a later CC Switch edit must not strip them — set_provider + // carries over any existing on-disk fields that the UI payload didn't + // submit. + with_test_home(|| { + let yaml = "\ +custom_providers: + - name: acme + base_url: https://old.example.com + api_key: sk-old + request_timeout_seconds: 300 + key_env: ACME_API_KEY +"; + let config_path = get_hermes_config_path(); + fs::create_dir_all(config_path.parent().unwrap()).unwrap(); + fs::write(&config_path, yaml).unwrap(); + + let update = serde_json::json!({ + "base_url": "https://new.example.com", + "api_key": "sk-new" + }); + set_provider("acme", update).unwrap(); + + let provider = get_provider("acme").unwrap().unwrap(); + assert_eq!(provider["base_url"], "https://new.example.com"); + assert_eq!(provider["api_key"], "sk-new"); + assert_eq!(provider["request_timeout_seconds"], 300); + assert_eq!(provider["key_env"], "ACME_API_KEY"); + }); + } + + #[test] + #[serial] + fn get_providers_surfaces_providers_dict_as_read_only() { + with_test_home(|| { + let yaml = "\ +_config_version: 19 +custom_providers: + - name: mine + base_url: https://mine.example.com + api_key: sk-mine +providers: + anthropic: + base_url: https://api.anthropic.com + api_key: sk-ant + model: claude-opus-4.6 + ollama-local: + base_url: http://localhost:11434/v1 + request_timeout_seconds: 300 +"; + let config_path = get_hermes_config_path(); + fs::create_dir_all(config_path.parent().unwrap()).unwrap(); + fs::write(&config_path, yaml).unwrap(); + + let providers = get_providers().unwrap(); + assert_eq!(providers.len(), 3); + + let mine = providers.get("mine").unwrap(); + assert_eq!(mine[PROVIDER_SOURCE_FIELD], PROVIDER_SOURCE_CUSTOM_LIST); + + let anthropic = providers.get("anthropic").unwrap(); + assert_eq!(anthropic[PROVIDER_SOURCE_FIELD], PROVIDER_SOURCE_DICT); + assert_eq!(anthropic["provider_key"], "anthropic"); + assert_eq!(anthropic["base_url"], "https://api.anthropic.com"); + + let ollama = providers.get("ollama-local").unwrap(); + assert_eq!(ollama[PROVIDER_SOURCE_FIELD], PROVIDER_SOURCE_DICT); + // Forward-compat fields from the dict pass through untouched + assert_eq!(ollama["request_timeout_seconds"], 300); + }); + } + + #[test] + #[serial] + fn get_providers_list_wins_on_name_collision() { + with_test_home(|| { + let yaml = "\ +_config_version: 19 +custom_providers: + - name: shared + base_url: https://writable.example.com +providers: + shared: + base_url: https://overlay.example.com +"; + let config_path = get_hermes_config_path(); + fs::create_dir_all(config_path.parent().unwrap()).unwrap(); + fs::write(&config_path, yaml).unwrap(); + + let providers = get_providers().unwrap(); + assert_eq!(providers.len(), 1); + let shared = providers.get("shared").unwrap(); + assert_eq!(shared["base_url"], "https://writable.example.com"); + assert_eq!(shared[PROVIDER_SOURCE_FIELD], PROVIDER_SOURCE_CUSTOM_LIST); + }); + } + + #[test] + #[serial] + fn set_provider_rejects_dict_only_entries() { + with_test_home(|| { + let yaml = "\ +_config_version: 19 +providers: + anthropic: + base_url: https://api.anthropic.com + model: claude-opus-4.6 +"; + let config_path = get_hermes_config_path(); + fs::create_dir_all(config_path.parent().unwrap()).unwrap(); + fs::write(&config_path, yaml).unwrap(); + + let update = serde_json::json!({ "base_url": "https://hacked.example.com" }); + let err = set_provider("anthropic", update).unwrap_err(); + assert!( + format!("{err}").contains("providers:"), + "error message should point user at providers dict: {err}" + ); + }); + } + + #[test] + #[serial] + fn remove_provider_rejects_dict_only_entries() { + with_test_home(|| { + let yaml = "\ +_config_version: 19 +providers: + anthropic: + base_url: https://api.anthropic.com +"; + let config_path = get_hermes_config_path(); + fs::create_dir_all(config_path.parent().unwrap()).unwrap(); + fs::write(&config_path, yaml).unwrap(); + + assert!(remove_provider("anthropic").is_err()); + }); + } + + #[test] + fn sanitize_strips_ui_only_markers() { + let mut v = serde_json::json!({ + "base_url": "https://api.example.com", + "_cc_source": "providers_dict", + "provider_key": "anthropic", + }); + sanitize_hermes_provider_keys(&mut v); + let obj = v.as_object().unwrap(); + assert!(obj.get("_cc_source").is_none()); + assert!(obj.get("provider_key").is_none()); + assert!(obj.get("base_url").is_some()); + } + + #[test] + #[serial] + fn get_providers_heals_legacy_camel_case_on_read() { + // A DB may still hold records from older DeepLink imports that wrote + // camelCase fields into `settings_config`. The read path must surface + // them in Hermes' native snake_case so UI editors aren't lying to users. + with_test_home(|| { + let yaml = "\ +custom_providers: + - name: legacy + baseUrl: https://legacy.example.com + apiKey: sk-legacy + apiMode: chat_completions + api: openai-completions +"; + let config_path = get_hermes_config_path(); + fs::create_dir_all(config_path.parent().unwrap()).unwrap(); + fs::write(&config_path, yaml).unwrap(); + + let provider = get_provider("legacy").unwrap().unwrap(); + assert_eq!(provider["base_url"], "https://legacy.example.com"); + assert_eq!(provider["api_key"], "sk-legacy"); + assert_eq!(provider["api_mode"], "chat_completions"); + assert!(provider.get("baseUrl").is_none()); + assert!(provider.get("apiKey").is_none()); + assert!(provider.get("api").is_none()); + }); + } + + // ---- Model config tests ---- + + #[test] + #[serial] + fn model_config_roundtrip() { + with_test_home(|| { + // Initially none + assert!(get_model_config().unwrap().is_none()); + + let model = HermesModelConfig { + default: Some("anthropic/claude-opus-4-7".to_string()), + provider: Some("openrouter".to_string()), + base_url: Some("https://openrouter.ai/api/v1".to_string()), + context_length: Some(200000), + max_tokens: None, + extra: HashMap::new(), + }; + set_model_config(&model).unwrap(); + + let read_model = get_model_config().unwrap().unwrap(); + assert_eq!( + read_model.default.as_deref(), + Some("anthropic/claude-opus-4-7") + ); + assert_eq!(read_model.provider.as_deref(), Some("openrouter")); + assert_eq!(read_model.context_length, Some(200000)); + }); + } + + // ---- yaml_to_json / json_to_yaml ---- + + #[test] + fn yaml_json_conversion_roundtrip() { + let json = serde_json::json!({ + "name": "test", + "count": 42, + "nested": { + "flag": true + } + }); + let yaml = json_to_yaml(&json).unwrap(); + let back = yaml_to_json(&yaml).unwrap(); + assert_eq!(json, back); + } + + // ---- models array ↔ dict transforms ---- + + #[test] + fn models_array_to_dict_strips_id_and_preserves_order() { + let arr = vec![ + serde_json::json!({ "id": "foo", "context_length": 100 }), + serde_json::json!({ "id": "bar", "max_tokens": 2000 }), + serde_json::json!({ "id": "baz" }), + ]; + let dict = models_array_to_dict(arr); + let obj = dict.as_object().unwrap(); + let keys: Vec<&String> = obj.keys().collect(); + assert_eq!(keys, vec!["foo", "bar", "baz"]); + assert_eq!(obj["foo"]["context_length"], 100); + assert_eq!(obj["bar"]["max_tokens"], 2000); + assert!(obj["baz"].as_object().unwrap().is_empty()); + // id must not leak into values + assert!(obj["foo"].get("id").is_none()); + } + + #[test] + fn models_array_to_dict_drops_empty_and_missing_ids() { + let arr = vec![ + serde_json::json!({ "id": "", "context_length": 1 }), + serde_json::json!({ "id": " ", "context_length": 2 }), + serde_json::json!({ "context_length": 3 }), + serde_json::json!({ "id": "kept" }), + ]; + let dict = models_array_to_dict(arr); + let obj = dict.as_object().unwrap(); + assert_eq!(obj.len(), 1); + assert!(obj.contains_key("kept")); + } + + #[test] + fn models_dict_to_array_reinjects_id_and_preserves_order() { + let mut map = serde_json::Map::new(); + map.insert( + "alpha".to_string(), + serde_json::json!({ "context_length": 10 }), + ); + map.insert("beta".to_string(), serde_json::json!({ "max_tokens": 20 })); + map.insert("gamma".to_string(), serde_json::Value::Null); + let arr = models_dict_to_array(map); + let list = arr.as_array().unwrap(); + assert_eq!(list.len(), 3); + assert_eq!(list[0]["id"], "alpha"); + assert_eq!(list[0]["context_length"], 10); + assert_eq!(list[1]["id"], "beta"); + assert_eq!(list[2]["id"], "gamma"); + } + + #[test] + #[serial] + fn provider_with_models_array_writes_dict_to_yaml() { + with_test_home(|| { + let config = serde_json::json!({ + "base_url": "https://api.example.com/v1", + "api_key": "sk-test", + "api_mode": "chat_completions", + "models": [ + { "id": "model-a", "context_length": 200000, "max_tokens": 32000 }, + { "id": "model-b", "context_length": 100000 }, + ] + }); + set_provider("demo", config).unwrap(); + + // Read raw YAML to verify the on-disk shape is a sequence under `custom_providers:`. + let raw = fs::read_to_string(get_hermes_config_path()).unwrap(); + let yaml: serde_yaml::Value = serde_yaml::from_str(&raw).unwrap(); + let providers = yaml + .get("custom_providers") + .and_then(|v| v.as_sequence()) + .unwrap(); + let provider = &providers[0]; + assert_eq!( + provider.get("name").and_then(|v| v.as_str()), + Some("demo"), + "entry should carry a name field" + ); + assert_eq!( + provider.get("model").and_then(|v| v.as_str()), + Some("model-a"), + "entry should carry a singular `model:` field set to the first model id \ + so Hermes runtime/picker reads it" + ); + let models = provider.get("models").and_then(|v| v.as_mapping()).unwrap(); + assert_eq!(models.len(), 2); + assert!(models.contains_key(serde_yaml::Value::String("model-a".into()))); + assert!(models.contains_key(serde_yaml::Value::String("model-b".into()))); + let model_a = models + .get(serde_yaml::Value::String("model-a".into())) + .unwrap(); + assert_eq!( + model_a + .get("context_length") + .and_then(|v| v.as_u64()) + .unwrap(), + 200000 + ); + // id should not leak into each model value + assert!(model_a.get("id").is_none()); + }); + } + + #[test] + #[serial] + fn provider_models_roundtrip_array_dict_array_preserves_order() { + with_test_home(|| { + let input = serde_json::json!({ + "base_url": "https://api.example.com/v1", + "api_key": "sk-test", + "models": [ + { "id": "first", "context_length": 1 }, + { "id": "second", "context_length": 2 }, + { "id": "third", "context_length": 3 }, + ] + }); + set_provider("order", input).unwrap(); + + let providers = get_providers().unwrap(); + let provider = providers.get("order").unwrap(); + let models = provider.get("models").and_then(|v| v.as_array()).unwrap(); + let ids: Vec<&str> = models + .iter() + .map(|m| m.get("id").and_then(|v| v.as_str()).unwrap()) + .collect(); + assert_eq!(ids, vec!["first", "second", "third"]); + assert_eq!(models[0].get("context_length").unwrap(), 1); + }); + } + + #[test] + #[serial] + fn provider_without_models_is_unaffected() { + with_test_home(|| { + let input = serde_json::json!({ + "base_url": "https://api.example.com/v1", + "api_key": "sk-test" + }); + set_provider("simple", input).unwrap(); + let providers = get_providers().unwrap(); + let provider = providers.get("simple").unwrap(); + assert!(provider.get("models").is_none()); + assert!( + provider.get("model").is_none(), + "singular `model:` should not appear when no models are declared" + ); + }); + } + + // ---- apply_switch_defaults ---- + + #[test] + #[serial] + fn apply_switch_defaults_sets_default_and_provider() { + with_test_home(|| { + let settings = serde_json::json!({ + "base_url": "https://api.example.com/v1", + "models": [ + { "id": "primary-model", "context_length": 200000 }, + { "id": "fallback", "context_length": 100000 }, + ] + }); + apply_switch_defaults("demo", &settings).unwrap(); + + let model = get_model_config().unwrap().unwrap(); + assert_eq!(model.default.as_deref(), Some("primary-model")); + assert_eq!(model.provider.as_deref(), Some("demo")); + }); + } + + #[test] + #[serial] + fn apply_switch_defaults_preserves_user_context_length() { + with_test_home(|| { + // User previously set a custom context_length via the Model panel. + let initial = HermesModelConfig { + default: Some("old-model".to_string()), + provider: Some("old-provider".to_string()), + base_url: Some("https://user-override.example.com".to_string()), + context_length: Some(131072), + max_tokens: Some(16384), + extra: HashMap::new(), + }; + set_model_config(&initial).unwrap(); + + let settings = serde_json::json!({ + "models": [{ "id": "new-model" }] + }); + apply_switch_defaults("new-provider", &settings).unwrap(); + + let model = get_model_config().unwrap().unwrap(); + assert_eq!(model.default.as_deref(), Some("new-model")); + assert_eq!(model.provider.as_deref(), Some("new-provider")); + // User-customized fields must survive the switch. + assert_eq!( + model.base_url.as_deref(), + Some("https://user-override.example.com") + ); + assert_eq!(model.context_length, Some(131072)); + assert_eq!(model.max_tokens, Some(16384)); + }); + } + + #[test] + #[serial] + fn apply_switch_defaults_updates_provider_even_without_models() { + with_test_home(|| { + // Seed an existing `model:` section — the user was already running + // some provider before this switch. + let initial = HermesModelConfig { + default: Some("legacy-default".to_string()), + provider: Some("legacy-provider".to_string()), + ..Default::default() + }; + set_model_config(&initial).unwrap(); + + // New provider has no `models` list — previously this would no-op + // and leave `model.provider` pointing at the legacy provider, + // causing "switch succeeds but has no effect" bug. + let settings = serde_json::json!({ + "base_url": "https://api.example.com/v1" + }); + apply_switch_defaults("bare", &settings).unwrap(); + + let model = get_model_config().unwrap().unwrap(); + assert_eq!(model.provider.as_deref(), Some("bare")); + assert_eq!(model.default.as_deref(), Some("legacy-default")); + }); + } + + #[test] + #[serial] + fn apply_switch_defaults_keeps_old_default_when_first_model_id_is_blank() { + with_test_home(|| { + let initial = HermesModelConfig { + default: Some("prev-default".to_string()), + provider: Some("prev-provider".to_string()), + ..Default::default() + }; + set_model_config(&initial).unwrap(); + + let settings = serde_json::json!({ + "models": [{ "id": " " }, { "id": "real" }] + }); + apply_switch_defaults("edge", &settings).unwrap(); + + let model = get_model_config().unwrap().unwrap(); + // Provider always updates. + assert_eq!(model.provider.as_deref(), Some("edge")); + // First entry's id is whitespace-only → blank → fall back to old default + // (we intentionally don't scan past the first entry for a default). + assert_eq!(model.default.as_deref(), Some("prev-default")); + }); + } + + // ---- memory file tests ---- + + #[test] + #[serial] + fn read_memory_returns_empty_when_file_missing() { + with_test_home(|| { + let memory = read_memory(MemoryKind::Memory).unwrap(); + let user = read_memory(MemoryKind::User).unwrap(); + assert!(memory.is_empty()); + assert!(user.is_empty()); + }); + } + + #[test] + #[serial] + fn write_then_read_memory_round_trip() { + with_test_home(|| { + let blob = "> note\n§\nfirst entry\n§\nsecond entry\n"; + write_memory(MemoryKind::Memory, blob).unwrap(); + assert_eq!(read_memory(MemoryKind::Memory).unwrap(), blob); + + // Writing USER.md doesn't clobber MEMORY.md. + write_memory(MemoryKind::User, "user profile").unwrap(); + assert_eq!(read_memory(MemoryKind::Memory).unwrap(), blob); + assert_eq!(read_memory(MemoryKind::User).unwrap(), "user profile"); + }); + } + + #[test] + #[serial] + fn memory_limits_fall_back_to_defaults_when_config_missing() { + with_test_home(|| { + let limits = read_memory_limits().unwrap(); + let defaults = HermesMemoryLimits::default(); + assert_eq!(limits.memory, defaults.memory); + assert_eq!(limits.user, defaults.user); + assert_eq!(limits.memory_enabled, defaults.memory_enabled); + assert_eq!(limits.user_enabled, defaults.user_enabled); + }); + } + + #[test] + #[serial] + fn set_memory_enabled_preserves_other_fields() { + // Flipping one toggle must preserve character budgets and external + // provider settings the user configured via Hermes Web UI — otherwise + // a CC Switch toggle would silently wipe those fields. + with_test_home(|| { + let yaml = "\ +memory: + memory_char_limit: 4096 + user_char_limit: 2048 + memory_enabled: true + user_profile_enabled: true + provider: mem0 +"; + let config_path = get_hermes_config_path(); + fs::create_dir_all(config_path.parent().unwrap()).unwrap(); + fs::write(&config_path, yaml).unwrap(); + + set_memory_enabled(MemoryKind::Memory, false).unwrap(); + + let limits = read_memory_limits().unwrap(); + assert!(!limits.memory_enabled, "toggle applied"); + assert!(limits.user_enabled, "unrelated toggle untouched"); + assert_eq!(limits.memory, 4096, "budgets preserved"); + assert_eq!(limits.user, 2048); + + // Verify the external provider field survived the section replacement. + let config = read_hermes_config().unwrap(); + let provider = config + .get("memory") + .and_then(|v| v.get("provider")) + .and_then(|v| v.as_str()); + assert_eq!(provider, Some("mem0")); + }); + } + + #[test] + #[serial] + fn memory_limits_read_from_config_yaml() { + with_test_home(|| { + let yaml = "\ +memory: + memory_char_limit: 4096 + user_char_limit: 2048 + memory_enabled: false + user_profile_enabled: true +"; + let config_path = get_hermes_config_path(); + fs::create_dir_all(config_path.parent().unwrap()).unwrap(); + fs::write(&config_path, yaml).unwrap(); + + let limits = read_memory_limits().unwrap(); + assert_eq!(limits.memory, 4096); + assert_eq!(limits.user, 2048); + assert!(!limits.memory_enabled); + assert!(limits.user_enabled); + }); + } + + #[test] + #[serial] + fn memory_limits_ignore_top_level_keys() { + // Regression guard: Hermes nests memory settings under `memory:`, so + // identically-named keys at the top level must be ignored rather than + // silently consumed. + with_test_home(|| { + let yaml = "\ +memory_char_limit: 9999 +user_char_limit: 9999 +memory_enabled: false +user_profile_enabled: false +"; + let config_path = get_hermes_config_path(); + fs::create_dir_all(config_path.parent().unwrap()).unwrap(); + fs::write(&config_path, yaml).unwrap(); + + let limits = read_memory_limits().unwrap(); + let defaults = HermesMemoryLimits::default(); + assert_eq!(limits.memory, defaults.memory); + assert_eq!(limits.user, defaults.user); + assert_eq!(limits.memory_enabled, defaults.memory_enabled); + assert_eq!(limits.user_enabled, defaults.user_enabled); + }); + } + + #[test] + fn memory_kind_deserializes_from_lowercase_strings() { + let memory: MemoryKind = serde_json::from_str("\"memory\"").unwrap(); + let user: MemoryKind = serde_json::from_str("\"user\"").unwrap(); + assert_eq!(memory, MemoryKind::Memory); + assert_eq!(user, MemoryKind::User); + assert!(serde_json::from_str::("\"bogus\"").is_err()); + } +} diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index dbfb63eae..f0c8fd1ab 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -1,6 +1,7 @@ mod app_config; mod app_store; mod auto_launch; +mod claude_desktop_config; mod claude_mcp; mod claude_plugin; mod codex_config; @@ -11,6 +12,7 @@ mod deeplink; mod error; mod gemini_config; mod gemini_mcp; +pub mod hermes_config; mod init_status; mod lightweight; #[cfg(target_os = "linux")] @@ -63,6 +65,7 @@ use tauri::image::Image; use tauri::tray::{TrayIconBuilder, TrayIconEvent}; use tauri::RunEvent; use tauri::{Emitter, Manager}; +use tauri_plugin_window_state::{AppHandleExt, StateFlags}; fn redact_url_for_log(url_str: &str) -> String { match url::Url::parse(url_str) { @@ -168,7 +171,7 @@ async fn update_tray_menu( ) -> Result { match tray::create_tray_menu(&app, state.inner()) { Ok(new_menu) => { - if let Some(tray) = app.tray_by_id("main") { + if let Some(tray) = app.tray_by_id(tray::TRAY_ID) { tray.set_menu(Some(new_menu)) .map_err(|e| format!("更新托盘菜单失败: {e}"))?; return Ok(true); @@ -263,6 +266,7 @@ pub fn run() { tray::apply_tray_policy(window.app_handle(), false); } } else { + api.prevent_close(); window.app_handle().exit(0); } } @@ -271,7 +275,14 @@ pub fn run() { .plugin(tauri_plugin_dialog::init()) .plugin(tauri_plugin_opener::init()) .plugin(tauri_plugin_store::Builder::new().build()) + .plugin( + tauri_plugin_window_state::Builder::default() + .with_state_flags(window_state_flags()) + .build(), + ) .setup(|app| { + let _ = rustls::crypto::ring::default_provider().install_default(); + // 预先刷新 Store 覆盖配置，确保后续路径读取正确（日志/数据库等） app_store::refresh_app_config_dir_override(app.handle()); panic_hook::init_app_config_dir(crate::config::get_app_config_dir()); @@ -484,6 +495,19 @@ pub fn run() { for app_type in crate::app_config::AppType::all().filter(|t| !t.is_additive_mode()) { + if !crate::services::provider::should_import_default_config_on_startup( + &app_state, + &app_type, + ) + .unwrap_or(false) + { + log::debug!( + "○ {} already has providers; live import skipped", + app_type.as_str() + ); + continue; + } + match crate::services::provider::import_default_config( &app_state, app_type.clone(), @@ -540,6 +564,13 @@ pub fn run() { Ok(_) => log::debug!("○ No new OpenClaw providers to import"), Err(e) => log::warn!("✗ Failed to import OpenClaw providers: {e}"), } + match crate::services::provider::import_hermes_providers_from_live(&app_state) { + Ok(count) if count > 0 => { + log::info!("✓ Imported {count} Hermes provider(s) from live config"); + } + Ok(_) => log::debug!("○ No new Hermes providers to import"), + Err(e) => log::warn!("✗ Failed to import Hermes providers: {e}"), + } // 2. OMO 配置导入（当数据库中无 OMO provider 时，从本地文件导入） { @@ -627,6 +658,14 @@ pub fn run() { Ok(_) => log::debug!("○ No OpenCode MCP servers found to import"), Err(e) => log::warn!("✗ Failed to import OpenCode MCP: {e}"), } + + match crate::services::mcp::McpService::import_from_hermes(&app_state) { + Ok(count) if count > 0 => { + log::info!("✓ Imported {count} MCP server(s) from Hermes"); + } + Ok(_) => log::debug!("○ No Hermes MCP servers found to import"), + Err(e) => log::warn!("✗ Failed to import Hermes MCP: {e}"), + } } // 4. 导入提示词文件（表空时触发） @@ -639,6 +678,7 @@ pub fn run() { crate::app_config::AppType::Gemini, crate::app_config::AppType::OpenCode, crate::app_config::AppType::OpenClaw, + crate::app_config::AppType::Hermes, ] { match crate::services::prompt::PromptService::import_from_file_on_first_launch( &app_state, @@ -728,10 +768,18 @@ pub fn run() { let menu = tray::create_tray_menu(app.handle(), &app_state)?; // 构建托盘 - let mut tray_builder = TrayIconBuilder::with_id("main") - .on_tray_icon_event(|_tray, event| match event { - // 左键点击已通过 show_menu_on_left_click(true) 打开菜单，这里不再额外处理 - TrayIconEvent::Click { .. } => {} + let mut tray_builder = TrayIconBuilder::with_id(tray::TRAY_ID) + .tooltip("CC Switch") // 鼠标悬停提示 + .on_tray_icon_event(|tray, event| match event { + // 鼠标悬停/点击到托盘图标时，后台异步刷新用量缓存， + // 让用户下一次（或快速打开菜单的那一刻）看到较新的数字。 + // refresh_all_usage_in_tray 内部有 10 秒防抖。 + TrayIconEvent::Enter { .. } | TrayIconEvent::Click { .. } => { + let app = tray.app_handle().clone(); + tauri::async_runtime::spawn(async move { + crate::tray::refresh_all_usage_in_tray(&app).await; + }); + } _ => log::debug!("unhandled event {event:?}"), }) .menu(&menu) @@ -898,28 +946,31 @@ pub fn run() { tauri::async_runtime::spawn(async move { const SESSION_SYNC_INTERVAL_SECS: u64 = 60; + fn run_step(name: &str, result: Result) { + if let Err(e) = result { + log::warn!("{name} failed: {e}"); + } + } + + let db = &db_for_session_sync; + // 首次同步 - if let Err(e) = - crate::services::session_usage::sync_claude_session_logs( - &db_for_session_sync, - ) - { - log::warn!("Session usage initial sync failed: {e}"); - } - if let Err(e) = - crate::services::session_usage_codex::sync_codex_usage( - &db_for_session_sync, - ) - { - log::warn!("Codex usage initial sync failed: {e}"); - } - if let Err(e) = - crate::services::session_usage_gemini::sync_gemini_usage( - &db_for_session_sync, - ) - { - log::warn!("Gemini usage initial sync failed: {e}"); - } + run_step( + "Usage cost startup backfill", + db.backfill_missing_usage_costs(), + ); + run_step( + "Session usage initial sync", + crate::services::session_usage::sync_claude_session_logs(db), + ); + run_step( + "Codex usage initial sync", + crate::services::session_usage_codex::sync_codex_usage(db), + ); + run_step( + "Gemini usage initial sync", + crate::services::session_usage_gemini::sync_gemini_usage(db), + ); // 定期同步 let mut interval = tokio::time::interval(std::time::Duration::from_secs( @@ -928,27 +979,18 @@ pub fn run() { interval.tick().await; // skip immediate first tick loop { interval.tick().await; - if let Err(e) = - crate::services::session_usage::sync_claude_session_logs( - &db_for_session_sync, - ) - { - log::warn!("Session usage periodic sync failed: {e}"); - } - if let Err(e) = - crate::services::session_usage_codex::sync_codex_usage( - &db_for_session_sync, - ) - { - log::warn!("Codex usage periodic sync failed: {e}"); - } - if let Err(e) = - crate::services::session_usage_gemini::sync_gemini_usage( - &db_for_session_sync, - ) - { - log::warn!("Gemini usage periodic sync failed: {e}"); - } + run_step( + "Session usage periodic sync", + crate::services::session_usage::sync_claude_session_logs(db), + ); + run_step( + "Codex usage periodic sync", + crate::services::session_usage_codex::sync_codex_usage(db), + ); + run_step( + "Gemini usage periodic sync", + crate::services::session_usage_gemini::sync_gemini_usage(db), + ); } }); }); @@ -1010,6 +1052,9 @@ pub fn run() { commands::remove_provider_from_live_config, commands::switch_provider, commands::import_default_config, + commands::get_claude_desktop_status, + commands::get_claude_desktop_default_routes, + commands::import_claude_desktop_providers_from_claude, commands::get_claude_config_status, commands::get_config_status, commands::get_claude_code_config_path, @@ -1151,6 +1196,7 @@ pub fn run() { commands::get_auto_launch_status, // Proxy server management commands::start_proxy_server, + commands::stop_proxy_server, commands::stop_proxy_with_restore, commands::get_proxy_takeover_status, commands::set_proxy_takeover_for_app, @@ -1234,6 +1280,17 @@ pub fn run() { commands::set_openclaw_env, commands::get_openclaw_tools, commands::set_openclaw_tools, + // Hermes specific + commands::import_hermes_providers_from_live, + commands::get_hermes_live_provider_ids, + commands::get_hermes_live_provider, + commands::get_hermes_model_config, + commands::open_hermes_web_ui, + commands::launch_hermes_dashboard, + commands::get_hermes_memory, + commands::set_hermes_memory, + commands::get_hermes_memory_limits, + commands::set_hermes_memory_enabled, // Global upstream proxy commands::get_global_proxy_url, commands::set_global_proxy_url, @@ -1311,6 +1368,7 @@ pub fn run() { let app_handle = app_handle.clone(); tauri::async_runtime::spawn(async move { + save_window_state_before_exit(&app_handle); cleanup_before_exit(&app_handle).await; log::info!("清理完成，退出应用"); @@ -1717,3 +1775,21 @@ fn show_database_init_error_dialog( )) .blocking_show() } + +// ============================================================ +// 在应用主动退出前显式持久化窗口状态 +// ============================================================ + +fn window_state_flags() -> StateFlags { + StateFlags::POSITION | StateFlags::SIZE | StateFlags::MAXIMIZED +} + +/// 当前应用的退出路径会拦截 `ExitRequested` 并最终直接 `std::process::exit(0)`， +/// 这里需要在真正结束进程前手动落盘，避免 window-state 插件的默认退出钩子被绕过。 +pub fn save_window_state_before_exit(app_handle: &tauri::AppHandle) { + if let Err(err) = app_handle.save_window_state(window_state_flags()) { + log::error!("退出前保存窗口状态失败: {err}"); + } else { + log::info!("已在退出前保存窗口状态"); + } +} diff --git a/src-tauri/src/lightweight.rs b/src-tauri/src/lightweight.rs index 78e5c9174..74b435b99 100644 --- a/src-tauri/src/lightweight.rs +++ b/src-tauri/src/lightweight.rs @@ -17,6 +17,7 @@ pub fn enter_lightweight_mode(app: &tauri::AppHandle) -> Result<(), String> { } if let Some(window) = app.get_webview_window("main") { + crate::save_window_state_before_exit(app); window .destroy() .map_err(|e| format!("销毁主窗口失败: {e}"))?; @@ -64,11 +65,12 @@ pub fn exit_lightweight_mode(app: &tauri::AppHandle) -> Result<(), String> { WebviewWindowBuilder::from_config(app, window_config) .map_err(|e| format!("加载主窗口配置失败: {e}"))? - .visible(true) .build() .map_err(|e| format!("创建主窗口失败: {e}"))?; if let Some(window) = app.get_webview_window("main") { + let _ = window.unminimize(); + let _ = window.show(); let _ = window.set_focus(); #[cfg(target_os = "linux")] { diff --git a/src-tauri/src/mcp/claude.rs b/src-tauri/src/mcp/claude.rs index 25d2f426a..e1971fb73 100644 --- a/src-tauri/src/mcp/claude.rs +++ b/src-tauri/src/mcp/claude.rs @@ -92,6 +92,7 @@ pub fn import_from_claude(config: &mut MultiAppConfig) -> Result Result codex: true, gemini: false, opencode: false, + hermes: false, }, description: None, homepage: None, diff --git a/src-tauri/src/mcp/gemini.rs b/src-tauri/src/mcp/gemini.rs index c8a7809f3..73c2fc840 100644 --- a/src-tauri/src/mcp/gemini.rs +++ b/src-tauri/src/mcp/gemini.rs @@ -88,6 +88,7 @@ pub fn import_from_gemini(config: &mut MultiAppConfig) -> Result bool { + hermes_config::get_hermes_dir().exists() +} + +// ============================================================================ +// Format Conversion: CC Switch -> Hermes +// ============================================================================ + +/// Convert CC Switch unified format to Hermes format +/// +/// Conversion rules: +/// - `stdio`: output `command`, `args`, `env` (strip `type` field) +/// - `sse`/`http`: output `url`, `headers` (strip `type` field) +/// - Always add `enabled: true` +fn convert_to_hermes_format(spec: &Value) -> Result { + let obj = spec + .as_object() + .ok_or_else(|| AppError::McpValidation("MCP spec must be a JSON object".into()))?; + + let typ = obj.get("type").and_then(|v| v.as_str()).unwrap_or("stdio"); + + let mut result = serde_json::Map::new(); + + match typ { + "stdio" => { + if let Some(command) = obj.get("command") { + result.insert("command".into(), command.clone()); + } + if let Some(args) = obj.get("args") { + if args.is_array() && !args.as_array().map(|a| a.is_empty()).unwrap_or(true) { + result.insert("args".into(), args.clone()); + } + } + if let Some(env) = obj.get("env") { + if env.is_object() && !env.as_object().map(|o| o.is_empty()).unwrap_or(true) { + result.insert("env".into(), env.clone()); + } + } + } + "sse" | "http" => { + if let Some(url) = obj.get("url") { + result.insert("url".into(), url.clone()); + } + if let Some(headers) = obj.get("headers") { + if headers.is_object() && !headers.as_object().map(|o| o.is_empty()).unwrap_or(true) + { + result.insert("headers".into(), headers.clone()); + } + } + } + _ => { + return Err(AppError::McpValidation(format!("Unknown MCP type: {typ}"))); + } + } + + result.insert("enabled".into(), json!(true)); + + Ok(Value::Object(result)) +} + +// ============================================================================ +// Format Conversion: Hermes -> CC Switch +// ============================================================================ + +/// Convert Hermes format to CC Switch unified format +/// +/// Conversion rules: +/// - If `command` exists: set `type: "stdio"`, extract `command`, `args`, `env` +/// - If `url` exists: set `type: "sse"`, extract `url`, `headers` +/// - Strip Hermes-specific fields: `enabled`, `timeout`, `connect_timeout`, `tools`, `sampling` +fn convert_from_hermes_format(id: &str, spec: &Value) -> Result { + let obj = spec + .as_object() + .ok_or_else(|| AppError::McpValidation("Hermes MCP spec must be a JSON object".into()))?; + + let mut result = serde_json::Map::new(); + + if obj.contains_key("command") { + // stdio type + result.insert("type".into(), json!("stdio")); + + if let Some(command) = obj.get("command") { + result.insert("command".into(), command.clone()); + } + if let Some(args) = obj.get("args") { + if args.is_array() && !args.as_array().map(|a| a.is_empty()).unwrap_or(true) { + result.insert("args".into(), args.clone()); + } + } + if let Some(env) = obj.get("env") { + if env.is_object() && !env.as_object().map(|o| o.is_empty()).unwrap_or(true) { + result.insert("env".into(), env.clone()); + } + } + } else if obj.contains_key("url") { + // HTTP/SSE type + result.insert("type".into(), json!("sse")); + + if let Some(url) = obj.get("url") { + result.insert("url".into(), url.clone()); + } + if let Some(headers) = obj.get("headers") { + if headers.is_object() && !headers.as_object().map(|o| o.is_empty()).unwrap_or(true) { + result.insert("headers".into(), headers.clone()); + } + } + } else { + return Err(AppError::McpValidation(format!( + "Hermes MCP server '{id}' has neither 'command' nor 'url' field" + ))); + } + + // Note: Hermes-specific fields (enabled, timeout, connect_timeout, tools, sampling) + // are intentionally NOT copied -- they are stripped on import. + + Ok(Value::Object(result)) +} + +// ============================================================================ +// Public API: Sync Functions +// ============================================================================ + +/// Sync a single MCP server to Hermes live config (merge-on-write) +/// +/// Strategy: +/// 1. Read existing mcp_servers from config.yaml +/// 2. If server already exists, merge: keep Hermes-specific fields, overwrite core fields +/// 3. Set `enabled: true` +/// 4. Write back +pub fn sync_single_server_to_hermes( + _config: &MultiAppConfig, + id: &str, + server_spec: &Value, +) -> Result<(), AppError> { + if !should_sync_hermes_mcp() { + return Ok(()); + } + + let hermes_spec = convert_to_hermes_format(server_spec)?; + let id_owned = id.to_string(); + + hermes_config::update_mcp_servers_yaml(|servers| { + let id_yaml = serde_yaml::Value::String(id_owned.clone()); + + let merged_json = if let Some(existing_yaml) = servers.get(&id_yaml) { + let existing_json = hermes_config::yaml_to_json(existing_yaml)?; + merge_hermes_spec(&existing_json, &hermes_spec) + } else { + hermes_spec.clone() + }; + + let merged_yaml_value = hermes_config::json_to_yaml(&merged_json)?; + servers.insert(id_yaml, merged_yaml_value); + Ok(()) + }) +} + +/// Merge new spec into existing Hermes spec, preserving Hermes-specific fields. +/// +/// Core fields (command, args, env, url, headers) come from `new_spec`. +/// Hermes-specific fields (enabled, tools, sampling, etc.) are kept from +/// `existing` — this prevents CC Switch from overwriting user customizations. +fn merge_hermes_spec(existing: &Value, new_spec: &Value) -> Value { + let mut result = serde_json::Map::new(); + + // Copy Hermes-specific fields from existing config + if let Some(existing_obj) = existing.as_object() { + for &field in HERMES_EXTRA_FIELDS { + if let Some(val) = existing_obj.get(field) { + result.insert(field.to_string(), val.clone()); + } + } + } + + // Overwrite with core fields from new spec; for Hermes-specific fields, + // only apply from new_spec if existing didn't already have them + if let Some(new_obj) = new_spec.as_object() { + for (key, val) in new_obj { + if HERMES_EXTRA_FIELDS.contains(&key.as_str()) && result.contains_key(key) { + continue; // Existing Hermes-specific field takes precedence + } + result.insert(key.clone(), val.clone()); + } + } + + Value::Object(result) +} + +/// Remove a single MCP server from Hermes live config +pub fn remove_server_from_hermes(id: &str) -> Result<(), AppError> { + if !should_sync_hermes_mcp() { + return Ok(()); + } + + let id_owned = id.to_string(); + hermes_config::update_mcp_servers_yaml(|servers| { + servers.remove(serde_yaml::Value::String(id_owned.clone())); + Ok(()) + }) +} + +/// Import MCP servers from Hermes config to unified structure +/// +/// Existing servers will have Hermes app enabled without overwriting other fields. +pub fn import_from_hermes(config: &mut MultiAppConfig) -> Result { + let yaml_map = hermes_config::get_mcp_servers_yaml()?; + if yaml_map.is_empty() { + return Ok(0); + } + + // Ensure servers map exists + let servers = config.mcp.servers.get_or_insert_with(HashMap::new); + + let mut changed = 0; + let mut errors = Vec::new(); + + for (key, spec_yaml) in &yaml_map { + let id = match key.as_str() { + Some(s) => s.to_string(), + None => { + log::warn!("Skip Hermes MCP server with non-string key"); + continue; + } + }; + + // Convert YAML value to JSON + let spec_json = match hermes_config::yaml_to_json(spec_yaml) { + Ok(j) => j, + Err(e) => { + log::warn!("Skip Hermes MCP server '{id}': failed to convert YAML to JSON: {e}"); + errors.push(format!("{id}: {e}")); + continue; + } + }; + + // Convert from Hermes format to unified format + let unified_spec = match convert_from_hermes_format(&id, &spec_json) { + Ok(s) => s, + Err(e) => { + log::warn!("Skip invalid Hermes MCP server '{id}': {e}"); + errors.push(format!("{id}: {e}")); + continue; + } + }; + + // Validate the converted spec + if let Err(e) = validate_server_spec(&unified_spec) { + log::warn!("Skip invalid MCP server '{id}' after conversion: {e}"); + errors.push(format!("{id}: {e}")); + continue; + } + + if let Some(existing) = servers.get_mut(&id) { + // Existing server: just enable Hermes app + if !existing.apps.hermes { + existing.apps.hermes = true; + changed += 1; + log::info!("MCP server '{id}' enabled for Hermes"); + } + } else { + // New server: default to only Hermes enabled + servers.insert( + id.clone(), + McpServer { + id: id.clone(), + name: id.clone(), + server: unified_spec, + apps: McpApps { + claude: false, + codex: false, + gemini: false, + opencode: false, + hermes: true, + }, + description: None, + homepage: None, + docs: None, + tags: Vec::new(), + }, + ); + changed += 1; + log::info!("Imported new MCP server '{id}' from Hermes"); + } + } + + if !errors.is_empty() { + log::warn!( + "Import completed with {} failures: {:?}", + errors.len(), + errors + ); + } + + Ok(changed) +} + +#[cfg(test)] +mod tests { + use super::*; + + // ======================================================================== + // convert_to_hermes_format tests + // ======================================================================== + + #[test] + fn test_convert_stdio_to_hermes() { + let spec = json!({ + "type": "stdio", + "command": "npx", + "args": ["-y", "@modelcontextprotocol/server-filesystem"], + "env": { "HOME": "/Users/test" } + }); + + let result = convert_to_hermes_format(&spec).unwrap(); + // No type field in Hermes format + assert!(result.get("type").is_none()); + assert_eq!(result["command"], "npx"); + assert_eq!(result["args"][0], "-y"); + assert_eq!(result["args"][1], "@modelcontextprotocol/server-filesystem"); + assert_eq!(result["env"]["HOME"], "/Users/test"); + assert_eq!(result["enabled"], true); + } + + #[test] + fn test_convert_http_to_hermes() { + let spec = json!({ + "type": "sse", + "url": "https://example.com/mcp", + "headers": { "Authorization": "Bearer xxx" } + }); + + let result = convert_to_hermes_format(&spec).unwrap(); + assert!(result.get("type").is_none()); + assert_eq!(result["url"], "https://example.com/mcp"); + assert_eq!(result["headers"]["Authorization"], "Bearer xxx"); + assert_eq!(result["enabled"], true); + } + + #[test] + fn test_convert_http_type_to_hermes() { + let spec = json!({ + "type": "http", + "url": "https://example.com/mcp" + }); + + let result = convert_to_hermes_format(&spec).unwrap(); + assert!(result.get("type").is_none()); + assert_eq!(result["url"], "https://example.com/mcp"); + assert_eq!(result["enabled"], true); + } + + #[test] + fn test_convert_stdio_empty_env_to_hermes() { + let spec = json!({ + "type": "stdio", + "command": "node", + "args": [], + "env": {} + }); + + let result = convert_to_hermes_format(&spec).unwrap(); + assert_eq!(result["command"], "node"); + // Empty args and env should be omitted + assert!(result.get("args").is_none()); + assert!(result.get("env").is_none()); + assert_eq!(result["enabled"], true); + } + + #[test] + fn test_convert_unknown_type_to_hermes_fails() { + let spec = json!({ "type": "grpc", "command": "foo" }); + assert!(convert_to_hermes_format(&spec).is_err()); + } + + // ======================================================================== + // convert_from_hermes_format tests + // ======================================================================== + + #[test] + fn test_convert_hermes_stdio_to_unified() { + let spec = json!({ + "command": "npx", + "args": ["-y", "@modelcontextprotocol/server-filesystem"], + "env": { "HOME": "/Users/test" }, + "enabled": true, + "timeout": 30, + "connect_timeout": 10, + "tools": { "include": ["read_file"] }, + "sampling": { "enabled": true } + }); + + let result = convert_from_hermes_format("filesystem", &spec).unwrap(); + assert_eq!(result["type"], "stdio"); + assert_eq!(result["command"], "npx"); + assert_eq!(result["args"][0], "-y"); + assert_eq!(result["args"][1], "@modelcontextprotocol/server-filesystem"); + assert_eq!(result["env"]["HOME"], "/Users/test"); + // Hermes-specific fields should be stripped + assert!(result.get("enabled").is_none()); + assert!(result.get("timeout").is_none()); + assert!(result.get("connect_timeout").is_none()); + assert!(result.get("tools").is_none()); + assert!(result.get("sampling").is_none()); + } + + #[test] + fn test_convert_hermes_http_to_unified() { + let spec = json!({ + "url": "https://example.com/mcp", + "headers": { "Authorization": "Bearer xxx" }, + "enabled": true, + "timeout": 60 + }); + + let result = convert_from_hermes_format("remote-server", &spec).unwrap(); + assert_eq!(result["type"], "sse"); + assert_eq!(result["url"], "https://example.com/mcp"); + assert_eq!(result["headers"]["Authorization"], "Bearer xxx"); + // Hermes-specific fields should be stripped + assert!(result.get("enabled").is_none()); + assert!(result.get("timeout").is_none()); + } + + #[test] + fn test_convert_hermes_no_command_no_url_fails() { + let spec = json!({ "enabled": true, "timeout": 30 }); + assert!(convert_from_hermes_format("bad-server", &spec).is_err()); + } + + // ======================================================================== + // Merge-on-write tests + // ======================================================================== + + #[test] + fn test_merge_preserves_hermes_specific_fields() { + let existing = json!({ + "command": "old-cmd", + "args": ["old-arg"], + "enabled": true, + "timeout": 30, + "connect_timeout": 10, + "tools": { "include": ["read_file"] }, + "sampling": { "enabled": true } + }); + + let new_spec = json!({ + "command": "new-cmd", + "args": ["new-arg"], + "env": { "KEY": "value" }, + "enabled": true + }); + + let merged = merge_hermes_spec(&existing, &new_spec); + + // Core fields should be overwritten + assert_eq!(merged["command"], "new-cmd"); + assert_eq!(merged["args"][0], "new-arg"); + assert_eq!(merged["env"]["KEY"], "value"); + + // Hermes-specific fields should be preserved from existing + assert_eq!(merged["timeout"], 30); + assert_eq!(merged["connect_timeout"], 10); + assert_eq!(merged["tools"]["include"][0], "read_file"); + assert_eq!(merged["sampling"]["enabled"], true); + assert_eq!(merged["enabled"], true); + } + + #[test] + fn test_merge_preserves_auth_field() { + let existing = json!({ + "url": "https://mcp.example.com", + "auth": "oauth", + "enabled": true + }); + + let new_spec = json!({ + "url": "https://mcp.example.com/updated", + "headers": { "X-Trace": "abc" }, + "enabled": true + }); + + let merged = merge_hermes_spec(&existing, &new_spec); + + assert_eq!(merged["url"], "https://mcp.example.com/updated"); + assert_eq!(merged["headers"]["X-Trace"], "abc"); + assert_eq!( + merged["auth"], "oauth", + "auth declaration must survive CC Switch round-trip" + ); + } + + #[test] + fn test_convert_hermes_strips_auth_on_import() { + let spec = json!({ + "url": "https://mcp.example.com", + "auth": "oauth", + "enabled": true + }); + + let result = convert_from_hermes_format("remote", &spec).unwrap(); + assert_eq!(result["type"], "sse"); + assert_eq!(result["url"], "https://mcp.example.com"); + assert!( + result.get("auth").is_none(), + "auth stays Hermes-specific; stripped from unified format" + ); + } + + #[test] + fn test_merge_new_server_no_existing_extra_fields() { + let existing = json!({ + "command": "old-cmd" + }); + + let new_spec = json!({ + "command": "new-cmd", + "args": ["arg1"], + "enabled": true + }); + + let merged = merge_hermes_spec(&existing, &new_spec); + assert_eq!(merged["command"], "new-cmd"); + assert_eq!(merged["args"][0], "arg1"); + assert_eq!(merged["enabled"], true); + // No extra fields to preserve + assert!(merged.get("timeout").is_none()); + } +} diff --git a/src-tauri/src/mcp/mod.rs b/src-tauri/src/mcp/mod.rs index 2f2b7f424..c411ac467 100644 --- a/src-tauri/src/mcp/mod.rs +++ b/src-tauri/src/mcp/mod.rs @@ -9,10 +9,12 @@ //! - `codex` - Codex MCP 同步和导入（含 TOML 转换） //! - `gemini` - Gemini MCP 同步和导入 //! - `opencode` - OpenCode MCP 同步和导入（含 local/remote 格式转换） +//! - `hermes` - Hermes MCP 同步和导入 mod claude; mod codex; mod gemini; +mod hermes; mod opencode; mod validation; @@ -28,6 +30,7 @@ pub use gemini::{ import_from_gemini, remove_server_from_gemini, sync_enabled_to_gemini, sync_single_server_to_gemini, }; +pub use hermes::{import_from_hermes, remove_server_from_hermes, sync_single_server_to_hermes}; pub use opencode::{ import_from_opencode, remove_server_from_opencode, sync_single_server_to_opencode, }; diff --git a/src-tauri/src/mcp/opencode.rs b/src-tauri/src/mcp/opencode.rs index 687d5797c..36dd25b57 100644 --- a/src-tauri/src/mcp/opencode.rs +++ b/src-tauri/src/mcp/opencode.rs @@ -259,6 +259,7 @@ pub fn import_from_opencode(config: &mut MultiAppConfig) -> Result Result std::sync::MutexGuard<'static, ()> { @@ -966,6 +967,7 @@ mod tests { } #[test] + #[serial] fn default_model_write_preserves_top_level_comments() { let source = r#"{ // top-level comment @@ -994,6 +996,7 @@ mod tests { } #[test] + #[serial] fn default_model_noop_write_skips_backup() { let source = r#"{ models: { @@ -1028,6 +1031,7 @@ mod tests { } #[test] + #[serial] fn save_detects_external_conflict() { let source = r#"{ models: { @@ -1050,6 +1054,7 @@ mod tests { } #[test] + #[serial] fn remove_last_provider_writes_empty_providers_without_panic() { let source = r#"{ models: { diff --git a/src-tauri/src/prompt_files.rs b/src-tauri/src/prompt_files.rs index 24e6a9b90..70f350dc8 100644 --- a/src-tauri/src/prompt_files.rs +++ b/src-tauri/src/prompt_files.rs @@ -10,20 +10,30 @@ use crate::opencode_config::get_opencode_dir; /// 返回指定应用所使用的提示词文件路径。 pub fn prompt_file_path(app: &AppType) -> Result { + if matches!(app, AppType::ClaudeDesktop) { + return Err(AppError::localized( + "claude_desktop.prompts_unsupported", + "Claude Desktop 暂不支持 Prompts", + "Claude Desktop does not support Prompts", + )); + } + let base_dir: PathBuf = match app { AppType::Claude => get_base_dir_with_fallback(get_claude_settings_path(), ".claude")?, AppType::Codex => get_base_dir_with_fallback(get_codex_auth_path(), ".codex")?, AppType::Gemini => get_gemini_dir(), AppType::OpenCode => get_opencode_dir(), AppType::OpenClaw => get_openclaw_dir(), + AppType::Hermes => crate::hermes_config::get_hermes_dir(), + AppType::ClaudeDesktop => unreachable!("handled above"), }; let filename = match app { AppType::Claude => "CLAUDE.md", AppType::Codex => "AGENTS.md", AppType::Gemini => "GEMINI.md", - AppType::OpenCode => "AGENTS.md", - AppType::OpenClaw => "AGENTS.md", // OpenClaw uses AGENTS.md for agent instructions + AppType::OpenCode | AppType::OpenClaw | AppType::Hermes => "AGENTS.md", + AppType::ClaudeDesktop => unreachable!("handled above"), }; Ok(base_dir.join(filename)) diff --git a/src-tauri/src/provider.rs b/src-tauri/src/provider.rs index af3af3f4b..64f57a525 100644 --- a/src-tauri/src/provider.rs +++ b/src-tauri/src/provider.rs @@ -65,6 +65,25 @@ impl Provider { in_failover_queue: false, } } + + pub fn is_codex_oauth(&self) -> bool { + self.meta.as_ref().and_then(|m| m.provider_type.as_deref()) == Some("codex_oauth") + } + + pub fn codex_fast_mode_enabled(&self) -> bool { + self.meta + .as_ref() + .map(|m| m.codex_fast_mode_enabled()) + .unwrap_or(false) + } + + pub fn has_usage_script_enabled(&self) -> bool { + self.meta + .as_ref() + .and_then(|m| m.usage_script.as_ref()) + .map(|s| s.enabled) + .unwrap_or(false) + } } /// 供应商管理器 @@ -197,6 +216,28 @@ pub struct AuthBinding { pub account_id: Option, } +/// Claude Desktop 3P 写入模式。 +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] +#[serde(rename_all = "lowercase")] +pub enum ClaudeDesktopMode { + Direct, + Proxy, +} + +/// Claude Desktop 本地路由模式下暴露给 Desktop 的安全模型路由。 +#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] +#[serde(rename_all = "camelCase")] +pub struct ClaudeDesktopModelRoute { + /// 真实上游模型名，只保存在 CC Switch 内部，不写入 Claude Desktop profile。 + pub model: String, + /// Desktop /v1/models 中显示的名称。 + #[serde(skip_serializing_if = "Option::is_none")] + pub display_name: Option, + /// Claude Desktop 3P 识别的 1M 上下文能力标记。 + #[serde(rename = "supports1m", skip_serializing_if = "Option::is_none")] + pub supports_1m: Option, +} + /// 供应商元数据 #[derive(Debug, Clone, Serialize, Deserialize, Default)] pub struct ProviderMeta { @@ -209,6 +250,16 @@ pub struct ProviderMeta { skip_serializing_if = "Option::is_none" )] pub common_config_enabled: Option, + /// Claude Desktop 3P 写入模式：direct（直连）或 proxy（预留） + #[serde(rename = "claudeDesktopMode", skip_serializing_if = "Option::is_none")] + pub claude_desktop_mode: Option, + /// Claude Desktop proxy 模式的模型路由映射：Claude-safe route -> upstream model。 + #[serde( + default, + rename = "claudeDesktopModelRoutes", + skip_serializing_if = "HashMap::is_empty" + )] + pub claude_desktop_model_routes: HashMap, /// 用量查询脚本配置 #[serde(skip_serializing_if = "Option::is_none")] pub usage_script: Option, @@ -258,9 +309,13 @@ pub struct ProviderMeta { pub is_full_url: Option, /// Prompt cache key for OpenAI Responses-compatible endpoints. /// When set, injected into converted Responses requests to improve cache hit rate. - /// If not set, provider ID is used automatically during Claude -> Responses conversion. + /// If not set, Claude -> Responses conversions use a client-provided session/thread + /// identity when available; generated session IDs are not sent upstream. #[serde(rename = "promptCacheKey", skip_serializing_if = "Option::is_none")] pub prompt_cache_key: Option, + /// Codex OAuth FAST mode: inject `service_tier = "priority"` for ChatGPT Codex requests. + #[serde(rename = "codexFastMode", skip_serializing_if = "Option::is_none")] + pub codex_fast_mode: Option, /// 累加模式应用中，该 provider 是否已写入 live config。 /// `None` 表示旧数据/未知状态，`Some(false)` 表示明确仅存在于数据库中。 #[serde(rename = "liveConfigManaged", skip_serializing_if = "Option::is_none")] @@ -276,6 +331,12 @@ pub struct ProviderMeta { } impl ProviderMeta { + /// Codex OAuth FAST mode 是否启用。默认关闭，因为 `service_tier="priority"` + /// 会按更高速率消耗 ChatGPT 订阅配额，用户需显式开启以换取更低延迟。 + pub fn codex_fast_mode_enabled(&self) -> bool { + self.codex_fast_mode.unwrap_or(false) + } + /// 解析指定托管认证供应商绑定的账号 ID。 /// /// 新版优先读取 authBinding，旧版继续兼容 githubAccountId。 @@ -699,8 +760,10 @@ mod tests { #[test] fn provider_meta_serializes_pricing_model_source() { - let mut meta = ProviderMeta::default(); - meta.pricing_model_source = Some("response".to_string()); + let meta = ProviderMeta { + pricing_model_source: Some("response".to_string()), + ..ProviderMeta::default() + }; let value = serde_json::to_value(&meta).expect("serialize ProviderMeta"); diff --git a/src-tauri/src/proxy/body_filter.rs b/src-tauri/src/proxy/body_filter.rs index 075469ac9..dd5e75456 100644 --- a/src-tauri/src/proxy/body_filter.rs +++ b/src-tauri/src/proxy/body_filter.rs @@ -6,6 +6,8 @@ //! - 以 `_` 开头的字段被视为私有参数，会被递归过滤 //! - 支持白名单机制，允许透传特定的 `_` 前缀字段 //! - 支持嵌套对象和数组的深度过滤 +//! - JSON Schema 的 properties / patternProperties / definitions / $defs 名称 +//! 是用户定义的字段名，不按私有参数过滤 //! //! ## 使用场景 //! - `_internal_id`: 内部追踪 ID @@ -65,29 +67,35 @@ pub fn filter_private_params(body: Value) -> Value { /// ``` pub fn filter_private_params_with_whitelist(body: Value, whitelist: &[String]) -> Value { let whitelist_set: HashSet<&str> = whitelist.iter().map(|s| s.as_str()).collect(); - filter_recursive_with_whitelist(body, &mut Vec::new(), &whitelist_set) + filter_recursive_with_whitelist(body, &mut Vec::new(), &mut Vec::new(), &whitelist_set) } /// 递归过滤实现（支持白名单） fn filter_recursive_with_whitelist( value: Value, + path: &mut Vec, removed_keys: &mut Vec, whitelist: &HashSet<&str>, ) -> Value { match value { Value::Object(map) => { + let is_schema_name_map = path.last().is_some_and(|key| matches_schema_name_map(key)); let filtered: serde_json::Map = map .into_iter() .filter_map(|(key, val)| { // 以 _ 开头且不在白名单中的字段被过滤 - if key.starts_with('_') && !whitelist.contains(key.as_str()) { + if key.starts_with('_') + && !whitelist.contains(key.as_str()) + && !is_schema_name_map + { removed_keys.push(key); None } else { - Some(( - key, - filter_recursive_with_whitelist(val, removed_keys, whitelist), - )) + path.push(key.clone()); + let filtered_value = + filter_recursive_with_whitelist(val, path, removed_keys, whitelist); + path.pop(); + Some((key, filtered_value)) } }) .collect(); @@ -102,13 +110,20 @@ fn filter_recursive_with_whitelist( } Value::Array(arr) => Value::Array( arr.into_iter() - .map(|v| filter_recursive_with_whitelist(v, removed_keys, whitelist)) + .map(|v| filter_recursive_with_whitelist(v, path, removed_keys, whitelist)) .collect(), ), other => other, } } +fn matches_schema_name_map(key: &str) -> bool { + matches!( + key, + "properties" | "patternProperties" | "definitions" | "$defs" + ) +} + #[cfg(test)] mod tests { use super::*; @@ -282,6 +297,33 @@ mod tests { assert!(data.get("normal").is_some()); } + #[test] + fn test_preserves_json_schema_property_names_with_underscore() { + let input = json!({ + "tools": [ + { + "name": "lookup", + "input_schema": { + "type": "object", + "properties": { + "_id": {"type": "string", "_internal_note": "remove"}, + "_meta": {"type": "object"} + }, + "_private_schema_note": "remove" + } + } + ] + }); + + let output = filter_private_params(input); + let schema = &output["tools"][0]["input_schema"]; + + assert!(schema["properties"].get("_id").is_some()); + assert!(schema["properties"].get("_meta").is_some()); + assert!(schema["properties"]["_id"].get("_internal_note").is_none()); + assert!(schema.get("_private_schema_note").is_none()); + } + #[test] fn test_empty_whitelist_same_as_default() { let input = json!({ diff --git a/src-tauri/src/proxy/copilot_optimizer.rs b/src-tauri/src/proxy/copilot_optimizer.rs index a58d1ef26..b28cae6db 100644 --- a/src-tauri/src/proxy/copilot_optimizer.rs +++ b/src-tauri/src/proxy/copilot_optimizer.rs @@ -443,6 +443,41 @@ pub fn sanitize_orphan_tool_results(mut body: Value) -> Value { body } +/// 请求前主动剥离所有 assistant 消息里的 thinking / redacted_thinking block +/// +/// Copilot 的三条目标端点（`/chat/completions`、`/v1/responses`、`/v1/chat/completions`） +/// 均为 OpenAI 兼容格式，不识别 Anthropic 的 thinking block。若原样转发，上游会 +/// 拒绝并返回 invalid_request_error —— 届时 `thinking_rectifier` 才做反应式清理并 +/// 重试。那次已经失败的请求依旧消耗一次 premium quota，所以此处提前剥离。 +/// +/// 与 `thinking_rectifier::rectify_anthropic_request` 的区别： +/// - 本函数只剥 thinking / redacted_thinking 两类 block，不触碰 signature，也不 +/// 移除顶层 thinking 字段——那些是错误路径上的激进整流，常规路径不需要。 +/// - 保持与 `merge_tool_results` / `sanitize_orphan_tool_results` 一致的"消费 body、 +/// 返回新 body"签名，便于接入 forwarder 管道。 +pub fn strip_thinking_blocks(mut body: Value) -> Value { + let Some(messages) = body.get_mut("messages").and_then(|m| m.as_array_mut()) else { + return body; + }; + + for msg in messages.iter_mut() { + if msg.get("role").and_then(|r| r.as_str()) != Some("assistant") { + continue; + } + let Some(content) = msg.get_mut("content").and_then(|c| c.as_array_mut()) else { + continue; + }; + content.retain(|block| { + !matches!( + block.get("type").and_then(|t| t.as_str()), + Some("thinking") | Some("redacted_thinking") + ) + }); + } + + body +} + // ─── 内部辅助 ───────────────────────────────── /// 从请求体的 `system` 字段提取文本（处理 string/array 两种格式）。 @@ -1371,4 +1406,138 @@ mod tests { assert_eq!(content[0]["type"], "text"); assert_eq!(content[1]["type"], "text"); } + + // === strip_thinking_blocks 测试 === + + #[test] + fn test_strip_thinking_removes_assistant_thinking_blocks() { + let body = serde_json::json!({ + "messages": [ + {"role": "user", "content": [{"type": "text", "text": "hi"}]}, + {"role": "assistant", "content": [ + {"type": "thinking", "thinking": "let me ponder", "signature": "sig"}, + {"type": "redacted_thinking", "data": "opaque"}, + {"type": "text", "text": "hello"}, + {"type": "tool_use", "id": "t1", "name": "read", "input": {}} + ]} + ] + }); + let result = strip_thinking_blocks(body); + let content = result["messages"][1]["content"].as_array().unwrap(); + assert_eq!(content.len(), 2); + assert_eq!(content[0]["type"], "text"); + assert_eq!(content[1]["type"], "tool_use"); + } + + #[test] + fn test_strip_thinking_leaves_user_messages_untouched() { + // 仅处理 assistant，user 的 thinking 块（极少见，但可能）不动 + let body = serde_json::json!({ + "messages": [ + {"role": "user", "content": [ + {"type": "thinking", "thinking": "x"}, + {"type": "text", "text": "hi"} + ]} + ] + }); + let result = strip_thinking_blocks(body); + let content = result["messages"][0]["content"].as_array().unwrap(); + assert_eq!(content.len(), 2); + } + + #[test] + fn test_strip_thinking_handles_missing_messages() { + let body = serde_json::json!({ "model": "claude-3-5-sonnet" }); + let result = strip_thinking_blocks(body.clone()); + assert_eq!(result, body); + } + + #[test] + fn test_strip_thinking_leaves_empty_content_array() { + // 仅含 thinking 的 assistant 消息剥完后 content 为空——保留上游自处理 + let body = serde_json::json!({ + "messages": [ + {"role": "assistant", "content": [ + {"type": "thinking", "thinking": "solo"} + ]} + ] + }); + let result = strip_thinking_blocks(body); + let content = result["messages"][0]["content"].as_array().unwrap(); + assert_eq!(content.len(), 0); + } + + #[test] + fn test_strip_thinking_preserves_signature_on_non_thinking_blocks() { + // signature 留给 thinking_rectifier 在错误路径处理，此处不动 + let body = serde_json::json!({ + "messages": [ + {"role": "assistant", "content": [ + {"type": "tool_use", "id": "t1", "name": "x", "input": {}, "signature": "s"} + ]} + ] + }); + let result = strip_thinking_blocks(body); + let block = &result["messages"][0]["content"][0]; + assert_eq!(block["signature"], "s"); + } + + #[test] + fn test_strip_thinking_multiple_assistant_turns() { + let body = serde_json::json!({ + "messages": [ + {"role": "user", "content": [{"type": "text", "text": "q1"}]}, + {"role": "assistant", "content": [ + {"type": "thinking", "thinking": "a"}, + {"type": "text", "text": "r1"} + ]}, + {"role": "user", "content": [{"type": "text", "text": "q2"}]}, + {"role": "assistant", "content": [ + {"type": "redacted_thinking", "data": "x"}, + {"type": "text", "text": "r2"} + ]} + ] + }); + let result = strip_thinking_blocks(body); + let a1 = result["messages"][1]["content"].as_array().unwrap(); + let a2 = result["messages"][3]["content"].as_array().unwrap(); + assert_eq!(a1.len(), 1); + assert_eq!(a1[0]["text"], "r1"); + assert_eq!(a2.len(), 1); + assert_eq!(a2[0]["text"], "r2"); + } + + #[test] + fn test_strip_thinking_ignores_string_content() { + // assistant.content 是字符串而非 block 数组 — 历史请求或极简客户端会这样 + // 不应崩溃，也不应转换结构 + let body = serde_json::json!({ + "messages": [ + {"role": "assistant", "content": "plain text response"} + ] + }); + let result = strip_thinking_blocks(body.clone()); + assert_eq!(result, body); + } + + #[test] + fn test_strip_thinking_preserves_block_order() { + let body = serde_json::json!({ + "messages": [ + {"role": "assistant", "content": [ + {"type": "thinking", "thinking": "pre"}, + {"type": "text", "text": "A"}, + {"type": "tool_use", "id": "t1", "name": "x", "input": {}}, + {"type": "redacted_thinking", "data": "mid"}, + {"type": "text", "text": "B"} + ]} + ] + }); + let result = strip_thinking_blocks(body); + let content = result["messages"][0]["content"].as_array().unwrap(); + assert_eq!(content.len(), 3); + assert_eq!(content[0]["text"], "A"); + assert_eq!(content[1]["type"], "tool_use"); + assert_eq!(content[2]["text"], "B"); + } } diff --git a/src-tauri/src/proxy/failover_switch.rs b/src-tauri/src/proxy/failover_switch.rs index 1aa1d1b0e..135115ea3 100644 --- a/src-tauri/src/proxy/failover_switch.rs +++ b/src-tauri/src/proxy/failover_switch.rs @@ -111,7 +111,7 @@ impl FailoverSwitchManager { } if let Ok(new_menu) = crate::tray::create_tray_menu(app, app_state.inner()) { - if let Some(tray) = app.tray_by_id("main") { + if let Some(tray) = app.tray_by_id(crate::tray::TRAY_ID) { if let Err(e) = tray.set_menu(Some(new_menu)) { log::error!("[Failover] 更新托盘菜单失败: {e}"); } diff --git a/src-tauri/src/proxy/forwarder.rs b/src-tauri/src/proxy/forwarder.rs index a1559d524..8fd7bf80f 100644 --- a/src-tauri/src/proxy/forwarder.rs +++ b/src-tauri/src/proxy/forwarder.rs @@ -7,6 +7,7 @@ use super::{ body_filter::filter_private_params_with_whitelist, error::*, failover_switch::FailoverSwitchManager, + json_canonical::{canonicalize_value, short_value_hash}, log_codes::fwd as log_fwd, provider_router::ProviderRouter, providers::{ @@ -55,6 +56,8 @@ pub struct RequestForwarder { current_provider_id_at_start: String, /// 代理会话 ID（用于 Gemini Native shadow replay） session_id: String, + /// Session ID 是否由客户端提供；生成值不能作为上游缓存身份。 + session_client_provided: bool, /// 整流器配置 rectifier_config: RectifierConfig, /// 优化器配置 @@ -63,6 +66,8 @@ pub struct RequestForwarder { copilot_optimizer_config: CopilotOptimizerConfig, /// 非流式请求超时（秒） non_streaming_timeout: std::time::Duration, + /// 流式请求响应头等待超时（秒） + streaming_first_byte_timeout: std::time::Duration, } impl RequestForwarder { @@ -77,7 +82,8 @@ impl RequestForwarder { app_handle: Option, current_provider_id_at_start: String, session_id: String, - _streaming_first_byte_timeout: u64, + session_client_provided: bool, + streaming_first_byte_timeout: u64, _streaming_idle_timeout: u64, rectifier_config: RectifierConfig, optimizer_config: OptimizerConfig, @@ -92,13 +98,51 @@ impl RequestForwarder { app_handle, current_provider_id_at_start, session_id, + session_client_provided, rectifier_config, optimizer_config, copilot_optimizer_config, non_streaming_timeout: std::time::Duration::from_secs(non_streaming_timeout), + streaming_first_byte_timeout: std::time::Duration::from_secs( + streaming_first_byte_timeout, + ), } } + async fn record_success_result( + &self, + provider_id: &str, + app_type: &str, + used_half_open_permit: bool, + ) { + if used_half_open_permit { + if let Err(e) = self + .router + .record_result(provider_id, app_type, true, true, None) + .await + { + log::warn!( + "[{app_type}] 记录 Provider 成功结果失败: provider_id={provider_id}, error={e}" + ); + } + return; + } + + let router = self.router.clone(); + let provider_id = provider_id.to_string(); + let app_type = app_type.to_string(); + tokio::spawn(async move { + if let Err(e) = router + .record_result(&provider_id, &app_type, false, true, None) + .await + { + log::warn!( + "[{app_type}] 异步记录 Provider 成功结果失败: provider_id={provider_id}, error={e}" + ); + } + }); + } + /// 转发请求（带故障转移） /// /// # Arguments @@ -186,6 +230,7 @@ impl RequestForwarder { // 转发请求（每个 Provider 只尝试一次，重试由客户端控制） match self .forward( + app_type, provider, endpoint, &provider_body, @@ -196,16 +241,9 @@ impl RequestForwarder { .await { Ok((response, claude_api_format)) => { - // 成功：记录成功并更新熔断器 - let _ = self - .router - .record_result( - &provider.id, - app_type_str, - used_half_open_permit, - true, - None, - ) + // 成功：普通闭合熔断状态异步记录，避免阻塞流式首包返回； + // HalfOpen 探测仍同步等待，保证 permit 与熔断状态及时释放。 + self.record_success_result(&provider.id, app_type_str, used_half_open_permit) .await; // 更新当前应用类型使用的 provider @@ -316,6 +354,7 @@ impl RequestForwarder { // 使用同一供应商重试（不计入熔断器） match self .forward( + app_type, provider, endpoint, &provider_body, @@ -327,17 +366,12 @@ impl RequestForwarder { { Ok((response, claude_api_format)) => { log::info!("[{app_type_str}] [RECT-002] 整流重试成功"); - // 记录成功 - let _ = self - .router - .record_result( - &provider.id, - app_type_str, - used_half_open_permit, - true, - None, - ) - .await; + self.record_success_result( + &provider.id, + app_type_str, + used_half_open_permit, + ) + .await; // 更新当前应用类型使用的 provider { @@ -515,6 +549,7 @@ impl RequestForwarder { // 使用同一供应商重试（不计入熔断器） match self .forward( + app_type, provider, endpoint, &provider_body, @@ -526,16 +561,12 @@ impl RequestForwarder { { Ok((response, claude_api_format)) => { log::info!("[{app_type_str}] [RECT-011] budget 整流重试成功"); - let _ = self - .router - .record_result( - &provider.id, - app_type_str, - used_half_open_permit, - true, - None, - ) - .await; + self.record_success_result( + &provider.id, + app_type_str, + used_half_open_permit, + ) + .await; { let mut current_providers = @@ -752,8 +783,10 @@ impl RequestForwarder { } /// 转发单个请求（使用适配器） + #[allow(clippy::too_many_arguments)] async fn forward( &self, + app_type: &AppType, provider: &Provider, endpoint: &str, body: &Value, @@ -771,8 +804,16 @@ impl RequestForwarder { .unwrap_or(false); // 应用模型映射（独立于格式转换） - let (mapped_body, _original_model, _mapped_model) = - super::model_mapper::apply_model_mapping(body.clone(), provider); + // Claude Desktop proxy 模式必须先把 Desktop 可见的 claude-* route + // 映射成真实上游模型名，并且未知 route 要直接报错，不能使用默认模型兜底。 + let mapped_body = if matches!(app_type, AppType::ClaudeDesktop) { + crate::claude_desktop_config::map_proxy_request_model(body.clone(), provider) + .map_err(|e| ProxyError::InvalidRequest(e.to_string()))? + } else { + let (mapped_body, _original_model, _mapped_model) = + super::model_mapper::apply_model_mapping(body.clone(), provider); + mapped_body + }; // 与 CCH 对齐：请求前不做 thinking 主动改写（仅保留兼容入口） let mut mapped_body = normalize_thinking_type(mapped_body); @@ -786,6 +827,13 @@ impl RequestForwarder { == Some("github_copilot") || base_url.contains("githubcopilot.com"); + if is_copilot { + mapped_body = + super::providers::copilot_model_map::apply_copilot_model_normalization(mapped_body); + self.apply_copilot_live_model_resolution(provider, &mut mapped_body) + .await; + } + // --- Copilot 优化器：分类 + 请求体优化（在格式转换之前执行） --- // 注意：确定性 ID 也在此处计算，因为 mapped_body 在格式转换时会被 move // @@ -821,6 +869,12 @@ impl RequestForwarder { mapped_body = super::copilot_optimizer::merge_tool_results(mapped_body); } + // 3.5. 主动剥离 thinking block — Copilot 走 OpenAI 兼容端点不识别该块 + // 避免上游拒绝后由 rectifier 反应式重试（首次请求已消耗 quota） + if self.copilot_optimizer_config.strip_thinking { + mapped_body = super::copilot_optimizer::strip_thinking_blocks(mapped_body); + } + // 4. Warmup 小模型降级 if self.copilot_optimizer_config.warmup_downgrade && classification.is_warmup { log::info!( @@ -960,7 +1014,8 @@ impl RequestForwarder { mapped_body, provider, api_format, - Some(&self.session_id), + self.session_client_provided + .then_some(self.session_id.as_str()), Some(self.gemini_shadow.as_ref()), )? } else { @@ -972,12 +1027,21 @@ impl RequestForwarder { // 过滤私有参数（以 `_` 开头的字段），防止内部信息泄露到上游 // 默认使用空白名单，过滤所有 _ 前缀字段 - let filtered_body = filter_private_params_with_whitelist(request_body, &[]); + let filtered_body = prepare_upstream_request_body(request_body); + log_prompt_cache_trace( + app_type, + provider, + &effective_endpoint, + resolved_claude_api_format.as_deref(), + &filtered_body, + self.session_client_provided, + ); let force_identity_encoding = needs_transform || should_force_identity_encoding(&effective_endpoint, &filtered_body, headers); // Codex OAuth 需要注入的 ChatGPT-Account-Id（在动态 token 获取期间填充） let mut codex_oauth_account_id: Option = None; + let mut should_send_codex_oauth_session_headers = false; // 获取认证头（提前准备，用于内联替换） let mut auth_headers = if let Some(mut auth) = adapter.extract_auth(provider) { @@ -1059,6 +1123,7 @@ impl RequestForwarder { match token_result { Ok(token) => { auth = AuthInfo::new(token, AuthStrategy::CodexOAuth); + should_send_codex_oauth_session_headers = true; // 解析使用的 account_id（用于注入 ChatGPT-Account-Id header） codex_oauth_account_id = match account_id { Some(id) => Some(id), @@ -1096,6 +1161,13 @@ impl RequestForwarder { } } + let codex_oauth_session_headers = + if should_send_codex_oauth_session_headers && self.session_client_provided { + build_codex_oauth_session_headers(&self.session_id) + } else { + Vec::new() + }; + // --- Copilot 优化器：动态 header 注入 --- if let Some((ref classification, ref det_request_id, ref interaction_id)) = copilot_optimization @@ -1347,6 +1419,12 @@ impl RequestForwarder { ); } + // Codex OAuth 反代尽量对齐官方 Codex CLI 的会话路由信号。 + // 只发送客户端提供的 session_id；生成的 UUID 每次不同，反而会破坏前缀缓存。 + for (name, value) in codex_oauth_session_headers { + ordered_headers.insert(name, value); + } + // 序列化请求体 let body_bytes = serde_json::to_vec(&filtered_body) .map_err(|e| ProxyError::Internal(format!("Failed to serialize request body: {e}")))?; @@ -1366,12 +1444,14 @@ impl RequestForwarder { .and_then(|v| v.as_str()) .unwrap_or(""); log::info!("[{tag}] >>> 请求 URL: {url} (model={request_model})"); - if let Ok(body_str) = serde_json::to_string(&filtered_body) { - log::debug!( - "[{tag}] >>> 请求体内容 ({}字节): {}", - body_str.len(), - body_str - ); + if log::log_enabled!(log::Level::Debug) { + if let Ok(body_str) = serde_json::to_string(&filtered_body) { + log::debug!( + "[{tag}] >>> 请求体内容 ({}字节): {}", + body_str.len(), + body_str + ); + } } // 确定超时 @@ -1390,35 +1470,60 @@ impl RequestForwarder { .map(|u| u.starts_with("socks5")) .unwrap_or(false); - let uri: http::Uri = url - .parse() - .map_err(|e| ProxyError::ForwardFailed(format!("Invalid URL '{url}': {e}")))?; + let preserve_exact_header_case = should_preserve_exact_header_case( + adapter.name(), + provider, + resolved_claude_api_format.as_deref(), + is_copilot, + ); // 发送请求 - let response = if is_socks_proxy { - // SOCKS5 代理：只能走 reqwest（不支持 header case 保留） - log::debug!("[Forwarder] Using reqwest for SOCKS5 proxy"); + let response = if is_socks_proxy || !preserve_exact_header_case { + // OpenAI / Copilot / Codex 类后端不依赖原始 header 大小写；走 reqwest + // 连接池，避免 raw TCP/TLS path 每次请求都重新握手。SOCKS5 也只能走 reqwest。 + log::debug!( + "[Forwarder] Using pooled reqwest client (preserve_exact_header_case={preserve_exact_header_case}, socks_proxy={is_socks_proxy})" + ); let client = super::http_client::get(); let mut request = client.post(&url); - if !self.non_streaming_timeout.is_zero() { + let request_is_streaming = + is_streaming_request(&effective_endpoint, &filtered_body, headers); + if request_is_streaming { + // reqwest 的 timeout 是整请求超时；流式请求交给 response_processor + // 的首包/静默期超时控制，避免长流被总时长误杀。 + request = request.timeout(std::time::Duration::from_secs(24 * 60 * 60)); + } else if !self.non_streaming_timeout.is_zero() { request = request.timeout(self.non_streaming_timeout); } for (key, value) in &ordered_headers { request = request.header(key, value); } - let reqwest_resp = request.body(body_bytes).send().await.map_err(|e| { - if e.is_timeout() { - ProxyError::Timeout(format!("请求超时: {e}")) - } else if e.is_connect() { - ProxyError::ForwardFailed(format!("连接失败: {e}")) + let send = request.body(body_bytes).send(); + let send_result = if request_is_streaming { + let header_timeout = if self.streaming_first_byte_timeout.is_zero() { + timeout } else { - ProxyError::ForwardFailed(e.to_string()) - } - })?; + self.streaming_first_byte_timeout + }; + tokio::time::timeout(header_timeout, send) + .await + .map_err(|_| { + ProxyError::Timeout(format!( + "流式响应首包超时: {}s（上游未返回响应头）", + header_timeout.as_secs() + )) + })? + } else { + send.await + }; + let reqwest_resp = send_result.map_err(map_reqwest_send_error)?; ProxyResponse::Reqwest(reqwest_resp) } else { // HTTP 代理或直连：走 hyper raw write（保持 header 大小写） // 如果有 HTTP 代理，hyper_client 会用 CONNECT 隧道穿过代理 + let uri: http::Uri = url + .parse() + .map_err(|e| ProxyError::ForwardFailed(format!("Invalid URL '{url}': {e}")))?; super::hyper_client::send_request( uri, http::Method::POST, @@ -1470,6 +1575,49 @@ impl RequestForwarder { "openai_chat".to_string() } + /// 用 Copilot live `/models` 列表确认 model ID 真实可用，找不到时按 family 降级。 + /// 命中缓存后是同步的；首次请求或 5 min 缓存过期后会触发一次 HTTP。 + async fn apply_copilot_live_model_resolution( + &self, + provider: &Provider, + body: &mut serde_json::Value, + ) { + let Some(model_id) = body.get("model").and_then(|v| v.as_str()) else { + return; + }; + let model_id = model_id.to_string(); + + let Some(app_handle) = &self.app_handle else { + return; + }; + let copilot_state = app_handle.state::(); + let copilot_auth = copilot_state.0.read().await; + let account_id = provider + .meta + .as_ref() + .and_then(|m| m.managed_account_id_for("github_copilot")); + + let models_result = match account_id.as_deref() { + Some(id) => copilot_auth.fetch_models_for_account(id).await, + None => copilot_auth.fetch_models().await, + }; + + let models = match models_result { + Ok(m) => m, + Err(err) => { + log::debug!("[Copilot] live model list unavailable, skip resolution: {err}"); + return; + } + }; + + if let Some(resolved) = + super::providers::copilot_model_map::resolve_against_models(&model_id, &models) + { + log::info!("[Copilot] live-model resolve: {model_id} → {resolved}"); + body["model"] = serde_json::Value::String(resolved); + } + } + async fn is_copilot_openai_vendor_model(&self, provider: &Provider, model_id: &str) -> bool { let Some(app_handle) = &self.app_handle else { log::debug!("[Copilot] AppHandle unavailable, fallback to chat/completions"); @@ -1824,11 +1972,46 @@ fn append_query_to_full_url(base_url: &str, query: Option<&str>) -> String { } } -fn should_force_identity_encoding( - endpoint: &str, - body: &Value, - headers: &axum::http::HeaderMap, +fn build_codex_oauth_session_headers( + session_id: &str, +) -> Vec<(http::HeaderName, http::HeaderValue)> { + let session_id = session_id.trim(); + if session_id.is_empty() { + return Vec::new(); + } + + let mut headers = Vec::new(); + if let Ok(value) = http::HeaderValue::from_str(session_id) { + headers.push((http::HeaderName::from_static("session_id"), value.clone())); + headers.push((http::HeaderName::from_static("x-client-request-id"), value)); + } + + let window_id = format!("{session_id}:0"); + if let Ok(value) = http::HeaderValue::from_str(&window_id) { + headers.push((http::HeaderName::from_static("x-codex-window-id"), value)); + } + + headers +} + +fn should_preserve_exact_header_case( + adapter_name: &str, + provider: &Provider, + resolved_claude_api_format: Option<&str>, + is_copilot: bool, ) -> bool { + if matches!(adapter_name, "Codex" | "Gemini") { + return false; + } + + if is_copilot || provider.is_codex_oauth() { + return false; + } + + matches!(resolved_claude_api_format, None | Some("anthropic")) +} + +fn is_streaming_request(endpoint: &str, body: &Value, headers: &axum::http::HeaderMap) -> bool { if body .get("stream") .and_then(|value| value.as_bool()) @@ -1848,6 +2031,24 @@ fn should_force_identity_encoding( .unwrap_or(false) } +fn should_force_identity_encoding( + endpoint: &str, + body: &Value, + headers: &axum::http::HeaderMap, +) -> bool { + is_streaming_request(endpoint, body, headers) +} + +fn map_reqwest_send_error(error: reqwest::Error) -> ProxyError { + if error.is_timeout() { + ProxyError::Timeout(format!("请求超时: {error}")) + } else if error.is_connect() { + ProxyError::ForwardFailed(format!("连接失败: {error}")) + } else { + ProxyError::ForwardFailed(error.to_string()) + } +} + fn summarize_text_for_log(text: &str, max_chars: usize) -> String { let normalized = text.split_whitespace().collect::>().join(" "); let trimmed = normalized.trim(); @@ -1861,6 +2062,65 @@ fn summarize_text_for_log(text: &str, max_chars: usize) -> String { format!("{truncated}...") } +fn prepare_upstream_request_body(request_body: Value) -> Value { + canonicalize_value(filter_private_params_with_whitelist(request_body, &[])) +} + +fn log_prompt_cache_trace( + app_type: &AppType, + provider: &Provider, + endpoint: &str, + api_format: Option<&str>, + body: &Value, + session_client_provided: bool, +) { + if !log::log_enabled!(log::Level::Debug) { + return; + } + + let prompt_cache_key = body + .get("prompt_cache_key") + .and_then(|value| value.as_str()) + .map(|key| format!("present(len={})", key.len())) + .unwrap_or_else(|| "absent".to_string()); + let store = body + .get("store") + .map(value_for_log) + .unwrap_or_else(|| "absent".to_string()); + let stream = body + .get("stream") + .map(value_for_log) + .unwrap_or_else(|| "absent".to_string()); + + log::debug!( + "[CacheTrace] app={}, provider={}, endpoint={}, api_format={}, session_client_provided={}, prompt_cache_key={}, store={}, stream={}, instructions_hash={}, tools_hash={}, input_hash={}, include_hash={}, body_hash={}", + app_type.as_str(), + provider.id, + endpoint, + api_format.unwrap_or("native"), + session_client_provided, + prompt_cache_key, + store, + stream, + short_value_hash(body.get("instructions")), + short_value_hash(body.get("tools")), + short_value_hash(body.get("input")), + short_value_hash(body.get("include")), + short_value_hash(Some(body)), + ); +} + +fn value_for_log(value: &Value) -> String { + match value { + Value::Bool(value) => value.to_string(), + Value::Number(value) => value.to_string(), + Value::String(value) => value.clone(), + Value::Null => "null".to_string(), + Value::Array(values) => format!("array(len={})", values.len()), + Value::Object(values) => format!("object(len={})", values.len()), + } +} + #[cfg(test)] mod tests { use super::*; @@ -1868,6 +2128,26 @@ mod tests { use axum::http::HeaderMap; use serde_json::json; + fn test_provider_with_type(provider_type: Option<&str>) -> Provider { + Provider { + id: "provider-1".to_string(), + name: "Provider 1".to_string(), + settings_config: json!({}), + website_url: None, + category: None, + created_at: None, + sort_index: None, + notes: None, + meta: provider_type.map(|value| crate::provider::ProviderMeta { + provider_type: Some(value.to_string()), + ..Default::default() + }), + icon: None, + icon_color: None, + in_failover_queue: false, + } + } + #[test] fn single_provider_retryable_log_uses_single_provider_code() { let error = ProxyError::UpstreamError { @@ -1933,6 +2213,151 @@ mod tests { assert_eq!(summary, "line1 line2..."); } + #[test] + fn canonical_json_sorts_object_keys_for_cache_trace_hashes() { + let left = json!({ + "tools": [ + { + "parameters": { + "properties": { + "b": {"type": "string"}, + "a": {"type": "number"} + }, + "type": "object" + }, + "name": "lookup" + } + ] + }); + let right = json!({ + "tools": [ + { + "name": "lookup", + "parameters": { + "type": "object", + "properties": { + "a": {"type": "number"}, + "b": {"type": "string"} + } + } + } + ] + }); + + assert_eq!( + crate::proxy::json_canonical::canonical_json_string(&left), + crate::proxy::json_canonical::canonical_json_string(&right) + ); + assert_eq!( + short_value_hash(Some(&left)), + short_value_hash(Some(&right)) + ); + } + + #[test] + fn prepare_upstream_request_body_filters_private_fields_and_canonicalizes_order() { + let body = json!({ + "z": 1, + "_internal": "drop", + "tools": [ + { + "name": "lookup", + "parameters": { + "type": "object", + "properties": { + "_id": { + "_private_note": "drop", + "type": "string" + }, + "b": {"type": "number"}, + "a": {"type": "string"} + } + } + } + ], + "a": 2 + }); + + let prepared = prepare_upstream_request_body(body); + + assert!(prepared.get("_internal").is_none()); + assert!(prepared["tools"][0]["parameters"]["properties"] + .get("_id") + .is_some()); + assert!(prepared["tools"][0]["parameters"]["properties"]["_id"] + .get("_private_note") + .is_none()); + assert_eq!( + serde_json::to_string(&prepared).unwrap(), + r#"{"a":2,"tools":[{"name":"lookup","parameters":{"properties":{"_id":{"type":"string"},"a":{"type":"string"},"b":{"type":"number"}},"type":"object"}}],"z":1}"# + ); + } + + #[test] + fn codex_oauth_session_headers_match_codex_cache_identity() { + let headers = build_codex_oauth_session_headers("session-123"); + let mut map = HeaderMap::new(); + for (name, value) in headers { + map.insert(name, value); + } + + assert_eq!( + map.get("session_id"), + Some(&HeaderValue::from_static("session-123")) + ); + assert_eq!( + map.get("x-client-request-id"), + Some(&HeaderValue::from_static("session-123")) + ); + assert_eq!( + map.get("x-codex-window-id"), + Some(&HeaderValue::from_static("session-123:0")) + ); + } + + #[test] + fn exact_header_case_preserved_for_native_claude_only() { + let provider = test_provider_with_type(None); + + assert!(should_preserve_exact_header_case( + "Claude", + &provider, + Some("anthropic"), + false + )); + assert!(!should_preserve_exact_header_case( + "Claude", + &provider, + Some("openai_responses"), + false + )); + assert!(!should_preserve_exact_header_case( + "Codex", &provider, None, false + )); + assert!(!should_preserve_exact_header_case( + "Gemini", &provider, None, false + )); + } + + #[test] + fn exact_header_case_skipped_for_codex_oauth_and_copilot() { + let codex_oauth = test_provider_with_type(Some("codex_oauth")); + let copilot = test_provider_with_type(Some("github_copilot")); + + assert!(!should_preserve_exact_header_case( + "Claude", + &codex_oauth, + Some("openai_responses"), + false + )); + assert!(!should_preserve_exact_header_case( + "Claude", + &copilot, + Some("openai_chat"), + true + )); + } + #[test] fn rewrite_claude_transform_endpoint_strips_beta_for_chat_completions() { let (endpoint, passthrough_query) = rewrite_claude_transform_endpoint( @@ -2098,6 +2523,17 @@ mod tests { )); } + #[test] + fn streaming_request_detects_gemini_sse_without_body_stream_flag() { + let headers = HeaderMap::new(); + + assert!(is_streaming_request( + "/v1beta/models/gemini-2.5-pro:streamGenerateContent?alt=sse", + &json!({ "model": "gemini-2.5-pro" }), + &headers + )); + } + #[test] fn force_identity_for_sse_accept_header() { let mut headers = HeaderMap::new(); diff --git a/src-tauri/src/proxy/gemini_url.rs b/src-tauri/src/proxy/gemini_url.rs index c75136677..429040980 100644 --- a/src-tauri/src/proxy/gemini_url.rs +++ b/src-tauri/src/proxy/gemini_url.rs @@ -81,6 +81,10 @@ fn should_normalize_gemini_full_url(base_url: &str) -> bool { let path = path.trim_end_matches('/'); let on_google_host = is_google_gemini_host(extract_host(origin)); + if matches_vertex_ai_publisher_model_path(path) { + return false; + } + // Unconditional layer: only paths whose grammar is *intrinsically* // Gemini-specific — the `/models/...:generateContent` method-call // shape and the deep OpenAI-compat endpoints (`/openai/chat/completions`, @@ -238,6 +242,27 @@ fn matches_structured_gemini_models_path(path: &str) -> bool { false } +/// Vertex AI endpoint paths include project/location/publisher routing before +/// `models/*:generateContent`; in full-URL mode that routing is user-provided +/// and must not be collapsed into the public Gemini `/v1beta/models/*` shape. +fn matches_vertex_ai_publisher_model_path(path: &str) -> bool { + let Some(projects_index) = path.find("/projects/") else { + return false; + }; + let Some(publisher_models_index) = path.find("/publishers/google/models/") else { + return false; + }; + + if projects_index >= publisher_models_index + || !path[projects_index..publisher_models_index].contains("/locations/") + { + return false; + } + + let after_model = &path[publisher_models_index + "/publishers/google/models/".len()..]; + after_model.contains(":generateContent") || after_model.contains(":streamGenerateContent") +} + fn merge_queries(base_query: Option<&str>, endpoint_query: Option<&str>) -> Option { let parts: Vec<&str> = [base_query, endpoint_query] .into_iter() @@ -334,6 +359,20 @@ mod tests { assert_eq!(url, "https://relay.example/custom/generate-content?alt=sse"); } + #[test] + fn preserves_cloudflare_vertex_ai_full_url_with_action() { + let url = resolve_gemini_native_url( + "https://gateway.ai.cloudflare.com/v1/account/gateway/google-vertex-ai/v1/projects/project/locations/us-central1/publishers/google/models/gemini-3.1-pro-preview:streamGenerateContent", + "/v1beta/models/gemini-2.5-flash:streamGenerateContent?alt=sse", + true, + ); + + assert_eq!( + url, + "https://gateway.ai.cloudflare.com/v1/account/gateway/google-vertex-ai/v1/projects/project/locations/us-central1/publishers/google/models/gemini-3.1-pro-preview:streamGenerateContent?alt=sse" + ); + } + #[test] fn preserves_opaque_full_url_containing_models_segment() { let url = resolve_gemini_native_url( diff --git a/src-tauri/src/proxy/handler_config.rs b/src-tauri/src/proxy/handler_config.rs index fcbeb1fa2..887b550fd 100644 --- a/src-tauri/src/proxy/handler_config.rs +++ b/src-tauri/src/proxy/handler_config.rs @@ -14,6 +14,12 @@ pub type ResponseUsageParser = fn(&Value) -> Option; /// 参数: (流式事件列表, 请求中的模型名称) -> 最终使用的模型名称 pub type StreamModelExtractor = fn(&[Value], &str) -> String; +/// 流式 usage 事件预过滤器类型别名。 +/// +/// 参数是 SSE `data:` 原始字符串。返回 false 时跳过 JSON parse，避免在 +/// token/chunk 高频路径上解析与 usage 无关的事件。 +pub type StreamUsageEventFilter = fn(&str) -> bool; + /// 各 API 的使用量解析配置 #[derive(Clone, Copy)] pub struct UsageParserConfig { @@ -23,10 +29,32 @@ pub struct UsageParserConfig { pub response_parser: ResponseUsageParser, /// 流式响应中的模型提取器 pub model_extractor: StreamModelExtractor, + /// 流式 usage 事件预过滤器 + pub stream_event_filter: Option, /// 应用类型字符串（用于日志记录） pub app_type_str: &'static str, } +// ============================================================================ +// 流式 usage 事件预过滤 +// ============================================================================ + +pub fn claude_stream_usage_event_filter(data: &str) -> bool { + data.contains("\"message_start\"") || data.contains("\"message_delta\"") +} + +fn openai_stream_usage_event_filter(data: &str) -> bool { + data.contains("\"usage\"") +} + +fn codex_stream_usage_event_filter(data: &str) -> bool { + data.contains("\"response.completed\"") || data.contains("\"usage\"") +} + +fn gemini_stream_usage_event_filter(data: &str) -> bool { + data.contains("\"usageMetadata\"") +} + // ============================================================================ // 模型提取器实现 // ============================================================================ @@ -104,6 +132,7 @@ pub const CLAUDE_PARSER_CONFIG: UsageParserConfig = UsageParserConfig { stream_parser: TokenUsage::from_claude_stream_events, response_parser: TokenUsage::from_claude_response, model_extractor: claude_model_extractor, + stream_event_filter: Some(claude_stream_usage_event_filter), app_type_str: "claude", }; @@ -112,6 +141,7 @@ pub const OPENAI_PARSER_CONFIG: UsageParserConfig = UsageParserConfig { stream_parser: TokenUsage::from_openai_stream_events, response_parser: TokenUsage::from_openai_response, model_extractor: openai_model_extractor, + stream_event_filter: Some(openai_stream_usage_event_filter), app_type_str: "codex", }; @@ -120,6 +150,7 @@ pub const CODEX_PARSER_CONFIG: UsageParserConfig = UsageParserConfig { stream_parser: TokenUsage::from_codex_stream_events_auto, response_parser: TokenUsage::from_codex_response_auto, model_extractor: codex_auto_model_extractor, + stream_event_filter: Some(codex_stream_usage_event_filter), app_type_str: "codex", }; @@ -128,6 +159,7 @@ pub const GEMINI_PARSER_CONFIG: UsageParserConfig = UsageParserConfig { stream_parser: TokenUsage::from_gemini_stream_chunks, response_parser: TokenUsage::from_gemini_response, model_extractor: gemini_model_extractor, + stream_event_filter: Some(gemini_stream_usage_event_filter), app_type_str: "gemini", }; diff --git a/src-tauri/src/proxy/handler_context.rs b/src-tauri/src/proxy/handler_context.rs index da2413ec4..151a8bc10 100644 --- a/src-tauri/src/proxy/handler_context.rs +++ b/src-tauri/src/proxy/handler_context.rs @@ -57,6 +57,8 @@ pub struct RequestContext { pub app_type: AppType, /// Session ID（从客户端请求提取或新生成） pub session_id: String, + /// Session ID 是否由客户端提供。生成的 UUID 不能作为上游缓存 key，否则每个请求都会换 key。 + pub session_client_provided: bool, /// 整流器配置 pub rectifier_config: RectifierConfig, /// 优化器配置 @@ -161,6 +163,7 @@ impl RequestContext { app_type_str, app_type, session_id, + session_client_provided: session_result.client_provided, rectifier_config, optimizer_config, copilot_optimizer_config, @@ -223,6 +226,7 @@ impl RequestContext { state.app_handle.clone(), self.current_provider_id.clone(), self.session_id.clone(), + self.session_client_provided, first_byte_timeout, idle_timeout, self.rectifier_config.clone(), diff --git a/src-tauri/src/proxy/handlers.rs b/src-tauri/src/proxy/handlers.rs index 086f944e6..58ee274cc 100644 --- a/src-tauri/src/proxy/handlers.rs +++ b/src-tauri/src/proxy/handlers.rs @@ -10,7 +10,8 @@ use super::{ error_mapper::{get_error_message, map_proxy_error_to_status}, handler_config::{ - CLAUDE_PARSER_CONFIG, CODEX_PARSER_CONFIG, GEMINI_PARSER_CONFIG, OPENAI_PARSER_CONFIG, + claude_stream_usage_event_filter, CLAUDE_PARSER_CONFIG, CODEX_PARSER_CONFIG, + GEMINI_PARSER_CONFIG, OPENAI_PARSER_CONFIG, }, handler_context::RequestContext, providers::{ @@ -22,9 +23,10 @@ use super::{ response_processor::{ create_logged_passthrough_stream, process_response, read_decoded_body, strip_entity_headers_for_rebuilt_body, strip_hop_by_hop_response_headers, - SseUsageCollector, + usage_logging_enabled, SseUsageCollector, }, server::ProxyState, + sse::{strip_sse_field, take_sse_block}, types::*, usage::parser::TokenUsage, ProxyError, @@ -68,6 +70,49 @@ pub async fn get_status(State(state): State) -> Result, request: axum::extract::Request, +) -> Result { + handle_messages_for_app(state, request, AppType::Claude, "Claude", "claude", None).await +} + +pub async fn handle_claude_desktop_messages( + State(state): State, + request: axum::extract::Request, +) -> Result { + validate_claude_desktop_gateway_auth(&state, request.headers())?; + handle_messages_for_app( + state, + request, + AppType::ClaudeDesktop, + "Claude Desktop", + "claude-desktop", + Some("/claude-desktop"), + ) + .await +} + +pub async fn handle_claude_desktop_models( + State(state): State, + headers: axum::http::HeaderMap, +) -> Result, ProxyError> { + validate_claude_desktop_gateway_auth(&state, &headers)?; + let providers = state + .provider_router + .select_providers("claude-desktop") + .await + .map_err(|e| ProxyError::DatabaseError(e.to_string()))?; + let provider = providers.first().ok_or(ProxyError::NoAvailableProvider)?; + let response = crate::claude_desktop_config::model_list_response(provider) + .map_err(|e| ProxyError::ConfigError(e.to_string()))?; + Ok(Json(response)) +} + +async fn handle_messages_for_app( + state: ProxyState, + request: axum::extract::Request, + app_type: AppType, + tag: &'static str, + app_type_str: &'static str, + strip_prefix: Option<&'static str>, ) -> Result { let (parts, body) = request.into_parts(); let uri = parts.uri; @@ -82,12 +127,15 @@ pub async fn handle_messages( .map_err(|e| ProxyError::Internal(format!("Failed to parse request body: {e}")))?; let mut ctx = - RequestContext::new(&state, &body, &headers, AppType::Claude, "Claude", "claude").await?; + RequestContext::new(&state, &body, &headers, app_type.clone(), tag, app_type_str).await?; - let endpoint = uri + let raw_endpoint = uri .path_and_query() .map(|path_and_query| path_and_query.as_str()) .unwrap_or(uri.path()); + let endpoint = strip_prefix + .and_then(|prefix| raw_endpoint.strip_prefix(prefix)) + .unwrap_or(raw_endpoint); let is_stream = body .get("stream") @@ -98,7 +146,7 @@ pub async fn handle_messages( let forwarder = ctx.create_forwarder(&state); let result = match forwarder .forward_with_retry( - &AppType::Claude, + &app_type, endpoint, body.clone(), headers, @@ -126,7 +174,7 @@ pub async fn handle_messages( let response = result.response; // 检查是否需要格式转换（OpenRouter 等中转服务） - let adapter = get_adapter(&AppType::Claude); + let adapter = get_adapter(&app_type); let needs_transform = adapter.needs_transform(&ctx.provider); // Claude 特有：格式转换处理 @@ -139,6 +187,33 @@ pub async fn handle_messages( process_response(response, &ctx, &state, &CLAUDE_PARSER_CONFIG).await } +fn validate_claude_desktop_gateway_auth( + state: &ProxyState, + headers: &axum::http::HeaderMap, +) -> Result<(), ProxyError> { + let expected = crate::claude_desktop_config::get_or_create_gateway_token(state.db.as_ref()) + .map_err(|e| ProxyError::AuthError(e.to_string()))?; + let Some(value) = headers.get(axum::http::header::AUTHORIZATION) else { + return Err(ProxyError::AuthError( + "Claude Desktop gateway 缺少 Authorization 头".to_string(), + )); + }; + let value = value + .to_str() + .map_err(|_| ProxyError::AuthError("Authorization 头格式无效".to_string()))?; + let token = value + .strip_prefix("Bearer ") + .or_else(|| value.strip_prefix("bearer ")) + .unwrap_or("") + .trim(); + if token != expected { + return Err(ProxyError::AuthError( + "Claude Desktop gateway token 无效".to_string(), + )); + } + Ok(()) +} + /// Claude 格式转换处理（独有逻辑） /// /// 支持 OpenAI Chat Completions 和 Responses API 两种格式的转换 @@ -151,10 +226,33 @@ async fn handle_claude_transform( api_format: &str, ) -> Result { let status = response.status(); + let is_codex_oauth = ctx + .provider + .meta + .as_ref() + .and_then(|meta| meta.provider_type.as_deref()) + == Some("codex_oauth"); + // Codex OAuth 会把 openai_responses 响应强制升级为 SSE，即使客户端发的是 stream:false。 + // should_use_claude_transform_streaming 默认会把这个组合路由到流式转换器——虽然能避免 + // JSON parse 报 422，但会让非流客户端收到 text/event-stream，违反 Anthropic 非流语义。 + // 这里为这个特定组合打开 override：把上游 SSE 聚合成 Anthropic JSON 回给客户端，其它 + // 场景（任意上游 is_sse、非 Codex OAuth 等）仍沿用原有流式兜底。 + let aggregate_codex_oauth_responses_sse = + !is_stream && is_codex_oauth && api_format == "openai_responses"; + let use_streaming = if aggregate_codex_oauth_responses_sse { + false + } else { + should_use_claude_transform_streaming( + is_stream, + response.is_sse(), + api_format, + is_codex_oauth, + ) + }; let tool_schema_hints = transform_gemini::extract_anthropic_tool_schema_hints(original_body); let tool_schema_hints = (!tool_schema_hints.is_empty()).then_some(tool_schema_hints); - if is_stream { + if use_streaming { // 根据 api_format 选择流式转换器 let stream = response.bytes_stream(); let sse_stream: Box< @@ -173,40 +271,49 @@ async fn handle_claude_transform( Box::new(Box::pin(create_anthropic_sse_stream(stream))) }; - // 创建使用量收集器 - let usage_collector = { + // 创建使用量收集器；关闭 usage logging 时不要再解析转换后的 SSE。 + let usage_collector = if usage_logging_enabled(state) { let state = state.clone(); let provider_id = ctx.provider.id.clone(); let model = ctx.request_model.clone(); let status_code = status.as_u16(); let start_time = ctx.start_time; + let session_id = ctx.session_id.clone(); - SseUsageCollector::new(start_time, move |events, first_token_ms| { - if let Some(usage) = TokenUsage::from_claude_stream_events(&events) { - let latency_ms = start_time.elapsed().as_millis() as u64; - let state = state.clone(); - let provider_id = provider_id.clone(); - let model = model.clone(); + Some(SseUsageCollector::new( + start_time, + Some(claude_stream_usage_event_filter), + move |events, first_token_ms| { + if let Some(usage) = TokenUsage::from_claude_stream_events(&events) { + let latency_ms = start_time.elapsed().as_millis() as u64; + let state = state.clone(); + let provider_id = provider_id.clone(); + let model = model.clone(); + let session_id = session_id.clone(); - tokio::spawn(async move { - log_usage( - &state, - &provider_id, - "claude", - &model, - &model, - usage, - latency_ms, - first_token_ms, - true, - status_code, - ) - .await; - }); - } else { - log::debug!("[Claude] OpenRouter 流式响应缺少 usage 统计，跳过消费记录"); - } - }) + tokio::spawn(async move { + log_usage( + &state, + &provider_id, + "claude", + &model, + &model, + usage, + latency_ms, + first_token_ms, + true, + status_code, + Some(session_id), + ) + .await; + }); + } else { + log::debug!("[Claude] OpenRouter 流式响应缺少 usage 统计，跳过消费记录"); + } + }, + )) + } else { + None }; // 获取流式超时配置 @@ -215,7 +322,7 @@ async fn handle_claude_transform( let logged_stream = create_logged_passthrough_stream( sse_stream, "Claude/OpenRouter", - Some(usage_collector), + usage_collector, timeout_config, ); @@ -245,10 +352,14 @@ async fn handle_claude_transform( let body_str = String::from_utf8_lossy(&body_bytes); - let upstream_response: Value = serde_json::from_slice(&body_bytes).map_err(|e| { - log::error!("[Claude] 解析上游响应失败: {e}, body: {body_str}"); - ProxyError::TransformError(format!("Failed to parse upstream response: {e}")) - })?; + let upstream_response: Value = if aggregate_codex_oauth_responses_sse { + responses_sse_to_response_value(&body_str)? + } else { + serde_json::from_slice(&body_bytes).map_err(|e| { + log::error!("[Claude] 解析上游响应失败: {e}, body: {body_str}"); + ProxyError::TransformError(format!("Failed to parse upstream response: {e}")) + })? + }; // 根据 api_format 选择非流式转换器 let anthropic_response = if api_format == "openai_responses" { @@ -282,6 +393,7 @@ async fn handle_claude_transform( let state = state.clone(); let provider_id = ctx.provider.id.clone(); let model = model.to_string(); + let session_id = ctx.session_id.clone(); async move { log_usage( &state, @@ -294,6 +406,7 @@ async fn handle_claude_transform( None, false, status.as_u16(), + Some(session_id), ) .await; } @@ -561,6 +674,87 @@ pub async fn handle_gemini( process_response(response, &ctx, &state, &GEMINI_PARSER_CONFIG).await } +fn should_use_claude_transform_streaming( + requested_streaming: bool, + upstream_is_sse: bool, + api_format: &str, + is_codex_oauth: bool, +) -> bool { + requested_streaming || upstream_is_sse || (is_codex_oauth && api_format == "openai_responses") +} + +/// 把 OpenAI Responses SSE 流聚合成一个完整的 Responses JSON 对象，供下游转成 Anthropic +/// 非流响应。仅在 Codex OAuth 把 `stream:false` 强制升级为 SSE 的场景下调用。 +/// +/// 复用 `proxy::sse` 的 `take_sse_block`/`strip_sse_field`：`take_sse_block` 同时支持 +/// `\n\n` 与 `\r\n\r\n` 两种分隔符，`strip_sse_field` 兼容带/不带空格的字段写法。 +fn responses_sse_to_response_value(body: &str) -> Result { + let mut buffer = body.to_string(); + let mut completed_response: Option = None; + let mut output_items = Vec::new(); + + while let Some(block) = take_sse_block(&mut buffer) { + let mut event_name = ""; + let mut data_lines: Vec<&str> = Vec::new(); + + for line in block.lines() { + if let Some(evt) = strip_sse_field(line, "event") { + event_name = evt.trim(); + } else if let Some(d) = strip_sse_field(line, "data") { + data_lines.push(d); + } + } + + if data_lines.is_empty() { + continue; + } + + let data_str = data_lines.join("\n"); + if data_str.trim() == "[DONE]" { + continue; + } + + let data: Value = serde_json::from_str(&data_str).map_err(|e| { + ProxyError::TransformError(format!("Failed to parse upstream SSE event: {e}")) + })?; + + match event_name { + "response.output_item.done" => { + if let Some(item) = data.get("item") { + output_items.push(item.clone()); + } + } + "response.completed" => { + completed_response = Some(data.get("response").cloned().unwrap_or(data)); + } + "response.failed" => { + let message = data + .pointer("/response/error/message") + .and_then(|v| v.as_str()) + .unwrap_or("response.failed event received"); + return Err(ProxyError::TransformError(message.to_string())); + } + _ => {} + } + } + + let mut response = completed_response.ok_or_else(|| { + ProxyError::TransformError("No response.completed event in upstream SSE".to_string()) + })?; + + if !output_items.is_empty() { + if let Some(obj) = response.as_object_mut() { + obj.insert("output".to_string(), Value::Array(output_items)); + } else { + return Err(ProxyError::TransformError( + "response.completed payload is not an object".to_string(), + )); + } + } + + Ok(response) +} + // ============================================================================ // 使用量记录（保留用于 Claude 转换逻辑） // ============================================================================ @@ -607,9 +801,14 @@ async fn log_usage( first_token_ms: Option, is_streaming: bool, status_code: u16, + session_id: Option, ) { use super::usage::logger::UsageLogger; + if !usage_logging_enabled(state) { + return; + } + let logger = UsageLogger::new(&state.db); let (multiplier, pricing_model_source) = @@ -634,10 +833,101 @@ async fn log_usage( latency_ms, first_token_ms, status_code, - None, + session_id, None, // provider_type is_streaming, ) { log::warn!("[USG-001] 记录使用量失败: {e}"); } } + +#[cfg(test)] +mod tests { + use super::{responses_sse_to_response_value, should_use_claude_transform_streaming}; + use crate::proxy::ProxyError; + + #[test] + fn codex_oauth_responses_force_streaming_even_if_client_sent_false() { + assert!(should_use_claude_transform_streaming( + false, + false, + "openai_responses", + true, + )); + } + + #[test] + fn upstream_sse_response_always_uses_streaming_path() { + assert!(should_use_claude_transform_streaming( + false, + true, + "openai_chat", + false, + )); + } + + #[test] + fn non_streaming_response_stays_non_streaming_for_regular_openai_responses() { + assert!(!should_use_claude_transform_streaming( + false, + false, + "openai_responses", + false, + )); + } + + #[test] + fn responses_sse_to_response_value_collects_output_items() { + let sse = r#"event: response.output_item.done +data: {"type":"response.output_item.done","item":{"type":"message","role":"assistant","content":[{"type":"output_text","text":"hello"}]}} + +event: response.completed +data: {"type":"response.completed","response":{"id":"resp_1","status":"completed","model":"gpt-5.4","output":[],"usage":{"input_tokens":10,"output_tokens":2}}} + +"#; + + let response = responses_sse_to_response_value(sse).unwrap(); + + assert_eq!(response["id"], "resp_1"); + assert_eq!(response["output"][0]["type"], "message"); + assert_eq!(response["output"][0]["content"][0]["text"], "hello"); + } + + #[test] + fn responses_sse_to_response_value_handles_crlf_delimiters() { + // 真实 HTTP SSE 按规范使用 \r\n\r\n 分隔事件；take_sse_block 必须同时处理两种分隔符， + // 否则此路径在任何标准上游（含 Codex OAuth HTTPS 后端）下都会 TransformError。 + let sse = "event: response.output_item.done\r\n\ +data: {\"type\":\"response.output_item.done\",\"item\":{\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"output_text\",\"text\":\"hi\"}]}}\r\n\ +\r\n\ +event: response.completed\r\n\ +data: {\"type\":\"response.completed\",\"response\":{\"id\":\"resp_crlf\",\"status\":\"completed\",\"model\":\"gpt-5.4\",\"output\":[],\"usage\":{\"input_tokens\":5,\"output_tokens\":1}}}\r\n\ +\r\n"; + + let response = responses_sse_to_response_value(sse).unwrap(); + + assert_eq!(response["id"], "resp_crlf"); + assert_eq!(response["output"][0]["type"], "message"); + assert_eq!(response["output"][0]["content"][0]["text"], "hi"); + } + + #[test] + fn responses_sse_to_response_value_returns_err_on_response_failed() { + let sse = "event: response.failed\n\ +data: {\"type\":\"response.failed\",\"response\":{\"error\":{\"message\":\"upstream blew up\"}}}\n\n"; + + let err = responses_sse_to_response_value(sse).unwrap_err(); + match err { + ProxyError::TransformError(msg) => assert!(msg.contains("upstream blew up")), + other => panic!("expected TransformError, got {other:?}"), + } + } + + #[test] + fn responses_sse_to_response_value_errors_when_no_completed_event() { + let sse = "event: response.output_item.done\n\ +data: {\"type\":\"response.output_item.done\",\"item\":{\"type\":\"message\"}}\n\n"; + + assert!(responses_sse_to_response_value(sse).is_err()); + } +} diff --git a/src-tauri/src/proxy/json_canonical.rs b/src-tauri/src/proxy/json_canonical.rs new file mode 100644 index 000000000..1419ff66f --- /dev/null +++ b/src-tauri/src/proxy/json_canonical.rs @@ -0,0 +1,102 @@ +//! Stable JSON helpers for cache-sensitive request bodies. + +use serde_json::Value; +use sha2::{Digest, Sha256}; + +pub(crate) fn canonicalize_value(value: Value) -> Value { + match value { + Value::Array(values) => Value::Array(values.into_iter().map(canonicalize_value).collect()), + Value::Object(map) => { + let mut entries = map.into_iter().collect::>(); + entries.sort_by(|(left, _), (right, _)| left.cmp(right)); + + let mut sorted = serde_json::Map::new(); + for (key, value) in entries { + sorted.insert(key, canonicalize_value(value)); + } + Value::Object(sorted) + } + other => other, + } +} + +pub(crate) fn canonical_json_string(value: &Value) -> String { + match value { + Value::Null => "null".to_string(), + Value::Bool(value) => value.to_string(), + Value::Number(value) => value.to_string(), + Value::String(value) => serde_json::to_string(value) + .expect("serializing a JSON string for canonical output should not fail"), + Value::Array(values) => { + let parts = values.iter().map(canonical_json_string).collect::>(); + format!("[{}]", parts.join(",")) + } + Value::Object(map) => { + let mut entries = map.iter().collect::>(); + entries.sort_by_key(|(left, _)| *left); + let parts = entries + .into_iter() + .map(|(key, value)| { + let key = serde_json::to_string(key).expect( + "serializing a JSON object key for canonical output should not fail", + ); + format!("{key}:{}", canonical_json_string(value)) + }) + .collect::>(); + format!("{{{}}}", parts.join(",")) + } + } +} + +pub(crate) fn short_value_hash(value: Option<&Value>) -> String { + let Some(value) = value else { + return "absent".to_string(); + }; + short_sha256_hex(canonical_json_string(value).as_bytes()) +} + +pub(crate) fn short_sha256_hex(bytes: &[u8]) -> String { + let digest = Sha256::digest(bytes); + digest + .iter() + .take(8) + .map(|byte| format!("{byte:02x}")) + .collect::() +} + +#[cfg(test)] +mod tests { + use super::*; + use serde_json::json; + + #[test] + fn canonical_json_string_sorts_nested_object_keys() { + let left = json!({ + "b": 2, + "a": { + "d": true, + "c": [3, {"z": 1, "y": 2}] + } + }); + let right = json!({ + "a": { + "c": [3, {"y": 2, "z": 1}], + "d": true + }, + "b": 2 + }); + + assert_eq!(canonical_json_string(&left), canonical_json_string(&right)); + assert_eq!( + short_value_hash(Some(&left)), + short_value_hash(Some(&right)) + ); + } + + #[test] + fn canonicalize_value_sorts_map_storage_order() { + let value = canonicalize_value(json!({"b": 2, "a": 1})); + + assert_eq!(serde_json::to_string(&value).unwrap(), r#"{"a":1,"b":2}"#); + } +} diff --git a/src-tauri/src/proxy/mod.rs b/src-tauri/src/proxy/mod.rs index 48cec6b38..6dd7bd0d9 100644 --- a/src-tauri/src/proxy/mod.rs +++ b/src-tauri/src/proxy/mod.rs @@ -17,6 +17,7 @@ mod handlers; mod health; pub mod http_client; pub mod hyper_client; +pub(crate) mod json_canonical; pub mod log_codes; pub mod model_mapper; pub mod provider_router; diff --git a/src-tauri/src/proxy/model_mapper.rs b/src-tauri/src/proxy/model_mapper.rs index 4f0f94d81..c7f543e1e 100644 --- a/src-tauri/src/proxy/model_mapper.rs +++ b/src-tauri/src/proxy/model_mapper.rs @@ -11,7 +11,6 @@ pub struct ModelMapping { pub sonnet_model: Option, pub opus_model: Option, pub default_model: Option, - pub reasoning_model: Option, } impl ModelMapping { @@ -40,11 +39,6 @@ impl ModelMapping { .and_then(|v| v.as_str()) .filter(|s| !s.is_empty()) .map(String::from), - reasoning_model: env - .and_then(|e| e.get("ANTHROPIC_REASONING_MODEL")) - .and_then(|v| v.as_str()) - .filter(|s| !s.is_empty()) - .map(String::from), } } @@ -54,21 +48,13 @@ impl ModelMapping { || self.sonnet_model.is_some() || self.opus_model.is_some() || self.default_model.is_some() - || self.reasoning_model.is_some() } /// 根据原始模型名称获取映射后的模型 - pub fn map_model(&self, original_model: &str, has_thinking: bool) -> String { + pub fn map_model(&self, original_model: &str) -> String { let model_lower = original_model.to_lowercase(); - // 1. thinking 模式优先使用推理模型 - if has_thinking { - if let Some(ref m) = self.reasoning_model { - return m.clone(); - } - } - - // 2. 按模型类型匹配 + // 1. 按模型类型匹配 if model_lower.contains("haiku") { if let Some(ref m) = self.haiku_model { return m.clone(); @@ -85,35 +71,16 @@ impl ModelMapping { } } - // 3. 默认模型 + // 2. 默认模型 if let Some(ref m) = self.default_model { return m.clone(); } - // 4. 无映射，保持原样 + // 3. 无映射，保持原样 original_model.to_string() } } -/// 检测请求是否启用了 thinking 模式 -pub fn has_thinking_enabled(body: &Value) -> bool { - match body - .get("thinking") - .and_then(|v| v.as_object()) - .and_then(|o| o.get("type")) - .and_then(|t| t.as_str()) - { - Some("enabled") | Some("adaptive") => true, - Some("disabled") | None => false, - Some(other) => { - log::warn!( - "[ModelMapper] 未知 thinking.type='{other}'，按 disabled 处理以避免误路由 reasoning 模型" - ); - false - } - } -} - /// 对请求体应用模型映射 /// /// 返回 (映射后的请求体, 原始模型名, 映射后模型名) @@ -133,8 +100,7 @@ pub fn apply_model_mapping( let original_model = body.get("model").and_then(|m| m.as_str()).map(String::from); if let Some(ref original) = original_model { - let has_thinking = has_thinking_enabled(&body); - let mapped = mapping.map_model(original, has_thinking); + let mapped = mapping.map_model(original); if mapped != *original { log::debug!("[ModelMapper] 模型映射: {original} → {mapped}"); @@ -160,8 +126,7 @@ mod tests { "ANTHROPIC_MODEL": "default-model", "ANTHROPIC_DEFAULT_HAIKU_MODEL": "haiku-mapped", "ANTHROPIC_DEFAULT_SONNET_MODEL": "sonnet-mapped", - "ANTHROPIC_DEFAULT_OPUS_MODEL": "opus-mapped", - "ANTHROPIC_REASONING_MODEL": "reasoning-model" + "ANTHROPIC_DEFAULT_OPUS_MODEL": "opus-mapped" } }), website_url: None, @@ -193,27 +158,6 @@ mod tests { } } - fn create_provider_with_reasoning_only() -> Provider { - Provider { - id: "test".to_string(), - name: "Test".to_string(), - settings_config: json!({ - "env": { - "ANTHROPIC_REASONING_MODEL": "reasoning-only-model" - } - }), - website_url: None, - category: None, - created_at: None, - sort_index: None, - notes: None, - meta: None, - icon: None, - icon_color: None, - in_failover_queue: false, - } - } - #[test] fn test_sonnet_mapping() { let provider = create_provider_with_mapping(); @@ -243,40 +187,29 @@ mod tests { } #[test] - fn test_thinking_mode() { + fn test_thinking_does_not_affect_model_mapping() { + // Issue #2081: thinking 参数不应影响模型映射 let provider = create_provider_with_mapping(); let body = json!({ "model": "claude-sonnet-4-5", "thinking": {"type": "enabled"} }); let (result, _, mapped) = apply_model_mapping(body, &provider); - assert_eq!(result["model"], "reasoning-model"); - assert_eq!(mapped, Some("reasoning-model".to_string())); + assert_eq!(result["model"], "sonnet-mapped"); + assert_eq!(mapped, Some("sonnet-mapped".to_string())); } #[test] - fn test_reasoning_only_mapping_in_thinking_mode() { - let provider = create_provider_with_reasoning_only(); + fn test_thinking_adaptive_does_not_affect_model_mapping() { + // Issue #2081: adaptive thinking 也不应影响模型映射 + let provider = create_provider_with_mapping(); let body = json!({ "model": "claude-sonnet-4-5", - "thinking": {"type": "enabled"} + "thinking": {"type": "adaptive"} }); let (result, _, mapped) = apply_model_mapping(body, &provider); - assert_eq!(result["model"], "reasoning-only-model"); - assert_eq!(mapped, Some("reasoning-only-model".to_string())); - } - - #[test] - fn test_reasoning_only_mapping_does_not_affect_non_thinking() { - let provider = create_provider_with_reasoning_only(); - let body = json!({ - "model": "claude-sonnet-4-5", - "thinking": {"type": "disabled"} - }); - let (result, original, mapped) = apply_model_mapping(body, &provider); - assert_eq!(result["model"], "claude-sonnet-4-5"); - assert_eq!(original, Some("claude-sonnet-4-5".to_string())); - assert!(mapped.is_none()); + assert_eq!(result["model"], "sonnet-mapped"); + assert_eq!(mapped, Some("sonnet-mapped".to_string())); } #[test] @@ -310,30 +243,6 @@ mod tests { assert!(mapped.is_none()); } - #[test] - fn test_thinking_adaptive() { - let provider = create_provider_with_mapping(); - let body = json!({ - "model": "claude-sonnet-4-5", - "thinking": {"type": "adaptive"} - }); - let (result, _, mapped) = apply_model_mapping(body, &provider); - assert_eq!(result["model"], "reasoning-model"); - assert_eq!(mapped, Some("reasoning-model".to_string())); - } - - #[test] - fn test_thinking_unknown_type() { - let provider = create_provider_with_mapping(); - let body = json!({ - "model": "claude-sonnet-4-5", - "thinking": {"type": "some_future_type"} - }); - let (result, _, mapped) = apply_model_mapping(body, &provider); - assert_eq!(result["model"], "sonnet-mapped"); - assert_eq!(mapped, Some("sonnet-mapped".to_string())); - } - #[test] fn test_case_insensitive() { let provider = create_provider_with_mapping(); diff --git a/src-tauri/src/proxy/providers/claude.rs b/src-tauri/src/proxy/providers/claude.rs index 604c9ebfe..bdc479e1c 100644 --- a/src-tauri/src/proxy/providers/claude.rs +++ b/src-tauri/src/proxy/providers/claude.rs @@ -82,6 +82,40 @@ pub fn claude_api_format_needs_transform(api_format: &str) -> bool { ) } +fn is_reasoning_content_compatible_identifier(value: &str) -> bool { + let value = value.to_ascii_lowercase(); + value.contains("moonshot") || value.contains("kimi") || value.contains("deepseek") +} + +fn should_preserve_reasoning_content_for_openai_chat( + provider: &Provider, + body: &serde_json::Value, +) -> bool { + if body + .get("model") + .and_then(|m| m.as_str()) + .is_some_and(is_reasoning_content_compatible_identifier) + { + return true; + } + + let settings = &provider.settings_config; + let base_urls = [ + settings + .get("env") + .and_then(|env| env.get("ANTHROPIC_BASE_URL")) + .and_then(|v| v.as_str()), + settings.get("base_url").and_then(|v| v.as_str()), + settings.get("baseURL").and_then(|v| v.as_str()), + settings.get("apiEndpoint").and_then(|v| v.as_str()), + ]; + + base_urls + .into_iter() + .flatten() + .any(is_reasoning_content_compatible_identifier) +} + pub fn transform_claude_request_for_api_format( body: serde_json::Value, provider: &Provider, @@ -89,6 +123,8 @@ pub fn transform_claude_request_for_api_format( session_id: Option<&str>, shadow_store: Option<&super::gemini_shadow::GeminiShadowStore>, ) -> Result { + let is_codex_oauth = provider.is_codex_oauth(); + // Copilot 场景：优先从 metadata.user_id 提取 session ID 作为 cache key // 格式: "uuid_sessionId" → 提取 "_" 后面的部分作为 session 标识 // 同一会话的请求共享 cache key，提升 Copilot 缓存命中率 @@ -119,35 +155,47 @@ pub fn transform_claude_request_for_api_format( .map(|s| s.to_string()) }) } else { - None + session_id + .map(str::trim) + .filter(|s| !s.is_empty()) + .map(ToString::to_string) }; - let cache_key = session_cache_key - .as_deref() - .or_else(|| { - provider - .meta - .as_ref() - .and_then(|m| m.prompt_cache_key.as_deref()) - }) - .unwrap_or(&provider.id); + let explicit_cache_key = provider + .meta + .as_ref() + .and_then(|m| m.prompt_cache_key.as_deref()); + let (cache_key, cache_key_source) = if let Some(key) = explicit_cache_key { + (Some(key), "explicit") + } else if let Some(key) = session_cache_key.as_deref() { + (Some(key), "session") + } else { + (None, "none") + }; match api_format { "openai_responses" => { + log::debug!( + "[Cache] OpenAI Responses prompt_cache_key source={cache_key_source}, provider={}, codex_oauth={is_codex_oauth}, has_key={}", + provider.id, + cache_key.is_some() + ); // Codex OAuth (ChatGPT Plus/Pro 反代) 需要在请求体里强制 store: false // + include: ["reasoning.encrypted_content"]，由 transform 层统一处理。 - let is_codex_oauth = provider - .meta - .as_ref() - .and_then(|m| m.provider_type.as_deref()) - == Some("codex_oauth"); + let codex_fast_mode = provider.codex_fast_mode_enabled(); super::transform_responses::anthropic_to_responses( body, - Some(cache_key), + cache_key, is_codex_oauth, + codex_fast_mode, ) } "openai_chat" => { - let mut result = super::transform::anthropic_to_openai(body)?; + let preserve_reasoning_content = + should_preserve_reasoning_content_for_openai_chat(provider, &body); + let mut result = super::transform::anthropic_to_openai_with_reasoning_content( + body, + preserve_reasoning_content, + )?; // Inject prompt_cache_key only if explicitly configured in meta if let Some(key) = provider .meta @@ -332,6 +380,16 @@ impl ClaudeAdapter { log::debug!("[Claude] 使用 OPENAI_API_KEY"); return Some(key.to_string()); } + // Gemini Native key + if let Some(key) = env + .get("GEMINI_API_KEY") + .and_then(|v| v.as_str()) + .map(str::trim) + .filter(|s| !s.is_empty()) + { + log::debug!("[Claude] 使用 GEMINI_API_KEY"); + return Some(key.to_string()); + } } // 尝试直接获取 @@ -350,6 +408,33 @@ impl ClaudeAdapter { log::warn!("[Claude] 未找到有效的 API Key"); None } + + /// 根据 env 中填写的变量名推断 Anthropic 默认走哪种鉴权策略。 + /// + /// 与 Anthropic SDK 原生语义保持一致： + /// - `ANTHROPIC_AUTH_TOKEN` → `ClaudeAuth`（发送 `Authorization: Bearer`） + /// - `ANTHROPIC_API_KEY` → `Anthropic` （发送 `x-api-key`） + /// + /// 优先级与 [`extract_key`] 一致；两者都缺时返回 `None` 由调用方决定 fallback。 + fn infer_anthropic_auth_strategy(&self, provider: &Provider) -> Option { + let env = provider.settings_config.get("env")?; + + let has_value = |key: &str| -> bool { + env.get(key) + .and_then(|v| v.as_str()) + .map(str::trim) + .filter(|s| !s.is_empty()) + .is_some() + }; + + if has_value("ANTHROPIC_AUTH_TOKEN") { + return Some(AuthStrategy::ClaudeAuth); + } + if has_value("ANTHROPIC_API_KEY") { + return Some(AuthStrategy::Anthropic); + } + None + } } impl Default for ClaudeAdapter { @@ -463,7 +548,16 @@ impl ProviderAdapter for ClaudeAdapter { ProviderType::Gemini => Some(AuthInfo::new(key, AuthStrategy::Google)), ProviderType::OpenRouter => Some(AuthInfo::new(key, AuthStrategy::Bearer)), ProviderType::ClaudeAuth => Some(AuthInfo::new(key, AuthStrategy::ClaudeAuth)), - _ => Some(AuthInfo::new(key, AuthStrategy::Anthropic)), + _ => { + // 按 env 中的变量名推断鉴权策略，对齐 Anthropic SDK 语义： + // ANTHROPIC_AUTH_TOKEN → Authorization: Bearer + // ANTHROPIC_API_KEY → x-api-key + // 其他来源（apiKey 直填等）默认走 x-api-key（Anthropic 官方协议）。 + let strategy = self + .infer_anthropic_auth_strategy(provider) + .unwrap_or(AuthStrategy::Anthropic); + Some(AuthInfo::new(key, strategy)) + } } } @@ -500,7 +594,13 @@ impl ProviderAdapter for ClaudeAdapter { // 注意：anthropic-version 由 forwarder.rs 统一处理（透传客户端值或设置默认值） let bearer = format!("Bearer {}", auth.api_key); match auth.strategy { - AuthStrategy::Anthropic | AuthStrategy::ClaudeAuth | AuthStrategy::Bearer => { + AuthStrategy::Anthropic => { + vec![( + HeaderName::from_static("x-api-key"), + HeaderValue::from_str(&auth.api_key).unwrap(), + )] + } + AuthStrategy::ClaudeAuth | AuthStrategy::Bearer => { vec![( HeaderName::from_static("authorization"), HeaderValue::from_str(&bearer).unwrap(), @@ -701,7 +801,9 @@ mod tests { } #[test] - fn test_extract_auth_anthropic() { + fn test_extract_auth_anthropic_auth_token_uses_claude_auth_strategy() { + // ANTHROPIC_AUTH_TOKEN 在 Anthropic SDK 里语义就是 Authorization: Bearer， + // 因此走 ClaudeAuth strategy 而不是 Anthropic（x-api-key）。 let adapter = ClaudeAdapter::new(); let provider = create_provider(json!({ "env": { @@ -712,7 +814,7 @@ mod tests { let auth = adapter.extract_auth(&provider).unwrap(); assert_eq!(auth.api_key, "sk-ant-test-key"); - assert_eq!(auth.strategy, AuthStrategy::Anthropic); + assert_eq!(auth.strategy, AuthStrategy::ClaudeAuth); } #[test] @@ -730,6 +832,73 @@ mod tests { assert_eq!(auth.strategy, AuthStrategy::Anthropic); } + #[test] + fn test_extract_auth_both_env_vars_prefer_auth_token() { + // 两个变量都填时，extract_key 选 AUTH_TOKEN，strategy 推断也必须保持一致。 + let adapter = ClaudeAdapter::new(); + let provider = create_provider(json!({ + "env": { + "ANTHROPIC_BASE_URL": "https://api.anthropic.com", + "ANTHROPIC_AUTH_TOKEN": "sk-from-auth-token", + "ANTHROPIC_API_KEY": "sk-from-api-key" + } + })); + + let auth = adapter.extract_auth(&provider).unwrap(); + assert_eq!(auth.api_key, "sk-from-auth-token"); + assert_eq!(auth.strategy, AuthStrategy::ClaudeAuth); + } + + #[test] + fn test_extract_auth_apikey_field_fallback_uses_anthropic_strategy() { + // 当用户没填任一 ANTHROPIC_* env，而是直接使用 apiKey 字段时， + // 视为没有显式语义偏好，默认走 Anthropic 官方协议（x-api-key）。 + let adapter = ClaudeAdapter::new(); + let provider = create_provider(json!({ + "apiKey": "sk-direct", + "env": { + "ANTHROPIC_BASE_URL": "https://api.anthropic.com" + } + })); + + let auth = adapter.extract_auth(&provider).unwrap(); + assert_eq!(auth.api_key, "sk-direct"); + assert_eq!(auth.strategy, AuthStrategy::Anthropic); + } + + #[test] + fn test_get_auth_headers_anthropic_emits_x_api_key() { + let adapter = ClaudeAdapter::new(); + let auth = AuthInfo::new("sk-ant-test".to_string(), AuthStrategy::Anthropic); + + let headers = adapter.get_auth_headers(&auth); + assert_eq!(headers.len(), 1); + assert_eq!(headers[0].0.as_str(), "x-api-key"); + assert_eq!(headers[0].1.to_str().unwrap(), "sk-ant-test"); + } + + #[test] + fn test_get_auth_headers_claude_auth_emits_authorization_bearer() { + let adapter = ClaudeAdapter::new(); + let auth = AuthInfo::new("sk-relay-test".to_string(), AuthStrategy::ClaudeAuth); + + let headers = adapter.get_auth_headers(&auth); + assert_eq!(headers.len(), 1); + assert_eq!(headers[0].0.as_str(), "authorization"); + assert_eq!(headers[0].1.to_str().unwrap(), "Bearer sk-relay-test"); + } + + #[test] + fn test_get_auth_headers_bearer_emits_authorization_bearer() { + let adapter = ClaudeAdapter::new(); + let auth = AuthInfo::new("sk-or-test".to_string(), AuthStrategy::Bearer); + + let headers = adapter.get_auth_headers(&auth); + assert_eq!(headers.len(), 1); + assert_eq!(headers[0].0.as_str(), "authorization"); + assert_eq!(headers[0].1.to_str().unwrap(), "Bearer sk-or-test"); + } + #[test] fn test_extract_auth_openrouter() { let adapter = ClaudeAdapter::new(); @@ -745,6 +914,27 @@ mod tests { assert_eq!(auth.strategy, AuthStrategy::Bearer); } + #[test] + fn test_extract_auth_gemini_api_key() { + let adapter = ClaudeAdapter::new(); + let provider = create_provider_with_meta( + json!({ + "env": { + "ANTHROPIC_BASE_URL": "https://generativelanguage.googleapis.com/v1beta", + "GEMINI_API_KEY": "gemini-test-key" + } + }), + ProviderMeta { + api_format: Some("gemini_native".to_string()), + ..Default::default() + }, + ); + + let auth = adapter.extract_auth(&provider).unwrap(); + assert_eq!(auth.api_key, "gemini-test-key"); + assert_eq!(auth.strategy, AuthStrategy::Google); + } + #[test] fn test_extract_auth_claude_auth_mode() { let adapter = ClaudeAdapter::new(); @@ -1222,6 +1412,202 @@ mod tests { assert!(transformed.get("max_output_tokens").is_some()); } + #[test] + fn test_transform_claude_request_for_codex_oauth_uses_session_cache_key() { + let provider = create_provider_with_meta( + json!({ + "env": { + "ANTHROPIC_BASE_URL": "https://chatgpt.com/backend-api/codex" + } + }), + ProviderMeta { + api_format: Some("openai_responses".to_string()), + provider_type: Some("codex_oauth".to_string()), + ..ProviderMeta::default() + }, + ); + let body = json!({ + "model": "gpt-5.4", + "messages": [{ "role": "user", "content": "hello" }], + "max_tokens": 128 + }); + + let transformed = transform_claude_request_for_api_format( + body, + &provider, + "openai_responses", + Some("session-123"), + None, + ) + .unwrap(); + + assert_eq!(transformed["prompt_cache_key"], "session-123"); + } + + #[test] + fn test_transform_claude_request_for_codex_oauth_without_session_omits_cache_key() { + let provider = create_provider_with_meta( + json!({ + "env": { + "ANTHROPIC_BASE_URL": "https://chatgpt.com/backend-api/codex" + } + }), + ProviderMeta { + api_format: Some("openai_responses".to_string()), + provider_type: Some("codex_oauth".to_string()), + ..ProviderMeta::default() + }, + ); + let body = json!({ + "model": "gpt-5.4", + "messages": [{ "role": "user", "content": "hello" }], + "max_tokens": 128 + }); + + let transformed = transform_claude_request_for_api_format( + body, + &provider, + "openai_responses", + None, + None, + ) + .unwrap(); + + assert!(transformed.get("prompt_cache_key").is_none()); + } + + #[test] + fn test_transform_claude_request_for_responses_uses_session_cache_key() { + let provider = create_provider_with_meta( + json!({ + "env": { + "ANTHROPIC_BASE_URL": "https://api.openai.example.com" + } + }), + ProviderMeta { + api_format: Some("openai_responses".to_string()), + ..ProviderMeta::default() + }, + ); + let body = json!({ + "model": "gpt-5.4", + "messages": [{ "role": "user", "content": "hello" }], + "max_tokens": 128 + }); + + let transformed = transform_claude_request_for_api_format( + body, + &provider, + "openai_responses", + Some("claude-session-123"), + None, + ) + .unwrap(); + + assert_eq!(transformed["prompt_cache_key"], "claude-session-123"); + } + + #[test] + fn test_transform_claude_request_for_responses_without_session_omits_cache_key() { + let provider = create_provider_with_meta( + json!({ + "env": { + "ANTHROPIC_BASE_URL": "https://api.openai.example.com" + } + }), + ProviderMeta { + api_format: Some("openai_responses".to_string()), + ..ProviderMeta::default() + }, + ); + let body = json!({ + "model": "gpt-5.4", + "messages": [{ "role": "user", "content": "hello" }], + "max_tokens": 128 + }); + + let transformed = transform_claude_request_for_api_format( + body, + &provider, + "openai_responses", + None, + None, + ) + .unwrap(); + + assert!(transformed.get("prompt_cache_key").is_none()); + } + + #[test] + fn test_transform_claude_request_for_codex_oauth_keeps_explicit_cache_key() { + let provider = create_provider_with_meta( + json!({ + "env": { + "ANTHROPIC_BASE_URL": "https://chatgpt.com/backend-api/codex" + } + }), + ProviderMeta { + api_format: Some("openai_responses".to_string()), + provider_type: Some("codex_oauth".to_string()), + prompt_cache_key: Some("explicit-cache-key".to_string()), + ..ProviderMeta::default() + }, + ); + let body = json!({ + "model": "gpt-5.4", + "messages": [{ "role": "user", "content": "hello" }], + "max_tokens": 128 + }); + + let transformed = transform_claude_request_for_api_format( + body, + &provider, + "openai_responses", + Some("session-123"), + None, + ) + .unwrap(); + + assert_eq!(transformed["prompt_cache_key"], "explicit-cache-key"); + } + + #[test] + fn test_transform_claude_request_for_api_format_codex_oauth_fast_mode_off() { + let provider = create_provider_with_meta( + json!({ + "env": { + "ANTHROPIC_BASE_URL": "https://chatgpt.com/backend-api/codex" + } + }), + ProviderMeta { + provider_type: Some("codex_oauth".to_string()), + codex_fast_mode: Some(false), + ..ProviderMeta::default() + }, + ); + let body = json!({ + "model": "gpt-5.4", + "messages": [{ "role": "user", "content": "hello" }], + "max_tokens": 128 + }); + + let transformed = transform_claude_request_for_api_format( + body, + &provider, + "openai_responses", + None, + None, + ) + .unwrap(); + + assert_eq!(transformed["store"], json!(false)); + assert!(transformed.get("service_tier").is_none()); + assert_eq!( + transformed["include"], + json!(["reasoning.encrypted_content"]) + ); + } + #[test] fn test_transform_claude_request_for_api_format_gemini_native() { let provider = create_provider_with_meta( @@ -1310,4 +1696,109 @@ mod tests { assert_eq!(transformed["prompt_cache_key"], "claude-cache-route"); } + + #[test] + fn test_transform_openai_chat_skips_reasoning_content_for_generic_provider() { + let provider = create_provider_with_meta( + json!({ + "env": { + "ANTHROPIC_BASE_URL": "https://api.example.com", + "ANTHROPIC_API_KEY": "test-key" + } + }), + ProviderMeta { + api_format: Some("openai_chat".to_string()), + ..Default::default() + }, + ); + let body = json!({ + "model": "gpt-5.4", + "max_tokens": 64, + "messages": [{ + "role": "assistant", + "content": [ + {"type": "thinking", "thinking": "I should call the tool."}, + {"type": "tool_use", "id": "call_123", "name": "get_weather", "input": {"location": "Tokyo"}} + ] + }] + }); + + let transformed = + transform_claude_request_for_api_format(body, &provider, "openai_chat", None, None) + .unwrap(); + + let msg = &transformed["messages"][0]; + assert!(msg.get("tool_calls").is_some()); + assert!(msg.get("reasoning_content").is_none()); + } + + #[test] + fn test_transform_openai_chat_preserves_reasoning_content_for_kimi_provider() { + let provider = create_provider_with_meta( + json!({ + "env": { + "ANTHROPIC_BASE_URL": "https://api.moonshot.cn/v1", + "ANTHROPIC_API_KEY": "test-key" + } + }), + ProviderMeta { + api_format: Some("openai_chat".to_string()), + ..Default::default() + }, + ); + let body = json!({ + "model": "kimi-k2.6", + "max_tokens": 64, + "messages": [{ + "role": "assistant", + "content": [ + {"type": "thinking", "thinking": "I should call the tool."}, + {"type": "tool_use", "id": "call_123", "name": "get_weather", "input": {"location": "Tokyo"}} + ] + }] + }); + + let transformed = + transform_claude_request_for_api_format(body, &provider, "openai_chat", None, None) + .unwrap(); + + let msg = &transformed["messages"][0]; + assert_eq!(msg["reasoning_content"], "I should call the tool."); + assert!(msg.get("tool_calls").is_some()); + } + + #[test] + fn test_transform_openai_chat_preserves_reasoning_content_for_deepseek_provider() { + let provider = create_provider_with_meta( + json!({ + "env": { + "ANTHROPIC_BASE_URL": "https://api.deepseek.com/v1", + "ANTHROPIC_API_KEY": "test-key" + } + }), + ProviderMeta { + api_format: Some("openai_chat".to_string()), + ..Default::default() + }, + ); + let body = json!({ + "model": "deepseek-v4-flash", + "max_tokens": 64, + "messages": [{ + "role": "assistant", + "content": [ + {"type": "thinking", "thinking": "I should call the tool."}, + {"type": "tool_use", "id": "call_123", "name": "get_weather", "input": {"location": "Tokyo"}} + ] + }] + }); + + let transformed = + transform_claude_request_for_api_format(body, &provider, "openai_chat", None, None) + .unwrap(); + + let msg = &transformed["messages"][0]; + assert_eq!(msg["reasoning_content"], "I should call the tool."); + assert!(msg.get("tool_calls").is_some()); + } } diff --git a/src-tauri/src/proxy/providers/copilot_model_map.rs b/src-tauri/src/proxy/providers/copilot_model_map.rs new file mode 100644 index 000000000..e4ca4355d --- /dev/null +++ b/src-tauri/src/proxy/providers/copilot_model_map.rs @@ -0,0 +1,374 @@ +//! GitHub Copilot 模型 ID 归一化与 live-list 解析 +//! +//! Copilot upstream 仅接受 dot 形式的 Claude 4.x 模型 ID（如 `claude-sonnet-4.6`）， +//! 而 Claude Code 客户端发出 dash 形式（如 `claude-sonnet-4-6`、`claude-sonnet-4-6[1m]`）。 +//! 不归一化会触发上游 400 `model_not_supported`。 +//! +//! 仅做语法归一化不够：账号订阅级别可能不开放某个具体模型。 +//! `resolve_against_models` 用 `/models` live 列表做精确匹配，找不到时 +//! 按 family（haiku/sonnet/opus）+ 最高版本号 fallback。 + +use super::copilot_auth::CopilotModel; +use serde_json::Value; + +/// 归一化客户端 model ID 为 Copilot upstream 接受的形式。 +/// 返回 `None` 表示无需变换（已归一化、非 Claude 4.x 系列、或空输入）。 +pub(super) fn normalize_to_copilot_id(client_id: &str) -> Option { + let trimmed = client_id.trim(); + let bytes = trimmed.as_bytes(); + + if bytes.len() < 8 || !bytes[..7].eq_ignore_ascii_case(b"claude-") { + return None; + } + + let has_one_m_bracket = ends_with_ascii_ci(bytes, b"[1m]"); + + // Fast path: 已含点 + 不带 [1m] → 已归一化（绝大多数请求走这里） + if trimmed.contains('.') && !has_one_m_bracket { + return None; + } + + let (base, has_1m_suffix) = split_one_m_suffix(trimmed); + let stripped = strip_trailing_date(base); + let dotted = dashes_to_dot_in_last_version(stripped); + + if dotted.is_none() && !has_1m_suffix { + return None; + } + + let mut candidate = dotted.unwrap_or_else(|| stripped.to_string()); + if has_1m_suffix { + candidate.push_str("-1m"); + } + (candidate != trimmed).then_some(candidate) +} + +/// 在请求体中应用 model ID 归一化。 +pub fn apply_copilot_model_normalization(mut body: Value) -> Value { + let Some(orig) = body.get("model").and_then(|v| v.as_str()) else { + return body; + }; + if let Some(normalized) = normalize_to_copilot_id(orig) { + log::debug!("[CopilotNormalizer] {orig} → {normalized}"); + body["model"] = Value::String(normalized); + } + body +} + +fn ends_with_ascii_ci(haystack: &[u8], needle: &[u8]) -> bool { + haystack.len() >= needle.len() + && haystack[haystack.len() - needle.len()..].eq_ignore_ascii_case(needle) +} + +fn split_one_m_suffix(id: &str) -> (&str, bool) { + let bytes = id.as_bytes(); + if ends_with_ascii_ci(bytes, b"[1m]") { + return (&id[..bytes.len() - 4], true); + } + if ends_with_ascii_ci(bytes, b"-1m") { + return (&id[..bytes.len() - 3], true); + } + (id, false) +} + +fn strip_trailing_date(id: &str) -> &str { + let Some(last_dash) = id.rfind('-') else { + return id; + }; + let suffix = &id[last_dash + 1..]; + if suffix.len() == 8 && suffix.bytes().all(|b| b.is_ascii_digit()) { + &id[..last_dash] + } else { + id + } +} + +/// 把 `…-X-Y`（X、Y 都是纯数字的末两段）变成 `…-X.Y`。 +/// 返回 `None` 表示模式不匹配（保守策略避免误伤 `claude-3-5-sonnet` 等历史 ID）。 +fn dashes_to_dot_in_last_version(id: &str) -> Option { + let last_dash = id.rfind('-')?; + let last_segment = &id[last_dash + 1..]; + if last_segment.is_empty() || !last_segment.bytes().all(|b| b.is_ascii_digit()) { + return None; + } + let head = &id[..last_dash]; + let prev_dash = head.rfind('-')?; + let prev_segment = &head[prev_dash + 1..]; + if prev_segment.is_empty() || !prev_segment.bytes().all(|b| b.is_ascii_digit()) { + return None; + } + Some(format!("{head}.{last_segment}")) +} + +/// 用 Copilot live 模型列表确认/降级 model ID。 +/// +/// 流程： +/// 1. 先做语法归一化（dash→dot、`[1m]`→`-1m`） +/// 2. 在 `models` 中精确匹配；找到则使用归一化后的 ID +/// 3. 找不到时按 family（haiku/sonnet/opus）取最高版本号 fallback +/// （优先保留 `-1m` 标志；都没有则取 base 版） +/// +/// 返回 `None` 表示无需变换或无可降级的 family 候选（保留原 ID 让上游决定， +/// 让用户拿到明确的 `model_not_supported` 而非被静默替换）。 +pub fn resolve_against_models(client_id: &str, models: &[CopilotModel]) -> Option { + let normalized = normalize_to_copilot_id(client_id); + let target = normalized.as_deref().unwrap_or(client_id); + + if models.iter().any(|m| m.id.eq_ignore_ascii_case(target)) { + return normalized.filter(|s| s != client_id); + } + + let fallback = family_fallback(target, models)?; + if fallback.eq_ignore_ascii_case(client_id) { + None + } else { + Some(fallback) + } +} + +fn detect_family(id: &str) -> Option<&'static str> { + let lower = id.to_ascii_lowercase(); + if lower.contains("haiku") { + Some("haiku") + } else if lower.contains("sonnet") { + Some("sonnet") + } else if lower.contains("opus") { + Some("opus") + } else { + None + } +} + +/// 提取 family 后第一段 `MAJOR.MINOR` 版本号。 +/// 例：`claude-sonnet-4.6` → (4, 6)；`claude-sonnet-4.6-1m` → (4, 6)。 +fn extract_major_minor(id: &str) -> Option<(u32, u32)> { + let lower = id.to_ascii_lowercase(); + let family = detect_family(&lower)?; + let after = &lower[lower.find(family)? + family.len()..]; + let after = after.strip_prefix('-')?; + let segment = after.split(['-', '[', ' ']).next()?; + let mut parts = segment.split('.'); + let major: u32 = parts.next()?.parse().ok()?; + let minor: u32 = parts.next().unwrap_or("0").parse().ok()?; + Some((major, minor)) +} + +fn family_fallback(target: &str, models: &[CopilotModel]) -> Option { + let family = detect_family(target)?; + let want_1m = target.ends_with("-1m"); + + let pick_best = |require_1m: bool| -> Option { + models + .iter() + .filter(|m| { + let lower = m.id.to_ascii_lowercase(); + lower.contains(family) && lower.ends_with("-1m") == require_1m + }) + .filter_map(|m| extract_major_minor(&m.id).map(|v| (m, v))) + .max_by_key(|(_, v)| *v) + .map(|(m, _)| m.id.clone()) + }; + + if want_1m { + pick_best(true).or_else(|| pick_best(false)) + } else { + pick_best(false) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use serde_json::json; + + #[test] + fn dashes_to_dot_basic() { + assert_eq!( + normalize_to_copilot_id("claude-sonnet-4-6"), + Some("claude-sonnet-4.6".to_string()) + ); + assert_eq!( + normalize_to_copilot_id("claude-opus-4-6"), + Some("claude-opus-4.6".to_string()) + ); + assert_eq!( + normalize_to_copilot_id("claude-haiku-4-5"), + Some("claude-haiku-4.5".to_string()) + ); + } + + #[test] + fn one_m_bracket_to_dash() { + assert_eq!( + normalize_to_copilot_id("claude-sonnet-4-6[1m]"), + Some("claude-sonnet-4.6-1m".to_string()) + ); + assert_eq!( + normalize_to_copilot_id("claude-opus-4-6[1m]"), + Some("claude-opus-4.6-1m".to_string()) + ); + } + + #[test] + fn one_m_bracket_on_already_dotted() { + // claude-sonnet-4.6[1m] 走非 fast-path 分支（has_one_m_bracket=true）， + // 应被改写为 -1m 形式 + assert_eq!( + normalize_to_copilot_id("claude-sonnet-4.6[1m]"), + Some("claude-sonnet-4.6-1m".to_string()) + ); + } + + #[test] + fn date_suffix_stripped() { + assert_eq!( + normalize_to_copilot_id("claude-haiku-4-5-20251001"), + Some("claude-haiku-4.5".to_string()) + ); + assert_eq!( + normalize_to_copilot_id("claude-sonnet-4-5-20250929"), + Some("claude-sonnet-4.5".to_string()) + ); + } + + #[test] + fn already_copilot_format_returns_none() { + assert_eq!(normalize_to_copilot_id("claude-sonnet-4.6"), None); + assert_eq!(normalize_to_copilot_id("claude-opus-4.6-1m"), None); + assert_eq!(normalize_to_copilot_id("claude-haiku-4.5"), None); + } + + #[test] + fn non_claude_models_untouched() { + assert_eq!(normalize_to_copilot_id("gpt-5"), None); + assert_eq!(normalize_to_copilot_id("gpt-4o-mini"), None); + assert_eq!(normalize_to_copilot_id("o3"), None); + assert_eq!(normalize_to_copilot_id(""), None); + } + + #[test] + fn legacy_three_part_versions_untouched() { + assert_eq!(normalize_to_copilot_id("claude-3-5-sonnet"), None); + assert_eq!(normalize_to_copilot_id("claude-3-5-sonnet-20241022"), None); + } + + #[test] + fn case_insensitive_on_prefix_and_suffix() { + assert_eq!( + normalize_to_copilot_id("Claude-Sonnet-4-6"), + Some("Claude-Sonnet-4.6".to_string()) + ); + assert_eq!( + normalize_to_copilot_id("claude-sonnet-4-6[1M]"), + Some("claude-sonnet-4.6-1m".to_string()) + ); + } + + #[test] + fn bracket_one_m_with_date_combined() { + assert_eq!( + normalize_to_copilot_id("claude-haiku-4-5-20251001[1m]"), + Some("claude-haiku-4.5-1m".to_string()) + ); + } + + #[test] + fn apply_rewrites_body() { + let body = json!({"model": "claude-sonnet-4-6", "max_tokens": 1024}); + let out = apply_copilot_model_normalization(body); + assert_eq!(out["model"], "claude-sonnet-4.6"); + assert_eq!(out["max_tokens"], 1024); + } + + #[test] + fn apply_no_change_when_already_normalized() { + let body = json!({"model": "claude-sonnet-4.6"}); + let out = apply_copilot_model_normalization(body); + assert_eq!(out["model"], "claude-sonnet-4.6"); + } + + #[test] + fn apply_handles_missing_model() { + let body = json!({"messages": []}); + let out = apply_copilot_model_normalization(body); + assert!(out.get("model").is_none()); + } + + fn model(id: &str) -> CopilotModel { + CopilotModel { + id: id.to_string(), + name: id.to_string(), + vendor: "anthropic".to_string(), + model_picker_enabled: true, + } + } + + #[test] + fn resolve_exact_match_after_normalize() { + let models = vec![ + model("claude-sonnet-4.6"), + model("claude-opus-4.6"), + model("claude-haiku-4.5"), + ]; + assert_eq!( + resolve_against_models("claude-sonnet-4-6", &models), + Some("claude-sonnet-4.6".to_string()) + ); + } + + #[test] + fn resolve_returns_none_when_already_valid() { + let models = vec![model("claude-sonnet-4.6")]; + assert_eq!(resolve_against_models("claude-sonnet-4.6", &models), None); + } + + #[test] + fn resolve_falls_back_to_highest_family_version() { + // 用户请求 opus 4.7 但 Copilot 账号只有 opus 4.6 + let models = vec![ + model("claude-opus-4.5"), + model("claude-opus-4.6"), + model("claude-sonnet-4.6"), + ]; + assert_eq!( + resolve_against_models("claude-opus-4.7", &models), + Some("claude-opus-4.6".to_string()) + ); + } + + #[test] + fn resolve_prefers_1m_when_requested() { + let models = vec![ + model("claude-sonnet-4.6"), + model("claude-sonnet-4.6-1m"), + model("claude-opus-4.6"), + ]; + assert_eq!( + resolve_against_models("claude-sonnet-4-6[1m]", &models), + Some("claude-sonnet-4.6-1m".to_string()) + ); + } + + #[test] + fn resolve_falls_back_to_base_when_1m_unavailable() { + // 账号没开 -1m 变体时降级到 base + let models = vec![model("claude-sonnet-4.6")]; + assert_eq!( + resolve_against_models("claude-sonnet-4-6[1m]", &models), + Some("claude-sonnet-4.6".to_string()) + ); + } + + #[test] + fn resolve_returns_none_when_family_absent() { + // 账号完全没有 opus 时不做强行替换，让上游报错 + let models = vec![model("claude-sonnet-4.6"), model("claude-haiku-4.5")]; + assert_eq!(resolve_against_models("claude-opus-4.6", &models), None); + } + + #[test] + fn resolve_handles_non_claude_target() { + let models = vec![model("claude-sonnet-4.6")]; + assert_eq!(resolve_against_models("gpt-5", &models), None); + } +} diff --git a/src-tauri/src/proxy/providers/mod.rs b/src-tauri/src/proxy/providers/mod.rs index 7e6238ec1..174268fdb 100644 --- a/src-tauri/src/proxy/providers/mod.rs +++ b/src-tauri/src/proxy/providers/mod.rs @@ -17,6 +17,7 @@ mod claude; mod codex; pub mod codex_oauth_auth; pub mod copilot_auth; +pub mod copilot_model_map; mod gemini; pub(crate) mod gemini_schema; pub mod gemini_shadow; @@ -104,7 +105,7 @@ impl ProviderType { #[allow(dead_code)] pub fn from_app_type_and_config(app_type: &AppType, provider: &Provider) -> Self { match app_type { - AppType::Claude => { + AppType::Claude | AppType::ClaudeDesktop => { if get_claude_api_format(provider) == "gemini_native" { let adapter = ClaudeAdapter::new(); return match adapter.extract_auth(provider).map(|auth| auth.strategy) { @@ -174,13 +175,9 @@ impl ProviderType { } ProviderType::Gemini } - AppType::OpenCode => { - // OpenCode doesn't support proxy, but return a default type for completeness - ProviderType::Codex // Fallback to Codex-like type - } - AppType::OpenClaw => { - // OpenClaw doesn't support proxy, but return a default type for completeness - ProviderType::Codex // Fallback to Codex-like type + AppType::OpenCode | AppType::OpenClaw | AppType::Hermes => { + // These apps don't support proxy, fallback to Codex-like type + ProviderType::Codex } } } @@ -229,15 +226,11 @@ impl std::str::FromStr for ProviderType { /// 根据 AppType 获取对应的适配器 pub fn get_adapter(app_type: &AppType) -> Box { match app_type { - AppType::Claude => Box::new(ClaudeAdapter::new()), + AppType::Claude | AppType::ClaudeDesktop => Box::new(ClaudeAdapter::new()), AppType::Codex => Box::new(CodexAdapter::new()), AppType::Gemini => Box::new(GeminiAdapter::new()), - AppType::OpenCode => { - // OpenCode doesn't support proxy, fallback to Codex adapter - Box::new(CodexAdapter::new()) - } - AppType::OpenClaw => { - // OpenClaw doesn't support proxy, fallback to Codex adapter + AppType::OpenCode | AppType::OpenClaw | AppType::Hermes => { + // These apps don't support proxy, fallback to Codex adapter Box::new(CodexAdapter::new()) } } diff --git a/src-tauri/src/proxy/providers/streaming.rs b/src-tauri/src/proxy/providers/streaming.rs index d6339e5d2..3bfc8b305 100644 --- a/src-tauri/src/proxy/providers/streaming.rs +++ b/src-tauri/src/proxy/providers/streaming.rs @@ -6,14 +6,17 @@ use crate::proxy::sse::{strip_sse_field, take_sse_block}; use bytes::Bytes; use futures::stream::{Stream, StreamExt}; use serde::{Deserialize, Serialize}; -use serde_json::json; +use serde_json::{json, Value}; use std::collections::{HashMap, HashSet}; /// OpenAI 流式响应数据结构 #[derive(Debug, Deserialize)] struct OpenAIStreamChunk { + #[serde(default)] id: String, + #[serde(default)] model: String, + #[serde(default)] choices: Vec, #[serde(default)] usage: Option, @@ -30,8 +33,9 @@ struct StreamChoice { struct Delta { #[serde(default)] content: Option, - #[serde(default)] - reasoning: Option, // OpenRouter 的推理内容 + // OpenRouter/Kimi/其它 使用 reasoning，DeepSeek 使用 reasoning_content + #[serde(default, alias = "reasoning_content")] + reasoning: Option, #[serde(default)] tool_calls: Option>, } @@ -95,6 +99,42 @@ struct ToolBlockState { /// 无限空白 bug 的连续空白字符阈值 const INFINITE_WHITESPACE_THRESHOLD: usize = 20; +fn build_anthropic_usage_json(usage: &Usage) -> Value { + let mut usage_json = json!({ + "input_tokens": usage.prompt_tokens, + "output_tokens": usage.completion_tokens + }); + if let Some(cached) = extract_cache_read_tokens(usage) { + usage_json["cache_read_input_tokens"] = json!(cached); + } + if let Some(created) = usage.cache_creation_input_tokens { + usage_json["cache_creation_input_tokens"] = json!(created); + } + usage_json +} + +fn default_anthropic_usage_json() -> Value { + json!({ + "input_tokens": 0, + "output_tokens": 0 + }) +} + +fn build_message_delta_event(stop_reason: Option, usage_json: Option) -> Value { + let usage = usage_json + .filter(|usage| usage.is_object()) + .unwrap_or_else(default_anthropic_usage_json); + + json!({ + "type": "message_delta", + "delta": { + "stop_reason": stop_reason, + "stop_sequence": null + }, + "usage": usage + }) +} + /// 创建 Anthropic SSE 流 pub fn create_anthropic_sse_stream( stream: impl Stream> + Send + 'static, @@ -106,6 +146,16 @@ pub fn create_anthropic_sse_stream( let mut current_model = None; let mut next_content_index: u32 = 0; let mut has_sent_message_start = false; + // 某些上游 provider（如 OpenRouter 的 kimi-k2.6）会在 tool_use 后发送多个 + // 带 finish_reason 的 SSE chunk。Anthropic 协议要求每个消息流只能有一个 + // message_delta，重复会导致 Claude Code abort 连接。因此需要： + // 1) has_emitted_message_delta: 去重，只处理第一个 finish_reason + // 2) pending_message_delta: 缓存延迟到 [DONE] 发送，确保 usage 完整 + let mut has_emitted_message_delta = false; + let mut pending_message_delta: Option<(Option, Option)> = None; + let mut has_sent_message_stop = false; + let mut stream_ended_with_error = false; + let mut latest_usage: Option = None; let mut current_non_tool_block_type: Option<&'static str> = None; let mut current_non_tool_block_index: Option = None; let mut tool_blocks_by_index: HashMap = HashMap::new(); @@ -127,24 +177,44 @@ pub fn create_anthropic_sse_stream( if let Some(data) = strip_sse_field(l, "data") { if data.trim() == "[DONE]" { log::debug!("[Claude/OpenRouter] <<< OpenAI SSE: [DONE]"); + + // 流正常结束，发出缓存的 message_delta（含完整 usage）。 + if let Some((stop_reason, usage_json)) = pending_message_delta.take() { + let event = build_message_delta_event(stop_reason, usage_json); + let sse_data = format!("event: message_delta\ndata: {}\n\n", + serde_json::to_string(&event).unwrap_or_default()); + log::debug!("[Claude/OpenRouter] >>> Anthropic SSE: message_delta (from pending)"); + yield Ok(Bytes::from(sse_data)); + } + let event = json!({"type": "message_stop"}); let sse_data = format!("event: message_stop\ndata: {}\n\n", serde_json::to_string(&event).unwrap_or_default()); log::debug!("[Claude/OpenRouter] >>> Anthropic SSE: message_stop"); yield Ok(Bytes::from(sse_data)); + has_sent_message_stop = true; continue; } if let Ok(chunk) = serde_json::from_str::(data) { log::debug!("[Claude/OpenRouter] <<< SSE chunk received"); - if message_id.is_none() { + if message_id.is_none() && !chunk.id.is_empty() { message_id = Some(chunk.id.clone()); } - if current_model.is_none() { + if current_model.is_none() && !chunk.model.is_empty() { current_model = Some(chunk.model.clone()); } + let chunk_usage_json = + chunk.usage.as_ref().map(build_anthropic_usage_json); + if let Some(usage_json) = &chunk_usage_json { + latest_usage = Some(usage_json.clone()); + if let Some((_, pending_usage)) = pending_message_delta.as_mut() { + *pending_usage = Some(usage_json.clone()); + } + } + if let Some(choice) = chunk.choices.first() { if !has_sent_message_start { // Build usage with cache tokens if available from first chunk @@ -420,8 +490,24 @@ pub fn create_anthropic_sse_stream( } } - // 处理 finish_reason + // 处理 finish_reason。 + // 注意：OpenRouter 某些 provider 会发送多个带 finish_reason 的 chunk + // （第一个 usage 为 null，后续才补全）。此处只做缓存，不立即发送， + // 等到 [DONE] 或流末尾再统一发出，确保 usage 完整且只发一次。 if let Some(finish_reason) = &choice.finish_reason { + let stop_reason = map_stop_reason(Some(finish_reason)); + let usage_json = + chunk_usage_json.clone().or_else(|| latest_usage.clone()); + + if has_emitted_message_delta { + // 更新缓存的 message_delta usage（如果有更完整的 usage） + if let (Some((_, ref mut usage)), Some(uj)) = (&mut pending_message_delta, usage_json) { + *usage = Some(uj); + } + continue; + } + has_emitted_message_delta = true; + if let Some(index) = current_non_tool_block_index.take() { let event = json!({ "type": "content_block_stop", @@ -511,32 +597,8 @@ pub fn create_anthropic_sse_stream( open_tool_block_indices.clear(); } - let stop_reason = map_stop_reason(Some(finish_reason)); - // Build usage with cache token fields - let usage_json = chunk.usage.as_ref().map(|u| { - let mut uj = json!({ - "input_tokens": u.prompt_tokens, - "output_tokens": u.completion_tokens - }); - if let Some(cached) = extract_cache_read_tokens(u) { - uj["cache_read_input_tokens"] = json!(cached); - } - if let Some(created) = u.cache_creation_input_tokens { - uj["cache_creation_input_tokens"] = json!(created); - } - uj - }); - let event = json!({ - "type": "message_delta", - "delta": { - "stop_reason": stop_reason, - "stop_sequence": null - }, - "usage": usage_json - }); - let sse_data = format!("event: message_delta\ndata: {}\n\n", - serde_json::to_string(&event).unwrap_or_default()); - yield Ok(Bytes::from(sse_data)); + // 缓存 message_delta，等到 [DONE] 时发送（以便收集完整的 usage） + pending_message_delta = Some((stop_reason, usage_json)); } } } @@ -546,6 +608,7 @@ pub fn create_anthropic_sse_stream( } Err(e) => { log::error!("Stream error: {e}"); + stream_ended_with_error = true; let error_event = json!({ "type": "error", "error": { @@ -560,6 +623,31 @@ pub fn create_anthropic_sse_stream( } } } + + // 流自然结束但未收到 [DONE] 时，确保发送缓存的 message_delta 和 message_stop。 + // 若上游已显式报错，则只保留 error 事件，避免把失败伪装成成功完成。 + if !stream_ended_with_error { + let emitted_pending_message_delta = if let Some((stop_reason, usage_json)) = + pending_message_delta.take() + { + let event = build_message_delta_event(stop_reason, usage_json); + let sse_data = format!("event: message_delta\ndata: {}\n\n", + serde_json::to_string(&event).unwrap_or_default()); + log::debug!("[Claude/OpenRouter] >>> Anthropic SSE: message_delta (at stream end)"); + yield Ok(Bytes::from(sse_data)); + true + } else { + false + }; + + if emitted_pending_message_delta && !has_sent_message_stop { + let event = json!({"type": "message_stop"}); + let sse_data = format!("event: message_stop\ndata: {}\n\n", + serde_json::to_string(&event).unwrap_or_default()); + log::debug!("[Claude/OpenRouter] >>> Anthropic SSE: message_stop (at stream end)"); + yield Ok(Bytes::from(sse_data)); + } + } } } @@ -602,6 +690,32 @@ mod tests { use serde_json::Value; use std::collections::HashMap; + async fn collect_anthropic_events(input: &str) -> Vec { + let upstream = stream::iter(vec![Ok::<_, std::io::Error>(Bytes::from( + input.as_bytes().to_vec(), + ))]); + let converted = create_anthropic_sse_stream(upstream); + let chunks: Vec<_> = converted.collect().await; + let merged = chunks + .into_iter() + .map(|chunk| String::from_utf8_lossy(chunk.unwrap().as_ref()).to_string()) + .collect::(); + + merged + .split("\n\n") + .filter_map(|block| { + let data = block + .lines() + .find_map(|line| strip_sse_field(line, "data"))?; + serde_json::from_str::(data).ok() + }) + .collect() + } + + fn event_type(event: &Value) -> Option<&str> { + event.get("type").and_then(|v| v.as_str()) + } + #[test] fn test_map_stop_reason_legacy_and_filtered_values() { assert_eq!( @@ -818,4 +932,210 @@ mod tests { "output must not contain U+FFFD replacement characters" ); } + + #[tokio::test] + async fn test_duplicate_finish_reason_emits_only_one_message_delta() { + // Simulates OpenRouter behavior where two chunks carry finish_reason: + // first with null usage, second with populated usage. + let input = concat!( + "data: {\"id\":\"chatcmpl_dup\",\"model\":\"gpt-4o\",\"choices\":[{\"delta\":{},\"finish_reason\":\"tool_calls\"}]}\n\n", + "data: {\"id\":\"chatcmpl_dup\",\"model\":\"gpt-4o\",\"choices\":[{\"delta\":{},\"finish_reason\":\"tool_calls\"}],\"usage\":{\"prompt_tokens\":10,\"completion_tokens\":5}}\n\n", + "data: [DONE]\n\n" + ); + + let upstream = stream::iter(vec![Ok::<_, std::io::Error>(Bytes::from( + input.as_bytes().to_vec(), + ))]); + let converted = create_anthropic_sse_stream(upstream); + let chunks: Vec<_> = converted.collect().await; + + let merged = chunks + .into_iter() + .map(|chunk| String::from_utf8_lossy(chunk.unwrap().as_ref()).to_string()) + .collect::(); + + let events: Vec = merged + .split("\n\n") + .filter_map(|block| { + let data = block + .lines() + .find_map(|line| strip_sse_field(line, "data"))?; + serde_json::from_str::(data).ok() + }) + .collect(); + + let message_deltas: Vec<&Value> = events + .iter() + .filter(|e| e.get("type").and_then(|v| v.as_str()) == Some("message_delta")) + .collect(); + + assert_eq!( + message_deltas.len(), + 1, + "duplicate finish_reason chunks must produce exactly one message_delta, got {}: {:?}", + message_deltas.len(), + message_deltas + ); + + assert_eq!(message_deltas[0]["usage"]["input_tokens"], 10); + assert_eq!(message_deltas[0]["usage"]["output_tokens"], 5); + + let message_stops = events + .iter() + .filter(|e| e.get("type").and_then(|v| v.as_str()) == Some("message_stop")) + .count(); + assert_eq!(message_stops, 1, "message_stop must only be emitted once"); + } + + #[tokio::test] + async fn test_usage_only_chunk_after_finish_reason_updates_message_delta_usage() { + let input = concat!( + "data: {\"id\":\"chatcmpl_split\",\"model\":\"glm-5.1\",\"choices\":[{\"delta\":{\"tool_calls\":[{\"index\":0,\"id\":\"tool-0924\",\"type\":\"function\",\"function\":{\"name\":\"Bash\",\"arguments\":\"{\\\"command\\\":\\\"pwd\\\"}\"}}]}}]}\n\n", + "data: {\"id\":\"chatcmpl_split\",\"model\":\"glm-5.1\",\"choices\":[{\"delta\":{},\"finish_reason\":\"tool_calls\"}]}\n\n", + "data: {\"choices\":[],\"usage\":{\"prompt_tokens\":13312,\"completion_tokens\":79,\"prompt_tokens_details\":{\"cached_tokens\":100}}}\n\n", + "data: [DONE]\n\n" + ); + + let events = collect_anthropic_events(input).await; + let message_deltas: Vec<&Value> = events + .iter() + .filter(|event| event_type(event) == Some("message_delta")) + .collect(); + let message_stops = events + .iter() + .filter(|event| event_type(event) == Some("message_stop")) + .count(); + + assert_eq!(message_deltas.len(), 1); + assert_eq!(message_stops, 1); + + let message_delta = message_deltas[0]; + assert_eq!( + message_delta + .pointer("/delta/stop_reason") + .and_then(|v| v.as_str()), + Some("tool_use") + ); + assert_eq!( + message_delta + .pointer("/usage/input_tokens") + .and_then(|v| v.as_u64()), + Some(13312) + ); + assert_eq!( + message_delta + .pointer("/usage/output_tokens") + .and_then(|v| v.as_u64()), + Some(79) + ); + assert_eq!( + message_delta + .pointer("/usage/cache_read_input_tokens") + .and_then(|v| v.as_u64()), + Some(100) + ); + } + + #[tokio::test] + async fn test_message_delta_includes_zero_usage_when_stream_has_no_usage() { + let input = concat!( + "data: {\"id\":\"chatcmpl_no_usage\",\"model\":\"gpt-5.5\",\"choices\":[{\"delta\":{\"tool_calls\":[{\"index\":0,\"id\":\"call_0\",\"type\":\"function\",\"function\":{\"name\":\"get_time\",\"arguments\":\"{}\"}}]}}]}\n\n", + "data: {\"id\":\"chatcmpl_no_usage\",\"model\":\"gpt-5.5\",\"choices\":[{\"delta\":{},\"finish_reason\":\"tool_calls\"}]}\n\n", + "data: [DONE]\n\n" + ); + + let events = collect_anthropic_events(input).await; + let message_deltas: Vec<&Value> = events + .iter() + .filter(|event| event_type(event) == Some("message_delta")) + .collect(); + + assert_eq!(message_deltas.len(), 1); + let message_delta = message_deltas[0]; + assert_eq!( + message_delta + .pointer("/delta/stop_reason") + .and_then(|v| v.as_str()), + Some("tool_use") + ); + assert_eq!( + message_delta + .pointer("/usage/input_tokens") + .and_then(|v| v.as_u64()), + Some(0) + ); + assert_eq!( + message_delta + .pointer("/usage/output_tokens") + .and_then(|v| v.as_u64()), + Some(0) + ); + } + + #[tokio::test] + async fn test_streaming_finalizes_after_finish_when_done_is_missing() { + let input = concat!( + "data: {\"id\":\"chatcmpl_no_done\",\"model\":\"gpt-4o\",\"choices\":[{\"delta\":{\"content\":\"hello\"}}]}\n\n", + "data: {\"id\":\"chatcmpl_no_done\",\"model\":\"gpt-4o\",\"choices\":[{\"delta\":{},\"finish_reason\":\"stop\"}]}\n\n" + ); + + let events = collect_anthropic_events(input).await; + + assert!(events.iter().any(|event| { + event_type(event) == Some("message_delta") + && event.pointer("/delta/stop_reason").and_then(|v| v.as_str()) == Some("end_turn") + })); + assert_eq!( + events.last().and_then(|event| event_type(event)), + Some("message_stop") + ); + } + + #[tokio::test] + async fn test_stream_end_without_finish_reason_does_not_emit_success_terminal_events() { + let input = "data: {\"id\":\"chatcmpl_truncated\",\"model\":\"gpt-4o\",\"choices\":[{\"delta\":{\"content\":\"hello\"}}]}\n\n"; + + let events = collect_anthropic_events(input).await; + + assert!(!events + .iter() + .any(|event| event_type(event) == Some("message_delta"))); + assert!(!events + .iter() + .any(|event| event_type(event) == Some("message_stop"))); + } + + #[tokio::test] + async fn test_stream_error_does_not_emit_success_terminal_events() { + let upstream = stream::iter(vec![Err::(std::io::Error::other( + "upstream disconnected", + ))]); + let converted = create_anthropic_sse_stream(upstream); + let chunks: Vec<_> = converted.collect().await; + + let merged = chunks + .into_iter() + .map(|chunk| String::from_utf8_lossy(chunk.unwrap().as_ref()).to_string()) + .collect::(); + + let events: Vec = merged + .split("\n\n") + .filter_map(|block| { + let data = block + .lines() + .find_map(|line| strip_sse_field(line, "data"))?; + serde_json::from_str::(data).ok() + }) + .collect(); + + assert!(events + .iter() + .any(|e| e.get("type").and_then(|v| v.as_str()) == Some("error"))); + assert!(!events + .iter() + .any(|e| e.get("type").and_then(|v| v.as_str()) == Some("message_delta"))); + assert!(!events + .iter() + .any(|e| e.get("type").and_then(|v| v.as_str()) == Some("message_stop"))); + } } diff --git a/src-tauri/src/proxy/providers/streaming_responses.rs b/src-tauri/src/proxy/providers/streaming_responses.rs index 1eba5033e..81615c2cf 100644 --- a/src-tauri/src/proxy/providers/streaming_responses.rs +++ b/src-tauri/src/proxy/providers/streaming_responses.rs @@ -8,7 +8,10 @@ //! //! 与 Chat Completions 的 delta chunk 模型完全不同，需要独立的状态机处理。 -use super::transform_responses::{build_anthropic_usage_from_responses, map_responses_stop_reason}; +use super::transform_responses::{ + build_anthropic_usage_from_responses, map_responses_stop_reason, + sanitize_anthropic_tool_use_input_json, +}; use crate::proxy::sse::{strip_sse_field, take_sse_block}; use bytes::Bytes; use futures::stream::{Stream, StreamExt}; @@ -112,6 +115,8 @@ pub fn create_anthropic_sse_stream_from_responses = None; let mut current_text_index: Option = None; let mut tool_index_by_item_id: HashMap = HashMap::new(); + let mut tool_name_by_index: HashMap = HashMap::new(); + let mut tool_args_by_index: HashMap = HashMap::new(); let mut last_tool_index: Option = None; tokio::pin!(stream); @@ -170,9 +175,12 @@ pub fn create_anthropic_sse_stream_from_responses(Bytes::from( + input.as_bytes().to_vec(), + ))]); + let converted = create_anthropic_sse_stream_from_responses(upstream); + let chunks: Vec<_> = converted.collect().await; + + let merged = chunks + .into_iter() + .map(|c| String::from_utf8_lossy(c.unwrap().as_ref()).to_string()) + .collect::(); + + assert!(merged.contains("\"name\":\"Read\"")); + assert!(merged.contains("\"partial_json\":\"{\\\"file_path\\\":\\\"/tmp/demo.py\\\",\\\"limit\\\":2000,\\\"offset\\\":0}")); + assert!(!merged.contains("\\\"pages\\\":\\\"\\\"")); + } + + #[tokio::test] + async fn test_streaming_read_tool_duplicate_start_preserves_buffered_args() { + let input = concat!( + "event: response.created\n", + "data: {\"type\":\"response.created\",\"response\":{\"id\":\"resp_read\",\"model\":\"gpt-5.5\"}}\n\n", + "event: response.output_item.added\n", + "data: {\"type\":\"response.output_item.added\",\"item\":{\"id\":\"fc_read\",\"type\":\"function_call\",\"call_id\":\"call_read\",\"name\":\"Read\"}}\n\n", + "event: response.function_call_arguments.delta\n", + "data: {\"type\":\"response.function_call_arguments.delta\",\"item_id\":\"fc_read\",\"delta\":\"{\\\"file_path\\\":\\\"/tmp/demo.py\\\",\\\"limit\\\":2000,\\\"offset\\\":0,\\\"pages\\\":\\\"\\\"}\"}\n\n", + "event: response.output_item.added\n", + "data: {\"type\":\"response.output_item.added\",\"item\":{\"id\":\"fc_read\",\"type\":\"function_call\",\"call_id\":\"call_read\",\"name\":\"Read\"}}\n\n", + "event: response.function_call_arguments.done\n", + "data: {\"type\":\"response.function_call_arguments.done\",\"item_id\":\"fc_read\"}\n\n", + "event: response.completed\n", + "data: {\"type\":\"response.completed\",\"response\":{\"status\":\"completed\"}}\n\n" + ); + + let upstream = stream::iter(vec![Ok::<_, std::io::Error>(Bytes::from( + input.as_bytes().to_vec(), + ))]); + let converted = create_anthropic_sse_stream_from_responses(upstream); + let chunks: Vec<_> = converted.collect().await; + + let merged = chunks + .into_iter() + .map(|c| String::from_utf8_lossy(c.unwrap().as_ref()).to_string()) + .collect::(); + + assert_eq!(merged.matches("event: content_block_start").count(), 1); + assert_eq!(merged.matches("event: content_block_stop").count(), 1); + assert!(merged.contains("\"partial_json\":\"{\\\"file_path\\\":\\\"/tmp/demo.py\\\",\\\"limit\\\":2000,\\\"offset\\\":0}")); + assert!(!merged.contains("\\\"pages\\\":\\\"\\\"")); + } + #[tokio::test] async fn test_streaming_conversion_interleaved_tool_deltas_by_item_id() { let input = concat!( diff --git a/src-tauri/src/proxy/providers/transform.rs b/src-tauri/src/proxy/providers/transform.rs index 72e6b0f02..d734ef2e0 100644 --- a/src-tauri/src/proxy/providers/transform.rs +++ b/src-tauri/src/proxy/providers/transform.rs @@ -3,9 +3,49 @@ //! 实现 Anthropic ↔ OpenAI 格式转换，用于 OpenRouter 支持 //! 参考: anthropic-proxy-rs -use crate::proxy::error::ProxyError; +use crate::proxy::{error::ProxyError, json_canonical::canonical_json_string}; use serde_json::{json, Value}; +const ANTHROPIC_BILLING_HEADER_PREFIX: &str = "x-anthropic-billing-header:"; + +/// Strip only a leading Claude Code attribution line from system text. +/// +/// Claude Code can send dynamic `x-anthropic-billing-header` metadata at the +/// start of `system`. If forwarded into OpenAI Chat messages or Responses +/// `instructions`, the rotating `cch=` value changes the prompt prefix on every +/// request and prevents prefix cache reuse (#2350). Later occurrences are kept +/// to avoid deleting user-authored prompt text. +pub(crate) fn strip_leading_anthropic_billing_header(text: &str) -> &str { + if !text.starts_with(ANTHROPIC_BILLING_HEADER_PREFIX) { + return text; + } + + let Some(line_end) = text + .as_bytes() + .iter() + .position(|byte| *byte == b'\n' || *byte == b'\r') + else { + return ""; + }; + + let bytes = text.as_bytes(); + let mut rest_start = line_end + 1; + if bytes[line_end] == b'\r' && bytes.get(line_end + 1) == Some(&b'\n') { + rest_start += 1; + } + + let rest = &text[rest_start..]; + if let Some(stripped) = rest.strip_prefix("\r\n") { + stripped + } else if let Some(stripped) = rest.strip_prefix('\n') { + stripped + } else if let Some(stripped) = rest.strip_prefix('\r') { + stripped + } else { + rest + } +} + /// Detect OpenAI o-series reasoning models (o1, o3, o4-mini, etc.) /// These models require `max_completion_tokens` instead of `max_tokens`. pub fn is_openai_o_series(model: &str) -> bool { @@ -73,6 +113,18 @@ pub fn resolve_reasoning_effort(body: &Value) -> Option<&'static str> { /// Anthropic 请求 → OpenAI Chat Completions 请求 pub fn anthropic_to_openai(body: Value) -> Result { + anthropic_to_openai_with_reasoning_content(body, false) +} + +/// Anthropic 请求 → OpenAI Chat Completions 请求 +/// +/// `preserve_reasoning_content` 仅用于明确需要 Moonshot/Kimi/DeepSeek +/// `reasoning_content` 兼容字段的 provider。默认转换保持通用 OpenAI-compatible +/// 请求体，避免向严格后端发送未知字段。 +pub fn anthropic_to_openai_with_reasoning_content( + body: Value, + preserve_reasoning_content: bool, +) -> Result { let mut result = json!({}); // NOTE: 模型映射由上游统一处理（proxy::model_mapper），格式转换层只做结构转换。 @@ -85,12 +137,18 @@ pub fn anthropic_to_openai(body: Value) -> Result { // 处理 system prompt if let Some(system) = body.get("system") { if let Some(text) = system.as_str() { - // 单个字符串 - messages.push(json!({"role": "system", "content": text})); + let text = strip_leading_anthropic_billing_header(text); + if !text.is_empty() { + messages.push(json!({"role": "system", "content": text})); + } } else if let Some(arr) = system.as_array() { // 多个 system message — preserve cache_control for compatible proxies for msg in arr { if let Some(text) = msg.get("text").and_then(|t| t.as_str()) { + let text = strip_leading_anthropic_billing_header(text); + if text.is_empty() { + continue; + } let mut sys_msg = json!({"role": "system", "content": text}); if let Some(cc) = msg.get("cache_control") { sys_msg["cache_control"] = cc.clone(); @@ -106,7 +164,7 @@ pub fn anthropic_to_openai(body: Value) -> Result { for msg in msgs { let role = msg.get("role").and_then(|r| r.as_str()).unwrap_or("user"); let content = msg.get("content"); - let converted = convert_message_to_openai(role, content)?; + let converted = convert_message_to_openai(role, content, preserve_reasoning_content)?; messages.extend(converted); } } @@ -252,6 +310,7 @@ fn normalize_openai_system_messages(messages: &mut Vec) { fn convert_message_to_openai( role: &str, content: Option<&Value>, + preserve_reasoning_content: bool, ) -> Result, ProxyError> { let mut result = Vec::new(); @@ -273,6 +332,9 @@ fn convert_message_to_openai( if let Some(blocks) = content.as_array() { let mut content_parts = Vec::new(); let mut tool_calls = Vec::new(); + // reasoning_parts: 仅在兼容 Moonshot/Kimi/DeepSeek thinking tool-call 路径时 + // 生成 reasoning_content，通用 OpenAI-compatible 路径不发送该非标准字段。 + let mut reasoning_parts = Vec::new(); for block in blocks { let block_type = block.get("type").and_then(|t| t.as_str()).unwrap_or(""); @@ -309,7 +371,7 @@ fn convert_message_to_openai( "type": "function", "function": { "name": name, - "arguments": serde_json::to_string(&input).unwrap_or_default() + "arguments": canonical_json_string(&input) } })); } @@ -322,7 +384,7 @@ fn convert_message_to_openai( let content_val = block.get("content"); let content_str = match content_val { Some(Value::String(s)) => s.clone(), - Some(v) => serde_json::to_string(v).unwrap_or_default(), + Some(v) => canonical_json_string(v), None => String::new(), }; result.push(json!({ @@ -332,7 +394,12 @@ fn convert_message_to_openai( })); } "thinking" => { - // 跳过 thinking blocks + // 提取 thinking 内容，后续可作为 reasoning_content 传给需要它的上游。 + if let Some(thinking) = block.get("thinking").and_then(|t| t.as_str()) { + if !thinking.is_empty() { + reasoning_parts.push(thinking.to_string()); + } + } } _ => {} } @@ -366,6 +433,15 @@ fn convert_message_to_openai( msg["tool_calls"] = json!(tool_calls); } + if preserve_reasoning_content && role == "assistant" && !tool_calls.is_empty() { + let reasoning_content = if reasoning_parts.is_empty() { + "tool call".to_string() + } else { + reasoning_parts.join("\n") + }; + msg["reasoning_content"] = json!(reasoning_content); + } + result.push(msg); } @@ -417,6 +493,13 @@ pub fn openai_to_anthropic(body: Value) -> Result { let mut content = Vec::new(); let mut has_tool_use = false; + // DeepSeek provider 会把思考内容放在 message.reasoning_content。 + if let Some(reasoning_content) = message.get("reasoning_content").and_then(|r| r.as_str()) { + if !reasoning_content.is_empty() { + content.push(json!({"type": "thinking", "thinking": reasoning_content})); + } + } + // 文本/拒绝内容 if let Some(msg_content) = message.get("content") { if let Some(text) = msg_content.as_str() { @@ -608,6 +691,80 @@ mod tests { assert_eq!(result["messages"][1]["role"], "user"); } + #[test] + fn test_anthropic_to_openai_strips_leading_billing_header_from_system_string() { + let input = json!({ + "model": "claude-3-sonnet", + "max_tokens": 1024, + "system": "x-anthropic-billing-header: cc_version=2.1.119.47e; cc_entrypoint=sdk-cli; cch=a7754;\n\nYou are a helpful assistant.", + "messages": [{"role": "user", "content": "Hello"}] + }); + + let result = anthropic_to_openai(input).unwrap(); + assert_eq!(result["messages"][0]["role"], "system"); + assert_eq!( + result["messages"][0]["content"], + "You are a helpful assistant." + ); + assert_eq!(result["messages"][1]["role"], "user"); + } + + #[test] + fn test_anthropic_to_openai_strips_billing_header_from_system_array_parts() { + let input = json!({ + "model": "claude-3-sonnet", + "max_tokens": 1024, + "system": [ + {"type": "text", "text": "x-anthropic-billing-header: cc_version=2.1.119.47e; cc_entrypoint=sdk-cli; cch=a7754;\n"}, + {"type": "text", "text": "Stable prompt"} + ], + "messages": [{"role": "user", "content": "Hello"}] + }); + + let result = anthropic_to_openai(input).unwrap(); + assert_eq!(result["messages"][0]["role"], "system"); + assert_eq!(result["messages"][0]["content"], "Stable prompt"); + assert_eq!(result["messages"][1]["role"], "user"); + } + + #[test] + fn test_anthropic_to_openai_preserves_prompt_after_billing_header_in_same_part() { + let input = json!({ + "model": "claude-3-sonnet", + "max_tokens": 1024, + "system": [ + {"type": "text", "text": "x-anthropic-billing-header: cc_version=2.1.119.47e; cc_entrypoint=sdk-cli; cch=a7754;\n\nStable prompt part 1"}, + {"type": "text", "text": "Stable prompt part 2"} + ], + "messages": [{"role": "user", "content": "Hello"}] + }); + + let result = anthropic_to_openai(input).unwrap(); + assert_eq!(result["messages"][0]["role"], "system"); + assert_eq!( + result["messages"][0]["content"], + "Stable prompt part 1\nStable prompt part 2" + ); + assert_eq!(result["messages"][1]["role"], "user"); + } + + #[test] + fn test_anthropic_to_openai_keeps_non_leading_billing_header_text() { + let input = json!({ + "model": "claude-3-sonnet", + "max_tokens": 1024, + "system": "Keep this literal:\nx-anthropic-billing-header: example", + "messages": [{"role": "user", "content": "Hello"}] + }); + + let result = anthropic_to_openai(input).unwrap(); + assert_eq!(result["messages"][0]["role"], "system"); + assert_eq!( + result["messages"][0]["content"], + "Keep this literal:\nx-anthropic-billing-header: example" + ); + } + #[test] fn test_anthropic_to_openai_with_tools() { let input = json!({ @@ -710,6 +867,88 @@ mod tests { assert_eq!(msg["role"], "assistant"); assert!(msg.get("tool_calls").is_some()); assert_eq!(msg["tool_calls"][0]["id"], "call_123"); + assert!(msg.get("reasoning_content").is_none()); + } + + #[test] + fn test_anthropic_to_openai_tool_use_preserves_reasoning_content() { + let input = json!({ + "model": "kimi-k2.6", + "max_tokens": 1024, + "messages": [{ + "role": "assistant", + "content": [ + {"type": "thinking", "thinking": "I should call the tool."}, + {"type": "tool_use", "id": "call_123", "name": "get_weather", "input": {"location": "Tokyo"}} + ] + }] + }); + + let result = anthropic_to_openai_with_reasoning_content(input, true).unwrap(); + let msg = &result["messages"][0]; + assert_eq!(msg["role"], "assistant"); + assert_eq!(msg["reasoning_content"], "I should call the tool."); + assert!(msg.get("tool_calls").is_some()); + assert_eq!(msg["tool_calls"][0]["id"], "call_123"); + } + + #[test] + fn test_anthropic_to_openai_tool_use_injects_placeholder_reasoning_content_when_missing() { + let input = json!({ + "model": "kimi-k2.6", + "max_tokens": 1024, + "messages": [{ + "role": "assistant", + "content": [ + {"type": "tool_use", "id": "call_123", "name": "get_weather", "input": {"location": "Tokyo"}} + ] + }] + }); + + let result = anthropic_to_openai_with_reasoning_content(input, true).unwrap(); + let msg = &result["messages"][0]; + assert_eq!(msg["role"], "assistant"); + assert_eq!(msg["reasoning_content"], "tool call"); + assert!(msg.get("tool_calls").is_some()); + assert_eq!(msg["tool_calls"][0]["id"], "call_123"); + } + + #[test] + fn test_anthropic_to_openai_does_not_emit_reasoning_content_by_default() { + let input = json!({ + "model": "gpt-5.4", + "max_tokens": 1024, + "messages": [{ + "role": "assistant", + "content": [ + {"type": "thinking", "thinking": "I should call the tool."}, + {"type": "tool_use", "id": "call_123", "name": "get_weather", "input": {"location": "Tokyo"}} + ] + }] + }); + + let result = anthropic_to_openai(input).unwrap(); + let msg = &result["messages"][0]; + assert_eq!(msg["role"], "assistant"); + assert!(msg.get("tool_calls").is_some()); + assert!(msg.get("reasoning_content").is_none()); + } + + #[test] + fn test_anthropic_to_openai_skips_thinking_only_message() { + let input = json!({ + "model": "claude-3-opus", + "max_tokens": 1024, + "messages": [{ + "role": "assistant", + "content": [ + {"type": "thinking", "thinking": "No visible content yet."} + ] + }] + }); + + let result = anthropic_to_openai(input).unwrap(); + assert_eq!(result["messages"].as_array().unwrap().len(), 0); } #[test] @@ -757,6 +996,34 @@ mod tests { assert_eq!(result["usage"]["output_tokens"], 5); } + #[test] + fn test_openai_to_anthropic_preserves_id_for_usage_dedup() { + let input = json!({ + "id": "chatcmpl-claude-compatible", + "object": "chat.completion", + "model": "claude-sonnet-4-5", + "choices": [{ + "index": 0, + "message": {"role": "assistant", "content": "Hello!"}, + "finish_reason": "stop" + }], + "usage": {"prompt_tokens": 10, "completion_tokens": 5, "total_tokens": 15} + }); + + let result = openai_to_anthropic(input).unwrap(); + let usage = crate::proxy::usage::parser::TokenUsage::from_claude_response(&result) + .expect("converted Anthropic response should parse usage"); + + assert_eq!( + usage.message_id.as_deref(), + Some("chatcmpl-claude-compatible") + ); + assert_eq!( + usage.dedup_request_id(), + "session:chatcmpl-claude-compatible" + ); + } + #[test] fn test_openai_to_anthropic_with_tool_calls() { let input = json!({ @@ -788,6 +1055,59 @@ mod tests { assert_eq!(result["stop_reason"], "tool_use"); } + #[test] + fn test_deepseek_reasoning_content_round_trips_for_tool_calls() { + let upstream_response = json!({ + "id": "chatcmpl-deepseek", + "object": "chat.completion", + "created": 1234567890, + "model": "deepseek-v4-flash", + "choices": [{ + "index": 0, + "message": { + "role": "assistant", + "reasoning_content": "Need the current date before calling weather.", + "content": "Let me check the date first.", + "tool_calls": [{ + "id": "call_date", + "type": "function", + "function": {"name": "get_date", "arguments": "{}"} + }] + }, + "finish_reason": "tool_calls" + }], + "usage": {"prompt_tokens": 10, "completion_tokens": 5, "total_tokens": 15} + }); + + let anthropic_response = openai_to_anthropic(upstream_response).unwrap(); + assert_eq!(anthropic_response["content"][0]["type"], "thinking"); + assert_eq!( + anthropic_response["content"][0]["thinking"], + "Need the current date before calling weather." + ); + assert_eq!(anthropic_response["content"][1]["type"], "text"); + assert_eq!(anthropic_response["content"][2]["type"], "tool_use"); + assert_eq!(anthropic_response["content"][2]["id"], "call_date"); + + let follow_up_request = json!({ + "model": "deepseek-v4-flash", + "max_tokens": 1024, + "messages": [{ + "role": "assistant", + "content": anthropic_response["content"].clone() + }] + }); + let replayed = anthropic_to_openai_with_reasoning_content(follow_up_request, true).unwrap(); + let msg = &replayed["messages"][0]; + + assert_eq!( + msg["reasoning_content"], + "Need the current date before calling weather." + ); + assert_eq!(msg["tool_calls"][0]["id"], "call_date"); + assert_eq!(msg["tool_calls"][0]["function"]["name"], "get_date"); + } + #[test] fn test_model_passthrough() { // 格式转换层只做结构转换，模型映射由上游 proxy::model_mapper 处理 diff --git a/src-tauri/src/proxy/providers/transform_responses.rs b/src-tauri/src/proxy/providers/transform_responses.rs index 8a7038b85..537e0f5de 100644 --- a/src-tauri/src/proxy/providers/transform_responses.rs +++ b/src-tauri/src/proxy/providers/transform_responses.rs @@ -8,19 +8,51 @@ //! - system prompt 使用 `instructions` 字段而非 system role message //! - usage 字段命名与 Anthropic 一致 (input_tokens/output_tokens) -use crate::proxy::error::ProxyError; +use crate::proxy::{error::ProxyError, json_canonical::canonical_json_string}; use serde_json::{json, Value}; +pub(crate) fn sanitize_anthropic_tool_use_input(name: &str, input: Value) -> Value { + if name != "Read" { + return input; + } + + match input { + Value::Object(mut object) => { + if matches!(object.get("pages"), Some(Value::String(value)) if value.is_empty()) { + object.remove("pages"); + } + Value::Object(object) + } + other => other, + } +} + +pub(crate) fn sanitize_anthropic_tool_use_input_json(name: &str, raw: &str) -> String { + if name != "Read" || raw.is_empty() { + return raw.to_string(); + } + + let Ok(input) = serde_json::from_str::(raw) else { + return raw.to_string(); + }; + + serde_json::to_string(&sanitize_anthropic_tool_use_input(name, input)) + .unwrap_or_else(|_| raw.to_string()) +} + /// Anthropic 请求 → OpenAI Responses 请求 /// /// `cache_key`: optional prompt_cache_key to inject for improved cache routing /// `is_codex_oauth`: 当目标后端是 ChatGPT Plus/Pro 反代 (`chatgpt.com/backend-api/codex`) 时为 true。 /// 该后端强制要求 `store: false`，并要求 `include` 包含 `reasoning.encrypted_content` /// 以便在无服务端状态下保持多轮 reasoning 上下文。 +/// `codex_fast_mode`: 仅在 `is_codex_oauth` 为 true 时生效，控制是否注入 +/// `service_tier = "priority"`。 pub fn anthropic_to_responses( body: Value, cache_key: Option<&str>, is_codex_oauth: bool, + codex_fast_mode: bool, ) -> Result { let mut result = json!({}); @@ -32,10 +64,12 @@ pub fn anthropic_to_responses( // system → instructions (Responses API 使用 instructions 字段) if let Some(system) = body.get("system") { let instructions = if let Some(text) = system.as_str() { - text.to_string() + super::transform::strip_leading_anthropic_billing_header(text).to_string() } else if let Some(arr) = system.as_array() { arr.iter() .filter_map(|msg| msg.get("text").and_then(|t| t.as_str())) + .map(super::transform::strip_leading_anthropic_billing_header) + .filter(|text| !text.is_empty()) .collect::>() .join("\n\n") } else { @@ -125,10 +159,15 @@ pub fn anthropic_to_responses( // （codex-rs 结构体根本没有这三个字段，OpenAI 自己的客户端不发它们） // - instructions / tools / parallel_tool_calls: 必填字段，缺则兜底默认值 // （cc-switch 的 transform 当前是"条件写入"，可能产生缺失） + // - service_tier: 仅在 FAST mode 开启时写入 "priority" + // （与 OpenAI 官方 codex-rs 当前请求结构保持一致） // - stream: 必须永远 true（codex-rs 硬编码 true，且 cc-switch 的 // SSE 解析层只处理流式响应，强制覆盖避免客户端误传 false） if is_codex_oauth { result["store"] = json!(false); + if codex_fast_mode { + result["service_tier"] = json!("priority"); + } const REASONING_MARKER: &str = "reasoning.encrypted_content"; let mut includes: Vec = body @@ -203,18 +242,35 @@ pub(crate) fn map_responses_stop_reason( { "max_tokens" } + "incomplete" => "end_turn", _ => "end_turn", }) } /// Build Anthropic-style usage JSON from Responses API usage, including cache tokens. /// -/// Priority order: +/// **Robustness Features**: +/// - Handles null, missing, empty objects, and partial objects gracefully +/// - Supports OpenAI field name variants (prompt_tokens/completion_tokens) as fallbacks +/// - Always returns valid structure: {"input_tokens": N, "output_tokens": N} +/// - Preserves cache token fields even when input/output tokens are missing +/// +/// **Field Name Resolution Priority**: +/// 1. input_tokens: Anthropic `input_tokens` → OpenAI `prompt_tokens` → default 0 +/// 2. output_tokens: Anthropic `output_tokens` → OpenAI `completion_tokens` → default 0 +/// 3. cache_read_input_tokens: Direct field → nested input_tokens_details.cached_tokens → prompt_tokens_details.cached_tokens +/// 4. cache_creation_input_tokens: Direct field only +/// +/// **Cache Token Priority Order**: /// 1. OpenAI nested details (`input_tokens_details.cached_tokens`, `prompt_tokens_details.cached_tokens`) as initial value /// 2. Direct Anthropic-style fields (`cache_read_input_tokens`, `cache_creation_input_tokens`) override if present +/// +/// **Logging**: +/// - Warns on empty objects {} or partial objects (only one field present) +/// - Debug logs when using OpenAI field name fallbacks pub(crate) fn build_anthropic_usage_from_responses(usage: Option<&Value>) -> Value { let u = match usage { - Some(v) if !v.is_null() => v, + Some(v) if !v.is_null() && v.is_object() => v, _ => { return json!({ "input_tokens": 0, @@ -223,15 +279,56 @@ pub(crate) fn build_anthropic_usage_from_responses(usage: Option<&Value>) -> Val } }; - let input = u.get("input_tokens").and_then(|v| v.as_u64()).unwrap_or(0); - let output = u.get("output_tokens").and_then(|v| v.as_u64()).unwrap_or(0); + // Detect empty object {} and log warning + if u.as_object().map(|obj| obj.is_empty()).unwrap_or(false) { + log::warn!("[Responses] Empty usage object received, using defaults"); + return json!({ + "input_tokens": 0, + "output_tokens": 0 + }); + } + + // Extract input_tokens with OpenAI field name fallback + // Priority: input_tokens (Anthropic) → prompt_tokens (OpenAI) → 0 + let input = u + .get("input_tokens") + .and_then(|v| v.as_u64()) + .or_else(|| { + let prompt_tokens = u.get("prompt_tokens").and_then(|v| v.as_u64()); + if prompt_tokens.is_some() { + log::debug!( + "[Responses] Using OpenAI field name fallback 'prompt_tokens' for input_tokens" + ); + } + prompt_tokens + }) + .unwrap_or(0); + + // Extract output_tokens with OpenAI field name fallback + // Priority: output_tokens (Anthropic) → completion_tokens (OpenAI) → 0 + let output = u.get("output_tokens") + .and_then(|v| v.as_u64()) + .or_else(|| { + let completion_tokens = u.get("completion_tokens").and_then(|v| v.as_u64()); + if completion_tokens.is_some() { + log::debug!("[Responses] Using OpenAI field name fallback 'completion_tokens' for output_tokens"); + } + completion_tokens + }) + .unwrap_or(0); + + // Log if only one field present (partial object). Streaming chunks legitimately + // arrive with partial usage, so this stays at debug level to avoid noise. + if (input == 0 && output > 0) || (input > 0 && output == 0) { + log::debug!("[Responses] Partial usage object: {:?}", u); + } let mut result = json!({ "input_tokens": input, "output_tokens": output }); - // Step 1: OpenAI nested details as fallback + // Step 1: OpenAI nested details as fallback for cache tokens // OpenAI Responses API: input_tokens_details.cached_tokens if let Some(cached) = u .pointer("/input_tokens_details/cached_tokens") @@ -250,6 +347,7 @@ pub(crate) fn build_anthropic_usage_from_responses(usage: Option<&Value>) -> Val } // Step 2: Direct Anthropic-style fields override (authoritative if present) + // These preserve cache tokens even if input/output_tokens are missing if let Some(v) = u.get("cache_read_input_tokens") { result["cache_read_input_tokens"] = v.clone(); } @@ -343,7 +441,7 @@ fn convert_messages_to_input(messages: &[Value]) -> Result, ProxyErro "type": "function_call", "call_id": id, "name": name, - "arguments": serde_json::to_string(&arguments).unwrap_or_default() + "arguments": canonical_json_string(&arguments) })); } @@ -364,7 +462,7 @@ fn convert_messages_to_input(messages: &[Value]) -> Result, ProxyErro .unwrap_or(""); let output = match block.get("content") { Some(Value::String(s)) => s.clone(), - Some(v) => serde_json::to_string(v).unwrap_or_default(), + Some(v) => canonical_json_string(v), None => String::new(), }; @@ -445,6 +543,7 @@ pub fn responses_to_anthropic(body: Value) -> Result { .and_then(|a| a.as_str()) .unwrap_or("{}"); let input: Value = serde_json::from_str(args_str).unwrap_or(json!({})); + let input = sanitize_anthropic_tool_use_input(name, input); content.push(json!({ "type": "tool_use", @@ -519,7 +618,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["model"], "gpt-4o"); assert_eq!(result["max_output_tokens"], 1024); assert_eq!(result["input"][0]["role"], "user"); @@ -538,12 +637,54 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["instructions"], "You are a helpful assistant."); // system should not appear in input assert_eq!(result["input"].as_array().unwrap().len(), 1); } + #[test] + fn test_anthropic_to_responses_strips_leading_billing_header_from_system_string() { + let input = json!({ + "model": "gpt-4o", + "max_tokens": 1024, + "system": "x-anthropic-billing-header: cc_version=2.1.119.47e; cc_entrypoint=sdk-cli; cch=a7754;\n\nYou are a helpful assistant.", + "messages": [{"role": "user", "content": "Hello"}] + }); + + let result = anthropic_to_responses(input, None, false, false).unwrap(); + assert_eq!(result["instructions"], "You are a helpful assistant."); + } + + #[test] + fn test_anthropic_to_responses_strips_billing_header_with_crlf() { + let input = json!({ + "model": "gpt-4o", + "max_tokens": 1024, + "system": "x-anthropic-billing-header: cc_version=2.1.119.47e; cc_entrypoint=sdk-cli; cch=a7754;\r\n\r\nYou are a helpful assistant.", + "messages": [{"role": "user", "content": "Hello"}] + }); + + let result = anthropic_to_responses(input, None, false, false).unwrap(); + assert_eq!(result["instructions"], "You are a helpful assistant."); + } + + #[test] + fn test_anthropic_to_responses_keeps_non_leading_billing_header_text() { + let input = json!({ + "model": "gpt-4o", + "max_tokens": 1024, + "system": "Keep this literal:\nx-anthropic-billing-header: example", + "messages": [{"role": "user", "content": "Hello"}] + }); + + let result = anthropic_to_responses(input, None, false, false).unwrap(); + assert_eq!( + result["instructions"], + "Keep this literal:\nx-anthropic-billing-header: example" + ); + } + #[test] fn test_anthropic_to_responses_with_system_array() { let input = json!({ @@ -556,10 +697,45 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["instructions"], "Part 1\n\nPart 2"); } + #[test] + fn test_anthropic_to_responses_strips_billing_header_from_system_array_parts() { + let input = json!({ + "model": "gpt-4o", + "max_tokens": 1024, + "system": [ + {"type": "text", "text": "x-anthropic-billing-header: cc_version=2.1.119.47e; cc_entrypoint=sdk-cli; cch=a7754;\n"}, + {"type": "text", "text": "Stable prompt"} + ], + "messages": [{"role": "user", "content": "Hello"}] + }); + + let result = anthropic_to_responses(input, None, false, false).unwrap(); + assert_eq!(result["instructions"], "Stable prompt"); + } + + #[test] + fn test_anthropic_to_responses_preserves_prompt_after_billing_header_in_same_part() { + let input = json!({ + "model": "gpt-4o", + "max_tokens": 1024, + "system": [ + {"type": "text", "text": "x-anthropic-billing-header: cc_version=2.1.119.47e; cc_entrypoint=sdk-cli; cch=a7754;\n\nStable prompt part 1"}, + {"type": "text", "text": "Stable prompt part 2"} + ], + "messages": [{"role": "user", "content": "Hello"}] + }); + + let result = anthropic_to_responses(input, None, false, false).unwrap(); + assert_eq!( + result["instructions"], + "Stable prompt part 1\n\nStable prompt part 2" + ); + } + #[test] fn test_anthropic_to_responses_with_tools() { let input = json!({ @@ -573,7 +749,7 @@ mod tests { }] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["tools"][0]["type"], "function"); assert_eq!(result["tools"][0]["name"], "get_weather"); assert!(result["tools"][0].get("parameters").is_some()); @@ -590,7 +766,7 @@ mod tests { "tool_choice": {"type": "any"} }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["tool_choice"], "required"); } @@ -603,7 +779,7 @@ mod tests { "tool_choice": {"type": "tool", "name": "get_weather"} }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["tool_choice"]["type"], "function"); assert_eq!(result["tool_choice"]["name"], "get_weather"); } @@ -622,7 +798,7 @@ mod tests { }] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); let input_arr = result["input"].as_array().unwrap(); // Should produce: assistant message (text) + function_call item @@ -652,7 +828,7 @@ mod tests { }] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); let input_arr = result["input"].as_array().unwrap(); // Should produce: function_call_output item (lifted) @@ -676,7 +852,7 @@ mod tests { }] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); let input_arr = result["input"].as_array().unwrap(); // thinking should be discarded, only text remains @@ -699,7 +875,7 @@ mod tests { }] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); let content = result["input"][0]["content"].as_array().unwrap(); assert_eq!(content[0]["type"], "input_text"); @@ -759,6 +935,56 @@ mod tests { assert_eq!(result["stop_reason"], "tool_use"); } + #[test] + fn test_responses_to_anthropic_read_drops_empty_pages() { + let input = json!({ + "id": "resp_read", + "object": "response", + "status": "completed", + "model": "gpt-5.5", + "output": [{ + "type": "function_call", + "id": "fc_read", + "call_id": "call_read", + "name": "Read", + "arguments": "{\"file_path\":\"/tmp/demo.py\",\"limit\":2000,\"offset\":0,\"pages\":\"\"}", + "status": "completed" + }] + }); + + let result = responses_to_anthropic(input).unwrap(); + let tool_input = &result["content"][0]["input"]; + + assert_eq!(result["content"][0]["type"], "tool_use"); + assert_eq!(result["content"][0]["name"], "Read"); + assert_eq!(tool_input["file_path"], "/tmp/demo.py"); + assert_eq!(tool_input["limit"], 2000); + assert_eq!(tool_input["offset"], 0); + assert!(tool_input.get("pages").is_none()); + } + + #[test] + fn test_responses_to_anthropic_preserves_empty_strings_for_other_tools() { + let input = json!({ + "id": "resp_other", + "object": "response", + "status": "completed", + "model": "gpt-5.5", + "output": [{ + "type": "function_call", + "id": "fc_other", + "call_id": "call_other", + "name": "search", + "arguments": "{\"query\":\"\"}", + "status": "completed" + }] + }); + + let result = responses_to_anthropic(input).unwrap(); + + assert_eq!(result["content"][0]["input"]["query"], ""); + } + #[test] fn test_responses_to_anthropic_with_refusal_block() { let input = json!({ @@ -857,7 +1083,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["model"], "o3-mini"); } @@ -869,7 +1095,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, Some("my-provider-id"), false).unwrap(); + let result = anthropic_to_responses(input, Some("my-provider-id"), false, false).unwrap(); assert_eq!(result["prompt_cache_key"], "my-provider-id"); } @@ -887,7 +1113,7 @@ mod tests { }] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert!(result["tools"][0].get("cache_control").is_none()); } @@ -904,7 +1130,7 @@ mod tests { }] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert!(result["input"][0]["content"][0] .get("cache_control") .is_none()); @@ -966,7 +1192,7 @@ mod tests { "max_tokens": 4096, "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["max_output_tokens"], 4096); assert!(result.get("max_completion_tokens").is_none()); } @@ -980,7 +1206,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["reasoning"]["effort"], "xhigh"); } @@ -994,7 +1220,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["reasoning"]["effort"], "low"); } @@ -1007,7 +1233,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["reasoning"]["effort"], "low"); } @@ -1020,7 +1246,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["reasoning"]["effort"], "medium"); } @@ -1033,7 +1259,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["reasoning"]["effort"], "high"); } @@ -1046,7 +1272,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["reasoning"]["effort"], "xhigh"); } @@ -1059,7 +1285,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert!(result.get("reasoning").is_none()); } @@ -1073,10 +1299,11 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, true).unwrap(); + let result = anthropic_to_responses(input, None, true, true).unwrap(); // store 必须显式为 false（ChatGPT 后端拒绝 true） assert_eq!(result["store"], json!(false)); + assert_eq!(result["service_tier"], json!("priority")); // include 必须包含 reasoning.encrypted_content（无服务端状态下保持多轮 reasoning） assert_eq!(result["include"], json!(["reasoning.encrypted_content"])); @@ -1092,9 +1319,10 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert!(result.get("store").is_none()); + assert!(result.get("service_tier").is_none()); assert!(result.get("include").is_none()); } @@ -1108,7 +1336,7 @@ mod tests { "include": ["something.else", "reasoning.encrypted_content"] }); - let result = anthropic_to_responses(input, None, true).unwrap(); + let result = anthropic_to_responses(input, None, true, true).unwrap(); let includes = result["include"] .as_array() .expect("include should be array"); @@ -1129,6 +1357,21 @@ mod tests { assert_eq!(marker_count, 1, "marker 不应被重复添加（idempotent 失败）"); } + #[test] + fn test_anthropic_to_responses_codex_oauth_fast_mode_can_be_disabled() { + let input = json!({ + "model": "gpt-5-codex", + "max_tokens": 1024, + "messages": [{"role": "user", "content": "Hello"}] + }); + + let result = anthropic_to_responses(input, None, true, false).unwrap(); + + assert_eq!(result["store"], json!(false)); + assert!(result.get("service_tier").is_none()); + assert_eq!(result["include"], json!(["reasoning.encrypted_content"])); + } + #[test] fn test_anthropic_to_responses_codex_oauth_strips_max_output_tokens() { // ChatGPT Plus/Pro 反代不接受 max_output_tokens（OpenAI 官方 codex-rs 的 @@ -1140,7 +1383,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, true).unwrap(); + let result = anthropic_to_responses(input, None, true, true).unwrap(); assert!( result.get("max_output_tokens").is_none(), @@ -1158,7 +1401,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["max_output_tokens"], json!(1024)); } @@ -1176,7 +1419,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, true).unwrap(); + let result = anthropic_to_responses(input, None, true, true).unwrap(); assert!( result.get("temperature").is_none(), @@ -1194,7 +1437,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, true).unwrap(); + let result = anthropic_to_responses(input, None, true, true).unwrap(); assert!( result.get("top_p").is_none(), @@ -1211,7 +1454,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, true).unwrap(); + let result = anthropic_to_responses(input, None, true, true).unwrap(); assert_eq!( result["instructions"], @@ -1245,7 +1488,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, true).unwrap(); + let result = anthropic_to_responses(input, None, true, true).unwrap(); assert_eq!( result["instructions"], @@ -1269,7 +1512,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, true).unwrap(); + let result = anthropic_to_responses(input, None, true, true).unwrap(); assert_eq!( result["stream"], @@ -1290,7 +1533,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert_eq!(result["temperature"], json!(0.7)); assert_eq!(result["top_p"], json!(0.9)); @@ -1306,7 +1549,7 @@ mod tests { "messages": [{"role": "user", "content": "Hello"}] }); - let result = anthropic_to_responses(input, None, false).unwrap(); + let result = anthropic_to_responses(input, None, false, false).unwrap(); assert!( result.get("parallel_tool_calls").is_none(), @@ -1326,4 +1569,106 @@ mod tests { "非 Codex OAuth 路径下 tools 在客户端未送时不应被注入" ); } + + // ==================== Usage Field Robustness Tests ==================== + + #[test] + fn test_build_usage_from_null_parameter() { + let result = build_anthropic_usage_from_responses(None); + assert_eq!(result["input_tokens"], json!(0)); + assert_eq!(result["output_tokens"], json!(0)); + } + + #[test] + fn test_build_usage_from_null_json_value() { + let result = build_anthropic_usage_from_responses(Some(&json!(null))); + assert_eq!(result["input_tokens"], json!(0)); + assert_eq!(result["output_tokens"], json!(0)); + } + + #[test] + fn test_build_usage_from_empty_object() { + let result = build_anthropic_usage_from_responses(Some(&json!({}))); + assert_eq!(result["input_tokens"], json!(0)); + assert_eq!(result["output_tokens"], json!(0)); + } + + #[test] + fn test_build_usage_from_partial_input_only() { + let result = build_anthropic_usage_from_responses(Some(&json!({ + "input_tokens": 100 + }))); + assert_eq!(result["input_tokens"], json!(100)); + assert_eq!(result["output_tokens"], json!(0)); + } + + #[test] + fn test_build_usage_from_partial_output_only() { + let result = build_anthropic_usage_from_responses(Some(&json!({ + "output_tokens": 50 + }))); + assert_eq!(result["input_tokens"], json!(0)); + assert_eq!(result["output_tokens"], json!(50)); + } + + #[test] + fn test_build_usage_with_openai_field_names() { + let result = build_anthropic_usage_from_responses(Some(&json!({ + "prompt_tokens": 120, + "completion_tokens": 45 + }))); + assert_eq!(result["input_tokens"], json!(120)); + assert_eq!(result["output_tokens"], json!(45)); + } + + #[test] + fn test_build_usage_anthropic_names_precedence() { + let result = build_anthropic_usage_from_responses(Some(&json!({ + "input_tokens": 100, + "prompt_tokens": 120, + "output_tokens": 50, + "completion_tokens": 45 + }))); + assert_eq!(result["input_tokens"], json!(100)); // Anthropic name takes precedence + assert_eq!(result["output_tokens"], json!(50)); // Anthropic name takes precedence + } + + #[test] + fn test_build_usage_cache_tokens_from_nested_details() { + let result = build_anthropic_usage_from_responses(Some(&json!({ + "input_tokens": 100, + "output_tokens": 50, + "input_tokens_details": { + "cached_tokens": 80 + } + }))); + assert_eq!(result["input_tokens"], json!(100)); + assert_eq!(result["output_tokens"], json!(50)); + assert_eq!(result["cache_read_input_tokens"], json!(80)); + } + + #[test] + fn test_build_usage_cache_tokens_direct_override() { + let result = build_anthropic_usage_from_responses(Some(&json!({ + "input_tokens": 100, + "output_tokens": 50, + "input_tokens_details": { + "cached_tokens": 80 + }, + "cache_read_input_tokens": 100 + }))); + assert_eq!(result["cache_read_input_tokens"], json!(100)); // Direct field overrides nested + } + + #[test] + fn test_build_usage_cache_tokens_without_input_output() { + let result = build_anthropic_usage_from_responses(Some(&json!({ + "cache_read_input_tokens": 60, + "cache_creation_input_tokens": 20 + }))); + assert_eq!(result["input_tokens"], json!(0)); + assert_eq!(result["output_tokens"], json!(0)); + assert_eq!(result["cache_read_input_tokens"], json!(60)); + assert_eq!(result["cache_creation_input_tokens"], json!(20)); + } } diff --git a/src-tauri/src/proxy/response_processor.rs b/src-tauri/src/proxy/response_processor.rs index 0b9f19f82..9f00f8860 100644 --- a/src-tauri/src/proxy/response_processor.rs +++ b/src-tauri/src/proxy/response_processor.rs @@ -3,7 +3,7 @@ //! 统一处理流式和非流式 API 响应 use super::{ - handler_config::UsageParserConfig, + handler_config::{StreamUsageEventFilter, UsageParserConfig}, handler_context::{RequestContext, StreamingTimeoutConfig}, hyper_client::ProxyResponse, server::ProxyState, @@ -211,7 +211,7 @@ pub async fn handle_streaming( // 创建字节流 let stream = response.bytes_stream(); - // 创建使用量收集器 + // 创建使用量收集器；关闭 usage logging 时不要在流式热路径上解析每个 SSE event。 let usage_collector = create_usage_collector(ctx, state, status.as_u16(), parser_config); // 获取流式超时配置 @@ -219,7 +219,7 @@ pub async fn handle_streaming( // 创建带日志和超时的透传流 let logged_stream = - create_logged_passthrough_stream(stream, ctx.tag, Some(usage_collector), timeout_config); + create_logged_passthrough_stream(stream, ctx.tag, usage_collector, timeout_config); let body = axum::body::Body::from_stream(logged_stream); match builder.body(body) { @@ -255,63 +255,67 @@ pub async fn handle_non_streaming( String::from_utf8_lossy(&body_bytes) ); - // 解析并记录使用量 - if let Ok(json_value) = serde_json::from_slice::(&body_bytes) { - // 解析使用量 - if let Some(usage) = (parser_config.response_parser)(&json_value) { - // 优先使用 usage 中解析出的模型名称，其次使用响应中的 model 字段，最后回退到请求模型 - let model = if let Some(ref m) = usage.model { - m.clone() - } else if let Some(m) = json_value.get("model").and_then(|m| m.as_str()) { - m.to_string() - } else { - ctx.request_model.clone() - }; + // 解析并记录使用量。关闭 usage logging 时直接跳过，避免非流式响应整包 JSON parse。 + if usage_logging_enabled(state) { + if let Ok(json_value) = serde_json::from_slice::(&body_bytes) { + // 解析使用量 + if let Some(usage) = (parser_config.response_parser)(&json_value) { + // 优先使用 usage 中解析出的模型名称，其次使用响应中的 model 字段，最后回退到请求模型 + let model = if let Some(ref m) = usage.model { + m.clone() + } else if let Some(m) = json_value.get("model").and_then(|m| m.as_str()) { + m.to_string() + } else { + ctx.request_model.clone() + }; - spawn_log_usage( - state, - ctx, - usage, - &model, - &ctx.request_model, - status.as_u16(), - false, - ); + spawn_log_usage( + state, + ctx, + usage, + &model, + &ctx.request_model, + status.as_u16(), + false, + ); + } else { + let model = json_value + .get("model") + .and_then(|m| m.as_str()) + .unwrap_or(&ctx.request_model) + .to_string(); + spawn_log_usage( + state, + ctx, + TokenUsage::default(), + &model, + &ctx.request_model, + status.as_u16(), + false, + ); + log::debug!( + "[{}] 未能解析 usage 信息，跳过记录", + parser_config.app_type_str + ); + } } else { - let model = json_value - .get("model") - .and_then(|m| m.as_str()) - .unwrap_or(&ctx.request_model) - .to_string(); + log::debug!( + "[{}] <<< 响应 (非 JSON): {} bytes", + ctx.tag, + body_bytes.len() + ); spawn_log_usage( state, ctx, TokenUsage::default(), - &model, + &ctx.request_model, &ctx.request_model, status.as_u16(), false, ); - log::debug!( - "[{}] 未能解析 usage 信息，跳过记录", - parser_config.app_type_str - ); } } else { - log::debug!( - "[{}] <<< 响应 (非 JSON): {} bytes", - ctx.tag, - body_bytes.len() - ); - spawn_log_usage( - state, - ctx, - TokenUsage::default(), - &ctx.request_model, - &ctx.request_model, - status.as_u16(), - false, - ); + log::debug!("[{}] usage logging 已关闭，跳过非流式 usage 解析", ctx.tag); } // 构建响应 @@ -360,13 +364,15 @@ struct SseUsageCollectorInner { first_event_time: Mutex>, start_time: std::time::Instant, on_complete: UsageCallbackWithTiming, + should_collect: Option, finished: AtomicBool, } impl SseUsageCollector { - /// 创建新的使用量收集器 + /// 创建使用量收集器；`should_collect` 用来在 hot path 跳过与 usage 无关的事件。 pub fn new( start_time: std::time::Instant, + should_collect: Option, callback: impl Fn(Vec, Option) + Send + Sync + 'static, ) -> Self { let on_complete: UsageCallbackWithTiming = Arc::new(callback); @@ -376,11 +382,19 @@ impl SseUsageCollector { first_event_time: Mutex::new(None), start_time, on_complete, + should_collect, finished: AtomicBool::new(false), }), } } + pub fn should_collect(&self, data: &str) -> bool { + self.inner + .should_collect + .map(|filter| filter(data)) + .unwrap_or(true) + } + /// 推送 SSE 事件 pub async fn push(&self, event: Value) { // 记录首个事件时间 @@ -424,12 +438,16 @@ fn create_usage_collector( state: &ProxyState, status_code: u16, parser_config: &UsageParserConfig, -) -> SseUsageCollector { +) -> Option { let logging_enabled = state .config .try_read() .map(|c| c.enable_logging) .unwrap_or(true); + if !logging_enabled { + return None; + } + let state = state.clone(); let provider_id = ctx.provider.id.clone(); let request_model = ctx.request_model.clone(); @@ -440,62 +458,63 @@ fn create_usage_collector( let model_extractor = parser_config.model_extractor; let session_id = ctx.session_id.clone(); - SseUsageCollector::new(start_time, move |events, first_token_ms| { - if !logging_enabled { - return; - } - if let Some(usage) = stream_parser(&events) { - let model = model_extractor(&events, &request_model); - let latency_ms = start_time.elapsed().as_millis() as u64; + Some(SseUsageCollector::new( + start_time, + parser_config.stream_event_filter, + move |events, first_token_ms| { + if let Some(usage) = stream_parser(&events) { + let model = model_extractor(&events, &request_model); + let latency_ms = start_time.elapsed().as_millis() as u64; - let state = state.clone(); - let provider_id = provider_id.clone(); - let session_id = session_id.clone(); - let request_model = request_model.clone(); + let state = state.clone(); + let provider_id = provider_id.clone(); + let session_id = session_id.clone(); + let request_model = request_model.clone(); - tokio::spawn(async move { - log_usage_internal( - &state, - &provider_id, - app_type_str, - &model, - &request_model, - usage, - latency_ms, - first_token_ms, - true, // is_streaming - status_code, - Some(session_id), - ) - .await; - }); - } else { - let model = model_extractor(&events, &request_model); - let latency_ms = start_time.elapsed().as_millis() as u64; - let state = state.clone(); - let provider_id = provider_id.clone(); - let session_id = session_id.clone(); - let request_model = request_model.clone(); + tokio::spawn(async move { + log_usage_internal( + &state, + &provider_id, + app_type_str, + &model, + &request_model, + usage, + latency_ms, + first_token_ms, + true, // is_streaming + status_code, + Some(session_id), + ) + .await; + }); + } else { + let model = model_extractor(&events, &request_model); + let latency_ms = start_time.elapsed().as_millis() as u64; + let state = state.clone(); + let provider_id = provider_id.clone(); + let session_id = session_id.clone(); + let request_model = request_model.clone(); - tokio::spawn(async move { - log_usage_internal( - &state, - &provider_id, - app_type_str, - &model, - &request_model, - TokenUsage::default(), - latency_ms, - first_token_ms, - true, // is_streaming - status_code, - Some(session_id), - ) - .await; - }); - log::debug!("[{tag}] 流式响应缺少 usage 统计，跳过消费记录"); - } - }) + tokio::spawn(async move { + log_usage_internal( + &state, + &provider_id, + app_type_str, + &model, + &request_model, + TokenUsage::default(), + latency_ms, + first_token_ms, + true, // is_streaming + status_code, + Some(session_id), + ) + .await; + }); + log::debug!("[{tag}] 流式响应缺少 usage 统计，跳过消费记录"); + } + }, + )) } /// 异步记录使用量 @@ -541,6 +560,14 @@ fn spawn_log_usage( }); } +pub(crate) fn usage_logging_enabled(state: &ProxyState) -> bool { + state + .config + .try_read() + .map(|config| config.enable_logging) + .unwrap_or(true) +} + /// 内部使用量记录函数 #[allow(clippy::too_many_arguments)] async fn log_usage_internal( @@ -609,6 +636,8 @@ pub fn create_logged_passthrough_stream( let mut buffer = String::new(); let mut utf8_remainder: Vec = Vec::new(); let mut collector = usage_collector; + let inspect_sse_events = + collector.is_some() || log::log_enabled!(log::Level::Debug); let mut is_first_chunk = true; // 超时配置 @@ -659,25 +688,36 @@ pub fn create_logged_passthrough_stream( ); } is_first_chunk = false; - crate::proxy::sse::append_utf8_safe(&mut buffer, &mut utf8_remainder, &bytes); + if inspect_sse_events { + crate::proxy::sse::append_utf8_safe(&mut buffer, &mut utf8_remainder, &bytes); - // 尝试解析并记录完整的 SSE 事件 - while let Some(event_text) = take_sse_block(&mut buffer) { - if !event_text.trim().is_empty() { - // 提取 data 部分并尝试解析为 JSON - for line in event_text.lines() { - if let Some(data) = strip_sse_field(line, "data") { - if data.trim() != "[DONE]" { - if let Ok(json_value) = serde_json::from_str::(data) { - if let Some(c) = &collector { - c.push(json_value.clone()).await; + // 尝试解析并记录完整的 SSE 事件 + while let Some(event_text) = take_sse_block(&mut buffer) { + if !event_text.trim().is_empty() { + // 提取 data 部分；只有 usage collector 存在时才解析 JSON。 + for line in event_text.lines() { + if let Some(data) = strip_sse_field(line, "data") { + if data.trim() != "[DONE]" { + let collected = match &collector { + Some(c) if c.should_collect(data) => { + match serde_json::from_str::(data) { + Ok(json_value) => { + c.push(json_value).await; + true + } + Err(_) => false, + } + } + _ => false, + }; + if collected { + log::debug!("[{tag}] <<< SSE 事件: {data}"); + } else { + log::debug!("[{tag}] <<< SSE 数据: {data}"); } - log::debug!("[{tag}] <<< SSE 事件: {data}"); } else { - log::debug!("[{tag}] <<< SSE 数据: {data}"); + log::debug!("[{tag}] <<< SSE: [DONE]"); } - } else { - log::debug!("[{tag}] <<< SSE: [DONE]"); } } } @@ -894,9 +934,11 @@ mod tests { db.set_pricing_model_source(app_type, "response").await?; seed_pricing(&db)?; - let mut meta = ProviderMeta::default(); - meta.cost_multiplier = Some("2".to_string()); - meta.pricing_model_source = Some("request".to_string()); + let meta = ProviderMeta { + cost_multiplier: Some("2".to_string()), + pricing_model_source: Some("request".to_string()), + ..ProviderMeta::default() + }; insert_provider(&db, "provider-1", app_type, meta)?; let state = build_state(db.clone()); diff --git a/src-tauri/src/proxy/server.rs b/src-tauri/src/proxy/server.rs index 1360aae03..475069a98 100644 --- a/src-tauri/src/proxy/server.rs +++ b/src-tauri/src/proxy/server.rs @@ -285,6 +285,15 @@ impl ProxyServer { // Claude API (支持带前缀和不带前缀两种格式) .route("/v1/messages", post(handlers::handle_messages)) .route("/claude/v1/messages", post(handlers::handle_messages)) + // Claude Desktop 3P 本地 gateway（独立 provider namespace） + .route( + "/claude-desktop/v1/models", + get(handlers::handle_claude_desktop_models), + ) + .route( + "/claude-desktop/v1/messages", + post(handlers::handle_claude_desktop_messages), + ) // OpenAI Chat Completions API (Codex CLI，支持带前缀和不带前缀) .route("/chat/completions", post(handlers::handle_chat_completions)) .route( diff --git a/src-tauri/src/proxy/thinking_optimizer.rs b/src-tauri/src/proxy/thinking_optimizer.rs index f29968e04..99484b2bd 100644 --- a/src-tauri/src/proxy/thinking_optimizer.rs +++ b/src-tauri/src/proxy/thinking_optimizer.rs @@ -7,7 +7,7 @@ use serde_json::{json, Value}; /// /// 三路径分发： /// - skip: haiku 模型直接跳过 -/// - adaptive: opus-4-6 / sonnet-4-6 使用 adaptive thinking +/// - adaptive: opus-4-7 / opus-4-6 / sonnet-4-6 使用 adaptive thinking /// - legacy: 其他模型注入 enabled thinking + budget_tokens pub fn optimize(body: &mut Value, config: &OptimizerConfig) { if !config.thinking_optimizer { @@ -24,7 +24,7 @@ pub fn optimize(body: &mut Value, config: &OptimizerConfig) { return; } - if model.contains("opus-4-6") || model.contains("sonnet-4-6") { + if model.contains("opus-4-7") || model.contains("opus-4-6") || model.contains("sonnet-4-6") { log::info!("[OPT] thinking: adaptive({model})"); body["thinking"] = json!({"type": "adaptive"}); body["output_config"] = json!({"effort": "max"}); diff --git a/src-tauri/src/proxy/types.rs b/src-tauri/src/proxy/types.rs index 744e596f7..68474400b 100644 --- a/src-tauri/src/proxy/types.rs +++ b/src-tauri/src/proxy/types.rs @@ -298,9 +298,15 @@ pub struct CopilotOptimizerConfig { /// Warmup 小模型降级（默认开启 — 与参考实现对齐，避免探针请求消耗 premium quota） #[serde(default = "default_true")] pub warmup_downgrade: bool, - /// Warmup 降级使用的模型（默认 "gpt-4o-mini"） + /// Warmup 降级使用的模型（默认 "gpt-5-mini"） #[serde(default = "default_warmup_model")] pub warmup_model: String, + /// 请求前主动剥离 assistant 消息里的 thinking / redacted_thinking block + /// + /// Copilot 走 OpenAI 兼容端点，thinking block 会被上游拒绝并触发 rectifier 反应式 + /// 重试，那时第一次请求已经消耗了一次 premium quota。主动剥离避免这次浪费。 + #[serde(default = "default_true")] + pub strip_thinking: bool, } fn default_warmup_model() -> String { @@ -317,7 +323,8 @@ impl Default for CopilotOptimizerConfig { deterministic_request_id: true, subagent_detection: true, warmup_downgrade: true, - warmup_model: "gpt-4o-mini".to_string(), + warmup_model: "gpt-5-mini".to_string(), + strip_thinking: true, } } } diff --git a/src-tauri/src/services/balance.rs b/src-tauri/src/services/balance.rs index fa6b5d5a1..dce56fed8 100644 --- a/src-tauri/src/services/balance.rs +++ b/src-tauri/src/services/balance.rs @@ -233,14 +233,21 @@ async fn query_siliconflow(api_key: &str, is_cn: bool) -> UsageResult { let total_balance = parse_f64_field(data, "totalBalance").unwrap_or(0.0); + let unit = if is_cn { "CNY" } else { "USD" }; + let plan_name = if is_cn { + "SiliconFlow" + } else { + "SiliconFlow (EN)" + }; + UsageResult { success: true, data: Some(vec![UsageData { - plan_name: Some("SiliconFlow".to_string()), + plan_name: Some(plan_name.to_string()), remaining: Some(total_balance), total: None, used: None, - unit: Some("CNY".to_string()), + unit: Some(unit.to_string()), is_valid: Some(true), invalid_message: None, extra: None, diff --git a/src-tauri/src/services/coding_plan.rs b/src-tauri/src/services/coding_plan.rs index 565ee2cf0..c03345b11 100644 --- a/src-tauri/src/services/coding_plan.rs +++ b/src-tauri/src/services/coding_plan.rs @@ -3,7 +3,9 @@ //! 支持 Kimi For Coding、智谱 GLM、MiniMax 的 Token Plan 额度查询。 //! 复用 subscription 模块的 SubscriptionQuota / QuotaTier 类型。 -use super::subscription::{CredentialStatus, QuotaTier, SubscriptionQuota}; +use super::subscription::{ + CredentialStatus, QuotaTier, SubscriptionQuota, TIER_FIVE_HOUR, TIER_WEEKLY_LIMIT, +}; use std::time::{SystemTime, UNIX_EPOCH}; // ── 供应商检测 ────────────────────────────────────────────── @@ -181,6 +183,60 @@ async fn query_kimi(api_key: &str) -> SubscriptionQuota { // ── 智谱 GLM ──────────────────────────────────────────────── +/// 把智谱 `data` 里的 `limits[]` 解析成 tier 列表。 +/// +/// 按 `nextResetTime` 升序后：第 0 条 = 五小时桶（`five_hour`）、 +/// 第 1 条 = 每周桶（`weekly_limit`）。老套餐（2026-02-12 前订阅）只回 1 条 +/// `TOKENS_LIMIT`，自然降级为仅展示 `five_hour`；新套餐回 2 条。 +/// 缺失 `nextResetTime` 时按 `i64::MAX` 排到末位。 +fn parse_zhipu_token_tiers(data: &serde_json::Value) -> Vec { + let mut token_limits: Vec<(i64, f64, Option)> = Vec::new(); + if let Some(limits) = data.get("limits").and_then(|v| v.as_array()) { + for limit_item in limits { + let limit_type = limit_item + .get("type") + .and_then(|v| v.as_str()) + .unwrap_or(""); + // 大小写不敏感比较：上游若把 "TOKENS_LIMIT" 改成小写或驼峰，依然能识别 + if !limit_type.eq_ignore_ascii_case("TOKENS_LIMIT") { + continue; + } + let percentage = limit_item + .get("percentage") + .and_then(|v| v.as_f64()) + .unwrap_or(0.0); + let reset_ms = limit_item + .get("nextResetTime") + .and_then(|v| v.as_i64()) + .unwrap_or(i64::MAX); + let reset_iso = if reset_ms == i64::MAX { + None + } else { + millis_to_iso8601(reset_ms) + }; + token_limits.push((reset_ms, percentage, reset_iso)); + } + } + token_limits.sort_by_key(|(reset, _, _)| *reset); + + token_limits + .into_iter() + .enumerate() + .filter_map(|(idx, (_, percentage, resets_at))| { + let name = match idx { + 0 => TIER_FIVE_HOUR, + 1 => TIER_WEEKLY_LIMIT, + _ => return None, // 智谱当前最多两条 TOKENS_LIMIT，多余的忽略 + }; + Some(QuotaTier { + name: name.to_string(), + utilization: percentage, + resets_at, + }) + }) + .collect() +} + async fn query_zhipu(api_key: &str) -> SubscriptionQuota { let client = crate::proxy::http_client::get(); @@ -237,34 +293,7 @@ async fn query_zhipu(api_key: &str) -> SubscriptionQuota { None => return make_error("Missing 'data' field in response".to_string()), }; - let mut tiers = Vec::new(); - - if let Some(limits) = data.get("limits").and_then(|v| v.as_array()) { - for limit_item in limits { - let limit_type = limit_item - .get("type") - .and_then(|v| v.as_str()) - .unwrap_or(""); - let percentage = limit_item - .get("percentage") - .and_then(|v| v.as_f64()) - .unwrap_or(0.0); - let next_reset = limit_item - .get("nextResetTime") - .and_then(|v| v.as_i64()) - .and_then(millis_to_iso8601); - - if limit_type != "TOKENS_LIMIT" { - continue; - } - - tiers.push(QuotaTier { - name: "five_hour".to_string(), - utilization: percentage, - resets_at: next_reset, - }); - } - } + let tiers = parse_zhipu_token_tiers(data); // 套餐等级存入 credential_message let level = data @@ -449,3 +478,135 @@ pub async fn get_coding_plan_quota( Ok(quota) } + +#[cfg(test)] +mod tests { + use super::{parse_zhipu_token_tiers, TIER_FIVE_HOUR, TIER_WEEKLY_LIMIT}; + use serde_json::json; + + #[test] + fn zhipu_new_plan_two_tiers_sorted_by_reset_time() { + // 新套餐：两条 TOKENS_LIMIT，nextResetTime 较近的归 five_hour、较远的归 weekly_limit。 + // 故意把"周限"放数组前面，验证不依赖输入顺序。 + let data = json!({ + "limits": [ + { "type": "TOKENS_LIMIT", "percentage": 53.0, "nextResetTime": 2_000_000_000_000_i64 }, + { "type": "TOKENS_LIMIT", "percentage": 44.0, "nextResetTime": 1_000_000_000_000_i64 }, + { "type": "TIME_LIMIT", "percentage": 7.0 }, + ] + }); + let tiers = parse_zhipu_token_tiers(&data); + assert_eq!(tiers.len(), 2); + assert_eq!(tiers[0].name, TIER_FIVE_HOUR); + assert_eq!(tiers[0].utilization, 44.0); + assert_eq!(tiers[1].name, TIER_WEEKLY_LIMIT); + assert_eq!(tiers[1].utilization, 53.0); + } + + #[test] + fn zhipu_old_plan_single_tier_falls_back_to_five_hour() { + // 老套餐（2026-02-12 前订阅）：仅一条 TOKENS_LIMIT，无周限。 + let data = json!({ + "limits": [ + { + "type": "TOKENS_LIMIT", + "percentage": 2.0, + "nextResetTime": 1_774_967_594_803_i64 + }, + { "type": "TIME_LIMIT", "percentage": 0.0 } + ] + }); + let tiers = parse_zhipu_token_tiers(&data); + assert_eq!(tiers.len(), 1); + assert_eq!(tiers[0].name, TIER_FIVE_HOUR); + assert_eq!(tiers[0].utilization, 2.0); + } + + #[test] + fn zhipu_no_token_limits_returns_empty() { + let data = json!({ "limits": [{ "type": "TIME_LIMIT", "percentage": 5.0 }] }); + assert!(parse_zhipu_token_tiers(&data).is_empty()); + } + + #[test] + fn zhipu_missing_reset_time_sorts_last() { + // 防御性：没有 nextResetTime 的条目排到末位，避免抢占 five_hour 槽位。 + let data = json!({ + "limits": [ + { "type": "TOKENS_LIMIT", "percentage": 99.0 }, + { "type": "TOKENS_LIMIT", "percentage": 10.0, "nextResetTime": 1_000_000_000_000_i64 } + ] + }); + let tiers = parse_zhipu_token_tiers(&data); + assert_eq!(tiers.len(), 2); + assert_eq!(tiers[0].name, TIER_FIVE_HOUR); + assert_eq!(tiers[0].utilization, 10.0); + assert_eq!(tiers[1].name, TIER_WEEKLY_LIMIT); + assert_eq!(tiers[1].utilization, 99.0); + assert!(tiers[1].resets_at.is_none()); + } + + #[test] + fn zhipu_type_is_case_insensitive() { + // 防御性：上游若把 "TOKENS_LIMIT" 改成 "tokens_limit"（仅大小写变化）仍能识别。 + // 注意：分隔符差异（如 "TokensLimit" 去掉下划线）不在兼容范围。 + let data = json!({ + "limits": [ + { "type": "tokens_limit", "percentage": 12.0, "nextResetTime": 1_000_000_000_000_i64 }, + { "type": "Tokens_Limit", "percentage": 34.0, "nextResetTime": 2_000_000_000_000_i64 } + ] + }); + let tiers = parse_zhipu_token_tiers(&data); + assert_eq!(tiers.len(), 2); + assert_eq!(tiers[0].name, TIER_FIVE_HOUR); + assert_eq!(tiers[0].utilization, 12.0); + assert_eq!(tiers[1].name, TIER_WEEKLY_LIMIT); + assert_eq!(tiers[1].utilization, 34.0); + } + + #[test] + fn zhipu_invalid_percentage_falls_back_to_zero() { + // percentage 为字符串或 null 时不应崩溃，按 0 处理（仍展示 tier，但用量为 0）。 + let data = json!({ + "limits": [ + { "type": "TOKENS_LIMIT", "percentage": "invalid", "nextResetTime": 1_000_000_000_000_i64 }, + { "type": "TOKENS_LIMIT", "percentage": null, "nextResetTime": 2_000_000_000_000_i64 } + ] + }); + let tiers = parse_zhipu_token_tiers(&data); + assert_eq!(tiers.len(), 2); + assert_eq!(tiers[0].utilization, 0.0); + assert_eq!(tiers[1].utilization, 0.0); + } + + #[test] + fn zhipu_extreme_percentage_values_pass_through() { + // 负数 / 超 100 不做范围裁剪——下游渲染层负责显示策略，解析层只负责忠实搬运。 + let data = json!({ + "limits": [ + { "type": "TOKENS_LIMIT", "percentage": -5.0, "nextResetTime": 1_000_000_000_000_i64 }, + { "type": "TOKENS_LIMIT", "percentage": 150.0, "nextResetTime": 2_000_000_000_000_i64 } + ] + }); + let tiers = parse_zhipu_token_tiers(&data); + assert_eq!(tiers.len(), 2); + assert_eq!(tiers[0].utilization, -5.0); + assert_eq!(tiers[1].utilization, 150.0); + } + + #[test] + fn zhipu_more_than_two_token_limits_keeps_first_two() { + // 防御性：智谱当前最多两条 TOKENS_LIMIT，若上游意外增加第三条应被丢弃，避免命名空缺。 + let data = json!({ + "limits": [ + { "type": "TOKENS_LIMIT", "percentage": 1.0, "nextResetTime": 1_000_000_000_000_i64 }, + { "type": "TOKENS_LIMIT", "percentage": 2.0, "nextResetTime": 2_000_000_000_000_i64 }, + { "type": "TOKENS_LIMIT", "percentage": 3.0, "nextResetTime": 3_000_000_000_000_i64 } + ] + }); + let tiers = parse_zhipu_token_tiers(&data); + assert_eq!(tiers.len(), 2); + assert_eq!(tiers[0].name, TIER_FIVE_HOUR); + assert_eq!(tiers[1].name, TIER_WEEKLY_LIMIT); + } +} diff --git a/src-tauri/src/services/config.rs b/src-tauri/src/services/config.rs index d354cccb1..a56ef57d5 100644 --- a/src-tauri/src/services/config.rs +++ b/src-tauri/src/services/config.rs @@ -121,6 +121,9 @@ impl ConfigService { match app_type { AppType::Codex => Self::sync_codex_live(config, ¤t_id, &provider)?, AppType::Claude => Self::sync_claude_live(config, ¤t_id, &provider)?, + AppType::ClaudeDesktop => { + // Claude Desktop 3P profiles are managed by claude_desktop_config. + } AppType::Gemini => Self::sync_gemini_live(config, ¤t_id, &provider)?, AppType::OpenCode => { // OpenCode uses additive mode, no live sync needed @@ -130,6 +133,9 @@ impl ConfigService { // OpenClaw uses additive mode, no live sync needed // OpenClaw providers are managed directly in the config file } + AppType::Hermes => { + // Hermes uses additive mode, no live sync needed + } } Ok(()) @@ -153,7 +159,7 @@ impl ConfigService { } let cfg_text = settings.get("config").and_then(Value::as_str); - crate::codex_config::write_codex_live_atomic(auth, cfg_text)?; + crate::codex_config::write_codex_live_atomic_with_stable_provider(auth, cfg_text)?; // 注意：MCP 同步在 v3.7.0 中已通过 McpService 进行，不再在此调用 // sync_enabled_to_codex 使用旧的 config.mcp.codex 结构，在新架构中为空 // MCP 的启用/禁用应通过 McpService::toggle_app 进行 diff --git a/src-tauri/src/services/mcp.rs b/src-tauri/src/services/mcp.rs index 02b31aea9..ed07c56fe 100644 --- a/src-tauri/src/services/mcp.rs +++ b/src-tauri/src/services/mcp.rs @@ -40,6 +40,9 @@ impl McpService { if prev_apps.opencode && !server.apps.opencode { Self::remove_server_from_app(state, &server.id, &AppType::OpenCode)?; } + if prev_apps.hermes && !server.apps.hermes { + Self::remove_server_from_app(state, &server.id, &AppType::Hermes)?; + } // 同步到各个启用的应用 Self::sync_server_to_apps(state, &server)?; @@ -109,6 +112,9 @@ impl McpService { AppType::Claude => { mcp::sync_single_server_to_claude(&Default::default(), &server.id, &server.server)?; } + AppType::ClaudeDesktop => { + log::debug!("Claude Desktop 3P profiles do not use CC Switch MCP sync, skipping"); + } AppType::Codex => { // Codex uses TOML format, must use the correct function mcp::sync_single_server_to_codex(&Default::default(), &server.id, &server.server)?; @@ -128,6 +134,9 @@ impl McpService { // Skip for now log::debug!("OpenClaw MCP support is still in development, skipping sync"); } + AppType::Hermes => { + mcp::sync_single_server_to_hermes(&Default::default(), &server.id, &server.server)?; + } } Ok(()) } @@ -148,6 +157,9 @@ impl McpService { fn remove_server_from_app(_state: &AppState, id: &str, app: &AppType) -> Result<(), AppError> { match app { AppType::Claude => mcp::remove_server_from_claude(id)?, + AppType::ClaudeDesktop => { + log::debug!("Claude Desktop 3P profiles do not use CC Switch MCP sync, skipping"); + } AppType::Codex => mcp::remove_server_from_codex(id)?, AppType::Gemini => mcp::remove_server_from_gemini(id)?, AppType::OpenCode => { @@ -157,6 +169,9 @@ impl McpService { // OpenClaw MCP support is still in development log::debug!("OpenClaw MCP support is still in development, skipping remove"); } + AppType::Hermes => { + mcp::remove_server_from_hermes(id)?; + } } Ok(()) } @@ -166,7 +181,7 @@ impl McpService { let servers = Self::get_all_servers(state)?; for app in AppType::all() { - if matches!(app, AppType::OpenClaw) { + if matches!(app, AppType::OpenClaw | AppType::ClaudeDesktop) { continue; } @@ -259,8 +274,8 @@ impl McpService { state.db.save_mcp_server(&to_save)?; existing.insert(to_save.id.clone(), to_save.clone()); - // 同步到对应应用 live 配置 - Self::sync_server_to_apps(state, &to_save)?; + // 导入是读取已有配置，不应反向写回任何应用的 live 配置。 + // 显式编辑、启用/禁用或手动同步时再执行写回。 } } } @@ -297,8 +312,8 @@ impl McpService { state.db.save_mcp_server(&to_save)?; existing.insert(to_save.id.clone(), to_save.clone()); - // 同步到对应应用 live 配置 - Self::sync_server_to_apps(state, &to_save)?; + // 导入是读取已有配置，不应反向写回任何应用的 live 配置。 + // 显式编辑、启用/禁用或手动同步时再执行写回。 } } } @@ -335,8 +350,8 @@ impl McpService { state.db.save_mcp_server(&to_save)?; existing.insert(to_save.id.clone(), to_save.clone()); - // 同步到对应应用 live 配置 - Self::sync_server_to_apps(state, &to_save)?; + // 导入是读取已有配置，不应反向写回任何应用的 live 配置。 + // 显式编辑、启用/禁用或手动同步时再执行写回。 } } } @@ -373,8 +388,46 @@ impl McpService { state.db.save_mcp_server(&to_save)?; existing.insert(to_save.id.clone(), to_save.clone()); - // 同步到对应应用 live 配置 - Self::sync_server_to_apps(state, &to_save)?; + // 导入是读取已有配置，不应反向写回任何应用的 live 配置。 + // 显式编辑、启用/禁用或手动同步时再执行写回。 + } + } + } + + Ok(new_count) + } + + /// 从 Hermes 导入 MCP + pub fn import_from_hermes(state: &AppState) -> Result { + // 创建临时 MultiAppConfig 用于导入 + let mut temp_config = crate::app_config::MultiAppConfig::default(); + + // 调用导入逻辑（从 mcp/hermes.rs） + let count = crate::mcp::import_from_hermes(&mut temp_config)?; + + let mut new_count = 0; + + // 如果有导入的服务器，保存到数据库 + if count > 0 { + if let Some(servers) = &temp_config.mcp.servers { + let mut existing = state.db.get_all_mcp_servers()?; + for server in servers.values() { + // 已存在：仅启用 Hermes，不覆盖其他字段（与导入模块语义保持一致） + let to_save = if let Some(existing_server) = existing.get(&server.id) { + let mut merged = existing_server.clone(); + merged.apps.hermes = true; + merged + } else { + // 真正的新服务器 + new_count += 1; + server.clone() + }; + + state.db.save_mcp_server(&to_save)?; + existing.insert(to_save.id.clone(), to_save.clone()); + + // 导入是读取已有配置，不应反向写回任何应用的 live 配置。 + // 显式编辑、启用/禁用或手动同步时再执行写回。 } } } diff --git a/src-tauri/src/services/mod.rs b/src-tauri/src/services/mod.rs index 5a6bb798f..d9fb5077c 100644 --- a/src-tauri/src/services/mod.rs +++ b/src-tauri/src/services/mod.rs @@ -16,6 +16,7 @@ pub mod skill; pub mod speedtest; pub mod stream_check; pub mod subscription; +pub mod usage_cache; pub mod usage_stats; pub mod webdav; pub mod webdav_auto_sync; @@ -30,6 +31,7 @@ pub use proxy::ProxyService; #[allow(unused_imports)] pub use skill::{DiscoverableSkill, Skill, SkillRepo, SkillService}; pub use speedtest::{EndpointLatency, SpeedtestService}; +pub use usage_cache::UsageCache; #[allow(unused_imports)] pub use usage_stats::{ DailyStats, LogFilters, ModelStats, PaginatedLogs, ProviderLimitStatus, ProviderStats, diff --git a/src-tauri/src/services/model_fetch.rs b/src-tauri/src/services/model_fetch.rs index 2cc7f166b..580ddda88 100644 --- a/src-tauri/src/services/model_fetch.rs +++ b/src-tauri/src/services/model_fetch.rs @@ -1,8 +1,10 @@ //! 模型列表获取服务 //! //! 通过 OpenAI 兼容的 GET /v1/models 端点获取供应商可用模型列表。 -//! 主要面向第三方聚合站（硅基流动、OpenRouter 等）。 +//! 主要面向第三方聚合站（硅基流动、OpenRouter 等），以及把 Anthropic +//! 协议挂在兼容子路径上的官方供应商（DeepSeek、Kimi、智谱 GLM 等）。 +use reqwest::StatusCode; use serde::{Deserialize, Serialize}; use std::time::Duration; @@ -28,85 +30,184 @@ struct ModelEntry { const FETCH_TIMEOUT_SECS: u64 = 15; +/// 404/405 响应体截断长度：避免把几十 KB HTML 404 页整页保留到错误串里。 +const ERROR_BODY_MAX_CHARS: usize = 512; + +/// 已知的「Anthropic 协议兼容子路径」后缀；按长度降序，最长前缀优先匹配。 +/// baseURL 命中这些后缀时，候选列表会追加「剥离后缀再拼 /v1/models / /models」的版本。 +const KNOWN_COMPAT_SUFFIXES: &[&str] = &[ + "/api/claudecode", + "/api/anthropic", + "/apps/anthropic", + "/api/coding", + "/claudecode", + "/anthropic", + "/step_plan", + "/coding", + "/claude", +]; + /// 获取供应商的可用模型列表 /// -/// 使用 OpenAI 兼容的 GET /v1/models 端点。 +/// 使用 OpenAI 兼容的 GET /v1/models 端点，按候选列表顺序尝试。 pub async fn fetch_models( base_url: &str, api_key: &str, is_full_url: bool, + models_url_override: Option<&str>, ) -> Result, String> { if api_key.is_empty() { return Err("API Key is required to fetch models".to_string()); } - let models_url = build_models_url(base_url, is_full_url)?; + let candidates = build_models_url_candidates(base_url, is_full_url, models_url_override)?; let client = crate::proxy::http_client::get(); + let mut last_err: Option = None; - let response = client - .get(&models_url) - .header("Authorization", format!("Bearer {api_key}")) - .timeout(Duration::from_secs(FETCH_TIMEOUT_SECS)) - .send() - .await - .map_err(|e| format!("Request failed: {e}"))?; + for url in &candidates { + log::debug!("[ModelFetch] Trying endpoint: {url}"); + let response = match client + .get(url) + .header("Authorization", format!("Bearer {api_key}")) + .timeout(Duration::from_secs(FETCH_TIMEOUT_SECS)) + .send() + .await + { + Ok(r) => r, + Err(e) => { + return Err(format!("Request failed: {e}")); + } + }; - let status = response.status(); - if !status.is_success() { - let body = response.text().await.unwrap_or_default(); + let status = response.status(); + + if status.is_success() { + let resp: ModelsResponse = response + .json() + .await + .map_err(|e| format!("Failed to parse response: {e}"))?; + + let mut models: Vec = resp + .data + .unwrap_or_default() + .into_iter() + .map(|m| FetchedModel { + id: m.id, + owned_by: m.owned_by, + }) + .collect(); + + models.sort_by(|a, b| a.id.cmp(&b.id)); + return Ok(models); + } + + if status == StatusCode::NOT_FOUND || status == StatusCode::METHOD_NOT_ALLOWED { + let body = truncate_body(response.text().await.unwrap_or_default()); + last_err = Some(format!("HTTP {status}: {body}")); + continue; + } + + let body = truncate_body(response.text().await.unwrap_or_default()); return Err(format!("HTTP {status}: {body}")); } - let resp: ModelsResponse = response - .json() - .await - .map_err(|e| format!("Failed to parse response: {e}"))?; - - let mut models: Vec = resp - .data - .unwrap_or_default() - .into_iter() - .map(|m| FetchedModel { - id: m.id, - owned_by: m.owned_by, - }) - .collect(); - - models.sort_by(|a, b| a.id.cmp(&b.id)); - Ok(models) + Err(format!( + "All candidates failed: {}", + last_err.unwrap_or_else(|| "no candidates".to_string()) + )) } -/// 构造 /v1/models 的完整 URL -fn build_models_url(base_url: &str, is_full_url: bool) -> Result { - let trimmed = base_url.trim().trim_end_matches('/'); +/// 构造「模型列表端点」的候选 URL 列表 +/// +/// 候选顺序： +/// 1. `models_url_override` 非空 → 只返回它 +/// 2. baseURL 直接拼 `/v1/models`（若已有 `/v1` 结尾则拼 `/models`） +/// 3. 若 baseURL 命中 [`KNOWN_COMPAT_SUFFIXES`]，剥离后缀再拼 `/v1/models` +/// 4. 同上，但拼 `/models`（部分站点如 DeepSeek 官方只暴露 `/models`） +/// +/// 结果已去重且保持首次出现顺序。 +pub fn build_models_url_candidates( + base_url: &str, + is_full_url: bool, + models_url_override: Option<&str>, +) -> Result, String> { + if let Some(raw) = models_url_override { + let trimmed = raw.trim(); + if !trimmed.is_empty() { + return Ok(vec![trimmed.to_string()]); + } + } + let trimmed = base_url.trim().trim_end_matches('/'); if trimmed.is_empty() { return Err("Base URL is empty".to_string()); } + let mut candidates: Vec = Vec::new(); + if is_full_url { - // 尝试从完整端点 URL 推导 API 根路径 - // 例如: https://proxy.example.com/v1/chat/completions → https://proxy.example.com/v1/models if let Some(idx) = trimmed.find("/v1/") { - return Ok(format!("{}/v1/models", &trimmed[..idx])); - } - // 如果没有 /v1/ 路径，直接去掉最后一段路径 - if let Some(idx) = trimmed.rfind('/') { + candidates.push(format!("{}/v1/models", &trimmed[..idx])); + } else if let Some(idx) = trimmed.rfind('/') { let root = &trimmed[..idx]; if root.contains("://") && root.len() > root.find("://").unwrap() + 3 { - return Ok(format!("{root}/v1/models")); + candidates.push(format!("{root}/v1/models")); } } - return Err("Cannot derive models endpoint from full URL".to_string()); + if candidates.is_empty() { + return Err("Cannot derive models endpoint from full URL".to_string()); + } + return Ok(candidates); } - // 常规情况: base_url 是 API 根路径 - // 如果已经包含 /v1 路径，直接追加 /models - if trimmed.ends_with("/v1") { - return Ok(format!("{trimmed}/models")); + let primary = if trimmed.ends_with("/v1") { + format!("{trimmed}/models") + } else { + format!("{trimmed}/v1/models") + }; + candidates.push(primary); + + if let Some(stripped) = strip_compat_suffix(trimmed) { + let root = stripped.trim_end_matches('/'); + if !root.is_empty() && root.contains("://") { + candidates.push(format!("{root}/v1/models")); + candidates.push(format!("{root}/models")); + } } - Ok(format!("{trimmed}/v1/models")) + // 候选最多 3 条，线性去重即可，不值得上 HashSet。 + let mut unique: Vec = Vec::with_capacity(candidates.len()); + for url in candidates { + if !unique.iter().any(|u| u == &url) { + unique.push(url); + } + } + + Ok(unique) +} + +/// 截断响应体到 [`ERROR_BODY_MAX_CHARS`] 字符，避免 HTML 404 页占用错误串。 +fn truncate_body(body: String) -> String { + if body.chars().count() <= ERROR_BODY_MAX_CHARS { + body + } else { + let mut s: String = body.chars().take(ERROR_BODY_MAX_CHARS).collect(); + s.push('…'); + s + } +} + +/// 若 baseURL 以任一已知兼容子路径结尾，返回剥离后的剩余部分；否则 `None`。 +/// +/// 依赖 [`KNOWN_COMPAT_SUFFIXES`] 按长度降序排列，确保最长前缀优先命中 +/// （否则 `/anthropic` 会提前匹配掉 `/api/anthropic` 的场景）。 +fn strip_compat_suffix(base_url: &str) -> Option<&str> { + for suffix in KNOWN_COMPAT_SUFFIXES { + if base_url.ends_with(*suffix) { + return Some(&base_url[..base_url.len() - suffix.len()]); + } + } + None } #[cfg(test)] @@ -114,40 +215,174 @@ mod tests { use super::*; #[test] - fn test_build_models_url_basic() { + fn test_candidates_plain_root() { + let c = build_models_url_candidates("https://api.siliconflow.cn", false, None).unwrap(); + assert_eq!(c, vec!["https://api.siliconflow.cn/v1/models"]); + } + + #[test] + fn test_candidates_trailing_slash() { + let c = build_models_url_candidates("https://api.example.com/", false, None).unwrap(); + assert_eq!(c, vec!["https://api.example.com/v1/models"]); + } + + #[test] + fn test_candidates_with_v1() { + let c = build_models_url_candidates("https://api.example.com/v1", false, None).unwrap(); + assert_eq!(c, vec!["https://api.example.com/v1/models"]); + } + + #[test] + fn test_candidates_full_url() { + let c = build_models_url_candidates( + "https://proxy.example.com/v1/chat/completions", + true, + None, + ) + .unwrap(); + assert_eq!(c, vec!["https://proxy.example.com/v1/models"]); + } + + #[test] + fn test_candidates_empty() { + assert!(build_models_url_candidates("", false, None).is_err()); + } + + #[test] + fn test_candidates_override_returns_single() { + let c = build_models_url_candidates( + "https://api.deepseek.com/anthropic", + false, + Some("https://api.deepseek.com/models"), + ) + .unwrap(); + assert_eq!(c, vec!["https://api.deepseek.com/models"]); + } + + #[test] + fn test_candidates_override_empty_falls_through() { + let c = + build_models_url_candidates("https://api.siliconflow.cn", false, Some(" ")).unwrap(); + assert_eq!(c, vec!["https://api.siliconflow.cn/v1/models"]); + } + + #[test] + fn test_candidates_deepseek_strip_anthropic() { + let c = + build_models_url_candidates("https://api.deepseek.com/anthropic", false, None).unwrap(); assert_eq!( - build_models_url("https://api.siliconflow.cn", false).unwrap(), - "https://api.siliconflow.cn/v1/models" + c, + vec![ + "https://api.deepseek.com/anthropic/v1/models", + "https://api.deepseek.com/v1/models", + "https://api.deepseek.com/models", + ] ); } #[test] - fn test_build_models_url_trailing_slash() { + fn test_candidates_zhipu_strip_api_anthropic() { + let c = build_models_url_candidates("https://open.bigmodel.cn/api/anthropic", false, None) + .unwrap(); assert_eq!( - build_models_url("https://api.example.com/", false).unwrap(), - "https://api.example.com/v1/models" + c, + vec![ + "https://open.bigmodel.cn/api/anthropic/v1/models", + "https://open.bigmodel.cn/v1/models", + "https://open.bigmodel.cn/models", + ] ); } #[test] - fn test_build_models_url_with_v1() { + fn test_candidates_bailian_strip_apps_anthropic() { + let c = build_models_url_candidates( + "https://dashscope.aliyuncs.com/apps/anthropic", + false, + None, + ) + .unwrap(); assert_eq!( - build_models_url("https://api.example.com/v1", false).unwrap(), - "https://api.example.com/v1/models" + c, + vec![ + "https://dashscope.aliyuncs.com/apps/anthropic/v1/models", + "https://dashscope.aliyuncs.com/v1/models", + "https://dashscope.aliyuncs.com/models", + ] ); } #[test] - fn test_build_models_url_full_url() { + fn test_candidates_stepfun_strip_step_plan() { + let c = + build_models_url_candidates("https://api.stepfun.com/step_plan", false, None).unwrap(); assert_eq!( - build_models_url("https://proxy.example.com/v1/chat/completions", true).unwrap(), - "https://proxy.example.com/v1/models" + c, + vec![ + "https://api.stepfun.com/step_plan/v1/models", + "https://api.stepfun.com/v1/models", + "https://api.stepfun.com/models", + ] ); } #[test] - fn test_build_models_url_empty() { - assert!(build_models_url("", false).is_err()); + fn test_candidates_doubao_strip_api_coding() { + let c = build_models_url_candidates( + "https://ark.cn-beijing.volces.com/api/coding", + false, + None, + ) + .unwrap(); + assert_eq!( + c, + vec![ + "https://ark.cn-beijing.volces.com/api/coding/v1/models", + "https://ark.cn-beijing.volces.com/v1/models", + "https://ark.cn-beijing.volces.com/models", + ] + ); + } + + #[test] + fn test_candidates_rightcode_strip_claude() { + let c = build_models_url_candidates("https://www.right.codes/claude", false, None).unwrap(); + assert_eq!( + c, + vec![ + "https://www.right.codes/claude/v1/models", + "https://www.right.codes/v1/models", + "https://www.right.codes/models", + ] + ); + } + + #[test] + fn test_candidates_longer_suffix_wins() { + // baseURL 以 /api/anthropic 结尾时，应剥离整个 /api/anthropic， + // 而不是只剥离 /anthropic（那样会得到残缺的 https://.../api 根）。 + let c = build_models_url_candidates("https://api.z.ai/api/anthropic", false, None).unwrap(); + assert_eq!( + c, + vec![ + "https://api.z.ai/api/anthropic/v1/models", + "https://api.z.ai/v1/models", + "https://api.z.ai/models", + ] + ); + } + + #[test] + fn test_candidates_no_suffix_no_strip() { + let c = build_models_url_candidates("https://openrouter.ai/api", false, None).unwrap(); + assert_eq!(c, vec!["https://openrouter.ai/api/v1/models"]); + } + + #[test] + fn test_candidates_deduplicate() { + // 虚构 case：baseURL 就是 "scheme://host"，剥不出子路径，应只有一个候选。 + let c = build_models_url_candidates("https://host.example.com", false, None).unwrap(); + assert_eq!(c.len(), 1); } #[test] diff --git a/src-tauri/src/services/provider/live.rs b/src-tauri/src/services/provider/live.rs index 21147da65..0086b2bb6 100644 --- a/src-tauri/src/services/provider/live.rs +++ b/src-tauri/src/services/provider/live.rs @@ -8,7 +8,9 @@ use serde_json::{json, Value}; use toml_edit::{DocumentMut, Item, TableLike}; use crate::app_config::AppType; -use crate::codex_config::{get_codex_auth_path, get_codex_config_path}; +use crate::codex_config::{ + get_codex_auth_path, get_codex_config_path, write_codex_live_atomic_with_stable_provider, +}; use crate::config::{delete_file, get_claude_settings_path, read_json_file, write_json_file}; use crate::database::Database; use crate::error::AppError; @@ -42,6 +44,8 @@ pub(crate) fn provider_exists_in_live_config( .map(|providers| providers.contains_key(provider_id)), AppType::OpenClaw => crate::openclaw_config::get_providers() .map(|providers| providers.contains_key(provider_id)), + AppType::Hermes => crate::hermes_config::get_providers() + .map(|providers| providers.contains_key(provider_id)), _ => Ok(false), } } @@ -345,7 +349,7 @@ fn settings_contain_common_config(app_type: &AppType, settings: &Value, snippet: } _ => false, }, - AppType::OpenCode | AppType::OpenClaw => false, + AppType::OpenCode | AppType::OpenClaw | AppType::Hermes | AppType::ClaudeDesktop => false, } } @@ -415,7 +419,9 @@ pub(crate) fn remove_common_config_from_settings( } Ok(result) } - AppType::OpenCode | AppType::OpenClaw => Ok(settings.clone()), + AppType::OpenCode | AppType::OpenClaw | AppType::Hermes | AppType::ClaudeDesktop => { + Ok(settings.clone()) + } } } @@ -470,7 +476,9 @@ fn apply_common_config_to_settings( } Ok(result) } - AppType::OpenCode | AppType::OpenClaw => Ok(settings.clone()), + AppType::OpenCode | AppType::OpenClaw | AppType::Hermes | AppType::ClaudeDesktop => { + Ok(settings.clone()) + } } } @@ -509,6 +517,16 @@ pub(crate) fn write_live_with_common_config( effective_provider.settings_config = build_effective_settings_with_common_config(db, app_type, provider)?; + if matches!(app_type, AppType::ClaudeDesktop) { + crate::claude_desktop_config::apply_provider(db, &effective_provider)?; + log::info!( + "Claude Desktop 3P profile '{}' written for provider '{}'", + crate::claude_desktop_config::PROFILE_ID, + effective_provider.id + ); + return Ok(()); + } + write_live_snapshot(app_type, &effective_provider) } @@ -526,29 +544,55 @@ pub(crate) fn strip_common_config_from_live_settings( app_type.as_str(), provider.id ); - return live_settings; + return restore_live_settings_for_provider_backfill(app_type, provider, live_settings); } }; - if !provider_uses_common_config(app_type, provider, snippet.as_deref()) { - return live_settings; - } - - let Some(snippet_text) = snippet.as_deref() else { - return live_settings; + let backfill_settings = if provider_uses_common_config(app_type, provider, snippet.as_deref()) { + match snippet.as_deref() { + Some(snippet_text) => { + match remove_common_config_from_settings(app_type, &live_settings, snippet_text) { + Ok(settings) => settings, + Err(err) => { + log::warn!( + "Failed to strip common config for {} provider '{}': {err}", + app_type.as_str(), + provider.id + ); + live_settings + } + } + } + None => live_settings, + } + } else { + live_settings }; - match remove_common_config_from_settings(app_type, &live_settings, snippet_text) { - Ok(settings) => settings, - Err(err) => { - log::warn!( - "Failed to strip common config for {} provider '{}': {err}", - app_type.as_str(), - provider.id - ); - live_settings - } + restore_live_settings_for_provider_backfill(app_type, provider, backfill_settings) +} + +fn restore_live_settings_for_provider_backfill( + app_type: &AppType, + provider: &Provider, + live_settings: Value, +) -> Value { + if !matches!(app_type, AppType::Codex) { + return live_settings; } + + let mut settings = live_settings; + if let Err(err) = crate::codex_config::restore_codex_settings_config_model_provider_for_backfill( + &mut settings, + &provider.settings_config, + ) { + log::warn!( + "Failed to restore Codex provider id while backfilling '{}': {err}", + provider.id + ); + } + + settings } pub(crate) fn normalize_provider_common_config_for_storage( @@ -669,6 +713,13 @@ pub(crate) fn write_live_snapshot(app_type: &AppType, provider: &Provider) -> Re let settings = sanitize_claude_settings_for_live(&provider.settings_config); write_json_file(&path, &settings)?; } + AppType::ClaudeDesktop => { + return Err(AppError::localized( + "claude_desktop.live.requires_db_context", + "Claude Desktop 配置写入需要通过供应商切换流程执行", + "Claude Desktop configuration must be written through the provider switch flow", + )); + } AppType::Codex => { let obj = provider .settings_config @@ -681,10 +732,7 @@ pub(crate) fn write_live_snapshot(app_type: &AppType, provider: &Provider) -> Re AppError::Config("Codex 供应商配置缺少 'config' 字段或不是字符串".to_string()) })?; - let auth_path = get_codex_auth_path(); - write_json_file(&auth_path, auth)?; - let config_path = get_codex_config_path(); - std::fs::write(&config_path, config_str).map_err(|e| AppError::io(&config_path, e))?; + write_codex_live_atomic_with_stable_provider(auth, Some(config_str))?; } AppType::Gemini => { // Delegate to write_gemini_live which handles env file writing correctly @@ -790,6 +838,10 @@ pub(crate) fn write_live_snapshot(app_type: &AppType, provider: &Provider) -> Re } } } + AppType::Hermes => { + crate::hermes_config::set_provider(&provider.id, provider.settings_config.clone())?; + log::debug!("Hermes provider '{}' written to live config", provider.id); + } } Ok(()) } @@ -922,6 +974,11 @@ pub fn read_live_settings(app_type: AppType) -> Result { } read_json_file(&path) } + AppType::ClaudeDesktop => Err(AppError::localized( + "claude_desktop.live.read_unsupported", + "Claude Desktop 3P 配置不支持作为通用 live 配置导入，请使用“从 Claude 导入兼容供应商”。", + "Claude Desktop 3P configuration cannot be imported as a generic live config. Use 'Import compatible providers from Claude' instead.", + )), AppType::Gemini => { use crate::gemini_config::{ env_to_json, get_gemini_env_path, get_gemini_settings_path, read_gemini_env, @@ -985,6 +1042,19 @@ pub fn read_live_settings(app_type: AppType) -> Result { let config = read_openclaw_config()?; Ok(config) } + AppType::Hermes => { + let config_path = crate::hermes_config::get_hermes_config_path(); + if !config_path.exists() { + return Err(AppError::localized( + "hermes.config.missing", + "Hermes 配置文件不存在", + "Hermes configuration file not found", + )); + } + let yaml_config = crate::hermes_config::read_hermes_config()?; + let config = crate::hermes_config::yaml_to_json(&yaml_config)?; + Ok(config) + } } } @@ -1034,6 +1104,13 @@ pub fn import_default_config(state: &AppState, app_type: AppType) -> Result { + return Err(AppError::localized( + "claude_desktop.import_unsupported", + "Claude Desktop 3P 配置不能通过通用导入读取，请使用“从 Claude 导入兼容供应商”。", + "Claude Desktop 3P config cannot be imported through the generic import flow. Use 'Import compatible providers from Claude' instead.", + )); + } AppType::Gemini => { use crate::gemini_config::{ env_to_json, get_gemini_env_path, get_gemini_settings_path, read_gemini_env, @@ -1067,8 +1144,8 @@ pub fn import_default_config(state: &AppState, app_type: AppType) -> Result { + // OpenCode, OpenClaw and Hermes use additive mode and are handled by early return above + AppType::OpenCode | AppType::OpenClaw | AppType::Hermes => { unreachable!("additive mode apps are handled by early return") } }; @@ -1085,10 +1162,27 @@ pub fn import_default_config(state: &AppState, app_type: AppType) -> Result Result { + if app_type.is_additive_mode() { + return Ok(false); + } + + Ok(!state.db.has_any_provider_for_app(app_type.as_str())?) +} + /// Write Gemini live configuration with authentication handling pub(crate) fn write_gemini_live(provider: &Provider) -> Result<(), AppError> { use crate::gemini_config::{ @@ -1316,6 +1410,74 @@ pub fn import_openclaw_providers_from_live(state: &AppState) -> Result Result { + use crate::hermes_config; + + let providers = hermes_config::get_providers()?; + if providers.is_empty() { + return Ok(0); + } + + let mut imported = 0; + let existing_ids = state.db.get_provider_ids("hermes")?; + + for (name, config) in providers { + // Validate: skip entries with empty name + if name.trim().is_empty() { + log::warn!("Skipping Hermes provider with empty name"); + continue; + } + + // Skip if already exists in database + if existing_ids.contains(&name) { + log::debug!("Hermes provider '{name}' already exists in database, skipping"); + continue; + } + + // Create provider + let mut provider = Provider::with_id(name.clone(), name.clone(), config, None); + provider.meta = Some(crate::provider::ProviderMeta { + live_config_managed: Some(true), + ..Default::default() + }); + + // Save to database + if let Err(e) = state.db.save_provider("hermes", &provider) { + log::warn!("Failed to import Hermes provider '{name}': {e}"); + continue; + } + + imported += 1; + log::info!("Imported Hermes provider '{name}' from live config"); + } + + Ok(imported) +} + +/// Remove a Hermes provider from live config +/// +/// This removes a specific provider from ~/.hermes/config.yaml +/// without affecting other providers in the file. +pub fn remove_hermes_provider_from_live(provider_id: &str) -> Result<(), AppError> { + use crate::hermes_config; + + // Check if Hermes config directory exists + if !hermes_config::get_hermes_dir().exists() { + log::debug!("Hermes config directory doesn't exist, skipping removal of '{provider_id}'"); + return Ok(()); + } + + hermes_config::remove_provider(provider_id)?; + log::info!("Hermes provider '{provider_id}' removed from live config"); + + Ok(()) +} + /// Remove an OpenClaw provider from live config /// /// This removes a specific provider from ~/.openclaw/openclaw.json diff --git a/src-tauri/src/services/provider/mod.rs b/src-tauri/src/services/provider/mod.rs index d16f18089..64c6120b0 100644 --- a/src-tauri/src/services/provider/mod.rs +++ b/src-tauri/src/services/provider/mod.rs @@ -21,8 +21,9 @@ use crate::store::AppState; // Re-export sub-module functions for external access pub use live::{ - import_default_config, import_openclaw_providers_from_live, - import_opencode_providers_from_live, read_live_settings, sync_current_to_live, + import_default_config, import_hermes_providers_from_live, import_openclaw_providers_from_live, + import_opencode_providers_from_live, read_live_settings, + should_import_default_config_on_startup, sync_current_to_live, }; // Internal re-exports (pub(crate)) @@ -35,7 +36,8 @@ pub(crate) use live::{ // Internal re-exports use live::{ - remove_openclaw_provider_from_live, remove_opencode_provider_from_live, write_gemini_live, + remove_hermes_provider_from_live, remove_openclaw_provider_from_live, + remove_opencode_provider_from_live, write_gemini_live, }; use usage::validate_usage_script; @@ -1282,6 +1284,7 @@ impl ProviderService { match app_type { AppType::OpenCode => remove_opencode_provider_from_live(id)?, AppType::OpenClaw => remove_openclaw_provider_from_live(id)?, + AppType::Hermes => remove_hermes_provider_from_live(id)?, _ => {} } } @@ -1344,6 +1347,9 @@ impl ProviderService { AppType::OpenClaw => { remove_openclaw_provider_from_live(id)?; } + AppType::Hermes => { + remove_hermes_provider_from_live(id)?; + } _ => { return Err(AppError::Message(format!( "App {} does not support remove from live config", @@ -1391,6 +1397,10 @@ impl ProviderService { return Self::switch_normal(state, app_type, id, &providers); } + if matches!(app_type, AppType::ClaudeDesktop) { + return Self::switch_normal(state, app_type, id, &providers); + } + // Check if proxy takeover mode is active AND proxy server is actually running // Both conditions must be true to use hot-switch mode // Use blocking wait since this is a sync function @@ -1518,6 +1528,25 @@ impl ProviderService { // Sync to live (write_gemini_live handles security flag internally for Gemini) write_live_with_common_config(state.db.as_ref(), &app_type, provider)?; + // Hermes is additive, so "switching" doesn't overwrite a live config file + // — we instead update the top-level `model:` section to point at this + // provider's first declared model. Without this, clicking "switch" would + // only shuffle entries in custom_providers[] while Hermes keeps using + // whatever `model.provider` was set before. + if matches!(app_type, AppType::Hermes) { + if let Err(e) = + crate::hermes_config::apply_switch_defaults(&provider.id, &provider.settings_config) + { + log::warn!( + "Failed to update Hermes model defaults after switching to '{}': {e}", + provider.id + ); + result + .warnings + .push(format!("hermes_model_defaults_failed:{}", provider.id)); + } + } + // For additive-mode providers that were DB-only (live_config_managed == Some(false)), // flip the flag to true now that the provider has been successfully written to the live // file. This ensures sync_all_providers_to_live() will include it on future syncs. @@ -1532,6 +1561,7 @@ impl ProviderService { let rollback_result = match app_type { AppType::OpenCode => remove_opencode_provider_from_live(&provider.id), AppType::OpenClaw => remove_openclaw_provider_from_live(&provider.id), + AppType::Hermes => remove_hermes_provider_from_live(&provider.id), _ => Ok(()), }; @@ -1704,10 +1734,12 @@ impl ProviderService { match app_type { AppType::Claude => Self::extract_claude_common_config(&provider.settings_config), + AppType::ClaudeDesktop => Ok(String::new()), AppType::Codex => Self::extract_codex_common_config(&provider.settings_config), AppType::Gemini => Self::extract_gemini_common_config(&provider.settings_config), AppType::OpenCode => Self::extract_opencode_common_config(&provider.settings_config), AppType::OpenClaw => Self::extract_openclaw_common_config(&provider.settings_config), + AppType::Hermes => Ok(String::new()), // Hermes doesn't use common config snippets } } @@ -1718,10 +1750,12 @@ impl ProviderService { ) -> Result { match app_type { AppType::Claude => Self::extract_claude_common_config(settings_config), + AppType::ClaudeDesktop => Ok(String::new()), AppType::Codex => Self::extract_codex_common_config(settings_config), AppType::Gemini => Self::extract_gemini_common_config(settings_config), AppType::OpenCode => Self::extract_opencode_common_config(settings_config), AppType::OpenClaw => Self::extract_openclaw_common_config(settings_config), + AppType::Hermes => Ok(String::new()), // Hermes doesn't use common config snippets } } @@ -1734,9 +1768,9 @@ impl ProviderService { // Auth "ANTHROPIC_API_KEY", "ANTHROPIC_AUTH_TOKEN", - // Models (5 fields) + // Models (4 fields + 1 legacy) "ANTHROPIC_MODEL", - "ANTHROPIC_REASONING_MODEL", + "ANTHROPIC_REASONING_MODEL", // legacy: 已废弃，但旧配置可能残留 "ANTHROPIC_DEFAULT_HAIKU_MODEL", "ANTHROPIC_DEFAULT_OPUS_MODEL", "ANTHROPIC_DEFAULT_SONNET_MODEL", @@ -1906,6 +1940,13 @@ impl ProviderService { import_default_config(state, app_type) } + pub fn should_import_default_config_on_startup( + state: &AppState, + app_type: &AppType, + ) -> Result { + should_import_default_config_on_startup(state, app_type) + } + /// Read current live settings (re-export) pub fn read_live_settings(app_type: AppType) -> Result { read_live_settings(app_type) @@ -2021,6 +2062,9 @@ impl ProviderService { )); } } + AppType::ClaudeDesktop => { + crate::claude_desktop_config::validate_provider(provider)?; + } AppType::Codex => { let settings = provider.settings_config.as_object().ok_or_else(|| { AppError::localized( @@ -2087,6 +2131,16 @@ impl ProviderService { )); } } + AppType::Hermes => { + // Hermes: accept any JSON object for now + if !provider.settings_config.is_object() { + return Err(AppError::localized( + "provider.hermes.settings.not_object", + "Hermes 配置必须是 JSON 对象", + "Hermes configuration must be a JSON object", + )); + } + } } // Validate and clean UsageScript configuration (common for all app types) @@ -2145,6 +2199,11 @@ impl ProviderService { Ok((api_key, base_url)) } + AppType::ClaudeDesktop => { + let credentials = + crate::claude_desktop_config::direct_gateway_credentials(provider)?; + Ok((credentials.api_key, credentials.base_url)) + } AppType::Codex => { let auth = provider .settings_config @@ -2258,8 +2317,8 @@ impl ProviderService { Ok((api_key, base_url)) } - AppType::OpenClaw => { - // OpenClaw uses apiKey and baseUrl directly on the object + AppType::OpenClaw | AppType::Hermes => { + // OpenClaw/Hermes use apiKey and baseUrl directly on the object let api_key = provider .settings_config .get("apiKey") diff --git a/src-tauri/src/services/proxy.rs b/src-tauri/src/services/proxy.rs index 267d71ca7..8ef08c198 100644 --- a/src-tauri/src/services/proxy.rs +++ b/src-tauri/src/services/proxy.rs @@ -27,7 +27,7 @@ const PROXY_TOKEN_PLACEHOLDER: &str = "PROXY_MANAGED"; /// Claude Code 会继续以旧模型名发起请求，导致新供应商不支持时失败。 const CLAUDE_MODEL_OVERRIDE_ENV_KEYS: [&str; 6] = [ "ANTHROPIC_MODEL", - "ANTHROPIC_REASONING_MODEL", + "ANTHROPIC_REASONING_MODEL", // legacy: 已废弃，但旧配置可能残留 "ANTHROPIC_DEFAULT_HAIKU_MODEL", "ANTHROPIC_DEFAULT_SONNET_MODEL", "ANTHROPIC_DEFAULT_OPUS_MODEL", @@ -466,14 +466,7 @@ impl ProxyService { AppType::Claude => self.read_claude_live()?, AppType::Codex => self.read_codex_live()?, AppType::Gemini => self.read_gemini_live()?, - AppType::OpenCode => { - // OpenCode doesn't support proxy features - return Err("OpenCode 不支持代理功能".to_string()); - } - AppType::OpenClaw => { - // OpenClaw doesn't support proxy features - return Err("OpenClaw 不支持代理功能".to_string()); - } + _ => return Err("该应用不支持代理功能".to_string()), }; self.sync_live_config_to_provider(app_type, &live_config) @@ -687,12 +680,7 @@ impl ProxyService { } } } - AppType::OpenCode => { - // OpenCode doesn't support proxy features, skip silently - } - AppType::OpenClaw => { - // OpenClaw doesn't support proxy features, skip silently - } + _ => {} } Ok(()) @@ -871,14 +859,7 @@ impl ProxyService { AppType::Claude => ("claude", self.read_claude_live()?), AppType::Codex => ("codex", self.read_codex_live()?), AppType::Gemini => ("gemini", self.read_gemini_live()?), - AppType::OpenCode => { - // OpenCode doesn't support proxy features - return Err("OpenCode 不支持代理功能".to_string()); - } - AppType::OpenClaw => { - // OpenClaw doesn't support proxy features - return Err("OpenClaw 不支持代理功能".to_string()); - } + _ => return Err("该应用不支持代理功能".to_string()), }; let json_str = serde_json::to_string(&config) @@ -1019,14 +1000,7 @@ impl ProxyService { self.write_gemini_live(&live_config)?; log::info!("Gemini Live 配置已接管，代理地址: {proxy_url}"); } - AppType::OpenCode => { - // OpenCode doesn't support proxy features - return Err("OpenCode 不支持代理功能".to_string()); - } - AppType::OpenClaw => { - // OpenClaw doesn't support proxy features - return Err("OpenClaw 不支持代理功能".to_string()); - } + _ => return Err("该应用不支持代理功能".to_string()), } Ok(()) @@ -1076,12 +1050,7 @@ impl ProxyService { let _ = self.write_gemini_live(&live_config); } } - AppType::OpenCode => { - // OpenCode doesn't support proxy features, skip silently - } - AppType::OpenClaw => { - // OpenClaw doesn't support proxy features, skip silently - } + _ => {} } Ok(()) @@ -1119,12 +1088,7 @@ impl ProxyService { log::info!("Gemini Live 配置已恢复"); } } - AppType::OpenCode => { - // OpenCode doesn't support proxy features, skip silently - } - AppType::OpenClaw => { - // OpenClaw doesn't support proxy features, skip silently - } + _ => {} } Ok(()) @@ -1213,14 +1177,7 @@ impl ProxyService { AppType::Claude => self.write_claude_live(config), AppType::Codex => self.write_codex_live(config), AppType::Gemini => self.write_gemini_live(config), - AppType::OpenCode => { - // OpenCode doesn't support proxy features - Err("OpenCode 不支持代理功能".to_string()) - } - AppType::OpenClaw => { - // OpenClaw doesn't support proxy features - Err("OpenClaw 不支持代理功能".to_string()) - } + _ => Err("该应用不支持代理功能".to_string()), } } @@ -1238,14 +1195,7 @@ impl ProxyService { Ok(config) => Self::is_gemini_live_taken_over(&config), Err(_) => false, }, - AppType::OpenCode => { - // OpenCode doesn't support proxy takeover - false - } - AppType::OpenClaw => { - // OpenClaw doesn't support proxy takeover - false - } + _ => false, } } @@ -1285,14 +1235,7 @@ impl ProxyService { AppType::Claude => self.cleanup_claude_takeover_placeholders_in_live(), AppType::Codex => self.cleanup_codex_takeover_placeholders_in_live(), AppType::Gemini => self.cleanup_gemini_takeover_placeholders_in_live(), - AppType::OpenCode => { - // OpenCode doesn't support proxy features - Ok(()) - } - AppType::OpenClaw => { - // OpenClaw doesn't support proxy features - Ok(()) - } + _ => Ok(()), } } @@ -1509,20 +1452,33 @@ impl ProxyService { .map_err(|e| format!("构建 {app_type} 有效配置失败: {e}"))?; if matches!(app_type_enum, AppType::Codex) { - let existing_backup = self + let existing_backup_value = self .db .get_live_backup(app_type) .await - .map_err(|e| format!("读取 {app_type} 现有备份失败: {e}"))?; + .map_err(|e| format!("读取 {app_type} 现有备份失败: {e}"))? + .map(|backup| { + serde_json::from_str::(&backup.original_config) + .map_err(|e| format!("解析 {app_type} 现有备份失败: {e}")) + }) + .transpose()?; - if let Some(existing_backup) = existing_backup { - let existing_value: Value = serde_json::from_str(&existing_backup.original_config) - .map_err(|e| format!("解析 {app_type} 现有备份失败: {e}"))?; + if let Some(existing_value) = existing_backup_value.as_ref() { Self::preserve_codex_mcp_servers_in_backup( &mut effective_settings, - &existing_value, + existing_value, )?; } + + let anchor_config_text = existing_backup_value + .as_ref() + .and_then(|value| value.get("config")) + .and_then(|value| value.as_str()); + crate::codex_config::normalize_codex_settings_config_model_provider( + &mut effective_settings, + anchor_config_text, + ) + .map_err(|e| format!("归一化 Codex restore backup 失败: {e}"))?; } let backup_json = match app_type_enum { @@ -1540,9 +1496,7 @@ impl ProxyService { serde_json::to_string(&env_backup) .map_err(|e| format!("序列化 Gemini 配置失败: {e}"))? } - AppType::OpenCode | AppType::OpenClaw => { - return Err(format!("未知的应用类型: {app_type}")); - } + _ => return Err(format!("未知的应用类型: {app_type}")), }; self.db @@ -1782,6 +1736,8 @@ impl ProxyService { let auth = config.get("auth"); let config_str = config.get("config").and_then(|v| v.as_str()); + // Proxy restore writes saved live backups verbatim. Provider-driven writes go + // through write_live_with_common_config(), which normalizes Codex provider ids. match (auth, config_str) { (Some(auth), Some(cfg)) => write_codex_live_atomic(auth, Some(cfg)) .map_err(|e| format!("写入 Codex 配置失败: {e}"))?, @@ -2726,6 +2682,147 @@ base_url = "https://new.example/v1" ); } + #[tokio::test] + #[serial] + async fn hot_switch_codex_provider_keeps_model_provider_stable_in_backup_and_restore() { + let _home = TempHome::new(); + crate::settings::reload_settings().expect("reload settings"); + + let db = Arc::new(Database::memory().expect("init db")); + let service = ProxyService::new(db.clone()); + + let provider_a = Provider::with_id( + "a".to_string(), + "RightCode".to_string(), + json!({ + "auth": { + "OPENAI_API_KEY": "rightcode-key" + }, + "config": r#"model_provider = "rightcode" +model = "gpt-5.4" + +[model_providers.rightcode] +name = "RightCode" +base_url = "https://rightcode.example/v1" +wire_api = "responses" +requires_openai_auth = true +"# + }), + None, + ); + let provider_b = Provider::with_id( + "b".to_string(), + "AiHubMix".to_string(), + json!({ + "auth": { + "OPENAI_API_KEY": "aihubmix-key" + }, + "config": r#"model_provider = "aihubmix" +model = "gpt-5.4" + +[model_providers.aihubmix] +name = "AiHubMix" +base_url = "https://aihubmix.example/v1" +wire_api = "responses" +requires_openai_auth = true +"# + }), + None, + ); + + db.save_provider("codex", &provider_a) + .expect("save provider a"); + db.save_provider("codex", &provider_b) + .expect("save provider b"); + db.set_current_provider("codex", "a") + .expect("set current provider"); + crate::settings::set_current_provider(&AppType::Codex, Some("a")) + .expect("set local current provider"); + db.save_live_backup( + "codex", + &serde_json::to_string(&provider_a.settings_config).expect("serialize provider a"), + ) + .await + .expect("seed live backup"); + service + .write_codex_live(&json!({ + "auth": { + "OPENAI_API_KEY": PROXY_TOKEN_PLACEHOLDER + }, + "config": r#"model_provider = "rightcode" +model = "gpt-5.4" + +[model_providers.rightcode] +name = "RightCode" +base_url = "http://127.0.0.1:15721/v1" +wire_api = "responses" +requires_openai_auth = true +"# + })) + .expect("seed taken-over Codex live config"); + + service + .hot_switch_provider("codex", "b") + .await + .expect("hot switch Codex provider"); + + let backup = db + .get_live_backup("codex") + .await + .expect("get live backup") + .expect("backup exists"); + let stored: Value = + serde_json::from_str(&backup.original_config).expect("parse backup json"); + let backup_config = stored + .get("config") + .and_then(|v| v.as_str()) + .expect("backup config string"); + let parsed_backup: toml::Value = + toml::from_str(backup_config).expect("parse backup config"); + assert_eq!( + parsed_backup.get("model_provider").and_then(|v| v.as_str()), + Some("rightcode"), + "provider-derived restore backup should retain stable Codex model_provider" + ); + let backup_model_providers = parsed_backup + .get("model_providers") + .and_then(|v| v.as_table()) + .expect("backup model_providers"); + assert!(backup_model_providers.get("aihubmix").is_none()); + assert_eq!( + backup_model_providers + .get("rightcode") + .and_then(|v| v.get("base_url")) + .and_then(|v| v.as_str()), + Some("https://aihubmix.example/v1"), + "stable provider id should point at the hot-switched provider endpoint" + ); + + service + .restore_live_config_for_app_with_fallback(&AppType::Codex) + .await + .expect("restore Codex live config"); + + let live = service.read_codex_live().expect("read Codex live config"); + let live_config = live + .get("config") + .and_then(|v| v.as_str()) + .expect("live config string"); + let parsed_live: toml::Value = toml::from_str(live_config).expect("parse live config"); + assert_eq!( + parsed_live.get("model_provider").and_then(|v| v.as_str()), + Some("rightcode"), + "restored Codex live config should not switch history buckets" + ); + assert_eq!( + live.get("auth") + .and_then(|auth| auth.get("OPENAI_API_KEY")) + .and_then(|v| v.as_str()), + Some("aihubmix-key"), + "restore should still use the hot-switched provider auth" + ); + } + #[tokio::test] #[serial] async fn update_live_backup_from_provider_keeps_new_codex_mcp_entries_on_conflict() { diff --git a/src-tauri/src/services/session_usage.rs b/src-tauri/src/services/session_usage.rs index 2b9c5af9f..5f9f0f618 100644 --- a/src-tauri/src/services/session_usage.rs +++ b/src-tauri/src/services/session_usage.rs @@ -13,6 +13,9 @@ use crate::database::{lock_conn, Database}; use crate::error::AppError; use crate::proxy::usage::calculator::{CostCalculator, ModelPricing}; use crate::proxy::usage::parser::TokenUsage; +use crate::services::usage_stats::{ + effective_usage_log_filter, should_skip_session_insert, DedupKey, +}; use rust_decimal::Decimal; use serde::{Deserialize, Serialize}; use std::collections::HashMap; @@ -305,8 +308,10 @@ fn sync_single_file(db: &Database, file_path: &Path) -> Result<(u32, u32), AppEr Ok((imported, skipped)) } -/// 获取文件的同步状态 -fn get_sync_state(db: &Database, file_path: &str) -> Result<(i64, i64), AppError> { +/// 获取 session_log_sync 表中某条目的同步进度。 +/// +/// Shared by all session_usage_* parsers. +pub(crate) fn get_sync_state(db: &Database, file_path: &str) -> Result<(i64, i64), AppError> { let conn = lock_conn!(db.conn); let result = conn.query_row( "SELECT last_modified, last_line_offset FROM session_log_sync WHERE file_path = ?1", @@ -316,8 +321,10 @@ fn get_sync_state(db: &Database, file_path: &str) -> Result<(i64, i64), AppError Ok(result.unwrap_or((0, 0))) } -/// 更新文件的同步状态 -fn update_sync_state( +/// 更新 session_log_sync 表中某条目的同步进度。 +/// +/// Shared by all session_usage_* parsers. +pub(crate) fn update_sync_state( db: &Database, file_path: &str, last_modified: i64, @@ -346,25 +353,10 @@ fn insert_session_log_entry( ) -> Result { let conn = lock_conn!(db.conn); - // 检查是否已存在 - let exists: bool = conn - .query_row( - "SELECT COUNT(*) FROM proxy_request_logs WHERE request_id = ?1", - rusqlite::params![request_id], - |row| row.get::<_, i64>(0).map(|c| c > 0), - ) - .unwrap_or(false); - - if exists { - return Ok(false); - } - - // 解析时间戳 let created_at = msg .timestamp .as_ref() .and_then(|ts| { - // 尝试解析 ISO 8601 时间戳 chrono::DateTime::parse_from_rfc3339(ts) .ok() .map(|dt| dt.timestamp()) @@ -376,6 +368,19 @@ fn insert_session_log_entry( .unwrap_or(0) }); + let dedup_key = DedupKey { + app_type: "claude", + model: &msg.model, + input_tokens: msg.input_tokens, + output_tokens: msg.output_tokens, + cache_read_tokens: msg.cache_read_tokens, + cache_creation_tokens: msg.cache_creation_tokens, + created_at, + }; + if should_skip_session_insert(&conn, request_id, &dedup_key)? { + return Ok(false); + } + // 计算费用 let usage = TokenUsage { input_tokens: msg.input_tokens, @@ -531,13 +536,17 @@ fn try_find_pricing( pub fn get_data_source_breakdown(db: &Database) -> Result, AppError> { let conn = lock_conn!(db.conn); - let mut stmt = conn.prepare( - "SELECT COALESCE(data_source, 'proxy') as ds, COUNT(*) as cnt, - COALESCE(SUM(CAST(total_cost_usd AS REAL)), 0) as cost - FROM proxy_request_logs + let effective_filter = effective_usage_log_filter("l"); + let sql = format!( + "SELECT COALESCE(l.data_source, 'proxy') as ds, COUNT(*) as cnt, + COALESCE(SUM(CAST(l.total_cost_usd AS REAL)), 0) as cost + FROM proxy_request_logs l + WHERE {effective_filter} GROUP BY ds - ORDER BY cnt DESC", - )?; + ORDER BY cnt DESC" + ); + + let mut stmt = conn.prepare(&sql)?; let rows = stmt.query_map([], |row| { Ok(DataSourceSummary { @@ -636,4 +645,58 @@ mod tests { messages.insert("msg_1".to_string(), final_entry); assert_eq!(messages.get("msg_1").unwrap().output_tokens, 1349); } + + #[test] + fn test_insert_claude_session_skips_matching_proxy_log() -> Result<(), AppError> { + let db = Database::memory()?; + { + let conn = lock_conn!(db.conn); + conn.execute( + "INSERT INTO proxy_request_logs ( + request_id, provider_id, app_type, model, request_model, + input_tokens, output_tokens, cache_read_tokens, cache_creation_tokens, + total_cost_usd, latency_ms, status_code, created_at, data_source + ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + rusqlite::params![ + "proxy-different-id", + "openai-compatible", + "claude", + "claude-sonnet-4-5", + "claude-sonnet-4-5", + 100, + 20, + 10, + 5, + "0.10", + 100, + 200, + 1000, + "proxy" + ], + )?; + } + + let msg = ParsedAssistantUsage { + message_id: "msg_1".to_string(), + model: "claude-sonnet-4-5".to_string(), + input_tokens: 100, + output_tokens: 20, + cache_read_tokens: 10, + cache_creation_tokens: 5, + stop_reason: Some("end_turn".to_string()), + timestamp: Some("1970-01-01T00:16:45Z".to_string()), + session_id: Some("session-1".to_string()), + }; + + let inserted = insert_session_log_entry(&db, "session:msg_1", &msg)?; + assert!(!inserted); + + let conn = lock_conn!(db.conn); + let count: i64 = conn.query_row("SELECT COUNT(*) FROM proxy_request_logs", [], |row| { + row.get(0) + })?; + assert_eq!(count, 1); + + Ok(()) + } } diff --git a/src-tauri/src/services/session_usage_codex.rs b/src-tauri/src/services/session_usage_codex.rs index 8360c7ecf..ee7d1bcff 100644 --- a/src-tauri/src/services/session_usage_codex.rs +++ b/src-tauri/src/services/session_usage_codex.rs @@ -18,7 +18,8 @@ use crate::database::{lock_conn, Database}; use crate::error::AppError; use crate::proxy::usage::calculator::{CostCalculator, ModelPricing}; use crate::proxy::usage::parser::TokenUsage; -use crate::services::session_usage::SessionSyncResult; +use crate::services::session_usage::{get_sync_state, update_sync_state, SessionSyncResult}; +use crate::services::usage_stats::{should_skip_session_insert, DedupKey}; use rust_decimal::Decimal; use std::fs; use std::io::{BufRead, BufReader}; @@ -171,7 +172,7 @@ pub fn sync_codex_usage(db: &Database) -> Result { if result.imported > 0 { log::info!( - "[CODEX-SYNC] 同步完成: 导入 {} 条, 跳过 {} 条, ��描 {} 个文件", + "[CODEX-SYNC] 同步完成: 导入 {} 条, 跳过 {} 条, 扫描 {} 个文件", result.imported, result.skipped, result.files_scanned @@ -185,7 +186,7 @@ pub fn sync_codex_usage(db: &Database) -> Result { fn collect_codex_session_files(codex_dir: &Path) -> Vec { let mut files = Vec::new(); - // 1. 扫描 sessions/YYYY/MM/DD/*.jsonl（日期分区目录�� + // 1. 扫描 sessions/YYYY/MM/DD/*.jsonl（日期分区目录） let sessions_dir = codex_dir.join("sessions"); if sessions_dir.is_dir() { collect_jsonl_recursive(&sessions_dir, &mut files, 0, 3); @@ -224,13 +225,13 @@ fn collect_jsonl_recursive(dir: &Path, files: &mut Vec, depth: u32, max } } -/// 同步单�� Codex JSONL 文件，返回 (imported, skipped) +/// 同步单个 Codex JSONL 文件，返回 (imported, skipped) fn sync_single_codex_file(db: &Database, file_path: &Path) -> Result<(u32, u32), AppError> { let file_path_str = file_path.to_string_lossy().to_string(); // 获取文件元数据 let metadata = fs::metadata(file_path) - .map_err(|e| AppError::Config(format!("无法读取文���元数据: {e}")))?; + .map_err(|e| AppError::Config(format!("无法读取文件元数据: {e}")))?; let file_modified = metadata .modified() .ok() @@ -333,7 +334,7 @@ fn sync_single_codex_file(db: &Database, file_path: &Path) -> Result<(u32, u32), let info = match payload.get("info") { Some(i) if !i.is_null() => i, - _ => continue, // info 为 null 的首个事件跳�� + _ => continue, // 跳过 info 为 null 的首个事件 }; // 提取模型（token_count 事件也可能携带 model） @@ -438,20 +439,6 @@ fn insert_codex_session_entry( ) -> Result { let conn = lock_conn!(db.conn); - // 检查是否已存在 - let exists: bool = conn - .query_row( - "SELECT COUNT(*) FROM proxy_request_logs WHERE request_id = ?1", - rusqlite::params![request_id], - |row| row.get::<_, i64>(0).map(|c| c > 0), - ) - .unwrap_or(false); - - if exists { - return Ok(false); - } - - // 解析时间戳 let created_at = timestamp .and_then(|ts| { chrono::DateTime::parse_from_rfc3339(ts) @@ -465,6 +452,19 @@ fn insert_codex_session_entry( .unwrap_or(0) }); + let dedup_key = DedupKey { + app_type: "codex", + model, + input_tokens: delta.input, + output_tokens: delta.output, + cache_read_tokens: delta.cached_input, + cache_creation_tokens: 0, + created_at, + }; + if should_skip_session_insert(&conn, request_id, &dedup_key)? { + return Ok(false); + } + // 计算费用 let usage = TokenUsage { input_tokens: delta.input, @@ -538,40 +538,7 @@ fn insert_codex_session_entry( Ok(true) } -/// 获取文件的同步状态 -fn get_sync_state(db: &Database, file_path: &str) -> Result<(i64, i64), AppError> { - let conn = lock_conn!(db.conn); - let result = conn.query_row( - "SELECT last_modified, last_line_offset FROM session_log_sync WHERE file_path = ?1", - rusqlite::params![file_path], - |row| Ok((row.get::<_, i64>(0)?, row.get::<_, i64>(1)?)), - ); - Ok(result.unwrap_or((0, 0))) -} - -/// 更新文件的同步状态 -fn update_sync_state( - db: &Database, - file_path: &str, - last_modified: i64, - last_offset: i64, -) -> Result<(), AppError> { - let now = SystemTime::now() - .duration_since(SystemTime::UNIX_EPOCH) - .map(|d| d.as_secs() as i64) - .unwrap_or(0); - - let conn = lock_conn!(db.conn); - conn.execute( - "INSERT OR REPLACE INTO session_log_sync (file_path, last_modified, last_line_offset, last_synced_at) - VALUES (?1, ?2, ?3, ?4)", - rusqlite::params![file_path, last_modified, last_offset, now], - ) - .map_err(|e| AppError::Database(format!("更新同步状态失败: {e}")))?; - Ok(()) -} - -/// ��找 Codex 模型定价（带归一化） +/// 查找 Codex 模型定价（带归一化） fn find_codex_pricing(conn: &rusqlite::Connection, model_id: &str) -> Option { let normalized = normalize_codex_model(model_id); @@ -733,6 +700,60 @@ mod tests { assert!(files.is_empty()); } + #[test] + fn test_insert_codex_session_skips_matching_proxy_log() -> Result<(), AppError> { + let db = Database::memory()?; + { + let conn = lock_conn!(db.conn); + conn.execute( + "INSERT INTO proxy_request_logs ( + request_id, provider_id, app_type, model, request_model, + input_tokens, output_tokens, cache_read_tokens, cache_creation_tokens, + total_cost_usd, latency_ms, status_code, created_at, data_source + ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + rusqlite::params![ + "codex-proxy", + "openai", + "codex", + "gpt-5.4", + "gpt-5.4", + 10, + 2, + 1, + 7, + "0.01", + 100, + 200, + 1000, + "proxy" + ], + )?; + } + + let delta = DeltaTokens { + input: 10, + cached_input: 1, + output: 2, + }; + let inserted = insert_codex_session_entry( + &db, + "codex-session-dup", + &delta, + "gpt-5.4", + Some("session-1"), + Some("1970-01-01T00:16:45Z"), + )?; + assert!(!inserted); + + let conn = lock_conn!(db.conn); + let count: i64 = conn.query_row("SELECT COUNT(*) FROM proxy_request_logs", [], |row| { + row.get(0) + })?; + assert_eq!(count, 1); + + Ok(()) + } + // ── 模型名归一化测试 ── #[test] diff --git a/src-tauri/src/services/session_usage_gemini.rs b/src-tauri/src/services/session_usage_gemini.rs index 24ff25c37..ef68d20da 100644 --- a/src-tauri/src/services/session_usage_gemini.rs +++ b/src-tauri/src/services/session_usage_gemini.rs @@ -18,7 +18,8 @@ use crate::error::AppError; use crate::gemini_config::get_gemini_dir; use crate::proxy::usage::calculator::{CostCalculator, ModelPricing}; use crate::proxy::usage::parser::TokenUsage; -use crate::services::session_usage::SessionSyncResult; +use crate::services::session_usage::{get_sync_state, update_sync_state, SessionSyncResult}; +use crate::services::usage_stats::{should_skip_session_insert, DedupKey}; use rust_decimal::Decimal; use std::fs; use std::path::{Path, PathBuf}; @@ -237,7 +238,6 @@ fn insert_gemini_session_entry( ) -> Result { let conn = lock_conn!(db.conn); - // 解析时间戳 let created_at = timestamp .and_then(|ts| { chrono::DateTime::parse_from_rfc3339(ts) @@ -254,6 +254,19 @@ fn insert_gemini_session_entry( // 合并 thoughts 到 output（思考 token 按输出计费） let output_tokens = tokens.output + tokens.thoughts; + let dedup_key = DedupKey { + app_type: "gemini", + model, + input_tokens: tokens.input, + output_tokens, + cache_read_tokens: tokens.cached, + cache_creation_tokens: 0, + created_at, + }; + if should_skip_session_insert(&conn, request_id, &dedup_key)? { + return Ok(false); + } + // 计算费用 let usage = TokenUsage { input_tokens: tokens.input, @@ -343,39 +356,6 @@ fn insert_gemini_session_entry( Ok(conn.changes() > 0) } -/// 获取文件的同步状态 -fn get_sync_state(db: &Database, file_path: &str) -> Result<(i64, i64), AppError> { - let conn = lock_conn!(db.conn); - let result = conn.query_row( - "SELECT last_modified, last_line_offset FROM session_log_sync WHERE file_path = ?1", - rusqlite::params![file_path], - |row| Ok((row.get::<_, i64>(0)?, row.get::<_, i64>(1)?)), - ); - Ok(result.unwrap_or((0, 0))) -} - -/// 更新文件的同步状态 -fn update_sync_state( - db: &Database, - file_path: &str, - last_modified: i64, - last_offset: i64, -) -> Result<(), AppError> { - let now = SystemTime::now() - .duration_since(SystemTime::UNIX_EPOCH) - .map(|d| d.as_secs() as i64) - .unwrap_or(0); - - let conn = lock_conn!(db.conn); - conn.execute( - "INSERT OR REPLACE INTO session_log_sync (file_path, last_modified, last_line_offset, last_synced_at) - VALUES (?1, ?2, ?3, ?4)", - rusqlite::params![file_path, last_modified, last_offset, now], - ) - .map_err(|e| AppError::Database(format!("更新同步状态失败: {e}")))?; - Ok(()) -} - /// 查找 Gemini 模型定价 fn find_gemini_pricing(conn: &rusqlite::Connection, model_id: &str) -> Option { // 精确匹配 @@ -433,6 +413,61 @@ mod tests { assert!(files.is_empty()); } + #[test] + fn test_insert_gemini_session_skips_matching_proxy_log() -> Result<(), AppError> { + let db = Database::memory()?; + { + let conn = lock_conn!(db.conn); + conn.execute( + "INSERT INTO proxy_request_logs ( + request_id, provider_id, app_type, model, request_model, + input_tokens, output_tokens, cache_read_tokens, cache_creation_tokens, + total_cost_usd, latency_ms, status_code, created_at, data_source + ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + rusqlite::params![ + "gemini-proxy", + "google", + "gemini", + "gemini-2.5-pro", + "gemini-2.5-pro", + 10, + 7, + 1, + 0, + "0.01", + 100, + 200, + 1000, + "proxy" + ], + )?; + } + + let tokens = GeminiTokens { + input: 10, + output: 2, + cached: 1, + thoughts: 5, + }; + let inserted = insert_gemini_session_entry( + &db, + "gemini-session-dup", + &tokens, + "gemini-2.5-pro", + Some("session-1"), + Some("1970-01-01T00:16:45Z"), + )?; + assert!(!inserted); + + let conn = lock_conn!(db.conn); + let count: i64 = conn.query_row("SELECT COUNT(*) FROM proxy_request_logs", [], |row| { + row.get(0) + })?; + assert_eq!(count, 1); + + Ok(()) + } + #[test] fn test_parse_gemini_tokens() { let json: serde_json::Value = serde_json::json!({ diff --git a/src-tauri/src/services/skill.rs b/src-tauri/src/services/skill.rs index 892c621b4..5cdb33076 100644 --- a/src-tauri/src/services/skill.rs +++ b/src-tauri/src/services/skill.rs @@ -509,6 +509,7 @@ impl SkillService { return Ok(custom.join("skills")); } } + AppType::ClaudeDesktop => {} AppType::Codex => { if let Some(custom) = crate::settings::get_codex_override_dir() { return Ok(custom.join("skills")); @@ -529,6 +530,11 @@ impl SkillService { return Ok(custom.join("skills")); } } + AppType::Hermes => { + if let Some(custom) = crate::settings::get_hermes_override_dir() { + return Ok(custom.join("skills")); + } + } } // 默认路径：回退到用户主目录下的标准位置 @@ -540,10 +546,12 @@ impl SkillService { Ok(match app { AppType::Claude => home.join(".claude").join("skills"), + AppType::ClaudeDesktop => home.join(".claude-desktop").join("skills"), AppType::Codex => home.join(".codex").join("skills"), AppType::Gemini => home.join(".gemini").join("skills"), AppType::OpenCode => home.join(".config").join("opencode").join("skills"), AppType::OpenClaw => home.join(".openclaw").join("skills"), + AppType::Hermes => crate::hermes_config::get_hermes_dir().join("skills"), }) } @@ -666,36 +674,16 @@ impl SkillService { repo_branch = used_branch; // 复制到 SSOT - let mut source = temp_dir.join(&source_rel); - if !source.exists() { - // 回退：在 temp_dir 中递归查找名称匹配的目录（含 SKILL.md） - let target_name = source_rel - .file_name() - .map(|n| n.to_string_lossy().to_string()) - .unwrap_or_default(); - if let Some(found) = Self::find_skill_dir_by_name(&temp_dir, &target_name) { - log::info!( - "Skill directory '{}' not found at direct path, using fallback: {}", - target_name, - found.display() - ); - source = found; - } else if temp_dir.join("SKILL.md").exists() { - // 根级 Skill：仓库本身就是 skill，SKILL.md 直接在解压根目录 - log::info!( - "Skill directory '{}' not found, but SKILL.md exists at root, using temp_dir", - target_name, - ); - source = temp_dir.clone(); - } else { + let source = + Self::resolve_skill_source_dir(&temp_dir, &skill.directory).ok_or_else(|| { + let missing = temp_dir.join(&source_rel).display().to_string(); let _ = fs::remove_dir_all(&temp_dir); - return Err(anyhow!(format_skill_error( + anyhow!(format_skill_error( "SKILL_DIR_NOT_FOUND", - &[("path", &source.display().to_string())], + &[("path", &missing)], Some("checkRepoUrl"), - ))); - } - } + )) + })?; let canonical_temp = temp_dir.canonicalize().unwrap_or_else(|_| temp_dir.clone()); let canonical_source = source.canonicalize().map_err(|_| { @@ -948,14 +936,13 @@ impl SkillService { }); let remote_skill_dir = match remote_match { - Some(rs) => temp_dir.join(&rs.directory), + Some(rs) => match Self::resolve_skill_source_dir(&temp_dir, &rs.directory) { + Some(path) => path, + None => continue, + }, None => continue, }; - if !remote_skill_dir.exists() { - continue; - } - let remote_hash = match Self::compute_dir_hash(&remote_skill_dir) { Ok(h) => h, Err(e) => { @@ -1059,15 +1046,16 @@ impl SkillService { )) })?; - let source = temp_dir.join(&remote_match.directory); - if !source.exists() { - let _ = fs::remove_dir_all(&temp_dir); - return Err(anyhow!(format_skill_error( - "SKILL_DIR_NOT_FOUND", - &[("path", &source.display().to_string())], - Some("checkRepoUrl"), - ))); - } + let source = Self::resolve_skill_source_dir(&temp_dir, &remote_match.directory) + .ok_or_else(|| { + let missing = temp_dir.join(&remote_match.directory).display().to_string(); + let _ = fs::remove_dir_all(&temp_dir); + anyhow!(format_skill_error( + "SKILL_DIR_NOT_FOUND", + &[("path", &missing)], + Some("checkRepoUrl"), + )) + })?; // 备份旧文件 let _ = Self::create_uninstall_backup(&skill); @@ -1550,19 +1538,6 @@ impl SkillService { // 保存到数据库 db.save_skill(&skill)?; - // 同步到已启用的应用目录（创建 symlink 或复制文件） - for app in AppType::all() { - if skill.apps.is_enabled_for(&app) { - if let Err(e) = Self::sync_to_app_dir(&skill.directory, &app) { - log::warn!( - "导入后同步 Skill '{}' 到 {:?} 失败: {e:#}", - skill.directory, - app - ); - } - } - } - imported.push(skill); } @@ -1608,6 +1583,10 @@ impl SkillService { /// - Symlink: 仅使用 symlink /// - Copy: 仅使用文件复制 pub fn sync_to_app_dir(directory: &str, app: &AppType) -> Result<()> { + if matches!(app, AppType::ClaudeDesktop) { + return Ok(()); + } + let ssot_dir = Self::get_ssot_dir()?; let source = ssot_dir.join(directory); @@ -1713,6 +1692,10 @@ impl SkillService { /// 从应用目录删除 Skill（支持 symlink 和真实目录） pub fn remove_from_app(directory: &str, app: &AppType) -> Result<()> { + if matches!(app, AppType::ClaudeDesktop) { + return Ok(()); + } + let app_dir = Self::get_app_skills_dir(app)?; let skill_path = app_dir.join(directory); @@ -1726,6 +1709,10 @@ impl SkillService { /// 同步所有已启用的 Skills 到指定应用 pub fn sync_to_app(db: &Arc, app: &AppType) -> Result<()> { + if matches!(app, AppType::ClaudeDesktop) { + return Ok(()); + } + let skills = db.get_all_installed_skills()?; let ssot_dir = Self::get_ssot_dir()?; let app_dir = Self::get_app_skills_dir(app)?; @@ -2102,6 +2089,40 @@ impl SkillService { walk(root, target_name, 0) } + /// 将 discoverable skill 的目录信息重新解析为解压目录中的真实源目录。 + /// + /// 兼容三种情况： + /// 1. `skills/foo` 这类直接相对路径； + /// 2. 仅持有安装名 `foo`，需要在仓库中递归查找真实目录； + /// 3. 仓库根目录本身就是 skill，此时回退到解压根目录。 + fn resolve_skill_source_dir(root: &Path, raw_directory: &str) -> Option { + let source_rel = Self::sanitize_skill_source_path(raw_directory)?; + let direct = root.join(&source_rel); + if direct.is_dir() { + return Some(direct); + } + + let target_name = source_rel.file_name()?.to_string_lossy().to_string(); + if let Some(found) = Self::find_skill_dir_by_name(root, &target_name) { + log::info!( + "Skill directory '{}' not found at direct path, using fallback: {}", + target_name, + found.display() + ); + return Some(found); + } + + if root.is_dir() && root.join("SKILL.md").exists() { + log::info!( + "Skill directory '{}' not found, but SKILL.md exists at root, using repo root", + target_name, + ); + return Some(root.to_path_buf()); + } + + None + } + /// 去重技能列表（基于完整 key，不同仓库的同名 skill 分开显示） fn deduplicate_discoverable_skills(skills: &mut Vec) { let mut seen = HashMap::new(); @@ -2969,3 +2990,53 @@ pub fn migrate_skills_to_ssot(db: &Arc) -> Result { Ok(count) } + +#[cfg(test)] +mod tests { + use super::*; + use tempfile::tempdir; + + fn write_skill(dir: &Path, name: &str) { + fs::create_dir_all(dir).expect("create skill dir"); + fs::write( + dir.join("SKILL.md"), + format!("---\nname: {name}\ndescription: Test skill\n---\n"), + ) + .expect("write SKILL.md"); + } + + #[test] + fn resolve_skill_source_dir_returns_repo_root_for_root_level_skill() { + let temp = tempdir().expect("tempdir"); + write_skill(temp.path(), "Root Skill"); + + let resolved = SkillService::resolve_skill_source_dir(temp.path(), "last30days-skill-cn") + .expect("root-level skill should resolve to the extracted repo root"); + + assert_eq!(resolved, temp.path()); + } + + #[test] + fn resolve_skill_source_dir_returns_direct_nested_directory_when_present() { + let temp = tempdir().expect("tempdir"); + let nested = temp.path().join("skills").join("nested-skill"); + write_skill(&nested, "Nested Skill"); + + let resolved = SkillService::resolve_skill_source_dir(temp.path(), "skills/nested-skill") + .expect("nested skill should resolve from its relative source path"); + + assert_eq!(resolved, nested); + } + + #[test] + fn resolve_skill_source_dir_falls_back_to_matching_install_name() { + let temp = tempdir().expect("tempdir"); + let nested = temp.path().join("skills").join("nested-skill"); + write_skill(&nested, "Nested Skill"); + + let resolved = SkillService::resolve_skill_source_dir(temp.path(), "nested-skill") + .expect("install name should fall back to the matching discovered skill directory"); + + assert_eq!(resolved, nested); + } +} diff --git a/src-tauri/src/services/stream_check.rs b/src-tauri/src/services/stream_check.rs index 1bb630058..9acfb51d4 100644 --- a/src-tauri/src/services/stream_check.rs +++ b/src-tauri/src/services/stream_check.rs @@ -3,7 +3,6 @@ //! 使用流式 API 进行快速健康检查，只需接收首个 chunk 即判定成功。 use futures::StreamExt; -use regex::Regex; use reqwest::Client; use serde::{Deserialize, Serialize}; use serde_json::json; @@ -17,7 +16,9 @@ use crate::proxy::providers::copilot_auth; use crate::proxy::providers::transform::anthropic_to_openai; use crate::proxy::providers::transform_gemini::anthropic_to_gemini; use crate::proxy::providers::transform_responses::anthropic_to_responses; -use crate::proxy::providers::{get_adapter, AuthInfo, AuthStrategy}; +use crate::proxy::providers::{ + get_adapter, AuthInfo, AuthStrategy, ClaudeAdapter, ProviderAdapter, +}; /// 健康状态枚举 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] @@ -207,11 +208,18 @@ impl StreamCheckService { // OpenCode / OpenClaw 的 settings_config 结构与 Claude/Codex/Gemini 不同 // （baseUrl / apiKey 直接作为根字段而非嵌套在 env），并且协议由 `api` // 或 `npm` 字段显式指定。它们不走 get_adapter 路径，而是直接分发。 - if matches!(app_type, AppType::OpenCode | AppType::OpenClaw) { + if matches!( + app_type, + AppType::OpenCode | AppType::OpenClaw | AppType::Hermes + ) { return Self::check_once_without_adapter(app_type, provider, config, start).await; } - let adapter = get_adapter(app_type); + let adapter: Box = if matches!(app_type, AppType::ClaudeDesktop) { + Box::new(ClaudeAdapter::new()) + } else { + get_adapter(app_type) + }; let base_url = match base_url_override { Some(base_url) => base_url, @@ -232,7 +240,7 @@ impl StreamCheckService { let test_prompt = &config.test_prompt; let result = match app_type { - AppType::Claude => { + AppType::Claude | AppType::ClaudeDesktop => { Self::check_claude_stream( &client, &base_url, @@ -270,9 +278,9 @@ impl StreamCheckService { ) .await } - AppType::OpenCode | AppType::OpenClaw => { + AppType::OpenCode | AppType::OpenClaw | AppType::Hermes => { // Already handled via early dispatch above - unreachable!("OpenCode/OpenClaw 已通过 check_once_without_adapter 处理") + unreachable!("OpenCode/OpenClaw/Hermes 已通过 check_once_without_adapter 处理") } }; @@ -353,15 +361,17 @@ impl StreamCheckService { }); // Codex OAuth (ChatGPT Plus/Pro 反代) 需要 store:false + include 标记， // 否则 Stream Check 会和生产路径一样被服务端 400 拒绝。 - let is_codex_oauth = provider - .meta - .as_ref() - .and_then(|m| m.provider_type.as_deref()) - == Some("codex_oauth"); + let is_codex_oauth = provider.is_codex_oauth(); + let codex_fast_mode = provider.codex_fast_mode_enabled(); let body = if is_openai_responses { - anthropic_to_responses(anthropic_body, Some(&provider.id), is_codex_oauth) - .map_err(|e| AppError::Message(format!("Failed to build test request: {e}")))? + anthropic_to_responses( + anthropic_body, + Some(&provider.id), + is_codex_oauth, + codex_fast_mode, + ) + .map_err(|e| AppError::Message(format!("Failed to build test request: {e}")))? } else if is_gemini_native { anthropic_to_gemini(anthropic_body) .map_err(|e| AppError::Message(format!("Failed to build test request: {e}")))? @@ -429,12 +439,13 @@ impl StreamCheckService { let os_name = Self::get_os_name(); let arch_name = Self::get_arch_name(); - request_builder = - request_builder.header("authorization", format!("Bearer {}", auth.api_key)); - - // Only Anthropic official strategy adds x-api-key - if auth.strategy == AuthStrategy::Anthropic { - request_builder = request_builder.header("x-api-key", &auth.api_key); + // 鉴权头复用 ClaudeAdapter::get_auth_headers，与代理路径（forwarder）保持单一真理来源。 + // - AuthStrategy::Anthropic → x-api-key + // - AuthStrategy::ClaudeAuth → Authorization: Bearer + // - AuthStrategy::Bearer → Authorization: Bearer + // 避免之前"无条件 Bearer + 条件 x-api-key 双发"导致的假阴性 / auth conflict。 + for (name, value) in ClaudeAdapter::new().get_auth_headers(auth) { + request_builder = request_builder.header(name, value); } request_builder = request_builder @@ -681,7 +692,7 @@ impl StreamCheckService { let result = match app_type { AppType::OpenClaw => { - Self::check_openclaw_stream( + Self::check_additive_app_stream( &client, provider, &model_to_test, @@ -700,7 +711,17 @@ impl StreamCheckService { ) .await } - _ => unreachable!("check_once_without_adapter 只处理 OpenCode/OpenClaw"), + AppType::Hermes => { + Self::check_hermes_stream( + &client, + provider, + &model_to_test, + test_prompt, + request_timeout, + ) + .await + } + _ => unreachable!("check_once_without_adapter 只处理 OpenCode/OpenClaw/Hermes"), }; let response_time = start.elapsed().as_millis() as u64; @@ -775,6 +796,15 @@ impl StreamCheckService { return None; } let lower = body.to_lowercase(); + let qianfan_quota_indicators = [ + "coding_plan_hour_quota_exceeded", + "coding_plan_week_quota_exceeded", + "coding_plan_month_quota_exceeded", + ]; + if qianfan_quota_indicators.iter().any(|s| lower.contains(s)) { + return Some("quotaExceeded"); + } + // 必须提到 "model"，避免通用 404 / 400 被误判 if !lower.contains("model") { return None; @@ -805,7 +835,7 @@ impl StreamCheckService { /// - `anthropic-messages` → check_claude_stream + api_format="anthropic" (ClaudeAuth 策略) /// - `google-generative-ai` → check_gemini_stream (Google API Key 策略) /// - `bedrock-converse-stream` → 不支持（需要 AWS SigV4 签名） - async fn check_openclaw_stream( + async fn check_additive_app_stream( client: &Client, provider: &Provider, model: &str, @@ -815,7 +845,7 @@ impl StreamCheckService { // 自定义认证头（如 Longcat 的 `apikey` 头）不走标准 Bearer， // 具体头名由 OpenClaw 网关内部决定，cc-switch 无法准确构造， // 因此直接返回友好错误而不是让用户看到一个误导性的 401。 - if Self::openclaw_uses_auth_header(provider) { + if Self::additive_app_uses_auth_header(provider) { return Err(AppError::localized( "openclaw_auth_header_not_supported", "该供应商使用自定义认证头，暂不支持流式健康检查。建议直接通过 OpenClaw 测试。", @@ -908,8 +938,8 @@ impl StreamCheckService { } } - /// 判断 OpenClaw 供应商是否使用自定义认证头（`authHeader: true`） - fn openclaw_uses_auth_header(provider: &Provider) -> bool { + /// 判断 additive-mode 供应商是否使用自定义认证头（`authHeader: true`） + fn additive_app_uses_auth_header(provider: &Provider) -> bool { provider .settings_config .get("authHeader") @@ -969,6 +999,112 @@ impl StreamCheckService { .filter(|s| !s.is_empty()) } + // Hermes 的 settings_config 用 snake_case（base_url / api_key / api_mode）， + // 与 OpenClaw 的 camelCase（baseUrl / apiKey / api）是两套独立命名。 + // 见 src/config/hermesProviderPresets.ts 的 HermesProviderSettingsConfig。 + fn extract_hermes_base_url(provider: &Provider) -> Result { + provider + .settings_config + .get("base_url") + .and_then(|v| v.as_str()) + .map(|s| s.trim().to_string()) + .filter(|s| !s.is_empty()) + .ok_or_else(|| { + AppError::localized( + "hermes_base_url_missing", + "Hermes 供应商缺少 base_url", + "Hermes provider is missing `base_url`", + ) + }) + } + + fn extract_hermes_api_key(provider: &Provider) -> Result { + provider + .settings_config + .get("api_key") + .and_then(|v| v.as_str()) + .map(|s| s.trim().to_string()) + .filter(|s| !s.is_empty()) + .ok_or_else(|| { + AppError::localized( + "hermes_api_key_missing", + "Hermes 供应商缺少 api_key", + "Hermes provider is missing `api_key`", + ) + }) + } + + fn extract_hermes_api_mode(provider: &Provider) -> Option { + provider + .settings_config + .get("api_mode") + .and_then(|v| v.as_str()) + .map(|s| s.trim().to_string()) + .filter(|s| !s.is_empty()) + } + + /// Hermes 流式检查分发器 + /// + /// Hermes 以 `api_mode` 字段显式指定协议，取值来自 + /// `HermesApiMode`（hermesProviderPresets.ts）： + /// - `chat_completions` → check_claude_stream + api_format="openai_chat"（Bearer） + /// - `anthropic_messages` → check_claude_stream + api_format="anthropic"（ClaudeAuth，与 OpenClaw 的 anthropic-messages 同策略） + /// - `codex_responses` → check_claude_stream + api_format="openai_responses"（Bearer） + /// - `bedrock_converse` → 不支持（需要 AWS SigV4 签名） + async fn check_hermes_stream( + client: &Client, + provider: &Provider, + model: &str, + test_prompt: &str, + timeout: std::time::Duration, + ) -> Result<(u16, String), AppError> { + // 先把 api_mode 路由出协议格式与认证策略。 + // 纯错误路径（bedrock / 未知 / 缺失）直接 return，避免在用户 + // 选了 bedrock_converse 时被"缺 base_url"的二级错误盖住真正原因。 + let (api_format, auth_strategy) = match Self::extract_hermes_api_mode(provider).as_deref() { + Some("chat_completions") => ("openai_chat", AuthStrategy::Bearer), + Some("anthropic_messages") => ("anthropic", AuthStrategy::ClaudeAuth), + Some("codex_responses") => ("openai_responses", AuthStrategy::Bearer), + Some("bedrock_converse") => { + return Err(AppError::localized( + "hermes_bedrock_not_supported", + "AWS Bedrock 需要 SigV4 签名，当前不支持健康检查。", + "AWS Bedrock requires SigV4 signing and is not supported by stream health check.", + )); + } + Some(other) => { + return Err(AppError::localized( + "hermes_protocol_not_yet_supported", + format!("Hermes 暂不支持协议: {other}"), + format!("Hermes protocol not yet supported: {other}"), + )); + } + None => { + return Err(AppError::localized( + "hermes_api_mode_missing", + "Hermes 供应商缺少 api_mode 字段", + "Hermes provider is missing the `api_mode` field", + )); + } + }; + + let base_url = Self::extract_hermes_base_url(provider)?; + let api_key = Self::extract_hermes_api_key(provider)?; + let auth = AuthInfo::new(api_key, auth_strategy); + Self::check_claude_stream( + client, + &base_url, + &auth, + model, + test_prompt, + timeout, + provider, + Some(api_format), + None, + ) + .await + } + /// OpenCode 流式检查分发器 /// /// OpenCode 用 `npm` 字段（AI SDK 包名）隐式指定协议。映射关系参见 @@ -1026,7 +1162,7 @@ impl StreamCheckService { .await } Some("@ai-sdk/anthropic") => { - // 见 check_openclaw_stream 对 anthropic-messages 的注释： + // 见 check_additive_app_stream 对 anthropic-messages 的处理： // 用 ClaudeAuth（Bearer-only）兼容中转服务。 let auth = AuthInfo::new(api_key, AuthStrategy::ClaudeAuth); Self::check_claude_stream( @@ -1229,8 +1365,10 @@ impl StreamCheckService { config: &StreamCheckConfig, ) -> String { match app_type { - AppType::Claude => Self::extract_env_model(provider, "ANTHROPIC_MODEL") - .unwrap_or_else(|| config.claude_model.clone()), + AppType::Claude | AppType::ClaudeDesktop => { + Self::extract_env_model(provider, "ANTHROPIC_MODEL") + .unwrap_or_else(|| config.claude_model.clone()) + } AppType::Codex => { Self::extract_codex_model(provider).unwrap_or_else(|| config.codex_model.clone()) } @@ -1241,8 +1379,8 @@ impl StreamCheckService { // Try to extract first model from the models object Self::extract_opencode_model(provider).unwrap_or_else(|| "gpt-4o".to_string()) } - AppType::OpenClaw => { - // OpenClaw uses models array in settings_config + AppType::OpenClaw | AppType::Hermes => { + // OpenClaw/Hermes use models array in settings_config // Try to extract first model from the models array Self::extract_openclaw_model(provider).unwrap_or_else(|| "gpt-4o".to_string()) } @@ -1293,10 +1431,11 @@ impl StreamCheckService { return None; } - let re = Regex::new(r#"^model\s*=\s*["']([^"']+)["']"#).ok()?; - re.captures(config_text) - .and_then(|caps| caps.get(1)) - .map(|m| m.as_str().trim().to_string()) + let table = toml::from_str::(config_text).ok()?; + table + .get("model") + .and_then(|v| v.as_str()) + .map(|s| s.trim().to_string()) .filter(|value| !value.is_empty()) } @@ -1406,24 +1545,24 @@ mod tests { } #[test] - fn test_openclaw_uses_auth_header_true() { + fn test_additive_app_uses_auth_header_true() { let p = make_provider(serde_json::json!({ "baseUrl": "https://api.longcat.chat/v1", "apiKey": "k", "api": "openai-completions", "authHeader": true, })); - assert!(StreamCheckService::openclaw_uses_auth_header(&p)); + assert!(StreamCheckService::additive_app_uses_auth_header(&p)); } #[test] - fn test_openclaw_uses_auth_header_default_false() { + fn test_additive_app_uses_auth_header_default_false() { let p = make_provider(serde_json::json!({ "baseUrl": "https://api.deepseek.com/v1", "apiKey": "k", "api": "openai-completions", })); - assert!(!StreamCheckService::openclaw_uses_auth_header(&p)); + assert!(!StreamCheckService::additive_app_uses_auth_header(&p)); } #[test] @@ -1612,6 +1751,22 @@ mod tests { ); } + #[test] + fn test_detect_qianfan_coding_plan_quota_errors() { + let cases = [ + r#"{"error":{"code":"coding_plan_hour_quota_exceeded","message":"hour quota exceeded"}}"#, + r#"{"error":{"code":"coding_plan_week_quota_exceeded","message":"week quota exceeded"}}"#, + r#"{"error":{"code":"coding_plan_month_quota_exceeded","message":"month quota exceeded"}}"#, + ]; + + for body in cases { + assert_eq!( + StreamCheckService::detect_error_category(429, body), + Some("quotaExceeded") + ); + } + } + #[test] fn test_get_os_name() { let os_name = StreamCheckService::get_os_name(); @@ -1782,6 +1937,22 @@ mod tests { assert_eq!(url, "https://relay.example/custom/generate-content?alt=sse"); } + #[test] + fn test_resolve_claude_stream_url_for_gemini_native_cloudflare_vertex_full_url() { + let url = StreamCheckService::resolve_claude_stream_url( + "https://gateway.ai.cloudflare.com/v1/account/gateway/google-vertex-ai/v1/projects/project/locations/us-central1/publishers/google/models/gemini-3.1-pro-preview:streamGenerateContent", + AuthStrategy::Google, + "gemini_native", + true, + "gemini-2.5-flash", + ); + + assert_eq!( + url, + "https://gateway.ai.cloudflare.com/v1/account/gateway/google-vertex-ai/v1/projects/project/locations/us-central1/publishers/google/models/gemini-3.1-pro-preview:streamGenerateContent?alt=sse" + ); + } + /// Regression: Gemini SDK outputs commonly surface model ids as the /// resource-name form `models/gemini-2.5-pro`. Interpolating that raw /// value used to produce `/v1beta/models/models/gemini-2.5-pro:...` diff --git a/src-tauri/src/services/subscription.rs b/src-tauri/src/services/subscription.rs index ee4a0b115..0349bfeb9 100644 --- a/src-tauri/src/services/subscription.rs +++ b/src-tauri/src/services/subscription.rs @@ -291,12 +291,26 @@ struct ApiExtraUsage { currency: Option, } -/// 已知的 Claude 用量窗口名称 +/// 已知的 Claude 用量窗口名称。`QuotaTier::name` 会是其中之一。 +pub const TIER_FIVE_HOUR: &str = "five_hour"; +pub const TIER_SEVEN_DAY: &str = "seven_day"; +pub const TIER_SEVEN_DAY_OPUS: &str = "seven_day_opus"; +pub const TIER_SEVEN_DAY_SONNET: &str = "seven_day_sonnet"; + +/// Coding Plan（Kimi / MiniMax）的周窗口 tier 名。与 `coding_plan::query_*` +/// 写入、tray 渲染、commands::provider 扁平化三处共用同一标识。 +pub const TIER_WEEKLY_LIMIT: &str = "weekly_limit"; + +/// Gemini 用量分组名称（按模型而非时间窗口）。`classify_gemini_model` 输出。 +pub const TIER_GEMINI_PRO: &str = "gemini_pro"; +pub const TIER_GEMINI_FLASH: &str = "gemini_flash"; +pub const TIER_GEMINI_FLASH_LITE: &str = "gemini_flash_lite"; + const KNOWN_TIERS: &[&str] = &[ - "five_hour", - "seven_day", - "seven_day_opus", - "seven_day_sonnet", + TIER_FIVE_HOUR, + TIER_SEVEN_DAY, + TIER_SEVEN_DAY_OPUS, + TIER_SEVEN_DAY_SONNET, ]; /// 查询 Claude 官方订阅额度 @@ -993,11 +1007,11 @@ fn extract_project_id(value: &serde_json::Value) -> Option { /// 将 Gemini 模型 ID 分类为 Pro / Flash / Flash Lite fn classify_gemini_model(model_id: &str) -> &str { if model_id.contains("flash-lite") { - "gemini_flash_lite" + TIER_GEMINI_FLASH_LITE } else if model_id.contains("flash") { - "gemini_flash" + TIER_GEMINI_FLASH } else if model_id.contains("pro") { - "gemini_pro" + TIER_GEMINI_PRO } else { model_id } @@ -1152,9 +1166,9 @@ async fn query_gemini_quota(access_token: &str) -> SubscriptionQuota { // 转换为 tiers（remainingFraction → utilization: 已用百分比） let sort_order = |name: &str| -> usize { match name { - "gemini_pro" => 0, - "gemini_flash" => 1, - "gemini_flash_lite" => 2, + TIER_GEMINI_PRO => 0, + TIER_GEMINI_FLASH => 1, + TIER_GEMINI_FLASH_LITE => 2, _ => 3, } }; diff --git a/src-tauri/src/services/usage_cache.rs b/src-tauri/src/services/usage_cache.rs new file mode 100644 index 000000000..638040fca --- /dev/null +++ b/src-tauri/src/services/usage_cache.rs @@ -0,0 +1,143 @@ +//! 托盘展示用的用量缓存（进程内、写穿式）。 +//! +//! 各 usage 查询命令成功时写入；系统托盘构建菜单时读取。不持久化， +//! 进程重启即空，由下一次自动查询或托盘悬停触发的刷新重新填充。 + +use std::collections::HashMap; +use std::sync::RwLock; + +use crate::app_config::AppType; +use crate::provider::UsageResult; +use crate::services::subscription::SubscriptionQuota; + +#[derive(Default)] +pub struct UsageCache { + subscription: RwLock>, + script: RwLock>, +} + +impl UsageCache { + pub fn new() -> Self { + Self::default() + } + + pub fn put_subscription(&self, app_type: AppType, quota: SubscriptionQuota) { + if let Ok(mut w) = self.subscription.write() { + w.insert(app_type, quota); + } + } + + pub fn put_script(&self, app_type: AppType, provider_id: String, result: UsageResult) { + if let Ok(mut w) = self.script.write() { + w.insert((app_type, provider_id), result); + } + } + + /// 以借用形式暴露订阅快照，避免托盘每次重建时深拷贝整个 `SubscriptionQuota`。 + pub fn with_subscription( + &self, + app_type: &AppType, + f: impl FnOnce(&SubscriptionQuota) -> R, + ) -> Option { + self.subscription + .read() + .ok() + .and_then(|r| r.get(app_type).map(f)) + } + + /// 以借用形式暴露脚本型用量结果，同上。 + pub fn with_script( + &self, + app_type: &AppType, + provider_id: &str, + f: impl FnOnce(&UsageResult) -> R, + ) -> Option { + self.script + .read() + .ok() + .and_then(|r| r.get(&(app_type.clone(), provider_id.to_string())).map(f)) + } + + pub fn invalidate_script(&self, app_type: &AppType, provider_id: &str) { + // 热路径会对每个禁用脚本的 provider 在托盘重建时调用一次：先走读锁 + // `contains_key` 快速放行"本来就不在缓存里"的常见情况，避免无谓的写锁升级。 + let key = (app_type.clone(), provider_id.to_string()); + if !self.script.read().is_ok_and(|r| r.contains_key(&key)) { + return; + } + if let Ok(mut w) = self.script.write() { + w.remove(&key); + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::services::subscription::CredentialStatus; + + fn fake_quota() -> SubscriptionQuota { + SubscriptionQuota { + tool: "claude".to_string(), + credential_status: CredentialStatus::Valid, + credential_message: None, + success: true, + tiers: vec![], + extra_usage: None, + error: None, + queried_at: Some(0), + } + } + + fn fake_result() -> UsageResult { + UsageResult { + success: true, + data: None, + error: None, + } + } + + #[test] + fn subscription_round_trip() { + let cache = UsageCache::new(); + assert!(cache + .with_subscription(&AppType::Claude, |q| q.success) + .is_none()); + cache.put_subscription(AppType::Claude, fake_quota()); + let got = cache + .with_subscription(&AppType::Claude, |q| q.success) + .unwrap(); + assert!(got); + assert!(cache + .with_subscription(&AppType::Codex, |q| q.success) + .is_none()); + } + + #[test] + fn script_round_trip_and_invalidate() { + let cache = UsageCache::new(); + assert!(cache + .with_script(&AppType::Codex, "pid", |r| r.success) + .is_none()); + cache.put_script(AppType::Codex, "pid".to_string(), fake_result()); + assert!(cache + .with_script(&AppType::Codex, "pid", |r| r.success) + .is_some()); + cache.invalidate_script(&AppType::Codex, "pid"); + assert!(cache + .with_script(&AppType::Codex, "pid", |r| r.success) + .is_none()); + } + + #[test] + fn script_keys_isolated_by_app_type() { + let cache = UsageCache::new(); + cache.put_script(AppType::Claude, "same".to_string(), fake_result()); + assert!(cache + .with_script(&AppType::Claude, "same", |r| r.success) + .is_some()); + assert!(cache + .with_script(&AppType::Codex, "same", |r| r.success) + .is_none()); + } +} diff --git a/src-tauri/src/services/usage_stats.rs b/src-tauri/src/services/usage_stats.rs index 706fd9f09..e0746a6a6 100644 --- a/src-tauri/src/services/usage_stats.rs +++ b/src-tauri/src/services/usage_stats.rs @@ -117,9 +117,52 @@ pub struct RequestLogDetail { pub data_source: Option, } +/// 把 24 列的查询结果映射为 `RequestLogDetail`。 +/// +/// 调用方的 SELECT **必须**按以下顺序返回 24 列： +/// `request_id, provider_id, provider_name, app_type, model, request_model, +/// cost_multiplier, input_tokens, output_tokens, cache_read_tokens, +/// cache_creation_tokens, input_cost_usd, output_cost_usd, cache_read_cost_usd, +/// cache_creation_cost_usd, total_cost_usd, is_streaming, latency_ms, +/// first_token_ms, duration_ms, status_code, error_message, created_at, +/// data_source` +/// +/// 不需要 provider_name 时（如 backfill）SELECT `NULL AS provider_name` 占位即可。 +fn row_to_request_log_detail(row: &rusqlite::Row<'_>) -> rusqlite::Result { + Ok(RequestLogDetail { + request_id: row.get(0)?, + provider_id: row.get(1)?, + provider_name: row.get(2)?, + app_type: row.get(3)?, + model: row.get(4)?, + request_model: row.get(5)?, + cost_multiplier: row + .get::<_, Option>(6)? + .unwrap_or_else(|| "1".to_string()), + input_tokens: row.get::<_, i64>(7)? as u32, + output_tokens: row.get::<_, i64>(8)? as u32, + cache_read_tokens: row.get::<_, i64>(9)? as u32, + cache_creation_tokens: row.get::<_, i64>(10)? as u32, + input_cost_usd: row.get(11)?, + output_cost_usd: row.get(12)?, + cache_read_cost_usd: row.get(13)?, + cache_creation_cost_usd: row.get(14)?, + total_cost_usd: row.get(15)?, + is_streaming: row.get::<_, i64>(16)? != 0, + latency_ms: row.get::<_, i64>(17)? as u64, + first_token_ms: row.get::<_, Option>(18)?.map(|v| v as u64), + duration_ms: row.get::<_, Option>(19)?.map(|v| v as u64), + status_code: row.get::<_, i64>(20)? as u16, + error_message: row.get(21)?, + created_at: row.get(22)?, + data_source: row.get(23)?, + }) +} + /// SQL fragment: resolve provider_name with fallback for session-based entries. -/// Session logs use placeholder provider_ids (_session, _codex_session, _gemini_session) -/// that don't exist in the providers table — this COALESCE gives them readable names. +/// Session logs use placeholder provider_ids (e.g., `_session`, `__session`) +/// that don't exist in the providers table — the CASE expression below is the +/// authoritative mapping from placeholder to readable name. fn provider_name_coalesce(log_alias: &str, provider_alias: &str) -> String { format!( "COALESCE({provider_alias}.name, CASE {log_alias}.provider_id \ @@ -130,6 +173,139 @@ fn provider_name_coalesce(log_alias: &str, provider_alias: &str) -> String { ) } +pub(crate) const SESSION_PROXY_DEDUP_WINDOW_SECONDS: i64 = 10 * 60; + +/// SQL 片段：把指定别名的 `data_source` 包成 COALESCE，NULL 视作 'proxy'。 +/// +/// 防御 schema v9 之前可能写入的 NULL data_source 行（见 +/// `tests::create_legacy_nullable_logs_table`）。所有用到 data_source 的查询 +/// 都应通过此 helper 生成片段，避免遗漏。 +fn data_source_expr(log_alias: &str) -> String { + format!("COALESCE({log_alias}.data_source, 'proxy')") +} + +pub(crate) fn effective_usage_log_filter(log_alias: &str) -> String { + let data_source = data_source_expr(log_alias); + let proxy_data_source = data_source_expr("proxy_dedup"); + format!( + "NOT ( + {data_source} IN ('session_log', 'codex_session', 'gemini_session') + AND EXISTS ( + SELECT 1 + FROM proxy_request_logs proxy_dedup + WHERE {proxy_data_source} = 'proxy' + AND proxy_dedup.app_type = {log_alias}.app_type + AND proxy_dedup.status_code >= 200 + AND proxy_dedup.status_code < 300 + AND proxy_dedup.input_tokens = {log_alias}.input_tokens + AND proxy_dedup.output_tokens = {log_alias}.output_tokens + AND proxy_dedup.cache_read_tokens = {log_alias}.cache_read_tokens + AND ( + proxy_dedup.cache_creation_tokens = {log_alias}.cache_creation_tokens + OR ( + {log_alias}.cache_creation_tokens = 0 + AND {data_source} IN ('codex_session', 'gemini_session') + ) + ) + AND proxy_dedup.created_at BETWEEN + {log_alias}.created_at - {SESSION_PROXY_DEDUP_WINDOW_SECONDS} + AND {log_alias}.created_at + {SESSION_PROXY_DEDUP_WINDOW_SECONDS} + AND ( + LOWER(proxy_dedup.model) = LOWER({log_alias}.model) + OR LOWER(proxy_dedup.model) = 'unknown' + OR LOWER({log_alias}.model) = 'unknown' + ) + ) + )" + ) +} + +/// 跨源去重指纹键。 +/// +/// `cache_creation_tokens`：Codex/Gemini session 日志不暴露该字段，调用方传 0 +/// 表示"未知"，匹配器会放行 proxy 侧任意 cache_creation_tokens 值。 +#[derive(Debug, Clone, Copy)] +pub(crate) struct DedupKey<'a> { + pub app_type: &'a str, + pub model: &'a str, + pub input_tokens: u32, + pub output_tokens: u32, + pub cache_read_tokens: u32, + pub cache_creation_tokens: u32, + pub created_at: i64, +} + +/// session 日志写入前的统一去重判定。 +/// +/// 命中以下任一条件即跳过插入：① `request_id` 已存在；② 时间窗口内存在 +/// 与 `key` 匹配的 proxy 日志（指纹去重）。 +pub(crate) fn should_skip_session_insert( + conn: &Connection, + request_id: &str, + key: &DedupKey, +) -> Result { + if proxy_request_id_exists(conn, request_id)? { + return Ok(true); + } + has_matching_proxy_usage_log(conn, key) +} + +fn proxy_request_id_exists(conn: &Connection, request_id: &str) -> Result { + conn.query_row( + "SELECT EXISTS(SELECT 1 FROM proxy_request_logs WHERE request_id = ?1)", + params![request_id], + |row| row.get::<_, bool>(0), + ) + .map_err(|e| AppError::Database(format!("查询 request_id 失败: {e}"))) +} + +pub(crate) fn has_matching_proxy_usage_log( + conn: &Connection, + key: &DedupKey, +) -> Result { + let allow_missing_cache_creation = + matches!(key.app_type, "codex" | "gemini") && key.cache_creation_tokens == 0; + + let l_data_source = data_source_expr("l"); + let sql = format!( + "SELECT EXISTS ( + SELECT 1 + FROM proxy_request_logs l + WHERE {l_data_source} = 'proxy' + AND l.app_type = ?1 + AND l.status_code >= 200 + AND l.status_code < 300 + AND l.input_tokens = ?3 + AND l.output_tokens = ?4 + AND l.cache_read_tokens = ?5 + AND (l.cache_creation_tokens = ?6 OR ?9 = 1) + AND l.created_at BETWEEN ?7 - ?8 AND ?7 + ?8 + AND ( + LOWER(l.model) = LOWER(?2) + OR LOWER(l.model) = 'unknown' + OR LOWER(?2) = 'unknown' + ) + )" + ); + + conn.query_row( + &sql, + params![ + key.app_type, + key.model, + key.input_tokens as i64, + key.output_tokens as i64, + key.cache_read_tokens as i64, + key.cache_creation_tokens as i64, + key.created_at, + SESSION_PROXY_DEDUP_WINDOW_SECONDS, + allow_missing_cache_creation as i64, + ], + |row| row.get::<_, bool>(0), + ) + .map_err(|e| AppError::Database(format!("查询重复代理用量日志失败: {e}"))) +} + #[derive(Debug, Clone, Default)] struct RollupDateBounds { start: Option, @@ -231,19 +407,19 @@ impl Database { let conn = lock_conn!(self.conn); // Build detail WHERE clause - let mut conditions = Vec::new(); + let mut conditions = vec![effective_usage_log_filter("l")]; let mut params_vec: Vec> = Vec::new(); if let Some(start) = start_date { - conditions.push("created_at >= ?"); + conditions.push("l.created_at >= ?".to_string()); params_vec.push(Box::new(start)); } if let Some(end) = end_date { - conditions.push("created_at <= ?"); + conditions.push("l.created_at <= ?".to_string()); params_vec.push(Box::new(end)); } if let Some(at) = app_type { - conditions.push("app_type = ?"); + conditions.push("l.app_type = ?".to_string()); params_vec.push(Box::new(at.to_string())); } @@ -293,7 +469,7 @@ impl Database { COALESCE(SUM(cache_creation_tokens), 0) as total_cache_creation_tokens, COALESCE(SUM(cache_read_tokens), 0) as total_cache_read_tokens, COALESCE(SUM(CASE WHEN status_code >= 200 AND status_code < 300 THEN 1 ELSE 0 END), 0) as success_count - FROM proxy_request_logs {where_clause}) d, + FROM proxy_request_logs l {where_clause}) d, (SELECT COALESCE(SUM(request_count), 0) as total_requests, COALESCE(SUM(CAST(total_cost_usd AS REAL)), 0) as total_cost, @@ -369,23 +545,25 @@ impl Database { } let app_type_filter = if app_type.is_some() { - "AND app_type = ?4" + "AND l.app_type = ?4" } else { "" }; + let effective_filter = effective_usage_log_filter("l"); let sql = format!( "SELECT - CAST((created_at - ?1) / ?3 AS INTEGER) as bucket_idx, + CAST((l.created_at - ?1) / ?3 AS INTEGER) as bucket_idx, COUNT(*) as request_count, - COALESCE(SUM(CAST(total_cost_usd AS REAL)), 0) as total_cost, - COALESCE(SUM(input_tokens + output_tokens), 0) as total_tokens, - COALESCE(SUM(input_tokens), 0) as total_input_tokens, - COALESCE(SUM(output_tokens), 0) as total_output_tokens, - COALESCE(SUM(cache_creation_tokens), 0) as total_cache_creation_tokens, - COALESCE(SUM(cache_read_tokens), 0) as total_cache_read_tokens - FROM proxy_request_logs - WHERE created_at >= ?1 AND created_at <= ?2 {app_type_filter} + COALESCE(SUM(CAST(l.total_cost_usd AS REAL)), 0) as total_cost, + COALESCE(SUM(l.input_tokens + l.output_tokens), 0) as total_tokens, + COALESCE(SUM(l.input_tokens), 0) as total_input_tokens, + COALESCE(SUM(l.output_tokens), 0) as total_output_tokens, + COALESCE(SUM(l.cache_creation_tokens), 0) as total_cache_creation_tokens, + COALESCE(SUM(l.cache_read_tokens), 0) as total_cache_read_tokens + FROM proxy_request_logs l + WHERE l.created_at >= ?1 AND l.created_at <= ?2 + AND {effective_filter} {app_type_filter} GROUP BY bucket_idx ORDER BY bucket_idx ASC" ); @@ -456,23 +634,25 @@ impl Database { let bucket_count = (end_day.signed_duration_since(start_day).num_days() + 1) as usize; let app_type_filter = if app_type.is_some() { - "AND app_type = ?3" + "AND l.app_type = ?3" } else { "" }; + let effective_filter = effective_usage_log_filter("l"); let detail_sql = format!( "SELECT - date(created_at, 'unixepoch', 'localtime') as bucket_date, + date(l.created_at, 'unixepoch', 'localtime') as bucket_date, COUNT(*) as request_count, - COALESCE(SUM(CAST(total_cost_usd AS REAL)), 0) as total_cost, - COALESCE(SUM(input_tokens + output_tokens), 0) as total_tokens, - COALESCE(SUM(input_tokens), 0) as total_input_tokens, - COALESCE(SUM(output_tokens), 0) as total_output_tokens, - COALESCE(SUM(cache_creation_tokens), 0) as total_cache_creation_tokens, - COALESCE(SUM(cache_read_tokens), 0) as total_cache_read_tokens - FROM proxy_request_logs - WHERE created_at >= ?1 AND created_at <= ?2 {app_type_filter} + COALESCE(SUM(CAST(l.total_cost_usd AS REAL)), 0) as total_cost, + COALESCE(SUM(l.input_tokens + l.output_tokens), 0) as total_tokens, + COALESCE(SUM(l.input_tokens), 0) as total_input_tokens, + COALESCE(SUM(l.output_tokens), 0) as total_output_tokens, + COALESCE(SUM(l.cache_creation_tokens), 0) as total_cache_creation_tokens, + COALESCE(SUM(l.cache_read_tokens), 0) as total_cache_read_tokens + FROM proxy_request_logs l + WHERE l.created_at >= ?1 AND l.created_at <= ?2 + AND {effective_filter} {app_type_filter} GROUP BY bucket_date ORDER BY bucket_date ASC" ); @@ -623,18 +803,18 @@ impl Database { ) -> Result, AppError> { let conn = lock_conn!(self.conn); - let mut detail_conditions = Vec::new(); + let mut detail_conditions = vec![effective_usage_log_filter("l")]; let mut detail_params: Vec> = Vec::new(); if let Some(start) = start_date { - detail_conditions.push("l.created_at >= ?"); + detail_conditions.push("l.created_at >= ?".to_string()); detail_params.push(Box::new(start)); } if let Some(end) = end_date { - detail_conditions.push("l.created_at <= ?"); + detail_conditions.push("l.created_at <= ?".to_string()); detail_params.push(Box::new(end)); } if let Some(at) = app_type { - detail_conditions.push("l.app_type = ?"); + detail_conditions.push("l.app_type = ?".to_string()); detail_params.push(Box::new(at.to_string())); } let detail_where = if detail_conditions.is_empty() { @@ -747,18 +927,18 @@ impl Database { ) -> Result, AppError> { let conn = lock_conn!(self.conn); - let mut detail_conditions = Vec::new(); + let mut detail_conditions = vec![effective_usage_log_filter("l")]; let mut detail_params: Vec> = Vec::new(); if let Some(start) = start_date { - detail_conditions.push("l.created_at >= ?"); + detail_conditions.push("l.created_at >= ?".to_string()); detail_params.push(Box::new(start)); } if let Some(end) = end_date { - detail_conditions.push("l.created_at <= ?"); + detail_conditions.push("l.created_at <= ?".to_string()); detail_params.push(Box::new(end)); } if let Some(at) = app_type { - detail_conditions.push("l.app_type = ?"); + detail_conditions.push("l.app_type = ?".to_string()); detail_params.push(Box::new(at.to_string())); } let detail_where = if detail_conditions.is_empty() { @@ -855,31 +1035,31 @@ impl Database { ) -> Result { let conn = lock_conn!(self.conn); - let mut conditions = Vec::new(); + let mut conditions = vec![effective_usage_log_filter("l")]; let mut params: Vec> = Vec::new(); if let Some(ref app_type) = filters.app_type { - conditions.push("l.app_type = ?"); + conditions.push("l.app_type = ?".to_string()); params.push(Box::new(app_type.clone())); } if let Some(ref provider_name) = filters.provider_name { - conditions.push("p.name LIKE ?"); + conditions.push("p.name LIKE ?".to_string()); params.push(Box::new(format!("%{provider_name}%"))); } if let Some(ref model) = filters.model { - conditions.push("l.model LIKE ?"); + conditions.push("l.model LIKE ?".to_string()); params.push(Box::new(format!("%{model}%"))); } if let Some(status) = filters.status_code { - conditions.push("l.status_code = ?"); + conditions.push("l.status_code = ?".to_string()); params.push(Box::new(status as i64)); } if let Some(start) = filters.start_date { - conditions.push("l.created_at >= ?"); + conditions.push("l.created_at >= ?".to_string()); params.push(Box::new(start)); } if let Some(end) = filters.end_date { - conditions.push("l.created_at <= ?"); + conditions.push("l.created_at <= ?".to_string()); params.push(Box::new(end)); } @@ -922,36 +1102,7 @@ impl Database { let mut stmt = conn.prepare(&sql)?; let params_refs: Vec<&dyn rusqlite::ToSql> = params.iter().map(|p| p.as_ref()).collect(); - let rows = stmt.query_map(params_refs.as_slice(), |row| { - Ok(RequestLogDetail { - request_id: row.get(0)?, - provider_id: row.get(1)?, - provider_name: row.get(2)?, - app_type: row.get(3)?, - model: row.get(4)?, - request_model: row.get(5)?, - cost_multiplier: row - .get::<_, Option>(6)? - .unwrap_or_else(|| "1".to_string()), - input_tokens: row.get::<_, i64>(7)? as u32, - output_tokens: row.get::<_, i64>(8)? as u32, - cache_read_tokens: row.get::<_, i64>(9)? as u32, - cache_creation_tokens: row.get::<_, i64>(10)? as u32, - input_cost_usd: row.get(11)?, - output_cost_usd: row.get(12)?, - cache_read_cost_usd: row.get(13)?, - cache_creation_cost_usd: row.get(14)?, - total_cost_usd: row.get(15)?, - is_streaming: row.get::<_, i64>(16)? != 0, - latency_ms: row.get::<_, i64>(17)? as u64, - first_token_ms: row.get::<_, Option>(18)?.map(|v| v as u64), - duration_ms: row.get::<_, Option>(19)?.map(|v| v as u64), - status_code: row.get::<_, i64>(20)? as u16, - error_message: row.get(21)?, - created_at: row.get(22)?, - data_source: row.get(23)?, - }) - })?; + let rows = stmt.query_map(params_refs.as_slice(), row_to_request_log_detail)?; let mut logs = Vec::new(); let mut provider_cache = HashMap::new(); @@ -995,36 +1146,7 @@ impl Database { LEFT JOIN providers p ON l.provider_id = p.id AND l.app_type = p.app_type WHERE l.request_id = ?" ); - let result = conn.query_row(&detail_sql, [request_id], |row| { - Ok(RequestLogDetail { - request_id: row.get(0)?, - provider_id: row.get(1)?, - provider_name: row.get(2)?, - app_type: row.get(3)?, - model: row.get(4)?, - request_model: row.get(5)?, - cost_multiplier: row - .get::<_, Option>(6)? - .unwrap_or_else(|| "1".to_string()), - input_tokens: row.get::<_, i64>(7)? as u32, - output_tokens: row.get::<_, i64>(8)? as u32, - cache_read_tokens: row.get::<_, i64>(9)? as u32, - cache_creation_tokens: row.get::<_, i64>(10)? as u32, - input_cost_usd: row.get(11)?, - output_cost_usd: row.get(12)?, - cache_read_cost_usd: row.get(13)?, - cache_creation_cost_usd: row.get(14)?, - total_cost_usd: row.get(15)?, - is_streaming: row.get::<_, i64>(16)? != 0, - latency_ms: row.get::<_, i64>(17)? as u64, - first_token_ms: row.get::<_, Option>(18)?.map(|v| v as u64), - duration_ms: row.get::<_, Option>(19)?.map(|v| v as u64), - status_code: row.get::<_, i64>(20)? as u16, - error_message: row.get(21)?, - created_at: row.get(22)?, - data_source: row.get(23)?, - }) - }); + let result = conn.query_row(&detail_sql, [request_id], row_to_request_log_detail); match result { Ok(mut detail) => { @@ -1155,27 +1277,80 @@ struct PricingInfo { } impl Database { + /// Recalculate stored zero-cost usage rows once pricing becomes available. + pub(crate) fn backfill_missing_usage_costs(&self) -> Result { + let conn = lock_conn!(self.conn); + Self::backfill_missing_usage_costs_on_conn(&conn) + } + + fn backfill_missing_usage_costs_on_conn(conn: &Connection) -> Result { + let mut logs = { + let mut stmt = conn.prepare( + "SELECT request_id, provider_id, NULL AS provider_name, app_type, model, request_model, + cost_multiplier, + input_tokens, output_tokens, cache_read_tokens, cache_creation_tokens, + input_cost_usd, output_cost_usd, cache_read_cost_usd, + cache_creation_cost_usd, total_cost_usd, is_streaming, latency_ms, + first_token_ms, duration_ms, status_code, error_message, created_at, + data_source + FROM proxy_request_logs + WHERE CAST(total_cost_usd AS REAL) <= 0 + AND (input_tokens > 0 OR output_tokens > 0 + OR cache_read_tokens > 0 OR cache_creation_tokens > 0)", + )?; + + let rows = stmt.query_map([], row_to_request_log_detail)?; + rows.collect::, _>>()? + }; + + if logs.is_empty() { + return Ok(0); + } + + let tx = conn + .unchecked_transaction() + .map_err(|e| AppError::Database(format!("启动用量成本回填事务失败: {e}")))?; + + let mut updated = 0u64; + let mut provider_cache = HashMap::new(); + let mut pricing_cache = HashMap::new(); + for log in &mut logs { + if Self::maybe_backfill_log_costs(&tx, log, &mut provider_cache, &mut pricing_cache)? { + updated += 1; + } + } + tx.commit() + .map_err(|e| AppError::Database(format!("提交用量成本回填事务失败: {e}")))?; + + if updated > 0 { + log::info!("已回填 {updated} 条缺失的用量成本"); + } + + Ok(updated) + } + + /// 尝试为单条 log 回填成本字段。返回是否实际写入（true=已 UPDATE，false=跳过）。 fn maybe_backfill_log_costs( conn: &Connection, log: &mut RequestLogDetail, provider_cache: &mut HashMap<(String, String), rust_decimal::Decimal>, pricing_cache: &mut HashMap, - ) -> Result<(), AppError> { - let total_cost = rust_decimal::Decimal::from_str(&log.total_cost_usd) + ) -> Result { + let existing_cost = rust_decimal::Decimal::from_str(&log.total_cost_usd) .unwrap_or(rust_decimal::Decimal::ZERO); - let has_cost = total_cost > rust_decimal::Decimal::ZERO; + let has_cost = existing_cost > rust_decimal::Decimal::ZERO; let has_usage = log.input_tokens > 0 || log.output_tokens > 0 || log.cache_read_tokens > 0 || log.cache_creation_tokens > 0; if has_cost || !has_usage { - return Ok(()); + return Ok(false); } let pricing = match Self::get_model_pricing_cached(conn, pricing_cache, &log.model)? { Some(info) => info, - None => return Ok(()), + None => return Ok(false), }; let multiplier = Self::get_cost_multiplier_cached( conn, @@ -1231,7 +1406,7 @@ impl Database { ) .map_err(|e| AppError::Database(format!("更新请求成本失败: {e}")))?; - Ok(()) + Ok(true) } fn get_cost_multiplier_cached( @@ -1310,7 +1485,8 @@ pub(crate) fn find_model_pricing_row( .next() .unwrap_or(model_id) .trim() - .replace('@', "-"); + .replace('@', "-") + .to_ascii_lowercase(); // 精确匹配清洗后的名称 let exact = conn @@ -1351,6 +1527,152 @@ mod tests { } } + #[allow(clippy::too_many_arguments)] + fn insert_usage_log( + conn: &Connection, + request_id: &str, + app_type: &str, + provider_id: &str, + model: &str, + data_source: &str, + created_at: i64, + input_tokens: i64, + output_tokens: i64, + cache_read_tokens: i64, + cache_creation_tokens: i64, + status_code: i64, + total_cost_usd: &str, + ) -> Result<(), AppError> { + conn.execute( + "INSERT INTO proxy_request_logs ( + request_id, provider_id, app_type, model, request_model, + input_tokens, output_tokens, cache_read_tokens, cache_creation_tokens, + input_cost_usd, output_cost_usd, cache_read_cost_usd, cache_creation_cost_usd, + total_cost_usd, latency_ms, status_code, created_at, data_source + ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, '0', '0', '0', '0', ?, 100, ?, ?, ?)", + params![ + request_id, + provider_id, + app_type, + model, + model, + input_tokens, + output_tokens, + cache_read_tokens, + cache_creation_tokens, + total_cost_usd, + status_code, + created_at, + data_source + ], + )?; + Ok(()) + } + + fn create_legacy_nullable_logs_table(conn: &Connection) -> Result<(), AppError> { + conn.execute( + "CREATE TABLE proxy_request_logs ( + request_id TEXT PRIMARY KEY, + app_type TEXT NOT NULL, + model TEXT NOT NULL, + input_tokens INTEGER NOT NULL, + output_tokens INTEGER NOT NULL, + cache_read_tokens INTEGER NOT NULL, + cache_creation_tokens INTEGER NOT NULL, + status_code INTEGER NOT NULL, + created_at INTEGER NOT NULL, + data_source TEXT + )", + [], + )?; + Ok(()) + } + + #[test] + fn test_effective_filter_keeps_legacy_null_data_source_proxy_rows() -> Result<(), AppError> { + let conn = Connection::open_in_memory()?; + create_legacy_nullable_logs_table(&conn)?; + conn.execute( + "INSERT INTO proxy_request_logs ( + request_id, app_type, model, input_tokens, output_tokens, + cache_read_tokens, cache_creation_tokens, status_code, created_at, data_source + ) VALUES ('legacy-proxy', 'codex', 'gpt-5.5', 10, 2, 1, 0, 200, 1000, NULL)", + [], + )?; + + let filter = effective_usage_log_filter("l"); + let sql = format!("SELECT COUNT(*) FROM proxy_request_logs l WHERE {filter}"); + let count: i64 = conn.query_row(&sql, [], |row| row.get(0))?; + assert_eq!(count, 1); + + Ok(()) + } + + #[test] + fn test_matching_proxy_log_treats_legacy_null_data_source_as_proxy() -> Result<(), AppError> { + let conn = Connection::open_in_memory()?; + create_legacy_nullable_logs_table(&conn)?; + conn.execute( + "INSERT INTO proxy_request_logs ( + request_id, app_type, model, input_tokens, output_tokens, + cache_read_tokens, cache_creation_tokens, status_code, created_at, data_source + ) VALUES ('legacy-proxy', 'codex', 'gpt-5.5', 10, 2, 1, 0, 200, 1000, NULL)", + [], + )?; + + let key = DedupKey { + app_type: "codex", + model: "gpt-5.5", + input_tokens: 10, + output_tokens: 2, + cache_read_tokens: 1, + cache_creation_tokens: 0, + created_at: 1000, + }; + assert!(has_matching_proxy_usage_log(&conn, &key)?); + + Ok(()) + } + + #[test] + fn test_backfill_missing_usage_costs_uses_new_gpt_5_5_pricing() -> Result<(), AppError> { + let db = Database::memory()?; + + { + let conn = lock_conn!(db.conn); + insert_usage_log( + &conn, + "codex-gpt-5-5-zero-cost", + "codex", + "_codex_session", + "gpt-5.5", + "codex_session", + 1000, + 1_000_000, + 1_000_000, + 0, + 0, + 200, + "0", + )?; + } + + assert_eq!(db.backfill_missing_usage_costs()?, 1); + + let conn = lock_conn!(db.conn); + let (input_cost, output_cost, total_cost): (String, String, String) = conn.query_row( + "SELECT input_cost_usd, output_cost_usd, total_cost_usd + FROM proxy_request_logs WHERE request_id = 'codex-gpt-5-5-zero-cost'", + [], + |row| Ok((row.get(0)?, row.get(1)?, row.get(2)?)), + )?; + assert_eq!(input_cost, "5.000000"); + assert_eq!(output_cost, "30.000000"); + assert_eq!(total_cost, "35.000000"); + + Ok(()) + } + #[test] fn test_get_usage_summary() -> Result<(), AppError> { let db = Database::memory()?; @@ -1525,6 +1847,359 @@ mod tests { Ok(()) } + #[test] + fn test_effective_usage_dedup_prefers_proxy_for_session_sources() -> Result<(), AppError> { + let db = Database::memory()?; + + { + let conn = lock_conn!(db.conn); + insert_usage_log( + &conn, + "codex-proxy", + "codex", + "openai", + "GPT-5.4", + "proxy", + 10_000, + 100, + 20, + 10, + 7, + 200, + "0.10", + )?; + insert_usage_log( + &conn, + "codex-session-dup", + "codex", + "_codex_session", + "gpt-5.4", + "codex_session", + 10_060, + 100, + 20, + 10, + 0, + 200, + "0.10", + )?; + insert_usage_log( + &conn, + "claude-proxy", + "claude", + "openai-compatible", + "claude-sonnet-4-5", + "proxy", + 25_000, + 300, + 60, + 20, + 5, + 200, + "0.30", + )?; + insert_usage_log( + &conn, + "claude-session-dup", + "claude", + "_session", + "claude-sonnet-4-5", + "session_log", + 25_060, + 300, + 60, + 20, + 5, + 200, + "0.30", + )?; + insert_usage_log( + &conn, + "gemini-proxy", + "gemini", + "google", + "gemini-2.5-pro", + "proxy", + 20_000, + 200, + 40, + 30, + 0, + 200, + "0.20", + )?; + insert_usage_log( + &conn, + "gemini-session-dup", + "gemini", + "_gemini_session", + "gemini-2.5-pro", + "gemini_session", + 20_060, + 200, + 40, + 30, + 0, + 200, + "0.20", + )?; + insert_usage_log( + &conn, + "codex-session-only", + "codex", + "_codex_session", + "gpt-5.4", + "codex_session", + 30_000, + 50, + 5, + 0, + 0, + 200, + "0.02", + )?; + } + + let summary = db.get_usage_summary(None, None, None)?; + assert_eq!(summary.total_requests, 4); + assert_eq!(summary.total_input_tokens, 650); + assert_eq!(summary.total_output_tokens, 125); + assert_eq!(summary.total_cache_read_tokens, 60); + assert_eq!(summary.total_cache_creation_tokens, 12); + + let trends = db.get_daily_trends(Some(0), Some(40_000), None)?; + assert_eq!(trends.iter().map(|stat| stat.request_count).sum::(), 4); + + let provider_stats = db.get_provider_stats(None, None, None)?; + assert_eq!( + provider_stats + .iter() + .map(|stat| stat.request_count) + .sum::(), + 4 + ); + assert!(provider_stats + .iter() + .any(|stat| stat.provider_id == "_codex_session" && stat.request_count == 1)); + assert!(!provider_stats + .iter() + .any(|stat| stat.provider_id == "_gemini_session")); + assert!(!provider_stats + .iter() + .any(|stat| stat.provider_id == "_session")); + + let model_stats = db.get_model_stats(None, None, None)?; + assert_eq!( + model_stats + .iter() + .map(|stat| stat.request_count) + .sum::(), + 4 + ); + + let logs = db.get_request_logs(&LogFilters::default(), 0, 10)?; + let request_ids: Vec<&str> = logs + .data + .iter() + .map(|log| log.request_id.as_str()) + .collect(); + assert_eq!(logs.total, 4); + assert!(request_ids.contains(&"codex-proxy")); + assert!(request_ids.contains(&"claude-proxy")); + assert!(request_ids.contains(&"gemini-proxy")); + assert!(request_ids.contains(&"codex-session-only")); + assert!(!request_ids.contains(&"codex-session-dup")); + assert!(!request_ids.contains(&"claude-session-dup")); + assert!(!request_ids.contains(&"gemini-session-dup")); + + let breakdown = crate::services::session_usage::get_data_source_breakdown(&db)?; + let proxy_count = breakdown + .iter() + .find(|item| item.data_source == "proxy") + .map(|item| item.request_count); + let codex_session_count = breakdown + .iter() + .find(|item| item.data_source == "codex_session") + .map(|item| item.request_count); + let gemini_session_count = breakdown + .iter() + .find(|item| item.data_source == "gemini_session") + .map(|item| item.request_count); + let session_log_count = breakdown + .iter() + .find(|item| item.data_source == "session_log") + .map(|item| item.request_count); + assert_eq!(proxy_count, Some(3)); + assert_eq!(codex_session_count, Some(1)); + assert_eq!(gemini_session_count, None); + assert_eq!(session_log_count, None); + + Ok(()) + } + + #[test] + fn test_effective_usage_dedup_keeps_non_matching_session_rows() -> Result<(), AppError> { + let db = Database::memory()?; + + { + let conn = lock_conn!(db.conn); + insert_usage_log( + &conn, + "proxy-base", + "codex", + "openai", + "gpt-5.4", + "proxy", + 10_000, + 100, + 20, + 10, + 0, + 200, + "0.10", + )?; + insert_usage_log( + &conn, + "session-outside-window", + "codex", + "_codex_session", + "gpt-5.4", + "codex_session", + 10_601, + 100, + 20, + 10, + 0, + 200, + "0.10", + )?; + insert_usage_log( + &conn, + "session-token-mismatch", + "codex", + "_codex_session", + "gpt-5.4", + "codex_session", + 10_060, + 101, + 20, + 10, + 0, + 200, + "0.10", + )?; + insert_usage_log( + &conn, + "session-app-mismatch", + "gemini", + "_gemini_session", + "gpt-5.4", + "gemini_session", + 10_060, + 100, + 20, + 10, + 0, + 200, + "0.10", + )?; + insert_usage_log( + &conn, + "session-model-mismatch", + "codex", + "_codex_session", + "different-model", + "codex_session", + 10_060, + 100, + 20, + 10, + 0, + 200, + "0.10", + )?; + insert_usage_log( + &conn, + "proxy-error", + "codex", + "openai", + "gpt-5.4", + "proxy", + 20_000, + 300, + 60, + 0, + 0, + 500, + "0.00", + )?; + insert_usage_log( + &conn, + "session-matches-error-proxy", + "codex", + "_codex_session", + "gpt-5.4", + "codex_session", + 20_060, + 300, + 60, + 0, + 0, + 200, + "0.30", + )?; + insert_usage_log( + &conn, + "claude-proxy-cache-creation", + "claude", + "anthropic", + "claude-sonnet-4-5", + "proxy", + 30_000, + 100, + 20, + 10, + 5, + 200, + "0.10", + )?; + insert_usage_log( + &conn, + "claude-session-cache-creation-mismatch", + "claude", + "_session", + "claude-sonnet-4-5", + "session_log", + 30_060, + 100, + 20, + 10, + 0, + 200, + "0.10", + )?; + } + + let summary = db.get_usage_summary(None, None, None)?; + assert_eq!(summary.total_requests, 9); + + let logs = db.get_request_logs(&LogFilters::default(), 0, 10)?; + let request_ids: Vec<&str> = logs + .data + .iter() + .map(|log| log.request_id.as_str()) + .collect(); + assert_eq!(logs.total, 9); + assert!(request_ids.contains(&"session-outside-window")); + assert!(request_ids.contains(&"session-token-mismatch")); + assert!(request_ids.contains(&"session-app-mismatch")); + assert!(request_ids.contains(&"session-model-mismatch")); + assert!(request_ids.contains(&"session-matches-error-proxy")); + assert!(request_ids.contains(&"claude-session-cache-creation-mismatch")); + + Ok(()) + } + #[test] fn test_get_model_stats() -> Result<(), AppError> { let db = Database::memory()?; @@ -1920,6 +2595,11 @@ mod tests { result.is_some(), "带 @ 分隔符的模型 gpt-5.2-codex@low 应能匹配到 gpt-5.2-codex-low" ); + let result = find_model_pricing_row(&conn, "OpenAI/GPT-5.5@HIGH")?; + assert!( + result.is_some(), + "大小写混合的 GPT-5.5 模型应能归一化匹配到 gpt-5.5-high" + ); // 测试不存在的模型 let result = find_model_pricing_row(&conn, "unknown-model-123")?; diff --git a/src-tauri/src/session_manager/mod.rs b/src-tauri/src/session_manager/mod.rs index 747f169e5..2a630c98c 100644 --- a/src-tauri/src/session_manager/mod.rs +++ b/src-tauri/src/session_manager/mod.rs @@ -4,7 +4,7 @@ pub mod terminal; use serde::{Deserialize, Serialize}; use std::path::{Path, PathBuf}; -use providers::{claude, codex, gemini, openclaw, opencode}; +use providers::{claude, codex, gemini, hermes, openclaw, opencode}; #[derive(Debug, Clone, Serialize)] #[serde(rename_all = "camelCase")] @@ -56,18 +56,20 @@ pub struct DeleteSessionOutcome { } pub fn scan_sessions() -> Vec { - let (r1, r2, r3, r4, r5) = std::thread::scope(|s| { + let (r1, r2, r3, r4, r5, r6) = std::thread::scope(|s| { let h1 = s.spawn(codex::scan_sessions); let h2 = s.spawn(claude::scan_sessions); let h3 = s.spawn(opencode::scan_sessions); let h4 = s.spawn(openclaw::scan_sessions); let h5 = s.spawn(gemini::scan_sessions); + let h6 = s.spawn(hermes::scan_sessions); ( h1.join().unwrap_or_default(), h2.join().unwrap_or_default(), h3.join().unwrap_or_default(), h4.join().unwrap_or_default(), h5.join().unwrap_or_default(), + h6.join().unwrap_or_default(), ) }); @@ -77,6 +79,7 @@ pub fn scan_sessions() -> Vec { sessions.extend(r3); sessions.extend(r4); sessions.extend(r5); + sessions.extend(r6); sessions.sort_by(|a, b| { let a_ts = a.last_active_at.or(a.created_at).unwrap_or(0); @@ -88,10 +91,13 @@ pub fn scan_sessions() -> Vec { } pub fn load_messages(provider_id: &str, source_path: &str) -> Result, String> { - // OpenCode SQLite sessions use a "sqlite:" prefixed source_path + // SQLite sessions use a "sqlite:" prefixed source_path if provider_id == "opencode" && source_path.starts_with("sqlite:") { return opencode::load_messages_sqlite(source_path); } + if provider_id == "hermes" && source_path.starts_with("sqlite:") { + return hermes::load_messages_sqlite(source_path); + } let path = Path::new(source_path); match provider_id { @@ -100,6 +106,7 @@ pub fn load_messages(provider_id: &str, source_path: &str) -> Result opencode::load_messages(path), "openclaw" => openclaw::load_messages(path), "gemini" => gemini::load_messages(path), + "hermes" => hermes::load_messages(path), _ => Err(format!("Unsupported provider: {provider_id}")), } } @@ -109,10 +116,13 @@ pub fn delete_session( session_id: &str, source_path: &str, ) -> Result { - // OpenCode SQLite sessions bypass the file-based deletion path + // SQLite sessions bypass the file-based deletion path if provider_id == "opencode" && source_path.starts_with("sqlite:") { return opencode::delete_session_sqlite(session_id, source_path); } + if provider_id == "hermes" && source_path.starts_with("sqlite:") { + return hermes::delete_session_sqlite(session_id, source_path); + } let root = provider_root(provider_id)?; delete_session_with_root(provider_id, session_id, Path::new(source_path), &root) @@ -150,6 +160,7 @@ fn delete_session_with_root( "opencode" => opencode::delete_session(&validated_root, &validated_source, session_id), "openclaw" => openclaw::delete_session(&validated_root, &validated_source, session_id), "gemini" => gemini::delete_session(&validated_root, &validated_source, session_id), + "hermes" => hermes::delete_session(&validated_root, &validated_source, session_id), _ => Err(format!("Unsupported provider: {provider_id}")), } } @@ -161,6 +172,7 @@ fn provider_root(provider_id: &str) -> Result { "opencode" => opencode::get_opencode_data_dir(), "openclaw" => crate::openclaw_config::get_openclaw_dir().join("agents"), "gemini" => crate::gemini_config::get_gemini_dir().join("tmp"), + "hermes" => crate::hermes_config::get_hermes_dir().join("sessions"), _ => return Err(format!("Unsupported provider: {provider_id}")), }; diff --git a/src-tauri/src/session_manager/providers/codex.rs b/src-tauri/src/session_manager/providers/codex.rs index 5d3c7d364..05775ebdc 100644 --- a/src-tauri/src/session_manager/providers/codex.rs +++ b/src-tauri/src/session_manager/providers/codex.rs @@ -143,6 +143,9 @@ fn parse_session(path: &Path) -> Option { } if value.get("type").and_then(Value::as_str) == Some("session_meta") { if let Some(payload) = value.get("payload") { + if is_subagent_source(payload.get("source")) { + return None; + } if session_id.is_none() { session_id = payload .get("id") @@ -170,7 +173,10 @@ fn parse_session(path: &Path) -> Option { { let text = payload.get("content").map(extract_text).unwrap_or_default(); let trimmed = text.trim(); - if !trimmed.is_empty() && !trimmed.starts_with("# AGENTS.md") { + if !trimmed.is_empty() + && !trimmed.starts_with("# AGENTS.md") + && !trimmed.starts_with("") + { first_user_message = Some(trimmed.to_string()); } } @@ -239,6 +245,13 @@ fn parse_session(path: &Path) -> Option { }) } +fn is_subagent_source(source: Option<&Value>) -> bool { + source + .and_then(|value| value.as_object()) + .map(|source| source.contains_key("subagent")) + .unwrap_or(false) +} + fn infer_session_id_from_filename(path: &Path) -> Option { let file_name = path.file_name()?.to_string_lossy(); UUID_RE.find(&file_name).map(|mat| mat.as_str().to_string()) @@ -328,6 +341,41 @@ mod tests { assert_eq!(meta.title.as_deref(), Some("Fix the login bug")); } + #[test] + fn parse_session_skips_subagent_sessions() { + let temp = tempdir().expect("tempdir"); + let path = temp.path().join("session.jsonl"); + std::fs::write( + &path, + concat!( + "{\"timestamp\":\"2026-04-28T10:00:00Z\",\"type\":\"session_meta\",\"payload\":{\"id\":\"subagent-id\",\"cwd\":\"/tmp/project\",\"originator\":\"codex-tui\",\"source\":{\"subagent\":{\"thread_spawn\":{\"parent_thread_id\":\"parent-id\",\"depth\":1,\"agent_role\":\"explorer\"}}}}}\n", + "{\"timestamp\":\"2026-04-28T10:00:01Z\",\"type\":\"response_item\",\"payload\":{\"type\":\"message\",\"role\":\"user\",\"content\":\"Inspect the project\"}}\n" + ), + ) + .expect("write"); + + assert!(parse_session(&path).is_none()); + } + + #[test] + fn parse_session_skips_environment_context_injection() { + let temp = tempdir().expect("tempdir"); + let path = temp.path().join("session.jsonl"); + std::fs::write( + &path, + concat!( + "{\"timestamp\":\"2026-03-06T21:50:12Z\",\"type\":\"session_meta\",\"payload\":{\"id\":\"test-id\",\"cwd\":\"/tmp/project\"}}\n", + "{\"timestamp\":\"2026-03-06T21:50:13Z\",\"type\":\"response_item\",\"payload\":{\"type\":\"message\",\"role\":\"user\",\"content\":\"\\n /tmp/project\\n\"}}\n", + "{\"timestamp\":\"2026-03-06T21:50:14Z\",\"type\":\"response_item\",\"payload\":{\"type\":\"message\",\"role\":\"user\",\"content\":\"Fix the login bug\"}}\n" + ), + ) + .expect("write"); + + let meta = parse_session(&path).unwrap(); + // Should skip environment_context injection and use the real user message + assert_eq!(meta.title.as_deref(), Some("Fix the login bug")); + } + #[test] fn parse_session_falls_back_to_dir_basename() { let temp = tempdir().expect("tempdir"); diff --git a/src-tauri/src/session_manager/providers/gemini.rs b/src-tauri/src/session_manager/providers/gemini.rs index c600f7bd7..82cb6fcd8 100644 --- a/src-tauri/src/session_manager/providers/gemini.rs +++ b/src-tauri/src/session_manager/providers/gemini.rs @@ -17,7 +17,7 @@ pub fn scan_sessions() -> Vec { let mut sessions = Vec::new(); - // Iterate over project hash directories: tmp//chats/session-*.json + // Iterate over project directories: tmp//chats/session-*.json let project_dirs = match std::fs::read_dir(&tmp_dir) { Ok(entries) => entries, Err(_) => return Vec::new(), @@ -34,13 +34,19 @@ pub fn scan_sessions() -> Vec { Err(_) => continue, }; + let project_root_file = entry.path().join(".project_root"); + let project_dir = std::fs::read_to_string(project_root_file).ok(); + for file_entry in chat_files.flatten() { let path = file_entry.path(); if path.extension().and_then(|e| e.to_str()) != Some("json") { continue; } if let Some(meta) = parse_session(&path) { - sessions.push(meta); + sessions.push(SessionMeta { + project_dir: project_dir.clone(), + ..meta + }); } } } @@ -159,7 +165,7 @@ fn parse_session(path: &Path) -> Option { session_id: session_id.clone(), title: title.clone(), summary: title, - project_dir: None, // project hash is not reversible + project_dir: None, // (optionally) populated later created_at, last_active_at: last_active_at.or(created_at), source_path: Some(source_path), diff --git a/src-tauri/src/session_manager/providers/hermes.rs b/src-tauri/src/session_manager/providers/hermes.rs new file mode 100644 index 000000000..837e0d6dc --- /dev/null +++ b/src-tauri/src/session_manager/providers/hermes.rs @@ -0,0 +1,603 @@ +use std::fs::File; +use std::io::{BufRead, BufReader}; +use std::path::{Path, PathBuf}; + +use rusqlite::Connection; +use serde_json::Value; + +use crate::hermes_config::get_hermes_dir; +use crate::session_manager::{SessionMessage, SessionMeta}; + +use super::utils::{ + extract_text, parse_timestamp_to_ms, read_head_tail_lines, truncate_summary, TITLE_MAX_CHARS, +}; + +const PROVIDER_ID: &str = "hermes"; + +fn get_hermes_db_path() -> PathBuf { + get_hermes_dir().join("state.db") +} + +fn get_hermes_sessions_dir() -> PathBuf { + get_hermes_dir().join("sessions") +} + +/// Scan sessions from both SQLite database and JSONL transcript files, +/// with SQLite taking precedence on ID conflicts. +pub fn scan_sessions() -> Vec { + let sqlite_sessions = scan_sessions_sqlite(); + let jsonl_sessions = scan_sessions_jsonl(); + + if sqlite_sessions.is_empty() { + return jsonl_sessions; + } + if jsonl_sessions.is_empty() { + return sqlite_sessions; + } + + let sqlite_ids: std::collections::HashSet = sqlite_sessions + .iter() + .map(|s| s.session_id.clone()) + .collect(); + + let mut merged = sqlite_sessions; + for s in jsonl_sessions { + if !sqlite_ids.contains(&s.session_id) { + merged.push(s); + } + } + merged +} + +// ── SQLite scanning ───────────────────────────────────────────────── + +fn scan_sessions_sqlite() -> Vec { + let db_path = get_hermes_db_path(); + if !db_path.exists() { + return Vec::new(); + } + + let conn = match Connection::open_with_flags( + &db_path, + rusqlite::OpenFlags::SQLITE_OPEN_READ_ONLY | rusqlite::OpenFlags::SQLITE_OPEN_NO_MUTEX, + ) { + Ok(c) => c, + Err(_) => return Vec::new(), + }; + + // Check if sessions table exists + let has_sessions: bool = conn + .query_row( + "SELECT COUNT(*) > 0 FROM sqlite_master WHERE type='table' AND name='sessions'", + [], + |row| row.get(0), + ) + .unwrap_or(false); + + if !has_sessions { + return Vec::new(); + } + + // Query sessions — use flexible column access via pragma + let columns = get_table_columns(&conn, "sessions"); + + let query = "SELECT * FROM sessions ORDER BY rowid DESC LIMIT 500"; + let mut stmt = match conn.prepare(query) { + Ok(s) => s, + Err(_) => return Vec::new(), + }; + + let mut sessions = Vec::new(); + let rows = match stmt.query_map([], |row| Ok(row_to_json(row, &columns))) { + Ok(r) => r, + Err(_) => return Vec::new(), + }; + + let db_source = format!("sqlite:{}", db_path.display()); + + for row_result in rows.flatten() { + if let Some(meta) = sqlite_row_to_session_meta(&row_result, &db_source) { + sessions.push(meta); + } + } + + sessions +} + +fn sqlite_row_to_session_meta(row: &Value, db_source: &str) -> Option { + let obj = row.as_object()?; + + let session_id = obj.get("id").and_then(Value::as_str)?.to_string(); + + let title = obj + .get("title") + .and_then(Value::as_str) + .filter(|s| !s.is_empty()) + .map(|s| truncate_summary(s, TITLE_MAX_CHARS).to_string()); + + let cwd = obj + .get("cwd") + .or_else(|| obj.get("directory")) + .and_then(Value::as_str) + .filter(|s| !s.is_empty()) + .map(|s| s.to_string()); + + let started_at = obj + .get("started_at") + .or_else(|| obj.get("created_at")) + .and_then(parse_timestamp_to_ms); + + let ended_at = obj + .get("ended_at") + .or_else(|| obj.get("updated_at")) + .and_then(parse_timestamp_to_ms); + + let source_path = format!("{}#{}", db_source, session_id); + + Some(SessionMeta { + provider_id: PROVIDER_ID.to_string(), + session_id, + title, + summary: None, + project_dir: cwd, + created_at: started_at, + last_active_at: ended_at.or(started_at), + source_path: Some(source_path), + resume_command: None, + }) +} + +/// Get column names for a table. +fn get_table_columns(conn: &Connection, table: &str) -> Vec { + let query = format!("PRAGMA table_info({table})"); + let mut stmt = match conn.prepare(&query) { + Ok(s) => s, + Err(_) => return Vec::new(), + }; + let rows = match stmt.query_map([], |row| { + let name: String = row.get(1)?; + Ok(name) + }) { + Ok(r) => r, + Err(_) => return Vec::new(), + }; + rows.flatten().collect() +} + +/// Convert a SQLite row to a JSON Value using known column names. +fn row_to_json(row: &rusqlite::Row, columns: &[String]) -> Value { + let mut map = serde_json::Map::new(); + for (i, col) in columns.iter().enumerate() { + // Try string first, then integer, then float, then null + if let Ok(val) = row.get::<_, String>(i) { + map.insert(col.clone(), Value::String(val)); + } else if let Ok(val) = row.get::<_, i64>(i) { + map.insert(col.clone(), Value::Number(val.into())); + } else if let Ok(val) = row.get::<_, f64>(i) { + if let Some(n) = serde_json::Number::from_f64(val) { + map.insert(col.clone(), Value::Number(n)); + } + } else { + map.insert(col.clone(), Value::Null); + } + } + Value::Object(map) +} + +/// Load messages from the Hermes SQLite database. +pub fn load_messages_sqlite(source: &str) -> Result, String> { + let (db_path, session_id) = parse_sqlite_source(source) + .ok_or_else(|| format!("Invalid SQLite source reference: {source}"))?; + + let conn = Connection::open_with_flags( + &db_path, + rusqlite::OpenFlags::SQLITE_OPEN_READ_ONLY | rusqlite::OpenFlags::SQLITE_OPEN_NO_MUTEX, + ) + .map_err(|e| format!("Failed to open Hermes database: {e}"))?; + + // Try querying with common column names + let query = + "SELECT role, content, created_at FROM messages WHERE session_id = ?1 ORDER BY created_at ASC"; + + let mut stmt = conn + .prepare(query) + .map_err(|e| format!("Failed to prepare messages query: {e}"))?; + + let rows = stmt + .query_map([session_id.as_str()], |row| { + let role: String = row.get(0)?; + let content: String = row.get(1)?; + let ts: Option = row.get(2).ok(); + Ok((role, content, ts)) + }) + .map_err(|e| format!("Failed to query messages: {e}"))?; + + let mut messages = Vec::new(); + for row in rows.flatten() { + let (role, content, ts) = row; + if content.trim().is_empty() { + continue; + } + let ts_ms = ts.and_then(|v| parse_timestamp_to_ms(&Value::Number(v.into()))); + messages.push(SessionMessage { + role, + content, + ts: ts_ms, + }); + } + + Ok(messages) +} + +/// Delete a session from the Hermes SQLite database. +pub fn delete_session_sqlite(session_id: &str, source: &str) -> Result { + let (db_path, ref_session_id) = parse_sqlite_source(source) + .ok_or_else(|| format!("Invalid SQLite source reference: {source}"))?; + let db_path = db_path + .canonicalize() + .map_err(|e| format!("Failed to canonicalize Hermes database path: {e}"))?; + let expected_db_path = get_hermes_db_path() + .canonicalize() + .map_err(|e| format!("Failed to canonicalize expected Hermes database path: {e}"))?; + + if ref_session_id != session_id { + return Err(format!( + "Hermes SQLite session ID mismatch: expected {session_id}, found {ref_session_id}" + )); + } + if db_path != expected_db_path { + return Err("SQLite path does not match expected Hermes database".to_string()); + } + + let conn = + Connection::open(&db_path).map_err(|e| format!("Failed to open Hermes database: {e}"))?; + + let tx = conn + .unchecked_transaction() + .map_err(|e| format!("Failed to begin transaction: {e}"))?; + + // Delete messages first (child records) + let _ = tx.execute("DELETE FROM messages WHERE session_id = ?1", [session_id]); + + let deleted = tx + .execute("DELETE FROM sessions WHERE id = ?1", [session_id]) + .map_err(|e| format!("Failed to delete Hermes session: {e}"))?; + + tx.commit() + .map_err(|e| format!("Failed to commit session deletion: {e}"))?; + + Ok(deleted > 0) +} + +fn parse_sqlite_source(source: &str) -> Option<(PathBuf, String)> { + let rest = source.strip_prefix("sqlite:")?; + let hash_pos = rest.rfind('#')?; + let db_path = PathBuf::from(&rest[..hash_pos]); + let session_id = rest[hash_pos + 1..].to_string(); + if session_id.is_empty() { + return None; + } + Some((db_path, session_id)) +} + +// ── JSONL scanning ────────────────────────────────────────────────── + +fn scan_sessions_jsonl() -> Vec { + let sessions_dir = get_hermes_sessions_dir(); + if !sessions_dir.exists() { + return Vec::new(); + } + + let entries = match std::fs::read_dir(&sessions_dir) { + Ok(e) => e, + Err(_) => return Vec::new(), + }; + + let mut sessions = Vec::new(); + for entry in entries.flatten() { + let path = entry.path(); + let ext = path.extension().and_then(|e| e.to_str()); + if ext != Some("jsonl") && ext != Some("json") { + continue; + } + if let Some(meta) = parse_jsonl_session(&path) { + sessions.push(meta); + } + } + sessions +} + +fn parse_jsonl_session(path: &Path) -> Option { + // Read head (metadata + first user message) and tail (last timestamp) + let (head, tail) = read_head_tail_lines(path, 30, 10).ok()?; + + let mut first_user_msg: Option = None; + let mut first_ts: Option = None; + let mut last_ts: Option = None; + let mut session_id: Option = None; + let mut title: Option = None; + let mut cwd: Option = None; + + // Process head lines for metadata and first user message + for line in &head { + if line.trim().is_empty() { + continue; + } + let value: Value = match serde_json::from_str(line) { + Ok(v) => v, + Err(_) => continue, + }; + + let ts = value + .get("timestamp") + .or_else(|| value.get("ts")) + .and_then(parse_timestamp_to_ms); + + if first_ts.is_none() { + first_ts = ts; + } + last_ts = ts.or(last_ts); + + let line_type = value.get("type").and_then(Value::as_str).unwrap_or(""); + + // Extract session metadata from session-type lines + if line_type == "session" || line_type == "init" { + if session_id.is_none() { + session_id = value + .get("id") + .or_else(|| value.get("sessionId")) + .and_then(Value::as_str) + .map(|s| s.to_string()); + } + if title.is_none() { + title = value + .get("title") + .and_then(Value::as_str) + .filter(|s| !s.is_empty()) + .map(|s| s.to_string()); + } + if cwd.is_none() { + cwd = value + .get("cwd") + .or_else(|| value.get("directory")) + .and_then(Value::as_str) + .filter(|s| !s.is_empty()) + .map(|s| s.to_string()); + } + } + + if first_user_msg.is_none() { + let role = value + .get("role") + .or_else(|| value.get("message").and_then(|m| m.get("role"))) + .and_then(Value::as_str); + + if role == Some("user") { + let content = value + .get("content") + .or_else(|| value.get("message").and_then(|m| m.get("content"))); + if let Some(c) = content { + let text = extract_text(c); + if !text.trim().is_empty() { + first_user_msg = Some(truncate_summary(&text, TITLE_MAX_CHARS).to_string()); + } + } + } + } + } + + // Process tail lines for the most recent timestamp + for line in tail.iter().rev() { + if line.trim().is_empty() { + continue; + } + let value: Value = match serde_json::from_str(line) { + Ok(v) => v, + Err(_) => continue, + }; + let ts = value + .get("timestamp") + .or_else(|| value.get("ts")) + .and_then(parse_timestamp_to_ms); + if let Some(t) = ts { + last_ts = Some(t); + break; + } + } + + // Fall back to filename as session ID + let session_id = session_id.unwrap_or_else(|| { + path.file_stem() + .and_then(|s| s.to_str()) + .unwrap_or("unknown") + .to_string() + }); + + let source_path = path.to_string_lossy().to_string(); + + Some(SessionMeta { + provider_id: PROVIDER_ID.to_string(), + session_id, + title: title.or_else(|| first_user_msg.clone()), + summary: first_user_msg, + project_dir: cwd, + created_at: first_ts, + last_active_at: last_ts.or(first_ts), + source_path: Some(source_path), + resume_command: None, + }) +} + +/// Load messages from a Hermes JSONL transcript file. +pub fn load_messages(path: &Path) -> Result, String> { + let file = File::open(path).map_err(|e| format!("Failed to open session file: {e}"))?; + let reader = BufReader::new(file); + let mut messages = Vec::new(); + + for line in reader.lines() { + let line = match line { + Ok(l) => l, + Err(_) => continue, + }; + if line.trim().is_empty() { + continue; + } + let value: Value = match serde_json::from_str(&line) { + Ok(v) => v, + Err(_) => continue, + }; + + // Support both flat messages and nested {type:"message", message:{...}} format + let (role_val, content_val, ts_val) = + if value.get("type").and_then(Value::as_str) == Some("message") { + let msg = match value.get("message") { + Some(m) => m, + None => continue, + }; + ( + msg.get("role"), + msg.get("content"), + value.get("timestamp").or_else(|| msg.get("ts")), + ) + } else { + ( + value.get("role"), + value.get("content"), + value.get("timestamp").or_else(|| value.get("ts")), + ) + }; + + let role = match role_val.and_then(Value::as_str) { + Some(r) => r.to_string(), + None => continue, + }; + + let content = content_val.map(extract_text).unwrap_or_default(); + if content.trim().is_empty() { + continue; + } + + let ts = ts_val.and_then(parse_timestamp_to_ms); + messages.push(SessionMessage { role, content, ts }); + } + + Ok(messages) +} + +/// Delete a Hermes JSONL session file. +pub fn delete_session(_root: &Path, path: &Path, _session_id: &str) -> Result { + std::fs::remove_file(path).map_err(|e| { + format!( + "Failed to delete Hermes session file {}: {e}", + path.display() + ) + })?; + Ok(true) +} + +#[cfg(test)] +mod tests { + use super::*; + use std::io::Write; + use tempfile::tempdir; + + #[test] + fn parse_sqlite_source_valid() { + let (path, id) = parse_sqlite_source("sqlite:/home/user/.hermes/state.db#session-123") + .expect("should parse"); + assert_eq!(path, PathBuf::from("/home/user/.hermes/state.db")); + assert_eq!(id, "session-123"); + } + + #[test] + fn parse_sqlite_source_invalid() { + assert!(parse_sqlite_source("not-sqlite").is_none()); + assert!(parse_sqlite_source("sqlite:").is_none()); + assert!(parse_sqlite_source("sqlite:/path#").is_none()); + } + + #[test] + fn parse_jsonl_session_extracts_metadata() { + let dir = tempdir().expect("tempdir"); + let path = dir.path().join("test-session.jsonl"); + let mut f = File::create(&path).expect("create"); + writeln!( + f, + r#"{{"type":"session","id":"s1","title":"My Session","cwd":"/home/user/project"}}"# + ) + .unwrap(); + writeln!(f, r#"{{"type":"message","message":{{"role":"user","content":"Hello world"}},"timestamp":"2026-01-01T00:00:00Z"}}"#).unwrap(); + writeln!(f, r#"{{"type":"message","message":{{"role":"assistant","content":"Hi there"}},"timestamp":"2026-01-01T00:01:00Z"}}"#).unwrap(); + f.flush().unwrap(); + + let meta = parse_jsonl_session(&path).expect("should parse"); + assert_eq!(meta.session_id, "s1"); + assert_eq!(meta.title.as_deref(), Some("My Session")); + assert_eq!(meta.project_dir.as_deref(), Some("/home/user/project")); + assert!(meta.created_at.is_some()); + assert!(meta.last_active_at.is_some()); + } + + #[test] + fn parse_jsonl_session_fallback_to_filename() { + let dir = tempdir().expect("tempdir"); + let path = dir.path().join("my-session.jsonl"); + let mut f = File::create(&path).expect("create"); + writeln!(f, r#"{{"role":"user","content":"Hello","ts":1700000000}}"#).unwrap(); + f.flush().unwrap(); + + let meta = parse_jsonl_session(&path).expect("should parse"); + assert_eq!(meta.session_id, "my-session"); + assert!(meta.title.is_some()); // Falls back to first user message + } + + #[test] + fn load_messages_flat_format() { + let dir = tempdir().expect("tempdir"); + let path = dir.path().join("session.jsonl"); + let mut f = File::create(&path).expect("create"); + writeln!( + f, + r#"{{"role":"user","content":"What is Rust?","ts":1700000000}}"# + ) + .unwrap(); + writeln!( + f, + r#"{{"role":"assistant","content":"A systems programming language.","ts":1700000001}}"# + ) + .unwrap(); + f.flush().unwrap(); + + let msgs = load_messages(&path).expect("should load"); + assert_eq!(msgs.len(), 2); + assert_eq!(msgs[0].role, "user"); + assert_eq!(msgs[1].role, "assistant"); + } + + #[test] + fn load_messages_nested_format() { + let dir = tempdir().expect("tempdir"); + let path = dir.path().join("session.jsonl"); + let mut f = File::create(&path).expect("create"); + writeln!(f, r#"{{"type":"session","id":"s1"}}"#).unwrap(); + writeln!(f, r#"{{"type":"message","message":{{"role":"user","content":"Hello"}},"timestamp":"2026-01-01T00:00:00Z"}}"#).unwrap(); + writeln!(f, r#"{{"type":"message","message":{{"role":"assistant","content":"Hi"}},"timestamp":"2026-01-01T00:01:00Z"}}"#).unwrap(); + f.flush().unwrap(); + + let msgs = load_messages(&path).expect("should load"); + assert_eq!(msgs.len(), 2); + assert_eq!(msgs[0].role, "user"); + assert!(msgs[0].ts.is_some()); + } + + #[test] + fn delete_session_removes_file() { + let dir = tempdir().expect("tempdir"); + let path = dir.path().join("session.jsonl"); + File::create(&path).expect("create"); + assert!(path.exists()); + + delete_session(dir.path(), &path, "session").expect("should delete"); + assert!(!path.exists()); + } +} diff --git a/src-tauri/src/session_manager/providers/mod.rs b/src-tauri/src/session_manager/providers/mod.rs index a2902c4db..394fdd1f8 100644 --- a/src-tauri/src/session_manager/providers/mod.rs +++ b/src-tauri/src/session_manager/providers/mod.rs @@ -1,6 +1,7 @@ pub mod claude; pub mod codex; pub mod gemini; +pub mod hermes; pub mod openclaw; pub mod opencode; mod utils; diff --git a/src-tauri/src/session_manager/terminal/mod.rs b/src-tauri/src/session_manager/terminal/mod.rs index 3e35df30e..420eff9ba 100644 --- a/src-tauri/src/session_manager/terminal/mod.rs +++ b/src-tauri/src/session_manager/terminal/mod.rs @@ -22,6 +22,8 @@ pub fn launch_terminal( "wezterm" => launch_wezterm(command, cwd), "kaku" => launch_kaku(command, cwd), "alacritty" => launch_alacritty(command, cwd), + #[cfg(unix)] + "warp" => launch_warp(command, cwd), "custom" => launch_custom(command, cwd, custom_config), _ => Err(format!("Unsupported terminal target: {target}")), } @@ -78,22 +80,7 @@ end tell"# } fn launch_ghostty(command: &str, cwd: Option<&str>) -> Result<(), String> { - let args = build_ghostty_args(command, cwd); - - let status = Command::new("open") - .args(args.iter().map(String::as_str)) - .status() - .map_err(|e| format!("Failed to launch Ghostty: {e}"))?; - - if status.success() { - Ok(()) - } else { - Err("Failed to launch Ghostty. Make sure it is installed.".to_string()) - } -} - -fn build_ghostty_args(command: &str, cwd: Option<&str>) -> Vec { - let input = ghostty_raw_input(command); + let shell = std::env::var("SHELL").unwrap_or_else(|_| "/bin/zsh".to_string()); let mut args = vec![ "-na".to_string(), @@ -108,22 +95,22 @@ fn build_ghostty_args(command: &str, cwd: Option<&str>) -> Vec { } } - args.push(format!("--input={input}")); - args -} + args.push("-e".to_string()); + args.push(shell); + args.push("-l".to_string()); + args.push("-c".to_string()); + args.push(command.to_string()); -fn ghostty_raw_input(command: &str) -> String { - let mut escaped = String::from("raw:"); - for ch in command.chars() { - match ch { - '\\' => escaped.push_str("\\\\"), - '\n' => escaped.push_str("\\n"), - '\r' => escaped.push_str("\\r"), - _ => escaped.push(ch), - } + let status = Command::new("open") + .args(&args) + .status() + .map_err(|e| format!("Failed to launch Ghostty: {e}"))?; + + if status.success() { + Ok(()) + } else { + Err("Failed to launch Ghostty. Make sure it is installed.".to_string()) } - escaped.push_str("\\n"); - escaped } fn launch_kitty(command: &str, cwd: Option<&str>) -> Result<(), String> { @@ -216,6 +203,48 @@ fn build_wezterm_compatible_args_with_shell( args } +#[cfg(unix)] +fn launch_warp(command: &str, cwd: Option<&str>) -> Result<(), String> { + use std::io::Write; + use std::os::unix::fs::PermissionsExt; + + let cwd = cwd.ok_or("Failed to resume session without cwd")?; + + let mut script_file = tempfile::Builder::new() + .disable_cleanup(true) + .permissions(std::fs::Permissions::from_mode(0o755)) + .tempfile_in(cwd) + .map_err(|e| format!("Failed to create temporary script file for launching Warp: {e}"))?; + + writeln!( + &mut script_file, + r#"#!/usr/bin/env sh + + rm -- "$0" + + exec {command} + "#, + ) + .map_err(|e| format!("Failed to write to temporary script file for Warp: {e}"))?; + + let mut warp_url = url::Url::parse("warp://action/new_tab").unwrap(); + warp_url + .query_pairs_mut() + .append_pair("path", &script_file.path().to_string_lossy()); + let warp_url = warp_url.to_string(); + + let status = Command::new("open") + .args(["-a", "Warp", &warp_url]) + .status() + .map_err(|e| format!("Failed to launch Warp: {e}"))?; + + if status.success() { + Ok(()) + } else { + Err("Failed to launch Warp.".to_string()) + } +} + fn launch_alacritty(command: &str, cwd: Option<&str>) -> Result<(), String> { // Alacritty: open -na Alacritty --args --working-directory ... -e shell -c command let full_command = build_shell_command(command, None); @@ -300,43 +329,10 @@ mod tests { use super::*; #[test] - fn ghostty_uses_shell_mode_for_resume_commands() { - let args = build_ghostty_args("claude --resume abc-123", Some("/tmp/project dir")); - + fn build_shell_command_keeps_command_without_cwd_prefix_when_not_provided() { assert_eq!( - args, - vec![ - "-na", - "Ghostty", - "--args", - "--quit-after-last-window-closed=true", - "--working-directory=/tmp/project dir", - "--input=raw:claude --resume abc-123\\n", - ] - ); - } - - #[test] - fn ghostty_keeps_command_without_cwd_prefix_when_not_provided() { - let args = build_ghostty_args("claude --resume abc-123", None); - - assert_eq!( - args, - vec![ - "-na", - "Ghostty", - "--args", - "--quit-after-last-window-closed=true", - "--input=raw:claude --resume abc-123\\n", - ] - ); - } - - #[test] - fn ghostty_escapes_newlines_and_backslashes_in_input() { - assert_eq!( - ghostty_raw_input("echo foo\\\\bar\npwd"), - "raw:echo foo\\\\\\\\bar\\npwd\\n" + build_shell_command("claude --resume abc-123", None), + "claude --resume abc-123" ); } @@ -365,4 +361,22 @@ mod tests { ] ); } + + #[test] + fn ghostty_uses_working_directory_arg_for_cwd() { + // cwd should be passed as --working-directory, not embedded in the shell command string + // This avoids shell expansion of special characters in directory paths + let cwd = "/tmp/project dir"; + let command = "claude --resume abc-123"; + + // Verify build_shell_command does NOT include cwd when used in ghostty context + // (ghostty passes cwd via --working-directory flag instead) + assert_eq!( + build_shell_command(command, None), + "claude --resume abc-123" + ); + + // Verify shell_escape works correctly for paths with spaces + assert_eq!(shell_escape(cwd), "\"/tmp/project dir\""); + } } diff --git a/src-tauri/src/settings.rs b/src-tauri/src/settings.rs index 8b41ba517..161e7bc6a 100644 --- a/src-tauri/src/settings.rs +++ b/src-tauri/src/settings.rs @@ -28,6 +28,13 @@ fn default_true() -> bool { pub struct VisibleApps { #[serde(default = "default_true")] pub claude: bool, + #[serde( + rename = "claude-desktop", + alias = "claudeDesktop", + alias = "claude_desktop", + default = "default_true" + )] + pub claude_desktop: bool, #[serde(default = "default_true")] pub codex: bool, #[serde(default = "default_true")] @@ -36,16 +43,20 @@ pub struct VisibleApps { pub opencode: bool, #[serde(default = "default_true")] pub openclaw: bool, + #[serde(default)] + pub hermes: bool, } impl Default for VisibleApps { fn default() -> Self { Self { claude: true, + claude_desktop: true, codex: true, gemini: true, opencode: true, openclaw: true, + hermes: false, // 默认不显示，需用户手动启用 } } } @@ -55,10 +66,12 @@ impl VisibleApps { pub fn is_visible(&self, app: &AppType) -> bool { match app { AppType::Claude => self.claude, + AppType::ClaudeDesktop => self.claude_desktop, AppType::Codex => self.codex, AppType::Gemini => self.gemini, AppType::OpenCode => self.opencode, AppType::OpenClaw => self.openclaw, + AppType::Hermes => self.hermes, } } } @@ -231,11 +244,16 @@ pub struct AppSettings { pub opencode_config_dir: Option, #[serde(default, skip_serializing_if = "Option::is_none")] pub openclaw_config_dir: Option, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub hermes_config_dir: Option, // ===== 当前供应商 ID（设备级）===== /// 当前 Claude 供应商 ID（本地存储，优先于数据库 is_current） #[serde(default, skip_serializing_if = "Option::is_none")] pub current_provider_claude: Option, + /// 当前 Claude Desktop 供应商 ID（本地存储，优先于数据库 is_current） + #[serde(default, skip_serializing_if = "Option::is_none")] + pub current_provider_claude_desktop: Option, /// 当前 Codex 供应商 ID（本地存储，优先于数据库 is_current） #[serde(default, skip_serializing_if = "Option::is_none")] pub current_provider_codex: Option, @@ -248,6 +266,9 @@ pub struct AppSettings { /// 当前 OpenClaw 供应商 ID（本地存储，对 OpenClaw 可能无意义，但保持结构一致） #[serde(default, skip_serializing_if = "Option::is_none")] pub current_provider_openclaw: Option, + /// 当前 Hermes 供应商 ID（本地存储，保持结构一致） + #[serde(default, skip_serializing_if = "Option::is_none")] + pub current_provider_hermes: Option, // ===== Skill 同步设置 ===== /// Skill 同步方式：auto（默认，优先 symlink）、symlink、copy @@ -315,11 +336,14 @@ impl Default for AppSettings { gemini_config_dir: None, opencode_config_dir: None, openclaw_config_dir: None, + hermes_config_dir: None, current_provider_claude: None, + current_provider_claude_desktop: None, current_provider_codex: None, current_provider_gemini: None, current_provider_opencode: None, current_provider_openclaw: None, + current_provider_hermes: None, skill_sync_method: SyncMethod::default(), skill_storage_location: SkillStorageLocation::default(), webdav_sync: None, @@ -377,6 +401,13 @@ impl AppSettings { .filter(|s| !s.is_empty()) .map(|s| s.to_string()); + self.hermes_config_dir = self + .hermes_config_dir + .as_ref() + .map(|s| s.trim()) + .filter(|s| !s.is_empty()) + .map(|s| s.to_string()); + self.language = self .language .as_ref() @@ -577,6 +608,14 @@ pub fn get_openclaw_override_dir() -> Option { .map(|p| resolve_override_path(p)) } +pub fn get_hermes_override_dir() -> Option { + let settings = settings_store().read().ok()?; + settings + .hermes_config_dir + .as_ref() + .map(|p| resolve_override_path(p)) +} + // ===== 当前供应商管理函数 ===== /// 获取指定应用类型的当前供应商 ID（从本地 settings 读取） @@ -587,10 +626,12 @@ pub fn get_current_provider(app_type: &AppType) -> Option { let settings = settings_store().read().ok()?; match app_type { AppType::Claude => settings.current_provider_claude.clone(), + AppType::ClaudeDesktop => settings.current_provider_claude_desktop.clone(), AppType::Codex => settings.current_provider_codex.clone(), AppType::Gemini => settings.current_provider_gemini.clone(), AppType::OpenCode => settings.current_provider_opencode.clone(), AppType::OpenClaw => settings.current_provider_openclaw.clone(), + AppType::Hermes => settings.current_provider_hermes.clone(), } } @@ -602,10 +643,12 @@ pub fn set_current_provider(app_type: &AppType, id: Option<&str>) -> Result<(), let id_owned = id.map(|s| s.to_string()); mutate_settings(|settings| match app_type { AppType::Claude => settings.current_provider_claude = id_owned.clone(), + AppType::ClaudeDesktop => settings.current_provider_claude_desktop = id_owned.clone(), AppType::Codex => settings.current_provider_codex = id_owned.clone(), AppType::Gemini => settings.current_provider_gemini = id_owned.clone(), AppType::OpenCode => settings.current_provider_opencode = id_owned.clone(), AppType::OpenClaw => settings.current_provider_openclaw = id_owned.clone(), + AppType::Hermes => settings.current_provider_hermes = id_owned.clone(), }) } @@ -740,3 +783,40 @@ pub fn update_webdav_sync_status(status: WebDavSyncStatus) -> Result<(), AppErro } }) } + +#[cfg(test)] +mod tests { + use super::*; + use crate::app_config::AppType; + + #[test] + fn visible_apps_old_settings_default_claude_desktop_visible() { + let visible: VisibleApps = serde_json::from_value(serde_json::json!({ + "claude": true, + "codex": true, + "gemini": true, + "opencode": true, + "openclaw": true, + "hermes": true + })) + .expect("visible apps"); + + assert!(visible.is_visible(&AppType::ClaudeDesktop)); + } + + #[test] + fn visible_apps_accepts_claude_desktop_aliases() { + let visible: VisibleApps = serde_json::from_value(serde_json::json!({ + "claude": true, + "claudeDesktop": false, + "codex": true, + "gemini": true, + "opencode": true, + "openclaw": true, + "hermes": true + })) + .expect("visible apps"); + + assert!(!visible.is_visible(&AppType::ClaudeDesktop)); + } +} diff --git a/src-tauri/src/store.rs b/src-tauri/src/store.rs index 9c626a5ec..f34e1de9a 100644 --- a/src-tauri/src/store.rs +++ b/src-tauri/src/store.rs @@ -1,11 +1,12 @@ use crate::database::Database; -use crate::services::ProxyService; +use crate::services::{ProxyService, UsageCache}; use std::sync::Arc; /// 全局应用状态 pub struct AppState { pub db: Arc, pub proxy_service: ProxyService, + pub usage_cache: Arc, } impl AppState { @@ -13,6 +14,10 @@ impl AppState { pub fn new(db: Arc) -> Self { let proxy_service = ProxyService::new(db.clone()); - Self { db, proxy_service } + Self { + db, + proxy_service, + usage_cache: Arc::new(UsageCache::new()), + } } } diff --git a/src-tauri/src/tray.rs b/src-tauri/src/tray.rs index 4bd63f1f6..42072312f 100644 --- a/src-tauri/src/tray.rs +++ b/src-tauri/src/tray.rs @@ -2,17 +2,26 @@ //! //! 负责系统托盘图标和菜单的创建、更新和事件处理。 -use tauri::menu::{CheckMenuItem, Menu, MenuBuilder, MenuItem, SubmenuBuilder}; +use once_cell::sync::Lazy; +use tauri::menu::{CheckMenuItem, Menu, MenuBuilder, MenuItem, Submenu, SubmenuBuilder}; use tauri::{Emitter, Manager}; +use tauri_plugin_opener::OpenerExt; use crate::app_config::AppType; use crate::error::AppError; use crate::store::AppState; +/// 每个 app 分区的子菜单句柄，用于 usage 更新时就地改 label 而非整菜单重建。 +/// `create_tray_menu` 每次重建都会整表覆盖写入，保证句柄始终指向当前活跃菜单。 +static TRAY_SECTION_SUBMENUS: Lazy< + std::sync::Mutex>>, +> = Lazy::new(|| std::sync::Mutex::new(std::collections::HashMap::new())); + /// 托盘菜单文本（国际化） #[derive(Clone, Copy)] pub struct TrayTexts { pub show_main: &'static str, + pub open_website: &'static str, pub no_providers_label: &'static str, pub lightweight_mode: &'static str, pub quit: &'static str, @@ -24,6 +33,7 @@ impl TrayTexts { match language { "en" => Self { show_main: "Open main window", + open_website: "Open Official Website", no_providers_label: "(no providers)", lightweight_mode: "Lightweight Mode", quit: "Quit", @@ -31,6 +41,7 @@ impl TrayTexts { }, "ja" => Self { show_main: "メインウィンドウを開く", + open_website: "公式サイトを開く", no_providers_label: "(プロバイダーなし)", lightweight_mode: "軽量モード", quit: "終了", @@ -38,6 +49,7 @@ impl TrayTexts { }, _ => Self { show_main: "打开主界面", + open_website: "打开官方网站", no_providers_label: "(无供应商)", lightweight_mode: "轻量模式", quit: "退出", @@ -58,6 +70,7 @@ pub struct TrayAppSection { /// Auto 菜单项后缀 pub const AUTO_SUFFIX: &str = "auto"; +pub const TRAY_ID: &str = "cc-switch"; pub const TRAY_SECTIONS: [TrayAppSection; 3] = [ TrayAppSection { @@ -83,6 +96,182 @@ pub const TRAY_SECTIONS: [TrayAppSection; 3] = [ }, ]; +/// 配色阈值（与前端 `utilizationColor` 语义一致）。 +const UTIL_WARN_PCT: f64 = 70.0; +const UTIL_DANGER_PCT: f64 = 90.0; + +fn emoji_for_utilization(pct: f64) -> &'static str { + if pct >= UTIL_DANGER_PCT { + "\u{1F534}" // 🔴 + } else if pct >= UTIL_WARN_PCT { + "\u{1F7E0}" // 🟠 + } else { + "\u{1F7E2}" // 🟢 + } +} + +fn format_subscription_summary( + quota: &crate::services::subscription::SubscriptionQuota, +) -> Option { + use crate::services::subscription::{ + TIER_FIVE_HOUR, TIER_GEMINI_FLASH, TIER_GEMINI_FLASH_LITE, TIER_GEMINI_PRO, TIER_SEVEN_DAY, + }; + if !quota.success { + return None; + } + + // 按 tool 选取主卡槽 tier 并映射到短 label： + // Claude / Codex 沿用时间窗口（h=5 小时，w=7 天）； + // Gemini 用模型维度（p=pro，f=flash，l=flash-lite）——Gemini 后端 tier + // 命名是 gemini_pro / gemini_flash / gemini_flash_lite，与时间窗口不同命名空间。 + // flash_lite 必须纳入：否则 lite 利用率最高时色标偏低，与前端 footer 行为不一致。 + let parts: Vec<(&'static str, f64)> = match quota.tool.as_str() { + "gemini" => { + let mut v = Vec::new(); + if let Some(t) = quota.tiers.iter().find(|t| t.name == TIER_GEMINI_PRO) { + v.push(("p", t.utilization)); + } + if let Some(t) = quota.tiers.iter().find(|t| t.name == TIER_GEMINI_FLASH) { + v.push(("f", t.utilization)); + } + if let Some(t) = quota + .tiers + .iter() + .find(|t| t.name == TIER_GEMINI_FLASH_LITE) + { + v.push(("l", t.utilization)); + } + v + } + _ => { + let mut v = Vec::new(); + if let Some(t) = quota.tiers.iter().find(|t| t.name == TIER_FIVE_HOUR) { + v.push(("h", t.utilization)); + } + if let Some(t) = quota.tiers.iter().find(|t| t.name == TIER_SEVEN_DAY) { + v.push(("w", t.utilization)); + } + v + } + }; + + if parts.is_empty() { + return None; + } + + // 色标取所有已选 tier 里最高的利用率——用户更关心"离上限多近"。 + let worst = parts + .iter() + .map(|(_, u)| *u) + .fold(f64::NEG_INFINITY, f64::max); + if !worst.is_finite() { + return None; + } + + let emoji = emoji_for_utilization(worst); + let body = parts + .iter() + .map(|(label, u)| format!("{label}{}%", u.round() as i64)) + .collect::>() + .join(" "); + Some(format!("{emoji} {body}")) +} + +fn tier_pct(data: &crate::provider::UsageData) -> Option { + match (data.used, data.total) { + (Some(used), Some(total)) if total > 0.0 => Some(used / total * 100.0), + _ => None, + } +} + +fn format_script_summary(result: &crate::provider::UsageResult) -> Option { + use crate::services::subscription::{TIER_FIVE_HOUR, TIER_WEEKLY_LIMIT}; + + if !result.success { + return None; + } + let data = result.data.as_ref()?; + if data.is_empty() { + return None; + } + + // commands::provider 的 token_plan 分支把 SubscriptionQuota 的每个 tier + // 扁平化为一条 UsageData（plan_name 承载 tier 名），所以这里按 plan_name + // 识别双桶形态，其余 usage 结果（Copilot / balance / 自定义脚本）走 fallback。 + const TOKEN_PLAN_LABELS: &[(&str, &str)] = &[(TIER_FIVE_HOUR, "h"), (TIER_WEEKLY_LIMIT, "w")]; + + let mut parts: Vec<(&'static str, f64)> = Vec::new(); + for &(tier_name, label) in TOKEN_PLAN_LABELS { + let Some(d) = data + .iter() + .find(|d| d.plan_name.as_deref() == Some(tier_name)) + else { + continue; + }; + if let Some(u) = tier_pct(d) { + parts.push((label, u)); + } + } + if !parts.is_empty() { + let worst = parts + .iter() + .map(|(_, u)| *u) + .fold(f64::NEG_INFINITY, f64::max); + let emoji = emoji_for_utilization(worst); + let body = parts + .iter() + .map(|(label, u)| format!("{label}{}%", u.round() as i64)) + .collect::>() + .join(" "); + return Some(format!("{emoji} {body}")); + } + + let first = data.first()?; + let pct = tier_pct(first)?; + let emoji = emoji_for_utilization(pct); + let plan = first.plan_name.as_deref().unwrap_or(""); + let rounded = pct.round() as i64; + if plan.is_empty() { + Some(format!("{} {}%", emoji, rounded)) + } else { + Some(format!("{} {} {}%", emoji, plan, rounded)) + } +} + +fn format_usage_suffix( + app_state: &AppState, + app_type: &AppType, + provider: &crate::provider::Provider, + provider_id: &str, +) -> Option { + // 当前脚本是否启用：禁用/删除时不再沿用旧 UsageCache 结果， + // 并顺手 invalidate，防止后续重建继续命中过期数据。 + if provider.has_usage_script_enabled() { + // 脚本缓存优先（覆盖 Copilot/coding_plan/balance/自定义脚本），借用访问避免克隆整条 UsageResult。 + if let Some(Some(s)) = + app_state + .usage_cache + .with_script(app_type, provider_id, format_script_summary) + { + return Some(format!(" · {s}")); + } + } else { + app_state + .usage_cache + .invalidate_script(app_type, provider_id); + } + + if provider.category.as_deref() == Some("official") { + if let Some(Some(s)) = app_state + .usage_cache + .with_subscription(app_type, format_subscription_summary) + { + return Some(format!(" · {s}")); + } + } + None +} + /// 对供应商列表排序：sort_index → created_at → name fn sort_providers( providers: &indexmap::IndexMap, @@ -207,7 +396,7 @@ fn handle_auto_click(app: &tauri::AppHandle, app_type: &AppType) -> Result<(), A // 4) 更新托盘菜单 if let Ok(new_menu) = create_tray_menu(app, app_state.inner()) { - if let Some(tray) = app.tray_by_id("main") { + if let Some(tray) = app.tray_by_id(TRAY_ID) { let _ = tray.set_menu(Some(new_menu)); } } @@ -245,17 +434,13 @@ fn handle_provider_click( .db .set_proxy_flags_sync(app_type_str, proxy_enabled, false)?; - // 切换供应商 - crate::commands::switch_provider( - app_state.clone(), - app_type_str.to_string(), - provider_id.to_string(), - ) - .map_err(AppError::Message)?; + // 切换供应商。需要本地路由的供应商也不在这里自动启动代理， + // 由用户在页面/设置中手动开启。 + crate::services::ProviderService::switch(app_state.inner(), app_type.clone(), provider_id)?; // 更新托盘菜单 if let Ok(new_menu) = create_tray_menu(app, app_state.inner()) { - if let Some(tray) = app.tray_by_id("main") { + if let Some(tray) = app.tray_by_id(TRAY_ID) { let _ = tray.set_menu(Some(new_menu)); } } @@ -290,12 +475,25 @@ pub fn create_tray_menu( let visible_apps = app_settings.visible_apps.unwrap_or_default(); let mut menu_builder = MenuBuilder::new(app); + let mut section_handles: std::collections::HashMap> = + std::collections::HashMap::new(); - // 顶部：打开主界面 + // 顶部：打开主界面 / 打开官方网站 let show_main_item = MenuItem::with_id(app, "show_main", tray_texts.show_main, true, None::<&str>) .map_err(|e| AppError::Message(format!("创建打开主界面菜单失败: {e}")))?; - menu_builder = menu_builder.item(&show_main_item).separator(); + let open_website_item = MenuItem::with_id( + app, + "open_website", + tray_texts.open_website, + true, + None::<&str>, + ) + .map_err(|e| AppError::Message(format!("创建打开官方网站菜单失败: {e}")))?; + menu_builder = menu_builder + .item(&show_main_item) + .item(&open_website_item) + .separator(); // Pre-compute proxy running state (used to disable official providers in tray menu) let is_proxy_running = futures::executor::block_on(app_state.proxy_service.is_running()); @@ -322,10 +520,13 @@ pub fn create_tray_menu( })?; menu_builder = menu_builder.item(&empty_item); } else { - // 有供应商：构建子菜单 - let current_name = providers.get(¤t_id).map(|p| p.name.as_str()); - let submenu_label = match current_name { - Some(name) => format!("{} · {}", section.header_label, name), + let current_provider = providers.get(¤t_id); + let submenu_label = match current_provider { + Some(p) => { + let suffix = format_usage_suffix(app_state, §ion.app_type, p, ¤t_id) + .unwrap_or_default(); + format!("{} · {}{}", section.header_label, p.name, suffix) + } None => section.header_label.to_string(), }; let submenu_id = format!("submenu_{}", app_type_str); @@ -368,6 +569,7 @@ pub fn create_tray_menu( let submenu = submenu_builder.build().map_err(|e| { AppError::Message(format!("构建{}子菜单失败: {e}", section.log_name)) })?; + section_handles.insert(section.app_type.clone(), submenu.clone()); menu_builder = menu_builder.item(&submenu); } @@ -392,9 +594,51 @@ pub fn create_tray_menu( menu_builder = menu_builder.item(&quit_item); - menu_builder + let menu = menu_builder .build() - .map_err(|e| AppError::Message(format!("构建菜单失败: {e}"))) + .map_err(|e| AppError::Message(format!("构建菜单失败: {e}")))?; + + *TRAY_SECTION_SUBMENUS + .lock() + .unwrap_or_else(|p| p.into_inner()) = section_handles; + + Ok(menu) +} + +/// 就地更新各 app 分区子菜单的标题（usage 后缀变化时走这条）， +/// 避免 `set_menu` 导致用户打开中的菜单被关闭。 +/// 句柄由上一次 `create_tray_menu` 填充；为空（从未构建过菜单）时无事发生。 +fn update_tray_usage_labels(app: &tauri::AppHandle) { + let Some(app_state) = app.try_state::() else { + return; + }; + let handles = match TRAY_SECTION_SUBMENUS.lock() { + Ok(g) => g, + Err(poisoned) => poisoned.into_inner(), + }; + + for section in TRAY_SECTIONS.iter() { + let Some(submenu) = handles.get(§ion.app_type) else { + continue; + }; + let Ok(providers) = app_state.db.get_all_providers(section.app_type.as_str()) else { + continue; + }; + let Ok(Some(current_id)) = + crate::settings::get_effective_current_provider(&app_state.db, §ion.app_type) + else { + continue; + }; + let Some(provider) = providers.get(¤t_id) else { + continue; + }; + let suffix = format_usage_suffix(&app_state, §ion.app_type, provider, ¤t_id) + .unwrap_or_default(); + let new_label = format!("{} · {}{}", section.header_label, provider.name, suffix); + if let Err(e) = submenu.set_text(&new_label) { + log::debug!("[Tray] 更新{}子菜单标题失败: {e}", section.log_name); + } + } } pub fn refresh_tray_menu(app: &tauri::AppHandle) { @@ -402,7 +646,7 @@ pub fn refresh_tray_menu(app: &tauri::AppHandle) { if let Some(state) = app.try_state::() { if let Ok(new_menu) = create_tray_menu(app, state.inner()) { - if let Some(tray) = app.tray_by_id("main") { + if let Some(tray) = app.tray_by_id(TRAY_ID) { if let Err(e) = tray.set_menu(Some(new_menu)) { log::error!("刷新托盘菜单失败: {e}"); } @@ -458,6 +702,11 @@ pub fn handle_tray_menu_event(app: &tauri::AppHandle, event_id: &str) { } } } + "open_website" => { + if let Err(e) = app.opener().open_url("https://ccswitch.io", None::) { + log::error!("打开官方网站失败: {e}"); + } + } "lightweight_mode" => { if crate::lightweight::is_lightweight_mode() { if let Err(e) = crate::lightweight::exit_lightweight_mode(app) { @@ -479,3 +728,370 @@ pub fn handle_tray_menu_event(app: &tauri::AppHandle, event_id: &str) { } } } + +static LAST_TRAY_USAGE_REFRESH: std::sync::Mutex> = + std::sync::Mutex::new(None); +const MIN_TRAY_USAGE_REFRESH_INTERVAL: std::time::Duration = std::time::Duration::from_secs(10); + +/// 合并多次快速触发的"usage 标题软更新"：批量刷新期间多个 usage 命令 +/// 同时成功时，只会产生一次就地 `set_text` 批量调用。走软更新而不是 +/// `refresh_tray_menu` 整建，避免用户打开中的菜单被 macOS 系统关闭。 +static TRAY_REBUILD_SCHEDULED: std::sync::atomic::AtomicBool = + std::sync::atomic::AtomicBool::new(false); + +pub fn schedule_tray_refresh(app: &tauri::AppHandle) { + use std::sync::atomic::Ordering; + if TRAY_REBUILD_SCHEDULED.swap(true, Ordering::AcqRel) { + return; + } + let app = app.clone(); + tauri::async_runtime::spawn_blocking(move || { + // 50ms 合窗：让同一轮 React Query / 托盘批量刷新触发的多个写入 + // 共享一次标题更新。 + std::thread::sleep(std::time::Duration::from_millis(50)); + TRAY_REBUILD_SCHEDULED.store(false, Ordering::Release); + update_tray_usage_labels(&app); + }); +} + +/// 并行刷新每个可见 app "当前 provider" 的用量；成功 / 失败结果都通过各 +/// command 的 write-through 逻辑写入 `UsageCache`，单次重建菜单由 +/// `schedule_tray_refresh` 做合并。内部 10 秒节流防止鼠标悬停反复进出时 +/// 雪崩请求；互斥锁被毒化时以上次状态为准继续推进，不会永久阻塞。 +/// +/// 刷新面与 `format_usage_suffix` 的展示面严格对齐 —— 每次悬停最多发 +/// `TRAY_SECTIONS.len()` 次外部请求，script 优先（覆盖 coding_plan / balance / +/// Copilot / 自定义脚本），否则当前 provider 必须是 `official` 才查订阅。 +pub(crate) async fn refresh_all_usage_in_tray(app: &tauri::AppHandle) { + use crate::commands::CopilotAuthState; + use futures::future::join_all; + + { + let mut guard = LAST_TRAY_USAGE_REFRESH + .lock() + .unwrap_or_else(|poisoned| poisoned.into_inner()); + let now = std::time::Instant::now(); + if let Some(last) = *guard { + if now.duration_since(last) < MIN_TRAY_USAGE_REFRESH_INTERVAL { + return; + } + } + *guard = Some(now); + } + + let Some(app_state) = app.try_state::() else { + return; + }; + + // 与 `create_tray_menu` 保持一致：用户隐藏的 app 不参与外部 API 查询， + // 避免在未使用的 app 上浪费请求、撞 rate limit 或反复触发鉴权失败日志。 + let visible_apps = crate::settings::get_settings() + .visible_apps + .unwrap_or_default(); + + let mut subscription_futures = Vec::new(); + let mut script_futures = Vec::new(); + + for section in TRAY_SECTIONS.iter() { + if !visible_apps.is_visible(§ion.app_type) { + continue; + } + + let app_type_str = section.app_type.as_str(); + let log_name = section.log_name; + + // 解析 effective current provider；未设置 / 出错都静默跳过， + // 与 create_tray_menu 的行为保持一致。 + let current_id = + match crate::settings::get_effective_current_provider(&app_state.db, §ion.app_type) + { + Ok(Some(id)) => id, + Ok(None) => continue, + Err(e) => { + log::warn!("[Tray] 读取{log_name}当前供应商失败: {e}"); + continue; + } + }; + // 只需当前 provider —— by-id 查询避免把整个 app 的 provider 列表加载 + // 进内存（每次悬停 × 3 sections 的热路径）。 + let current = match app_state.db.get_provider_by_id(¤t_id, app_type_str) { + Ok(Some(p)) => p, + Ok(None) => continue, + Err(e) => { + log::warn!("[Tray] 读取{log_name}当前供应商失败: {e}"); + continue; + } + }; + + // 与 format_usage_suffix 同一优先级：脚本启用 → 查脚本； + // 否则当前 provider 是 official → 查订阅；其它情况不发请求。 + if current.has_usage_script_enabled() { + let app_clone = app.clone(); + let state = app.state::(); + let copilot_state = app.state::(); + let provider_id = current_id.clone(); + let app_str = app_type_str.to_string(); + script_futures.push(async move { + if let Err(e) = crate::commands::queryProviderUsage( + app_clone, + state, + copilot_state, + provider_id.clone(), + app_str, + ) + .await + { + log::debug!("[Tray] 刷新{log_name}供应商 {provider_id} 用量失败: {e}"); + } + }); + } else if current.category.as_deref() == Some("official") { + let app_clone = app.clone(); + let state = app.state::(); + let tool = app_type_str.to_string(); + subscription_futures.push(async move { + if let Err(e) = + crate::commands::get_subscription_quota(app_clone, state, tool).await + { + log::debug!("[Tray] 刷新{log_name}订阅用量失败（可能未登录）: {e}"); + } + }); + } + } + + // 两组并行启动，整体等待 —— 订阅/脚本互不依赖，没必要串行。 + futures::future::join(join_all(subscription_futures), join_all(script_futures)).await; +} + +#[cfg(test)] +mod tests { + use super::{format_script_summary, format_subscription_summary, TRAY_ID}; + use crate::provider::{UsageData, UsageResult}; + use crate::services::subscription::{ + CredentialStatus, QuotaTier, SubscriptionQuota, TIER_FIVE_HOUR, TIER_WEEKLY_LIMIT, + }; + + #[test] + fn tray_id_is_unique_to_app() { + assert_eq!(TRAY_ID, "cc-switch"); + assert_ne!(TRAY_ID, "main"); + } + + fn make_quota(tool: &str, success: bool, tiers: Vec) -> SubscriptionQuota { + SubscriptionQuota { + tool: tool.to_string(), + credential_status: CredentialStatus::Valid, + credential_message: None, + success, + tiers, + extra_usage: None, + error: None, + queried_at: Some(0), + } + } + + fn tier(name: &str, utilization: f64) -> QuotaTier { + QuotaTier { + name: name.to_string(), + utilization, + resets_at: None, + } + } + + #[test] + fn claude_summary_uses_h_and_w_labels() { + let quota = make_quota( + "claude", + true, + vec![tier("five_hour", 9.0), tier("seven_day", 27.0)], + ); + let s = format_subscription_summary("a).expect("should format"); + assert!(s.contains("h9%"), "expected h9% in {s}"); + assert!(s.contains("w27%"), "expected w27% in {s}"); + } + + #[test] + fn gemini_summary_uses_p_and_f_labels() { + let quota = make_quota( + "gemini", + true, + vec![tier("gemini_pro", 15.0), tier("gemini_flash", 42.0)], + ); + let s = format_subscription_summary("a).expect("should format"); + assert!(s.contains("p15%"), "expected p15% in {s}"); + assert!(s.contains("f42%"), "expected f42% in {s}"); + } + + #[test] + fn gemini_summary_includes_all_three_tiers() { + let quota = make_quota( + "gemini", + true, + vec![ + tier("gemini_pro", 5.0), + tier("gemini_flash", 42.0), + tier("gemini_flash_lite", 80.0), + ], + ); + let s = format_subscription_summary("a).expect("should format"); + assert!(s.contains("p5%"), "expected p5% in {s}"); + assert!(s.contains("f42%"), "expected f42% in {s}"); + assert!(s.contains("l80%"), "expected l80% in {s}"); + } + + #[test] + fn gemini_summary_lite_only_still_renders() { + // flash_lite 如果是 API 返回的唯一 tier，仍应显示（避免前端 footer 能看到、 + // 托盘空白的不对称）。 + let quota = make_quota("gemini", true, vec![tier("gemini_flash_lite", 80.0)]); + let s = format_subscription_summary("a).expect("should format"); + assert!(s.contains("l80%"), "expected l80% in {s}"); + } + + #[test] + fn gemini_summary_emoji_reflects_highest_tier_including_lite() { + // lite 是利用率最高的那条 → emoji 必须是红色，不能被 pro/flash 掩盖。 + let quota = make_quota( + "gemini", + true, + vec![ + tier("gemini_pro", 10.0), + tier("gemini_flash", 20.0), + tier("gemini_flash_lite", 95.0), + ], + ); + let s = format_subscription_summary("a).unwrap(); + assert!( + s.starts_with("\u{1F534}"), + "expected red emoji (lite worst) in {s}" + ); + } + + #[test] + fn worst_emoji_reflects_highest_utilization() { + // 🔴 = \u{1F534}; 任一 tier ≥ 90% 时预期显示红色。 + let quota = make_quota( + "claude", + true, + vec![tier("five_hour", 10.0), tier("seven_day", 95.0)], + ); + let s = format_subscription_summary("a).unwrap(); + assert!(s.starts_with("\u{1F534}"), "expected red emoji in {s}"); + } + + #[test] + fn failure_quota_returns_none() { + let quota = make_quota("claude", false, vec![tier("five_hour", 50.0)]); + assert!(format_subscription_summary("a).is_none()); + } + + #[test] + fn unknown_tiers_return_none() { + let quota = make_quota("claude", true, vec![tier("one_hour", 80.0)]); + assert!(format_subscription_summary("a).is_none()); + } + + #[test] + fn gemini_without_any_known_tiers_returns_none() { + // 完全没有 pro/flash/flash_lite 三种 tier 的退化响应 → None。 + let quota = make_quota("gemini", true, vec![tier("some_future_tier", 80.0)]); + assert!(format_subscription_summary("a).is_none()); + } + + fn usage_data(plan_name: Option<&str>, utilization: f64) -> UsageData { + UsageData { + plan_name: plan_name.map(String::from), + extra: None, + is_valid: Some(true), + invalid_message: None, + total: Some(100.0), + used: Some(utilization), + remaining: Some(100.0 - utilization), + unit: Some("%".to_string()), + } + } + + fn usage_result(success: bool, data: Vec) -> UsageResult { + UsageResult { + success, + data: if data.is_empty() { None } else { Some(data) }, + error: None, + } + } + + #[test] + fn script_summary_token_plan_two_tiers() { + let r = usage_result( + true, + vec![ + usage_data(Some(TIER_FIVE_HOUR), 12.0), + usage_data(Some(TIER_WEEKLY_LIMIT), 80.0), + ], + ); + let s = format_script_summary(&r).expect("should format"); + assert!(s.contains("h12%"), "expected h12% in {s}"); + assert!(s.contains("w80%"), "expected w80% in {s}"); + assert!(s.starts_with("\u{1F7E0}"), "expected orange emoji in {s}"); + } + + #[test] + fn script_summary_token_plan_worst_drives_emoji() { + let r = usage_result( + true, + vec![ + usage_data(Some(TIER_FIVE_HOUR), 20.0), + usage_data(Some(TIER_WEEKLY_LIMIT), 95.0), + ], + ); + let s = format_script_summary(&r).unwrap(); + assert!(s.starts_with("\u{1F534}"), "expected red emoji in {s}"); + } + + #[test] + fn script_summary_token_plan_five_hour_only() { + let r = usage_result(true, vec![usage_data(Some(TIER_FIVE_HOUR), 8.0)]); + let s = format_script_summary(&r).expect("should format"); + assert!(s.contains("h8%"), "expected h8% in {s}"); + assert!( + !s.contains("plan_name"), + "plan_name should not leak into label: {s}" + ); + } + + #[test] + fn script_summary_token_plan_weekly_only() { + let r = usage_result(true, vec![usage_data(Some(TIER_WEEKLY_LIMIT), 50.0)]); + let s = format_script_summary(&r).expect("should format"); + assert!(s.contains("w50%"), "expected w50% in {s}"); + } + + #[test] + fn script_summary_single_bucket_fallback_with_plan_name() { + let r = usage_result(true, vec![usage_data(Some("Copilot Pro"), 40.0)]); + let s = format_script_summary(&r).expect("should format"); + assert!(s.contains("Copilot Pro"), "expected plan name in {s}"); + assert!(s.contains("40%"), "expected 40% in {s}"); + assert!( + !s.contains("h40%"), + "must not relabel non-token-plan data as h: {s}" + ); + } + + #[test] + fn script_summary_single_bucket_fallback_without_plan_name() { + let r = usage_result(true, vec![usage_data(None, 15.0)]); + let s = format_script_summary(&r).expect("should format"); + assert_eq!(s, "\u{1F7E2} 15%", "expected emoji + pct only, got {s}"); + } + + #[test] + fn script_summary_failure_returns_none() { + let r = usage_result(false, vec![usage_data(Some(TIER_FIVE_HOUR), 12.0)]); + assert!(format_script_summary(&r).is_none()); + } + + #[test] + fn script_summary_empty_data_returns_none() { + let r = usage_result(true, vec![]); + assert!(format_script_summary(&r).is_none()); + } +} diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index f3354cb75..7e4f11c36 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "CC Switch", - "version": "3.13.0", + "version": "3.14.1", "identifier": "com.ccswitch.desktop", "build": { "frontendDist": "../dist", diff --git a/src-tauri/tests/deeplink_import.rs b/src-tauri/tests/deeplink_import.rs index 5a0238c61..6cee273e8 100644 --- a/src-tauri/tests/deeplink_import.rs +++ b/src-tauri/tests/deeplink_import.rs @@ -1,8 +1,6 @@ use std::sync::Arc; -use cc_switch_lib::{ - import_provider_from_deeplink, parse_deeplink_url, AppState, Database, ProxyService, -}; +use cc_switch_lib::{import_provider_from_deeplink, parse_deeplink_url, AppState, Database}; #[path = "support.rs"] mod support; @@ -18,11 +16,7 @@ fn deeplink_import_claude_provider_persists_to_db() { let request = parse_deeplink_url(url).expect("parse deeplink url"); let db = Arc::new(Database::memory().expect("create memory db")); - let proxy_service = ProxyService::new(db.clone()); - let state = AppState { - db: db.clone(), - proxy_service, - }; + let state = AppState::new(db.clone()); let provider_id = import_provider_from_deeplink(&state, request.clone()) .expect("import provider from deeplink"); @@ -58,11 +52,7 @@ fn deeplink_import_codex_provider_builds_auth_and_config() { let request = parse_deeplink_url(url).expect("parse deeplink url"); let db = Arc::new(Database::memory().expect("create memory db")); - let proxy_service = ProxyService::new(db.clone()); - let state = AppState { - db: db.clone(), - proxy_service, - }; + let state = AppState::new(db.clone()); let provider_id = import_provider_from_deeplink(&state, request.clone()) .expect("import provider from deeplink"); diff --git a/src-tauri/tests/hermes_roundtrip.rs b/src-tauri/tests/hermes_roundtrip.rs new file mode 100644 index 000000000..9d4fe1d05 --- /dev/null +++ b/src-tauri/tests/hermes_roundtrip.rs @@ -0,0 +1,124 @@ +mod support; + +use cc_switch_lib::{hermes_config, update_settings, AppSettings}; + +/// 读取并回写 Hermes provider 时，Hermes v12+ 新增或未来才会出现的字段 +/// （例如 `rate_limit_delay`、`key_env`）必须透传，不能因为 UI 不感知就静默丢弃。 +/// 否则用户在 Hermes Web UI 配置的高级字段会在 CC Switch 编辑后消失。 +fn with_temp_hermes_dir(f: F) { + let guard = support::test_mutex().lock().expect("test mutex poisoned"); + let home = support::ensure_test_home(); + support::reset_test_fs(); + + let hermes_dir = home.join(".hermes-roundtrip"); + let _ = std::fs::remove_dir_all(&hermes_dir); + std::fs::create_dir_all(&hermes_dir).expect("create temp hermes dir"); + + update_settings(AppSettings { + hermes_config_dir: Some(hermes_dir.to_string_lossy().into_owned()), + ..AppSettings::default() + }) + .expect("set hermes_config_dir override"); + + let result = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| f(&hermes_dir))); + + // Always restore settings and drop fixture dir, even on test failure. + let _ = update_settings(AppSettings::default()); + let _ = std::fs::remove_dir_all(&hermes_dir); + drop(guard); + + if let Err(err) = result { + std::panic::resume_unwind(err); + } +} + +#[test] +fn set_provider_preserves_unknown_and_future_fields() { + with_temp_hermes_dir(|dir| { + let yaml = r#"custom_providers: + - name: myhost + base_url: https://api.example.com/v1 + api_key: sk-old + api_mode: chat_completions + rate_limit_delay: 0.5 + key_env: MY_API_KEY + foo_bar: keep-me-around + models: + gpt-4: + context_length: 8192 +"#; + let config_path = dir.join("config.yaml"); + std::fs::write(&config_path, yaml).expect("seed config.yaml"); + + // Simulate the UI sending back only the fields it knows about. + let patch = serde_json::json!({ + "name": "myhost", + "base_url": "https://api.example.com/v1", + "api_key": "sk-new", + "api_mode": "chat_completions", + "models": [ + { "id": "gpt-4", "context_length": 8192 } + ] + }); + + hermes_config::set_provider("myhost", patch).expect("set_provider"); + + let written = std::fs::read_to_string(&config_path).expect("read written config"); + + assert!( + written.contains("rate_limit_delay"), + "rate_limit_delay stripped:\n{written}" + ); + assert!( + written.contains("key_env"), + "key_env key stripped:\n{written}" + ); + assert!( + written.contains("MY_API_KEY"), + "key_env value stripped:\n{written}" + ); + assert!( + written.contains("foo_bar"), + "unknown forward-compat field stripped:\n{written}" + ); + assert!( + written.contains("sk-new"), + "api_key was not updated to sk-new:\n{written}" + ); + assert!( + !written.contains("sk-old"), + "old api_key still present:\n{written}" + ); + }); +} + +#[test] +fn get_providers_surfaces_rate_limit_delay_and_key_env() { + with_temp_hermes_dir(|dir| { + let yaml = r#"custom_providers: + - name: myhost + base_url: https://api.example.com/v1 + api_key: sk-xxx + api_mode: chat_completions + rate_limit_delay: 2.5 + key_env: FOO_KEY + models: + m1: {} +"#; + std::fs::write(dir.join("config.yaml"), yaml).expect("seed config.yaml"); + + let providers = hermes_config::get_providers().expect("get_providers"); + let entry = providers.get("myhost").expect("myhost missing"); + + assert_eq!( + entry.get("rate_limit_delay").and_then(|v| v.as_f64()), + Some(2.5), + "rate_limit_delay not surfaced to DAO payload" + ); + assert_eq!( + entry.get("key_env").and_then(|v| v.as_str()), + Some("FOO_KEY"), + "key_env not surfaced to DAO payload" + ); + }); +} diff --git a/src-tauri/tests/import_export_sync.rs b/src-tauri/tests/import_export_sync.rs index 24a1667fb..7fb9e5aaf 100644 --- a/src-tauri/tests/import_export_sync.rs +++ b/src-tauri/tests/import_export_sync.rs @@ -139,6 +139,93 @@ fn sync_codex_provider_writes_auth_and_config() { assert_eq!(synced_cfg, toml_text); } +#[test] +fn sync_codex_provider_preserves_live_model_provider_id_for_history() { + let _guard = test_mutex().lock().expect("acquire test mutex"); + reset_test_fs(); + + let legacy_auth = json!({ "OPENAI_API_KEY": "rightcode-key" }); + let legacy_config = r#"model_provider = "rightcode" +model = "gpt-5.4" + +[model_providers.rightcode] +name = "RightCode" +base_url = "https://rightcode.example/v1" +wire_api = "responses" +requires_openai_auth = true +"#; + cc_switch_lib::write_codex_live_atomic(&legacy_auth, Some(legacy_config)) + .expect("seed existing Codex live config"); + + let mut config = MultiAppConfig::default(); + let provider_config = json!({ + "auth": { + "OPENAI_API_KEY": "fresh-key" + }, + "config": r#"model_provider = "aihubmix" +model = "gpt-5.4" + +[model_providers.aihubmix] +name = "AiHubMix" +base_url = "https://aihubmix.example/v1" +wire_api = "responses" +requires_openai_auth = true +"# + }); + + let provider = Provider::with_id( + "codex-1".to_string(), + "Codex Test".to_string(), + provider_config, + None, + ); + + let manager = config + .get_manager_mut(&AppType::Codex) + .expect("codex manager"); + manager.providers.insert("codex-1".to_string(), provider); + manager.current = "codex-1".to_string(); + + ConfigService::sync_current_providers_to_live(&mut config).expect("sync codex live"); + + let toml_text = + fs::read_to_string(cc_switch_lib::get_codex_config_path()).expect("read config.toml"); + let parsed: toml::Value = toml::from_str(&toml_text).expect("parse config.toml"); + + assert_eq!( + parsed.get("model_provider").and_then(|v| v.as_str()), + Some("rightcode"), + "legacy ConfigService sync should use the stable live provider id" + ); + + let model_providers = parsed + .get("model_providers") + .and_then(|v| v.as_table()) + .expect("model_providers should exist"); + assert!( + model_providers.get("aihubmix").is_none(), + "provider-specific target id should not be written to live config" + ); + assert_eq!( + model_providers + .get("rightcode") + .and_then(|v| v.get("base_url")) + .and_then(|v| v.as_str()), + Some("https://aihubmix.example/v1") + ); + + let synced_cfg = config + .get_manager(&AppType::Codex) + .and_then(|manager| manager.providers.get("codex-1")) + .and_then(|provider| provider.settings_config.get("config")) + .and_then(|v| v.as_str()) + .expect("synced config string"); + assert!( + synced_cfg.contains("[model_providers.rightcode]"), + "ConfigService keeps its existing behavior of syncing provider config from live" + ); +} + #[test] fn sync_enabled_to_codex_writes_enabled_servers() { let _guard = test_mutex().lock().expect("acquire test mutex"); @@ -554,6 +641,7 @@ command = "echo" codex: false, // 初始未启用 gemini: false, opencode: false, + hermes: false, }, description: None, homepage: None, @@ -682,6 +770,7 @@ fn import_from_claude_merges_into_config() { codex: false, gemini: false, opencode: false, + hermes: false, }, description: None, homepage: None, diff --git a/src-tauri/tests/mcp_commands.rs b/src-tauri/tests/mcp_commands.rs index 1ed24a99d..242b6e835 100644 --- a/src-tauri/tests/mcp_commands.rs +++ b/src-tauri/tests/mcp_commands.rs @@ -150,6 +150,110 @@ fn import_mcp_from_claude_creates_config_and_enables_servers() { ); } +#[test] +fn import_mcp_from_codex_does_not_rewrite_codex_config() { + let _guard = test_mutex().lock().expect("acquire test mutex"); + reset_test_fs(); + let home = ensure_test_home(); + + let codex_dir = home.join(".codex"); + fs::create_dir_all(&codex_dir).expect("create codex dir"); + let config_path = codex_dir.join("config.toml"); + let original = r#"# keep user formatting intact +model = "gpt-5" + +[mcp.servers.legacy] +type = "stdio" +command = "echo" + +[mcp_servers.echo] +type = "stdio" +command = "echo" +"#; + fs::write(&config_path, original).expect("seed codex config"); + + let state = create_test_state().expect("create test state"); + let changed = McpService::import_from_codex(&state).expect("import from codex"); + assert!(changed > 0, "should import servers from Codex config"); + + let after = fs::read_to_string(&config_path).expect("read codex config"); + assert_eq!( + after, original, + "importing from Codex should not rewrite ~/.codex/config.toml" + ); +} + +#[test] +fn import_mcp_from_claude_does_not_sync_existing_codex_enabled_server() { + let _guard = test_mutex().lock().expect("acquire test mutex"); + reset_test_fs(); + let home = ensure_test_home(); + + let codex_dir = home.join(".codex"); + fs::create_dir_all(&codex_dir).expect("create codex dir"); + let codex_config_path = codex_dir.join("config.toml"); + let codex_original = r#"[mcp.servers.keep_me] +type = "stdio" +command = "echo" +"#; + fs::write(&codex_config_path, codex_original).expect("seed codex config"); + + let claude_json = json!({ + "mcpServers": { + "shared": { + "type": "stdio", + "command": "echo" + } + } + }); + fs::write( + get_claude_mcp_path(), + serde_json::to_string_pretty(&claude_json).expect("serialize claude mcp"), + ) + .expect("seed claude mcp"); + + let state = create_test_state().expect("create test state"); + state + .db + .save_mcp_server(&McpServer { + id: "shared".to_string(), + name: "shared".to_string(), + server: json!({ + "type": "stdio", + "command": "echo" + }), + apps: McpApps { + claude: false, + codex: true, + gemini: false, + opencode: false, + hermes: false, + }, + description: None, + homepage: None, + docs: None, + tags: Vec::new(), + }) + .expect("seed existing mcp server"); + + let changed = McpService::import_from_claude(&state).expect("import from claude"); + assert_eq!(changed, 0, "existing server should not count as new"); + + let after = fs::read_to_string(&codex_config_path).expect("read codex config"); + assert_eq!( + after, codex_original, + "importing from Claude should not sync an existing Codex-enabled server" + ); + + let servers = state.db.get_all_mcp_servers().expect("get all mcp servers"); + let shared = servers.get("shared").expect("shared server exists"); + assert!( + shared.apps.claude, + "import should enable Claude in database" + ); + assert!(shared.apps.codex, "existing Codex flag should be preserved"); +} + #[test] fn import_mcp_from_claude_invalid_json_preserves_state() { use support::create_test_state; @@ -217,6 +321,7 @@ fn set_mcp_enabled_for_codex_writes_live_config() { codex: false, // 初始未启用 gemini: false, opencode: false, + hermes: false, }, description: None, homepage: None, @@ -281,6 +386,7 @@ fn enabling_codex_mcp_skips_when_codex_dir_missing() { codex: false, gemini: false, opencode: false, + hermes: false, }, description: None, homepage: None, @@ -325,6 +431,7 @@ fn upsert_mcp_server_disabling_app_removes_from_claude_live_config() { codex: false, gemini: false, opencode: false, + hermes: false, }, description: None, homepage: None, @@ -358,6 +465,7 @@ fn upsert_mcp_server_disabling_app_removes_from_claude_live_config() { codex: false, gemini: false, opencode: false, + hermes: false, }, description: None, homepage: None, @@ -490,6 +598,7 @@ fn enabling_gemini_mcp_skips_when_gemini_dir_missing() { codex: false, gemini: false, opencode: false, + hermes: false, }, description: None, homepage: None, @@ -544,6 +653,7 @@ fn enabling_claude_mcp_skips_when_claude_config_absent() { codex: false, gemini: false, opencode: false, + hermes: false, }, description: None, homepage: None, @@ -604,6 +714,7 @@ fn sync_all_enabled_removes_known_disabled_but_preserves_unknown_live_entries() codex: false, gemini: false, opencode: false, + hermes: false, }, description: None, homepage: None, @@ -625,6 +736,7 @@ fn sync_all_enabled_removes_known_disabled_but_preserves_unknown_live_entries() codex: false, gemini: false, opencode: false, + hermes: false, }, description: None, homepage: None, diff --git a/src-tauri/tests/provider_commands.rs b/src-tauri/tests/provider_commands.rs index 328848926..7c407dc73 100644 --- a/src-tauri/tests/provider_commands.rs +++ b/src-tauri/tests/provider_commands.rs @@ -1,14 +1,146 @@ use serde_json::json; +use std::path::{Path, PathBuf}; use cc_switch_lib::{ - get_codex_auth_path, get_codex_config_path, read_json_file, switch_provider_test_hook, - write_codex_live_atomic, AppError, AppType, McpApps, McpServer, MultiAppConfig, Provider, + get_codex_auth_path, get_codex_config_path, import_default_config_test_hook, read_json_file, + switch_provider_test_hook, write_codex_live_atomic, AppError, AppType, McpApps, McpServer, + MultiAppConfig, Provider, ProviderService, }; #[path = "support.rs"] mod support; use std::collections::HashMap; -use support::{create_test_state_with_config, ensure_test_home, reset_test_fs, test_mutex}; +use support::{ + create_test_state, create_test_state_with_config, ensure_test_home, reset_test_fs, test_mutex, +}; + +fn settings_path(home: &Path) -> PathBuf { + home.join(".cc-switch").join("settings.json") +} + +#[test] +fn codex_startup_import_fresh_install_imports_once_and_syncs_current_setting() { + let _guard = test_mutex().lock().expect("acquire test mutex"); + reset_test_fs(); + let home = ensure_test_home(); + + let auth = json!({"OPENAI_API_KEY": "fresh-key"}); + let config = r#"model = "gpt-5" +"#; + write_codex_live_atomic(&auth, Some(config)).expect("seed codex live config"); + + let state = create_test_state().expect("create test state"); + + assert!( + ProviderService::should_import_default_config_on_startup(&state, &AppType::Codex) + .expect("check startup import eligibility"), + "empty Codex provider set should import on startup" + ); + + import_default_config_test_hook(&state, AppType::Codex).expect("import codex default"); + + let providers = state + .db + .get_all_providers(AppType::Codex.as_str()) + .expect("get codex providers after import"); + assert_eq!( + providers.len(), + 1, + "fresh install import should create exactly one Codex provider before seeding" + ); + assert!( + providers.contains_key("default"), + "fresh install import should create default provider" + ); + + let current_id = state + .db + .get_current_provider(AppType::Codex.as_str()) + .expect("get codex current provider"); + assert_eq!(current_id.as_deref(), Some("default")); + + let settings: serde_json::Value = serde_json::from_str( + &std::fs::read_to_string(settings_path(home)).expect("read settings.json"), + ) + .expect("parse settings.json"); + assert_eq!( + settings + .get("currentProviderCodex") + .and_then(|value| value.as_str()), + Some("default"), + "live import should also sync device-local currentProviderCodex" + ); + + state + .db + .init_default_official_providers() + .expect("seed official providers"); + let providers_after_seed = state + .db + .get_all_providers(AppType::Codex.as_str()) + .expect("get codex providers after seed"); + assert_eq!( + providers_after_seed.len(), + 2, + "official seeding should add codex-official alongside imported default" + ); + assert!(providers_after_seed.contains_key("codex-official")); + + assert!( + !ProviderService::should_import_default_config_on_startup(&state, &AppType::Codex) + .expect("re-check startup import eligibility"), + "subsequent startup should skip once Codex already has providers" + ); +} + +#[test] +fn codex_startup_import_skips_when_only_official_seed_exists() { + let _guard = test_mutex().lock().expect("acquire test mutex"); + reset_test_fs(); + let _home = ensure_test_home(); + + let auth = json!({"OPENAI_API_KEY": "fresh-key"}); + let config = r#"model = "gpt-5" +"#; + write_codex_live_atomic(&auth, Some(config)).expect("seed codex live config"); + + let state = create_test_state().expect("create test state"); + state + .db + .init_default_official_providers() + .expect("seed official providers"); + + let providers_before = state + .db + .get_all_providers(AppType::Codex.as_str()) + .expect("get codex providers before restart check"); + assert_eq!( + providers_before.len(), + 1, + "fixture should start with only codex-official present" + ); + assert!(providers_before.contains_key("codex-official")); + + assert!( + !ProviderService::should_import_default_config_on_startup(&state, &AppType::Codex) + .expect("check startup import eligibility"), + "startup should skip import when codex-official already exists" + ); + + let providers_after = state + .db + .get_all_providers(AppType::Codex.as_str()) + .expect("get codex providers after restart check"); + assert_eq!( + providers_after.len(), + providers_before.len(), + "skipping startup import should not grow the Codex provider set" + ); + assert!( + !providers_after.contains_key("default"), + "restart path should not create a new default provider" + ); +} #[test] fn switch_provider_updates_codex_live_and_state() { @@ -75,6 +207,7 @@ command = "say" codex: true, // 启用 Codex gemini: false, opencode: false, + hermes: false, }, description: None, homepage: None, diff --git a/src-tauri/tests/provider_service.rs b/src-tauri/tests/provider_service.rs index 2b9eddaa9..bb963be6d 100644 --- a/src-tauri/tests/provider_service.rs +++ b/src-tauri/tests/provider_service.rs @@ -163,6 +163,7 @@ command = "say" codex: true, gemini: false, opencode: false, + hermes: false, }, description: None, homepage: None, @@ -238,6 +239,241 @@ command = "say" ); } +#[test] +fn provider_service_switch_codex_preserves_live_model_provider_id_for_history() { + let _guard = test_mutex().lock().expect("acquire test mutex"); + reset_test_fs(); + let _home = ensure_test_home(); + + let legacy_auth = json!({ "OPENAI_API_KEY": "rightcode-key" }); + let legacy_config = r#"model_provider = "rightcode" +model = "gpt-5.4" + +[model_providers.rightcode] +name = "RightCode" +base_url = "https://rightcode.example/v1" +wire_api = "responses" +requires_openai_auth = true +"#; + write_codex_live_atomic(&legacy_auth, Some(legacy_config)) + .expect("seed existing codex live config"); + + let mut initial_config = MultiAppConfig::default(); + { + let manager = initial_config + .get_manager_mut(&AppType::Codex) + .expect("codex manager"); + manager.current = "old-provider".to_string(); + manager.providers.insert( + "old-provider".to_string(), + Provider::with_id( + "old-provider".to_string(), + "RightCode".to_string(), + json!({ + "auth": {"OPENAI_API_KEY": "stale"}, + "config": legacy_config + }), + None, + ), + ); + manager.providers.insert( + "new-provider".to_string(), + Provider::with_id( + "new-provider".to_string(), + "AiHubMix".to_string(), + json!({ + "auth": {"OPENAI_API_KEY": "fresh-key"}, + "config": r#"model_provider = "aihubmix" +model = "gpt-5.4" + +[model_providers.aihubmix] +name = "AiHubMix" +base_url = "https://aihubmix.example/v1" +wire_api = "responses" +requires_openai_auth = true +"# + }), + None, + ), + ); + } + + let state = create_test_state_with_config(&initial_config).expect("create test state"); + + ProviderService::switch(&state, AppType::Codex, "new-provider") + .expect("switch provider should succeed"); + + let config_text = + std::fs::read_to_string(cc_switch_lib::get_codex_config_path()).expect("read config.toml"); + let parsed: toml::Value = toml::from_str(&config_text).expect("parse config.toml"); + + assert_eq!( + parsed.get("model_provider").and_then(|v| v.as_str()), + Some("rightcode"), + "live Codex model_provider should stay stable so resume history remains visible" + ); + + let model_providers = parsed + .get("model_providers") + .and_then(|v| v.as_table()) + .expect("model_providers table exists"); + assert!( + model_providers.get("aihubmix").is_none(), + "target provider-specific id should be rewritten in live config" + ); + assert_eq!( + model_providers + .get("rightcode") + .and_then(|v| v.get("base_url")) + .and_then(|v| v.as_str()), + Some("https://aihubmix.example/v1"), + "stable provider id should point at the newly selected supplier endpoint" + ); + + let providers = state + .db + .get_all_providers(AppType::Codex.as_str()) + .expect("read providers after switch"); + let new_config_text = providers + .get("new-provider") + .expect("new provider exists") + .settings_config + .get("config") + .and_then(|v| v.as_str()) + .unwrap_or_default(); + assert!( + new_config_text.contains("[model_providers.aihubmix]"), + "stored provider template should remain provider-specific" + ); +} + +#[test] +fn provider_service_switch_codex_backfill_keeps_provider_specific_model_provider_id() { + let _guard = test_mutex().lock().expect("acquire test mutex"); + reset_test_fs(); + let _home = ensure_test_home(); + + let legacy_auth = json!({ "OPENAI_API_KEY": "rightcode-key" }); + let provider_a_config = r#"model_provider = "rightcode" +model = "gpt-5.4" + +[model_providers.rightcode] +name = "RightCode" +base_url = "https://rightcode.example/v1" +wire_api = "responses" +requires_openai_auth = true +"#; + write_codex_live_atomic(&legacy_auth, Some(provider_a_config)) + .expect("seed existing codex live config"); + + let mut initial_config = MultiAppConfig::default(); + { + let manager = initial_config + .get_manager_mut(&AppType::Codex) + .expect("codex manager"); + manager.current = "provider-a".to_string(); + manager.providers.insert( + "provider-a".to_string(), + Provider::with_id( + "provider-a".to_string(), + "RightCode".to_string(), + json!({ + "auth": {"OPENAI_API_KEY": "rightcode-key"}, + "config": provider_a_config + }), + None, + ), + ); + manager.providers.insert( + "provider-b".to_string(), + Provider::with_id( + "provider-b".to_string(), + "AiHubMix".to_string(), + json!({ + "auth": {"OPENAI_API_KEY": "aihubmix-key"}, + "config": r#"model_provider = "aihubmix" +model = "gpt-5.4" +profile = "work" + +[model_providers.aihubmix] +name = "AiHubMix" +base_url = "https://aihubmix.example/v1" +wire_api = "responses" +requires_openai_auth = true + +[profiles.work] +model_provider = "aihubmix" +model = "gpt-5.4" +"# + }), + None, + ), + ); + manager.providers.insert( + "provider-c".to_string(), + Provider::with_id( + "provider-c".to_string(), + "Vendor C".to_string(), + json!({ + "auth": {"OPENAI_API_KEY": "vendor-c-key"}, + "config": r#"model_provider = "vendor_c" +model = "gpt-5.4" + +[model_providers.vendor_c] +name = "Vendor C" +base_url = "https://vendor-c.example/v1" +wire_api = "responses" +requires_openai_auth = true +"# + }), + None, + ), + ); + } + + let state = create_test_state_with_config(&initial_config).expect("create test state"); + + ProviderService::switch(&state, AppType::Codex, "provider-b") + .expect("switch to provider b should succeed"); + ProviderService::switch(&state, AppType::Codex, "provider-c") + .expect("switch to provider c should succeed"); + + let providers = state + .db + .get_all_providers(AppType::Codex.as_str()) + .expect("read providers after switches"); + let provider_b_config = providers + .get("provider-b") + .expect("provider b exists") + .settings_config + .get("config") + .and_then(|v| v.as_str()) + .expect("provider b config"); + let parsed: toml::Value = toml::from_str(provider_b_config).expect("parse provider b config"); + + assert_eq!( + parsed.get("model_provider").and_then(|v| v.as_str()), + Some("aihubmix"), + "backfill should restore provider b's storage-specific model_provider id" + ); + assert!( + parsed + .get("model_providers") + .and_then(|v| v.get("aihubmix")) + .is_some(), + "provider b should keep its own model_providers table after backfill" + ); + assert_eq!( + parsed + .get("profiles") + .and_then(|v| v.get("work")) + .and_then(|v| v.get("model_provider")) + .and_then(|v| v.as_str()), + Some("aihubmix"), + "profile overrides should be restored to provider b's storage-specific id" + ); +} + #[test] fn sync_current_provider_for_app_keeps_live_takeover_and_updates_restore_backup() { let _guard = test_mutex().lock().expect("acquire test mutex"); diff --git a/src-tauri/tests/skill_sync.rs b/src-tauri/tests/skill_sync.rs index b1e0c3a61..fcba98a7a 100644 --- a/src-tauri/tests/skill_sync.rs +++ b/src-tauri/tests/skill_sync.rs @@ -53,10 +53,8 @@ fn import_from_apps_respects_explicit_app_selection() { vec![ImportSkillSelection { directory: "shared-skill".to_string(), apps: SkillApps { - claude: false, - codex: false, - gemini: false, opencode: true, + ..Default::default() }, }], ) @@ -74,6 +72,53 @@ fn import_from_apps_respects_explicit_app_selection() { ); } +#[test] +fn import_from_apps_does_not_rewrite_selected_app_directory() { + let _guard = test_mutex().lock().expect("acquire test mutex"); + reset_test_fs(); + let home = ensure_test_home(); + + let ssot_skill_dir = home.join(".cc-switch").join("skills").join("codex-skill"); + write_skill(&ssot_skill_dir, "Stale SSOT Skill"); + fs::write(ssot_skill_dir.join("prompt.md"), "stale ssot").expect("write stale ssot prompt"); + + let codex_skill_dir = home.join(".codex").join("skills").join("codex-skill"); + write_skill(&codex_skill_dir, "Live Codex Skill"); + fs::write(codex_skill_dir.join("prompt.md"), "live codex").expect("write live codex prompt"); + + let state = create_test_state().expect("create test state"); + + let imported = SkillService::import_from_apps( + &state.db, + vec![ImportSkillSelection { + directory: "codex-skill".to_string(), + apps: SkillApps { + codex: true, + ..Default::default() + }, + }], + ) + .expect("import skills"); + + assert_eq!(imported.len(), 1, "expected exactly one imported skill"); + assert!( + imported[0].apps.codex, + "import should preserve the selected Codex app state" + ); + assert_eq!( + fs::read_to_string(codex_skill_dir.join("prompt.md")).expect("read live codex prompt"), + "live codex", + "import should not replace the app skill directory with SSOT contents" + ); + assert!( + !fs::symlink_metadata(&codex_skill_dir) + .expect("read codex skill metadata") + .file_type() + .is_symlink(), + "import should not replace the app skill directory with a managed symlink" + ); +} + #[test] fn sync_to_app_removes_disabled_and_orphaned_ssot_symlinks() { let _guard = test_mutex().lock().expect("acquire test mutex"); @@ -103,12 +148,7 @@ fn sync_to_app_removes_disabled_and_orphaned_ssot_symlinks() { repo_name: None, repo_branch: None, readme_url: None, - apps: SkillApps { - claude: false, - codex: false, - gemini: false, - opencode: false, - }, + apps: SkillApps::default(), installed_at: 0, content_hash: None, updated_at: 0, @@ -151,9 +191,7 @@ fn uninstall_skill_creates_backup_before_removing_ssot() { readme_url: None, apps: SkillApps { claude: true, - codex: false, - gemini: false, - opencode: false, + ..Default::default() }, installed_at: 123, content_hash: None, @@ -221,9 +259,7 @@ fn restore_skill_backup_restores_files_to_ssot_and_current_app() { readme_url: None, apps: SkillApps { claude: true, - codex: false, - gemini: false, - opencode: false, + ..Default::default() }, installed_at: 456, content_hash: None, @@ -304,9 +340,7 @@ fn delete_skill_backup_removes_backup_directory() { readme_url: None, apps: SkillApps { claude: true, - codex: false, - gemini: false, - opencode: false, + ..Default::default() }, installed_at: 789, content_hash: None, diff --git a/src-tauri/tests/support.rs b/src-tauri/tests/support.rs index 83aa34d13..86f8f76e0 100644 --- a/src-tauri/tests/support.rs +++ b/src-tauri/tests/support.rs @@ -1,9 +1,7 @@ use std::path::{Path, PathBuf}; use std::sync::{Arc, Mutex, OnceLock}; -use cc_switch_lib::{ - update_settings, AppSettings, AppState, Database, MultiAppConfig, ProxyService, -}; +use cc_switch_lib::{update_settings, AppSettings, AppState, Database, MultiAppConfig}; /// 为测试设置隔离的 HOME 目录，避免污染真实用户数据。 pub fn ensure_test_home() -> &'static Path { @@ -62,8 +60,7 @@ pub fn test_mutex() -> &'static Mutex<()> { #[allow(dead_code)] pub fn create_test_state() -> Result> { let db = Arc::new(Database::init()?); - let proxy_service = ProxyService::new(db.clone()); - Ok(AppState { db, proxy_service }) + Ok(AppState::new(db)) } /// 创建测试用的 AppState，并从 MultiAppConfig 迁移数据 @@ -73,6 +70,5 @@ pub fn create_test_state_with_config( ) -> Result> { let db = Arc::new(Database::init()?); db.migrate_from_json(config)?; - let proxy_service = ProxyService::new(db.clone()); - Ok(AppState { db, proxy_service }) + Ok(AppState::new(db)) } diff --git a/src/App.tsx b/src/App.tsx index 4406ac753..9ffac348c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -14,6 +14,7 @@ import { Minimize2, X, Book, + Brain, Wrench, RefreshCw, History, @@ -25,6 +26,7 @@ import { KeyRound, Shield, Cpu, + LayoutDashboard, } from "lucide-react"; import { getCurrentWindow } from "@tauri-apps/api/window"; import type { Provider, VisibleApps } from "@/types"; @@ -39,8 +41,11 @@ import { import { checkAllEnvConflicts, checkEnvConflicts } from "@/lib/api/env"; import { useProviderActions } from "@/hooks/useProviderActions"; import { openclawKeys, useOpenClawHealth } from "@/hooks/useOpenClaw"; +import { hermesKeys, useOpenHermesWebUI } from "@/hooks/useHermes"; +import { hermesApi } from "@/lib/api/hermes"; import { useProxyStatus } from "@/hooks/useProxyStatus"; import { useAutoCompact } from "@/hooks/useAutoCompact"; +import { useUsageCacheBridge } from "@/hooks/useUsageCacheBridge"; import { useLastValidValue } from "@/hooks/useLastValidValue"; import { extractErrorMessage } from "@/utils/errorUtils"; import { isTextEditableTarget } from "@/utils/domUtils"; @@ -60,6 +65,7 @@ import { SettingsPage } from "@/components/settings/SettingsPage"; import { UpdateBadge } from "@/components/UpdateBadge"; import { EnvWarningBanner } from "@/components/env/EnvWarningBanner"; import { ProxyToggle } from "@/components/proxy/ProxyToggle"; +import { ClaudeDesktopRouteToggle } from "@/components/proxy/ClaudeDesktopRouteToggle"; import { FailoverToggle } from "@/components/proxy/FailoverToggle"; import UsageScriptModal from "@/components/UsageScriptModal"; import UnifiedMcpPanel from "@/components/mcp/UnifiedMcpPanel"; @@ -82,6 +88,7 @@ import EnvPanel from "@/components/openclaw/EnvPanel"; import ToolsPanel from "@/components/openclaw/ToolsPanel"; import AgentsDefaultsPanel from "@/components/openclaw/AgentsDefaultsPanel"; import OpenClawHealthBanner from "@/components/openclaw/OpenClawHealthBanner"; +import HermesMemoryPanel from "@/components/hermes/HermesMemoryPanel"; type View = | "providers" @@ -96,7 +103,8 @@ type View = | "workspace" | "openclawEnv" | "openclawTools" - | "openclawAgents"; + | "openclawAgents" + | "hermesMemory"; interface WebDavSyncStatusUpdatedPayload { source?: string; @@ -110,10 +118,12 @@ const HEADER_HEIGHT = 64; // px const STORAGE_KEY = "cc-switch-last-app"; const VALID_APPS: AppId[] = [ "claude", + "claude-desktop", "codex", "gemini", "opencode", "openclaw", + "hermes", ]; const getInitialApp = (): AppId => { @@ -139,6 +149,7 @@ const VALID_VIEWS: View[] = [ "openclawEnv", "openclawTools", "openclawAgents", + "hermesMemory", ]; const getInitialView = (): View => { @@ -170,18 +181,22 @@ function App() { const contentTopOffset = dragBarHeight + HEADER_HEIGHT; const visibleApps: VisibleApps = settingsData?.visibleApps ?? { claude: true, + "claude-desktop": true, codex: true, gemini: true, opencode: true, openclaw: true, + hermes: true, }; const getFirstVisibleApp = (): AppId => { if (visibleApps.claude) return "claude"; + if (visibleApps["claude-desktop"]) return "claude-desktop"; if (visibleApps.codex) return "codex"; if (visibleApps.gemini) return "gemini"; if (visibleApps.opencode) return "opencode"; if (visibleApps.openclaw) return "openclaw"; + if (visibleApps.hermes) return "hermes"; return "claude"; // fallback }; @@ -199,7 +214,8 @@ function App() { activeApp !== "codex" && activeApp !== "opencode" && activeApp !== "openclaw" && - activeApp !== "gemini" + activeApp !== "gemini" && + activeApp !== "hermes" ) { setCurrentView("providers"); } @@ -220,6 +236,8 @@ function App() { const toolbarRef = useRef(null); const isToolbarCompact = useAutoCompact(toolbarRef); + useUsageCacheBridge(); + const promptPanelRef = useRef(null); const mcpPanelRef = useRef(null); const skillsPageRef = useRef(null); @@ -255,13 +273,14 @@ function App() { currentView === "openclawAgents"); const { data: openclawHealthWarnings = [] } = useOpenClawHealth(isOpenClawView); - const hasSkillsSupport = true; + const hasSkillsSupport = activeApp !== "claude-desktop"; const hasSessionSupport = activeApp === "claude" || activeApp === "codex" || activeApp === "opencode" || activeApp === "openclaw" || - activeApp === "gemini"; + activeApp === "gemini" || + activeApp === "hermes"; const { addProvider, @@ -610,6 +629,11 @@ function App() { }; }, []); + const [launchDashboardOpen, setLaunchDashboardOpen] = useState(false); + const openHermesWebUI = useOpenHermesWebUI(() => + setLaunchDashboardOpen(true), + ); + const handleOpenWebsite = async (url: string) => { try { await settingsApi.openExternal(url); @@ -654,6 +678,10 @@ function App() { await queryClient.invalidateQueries({ queryKey: openclawKeys.health, }); + } else if (activeApp === "hermes") { + await queryClient.invalidateQueries({ + queryKey: hermesKeys.liveProviderIds, + }); } toast.success( t("notifications.removeFromConfigSuccess", { @@ -704,7 +732,11 @@ function App() { iconColor: provider.iconColor, }; - if (activeApp === "opencode" || activeApp === "openclaw") { + if ( + activeApp === "opencode" || + activeApp === "openclaw" || + activeApp === "hermes" + ) { let liveProviderIds: string[] = []; try { liveProviderIds = @@ -713,10 +745,15 @@ function App() { queryKey: ["opencodeLiveProviderIds"], queryFn: () => providersApi.getOpenCodeLiveProviderIds(), }) - : await queryClient.ensureQueryData({ - queryKey: openclawKeys.liveProviderIds, - queryFn: () => providersApi.getOpenClawLiveProviderIds(), - }); + : activeApp === "openclaw" + ? await queryClient.ensureQueryData({ + queryKey: openclawKeys.liveProviderIds, + queryFn: () => providersApi.getOpenClawLiveProviderIds(), + }) + : await queryClient.ensureQueryData({ + queryKey: hermesKeys.liveProviderIds, + queryFn: () => providersApi.getHermesLiveProviderIds(), + }); } catch (error) { console.error( "[App] Failed to load live provider IDs for duplication", @@ -877,6 +914,8 @@ function App() { appId={activeApp} /> ); + case "hermesMemory": + return ; case "skills": return ( setConfirmAction({ provider, action: "remove" }) : undefined @@ -972,7 +1013,11 @@ function App() { } onCreate={() => setIsAddOpen(true)} onSetAsDefault={ - activeApp === "openclaw" ? setAsDefaultModel : undefined + activeApp === "openclaw" + ? setAsDefaultModel + : activeApp === "hermes" + ? switchProvider + : undefined } /> @@ -1001,7 +1046,7 @@ function App() { return (
{(dragBarHeight > 0 || useAppWindowControls) && ( @@ -1133,6 +1178,7 @@ function App() { {currentView === "openclawTools" && t("openclaw.tools.title")} {currentView === "openclawAgents" && t("openclaw.agents.title")} + {currentView === "hermesMemory" && t("hermes.memory.title")}
) : ( @@ -1193,17 +1239,23 @@ function App() {
{currentView === "providers" && activeApp !== "opencode" && - activeApp !== "openclaw" && ( + activeApp !== "openclaw" && + activeApp !== "hermes" && (
- {settingsData?.enableLocalProxy && ( - - )} - {settingsData?.enableFailoverToggle && ( - + {activeApp === "claude-desktop" ? ( + + ) : ( + settingsData?.enableLocalProxy && ( + + ) )} + {activeApp !== "claude-desktop" && + settingsData?.enableFailoverToggle && ( + + )}
)}
- {activeApp === "openclaw" ? ( + {activeApp === "hermes" ? ( + <> + + + + + + ) : activeApp === "openclaw" ? ( <> - + {activeApp !== "claude-desktop" && ( + + )} - + {activeApp !== "claude-desktop" && ( + + )} )} @@ -1519,6 +1618,28 @@ function App() { onCancel={() => setConfirmAction(null)} /> + { + setLaunchDashboardOpen(false); + void (async () => { + try { + await hermesApi.launchDashboard(); + toast.success(t("hermes.webui.launching")); + } catch (error) { + toast.error(t("hermes.webui.launchFailed"), { + description: extractErrorMessage(error) || undefined, + }); + } + })(); + }} + onCancel={() => setLaunchDashboardOpen(false)} + /> +
diff --git a/src/components/AppSwitcher.tsx b/src/components/AppSwitcher.tsx index 61d780e90..f8c2dfafd 100644 --- a/src/components/AppSwitcher.tsx +++ b/src/components/AppSwitcher.tsx @@ -10,7 +10,15 @@ interface AppSwitcherProps { compact?: boolean; } -const ALL_APPS: AppId[] = ["claude", "codex", "gemini", "opencode", "openclaw"]; +const ALL_APPS: AppId[] = [ + "claude", + "claude-desktop", + "codex", + "gemini", + "opencode", + "openclaw", + "hermes", +]; const STORAGE_KEY = "cc-switch-last-app"; export function AppSwitcher({ @@ -27,17 +35,21 @@ export function AppSwitcher({ const iconSize = 20; const appIconName: Record = { claude: "claude", + "claude-desktop": "claude", codex: "openai", gemini: "gemini", opencode: "opencode", openclaw: "openclaw", + hermes: "hermes", }; const appDisplayName: Record = { claude: "Claude", + "claude-desktop": "Claude Desktop", codex: "Codex", gemini: "Gemini", opencode: "OpenCode", openclaw: "OpenClaw", + hermes: "Hermes", }; // Filter apps based on visibility settings (default all visible) diff --git a/src/components/ProviderIcon.tsx b/src/components/ProviderIcon.tsx index ddc9ed64d..0639d0619 100644 --- a/src/components/ProviderIcon.tsx +++ b/src/components/ProviderIcon.tsx @@ -74,6 +74,7 @@ export const ProviderIcon: React.FC = ({ "inline-flex items-center justify-center flex-shrink-0", className, )} + title={name} style={{ ...sizeStyle, color: effectiveColor }} dangerouslySetInnerHTML={{ __html: iconSvg }} /> @@ -86,6 +87,7 @@ export const ProviderIcon: React.FC = ({ {name} = ({ "bg-muted text-muted-foreground font-semibold", className, )} + title={name} style={sizeStyle} > = { gemini_flash: "subscription.geminiFlash", gemini_flash_lite: "subscription.geminiFlashLite", // Token Plan（five_hour 已在上方官方映射中） - weekly_limit: "subscription.weeklyLimit", + weekly_limit: "subscription.sevenDay", // GitHub Copilot premium: "subscription.copilotPremium", }; @@ -205,7 +205,9 @@ export const SubscriptionQuotaView: React.FC = ({ } // 成功获取数据 - const tiers = quota.tiers || []; + const tiers = (quota.tiers || []).filter( + (tier) => tier.name in TIER_I18N_KEYS, + ); if (tiers.length === 0) return null; // ── inline 模式：紧凑两行显示 ── diff --git a/src/components/UsageScriptModal.tsx b/src/components/UsageScriptModal.tsx index a0d33b077..e3083d716 100644 --- a/src/components/UsageScriptModal.tsx +++ b/src/components/UsageScriptModal.tsx @@ -3,7 +3,7 @@ import { Play, Wand2, Eye, EyeOff, Save } from "lucide-react"; import { toast } from "sonner"; import { useTranslation } from "react-i18next"; import { useQueryClient } from "@tanstack/react-query"; -import { Provider, UsageScript, UsageData } from "@/types"; +import { Provider, UsageScript, UsageData, createUsageScript } from "@/types"; import { usageApi, settingsApi, type AppId } from "@/lib/api"; import { copilotGetUsage, copilotGetUsageForAccount } from "@/lib/api/copilot"; import { useSettingsQuery } from "@/lib/query"; @@ -21,6 +21,10 @@ import { FullScreenPanel } from "@/components/common/FullScreenPanel"; import { ConfirmDialog } from "@/components/ConfirmDialog"; import { cn } from "@/lib/utils"; import { TEMPLATE_TYPES, PROVIDER_TYPES } from "@/config/constants"; +import { + CODING_PLAN_PROVIDERS, + detectCodingPlanProvider, +} from "@/config/codingPlanProviders"; interface UsageScriptModalProps { provider: Provider; @@ -73,6 +77,7 @@ const generatePresetTemplates = ( headers: { "Content-Type": "application/json", "Authorization": "Bearer {{accessToken}}", + "User-Agent": "cc-switch/1.0", "New-Api-User": "{{userId}}" }, }, @@ -113,21 +118,6 @@ const TEMPLATE_NAME_KEYS: Record = { [TEMPLATE_TYPES.BALANCE]: "usageScript.templateBalance", }; -/** Coding Plan 供应商选项 */ -const TOKEN_PLAN_PROVIDERS = [ - { id: "kimi", label: "Kimi For Coding", pattern: /api\.kimi\.com\/coding/i }, - { - id: "zhipu", - label: "Zhipu GLM (智谱)", - pattern: /bigmodel\.cn|api\.z\.ai/i, - }, - { - id: "minimax", - label: "MiniMax", - pattern: /api\.minimaxi?\.com|api\.minimax\.io/i, - }, -] as const; - /** 官方余额查询供应商检测 */ const BALANCE_PROVIDERS = [ { id: "deepseek", label: "DeepSeek", pattern: /api\.deepseek\.com/i }, @@ -147,15 +137,6 @@ function detectBalanceProvider(baseUrl: string | undefined): boolean { return BALANCE_PROVIDERS.some((bp) => bp.pattern.test(baseUrl)); } -/** 根据 Base URL 自动检测 Coding Plan 供应商 */ -function detectTokenPlanProvider(baseUrl: string | undefined): string | null { - if (!baseUrl) return null; - for (const cp of TOKEN_PLAN_PROVIDERS) { - if (cp.pattern.test(baseUrl)) return cp.id; - } - return null; -} - const UsageScriptModal: React.FC = ({ provider, appId, @@ -203,6 +184,18 @@ const UsageScriptModal: React.FC = ({ apiKey: env.GEMINI_API_KEY, baseUrl: env.GOOGLE_GEMINI_BASE_URL, }; + } else if (appId === "hermes") { + // Hermes: settingsConfig 顶层扁平（snake_case，对应 config.yaml） + return { + apiKey: (config as any).api_key, + baseUrl: (config as any).base_url, + }; + } else if (appId === "openclaw") { + // OpenClaw: settingsConfig 顶层扁平（camelCase，对应 openclaw.json） + return { + apiKey: (config as any).apiKey, + baseUrl: (config as any).baseUrl, + }; } return { apiKey: undefined, baseUrl: undefined }; } catch (error) { @@ -224,43 +217,24 @@ const UsageScriptModal: React.FC = ({ return { ...savedScript, codingPlanProvider: - detectTokenPlanProvider(providerCredentials.baseUrl) || "kimi", + detectCodingPlanProvider(providerCredentials.baseUrl) || "kimi", }; } return savedScript; } - // 新配置：如果 URL 匹配 Coding Plan，自动初始化 - const autoDetected = detectTokenPlanProvider(providerCredentials.baseUrl); + const autoDetected = detectCodingPlanProvider(providerCredentials.baseUrl); if (autoDetected) { - return { - enabled: false, - language: "javascript" as const, - code: "", - timeout: 10, - autoQueryInterval: 5, - codingPlanProvider: autoDetected, - }; + return createUsageScript({ codingPlanProvider: autoDetected }); } - // 新配置：如果 URL 匹配官方余额查询供应商，自动初始化 if (detectBalanceProvider(providerCredentials.baseUrl)) { - return { - enabled: false, - language: "javascript" as const, - code: "", - timeout: 10, - autoQueryInterval: 5, - }; + return createUsageScript(); } - return { - enabled: false, - language: "javascript" as const, + return createUsageScript({ code: PRESET_TEMPLATES[TEMPLATE_TYPES.GENERAL], - timeout: 10, - autoQueryInterval: 5, - }; + }); }); const [testing, setTesting] = useState(false); @@ -333,7 +307,7 @@ const UsageScriptModal: React.FC = ({ return TEMPLATE_TYPES.GENERAL; } // 新配置：如果 URL 匹配 Coding Plan 供应商，自动选择 Coding Plan 模板 - if (detectTokenPlanProvider(providerCredentials.baseUrl)) { + if (detectCodingPlanProvider(providerCredentials.baseUrl)) { return TEMPLATE_TYPES.TOKEN_PLAN; } // 新配置：如果 URL 匹配官方余额查询供应商，自动选择 Balance 模板 @@ -407,12 +381,8 @@ const UsageScriptModal: React.FC = ({ try { // 官方余额查询模板使用专用 API if (selectedTemplate === TEMPLATE_TYPES.BALANCE) { - const config = provider.settingsConfig as Record; - const baseUrl: string = config?.env?.ANTHROPIC_BASE_URL ?? ""; - const apiKey: string = - config?.env?.ANTHROPIC_AUTH_TOKEN ?? - config?.env?.ANTHROPIC_API_KEY ?? - ""; + const baseUrl = providerCredentials.baseUrl ?? ""; + const apiKey = providerCredentials.apiKey ?? ""; const { subscriptionApi } = await import("@/lib/api/subscription"); const result = await subscriptionApi.getBalance(baseUrl, apiKey); if (result.success && result.data && result.data.length > 0) { @@ -438,12 +408,8 @@ const UsageScriptModal: React.FC = ({ // Coding Plan 模板使用专用 API if (selectedTemplate === TEMPLATE_TYPES.TOKEN_PLAN) { - const config = provider.settingsConfig as Record; - const baseUrl: string = config?.env?.ANTHROPIC_BASE_URL ?? ""; - const apiKey: string = - config?.env?.ANTHROPIC_AUTH_TOKEN ?? - config?.env?.ANTHROPIC_API_KEY ?? - ""; + const baseUrl = providerCredentials.baseUrl ?? ""; + const apiKey = providerCredentials.apiKey ?? ""; const { subscriptionApi } = await import("@/lib/api/subscription"); const quota = await subscriptionApi.getCodingPlanQuota(baseUrl, apiKey); if (quota.success && quota.tiers.length > 0) { @@ -618,7 +584,7 @@ const UsageScriptModal: React.FC = ({ }); } else if (presetName === TEMPLATE_TYPES.TOKEN_PLAN) { // Coding Plan 模板不需要脚本，使用 Rust 原生查询 - const autoDetected = detectTokenPlanProvider( + const autoDetected = detectCodingPlanProvider( providerCredentials.baseUrl, ); setScript({ @@ -857,7 +823,7 @@ const UsageScriptModal: React.FC = ({ {t("usageScript.tokenPlanHint")}

- {TOKEN_PLAN_PROVIDERS.map((cp) => ( + {CODING_PLAN_PROVIDERS.map((cp) => (
diff --git a/src/components/common/AppToggleGroup.tsx b/src/components/common/AppToggleGroup.tsx index 928670ab7..c41eb1a12 100644 --- a/src/components/common/AppToggleGroup.tsx +++ b/src/components/common/AppToggleGroup.tsx @@ -8,7 +8,7 @@ import type { AppId } from "@/lib/api/types"; import { APP_IDS, APP_ICON_MAP } from "@/config/appConfig"; interface AppToggleGroupProps { - apps: Record; + apps: Partial>; onToggle: (app: AppId, enabled: boolean) => void; appIds?: AppId[]; } diff --git a/src/components/hermes/HermesMemoryPanel.tsx b/src/components/hermes/HermesMemoryPanel.tsx new file mode 100644 index 000000000..ad707b085 --- /dev/null +++ b/src/components/hermes/HermesMemoryPanel.tsx @@ -0,0 +1,179 @@ +import React, { useEffect, useState } from "react"; +import { useTranslation } from "react-i18next"; +import { toast } from "sonner"; +import { ExternalLink } from "lucide-react"; +import { Button } from "@/components/ui/button"; +import { Switch } from "@/components/ui/switch"; +import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; +import MarkdownEditor from "@/components/MarkdownEditor"; +import { + useHermesMemory, + useHermesMemoryLimits, + useOpenHermesWebUI, + useSaveHermesMemory, + useToggleHermesMemoryEnabled, +} from "@/hooks/useHermes"; +import { useDarkMode } from "@/hooks/useDarkMode"; +import type { HermesMemoryKind } from "@/types"; +import { cn } from "@/lib/utils"; + +interface MemoryTabPaneProps { + kind: HermesMemoryKind; + limit: number; + enabled: boolean; +} + +const MemoryTabPane: React.FC = ({ + kind, + limit, + enabled, +}) => { + const { t } = useTranslation(); + const darkMode = useDarkMode(); + const { data, isLoading } = useHermesMemory(kind, true); + const saveMutation = useSaveHermesMemory(); + const toggleMutation = useToggleHermesMemoryEnabled(); + const [content, setContent] = useState(""); + const [loaded, setLoaded] = useState(false); + + // Hydrate local dirty buffer from query data only on first load. Later + // refetches (e.g. after a successful save) must not clobber in-flight user + // edits — the caller owns `content` until they click Save again. + useEffect(() => { + if (!loaded && data !== undefined) { + setContent(data); + setLoaded(true); + } + }, [data, loaded]); + + const handleSave = async () => { + try { + await saveMutation.mutateAsync({ kind, content }); + toast.success(t("hermes.memory.saveSuccess")); + } catch { + // useSaveHermesMemory already surfaces a localized error toast. + } + }; + + const charCount = content.length; + const isOver = charCount > limit; + + return ( +
+
+
+ + toggleMutation.mutate({ kind, enabled: next }) + } + /> + + {enabled + ? t("hermes.memory.enableOn") + : t("hermes.memory.enableOff")} + +
+ {!enabled && ( + + {t("hermes.memory.disabledHint")} + + )} +
+ + {isLoading && !loaded ? ( +
+ {t("prompts.loading")} +
+ ) : ( + + )} + +
+ + {t("hermes.memory.usage", { current: charCount, limit })} + {isOver ? ` — ${t("hermes.memory.overLimit")}` : ""} + +
+ + {t("hermes.memory.runtimeNote")} + + +
+
+
+ ); +}; + +const HermesMemoryPanel: React.FC = () => { + const { t } = useTranslation(); + const [activeTab, setActiveTab] = useState("memory"); + const openHermesWebUI = useOpenHermesWebUI(); + const { data: limits } = useHermesMemoryLimits(true); + + const memoryLimit = limits?.memory ?? 2200; + const userLimit = limits?.user ?? 1375; + const memoryEnabled = limits?.memoryEnabled ?? true; + const userEnabled = limits?.userEnabled ?? true; + + return ( +
+ setActiveTab(v as HermesMemoryKind)} + className="flex-1 flex flex-col" + > +
+ + + {t("hermes.memory.agentTab")} + + {t("hermes.memory.userTab")} + + +
+ + + + + + + + +
+ ); +}; + +export default HermesMemoryPanel; diff --git a/src/components/mcp/McpFormModal.tsx b/src/components/mcp/McpFormModal.tsx index 70ab3b03a..0fd784b05 100644 --- a/src/components/mcp/McpFormModal.tsx +++ b/src/components/mcp/McpFormModal.tsx @@ -67,6 +67,7 @@ const McpFormModal: React.FC = ({ gemini: boolean; opencode: boolean; openclaw: boolean; + hermes: boolean; }>(() => { if (initialData?.apps) { return { ...initialData.apps }; @@ -77,6 +78,7 @@ const McpFormModal: React.FC = ({ gemini: defaultEnabledApps.includes("gemini"), opencode: defaultEnabledApps.includes("opencode"), openclaw: defaultEnabledApps.includes("openclaw"), + hermes: defaultEnabledApps.includes("hermes"), }; }); @@ -579,6 +581,22 @@ const McpFormModal: React.FC = ({ {t("mcp.unifiedPanel.apps.opencode")}
+ +
+ + setEnabledApps({ ...enabledApps, hermes: checked }) + } + /> + +
diff --git a/src/components/mcp/UnifiedMcpPanel.tsx b/src/components/mcp/UnifiedMcpPanel.tsx index 761ddcd65..754e9d954 100644 --- a/src/components/mcp/UnifiedMcpPanel.tsx +++ b/src/components/mcp/UnifiedMcpPanel.tsx @@ -17,7 +17,7 @@ import { Edit3, Trash2, ExternalLink } from "lucide-react"; import { settingsApi } from "@/lib/api"; import { mcpPresets } from "@/config/mcpPresets"; import { toast } from "sonner"; -import { MCP_SKILLS_APP_IDS } from "@/config/appConfig"; +import { MCP_APP_IDS } from "@/config/appConfig"; import { AppCountBar } from "@/components/common/AppCountBar"; import { AppToggleGroup } from "@/components/common/AppToggleGroup"; import { ListItemRow } from "@/components/common/ListItemRow"; @@ -56,9 +56,17 @@ const UnifiedMcpPanel = React.forwardRef< }, [serversMap]); const enabledCounts = useMemo(() => { - const counts = { claude: 0, codex: 0, gemini: 0, opencode: 0, openclaw: 0 }; + const counts = { + claude: 0, + "claude-desktop": 0, + codex: 0, + gemini: 0, + opencode: 0, + openclaw: 0, + hermes: 0, + }; serverEntries.forEach(([_, server]) => { - for (const app of MCP_SKILLS_APP_IDS) { + for (const app of MCP_APP_IDS) { if (server.apps[app]) counts[app]++; } }); @@ -136,7 +144,7 @@ const UnifiedMcpPanel = React.forwardRef<
@@ -278,7 +286,7 @@ const UnifiedMcpListItem: React.FC = ({ onToggleApp(id, app, enabled)} - appIds={MCP_SKILLS_APP_IDS} + appIds={MCP_APP_IDS} />
diff --git a/src/components/mode-toggle.tsx b/src/components/mode-toggle.tsx index 6c1bef5c6..9f3d45965 100644 --- a/src/components/mode-toggle.tsx +++ b/src/components/mode-toggle.tsx @@ -7,13 +7,11 @@ export function ModeToggle() { const { theme, setTheme } = useTheme(); const { t } = useTranslation(); - const toggleTheme = (event: React.MouseEvent) => { - // 如果当前是 dark 或 system（且系统是暗色），切换到 light - // 否则切换到 dark + const toggleTheme = () => { if (theme === "dark") { - setTheme("light", event); + setTheme("light"); } else { - setTheme("dark", event); + setTheme("dark"); } }; diff --git a/src/components/prompts/PromptFormModal.tsx b/src/components/prompts/PromptFormModal.tsx index 84e18d255..391670cae 100644 --- a/src/components/prompts/PromptFormModal.tsx +++ b/src/components/prompts/PromptFormModal.tsx @@ -32,9 +32,11 @@ const PromptFormModal: React.FC = ({ const appName = t(`apps.${appId}`); const filenameMap: Record, string> = { claude: "CLAUDE.md", + "claude-desktop": "CLAUDE.md", codex: "AGENTS.md", gemini: "GEMINI.md", opencode: "AGENTS.md", + hermes: "AGENTS.md", }; const filename = filenameMap[appId as Exclude]; const [name, setName] = useState(""); diff --git a/src/components/prompts/PromptFormPanel.tsx b/src/components/prompts/PromptFormPanel.tsx index c4481fa4c..1486dff06 100644 --- a/src/components/prompts/PromptFormPanel.tsx +++ b/src/components/prompts/PromptFormPanel.tsx @@ -26,10 +26,12 @@ const PromptFormPanel: React.FC = ({ const appName = t(`apps.${appId}`); const filenameMap: Record = { claude: "CLAUDE.md", + "claude-desktop": "CLAUDE.md", codex: "AGENTS.md", gemini: "GEMINI.md", opencode: "AGENTS.md", openclaw: "AGENTS.md", + hermes: "AGENTS.md", }; const filename = filenameMap[appId]; const [name, setName] = useState(""); diff --git a/src/components/providers/AddProviderDialog.tsx b/src/components/providers/AddProviderDialog.tsx index b6e9075a7..3ee783e31 100644 --- a/src/components/providers/AddProviderDialog.tsx +++ b/src/components/providers/AddProviderDialog.tsx @@ -17,6 +17,7 @@ import { UniversalProviderPanel } from "@/components/universal"; import { providerPresets } from "@/config/claudeProviderPresets"; import { codexProviderPresets } from "@/config/codexProviderPresets"; import { geminiProviderPresets } from "@/config/geminiProviderPresets"; +import { claudeDesktopProviderPresets } from "@/config/claudeDesktopProviderPresets"; import { extractCodexBaseUrl } from "@/utils/providerConfigUtils"; import type { OpenClawSuggestedDefaults } from "@/config/openclawProviderPresets"; import type { UniversalProviderPreset } from "@/config/universalProviderPresets"; @@ -41,7 +42,11 @@ export function AddProviderDialog({ }: AddProviderDialogProps) { const { t } = useTranslation(); // OpenCode and OpenClaw don't support universal providers - const showUniversalTab = appId !== "opencode" && appId !== "openclaw"; + const showUniversalTab = + appId !== "opencode" && + appId !== "openclaw" && + appId !== "hermes" && + appId !== "claude-desktop"; const [activeTab, setActiveTab] = useState<"app-specific" | "universal">( "app-specific", ); @@ -106,7 +111,7 @@ export function AddProviderDialog({ // OpenCode/OpenClaw: pass providerKey for ID generation if ( - (appId === "opencode" || appId === "openclaw") && + (appId === "opencode" || appId === "openclaw" || appId === "hermes") && values.providerKey ) { providerData.providerKey = values.providerKey; @@ -170,6 +175,22 @@ export function AddProviderDialog({ preset.endpointCandidates.forEach(addUrl); } } + } else if (appId === "claude-desktop") { + const presets = claudeDesktopProviderPresets; + const presetIndex = parseInt( + values.presetId.replace("claude-desktop-", ""), + ); + if ( + !isNaN(presetIndex) && + presetIndex >= 0 && + presetIndex < presets.length + ) { + const preset = presets[presetIndex]; + if (Array.isArray(preset.endpointCandidates)) { + preset.endpointCandidates.forEach(addUrl); + } + addUrl(preset.baseUrl); + } } } @@ -178,6 +199,11 @@ export function AddProviderDialog({ if (env?.ANTHROPIC_BASE_URL) { addUrl(env.ANTHROPIC_BASE_URL); } + } else if (appId === "claude-desktop") { + const env = parsedConfig.env as Record | undefined; + if (env?.ANTHROPIC_BASE_URL) { + addUrl(env.ANTHROPIC_BASE_URL); + } } else if (appId === "codex") { const config = parsedConfig.config as string | undefined; if (config) { @@ -203,6 +229,10 @@ export function AddProviderDialog({ if (parsedConfig.baseUrl) { addUrl(parsedConfig.baseUrl as string); } + } else if (appId === "hermes") { + if (parsedConfig.base_url) { + addUrl(parsedConfig.base_url as string); + } } const urls = Array.from(urlSet); diff --git a/src/components/providers/ProviderActions.tsx b/src/components/providers/ProviderActions.tsx index 344a71da8..30dfe3d90 100644 --- a/src/components/providers/ProviderActions.tsx +++ b/src/components/providers/ProviderActions.tsx @@ -38,6 +38,8 @@ interface ProviderActionsProps { isInFailoverQueue?: boolean; onToggleFailover?: (enabled: boolean) => void; isOfficialBlockedByProxy?: boolean; + // Hermes v12+ providers: dict overlay — edit/delete must go through Web UI + isReadOnly?: boolean; // OpenClaw: default model isDefaultModel?: boolean; onSetAsDefault?: () => void; @@ -63,6 +65,7 @@ export function ProviderActions({ isInFailoverQueue = false, onToggleFailover, isOfficialBlockedByProxy = false, + isReadOnly = false, // OpenClaw: default model isDefaultModel = false, onSetAsDefault, @@ -70,9 +73,11 @@ export function ProviderActions({ const { t } = useTranslation(); const iconButtonClass = "h-8 w-8 p-1"; - // 累加模式应用（OpenCode 非 OMO 和 OpenClaw） + // 累加模式应用（OpenCode 非 OMO / OpenClaw / Hermes） const isAdditiveMode = - (appId === "opencode" && !isOmo) || appId === "openclaw"; + (appId === "opencode" && !isOmo) || + appId === "openclaw" || + appId === "hermes"; // 故障转移模式下的按钮逻辑（累加模式和 OMO 应用不支持故障转移） const isFailoverMode = @@ -203,29 +208,44 @@ export function ProviderActions({ const buttonState = getMainButtonState(); - const canDelete = isOmo || isAdditiveMode ? true : !isCurrent; + const canDelete = + !isReadOnly && (isOmo || isAdditiveMode ? true : !isCurrent); + const readOnlyHint = t("provider.managedByHermesHint", { + defaultValue: "由 Hermes 管理，请在 Hermes Web UI 中编辑", + }); return (
- {appId === "openclaw" && isInConfig && onSetAsDefault && ( - - )} + {(appId === "openclaw" || appId === "hermes") && + isInConfig && + onSetAsDefault && + (() => { + const activeLabel = + appId === "hermes" + ? t("provider.inUse", { defaultValue: "已在用" }) + : t("provider.isDefault", { defaultValue: "当前默认" }); + const inactiveLabel = + appId === "hermes" + ? t("provider.enable", { defaultValue: "启用" }) + : t("provider.setAsDefault", { defaultValue: "设为默认" }); + return ( + + ); + })()} @@ -310,7 +334,7 @@ export function ProviderActions({ size="icon" variant="ghost" onClick={canDelete ? onDelete : undefined} - title={t("common.delete")} + title={isReadOnly ? readOnlyHint : t("common.delete")} className={cn( iconButtonClass, canDelete && "hover:text-red-500 dark:hover:text-red-400", diff --git a/src/components/providers/ProviderCard.tsx b/src/components/providers/ProviderCard.tsx index c0a36bfd4..2eca9dc49 100644 --- a/src/components/providers/ProviderCard.tsx +++ b/src/components/providers/ProviderCard.tsx @@ -15,6 +15,7 @@ import SubscriptionQuotaFooter from "@/components/SubscriptionQuotaFooter"; import CopilotQuotaFooter from "@/components/CopilotQuotaFooter"; import CodexOauthQuotaFooter from "@/components/CodexOauthQuotaFooter"; import { PROVIDER_TYPES } from "@/config/constants"; +import { isHermesReadOnlyProvider } from "@/config/hermesProviderPresets"; import { ProviderHealthBadge } from "@/components/providers/ProviderHealthBadge"; import { FailoverPriorityBadge } from "@/components/providers/FailoverPriorityBadge"; import { extractCodexBaseUrl } from "@/utils/providerConfigUtils"; @@ -61,6 +62,10 @@ interface ProviderCardProps { /** 判断是否为官方供应商（无自定义 base URL / API key，直连官方 API） */ function isOfficialProvider(provider: Provider, appId: AppId): boolean { + if (provider.category === "official") { + return true; + } + const config = provider.settingsConfig as Record; if (appId === "claude") { const baseUrl = config?.env?.ANTHROPIC_BASE_URL; @@ -180,13 +185,19 @@ export function ProviderCard({ const isCopilot = provider.meta?.providerType === PROVIDER_TYPES.GITHUB_COPILOT || provider.meta?.usage_script?.templateType === "github_copilot"; + // Hermes v12+ overlay entries live under the `providers:` dict and are + // read-only here — writes have to go through Hermes Web UI. + const isHermesReadOnly = + appId === "hermes" && isHermesReadOnlyProvider(provider.settingsConfig); const isCodexOauth = provider.meta?.providerType === PROVIDER_TYPES.CODEX_OAUTH; // 获取用量数据以判断是否有多套餐 - // 累加模式应用（OpenCode/OpenClaw）：使用 isInConfig 代替 isCurrent + // 累加模式应用（OpenCode/OpenClaw/Hermes）：使用 isInConfig 代替 isCurrent const shouldAutoQuery = - appId === "opencode" || appId === "openclaw" ? isInConfig : isCurrent; + appId === "opencode" || appId === "openclaw" || appId === "hermes" + ? isInConfig + : isCurrent; const autoQueryInterval = shouldAutoQuery ? provider.meta?.usage_script?.autoQueryInterval || 0 : 0; @@ -311,6 +322,16 @@ export function ProviderCard({ )} + {appId === "claude-desktop" && + provider.category !== "official" && + provider.meta?.claudeDesktopMode === "proxy" && ( + + {t("claudeDesktop.modeProxy", { + defaultValue: "需要路由", + })} + + )} + {isProxyRunning && isInFailoverQueue && health && ( )} + + {isHermesReadOnly && ( + + {t("provider.managedByHermes", { + defaultValue: "Hermes Managed", + })} + + )}
{displayUrl && ( @@ -427,6 +461,7 @@ export function ProviderCard({ isTesting={isTesting} isProxyTakeover={isProxyTakeover} isOfficialBlockedByProxy={isOfficialBlockedByProxy} + isReadOnly={isHermesReadOnly} isOmo={isAnyOmo} onSwitch={() => onSwitch(provider)} onEdit={() => onEdit(provider)} diff --git a/src/components/providers/ProviderEmptyState.tsx b/src/components/providers/ProviderEmptyState.tsx index a31cfa67e..ded2fed4c 100644 --- a/src/components/providers/ProviderEmptyState.tsx +++ b/src/components/providers/ProviderEmptyState.tsx @@ -36,7 +36,11 @@ export function ProviderEmptyState({ {onImport && ( )} {onCreate && ( diff --git a/src/components/providers/ProviderList.tsx b/src/components/providers/ProviderList.tsx index c0485b159..e312d063b 100644 --- a/src/components/providers/ProviderList.tsx +++ b/src/components/providers/ProviderList.tsx @@ -13,7 +13,7 @@ import { type CSSProperties, } from "react"; import { AnimatePresence, motion } from "framer-motion"; -import { Search, X } from "lucide-react"; +import { AlertTriangle, Search, X } from "lucide-react"; import { useTranslation } from "react-i18next"; import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query"; import { toast } from "sonner"; @@ -25,6 +25,10 @@ import { useOpenClawLiveProviderIds, useOpenClawDefaultModel, } from "@/hooks/useOpenClaw"; +import { + useHermesLiveProviderIds, + useHermesModelConfig, +} from "@/hooks/useHermes"; import { useStreamCheck } from "@/hooks/useStreamCheck"; import { ProviderCard } from "@/components/providers/ProviderCard"; import { ProviderEmptyState } from "@/components/providers/ProviderEmptyState"; @@ -105,7 +109,14 @@ export function ProviderList({ appId === "openclaw", ); - // 判断供应商是否已添加到配置（累加模式应用：OpenCode/OpenClaw） + // Hermes: 查询 live 配置中的供应商 ID 列表，用于判断 isInConfig + const { data: hermesLiveIds } = useHermesLiveProviderIds(appId === "hermes"); + + // Hermes: 读取当前 model.provider，用于判断哪个供应商是"当前激活"（高亮） + const { data: hermesModelConfig } = useHermesModelConfig(appId === "hermes"); + const hermesCurrentProviderId = hermesModelConfig?.provider; + + // 判断供应商是否已添加到配置（累加模式应用：OpenCode/OpenClaw/Hermes） const isProviderInConfig = useCallback( (providerId: string): boolean => { if (appId === "opencode") { @@ -114,9 +125,12 @@ export function ProviderList({ if (appId === "openclaw") { return openclawLiveIds?.includes(providerId) ?? false; } + if (appId === "hermes") { + return hermesLiveIds?.includes(providerId) ?? false; + } return true; // 其他应用始终返回 true }, - [appId, opencodeLiveIds, openclawLiveIds], + [appId, opencodeLiveIds, openclawLiveIds, hermesLiveIds], ); // OpenClaw: query default model to determine which provider is default @@ -181,6 +195,12 @@ export function ProviderList({ const [showStreamCheckConfirm, setShowStreamCheckConfirm] = useState(false); const [pendingTestProvider, setPendingTestProvider] = useState(null); + const { data: claudeDesktopStatus } = useQuery({ + queryKey: ["claudeDesktopStatus"], + queryFn: () => providersApi.getClaudeDesktopStatus(), + enabled: appId === "claude-desktop", + refetchInterval: appId === "claude-desktop" ? 5000 : false, + }); // Query settings for streamCheckConfirmed flag const { data: settings } = useQuery({ @@ -229,11 +249,22 @@ export function ProviderList({ const count = await providersApi.importOpenClawFromLive(); return count > 0; } + if (appId === "hermes") { + const count = await providersApi.importHermesFromLive(); + return count > 0; + } + if (appId === "claude-desktop") { + const count = await providersApi.importClaudeDesktopFromClaude(); + return count > 0; + } return providersApi.importDefault(appId); }, onSuccess: (imported) => { if (imported) { queryClient.invalidateQueries({ queryKey: ["providers", appId] }); + if (appId === "claude-desktop") { + queryClient.invalidateQueries({ queryKey: ["claudeDesktopStatus"] }); + } toast.success(t("provider.importCurrentDescription")); } else { toast.info(t("provider.noProviders")); @@ -283,6 +314,63 @@ export function ProviderList({ }); }, [searchTerm, sortedProviders]); + const claudeDesktopStatusMessages = useMemo(() => { + if (appId !== "claude-desktop" || !claudeDesktopStatus) return []; + + const messages: string[] = []; + if (!claudeDesktopStatus.supported) { + messages.push( + t("claudeDesktop.statusUnsupported", { + defaultValue: "当前平台暂不支持 Claude Desktop 3P 配置写入。", + }), + ); + return messages; + } + + if (claudeDesktopStatus.staleRawModels) { + messages.push( + t("claudeDesktop.statusStaleRawModels", { + defaultValue: + "Claude Desktop profile 中存在非 claude-* 模型名，新版 Claude Desktop 可能拒绝加载；重新切换当前供应商可修复。", + }), + ); + } + if (claudeDesktopStatus.missingRouteMappings) { + messages.push( + t("claudeDesktop.statusMissingRouteMappings", { + defaultValue: + "当前供应商启用了模型映射，但没有有效路由；请编辑供应商并补全至少一个模型映射。", + }), + ); + } + if ( + claudeDesktopStatus.mode === "proxy" && + !claudeDesktopStatus.gatewayTokenConfigured + ) { + messages.push( + t("claudeDesktop.statusGatewayTokenMissing", { + defaultValue: + "当前本地路由 token 尚未生成；重新切换该供应商会写入新的本地 token。", + }), + ); + } + + const expected = claudeDesktopStatus.expectedBaseUrl?.replace(/\/+$/, ""); + const actual = claudeDesktopStatus.actualBaseUrl?.replace(/\/+$/, ""); + if (expected && actual && expected !== actual) { + messages.push( + t("claudeDesktop.statusBaseUrlMismatch", { + expected, + actual, + defaultValue: + "Claude Desktop profile 指向的地址与当前供应商不一致；当前为 {{actual}}，应为 {{expected}}。重新切换当前供应商可修复。", + }), + ); + } + + return messages; + }, [appId, claudeDesktopStatus, t]); + if (isLoading) { return (
@@ -323,6 +411,8 @@ export function ProviderList({ const isOmoCurrent = isOmo && provider.id === (currentOmoId || ""); const isOmoSlimCurrent = isOmoSlim && provider.id === (currentOmoSlimId || ""); + const isHermesCurrent = + appId === "hermes" && hermesCurrentProviderId === provider.id; return ( onSetAsDefault(provider) : undefined } @@ -374,6 +470,21 @@ export function ProviderList({ return (
+ {claudeDesktopStatusMessages.length > 0 && ( +
+
+ + {t("claudeDesktop.statusTitle", { + defaultValue: "Claude Desktop 配置需要检查", + })} +
+
    + {claudeDesktopStatusMessages.map((message) => ( +
  • {message}
    • + ))} +
+
+ )} {isSearchOpen && ( Promise | void; + onCancel: () => void; + onSubmittingChange?: (isSubmitting: boolean) => void; + initialData?: { + name?: string; + websiteUrl?: string; + notes?: string; + settingsConfig?: Record; + category?: ProviderCategory; + meta?: ProviderMeta; + icon?: string; + iconColor?: string; + }; + showButtons?: boolean; +} + +type RouteRow = { + route: string; + model: string; + displayName: string; + supports1m: boolean; +}; + +function envString( + settingsConfig: Record | undefined, + key: string, +) { + const env = settingsConfig?.env; + if (!env || typeof env !== "object") return ""; + const value = (env as Record)[key]; + return typeof value === "string" ? value : ""; +} + +function clonePlainRecord(value: unknown): Record { + if (!value || typeof value !== "object" || Array.isArray(value)) { + return {}; + } + return { ...(value as Record) }; +} + +function initialRouteRows( + routes: Record | undefined, +): RouteRow[] { + return Object.entries(routes ?? {}).map(([route, value]) => ({ + route, + model: value.model ?? "", + displayName: value.displayName ?? "", + supports1m: value.supports1m ?? false, + })); +} + +function isClaudeSafeRoute(route: string) { + const normalized = route.trim().toLowerCase(); + return ( + normalized.startsWith("claude-") || + normalized.startsWith("anthropic/claude-") + ); +} + +function defaultRouteRows( + defaults: ClaudeDesktopDefaultRoute[], + defaultModel: string, +): RouteRow[] { + return defaults.map((route, index) => ({ + route: route.routeId, + model: index === 0 ? defaultModel : "", + displayName: route.displayName, + supports1m: route.supports1m, + })); +} + +function nextRouteRow(current: RouteRow[], defaults: RouteRow[]): RouteRow { + return ( + defaults.find( + (route) => !current.some((existing) => existing.route === route.route), + ) ?? { + route: "", + model: "", + displayName: "", + supports1m: true, + } + ); +} + +export function ClaudeDesktopProviderForm({ + submitLabel, + onSubmit, + onCancel, + onSubmittingChange, + initialData, + showButtons = true, +}: ClaudeDesktopProviderFormProps) { + const { t } = useTranslation(); + const initialMode = initialData?.meta?.claudeDesktopMode ?? "direct"; + const [mode, setMode] = useState<"direct" | "proxy">(initialMode); + const needsModelMapping = mode === "proxy"; + const [apiFormat, setApiFormat] = useState( + initialData?.meta?.apiFormat ?? "anthropic", + ); + const [baseUrl, setBaseUrl] = useState( + envString(initialData?.settingsConfig, "ANTHROPIC_BASE_URL"), + ); + const [apiKey, setApiKey] = useState( + envString(initialData?.settingsConfig, "ANTHROPIC_AUTH_TOKEN") || + envString(initialData?.settingsConfig, "ANTHROPIC_API_KEY"), + ); + const [apiKeyField, setApiKeyField] = useState(() => + envString(initialData?.settingsConfig, "ANTHROPIC_API_KEY") + ? "ANTHROPIC_API_KEY" + : "ANTHROPIC_AUTH_TOKEN", + ); + const [selectedPresetId, setSelectedPresetId] = useState( + "custom", + ); + const [activePreset, setActivePreset] = useState<{ + id: string; + category?: ProviderCategory; + isPartner?: boolean; + partnerPromotionKey?: string; + } | null>(null); + const [routes, setRoutes] = useState(() => + initialRouteRows(initialData?.meta?.claudeDesktopModelRoutes), + ); + const didSeedDefaultRoutes = useRef( + Object.keys(initialData?.meta?.claudeDesktopModelRoutes ?? {}).length > 0, + ); + const [fetchedModels, setFetchedModels] = useState([]); + const [isFetchingModels, setIsFetchingModels] = useState(false); + const [directModelsExpanded, setDirectModelsExpanded] = useState( + initialMode === "direct" && + Object.keys(initialData?.meta?.claudeDesktopModelRoutes ?? {}).length > 0, + ); + const { data: defaultRoutes = [] } = useQuery({ + queryKey: ["claudeDesktopDefaultRoutes"], + queryFn: () => providersApi.getClaudeDesktopDefaultRoutes(), + }); + const defaultProxyRouteRows = useMemo( + () => + defaultRouteRows( + defaultRoutes, + envString(initialData?.settingsConfig, "ANTHROPIC_MODEL"), + ), + [defaultRoutes, initialData?.settingsConfig], + ); + + const defaultValues: ProviderFormData = useMemo( + () => ({ + name: initialData?.name ?? "", + websiteUrl: initialData?.websiteUrl ?? "", + notes: initialData?.notes ?? "", + settingsConfig: JSON.stringify( + initialData?.settingsConfig ?? { env: {} }, + null, + 2, + ), + icon: initialData?.icon ?? "", + iconColor: initialData?.iconColor ?? "", + }), + [initialData], + ); + + const form = useForm({ + resolver: zodResolver(providerSchema), + defaultValues, + mode: "onSubmit", + }); + + useEffect(() => { + onSubmittingChange?.(form.formState.isSubmitting || isFetchingModels); + }, [form.formState.isSubmitting, isFetchingModels, onSubmittingChange]); + + const presetEntries = useMemo( + () => + claudeDesktopProviderPresets.map((preset, index) => ({ + id: `claude-desktop-${index}`, + preset, + })), + [], + ); + + const groupedPresets = useMemo( + () => + presetEntries.reduce>((acc, entry) => { + const cat = entry.preset.category ?? "others"; + if (!acc[cat]) acc[cat] = []; + acc[cat].push(entry); + return acc; + }, {}), + [presetEntries], + ); + + const categoryKeys = useMemo( + () => + Object.keys(groupedPresets).filter( + (key) => key !== "custom" && groupedPresets[key]?.length, + ), + [groupedPresets], + ); + + const presetCategoryLabels: Record = useMemo( + () => ({ + official: t("providerForm.categoryOfficial", { defaultValue: "官方" }), + cn_official: t("providerForm.categoryCnOfficial", { + defaultValue: "国内官方", + }), + aggregator: t("providerForm.categoryAggregation", { + defaultValue: "聚合服务", + }), + third_party: t("providerForm.categoryThirdParty", { + defaultValue: "第三方", + }), + }), + [t], + ); + + const applyDesktopPreset = (preset: ClaudeDesktopProviderPreset) => { + form.setValue("name", preset.nameKey ? t(preset.nameKey) : preset.name); + form.setValue("websiteUrl", preset.websiteUrl); + form.setValue("notes", ""); + form.setValue("icon", preset.icon ?? ""); + form.setValue("iconColor", preset.iconColor ?? ""); + + setBaseUrl(preset.baseUrl); + setApiKey(""); + setApiKeyField(preset.apiKeyField ?? "ANTHROPIC_AUTH_TOKEN"); + setApiFormat(preset.apiFormat ?? "anthropic"); + + didSeedDefaultRoutes.current = true; + setMode(preset.mode); + if (preset.mode === "proxy" && preset.modelRoutes) { + setRoutes( + preset.modelRoutes.map((r) => ({ + route: r.routeId, + model: r.upstreamModel, + displayName: r.displayName, + supports1m: r.supports1m, + })), + ); + } else { + setRoutes([]); + } + }; + + const handlePresetChange = (value: string) => { + setSelectedPresetId(value); + + if (value === "custom") { + setActivePreset(null); + form.reset(defaultValues); + setBaseUrl(""); + setApiKey(""); + setApiKeyField("ANTHROPIC_AUTH_TOKEN"); + setApiFormat("anthropic"); + didSeedDefaultRoutes.current = false; + setMode("direct"); + setRoutes([]); + return; + } + + const entry = presetEntries.find((item) => item.id === value); + if (!entry) return; + + setActivePreset({ + id: value, + category: entry.preset.category, + isPartner: entry.preset.isPartner, + partnerPromotionKey: entry.preset.partnerPromotionKey, + }); + applyDesktopPreset(entry.preset); + }; + + const updateRoute = (index: number, patch: Partial) => { + setRoutes((current) => + current.map((row, i) => (i === index ? { ...row, ...patch } : row)), + ); + }; + + const handleModelMappingChange = (checked: boolean) => { + setMode(checked ? "proxy" : "direct"); + if (checked) { + setRoutes((current) => { + if (current.length > 0 || defaultProxyRouteRows.length === 0) { + return current; + } + didSeedDefaultRoutes.current = true; + return defaultProxyRouteRows; + }); + } + }; + + useEffect(() => { + if ( + didSeedDefaultRoutes.current || + mode !== "proxy" || + routes.length > 0 || + defaultProxyRouteRows.length === 0 + ) { + return; + } + + didSeedDefaultRoutes.current = true; + setRoutes(defaultProxyRouteRows); + }, [defaultProxyRouteRows, mode, routes.length]); + + const handleFetchModels = async () => { + if (!baseUrl.trim() || !apiKey.trim()) { + showFetchModelsError(null, t, { + hasBaseUrl: Boolean(baseUrl.trim()), + hasApiKey: Boolean(apiKey.trim()), + }); + return; + } + + setIsFetchingModels(true); + try { + const models = await fetchModelsForConfig(baseUrl.trim(), apiKey.trim()); + setFetchedModels(models); + toast.success( + t("providerForm.fetchModelsSuccess", { + count: models.length, + defaultValue: `已获取 ${models.length} 个模型`, + }), + ); + } catch (error) { + showFetchModelsError(error, t, { + hasBaseUrl: Boolean(baseUrl.trim()), + hasApiKey: Boolean(apiKey.trim()), + }); + } finally { + setIsFetchingModels(false); + } + }; + + const handleSubmit = async (values: ProviderFormData) => { + if (!values.name.trim()) { + toast.error( + t("providerForm.fillSupplierName", { + defaultValue: "请填写供应商名称", + }), + ); + return; + } + if (!baseUrl.trim()) { + toast.error( + t("providerForm.fetchModelsNeedEndpoint", { + defaultValue: "请先填写接口地址", + }), + ); + return; + } + if (!apiKey.trim()) { + toast.error( + t("providerForm.fetchModelsNeedApiKey", { + defaultValue: "请先填写 API Key", + }), + ); + return; + } + + const routeEntries = routes + .map((route, index) => ({ + ...route, + route: + route.route.trim() || + (mode === "proxy" + ? `claude-${route.model.trim().replace(/[/\\]/g, "-") || `model-${index + 1}`}` + : ""), + model: route.model.trim(), + displayName: route.displayName.trim(), + })) + .filter((route) => route.route || route.model); + + if (mode === "proxy") { + const missing = routeEntries.find((route) => !route.model); + if (missing) { + toast.error( + t("claudeDesktop.routeInvalid", { + defaultValue: "请填写上游模型名", + }), + ); + return; + } + if (routeEntries.length === 0) { + toast.error( + t("claudeDesktop.routesRequired", { + defaultValue: "至少填写一个上游模型", + }), + ); + return; + } + } else { + const invalid = routeEntries.find( + (route) => !route.route || !isClaudeSafeRoute(route.route), + ); + if (invalid) { + toast.error( + t("claudeDesktop.directModelInvalid", { + defaultValue: + "直连模型必须使用 claude-* / anthropic/claude-* 模型名", + }), + ); + return; + } + } + + const settingsConfig = clonePlainRecord(initialData?.settingsConfig); + const env = clonePlainRecord(settingsConfig.env); + const otherKey: ApiKeyField = + apiKeyField === "ANTHROPIC_AUTH_TOKEN" + ? "ANTHROPIC_API_KEY" + : "ANTHROPIC_AUTH_TOKEN"; + delete env[otherKey]; + settingsConfig.env = { + ...env, + ANTHROPIC_BASE_URL: baseUrl.trim().replace(/\/+$/, ""), + [apiKeyField]: apiKey.trim(), + }; + + const routeMap = routeEntries.reduce< + Record + >((acc, route) => { + acc[route.route] = { + model: route.model || route.route, + displayName: route.displayName || undefined, + supports1m: route.supports1m || undefined, + }; + return acc; + }, {}); + + const meta: ProviderMeta = { + ...(initialData?.meta ?? {}), + claudeDesktopMode: mode, + apiFormat: mode === "proxy" ? apiFormat : "anthropic", + }; + + meta.claudeDesktopModelRoutes = routeMap; + + delete meta.endpointAutoSelect; + delete meta.providerType; + delete meta.isFullUrl; + + await onSubmit({ + ...values, + name: values.name.trim(), + websiteUrl: values.websiteUrl?.trim() ?? "", + notes: values.notes?.trim() ?? "", + settingsConfig: JSON.stringify(settingsConfig, null, 2), + meta, + presetId: activePreset?.id, + presetCategory: activePreset?.category, + isPartner: activePreset?.isPartner, + partnerPromotionKey: activePreset?.partnerPromotionKey, + }); + }; + + const renderActionButtons = (onAdd: () => void, addLabel: string) => ( +
+ + +
+ ); + + return ( +
+ + {!initialData && ( + + )} + + + +
+ + setApiKey(event.target.value)} + type="password" + placeholder="sk-..." + /> +
+ + setBaseUrl(v)} + placeholder={t("providerForm.apiEndpointPlaceholder")} + hint={ + needsModelMapping && apiFormat === "openai_responses" + ? t("providerForm.apiHintResponses") + : needsModelMapping && apiFormat === "openai_chat" + ? t("providerForm.apiHintOAI") + : needsModelMapping && apiFormat === "gemini_native" + ? t("providerForm.apiHintGeminiNative") + : t("providerForm.apiHint") + } + showManageButton={false} + /> + +
+
+
+ +

+ {needsModelMapping + ? t("claudeDesktop.modelMappingOnHint", { + defaultValue: + "Claude Desktop 目前对模型 ID 进行了限制，如果您的供应商提供的模型不是 Claude 系列模型，则需要打开本开关，并在使用过程中保持本地路由开启。", + }) + : t("claudeDesktop.modelMappingOffHint", { + defaultValue: + "适合供应商已经暴露并接受 claude-* / anthropic/claude-* 模型名的 Anthropic Messages API；请求会由 Claude Desktop 直连供应商。", + })} +

+
+ +
+
+ + {needsModelMapping && ( +
+
+ + +
+ +
+
+
+ + {renderActionButtons( + () => + setRoutes((current) => [ + ...current, + nextRouteRow(current, defaultProxyRouteRows), + ]), + t("claudeDesktop.addRoute", { defaultValue: "添加模型" }), + )} +
+

+ {t("claudeDesktop.routeMapHint", { + defaultValue: + "填写供应商实际提供的模型名，显示名为在 Claude Desktop 模型列表中展示的名称。", + })} +

+
+ +
+ + {t("claudeDesktop.upstreamModelLabel", { + defaultValue: "实际请求模型", + })} + + + {t("claudeDesktop.displayNameLabel", { + defaultValue: "显示名", + })} + + + {t("claudeDesktop.supports1mLabel", { + defaultValue: "1M", + })} + + +
+ {routes.map((route, index) => ( +
+
+ + updateRoute(index, { model: event.target.value }) + } + placeholder="kimi-k2 / deepseek-chat" + className="flex-1" + /> + {fetchedModels.length > 0 && ( + updateRoute(index, { model: id })} + /> + )} +
+ + updateRoute(index, { displayName: event.target.value }) + } + placeholder="Sonnet" + /> + + +
+ ))} +
+
+ )} + + {!needsModelMapping && ( + + + + + {!directModelsExpanded && ( +

+ {t("claudeDesktop.directModelListCollapsedHint", { + defaultValue: + "原生 Claude 模型供应商通常不用填写，Claude Desktop 会自动读取 /v1/models。", + })} +

+ )} + +
+
+

+ {t("claudeDesktop.directModelListHint", { + defaultValue: + "仅当供应商的 /v1/models 不可用或没有返回 Claude Desktop 可识别的 claude-* 模型名时填写；这些模型名会原样发送给供应商。", + })} +

+ {renderActionButtons( + () => + setRoutes((current) => [ + ...current, + { + route: "", + model: "", + displayName: "", + supports1m: false, + }, + ]), + t("claudeDesktop.addModel", { defaultValue: "添加模型" }), + )} +
+ + {routes.length > 0 ? ( +
+ {routes.map((route, index) => ( +
+
+ + updateRoute(index, { route: event.target.value }) + } + placeholder="claude-deepseek-chat" + className="flex-1" + /> + {fetchedModels.length > 0 && ( + + updateRoute(index, { route: id }) + } + /> + )} +
+ + +
+ ))} +
+ ) : null} +
+ + + )} + + ( + + + + + + + )} + /> + + {showButtons && ( +
+ + +
+ )} + + + ); +} diff --git a/src/components/providers/forms/ClaudeFormFields.tsx b/src/components/providers/forms/ClaudeFormFields.tsx index 8362015f4..c2504c845 100644 --- a/src/components/providers/forms/ClaudeFormFields.tsx +++ b/src/components/providers/forms/ClaudeFormFields.tsx @@ -50,7 +50,10 @@ import type { ClaudeApiFormat, ClaudeApiKeyField, } from "@/types"; -import type { TemplateValueConfig } from "@/config/claudeProviderPresets"; +import { + providerPresets, + type TemplateValueConfig, +} from "@/config/claudeProviderPresets"; interface EndpointCandidate { url: string; @@ -82,6 +85,8 @@ interface ClaudeFormFieldsProps { isCodexOauthAuthenticated?: boolean; selectedCodexAccountId?: string | null; onCodexAccountSelect?: (accountId: string | null) => void; + codexFastMode?: boolean; + onCodexFastModeChange?: (enabled: boolean) => void; // Template Values templateValueEntries: Array<[string, TemplateValueConfig]>; @@ -98,18 +103,17 @@ interface ClaudeFormFieldsProps { onCustomEndpointsChange?: (endpoints: string[]) => void; autoSelect: boolean; onAutoSelectChange: (checked: boolean) => void; + showEndpointTools?: boolean; // Model Selector shouldShowModelSelector: boolean; claudeModel: string; - reasoningModel: string; defaultHaikuModel: string; defaultSonnetModel: string; defaultOpusModel: string; onModelChange: ( field: | "ANTHROPIC_MODEL" - | "ANTHROPIC_REASONING_MODEL" | "ANTHROPIC_DEFAULT_HAIKU_MODEL" | "ANTHROPIC_DEFAULT_SONNET_MODEL" | "ANTHROPIC_DEFAULT_OPUS_MODEL", @@ -150,6 +154,8 @@ export function ClaudeFormFields({ isCodexOauthPreset, selectedCodexAccountId, onCodexAccountSelect, + codexFastMode, + onCodexFastModeChange, templateValueEntries, templateValues, templatePresetName, @@ -162,9 +168,9 @@ export function ClaudeFormFields({ onCustomEndpointsChange, autoSelect, onAutoSelectChange, + showEndpointTools = true, shouldShowModelSelector, claudeModel, - reasoningModel, defaultHaikuModel, defaultSonnetModel, defaultOpusModel, @@ -180,7 +186,6 @@ export function ClaudeFormFields({ const { t } = useTranslation(); const hasAnyAdvancedValue = !!( claudeModel || - reasoningModel || defaultHaikuModel || defaultSonnetModel || defaultOpusModel || @@ -212,8 +217,16 @@ export function ClaudeFormFields({ }); return; } + // 当 baseURL 仍是某预设的默认值时，优先使用预设上的 modelsUrl 覆写 + // 避免多走一次失败的候选请求（如 DeepSeek 把 /models 挂在根，而不是 /anthropic 子路径下） + const matchedPreset = providerPresets.find((p) => { + const env = (p.settingsConfig as { env?: Record })?.env; + return env?.ANTHROPIC_BASE_URL === baseUrl; + }); + const modelsUrl = matchedPreset?.modelsUrl; + setIsFetchingModels(true); - fetchModelsForConfig(baseUrl, apiKey, isFullUrl) + fetchModelsForConfig(baseUrl, apiKey, isFullUrl, modelsUrl) .then((models) => { setFetchedModels(models); if (models.length === 0) { @@ -378,6 +391,8 @@ export function ClaudeFormFields({ )} @@ -451,15 +466,18 @@ export function ClaudeFormFields({ ? t("providerForm.fullUrlHintGeminiNative") : undefined } - onManageClick={() => onEndpointModalToggle(true)} - showFullUrlToggle={true} + showManageButton={showEndpointTools} + onManageClick={ + showEndpointTools ? () => onEndpointModalToggle(true) : undefined + } + showFullUrlToggle={showEndpointTools} isFullUrl={isFullUrl} onFullUrlChange={onFullUrlChange} /> )} {/* 端点测速弹窗 */} - {shouldShowSpeedTest && isEndpointModalOpen && ( + {shouldShowSpeedTest && showEndpointTools && isEndpointModalOpen && ( { const value = claudeModel || - reasoningModel || defaultHaikuModel || defaultSonnetModel || defaultOpusModel; if (value) { onModelChange("ANTHROPIC_MODEL", value); - onModelChange("ANTHROPIC_REASONING_MODEL", value); onModelChange("ANTHROPIC_DEFAULT_HAIKU_MODEL", value); onModelChange("ANTHROPIC_DEFAULT_SONNET_MODEL", value); onModelChange("ANTHROPIC_DEFAULT_OPUS_MODEL", value); @@ -605,7 +621,6 @@ export function ClaudeFormFields({ }} disabled={ !claudeModel && - !reasoningModel && !defaultHaikuModel && !defaultSonnetModel && !defaultOpusModel @@ -656,18 +671,6 @@ export function ClaudeFormFields({ )}
- {/* 推理模型 */} -
- - {t("providerForm.anthropicReasoningModel")} - - {renderModelInput( - "reasoningModel", - reasoningModel, - "ANTHROPIC_REASONING_MODEL", - )} -
- {/* 默认 Haiku */}
diff --git a/src/components/providers/forms/CodexConfigSections.tsx b/src/components/providers/forms/CodexConfigSections.tsx index 280528392..8ce78eb30 100644 --- a/src/components/providers/forms/CodexConfigSections.tsx +++ b/src/components/providers/forms/CodexConfigSections.tsx @@ -1,17 +1,17 @@ -import React, { - useCallback, - useEffect, - useMemo, - useRef, - useState, -} from "react"; +// NOTE: Codex 1M 上下文 UI 已暂时隐藏（详见下方 CodexConfigSection 内 JSX 注释）。 +// 如需恢复，请同时： +// - 在下方 React import 中加回 `useMemo` +// - 取消下面 `@/utils/providerConfigUtils` import 的注释 +import React, { useCallback, useEffect, useRef, useState } from "react"; import { useTranslation } from "react-i18next"; import JsonEditor from "@/components/JsonEditor"; +/* import { extractCodexTopLevelInt, setCodexTopLevelInt, removeCodexTopLevelField, } from "@/utils/providerConfigUtils"; +*/ interface CodexAuthSectionProps { value: string; @@ -144,6 +144,8 @@ export const CodexConfigSection: React.FC = ({ [onChange], ); + // Codex 1M 上下文相关状态/回调暂时禁用——见同文件下方 JSX 注释处的恢复说明。 + /* // Parse toggle states from TOML text const toggleStates = useMemo(() => { const contextWindow = extractCodexTopLevelInt( @@ -211,6 +213,7 @@ export const CodexConfigSection: React.FC = ({ useEffect(() => { return () => clearTimeout(compactTimerRef.current); }, []); + */ return (
@@ -249,6 +252,8 @@ export const CodexConfigSection: React.FC = ({

)} + {/* Codex 1M 上下文 UI 已隐藏：模型不再支持该字段。 + 恢复方法：(1) 取消本段 JSX 注释；(2) 取消文件顶部 import 中 useMemo / extractCodexTopLevelInt / setCodexTopLevelInt / removeCodexTopLevelField 的注释；(3) 取消下方 toggleStates / compactTimerRef / handleContextWindowToggle / handleCompactLimitChange / cleanup useEffect 的注释。
+ */} void; + /** 是否开启 Codex FAST mode */ + fastModeEnabled?: boolean; + /** FAST mode 切换回调 */ + onFastModeChange?: (enabled: boolean) => void; } /** @@ -42,6 +47,8 @@ export const CodexOAuthSection: React.FC = ({ className, selectedAccountId, onAccountSelect, + fastModeEnabled = false, + onFastModeChange, }) => { const { t } = useTranslation(); const [copied, setCopied] = React.useState(false); @@ -140,6 +147,27 @@ export const CodexOAuthSection: React.FC = ({
)} + {onFastModeChange && ( +
+
+ +

+ {t("codexOauth.fastModeDescription", { + defaultValue: + 'Send service_tier="priority" for lower latency. Turn it off if the ChatGPT Codex backend rejects the parameter.', + })} +

+
+ +
+ )} + {/* 已登录账号列表 */} {hasAnyAccount && (
diff --git a/src/components/providers/forms/CommonConfigEditor.tsx b/src/components/providers/forms/CommonConfigEditor.tsx index 2ec4bdff8..a83536945 100644 --- a/src/components/providers/forms/CommonConfigEditor.tsx +++ b/src/components/providers/forms/CommonConfigEditor.tsx @@ -81,7 +81,7 @@ export function CommonConfigEditor({ enableToolSearch: config?.env?.ENABLE_TOOL_SEARCH === "true" || config?.env?.ENABLE_TOOL_SEARCH === "1", - effortHigh: config?.effortLevel === "high", + effortMax: config?.env?.CLAUDE_CODE_EFFORT_LEVEL === "max", disableAutoUpgrade: config?.env?.DISABLE_AUTOUPDATER === "1" || config?.env?.DISABLE_AUTOUPDATER === 1, @@ -91,7 +91,7 @@ export function CommonConfigEditor({ hideAttribution: false, teammates: false, enableToolSearch: false, - effortHigh: false, + effortMax: false, disableAutoUpgrade: false, }; } @@ -128,11 +128,13 @@ export function CommonConfigEditor({ if (Object.keys(config.env).length === 0) delete config.env; } break; - case "effortHigh": + case "effortMax": + if (!config.env) config.env = {}; if (checked) { - config.effortLevel = "high"; + config.env.CLAUDE_CODE_EFFORT_LEVEL = "max"; } else { - delete config.effortLevel; + delete config.env.CLAUDE_CODE_EFFORT_LEVEL; + if (Object.keys(config.env).length === 0) delete config.env; } break; case "disableAutoUpgrade": @@ -227,11 +229,11 @@ export function CommonConfigEditor({
+ ) : appId === "hermes" ? ( +
+ + + hermesForm.setHermesProviderKey( + e.target.value.toLowerCase().replace(/[^a-z0-9-]/g, ""), + ) + } + placeholder={t("hermes.form.providerKeyPlaceholder", { + defaultValue: "my-provider", + })} + disabled={ + isProviderKeyLocked || isProviderKeyLockStateLoading + } + className={ + (additiveExistingProviderKeys.includes( + hermesForm.hermesProviderKey, + ) && + !isProviderKeyLocked) || + (hermesForm.hermesProviderKey.trim() !== "" && + !/^[a-z0-9]+(-[a-z0-9]+)*$/.test( + hermesForm.hermesProviderKey, + )) + ? "border-destructive" + : "" + } + /> + {additiveExistingProviderKeys.includes( + hermesForm.hermesProviderKey, + ) && + !isProviderKeyLocked && ( +

+ {t("hermes.form.providerKeyDuplicate")} +

+ )} + {hermesForm.hermesProviderKey.trim() !== "" && + !/^[a-z0-9]+(-[a-z0-9]+)*$/.test( + hermesForm.hermesProviderKey, + ) && ( +

+ {t("hermes.form.providerKeyInvalid")} +

+ )} + {!( + additiveExistingProviderKeys.includes( + hermesForm.hermesProviderKey, + ) && !isProviderKeyLocked + ) && + (hermesForm.hermesProviderKey.trim() === "" || + /^[a-z0-9]+(-[a-z0-9]+)*$/.test( + hermesForm.hermesProviderKey, + )) && ( +

+ {isProviderKeyLocked + ? t("hermes.form.providerKeyLockedHint", { + defaultValue: + "This provider is in Hermes config; key is locked.", + }) + : t("hermes.form.providerKeyHint", { + defaultValue: + "Lowercase letters, numbers, and hyphens only. Used as the provider name in config.yaml.", + })} +

+ )} +
) : undefined } /> @@ -1551,6 +1795,8 @@ export function ProviderForm({ isCodexOauthAuthenticated={isCodexOauthAuthenticated} selectedCodexAccountId={selectedCodexAccountId} onCodexAccountSelect={setSelectedCodexAccountId} + codexFastMode={codexFastMode} + onCodexFastModeChange={setCodexFastMode} templateValueEntries={templateValueEntries} templateValues={templateValues} templatePresetName={templatePreset?.name || ""} @@ -1565,9 +1811,9 @@ export function ProviderForm({ } autoSelect={endpointAutoSelect} onAutoSelectChange={setEndpointAutoSelect} + showEndpointTools shouldShowModelSelector={category !== "official"} claudeModel={claudeModel} - reasoningModel={reasoningModel} defaultHaikuModel={defaultHaikuModel} defaultSonnetModel={defaultSonnetModel} defaultOpusModel={defaultOpusModel} @@ -1703,6 +1949,29 @@ export function ProviderForm({ /> )} + {/* Hermes 专属字段 */} + {appId === "hermes" && ( + + )} + {/* 配置编辑器：Codex、Claude、Gemini 分别使用不同的编辑器 */} {appId === "codex" ? ( <> @@ -1786,7 +2055,7 @@ export function ProviderForm({
{settingsConfigErrorField} - ) : appId === "openclaw" ? ( + ) : appId === "openclaw" || appId === "hermes" ? ( <>
@@ -1869,6 +2150,50 @@ export function ProviderForm({ onConfirm={() => void handleCommonConfigConfirm()} onCancel={() => void handleCommonConfigConfirm()} /> + + 0} + variant="info" + title={t("providerForm.softValidation.title", { + defaultValue: "配置存在以下问题", + })} + message={ + (softIssues ?? []).map((issue) => `• ${issue}`).join("\n") + + "\n\n" + + t("providerForm.softValidation.hint", { + defaultValue: + "仍要保存吗？保存后切换此供应商时可能失败，可以之后再补全。", + }) + } + confirmText={t("providerForm.softValidation.saveAnyway", { + defaultValue: "仍要保存", + })} + cancelText={t("common.cancel")} + onConfirm={async () => { + if (isConfirmSubmitting) return; + const values = pendingFormValues; + if (!values) { + setSoftIssues(null); + return; + } + setIsConfirmSubmitting(true); + try { + await performSubmit(values); + setSoftIssues(null); + setPendingFormValues(null); + } catch (error) { + console.error("[ProviderForm] soft-confirm submit failed:", error); + // 保留确认框和 pending values，让用户可以重试或取消 + } finally { + setIsConfirmSubmitting(false); + } + }} + onCancel={() => { + if (isConfirmSubmitting) return; + setSoftIssues(null); + setPendingFormValues(null); + }} + /> ); } diff --git a/src/components/providers/forms/ProviderPresetSelector.tsx b/src/components/providers/forms/ProviderPresetSelector.tsx index d1e3f7bad..47b88b82b 100644 --- a/src/components/providers/forms/ProviderPresetSelector.tsx +++ b/src/components/providers/forms/ProviderPresetSelector.tsx @@ -5,6 +5,7 @@ import { Zap, Star, Layers, Settings2 } from "lucide-react"; import type { ProviderPreset } from "@/config/claudeProviderPresets"; import type { CodexProviderPreset } from "@/config/codexProviderPresets"; import type { GeminiProviderPreset } from "@/config/geminiProviderPresets"; +import type { ClaudeDesktopProviderPreset } from "@/config/claudeDesktopProviderPresets"; import type { ProviderCategory } from "@/types"; import { universalProviderPresets, @@ -12,9 +13,15 @@ import { } from "@/config/universalProviderPresets"; import { ProviderIcon } from "@/components/ProviderIcon"; +type AnyPreset = + | ProviderPreset + | CodexProviderPreset + | GeminiProviderPreset + | ClaudeDesktopProviderPreset; + type PresetEntry = { id: string; - preset: ProviderPreset | CodexProviderPreset | GeminiProviderPreset; + preset: AnyPreset; }; interface ProviderPresetSelectorProps { @@ -74,9 +81,7 @@ export function ProviderPresetSelector({ } }; - const renderPresetIcon = ( - preset: ProviderPreset | CodexProviderPreset | GeminiProviderPreset, - ) => { + const renderPresetIcon = (preset: AnyPreset) => { const iconType = preset.theme?.icon; if (!iconType) return null; @@ -94,10 +99,7 @@ export function ProviderPresetSelector({ } }; - const getPresetButtonClass = ( - isSelected: boolean, - preset: ProviderPreset | CodexProviderPreset | GeminiProviderPreset, - ) => { + const getPresetButtonClass = (isSelected: boolean, preset: AnyPreset) => { const baseClass = "inline-flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium transition-colors"; @@ -111,10 +113,7 @@ export function ProviderPresetSelector({ return `${baseClass} bg-accent text-muted-foreground hover:bg-accent/80`; }; - const getPresetButtonStyle = ( - isSelected: boolean, - preset: ProviderPreset | CodexProviderPreset | GeminiProviderPreset, - ) => { + const getPresetButtonStyle = (isSelected: boolean, preset: AnyPreset) => { if (!isSelected || !preset.theme?.backgroundColor) { return undefined; } diff --git a/src/components/providers/forms/helpers/opencodeFormUtils.ts b/src/components/providers/forms/helpers/opencodeFormUtils.ts index 0a91f287a..a24361628 100644 --- a/src/components/providers/forms/helpers/opencodeFormUtils.ts +++ b/src/components/providers/forms/helpers/opencodeFormUtils.ts @@ -4,6 +4,16 @@ import type { PricingModelSourceOption } from "../ProviderAdvancedConfig"; // ── Default configs ────────────────────────────────────────────────── export const CLAUDE_DEFAULT_CONFIG = JSON.stringify({ env: {} }, null, 2); +export const CLAUDE_DESKTOP_DEFAULT_CONFIG = JSON.stringify( + { + env: { + ANTHROPIC_BASE_URL: "", + ANTHROPIC_AUTH_TOKEN: "", + }, + }, + null, + 2, +); export const CODEX_DEFAULT_CONFIG = JSON.stringify( { auth: {}, config: "" }, null, diff --git a/src/components/providers/forms/hooks/index.ts b/src/components/providers/forms/hooks/index.ts index ddee534c7..f70b1daf3 100644 --- a/src/components/providers/forms/hooks/index.ts +++ b/src/components/providers/forms/hooks/index.ts @@ -17,5 +17,6 @@ export { useOmoModelSource } from "./useOmoModelSource"; export { useOpencodeFormState } from "./useOpencodeFormState"; export { useOmoDraftState } from "./useOmoDraftState"; export { useOpenclawFormState } from "./useOpenclawFormState"; +export { useHermesFormState } from "./useHermesFormState"; export { useCopilotAuth } from "./useCopilotAuth"; export { useCodexOauth } from "./useCodexOauth"; diff --git a/src/components/providers/forms/hooks/useBaseUrlState.ts b/src/components/providers/forms/hooks/useBaseUrlState.ts index 2944dfdf3..05d9d7c8a 100644 --- a/src/components/providers/forms/hooks/useBaseUrlState.ts +++ b/src/components/providers/forms/hooks/useBaseUrlState.ts @@ -32,9 +32,9 @@ export function useBaseUrlState({ const [geminiBaseUrl, setGeminiBaseUrl] = useState(""); const isUpdatingRef = useRef(false); - // 从配置同步到 state（Claude） + // 从配置同步到 state（Claude / Claude Desktop） useEffect(() => { - if (appType !== "claude") return; + if (appType !== "claude" && appType !== "claude-desktop") return; // 只有 official 类别不显示 Base URL 输入框，其他类别都需要回填 if (category === "official") return; if (isUpdatingRef.current) return; diff --git a/src/components/providers/forms/hooks/useCodexCommonConfig.ts b/src/components/providers/forms/hooks/useCodexCommonConfig.ts index 228ab419f..86c360b46 100644 --- a/src/components/providers/forms/hooks/useCodexCommonConfig.ts +++ b/src/components/providers/forms/hooks/useCodexCommonConfig.ts @@ -160,9 +160,14 @@ export function useCodexCommonConfig({ config, commonConfigSnippet, ); - const hasCommon = initialEnabled ?? inferredHasCommon; - if (hasCommon && !inferredHasCommon) { + // 优先级：显式设置的 initialEnabled > 从配置推断的值 + // 如果 initialEnabled 为 undefined，使用推断值 + const hasCommon = + initialEnabled !== undefined ? initialEnabled : inferredHasCommon; + + // 如果应该启用通用配置但配置中还没有，则自动添加 + if (hasCommon && !inferredHasCommon && parsedSnippet.hasContent) { const { updatedConfig, error } = updateTomlCommonConfigSnippet( codexConfig, commonConfigSnippet, diff --git a/src/components/providers/forms/hooks/useCommonConfigSnippet.ts b/src/components/providers/forms/hooks/useCommonConfigSnippet.ts index 4b8fbed7b..49c009e4a 100644 --- a/src/components/providers/forms/hooks/useCommonConfigSnippet.ts +++ b/src/components/providers/forms/hooks/useCommonConfigSnippet.ts @@ -118,17 +118,23 @@ export function useCommonConfigSnippet({ // 初始化时检查通用配置片段（编辑模式） useEffect(() => { if (!enabled) return; - if (initialData && !isLoading) { + if (initialData && !isLoading && !hasInitializedEditMode.current) { + hasInitializedEditMode.current = true; + const configString = JSON.stringify(initialData.settingsConfig, null, 2); const inferredHasCommon = hasCommonConfigSnippet( configString, commonConfigSnippet, ); - const hasCommon = initialEnabled ?? inferredHasCommon; + + // 优先级：显式设置的 initialEnabled > 从配置推断的值 + // 如果 initialEnabled 为 undefined，使用推断值 + const hasCommon = + initialEnabled !== undefined ? initialEnabled : inferredHasCommon; setUseCommonConfig(hasCommon); - if (hasCommon && !inferredHasCommon && !hasInitializedEditMode.current) { - hasInitializedEditMode.current = true; + // 如果应该启用通用配置但配置中还没有，则自动添加 + if (hasCommon && !inferredHasCommon) { const { updatedConfig, error } = updateCommonConfigSnippet( settingsConfig, commonConfigSnippet, @@ -141,8 +147,6 @@ export function useCommonConfigSnippet({ isUpdatingFromCommonConfig.current = false; }, 0); } - } else { - hasInitializedEditMode.current = true; } } }, [ diff --git a/src/components/providers/forms/hooks/useGeminiCommonConfig.ts b/src/components/providers/forms/hooks/useGeminiCommonConfig.ts index 9a02a2cee..b521bf7fe 100644 --- a/src/components/providers/forms/hooks/useGeminiCommonConfig.ts +++ b/src/components/providers/forms/hooks/useGeminiCommonConfig.ts @@ -244,9 +244,18 @@ export function useGeminiCommonConfig({ env, parsed.env as Record, ); - const hasCommon = initialEnabled ?? inferredHasCommon; - if (hasCommon && !inferredHasCommon) { + // 优先级：显式设置的 initialEnabled > 从配置推断的值 + // 如果 initialEnabled 为 undefined，使用推断值 + const hasCommon = + initialEnabled !== undefined ? initialEnabled : inferredHasCommon; + + // 如果应该启用通用配置但配置中还没有，则自动添加 + if ( + hasCommon && + !inferredHasCommon && + Object.keys(parsed.env).length > 0 + ) { const currentEnv = envStringToObj(envValue); const merged = applySnippetToEnv(currentEnv, parsed.env); const nextEnvString = envObjToString(merged); diff --git a/src/components/providers/forms/hooks/useHermesFormState.ts b/src/components/providers/forms/hooks/useHermesFormState.ts new file mode 100644 index 000000000..f306efa93 --- /dev/null +++ b/src/components/providers/forms/hooks/useHermesFormState.ts @@ -0,0 +1,225 @@ +import { useState, useCallback, useMemo } from "react"; +import type { AppId } from "@/lib/api"; +import { useProvidersQuery } from "@/lib/query/queries"; +import { + HERMES_DEFAULT_API_MODE, + type HermesApiMode, + type HermesModel, + type HermesProviderSettingsConfig, +} from "@/config/hermesProviderPresets"; + +interface UseHermesFormStateParams { + initialData?: { + settingsConfig?: Record; + }; + appId: AppId; + providerId?: string; + onSettingsConfigChange: (config: string) => void; + getSettingsConfig: () => string; +} + +const HERMES_DEFAULT_CONFIG_OBJ = { + name: "", + base_url: "", + api_key: "", +} as const; + +export const HERMES_DEFAULT_CONFIG = JSON.stringify( + HERMES_DEFAULT_CONFIG_OBJ, + null, + 2, +); + +export interface HermesFormState { + hermesProviderKey: string; + setHermesProviderKey: (key: string) => void; + hermesBaseUrl: string; + hermesApiKey: string; + hermesApiMode: HermesApiMode; + hermesModels: HermesModel[]; + hermesRateLimitDelay: number | undefined; + existingHermesKeys: string[]; + handleHermesBaseUrlChange: (baseUrl: string) => void; + handleHermesApiKeyChange: (apiKey: string) => void; + handleHermesApiModeChange: (mode: HermesApiMode) => void; + handleHermesModelsChange: (models: HermesModel[]) => void; + handleHermesRateLimitDelayChange: (delay: number | undefined) => void; + resetHermesState: (config?: Partial) => void; +} + +function parseHermesField( + initialData: UseHermesFormStateParams["initialData"], + field: string, + fallback: T, +): T { + try { + if (initialData?.settingsConfig) { + return (initialData.settingsConfig[field] as T) || fallback; + } + return ( + ((HERMES_DEFAULT_CONFIG_OBJ as Record)[field] as T) || + fallback + ); + } catch { + return fallback; + } +} + +function parseRateLimitDelay(raw: unknown): number | undefined { + return typeof raw === "number" && Number.isFinite(raw) && raw >= 0 + ? raw + : undefined; +} + +export function useHermesFormState({ + initialData, + appId, + providerId, + onSettingsConfigChange, + getSettingsConfig, +}: UseHermesFormStateParams): HermesFormState { + const { data: hermesProvidersData } = useProvidersQuery("hermes"); + const existingHermesKeys = useMemo(() => { + if (!hermesProvidersData?.providers) return []; + return Object.keys(hermesProvidersData.providers).filter( + (k) => k !== providerId, + ); + }, [hermesProvidersData?.providers, providerId]); + + const [hermesProviderKey, setHermesProviderKey] = useState(() => { + if (appId !== "hermes") return ""; + return providerId || ""; + }); + + const [hermesBaseUrl, setHermesBaseUrl] = useState(() => { + if (appId !== "hermes") return ""; + return parseHermesField(initialData, "base_url", ""); + }); + + const [hermesApiKey, setHermesApiKey] = useState(() => { + if (appId !== "hermes") return ""; + return parseHermesField(initialData, "api_key", ""); + }); + + const [hermesApiMode, setHermesApiMode] = useState(() => { + if (appId !== "hermes") return HERMES_DEFAULT_API_MODE; + const stored = parseHermesField( + initialData, + "api_mode", + "", + ); + return stored || HERMES_DEFAULT_API_MODE; + }); + + const [hermesModels, setHermesModels] = useState(() => { + if (appId !== "hermes") return []; + return parseHermesField(initialData, "models", []); + }); + + const [hermesRateLimitDelay, setHermesRateLimitDelay] = useState< + number | undefined + >(() => { + if (appId !== "hermes") return undefined; + return parseRateLimitDelay(initialData?.settingsConfig?.rate_limit_delay); + }); + + const updateHermesConfig = useCallback( + (updater: (config: Record) => void) => { + try { + const config = JSON.parse(getSettingsConfig() || HERMES_DEFAULT_CONFIG); + updater(config); + onSettingsConfigChange(JSON.stringify(config, null, 2)); + } catch { + // ignore + } + }, + [getSettingsConfig, onSettingsConfigChange], + ); + + const handleHermesBaseUrlChange = useCallback( + (baseUrl: string) => { + setHermesBaseUrl(baseUrl); + updateHermesConfig((config) => { + config.base_url = baseUrl.trim().replace(/\/+$/, ""); + }); + }, + [updateHermesConfig], + ); + + const handleHermesApiKeyChange = useCallback( + (apiKey: string) => { + setHermesApiKey(apiKey); + updateHermesConfig((config) => { + config.api_key = apiKey; + }); + }, + [updateHermesConfig], + ); + + const handleHermesApiModeChange = useCallback( + (mode: HermesApiMode) => { + setHermesApiMode(mode); + updateHermesConfig((config) => { + config.api_mode = mode; + }); + }, + [updateHermesConfig], + ); + + const handleHermesModelsChange = useCallback( + (models: HermesModel[]) => { + setHermesModels(models); + updateHermesConfig((config) => { + if (models.length === 0) { + delete config.models; + } else { + config.models = models; + } + }); + }, + [updateHermesConfig], + ); + + const handleHermesRateLimitDelayChange = useCallback( + (delay: number | undefined) => { + setHermesRateLimitDelay(delay); + updateHermesConfig((config) => { + if (delay === undefined) { + delete config.rate_limit_delay; + } else { + config.rate_limit_delay = delay; + } + }); + }, + [updateHermesConfig], + ); + + const resetHermesState = useCallback( + (config?: Partial) => { + setHermesProviderKey(""); + setHermesBaseUrl(config?.base_url || ""); + setHermesApiKey(config?.api_key || ""); + setHermesApiMode(config?.api_mode ?? HERMES_DEFAULT_API_MODE); + setHermesModels(config?.models ?? []); + setHermesRateLimitDelay(parseRateLimitDelay(config?.rate_limit_delay)); + }, + [], + ); + + return { + hermesProviderKey, + setHermesProviderKey, + hermesBaseUrl, + hermesApiKey, + hermesApiMode, + hermesModels, + hermesRateLimitDelay, + existingHermesKeys, + handleHermesBaseUrlChange, + handleHermesApiKeyChange, + handleHermesApiModeChange, + handleHermesModelsChange, + handleHermesRateLimitDelayChange, + resetHermesState, + }; +} diff --git a/src/components/providers/forms/hooks/useModelState.ts b/src/components/providers/forms/hooks/useModelState.ts index 01278c4b5..7d6c7dd98 100644 --- a/src/components/providers/forms/hooks/useModelState.ts +++ b/src/components/providers/forms/hooks/useModelState.ts @@ -14,11 +14,6 @@ function parseModelsFromConfig(settingsConfig: string) { const env = cfg?.env || {}; const model = typeof env.ANTHROPIC_MODEL === "string" ? env.ANTHROPIC_MODEL : ""; - const explicitReasoning = - typeof env.ANTHROPIC_REASONING_MODEL === "string" - ? env.ANTHROPIC_REASONING_MODEL - : ""; - const reasoning = explicitReasoning || model; const small = typeof env.ANTHROPIC_SMALL_FAST_MODEL === "string" ? env.ANTHROPIC_SMALL_FAST_MODEL @@ -36,15 +31,15 @@ function parseModelsFromConfig(settingsConfig: string) { ? env.ANTHROPIC_DEFAULT_OPUS_MODEL : model || small; - return { model, reasoning, haiku, sonnet, opus }; + return { model, haiku, sonnet, opus }; } catch { - return { model: "", reasoning: "", haiku: "", sonnet: "", opus: "" }; + return { model: "", haiku: "", sonnet: "", opus: "" }; } } /** * 管理模型选择状态 - * 支持 ANTHROPIC_MODEL, ANTHROPIC_REASONING_MODEL 和各类型默认模型 + * 支持 ANTHROPIC_MODEL 和各类型默认模型 */ export function useModelState({ settingsConfig, @@ -54,9 +49,6 @@ export function useModelState({ const [claudeModel, setClaudeModel] = useState( () => parseModelsFromConfig(settingsConfig).model, ); - const [reasoningModel, setReasoningModel] = useState( - () => parseModelsFromConfig(settingsConfig).reasoning, - ); const [defaultHaikuModel, setDefaultHaikuModel] = useState( () => parseModelsFromConfig(settingsConfig).haiku, ); @@ -69,6 +61,9 @@ export function useModelState({ const isUserEditingRef = useRef(false); const lastConfigRef = useRef(settingsConfig); + const latestConfigRef = useRef(settingsConfig); + + latestConfigRef.current = settingsConfig; // 初始化读取：读新键；若缺失，按兼容优先级回退 // Haiku: DEFAULT_HAIKU || SMALL_FAST || MODEL @@ -93,11 +88,6 @@ export function useModelState({ const env = cfg?.env || {}; const model = typeof env.ANTHROPIC_MODEL === "string" ? env.ANTHROPIC_MODEL : ""; - const explicitReasoning = - typeof env.ANTHROPIC_REASONING_MODEL === "string" - ? env.ANTHROPIC_REASONING_MODEL - : ""; - const reasoning = explicitReasoning || model; const small = typeof env.ANTHROPIC_SMALL_FAST_MODEL === "string" ? env.ANTHROPIC_SMALL_FAST_MODEL @@ -116,7 +106,6 @@ export function useModelState({ : model || small; setClaudeModel(model || ""); - setReasoningModel(reasoning || ""); setDefaultHaikuModel(haiku || ""); setDefaultSonnetModel(sonnet || ""); setDefaultOpusModel(opus || ""); @@ -129,7 +118,6 @@ export function useModelState({ ( field: | "ANTHROPIC_MODEL" - | "ANTHROPIC_REASONING_MODEL" | "ANTHROPIC_DEFAULT_HAIKU_MODEL" | "ANTHROPIC_DEFAULT_SONNET_MODEL" | "ANTHROPIC_DEFAULT_OPUS_MODEL", @@ -138,7 +126,6 @@ export function useModelState({ isUserEditingRef.current = true; if (field === "ANTHROPIC_MODEL") setClaudeModel(value); - if (field === "ANTHROPIC_REASONING_MODEL") setReasoningModel(value); if (field === "ANTHROPIC_DEFAULT_HAIKU_MODEL") setDefaultHaikuModel(value); if (field === "ANTHROPIC_DEFAULT_SONNET_MODEL") @@ -146,8 +133,8 @@ export function useModelState({ if (field === "ANTHROPIC_DEFAULT_OPUS_MODEL") setDefaultOpusModel(value); try { - const currentConfig = settingsConfig - ? JSON.parse(settingsConfig) + const currentConfig = latestConfigRef.current + ? JSON.parse(latestConfigRef.current) : { env: {} }; if (!currentConfig.env) currentConfig.env = {}; const env = currentConfig.env as Record; @@ -162,19 +149,19 @@ export function useModelState({ // 删除旧键 delete env["ANTHROPIC_SMALL_FAST_MODEL"]; - onConfigChange(JSON.stringify(currentConfig, null, 2)); + const updatedConfig = JSON.stringify(currentConfig, null, 2); + latestConfigRef.current = updatedConfig; + onConfigChange(updatedConfig); } catch (err) { console.error("Failed to update model config:", err); } }, - [settingsConfig, onConfigChange], + [onConfigChange], ); return { claudeModel, setClaudeModel, - reasoningModel, - setReasoningModel, defaultHaikuModel, setDefaultHaikuModel, defaultSonnetModel, diff --git a/src/components/providers/forms/shared/ModelDropdown.tsx b/src/components/providers/forms/shared/ModelDropdown.tsx new file mode 100644 index 000000000..ec5d64b84 --- /dev/null +++ b/src/components/providers/forms/shared/ModelDropdown.tsx @@ -0,0 +1,53 @@ +import { ChevronDown } from "lucide-react"; +import { Button } from "@/components/ui/button"; +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuSeparator, + DropdownMenuTrigger, +} from "@/components/ui/dropdown-menu"; +import type { FetchedModel } from "@/lib/api/model-fetch"; + +export function ModelDropdown({ + models, + onSelect, +}: { + models: FetchedModel[]; + onSelect: (id: string) => void; +}) { + const grouped: Record = {}; + for (const model of models) { + const vendor = model.ownedBy || "Other"; + if (!grouped[vendor]) grouped[vendor] = []; + grouped[vendor].push(model); + } + const vendors = Object.keys(grouped).sort(); + + return ( + + + + + + {vendors.map((vendor, vi) => ( +
+ {vi > 0 && } + {vendor} + {grouped[vendor].map((m) => ( + onSelect(m.id)}> + {m.id} + + ))} +
+ ))} + + + ); +} diff --git a/src/components/providers/forms/shared/index.ts b/src/components/providers/forms/shared/index.ts index e5be59876..e1359c466 100644 --- a/src/components/providers/forms/shared/index.ts +++ b/src/components/providers/forms/shared/index.ts @@ -1,3 +1,4 @@ export { ApiKeySection } from "./ApiKeySection"; export { EndpointField } from "./EndpointField"; +export { ModelDropdown } from "./ModelDropdown"; export { ModelInputWithFetch } from "./ModelInputWithFetch"; diff --git a/src/components/proxy/ClaudeDesktopRouteToggle.tsx b/src/components/proxy/ClaudeDesktopRouteToggle.tsx new file mode 100644 index 000000000..cc924d0fc --- /dev/null +++ b/src/components/proxy/ClaudeDesktopRouteToggle.tsx @@ -0,0 +1,96 @@ +import { Loader2, Radio } from "lucide-react"; +import { toast } from "sonner"; +import { useTranslation } from "react-i18next"; +import { Switch } from "@/components/ui/switch"; +import { useProxyStatus } from "@/hooks/useProxyStatus"; +import { cn } from "@/lib/utils"; + +interface ClaudeDesktopRouteToggleProps { + className?: string; +} + +export function ClaudeDesktopRouteToggle({ + className, +}: ClaudeDesktopRouteToggleProps) { + const { t } = useTranslation(); + const { + isRunning, + status, + takeoverStatus, + startProxyServer, + stopProxyServer, + isStarting, + isStoppingServer, + } = useProxyStatus(); + + const isBusy = isStarting || isStoppingServer; + const otherTakeoverActive = Boolean( + takeoverStatus?.claude || takeoverStatus?.codex || takeoverStatus?.gemini, + ); + const routeAddress = status?.address ?? "127.0.0.1"; + const routePort = status?.port ?? 15721; + + const handleToggle = async (checked: boolean) => { + try { + if (checked) { + await startProxyServer(); + return; + } + + if (otherTakeoverActive) { + toast.warning( + t("claudeDesktop.route.stopBlockedByTakeover", { + defaultValue: + "其它应用正在使用代理接管。请先在设置中关闭对应应用接管，再停止本地路由。", + }), + { duration: 5000 }, + ); + return; + } + + await stopProxyServer(); + } catch (error) { + console.error("[ClaudeDesktopRouteToggle] Toggle route failed:", error); + } + }; + + const tooltipText = isRunning + ? t("claudeDesktop.route.tooltip.active", { + address: routeAddress, + port: routePort, + defaultValue: `Claude Desktop 本地路由已开启 - ${routeAddress}:${routePort}`, + }) + : t("claudeDesktop.route.tooltip.inactive", { + address: routeAddress, + port: routePort, + defaultValue: `开启 Claude Desktop 本地路由，用于需要模型映射或格式转换的供应商。当前配置地址：${routeAddress}:${routePort}`, + }); + + return ( +
+ {isBusy ? ( + + ) : ( + + )} + +
+ ); +} diff --git a/src/components/sessions/SessionManagerPage.tsx b/src/components/sessions/SessionManagerPage.tsx index 0c4b219ad..bb64257f4 100644 --- a/src/components/sessions/SessionManagerPage.tsx +++ b/src/components/sessions/SessionManagerPage.tsx @@ -62,7 +62,8 @@ type ProviderFilter = | "claude" | "opencode" | "openclaw" - | "gemini"; + | "gemini" + | "hermes"; export function SessionManagerPage({ appId }: { appId: string }) { const { t } = useTranslation(); diff --git a/src/components/settings/AboutSection.tsx b/src/components/settings/AboutSection.tsx index ac0c9ffb2..dd827aef2 100644 --- a/src/components/settings/AboutSection.tsx +++ b/src/components/settings/AboutSection.tsx @@ -3,6 +3,7 @@ import { Download, Copy, ExternalLink, + Globe, Info, Loader2, RefreshCw, @@ -360,6 +361,16 @@ export function AboutSection({ isPortable }: AboutSectionProps) {
+
); diff --git a/src/components/settings/SettingsPage.tsx b/src/components/settings/SettingsPage.tsx index 688e81683..5e48fbaed 100644 --- a/src/components/settings/SettingsPage.tsx +++ b/src/components/settings/SettingsPage.tsx @@ -317,6 +317,7 @@ export function SettingsPage({ geminiDir={settings.geminiConfigDir} opencodeDir={settings.opencodeConfigDir} openclawDir={settings.openclawConfigDir} + hermesDir={settings.hermesConfigDir} onDirectoryChange={updateDirectory} onBrowseDirectory={browseDirectory} onResetDirectory={resetDirectory} @@ -474,7 +475,7 @@ export function SettingsPage({ {activeTab === "advanced" && settings && (
diff --git a/src/components/settings/TerminalSettings.tsx b/src/components/settings/TerminalSettings.tsx index 4cf43d418..916b5fbea 100644 --- a/src/components/settings/TerminalSettings.tsx +++ b/src/components/settings/TerminalSettings.tsx @@ -17,6 +17,7 @@ const MACOS_TERMINALS = [ { value: "ghostty", labelKey: "settings.terminal.options.macos.ghostty" }, { value: "wezterm", labelKey: "settings.terminal.options.macos.wezterm" }, { value: "kaku", labelKey: "settings.terminal.options.macos.kaku" }, + { value: "warp", labelKey: "settings.terminal.options.macos.warp" }, ] as const; const WINDOWS_TERMINALS = [ diff --git a/src/components/settings/ThemeSettings.tsx b/src/components/settings/ThemeSettings.tsx index f22c51d69..107dbc865 100644 --- a/src/components/settings/ThemeSettings.tsx +++ b/src/components/settings/ThemeSettings.tsx @@ -19,21 +19,21 @@ export function ThemeSettings() {
setTheme("light", e)} + onClick={() => setTheme("light")} icon={Sun} > {t("settings.themeLight")} setTheme("dark", e)} + onClick={() => setTheme("dark")} icon={Moon} > {t("settings.themeDark")} setTheme("system", e)} + onClick={() => setTheme("system")} icon={Monitor} > {t("settings.themeSystem")} diff --git a/src/components/skills/UnifiedSkillsPanel.tsx b/src/components/skills/UnifiedSkillsPanel.tsx index 701af4929..309c17bf9 100644 --- a/src/components/skills/UnifiedSkillsPanel.tsx +++ b/src/components/skills/UnifiedSkillsPanel.tsx @@ -31,7 +31,7 @@ import type { AppId } from "@/lib/api/types"; import { ConfirmDialog } from "@/components/ConfirmDialog"; import { settingsApi, skillsApi } from "@/lib/api"; import { toast } from "sonner"; -import { MCP_SKILLS_APP_IDS } from "@/config/appConfig"; +import { SKILLS_APP_IDS } from "@/config/appConfig"; import { AppCountBar } from "@/components/common/AppCountBar"; import { AppToggleGroup } from "@/components/common/AppToggleGroup"; import { ListItemRow } from "@/components/common/ListItemRow"; @@ -113,10 +113,18 @@ const UnifiedSkillsPanel = React.forwardRef< }, [skillUpdates]); const enabledCounts = useMemo(() => { - const counts = { claude: 0, codex: 0, gemini: 0, opencode: 0, openclaw: 0 }; + const counts = { + claude: 0, + "claude-desktop": 0, + codex: 0, + gemini: 0, + opencode: 0, + openclaw: 0, + hermes: 0, + }; if (!skills) return counts; skills.forEach((skill) => { - for (const app of MCP_SKILLS_APP_IDS) { + for (const app of SKILLS_APP_IDS) { if (skill.apps[app]) counts[app]++; } }); @@ -342,7 +350,7 @@ const UnifiedSkillsPanel = React.forwardRef<
setImportDialogOpen(false)} /> @@ -546,7 +555,7 @@ const InstalledSkillListItem: React.FC = ({ onToggleApp(skill.id, app, enabled)} - appIds={MCP_SKILLS_APP_IDS} + appIds={SKILLS_APP_IDS} />
; + isImporting: boolean; onImport: (imports: ImportSkillSelection[]) => void; onClose: () => void; } @@ -717,6 +727,7 @@ const RestoreSkillsDialog: React.FC = ({ const ImportSkillsDialog: React.FC = ({ skills, + isImporting, onImport, onClose, }) => { @@ -736,6 +747,7 @@ const ImportSkillsDialog: React.FC = ({ gemini: skill.foundIn.includes("gemini"), opencode: skill.foundIn.includes("opencode"), openclaw: false, + hermes: skill.foundIn.includes("hermes"), }, ]), ), @@ -761,6 +773,7 @@ const ImportSkillsDialog: React.FC = ({ gemini: false, opencode: false, openclaw: false, + hermes: false, }, })), ); @@ -803,6 +816,7 @@ const ImportSkillsDialog: React.FC = ({ gemini: false, opencode: false, openclaw: false, + hermes: false, } } onToggle={(app, enabled) => { @@ -815,12 +829,13 @@ const ImportSkillsDialog: React.FC = ({ gemini: false, opencode: false, openclaw: false, + hermes: false, }), [app]: enabled, }, })); }} - appIds={MCP_SKILLS_APP_IDS} + appIds={SKILLS_APP_IDS} />
= ({
- -
diff --git a/src/components/theme-provider.tsx b/src/components/theme-provider.tsx index f730241e5..6d8795716 100644 --- a/src/components/theme-provider.tsx +++ b/src/components/theme-provider.tsx @@ -17,7 +17,7 @@ interface ThemeProviderProps { interface ThemeContextValue { theme: Theme; - setTheme: (theme: Theme, event?: React.MouseEvent) => void; + setTheme: (theme: Theme) => void; } const ThemeProviderContext = createContext( @@ -130,30 +130,9 @@ export function ThemeProvider({ const value = useMemo( () => ({ theme, - setTheme: (nextTheme: Theme, event?: React.MouseEvent) => { - // Skip if same theme + setTheme: (nextTheme: Theme) => { if (nextTheme === theme) return; - - // Set transition origin coordinates from click event - const x = event?.clientX ?? window.innerWidth / 2; - const y = event?.clientY ?? window.innerHeight / 2; - document.documentElement.style.setProperty( - "--theme-transition-x", - `${x}px`, - ); - document.documentElement.style.setProperty( - "--theme-transition-y", - `${y}px`, - ); - - // Use View Transitions API if available, otherwise fall back to instant change - if (document.startViewTransition) { - document.startViewTransition(() => { - setThemeState(nextTheme); - }); - } else { - setThemeState(nextTheme); - } + setThemeState(nextTheme); }, }), [theme], diff --git a/src/components/ui/scroll-area.tsx b/src/components/ui/scroll-area.tsx index b1f11275a..20f751297 100644 --- a/src/components/ui/scroll-area.tsx +++ b/src/components/ui/scroll-area.tsx @@ -14,7 +14,7 @@ const ScrollArea = React.forwardRef< className={cn("relative overflow-hidden", className)} {...props} > - + {children} diff --git a/src/components/universal/UniversalProviderCard.tsx b/src/components/universal/UniversalProviderCard.tsx index b75bb2ef0..4ec21a50b 100644 --- a/src/components/universal/UniversalProviderCard.tsx +++ b/src/components/universal/UniversalProviderCard.tsx @@ -1,5 +1,5 @@ import { useTranslation } from "react-i18next"; -import { Edit2, Trash2, RefreshCw, Globe } from "lucide-react"; +import { Edit2, Trash2, RefreshCw, Globe, Copy } from "lucide-react"; import { Button } from "@/components/ui/button"; import { ProviderIcon } from "@/components/ProviderIcon"; import type { UniversalProvider } from "@/types"; @@ -9,6 +9,7 @@ interface UniversalProviderCardProps { onEdit: (provider: UniversalProvider) => void; onDelete: (id: string) => void; onSync: (id: string) => void; + onDuplicate: (provider: UniversalProvider) => void; } export function UniversalProviderCard({ @@ -16,6 +17,7 @@ export function UniversalProviderCard({ onEdit, onDelete, onSync, + onDuplicate, }: UniversalProviderCardProps) { const { t } = useTranslation(); @@ -53,6 +55,15 @@ export function UniversalProviderCard({ > +
diff --git a/src/config/appConfig.tsx b/src/config/appConfig.tsx index db87b75a8..a2103a926 100644 --- a/src/config/appConfig.tsx +++ b/src/config/appConfig.tsx @@ -17,20 +17,26 @@ export interface AppConfig { export const APP_IDS: AppId[] = [ "claude", + "claude-desktop", "codex", "gemini", "opencode", "openclaw", + "hermes", ]; -/** App IDs shown in MCP & Skills panels (excludes OpenClaw) */ -export const MCP_SKILLS_APP_IDS: AppId[] = [ +/** App IDs shown in Skills panels (excludes OpenClaw — it doesn't support Skills) */ +export const SKILLS_APP_IDS: AppId[] = [ "claude", "codex", "gemini", "opencode", + "hermes", ]; +/** App IDs shown in MCP panels (excludes OpenClaw) */ +export const MCP_APP_IDS: AppId[] = [...SKILLS_APP_IDS]; + export const APP_ICON_MAP: Record = { claude: { label: "Claude", @@ -40,6 +46,14 @@ export const APP_ICON_MAP: Record = { badgeClass: "bg-orange-500/10 text-orange-700 dark:text-orange-300 hover:bg-orange-500/20 border-0 gap-1.5", }, + "claude-desktop": { + label: "Claude Desktop", + icon: , + activeClass: + "bg-amber-500/10 ring-1 ring-amber-500/20 hover:bg-amber-500/20 text-amber-700 dark:text-amber-300", + badgeClass: + "bg-amber-500/10 text-amber-700 dark:text-amber-300 hover:bg-amber-500/20 border-0 gap-1.5", + }, codex: { label: "Codex", icon: , @@ -79,4 +93,19 @@ export const APP_ICON_MAP: Record = { badgeClass: "bg-rose-500/10 text-rose-700 dark:text-rose-300 hover:bg-rose-500/20 border-0 gap-1.5", }, + hermes: { + label: "Hermes", + icon: ( + + ), + activeClass: + "bg-violet-500/10 ring-1 ring-violet-500/20 hover:bg-violet-500/20 text-violet-600 dark:text-violet-400", + badgeClass: + "bg-violet-500/10 text-violet-700 dark:text-violet-300 hover:bg-violet-500/20 border-0 gap-1.5", + }, }; diff --git a/src/config/claudeDesktopProviderPresets.ts b/src/config/claudeDesktopProviderPresets.ts new file mode 100644 index 000000000..7ca20789e --- /dev/null +++ b/src/config/claudeDesktopProviderPresets.ts @@ -0,0 +1,792 @@ +/** + * Claude Desktop 预设供应商配置模板 + * + * 形态与 Claude Code 预设不同： + * - baseUrl 是顶级字段，而不是 settingsConfig.env.ANTHROPIC_BASE_URL + * - 模型信息以"请求模型 → 上游模型 → 显示模型"三段式表达， + * 对应后端 ClaudeDesktopModelRoute 的 routeId / model / displayName + * + * 翻译来源：src/config/claudeProviderPresets.ts（排除 OAuth 与不兼容预设） + */ +import { ProviderCategory } from "../types"; +import type { PresetTheme } from "./claudeProviderPresets"; + +export type ClaudeDesktopApiFormat = + | "anthropic" + | "openai_chat" + | "openai_responses" + | "gemini_native"; + +export interface ClaudeDesktopRoutePreset { + routeId: string; + upstreamModel: string; + displayName: string; + supports1m: boolean; +} + +export interface ClaudeDesktopProviderPreset { + name: string; + nameKey?: string; + websiteUrl: string; + apiKeyUrl?: string; + category?: ProviderCategory; + isPartner?: boolean; + partnerPromotionKey?: string; + + baseUrl: string; + apiKeyField?: "ANTHROPIC_AUTH_TOKEN" | "ANTHROPIC_API_KEY"; + + mode: "direct" | "proxy"; + apiFormat?: ClaudeDesktopApiFormat; + modelRoutes?: ClaudeDesktopRoutePreset[]; + + endpointCandidates?: string[]; + theme?: PresetTheme; + icon?: string; + iconColor?: string; +} + +const passthroughRoutes = (supports1m = false): ClaudeDesktopRoutePreset[] => [ + { + routeId: "claude-sonnet-4-6", + upstreamModel: "claude-sonnet-4-6", + displayName: "Sonnet", + supports1m, + }, + { + routeId: "claude-opus-4-7", + upstreamModel: "claude-opus-4-7", + displayName: "Opus", + supports1m, + }, + { + routeId: "claude-haiku-4-5", + upstreamModel: "claude-haiku-4-5", + displayName: "Haiku", + supports1m, + }, +]; + +const mappedRoutes = ( + sonnet: string, + opus: string, + haiku: string, + supports1m = false, +): ClaudeDesktopRoutePreset[] => [ + { + routeId: "claude-sonnet-4-6", + upstreamModel: sonnet, + displayName: "Sonnet", + supports1m, + }, + { + routeId: "claude-opus-4-7", + upstreamModel: opus, + displayName: "Opus", + supports1m, + }, + { + routeId: "claude-haiku-4-5", + upstreamModel: haiku, + displayName: "Haiku", + supports1m, + }, +]; + +/** + * 非 Claude 上游模型用此工厂：displayName 直接等于 upstreamModel， + * 让用户在 Claude Desktop 看到的就是实际请求的模型 ID（如 "deepseek-v4-pro"）。 + */ +const brandedRoutes = ( + sonnet: string, + opus: string, + haiku: string, + supports1m = false, +): ClaudeDesktopRoutePreset[] => [ + { + routeId: "claude-sonnet-4-6", + upstreamModel: sonnet, + displayName: sonnet, + supports1m, + }, + { + routeId: "claude-opus-4-7", + upstreamModel: opus, + displayName: opus, + supports1m, + }, + { + routeId: "claude-haiku-4-5", + upstreamModel: haiku, + displayName: haiku, + supports1m, + }, +]; + +export const claudeDesktopProviderPresets: ClaudeDesktopProviderPreset[] = [ + { + name: "Shengsuanyun", + nameKey: "providerForm.presets.shengsuanyun", + websiteUrl: "https://www.shengsuanyun.com", + apiKeyUrl: "https://www.shengsuanyun.com/?from=CH_4HHXMRYF", + category: "aggregator", + baseUrl: "https://router.shengsuanyun.com/api", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + isPartner: true, + partnerPromotionKey: "shengsuanyun", + icon: "shengsuanyun", + }, + { + name: "Gemini Native", + websiteUrl: "https://ai.google.dev/gemini-api", + apiKeyUrl: "https://aistudio.google.com/app/apikey", + category: "third_party", + baseUrl: "https://generativelanguage.googleapis.com", + apiKeyField: "ANTHROPIC_API_KEY", + mode: "proxy", + apiFormat: "gemini_native", + modelRoutes: brandedRoutes( + "gemini-3.1-pro", + "gemini-3.1-pro", + "gemini-3-flash", + ), + endpointCandidates: ["https://generativelanguage.googleapis.com"], + icon: "gemini", + iconColor: "#4285F4", + }, + { + name: "DeepSeek", + websiteUrl: "https://platform.deepseek.com", + category: "cn_official", + baseUrl: "https://api.deepseek.com/anthropic", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes( + "deepseek-v4-pro", + "deepseek-v4-pro", + "deepseek-v4-flash", + ), + icon: "deepseek", + iconColor: "#1E88E5", + }, + { + name: "Zhipu GLM", + websiteUrl: "https://open.bigmodel.cn", + apiKeyUrl: "https://www.bigmodel.cn/claude-code?ic=RRVJPB5SII", + category: "cn_official", + baseUrl: "https://open.bigmodel.cn/api/anthropic", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes("glm-5", "glm-5", "glm-5"), + icon: "zhipu", + iconColor: "#0F62FE", + }, + { + name: "Zhipu GLM en", + websiteUrl: "https://z.ai", + apiKeyUrl: "https://z.ai/subscribe?ic=8JVLJQFSKB", + category: "cn_official", + baseUrl: "https://api.z.ai/api/anthropic", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes("glm-5", "glm-5", "glm-5"), + icon: "zhipu", + iconColor: "#0F62FE", + }, + { + name: "Baidu Qianfan Coding Plan", + websiteUrl: "https://cloud.baidu.com/product/qianfan_modelbuilder", + apiKeyUrl: + "https://console.bce.baidu.com/qianfan/ais/console/applicationConsole/application", + category: "cn_official", + baseUrl: "https://qianfan.baidubce.com/anthropic/coding", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes( + "qianfan-code-latest", + "qianfan-code-latest", + "qianfan-code-latest", + ), + endpointCandidates: ["https://qianfan.baidubce.com/anthropic/coding"], + icon: "baidu", + iconColor: "#2932E1", + }, + { + name: "Bailian", + websiteUrl: "https://bailian.console.aliyun.com", + category: "cn_official", + baseUrl: "https://dashscope.aliyuncs.com/apps/anthropic", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + icon: "bailian", + iconColor: "#624AFF", + }, + { + name: "Bailian For Coding", + websiteUrl: "https://bailian.console.aliyun.com", + category: "cn_official", + baseUrl: "https://coding.dashscope.aliyuncs.com/apps/anthropic", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + icon: "bailian", + iconColor: "#624AFF", + }, + { + name: "Kimi", + websiteUrl: "https://platform.moonshot.cn/console", + category: "cn_official", + baseUrl: "https://api.moonshot.cn/anthropic", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes("kimi-k2.6", "kimi-k2.6", "kimi-k2.6"), + icon: "kimi", + iconColor: "#6366F1", + }, + { + name: "Kimi For Coding", + websiteUrl: "https://www.kimi.com/code/docs/", + category: "cn_official", + baseUrl: "https://api.kimi.com/coding/", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + icon: "kimi", + iconColor: "#6366F1", + }, + { + name: "StepFun", + websiteUrl: "https://platform.stepfun.com/step-plan", + apiKeyUrl: "https://platform.stepfun.com/interface-key", + category: "cn_official", + baseUrl: "https://api.stepfun.com/step_plan", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes( + "step-3.5-flash-2603", + "step-3.5-flash-2603", + "step-3.5-flash-2603", + ), + endpointCandidates: ["https://api.stepfun.com/step_plan"], + icon: "stepfun", + iconColor: "#16D6D2", + }, + { + name: "StepFun en", + websiteUrl: "https://platform.stepfun.ai/step-plan", + apiKeyUrl: "https://platform.stepfun.ai/interface-key", + category: "cn_official", + baseUrl: "https://api.stepfun.ai/step_plan", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes( + "step-3.5-flash-2603", + "step-3.5-flash-2603", + "step-3.5-flash-2603", + ), + endpointCandidates: ["https://api.stepfun.ai/step_plan"], + icon: "stepfun", + iconColor: "#16D6D2", + }, + { + name: "ModelScope", + websiteUrl: "https://modelscope.cn", + category: "aggregator", + baseUrl: "https://api-inference.modelscope.cn", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes( + "ZhipuAI/GLM-5", + "ZhipuAI/GLM-5", + "ZhipuAI/GLM-5", + ), + icon: "modelscope", + iconColor: "#624AFF", + }, + { + name: "Longcat", + websiteUrl: "https://longcat.chat/platform", + apiKeyUrl: "https://longcat.chat/platform/api_keys", + category: "cn_official", + baseUrl: "https://api.longcat.chat/anthropic", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes( + "LongCat-Flash-Chat", + "LongCat-Flash-Chat", + "LongCat-Flash-Chat", + ), + icon: "longcat", + iconColor: "#29E154", + }, + { + name: "MiniMax", + websiteUrl: "https://platform.minimaxi.com", + apiKeyUrl: "https://platform.minimaxi.com/subscribe/coding-plan", + category: "cn_official", + baseUrl: "https://api.minimaxi.com/anthropic", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes("MiniMax-M2.7", "MiniMax-M2.7", "MiniMax-M2.7"), + isPartner: true, + partnerPromotionKey: "minimax_cn", + theme: { + backgroundColor: "#f64551", + textColor: "#FFFFFF", + }, + icon: "minimax", + iconColor: "#FF6B6B", + }, + { + name: "MiniMax en", + websiteUrl: "https://platform.minimax.io", + apiKeyUrl: "https://platform.minimax.io/subscribe/coding-plan", + category: "cn_official", + baseUrl: "https://api.minimax.io/anthropic", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes("MiniMax-M2.7", "MiniMax-M2.7", "MiniMax-M2.7"), + isPartner: true, + partnerPromotionKey: "minimax_en", + theme: { + backgroundColor: "#f64551", + textColor: "#FFFFFF", + }, + icon: "minimax", + iconColor: "#FF6B6B", + }, + { + name: "DouBaoSeed", + websiteUrl: "https://www.volcengine.com/product/doubao", + apiKeyUrl: "https://www.volcengine.com/product/doubao", + category: "cn_official", + baseUrl: "https://ark.cn-beijing.volces.com/api/coding", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes( + "doubao-seed-2-0-code-preview-latest", + "doubao-seed-2-0-code-preview-latest", + "doubao-seed-2-0-code-preview-latest", + ), + icon: "doubao", + iconColor: "#3370FF", + }, + { + name: "BaiLing", + websiteUrl: "https://alipaytbox.yuque.com/sxs0ba/ling/get_started", + category: "cn_official", + baseUrl: "https://api.tbox.cn/api/anthropic", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes("Ling-2.5-1T", "Ling-2.5-1T", "Ling-2.5-1T"), + }, + { + name: "AiHubMix", + websiteUrl: "https://aihubmix.com", + apiKeyUrl: "https://aihubmix.com", + category: "aggregator", + baseUrl: "https://aihubmix.com", + apiKeyField: "ANTHROPIC_API_KEY", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + endpointCandidates: ["https://aihubmix.com", "https://api.aihubmix.com"], + icon: "aihubmix", + iconColor: "#006FFB", + }, + { + name: "SiliconFlow", + websiteUrl: "https://siliconflow.cn", + apiKeyUrl: "https://cloud.siliconflow.cn/i/drGuwc9k", + category: "aggregator", + baseUrl: "https://api.siliconflow.cn", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes( + "Pro/MiniMaxAI/MiniMax-M2.7", + "Pro/MiniMaxAI/MiniMax-M2.7", + "Pro/MiniMaxAI/MiniMax-M2.7", + ), + isPartner: true, + partnerPromotionKey: "siliconflow", + icon: "siliconflow", + iconColor: "#6E29F6", + }, + { + name: "SiliconFlow en", + websiteUrl: "https://siliconflow.com", + apiKeyUrl: "https://cloud.siliconflow.cn/i/drGuwc9k", + category: "aggregator", + baseUrl: "https://api.siliconflow.com", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes( + "MiniMaxAI/MiniMax-M2.7", + "MiniMaxAI/MiniMax-M2.7", + "MiniMaxAI/MiniMax-M2.7", + ), + isPartner: true, + partnerPromotionKey: "siliconflow", + icon: "siliconflow", + iconColor: "#000000", + }, + { + name: "DMXAPI", + websiteUrl: "https://www.dmxapi.cn", + apiKeyUrl: "https://www.dmxapi.cn", + category: "aggregator", + baseUrl: "https://www.dmxapi.cn", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + endpointCandidates: ["https://www.dmxapi.cn", "https://api.dmxapi.cn"], + isPartner: true, + partnerPromotionKey: "dmxapi", + }, + { + name: "PackyCode", + websiteUrl: "https://www.packyapi.com", + apiKeyUrl: "https://www.packyapi.com/register?aff=cc-switch", + category: "third_party", + baseUrl: "https://www.packyapi.com", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + endpointCandidates: [ + "https://www.packyapi.com", + "https://api-slb.packyapi.com", + ], + isPartner: true, + partnerPromotionKey: "packycode", + icon: "packycode", + }, + { + name: "Cubence", + websiteUrl: "https://cubence.com", + apiKeyUrl: "https://cubence.com/signup?code=CCSWITCH&source=ccs", + category: "third_party", + baseUrl: "https://api.cubence.com", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + endpointCandidates: [ + "https://api.cubence.com", + "https://api-cf.cubence.com", + "https://api-dmit.cubence.com", + "https://api-bwg.cubence.com", + ], + isPartner: true, + partnerPromotionKey: "cubence", + icon: "cubence", + iconColor: "#000000", + }, + { + name: "AIGoCode", + websiteUrl: "https://aigocode.com", + apiKeyUrl: "https://aigocode.com/invite/CC-SWITCH", + category: "third_party", + baseUrl: "https://api.aigocode.com", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + endpointCandidates: ["https://api.aigocode.com"], + isPartner: true, + partnerPromotionKey: "aigocode", + icon: "aigocode", + iconColor: "#5B7FFF", + }, + { + name: "RightCode", + websiteUrl: "https://www.right.codes", + apiKeyUrl: "https://www.right.codes/register?aff=CCSWITCH", + category: "third_party", + baseUrl: "https://www.right.codes/claude", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + isPartner: true, + partnerPromotionKey: "rightcode", + icon: "rc", + iconColor: "#E96B2C", + }, + { + name: "AICodeMirror", + websiteUrl: "https://www.aicodemirror.com", + apiKeyUrl: "https://www.aicodemirror.com/register?invitecode=9915W3", + category: "third_party", + baseUrl: "https://api.aicodemirror.com/api/claudecode", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + endpointCandidates: [ + "https://api.aicodemirror.com/api/claudecode", + "https://api.claudecode.net.cn/api/claudecode", + ], + isPartner: true, + partnerPromotionKey: "aicodemirror", + icon: "aicodemirror", + iconColor: "#000000", + }, + { + name: "AICoding", + websiteUrl: "https://aicoding.sh", + apiKeyUrl: "https://aicoding.sh/i/CCSWITCH", + category: "third_party", + baseUrl: "https://api.aicoding.sh", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + endpointCandidates: ["https://api.aicoding.sh"], + isPartner: true, + partnerPromotionKey: "aicoding", + icon: "aicoding", + iconColor: "#000000", + }, + { + name: "CrazyRouter", + websiteUrl: "https://www.crazyrouter.com", + apiKeyUrl: "https://www.crazyrouter.com/register?aff=OZcm&ref=cc-switch", + category: "third_party", + baseUrl: "https://crazyrouter.com", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + endpointCandidates: ["https://crazyrouter.com"], + isPartner: true, + partnerPromotionKey: "crazyrouter", + icon: "crazyrouter", + iconColor: "#000000", + }, + { + name: "SSSAiCode", + websiteUrl: "https://www.sssaicode.com", + apiKeyUrl: "https://www.sssaicode.com/register?ref=DCP0SM", + category: "third_party", + baseUrl: "https://node-hk.sssaicode.com/api", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + endpointCandidates: [ + "https://node-hk.sssaicode.com/api", + "https://claude2.sssaicode.com/api", + "https://anti.sssaicode.com/api", + ], + isPartner: true, + partnerPromotionKey: "sssaicode", + icon: "sssaicode", + iconColor: "#000000", + }, + { + name: "Compshare", + nameKey: "providerForm.presets.ucloud", + websiteUrl: "https://www.compshare.cn", + apiKeyUrl: + "https://www.compshare.cn/coding-plan?ytag=GPU_YY_YX_git_cc-switch", + category: "aggregator", + baseUrl: "https://api.modelverse.cn", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + endpointCandidates: ["https://api.modelverse.cn"], + isPartner: true, + partnerPromotionKey: "ucloud", + icon: "ucloud", + iconColor: "#000000", + }, + { + name: "Compshare Coding Plan", + nameKey: "providerForm.presets.ucloudCoding", + websiteUrl: "https://www.compshare.cn", + apiKeyUrl: + "https://www.compshare.cn/coding-plan?ytag=GPU_YY_YX_git_cc-switch", + category: "aggregator", + baseUrl: "https://cp.compshare.cn", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + endpointCandidates: ["https://cp.compshare.cn"], + isPartner: true, + partnerPromotionKey: "ucloud", + icon: "ucloud", + iconColor: "#000000", + }, + { + name: "Micu", + websiteUrl: "https://www.openclaudecode.cn", + apiKeyUrl: "https://www.openclaudecode.cn/register?aff=aOYQ", + category: "third_party", + baseUrl: "https://www.openclaudecode.cn", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + endpointCandidates: ["https://www.openclaudecode.cn"], + isPartner: true, + partnerPromotionKey: "micu", + icon: "micu", + iconColor: "#000000", + }, + { + name: "CTok.ai", + websiteUrl: "https://ctok.ai", + apiKeyUrl: "https://ctok.ai", + category: "third_party", + baseUrl: "https://api.ctok.ai", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + isPartner: true, + partnerPromotionKey: "ctok", + icon: "ctok", + iconColor: "#000000", + }, + { + name: "DDSHub", + websiteUrl: "https://www.ddshub.cc", + apiKeyUrl: "https://ddshub.short.gy/ccswitch", + category: "third_party", + baseUrl: "https://www.ddshub.cc", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + isPartner: true, + partnerPromotionKey: "ddshub", + icon: "dds", + iconColor: "#000000", + }, + { + name: "E-FlowCode", + websiteUrl: "https://e-flowcode.cc", + apiKeyUrl: "https://e-flowcode.cc", + category: "third_party", + baseUrl: "https://e-flowcode.cc", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + endpointCandidates: ["https://e-flowcode.cc"], + icon: "eflowcode", + iconColor: "#000000", + }, + { + name: "LionCCAPI", + websiteUrl: "https://vibecodingapi.ai", + category: "third_party", + baseUrl: "https://vibecodingapi.ai", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + isPartner: true, + partnerPromotionKey: "lionccapi", + icon: "lioncc", + }, + { + name: "OpenRouter", + websiteUrl: "https://openrouter.ai", + apiKeyUrl: "https://openrouter.ai/keys", + category: "aggregator", + baseUrl: "https://openrouter.ai/api", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: mappedRoutes( + "anthropic/claude-sonnet-4.6", + "anthropic/claude-opus-4.7", + "anthropic/claude-haiku-4.5", + true, + ), + icon: "openrouter", + iconColor: "#6566F1", + }, + { + name: "TheRouter", + websiteUrl: "https://therouter.ai", + apiKeyUrl: "https://dashboard.therouter.ai", + category: "aggregator", + baseUrl: "https://api.therouter.ai", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: mappedRoutes( + "anthropic/claude-sonnet-4.6", + "anthropic/claude-opus-4.7", + "anthropic/claude-haiku-4.5", + true, + ), + endpointCandidates: ["https://api.therouter.ai"], + }, + { + name: "Novita AI", + websiteUrl: "https://novita.ai", + apiKeyUrl: "https://novita.ai", + category: "aggregator", + baseUrl: "https://api.novita.ai/anthropic", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes( + "zai-org/glm-5", + "zai-org/glm-5", + "zai-org/glm-5", + ), + endpointCandidates: ["https://api.novita.ai/anthropic"], + icon: "novita", + iconColor: "#000000", + }, + { + name: "LemonData", + websiteUrl: "https://lemondata.cc", + apiKeyUrl: "https://lemondata.cc/r/FFX1ZDUP", + category: "third_party", + baseUrl: "https://api.lemondata.cc", + apiKeyField: "ANTHROPIC_API_KEY", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: passthroughRoutes(), + isPartner: true, + partnerPromotionKey: "lemondata", + icon: "lemondata", + }, + { + name: "Nvidia", + websiteUrl: "https://build.nvidia.com", + apiKeyUrl: "https://build.nvidia.com/settings/api-keys", + category: "aggregator", + baseUrl: "https://integrate.api.nvidia.com", + mode: "proxy", + apiFormat: "openai_chat", + modelRoutes: brandedRoutes( + "moonshotai/kimi-k2.5", + "moonshotai/kimi-k2.5", + "moonshotai/kimi-k2.5", + ), + icon: "nvidia", + iconColor: "#000000", + }, + { + name: "PIPELLM", + websiteUrl: "https://code.pipellm.ai", + apiKeyUrl: "https://code.pipellm.ai/login?ref=uvw650za", + category: "aggregator", + baseUrl: "https://cc-api.pipellm.ai", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: mappedRoutes( + "claude-sonnet-4-6", + "claude-opus-4-7", + "claude-haiku-4-5-20251001", + true, + ), + icon: "pipellm", + }, + { + name: "Xiaomi MiMo", + websiteUrl: "https://platform.xiaomimimo.com", + apiKeyUrl: "https://platform.xiaomimimo.com/#/console/api-keys", + category: "cn_official", + baseUrl: "https://api.xiaomimimo.com/anthropic", + mode: "proxy", + apiFormat: "anthropic", + modelRoutes: brandedRoutes("mimo-v2-pro", "mimo-v2-pro", "mimo-v2-pro"), + icon: "xiaomimimo", + iconColor: "#000000", + }, +]; diff --git a/src/config/claudeProviderPresets.ts b/src/config/claudeProviderPresets.ts index 26c19a00e..6618e54d9 100644 --- a/src/config/claudeProviderPresets.ts +++ b/src/config/claudeProviderPresets.ts @@ -66,6 +66,10 @@ export interface ProviderPreset { // 是否在 UI 中隐藏该预设（预设仍存在，仅不在列表中显示） hidden?: boolean; + + // 获取模型列表使用的完整 URL（覆写自动候选逻辑） + // 缺省时后端基于 baseURL 自动尝试 /v1/models、/models 以及剥离已知兼容子路径后的变体。 + modelsUrl?: string; } export const providerPresets: ProviderPreset[] = [ @@ -85,27 +89,6 @@ export const providerPresets: ProviderPreset[] = [ icon: "anthropic", iconColor: "#D4915D", }, - { - name: "Gemini Native", - websiteUrl: "https://ai.google.dev/gemini-api", - apiKeyUrl: "https://aistudio.google.com/app/apikey", - apiKeyField: "ANTHROPIC_API_KEY", - settingsConfig: { - env: { - ANTHROPIC_BASE_URL: "https://generativelanguage.googleapis.com", - ANTHROPIC_API_KEY: "", - ANTHROPIC_MODEL: "gemini-2.5-pro", - ANTHROPIC_DEFAULT_HAIKU_MODEL: "gemini-2.5-flash", - ANTHROPIC_DEFAULT_SONNET_MODEL: "gemini-2.5-pro", - ANTHROPIC_DEFAULT_OPUS_MODEL: "gemini-2.5-pro", - }, - }, - category: "third_party", - apiFormat: "gemini_native", - endpointCandidates: ["https://generativelanguage.googleapis.com"], - icon: "gemini", - iconColor: "#4285F4", - }, { name: "Shengsuanyun", nameKey: "providerForm.presets.shengsuanyun", @@ -122,6 +105,27 @@ export const providerPresets: ProviderPreset[] = [ partnerPromotionKey: "shengsuanyun", icon: "shengsuanyun", }, + { + name: "Gemini Native", + websiteUrl: "https://ai.google.dev/gemini-api", + apiKeyUrl: "https://aistudio.google.com/app/apikey", + apiKeyField: "ANTHROPIC_API_KEY", + settingsConfig: { + env: { + ANTHROPIC_BASE_URL: "https://generativelanguage.googleapis.com", + ANTHROPIC_API_KEY: "", + ANTHROPIC_MODEL: "gemini-3.1-pro", + ANTHROPIC_DEFAULT_HAIKU_MODEL: "gemini-3-flash", + ANTHROPIC_DEFAULT_SONNET_MODEL: "gemini-3.1-pro", + ANTHROPIC_DEFAULT_OPUS_MODEL: "gemini-3.1-pro", + }, + }, + category: "third_party", + apiFormat: "gemini_native", + endpointCandidates: ["https://generativelanguage.googleapis.com"], + icon: "gemini", + iconColor: "#4285F4", + }, { name: "DeepSeek", websiteUrl: "https://platform.deepseek.com", @@ -129,13 +133,15 @@ export const providerPresets: ProviderPreset[] = [ env: { ANTHROPIC_BASE_URL: "https://api.deepseek.com/anthropic", ANTHROPIC_AUTH_TOKEN: "", - ANTHROPIC_MODEL: "DeepSeek-V3.2", - ANTHROPIC_DEFAULT_HAIKU_MODEL: "DeepSeek-V3.2", - ANTHROPIC_DEFAULT_SONNET_MODEL: "DeepSeek-V3.2", - ANTHROPIC_DEFAULT_OPUS_MODEL: "DeepSeek-V3.2", + ANTHROPIC_MODEL: "deepseek-v4-pro", + ANTHROPIC_DEFAULT_HAIKU_MODEL: "deepseek-v4-flash", + ANTHROPIC_DEFAULT_SONNET_MODEL: "deepseek-v4-pro", + ANTHROPIC_DEFAULT_OPUS_MODEL: "deepseek-v4-pro", }, }, category: "cn_official", + // Anthropic 兼容层挂在 /anthropic 子路径；/models 是根上独立端点 + modelsUrl: "https://api.deepseek.com/models", icon: "deepseek", iconColor: "#1E88E5", }, @@ -175,6 +181,26 @@ export const providerPresets: ProviderPreset[] = [ icon: "zhipu", iconColor: "#0F62FE", }, + { + name: "Baidu Qianfan Coding Plan", + websiteUrl: "https://cloud.baidu.com/product/qianfan_modelbuilder", + apiKeyUrl: + "https://console.bce.baidu.com/qianfan/ais/console/applicationConsole/application", + settingsConfig: { + env: { + ANTHROPIC_BASE_URL: "https://qianfan.baidubce.com/anthropic/coding", + ANTHROPIC_AUTH_TOKEN: "", + ANTHROPIC_MODEL: "qianfan-code-latest", + ANTHROPIC_DEFAULT_HAIKU_MODEL: "qianfan-code-latest", + ANTHROPIC_DEFAULT_SONNET_MODEL: "qianfan-code-latest", + ANTHROPIC_DEFAULT_OPUS_MODEL: "qianfan-code-latest", + }, + }, + category: "cn_official", + endpointCandidates: ["https://qianfan.baidubce.com/anthropic/coding"], + icon: "baidu", + iconColor: "#2932E1", + }, { name: "Bailian", websiteUrl: "https://bailian.console.aliyun.com", @@ -209,10 +235,10 @@ export const providerPresets: ProviderPreset[] = [ env: { ANTHROPIC_BASE_URL: "https://api.moonshot.cn/anthropic", ANTHROPIC_AUTH_TOKEN: "", - ANTHROPIC_MODEL: "kimi-k2.5", - ANTHROPIC_DEFAULT_HAIKU_MODEL: "kimi-k2.5", - ANTHROPIC_DEFAULT_SONNET_MODEL: "kimi-k2.5", - ANTHROPIC_DEFAULT_OPUS_MODEL: "kimi-k2.5", + ANTHROPIC_MODEL: "kimi-k2.6", + ANTHROPIC_DEFAULT_HAIKU_MODEL: "kimi-k2.6", + ANTHROPIC_DEFAULT_SONNET_MODEL: "kimi-k2.6", + ANTHROPIC_DEFAULT_OPUS_MODEL: "kimi-k2.6", }, }, category: "cn_official", @@ -221,7 +247,7 @@ export const providerPresets: ProviderPreset[] = [ }, { name: "Kimi For Coding", - websiteUrl: "https://www.kimi.com/coding/docs/", + websiteUrl: "https://www.kimi.com/code/docs/", settingsConfig: { env: { ANTHROPIC_BASE_URL: "https://api.kimi.com/coding/", @@ -234,23 +260,41 @@ export const providerPresets: ProviderPreset[] = [ }, { name: "StepFun", - websiteUrl: "https://platform.stepfun.ai", - apiKeyUrl: "https://platform.stepfun.ai/interface-key", + websiteUrl: "https://platform.stepfun.com/step-plan", + apiKeyUrl: "https://platform.stepfun.com/interface-key", settingsConfig: { env: { - ANTHROPIC_BASE_URL: "https://api.stepfun.ai/v1", + ANTHROPIC_BASE_URL: "https://api.stepfun.com/step_plan", ANTHROPIC_AUTH_TOKEN: "", - ANTHROPIC_MODEL: "step-3.5-flash", - ANTHROPIC_DEFAULT_HAIKU_MODEL: "step-3.5-flash", - ANTHROPIC_DEFAULT_SONNET_MODEL: "step-3.5-flash", - ANTHROPIC_DEFAULT_OPUS_MODEL: "step-3.5-flash", + ANTHROPIC_MODEL: "step-3.5-flash-2603", + ANTHROPIC_DEFAULT_HAIKU_MODEL: "step-3.5-flash-2603", + ANTHROPIC_DEFAULT_SONNET_MODEL: "step-3.5-flash-2603", + ANTHROPIC_DEFAULT_OPUS_MODEL: "step-3.5-flash-2603", }, }, category: "cn_official", - endpointCandidates: ["https://api.stepfun.ai/v1"], - apiFormat: "openai_chat", + endpointCandidates: ["https://api.stepfun.com/step_plan"], icon: "stepfun", - iconColor: "#005AFF", + iconColor: "#16D6D2", + }, + { + name: "StepFun en", + websiteUrl: "https://platform.stepfun.ai/step-plan", + apiKeyUrl: "https://platform.stepfun.ai/interface-key", + settingsConfig: { + env: { + ANTHROPIC_BASE_URL: "https://api.stepfun.ai/step_plan", + ANTHROPIC_AUTH_TOKEN: "", + ANTHROPIC_MODEL: "step-3.5-flash-2603", + ANTHROPIC_DEFAULT_HAIKU_MODEL: "step-3.5-flash-2603", + ANTHROPIC_DEFAULT_SONNET_MODEL: "step-3.5-flash-2603", + ANTHROPIC_DEFAULT_OPUS_MODEL: "step-3.5-flash-2603", + }, + }, + category: "cn_official", + endpointCandidates: ["https://api.stepfun.ai/step_plan"], + icon: "stepfun", + iconColor: "#16D6D2", }, { name: "ModelScope", @@ -645,6 +689,25 @@ export const providerPresets: ProviderPreset[] = [ icon: "ucloud", iconColor: "#000000", }, + { + name: "Compshare Coding Plan", + nameKey: "providerForm.presets.ucloudCoding", + websiteUrl: "https://www.compshare.cn", + apiKeyUrl: + "https://www.compshare.cn/coding-plan?ytag=GPU_YY_YX_git_cc-switch", + settingsConfig: { + env: { + ANTHROPIC_BASE_URL: "https://cp.compshare.cn", + ANTHROPIC_AUTH_TOKEN: "", + }, + }, + endpointCandidates: ["https://cp.compshare.cn"], + category: "aggregator", + isPartner: true, // 合作伙伴 + partnerPromotionKey: "ucloud", // 促销信息 i18n key（复用） + icon: "ucloud", + iconColor: "#000000", + }, { name: "Micu", websiteUrl: "https://www.openclaudecode.cn", @@ -741,7 +804,7 @@ export const providerPresets: ProviderPreset[] = [ ANTHROPIC_MODEL: "anthropic/claude-sonnet-4.6", ANTHROPIC_DEFAULT_HAIKU_MODEL: "anthropic/claude-haiku-4.5", ANTHROPIC_DEFAULT_SONNET_MODEL: "anthropic/claude-sonnet-4.6", - ANTHROPIC_DEFAULT_OPUS_MODEL: "anthropic/claude-opus-4.6", + ANTHROPIC_DEFAULT_OPUS_MODEL: "anthropic/claude-opus-4.7", }, }, category: "aggregator", @@ -760,7 +823,7 @@ export const providerPresets: ProviderPreset[] = [ ANTHROPIC_MODEL: "anthropic/claude-sonnet-4.6", ANTHROPIC_DEFAULT_HAIKU_MODEL: "anthropic/claude-haiku-4.5", ANTHROPIC_DEFAULT_SONNET_MODEL: "anthropic/claude-sonnet-4.6", - ANTHROPIC_DEFAULT_OPUS_MODEL: "anthropic/claude-opus-4.6", + ANTHROPIC_DEFAULT_OPUS_MODEL: "anthropic/claude-opus-4.7", }, }, category: "aggregator", @@ -791,10 +854,10 @@ export const providerPresets: ProviderPreset[] = [ settingsConfig: { env: { ANTHROPIC_BASE_URL: "https://api.githubcopilot.com", - ANTHROPIC_MODEL: "claude-opus-4.6", + ANTHROPIC_MODEL: "claude-sonnet-4.6", ANTHROPIC_DEFAULT_HAIKU_MODEL: "claude-haiku-4.5", ANTHROPIC_DEFAULT_SONNET_MODEL: "claude-sonnet-4.6", - ANTHROPIC_DEFAULT_OPUS_MODEL: "claude-opus-4.6", + ANTHROPIC_DEFAULT_OPUS_MODEL: "claude-sonnet-4.6", }, }, category: "third_party", @@ -825,6 +888,22 @@ export const providerPresets: ProviderPreset[] = [ icon: "openai", iconColor: "#000000", }, + { + name: "LemonData", + websiteUrl: "https://lemondata.cc", + apiKeyUrl: "https://lemondata.cc/r/FFX1ZDUP", + apiKeyField: "ANTHROPIC_API_KEY", + settingsConfig: { + env: { + ANTHROPIC_BASE_URL: "https://api.lemondata.cc", + ANTHROPIC_API_KEY: "", + }, + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "lemondata", + icon: "lemondata", + }, { name: "Nvidia", websiteUrl: "https://build.nvidia.com", @@ -852,10 +931,10 @@ export const providerPresets: ProviderPreset[] = [ env: { ANTHROPIC_BASE_URL: "https://cc-api.pipellm.ai", ANTHROPIC_AUTH_TOKEN: "", - ANTHROPIC_MODEL: "claude-opus-4-6", + ANTHROPIC_MODEL: "claude-opus-4-7", ANTHROPIC_DEFAULT_HAIKU_MODEL: "claude-haiku-4-5-20251001", ANTHROPIC_DEFAULT_SONNET_MODEL: "claude-sonnet-4-6", - ANTHROPIC_DEFAULT_OPUS_MODEL: "claude-opus-4-6", + ANTHROPIC_DEFAULT_OPUS_MODEL: "claude-opus-4-7", }, includeCoAuthoredBy: false, }, @@ -890,11 +969,11 @@ export const providerPresets: ProviderPreset[] = [ AWS_ACCESS_KEY_ID: "${AWS_ACCESS_KEY_ID}", AWS_SECRET_ACCESS_KEY: "${AWS_SECRET_ACCESS_KEY}", AWS_REGION: "${AWS_REGION}", - ANTHROPIC_MODEL: "global.anthropic.claude-opus-4-6-v1", + ANTHROPIC_MODEL: "global.anthropic.claude-opus-4-7", ANTHROPIC_DEFAULT_HAIKU_MODEL: "global.anthropic.claude-haiku-4-5-20251001-v1:0", ANTHROPIC_DEFAULT_SONNET_MODEL: "global.anthropic.claude-sonnet-4-6", - ANTHROPIC_DEFAULT_OPUS_MODEL: "global.anthropic.claude-opus-4-6-v1", + ANTHROPIC_DEFAULT_OPUS_MODEL: "global.anthropic.claude-opus-4-7", CLAUDE_CODE_USE_BEDROCK: "1", }, }, @@ -928,11 +1007,11 @@ export const providerPresets: ProviderPreset[] = [ ANTHROPIC_BASE_URL: "https://bedrock-runtime.${AWS_REGION}.amazonaws.com", AWS_REGION: "${AWS_REGION}", - ANTHROPIC_MODEL: "global.anthropic.claude-opus-4-6-v1", + ANTHROPIC_MODEL: "global.anthropic.claude-opus-4-7", ANTHROPIC_DEFAULT_HAIKU_MODEL: "global.anthropic.claude-haiku-4-5-20251001-v1:0", ANTHROPIC_DEFAULT_SONNET_MODEL: "global.anthropic.claude-sonnet-4-6", - ANTHROPIC_DEFAULT_OPUS_MODEL: "global.anthropic.claude-opus-4-6-v1", + ANTHROPIC_DEFAULT_OPUS_MODEL: "global.anthropic.claude-opus-4-7", CLAUDE_CODE_USE_BEDROCK: "1", }, }, diff --git a/src/config/codexProviderPresets.ts b/src/config/codexProviderPresets.ts index 0e8caa046..bc926c4e4 100644 --- a/src/config/codexProviderPresets.ts +++ b/src/config/codexProviderPresets.ts @@ -316,6 +316,25 @@ requires_openai_auth = true`, icon: "ucloud", iconColor: "#000000", }, + { + name: "Compshare Coding Plan", + nameKey: "providerForm.presets.ucloudCoding", + websiteUrl: "https://www.compshare.cn", + apiKeyUrl: + "https://www.compshare.cn/coding-plan?ytag=GPU_YY_YX_git_cc-switch", + auth: generateThirdPartyAuth(""), + config: generateThirdPartyConfig( + "compshare_coding", + "https://cp.compshare.cn/v1", + "gpt-5.4", + ), + endpointCandidates: ["https://cp.compshare.cn/v1"], + category: "aggregator", + isPartner: true, // 合作伙伴 + partnerPromotionKey: "ucloud", // 促销信息 i18n key（复用） + icon: "ucloud", + iconColor: "#000000", + }, { name: "Micu", websiteUrl: "https://www.openclaudecode.cn", @@ -364,6 +383,23 @@ requires_openai_auth = true`, partnerPromotionKey: "lionccapi", icon: "lioncc", }, + { + name: "DDSHub", + websiteUrl: "https://www.ddshub.cc", + apiKeyUrl: "https://ddshub.short.gy/ccswitch", + category: "third_party", + auth: generateThirdPartyAuth(""), + config: generateThirdPartyConfig( + "ddshub", + "https://www.ddshub.cc", + "gpt-5.4", + ), + endpointCandidates: ["https://www.ddshub.cc"], + isPartner: true, + partnerPromotionKey: "ddshub", + icon: "dds", + iconColor: "#000000", + }, { name: "E-FlowCode", websiteUrl: "https://e-flowcode.cc", @@ -389,6 +425,22 @@ model_auto_compact_token_limit = 9000000`, icon: "eflowcode", iconColor: "#000000", }, + { + name: "LemonData", + websiteUrl: "https://lemondata.cc", + apiKeyUrl: "https://lemondata.cc/r/FFX1ZDUP", + category: "third_party", + auth: generateThirdPartyAuth(""), + config: generateThirdPartyConfig( + "lemondata", + "https://api.lemondata.cc/v1", + "gpt-5.4", + ), + endpointCandidates: ["https://api.lemondata.cc/v1"], + isPartner: true, + partnerPromotionKey: "lemondata", + icon: "lemondata", + }, { name: "PIPELLM", websiteUrl: "https://code.pipellm.ai", diff --git a/src/config/codingPlanProviders.ts b/src/config/codingPlanProviders.ts new file mode 100644 index 000000000..f2fc75440 --- /dev/null +++ b/src/config/codingPlanProviders.ts @@ -0,0 +1,81 @@ +/** + * Coding Plan 供应商的 base_url 路由表。 + * + * 与后端 `src-tauri/src/services/coding_plan.rs::detect_provider` 保持一致： + * 后端靠 `url.contains(...)` 做子串判断，前端这里用 RegExp 做同效匹配。 + * 新增供应商时改这一处即可（UsageScriptModal 下拉 + useProviderActions + * 新建自动注入 + 托盘识别全部复用）。 + */ +import { createUsageScript } from "@/types"; +import { TEMPLATE_TYPES } from "@/config/constants"; + +export interface CodingPlanProviderEntry { + /** 与后端 QuotaTier 的 `codingPlanProvider` 取值对齐 */ + id: "kimi" | "zhipu" | "minimax"; + /** UsageScriptModal 下拉显示用 */ + label: string; + /** base_url 匹配规则 */ + pattern: RegExp; +} + +export const CODING_PLAN_PROVIDERS: readonly CodingPlanProviderEntry[] = [ + { id: "kimi", label: "Kimi For Coding", pattern: /api\.kimi\.com\/coding/i }, + { + id: "zhipu", + label: "Zhipu GLM (智谱)", + pattern: /bigmodel\.cn|api\.z\.ai/i, + }, + { + id: "minimax", + label: "MiniMax", + pattern: /api\.minimaxi?\.com|api\.minimax\.io/i, + }, +] as const; + +/** 根据 Base URL 自动检测 Coding Plan 供应商；未命中返回 null */ +export function detectCodingPlanProvider( + baseUrl: string | undefined | null, +): CodingPlanProviderEntry["id"] | null { + if (!baseUrl) return null; + for (const cp of CODING_PLAN_PROVIDERS) { + if (cp.pattern.test(baseUrl)) return cp.id; + } + return null; +} + +/** + * 新建 Claude 供应商时，若 `ANTHROPIC_BASE_URL` 命中 Coding Plan 路由表， + * 自动把 `meta.usage_script` 标记为 token_plan 并启用。 + * + * - 仅在 `meta.usage_script` 完全缺失时注入，不覆盖用户/UsageScriptModal 已有配置 + * - 仅对 Claude app 生效：后端 `commands/provider.rs` 的 token_plan 分支只处理 Claude + * supplier 的 `settings_config.env.ANTHROPIC_BASE_URL` + * - code 置空：Rust 端走专用 `coding_plan::get_coding_plan_quota`，不执行 JS 脚本 + */ +export function injectCodingPlanUsageScript< + T extends { + settingsConfig?: Record; + meta?: Record; + }, +>(appId: string, provider: T): T { + if (appId !== "claude") return provider; + if (provider.meta?.usage_script) return provider; + + const baseUrl = provider.settingsConfig?.env?.ANTHROPIC_BASE_URL; + const codingPlanProvider = detectCodingPlanProvider( + typeof baseUrl === "string" ? baseUrl : null, + ); + if (!codingPlanProvider) return provider; + + return { + ...provider, + meta: { + ...(provider.meta ?? {}), + usage_script: createUsageScript({ + enabled: true, + templateType: TEMPLATE_TYPES.TOKEN_PLAN, + codingPlanProvider, + }), + }, + }; +} diff --git a/src/config/geminiProviderPresets.ts b/src/config/geminiProviderPresets.ts index 14205c043..a6d911871 100644 --- a/src/config/geminiProviderPresets.ts +++ b/src/config/geminiProviderPresets.ts @@ -295,6 +295,25 @@ export const geminiProviderPresets: GeminiProviderPreset[] = [ icon: "eflowcode", iconColor: "#000000", }, + { + name: "LemonData", + websiteUrl: "https://lemondata.cc", + apiKeyUrl: "https://lemondata.cc/r/FFX1ZDUP", + settingsConfig: { + env: { + GOOGLE_GEMINI_BASE_URL: "https://api.lemondata.cc", + GEMINI_MODEL: "gemini-3.1-pro", + }, + }, + baseURL: "https://api.lemondata.cc", + model: "gemini-3.1-pro", + description: "LemonData", + category: "third_party", + isPartner: true, + partnerPromotionKey: "lemondata", + endpointCandidates: ["https://api.lemondata.cc"], + icon: "lemondata", + }, { name: "OpenRouter", websiteUrl: "https://openrouter.ai", @@ -319,11 +338,11 @@ export const geminiProviderPresets: GeminiProviderPreset[] = [ settingsConfig: { env: { GOOGLE_GEMINI_BASE_URL: "https://api.therouter.ai", - GEMINI_MODEL: "gemini-2.5-pro", + GEMINI_MODEL: "gemini-3.1-pro", }, }, baseURL: "https://api.therouter.ai", - model: "gemini-2.5-pro", + model: "gemini-3.1-pro", description: "TheRouter", category: "aggregator", endpointCandidates: ["https://api.therouter.ai"], diff --git a/src/config/hermesProviderPresets.ts b/src/config/hermesProviderPresets.ts new file mode 100644 index 000000000..eb48166ec --- /dev/null +++ b/src/config/hermesProviderPresets.ts @@ -0,0 +1,1133 @@ +/** + * Hermes Agent provider presets configuration + * Hermes uses custom_providers array in config.yaml + */ +import type { ProviderCategory } from "../types"; +import type { PresetTheme, TemplateValueConfig } from "./claudeProviderPresets"; + +/** + * Marker field and source values that `hermes_config.rs::get_providers` + * injects onto each settings payload. Kept in sync with the Rust constants + * `PROVIDER_SOURCE_FIELD` / `PROVIDER_SOURCE_CUSTOM_LIST` / `PROVIDER_SOURCE_DICT`. + */ +export const HERMES_PROVIDER_SOURCE_FIELD = "_cc_source"; +export const HERMES_PROVIDER_SOURCE_CUSTOM_LIST = "custom_providers"; +export const HERMES_PROVIDER_SOURCE_DICT = "providers_dict"; + +/** + * True when the provider was sourced from Hermes' v12+ `providers:` dict — + * CC Switch renders those read-only and routes edits to Hermes Web UI. + */ +export function isHermesReadOnlyProvider(settingsConfig: unknown): boolean { + if (!settingsConfig || typeof settingsConfig !== "object") { + return false; + } + const marker = (settingsConfig as Record)[ + HERMES_PROVIDER_SOURCE_FIELD + ]; + return marker === HERMES_PROVIDER_SOURCE_DICT; +} + +/** + * A model entry under a Hermes custom_provider. + * + * Serialized to YAML as a dict keyed by `id`: + * + * ```yaml + * models: + * anthropic/claude-opus-4-7: + * context_length: 200000 + * ``` + * + * Hermes' `_VALID_CUSTOM_PROVIDER_FIELDS` (hermes_cli/config.py) does not include + * `max_tokens` at the per-model level — writing it produces an "unknown field" + * warning on Hermes startup. Max tokens is a per-request parameter, not a + * provider-level config. + */ +export interface HermesModel { + /** Model ID — becomes the YAML key and the value written to top-level model.default. */ + id: string; + /** Optional display label (UI only, not serialized to YAML). */ + name?: string; + /** Override the auto-detected context window. */ + context_length?: number; +} + +/** + * Top-level `model:` defaults suggested by a preset. + * + * Written to the YAML `model:` section when the user switches to this provider. + * Per-model `context_length` lives on the individual `HermesModel` entries and + * flows through `custom_providers[].models`, not this object. + */ +export interface HermesSuggestedDefaults { + model: { + /** Model ID for `model.default`. Typically equals `models[0].id`. */ + default: string; + /** Value for `model.provider`. Omit to use the custom_provider name. */ + provider?: string; + }; +} + +/** Hermes custom_provider protocol mode. Always written explicitly. */ +export type HermesApiMode = + | "chat_completions" + | "anthropic_messages" + | "codex_responses" + | "bedrock_converse"; + +/** Default mode used when a provider has no stored value yet. */ +export const HERMES_DEFAULT_API_MODE: HermesApiMode = "chat_completions"; + +/** Dropdown options for the API Mode selector. `labelKey` is looked up in i18n. */ +export const hermesApiModes: Array<{ + value: HermesApiMode; + labelKey: string; +}> = [ + { value: "chat_completions", labelKey: "hermes.form.apiModeChatCompletions" }, + { + value: "anthropic_messages", + labelKey: "hermes.form.apiModeAnthropicMessages", + }, + { value: "codex_responses", labelKey: "hermes.form.apiModeCodexResponses" }, + { + value: "bedrock_converse", + labelKey: "hermes.form.apiModeBedrockConverse", + }, +]; + +export interface HermesProviderPreset { + name: string; + nameKey?: string; + websiteUrl: string; + apiKeyUrl?: string; + settingsConfig: HermesProviderSettingsConfig; + isOfficial?: boolean; + isPartner?: boolean; + partnerPromotionKey?: string; + category?: ProviderCategory; + templateValues?: Record; + theme?: PresetTheme; + icon?: string; + iconColor?: string; + isCustomTemplate?: boolean; + /** Optional top-level `model:` defaults written on switch. */ + suggestedDefaults?: HermesSuggestedDefaults; +} + +export interface HermesProviderSettingsConfig { + name: string; + base_url?: string; + api_key?: string; + api_mode?: HermesApiMode; + /** UI-side ordered list; serialized to YAML as a dict keyed by id. */ + models?: HermesModel[]; + /** Delay in seconds between consecutive requests to this provider. */ + rate_limit_delay?: number; + [key: string]: unknown; +} + +export const hermesProviderPresets: HermesProviderPreset[] = [ + { + name: "Shengsuanyun", + nameKey: "providerForm.presets.shengsuanyun", + websiteUrl: "https://www.shengsuanyun.com", + apiKeyUrl: "https://www.shengsuanyun.com/?from=CH_4HHXMRYF", + settingsConfig: { + name: "shengsuanyun", + base_url: "https://router.shengsuanyun.com/api/v1", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "openai/gpt-5.4", name: "GPT-5.4" }], + }, + category: "aggregator", + isPartner: true, + partnerPromotionKey: "shengsuanyun", + icon: "shengsuanyun", + suggestedDefaults: { + model: { default: "openai/gpt-5.4", provider: "shengsuanyun" }, + }, + }, + { + name: "OpenRouter", + nameKey: "providerForm.presets.openrouter", + websiteUrl: "https://openrouter.ai", + apiKeyUrl: "https://openrouter.ai/keys", + settingsConfig: { + name: "openrouter", + base_url: "https://openrouter.ai/api/v1", + api_key: "", + api_mode: "chat_completions", + models: [ + { + id: "anthropic/claude-opus-4-7", + name: "Claude Opus 4.7", + context_length: 1000000, + }, + { + id: "anthropic/claude-sonnet-4-6", + name: "Claude Sonnet 4.6", + context_length: 1000000, + }, + { + id: "anthropic/claude-haiku-4-5", + name: "Claude Haiku 4.5", + context_length: 200000, + }, + { + id: "openai/gpt-5.4", + name: "GPT-5.4", + context_length: 400000, + }, + { + id: "google/gemini-3-pro", + name: "Gemini 3 Pro", + context_length: 1000000, + }, + ], + }, + category: "aggregator", + icon: "openrouter", + iconColor: "#6366F1", + suggestedDefaults: { + model: { default: "anthropic/claude-opus-4-7", provider: "openrouter" }, + }, + }, + { + name: "DeepSeek", + nameKey: "providerForm.presets.deepseek", + websiteUrl: "https://platform.deepseek.com", + apiKeyUrl: "https://platform.deepseek.com/api_keys", + settingsConfig: { + name: "deepseek", + base_url: "https://api.deepseek.com", + api_key: "", + api_mode: "chat_completions", + models: [ + { + id: "deepseek-v4-pro", + name: "DeepSeek V4 Pro", + context_length: 1000000, + }, + { + id: "deepseek-v4-flash", + name: "DeepSeek V4 Flash", + context_length: 1000000, + }, + ], + }, + category: "cn_official", + icon: "deepseek", + iconColor: "#4D6BFE", + suggestedDefaults: { + model: { default: "deepseek-v4-flash", provider: "deepseek" }, + }, + }, + { + name: "Together AI", + nameKey: "providerForm.presets.together", + websiteUrl: "https://together.ai", + apiKeyUrl: "https://api.together.ai/settings/api-keys", + settingsConfig: { + name: "together", + base_url: "https://api.together.xyz/v1", + api_key: "", + api_mode: "chat_completions", + models: [ + { + id: "Qwen/Qwen3-Coder-480B-A35B-Instruct", + name: "Qwen3 Coder 480B", + context_length: 262144, + }, + { + id: "deepseek-ai/DeepSeek-V3.2", + name: "DeepSeek V3.2", + context_length: 64000, + }, + { + id: "meta-llama/Llama-4-Maverick-17B-128E-Instruct-FP8", + name: "Llama 4 Maverick", + context_length: 131072, + }, + ], + }, + category: "aggregator", + icon: "together", + iconColor: "#0F6FFF", + suggestedDefaults: { + model: { + default: "Qwen/Qwen3-Coder-480B-A35B-Instruct", + provider: "together", + }, + }, + }, + { + name: "Nous Research", + websiteUrl: "https://nousresearch.com", + apiKeyUrl: "https://portal.nousresearch.com/", + settingsConfig: { + name: "nous", + base_url: "https://inference-api.nousresearch.com/v1", + api_key: "", + api_mode: "chat_completions", + models: [ + { + id: "Hermes-4-405B", + name: "Hermes 4 405B", + context_length: 131072, + }, + { + id: "Hermes-4-70B", + name: "Hermes 4 70B", + context_length: 131072, + }, + ], + }, + isOfficial: true, + category: "official", + icon: "hermes", + iconColor: "#7C3AED", + suggestedDefaults: { + model: { default: "Hermes-4-405B", provider: "nous" }, + }, + }, + + // ===== 以下为从 Claude 应用预设同步而来的供应商 ===== + // 字段映射：env.ANTHROPIC_BASE_URL → base_url；env.ANTHROPIC_AUTH_TOKEN → api_key； + // apiFormat "anthropic"(默认) → api_mode "anthropic_messages"； + // apiFormat "openai_chat" → api_mode "chat_completions"； + // ANTHROPIC_MODEL / DEFAULT_HAIKU / SONNET / OPUS_MODEL 去重后塞进 models[]。 + { + name: "Zhipu GLM", + websiteUrl: "https://open.bigmodel.cn", + apiKeyUrl: "https://www.bigmodel.cn/claude-code?ic=RRVJPB5SII", + settingsConfig: { + name: "zhipu_glm", + base_url: "https://open.bigmodel.cn/api/paas/v4", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "glm-5", name: "GLM-5" }], + }, + category: "cn_official", + icon: "zhipu", + iconColor: "#0F62FE", + suggestedDefaults: { + model: { default: "glm-5", provider: "zhipu_glm" }, + }, + }, + { + name: "Zhipu GLM en", + websiteUrl: "https://z.ai", + apiKeyUrl: "https://z.ai/subscribe?ic=8JVLJQFSKB", + settingsConfig: { + name: "zhipu_glm_en", + base_url: "https://api.z.ai/api/paas/v4", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "glm-5", name: "GLM-5" }], + }, + category: "cn_official", + icon: "zhipu", + iconColor: "#0F62FE", + suggestedDefaults: { + model: { default: "glm-5", provider: "zhipu_glm_en" }, + }, + }, + { + name: "Bailian", + websiteUrl: "https://bailian.console.aliyun.com", + settingsConfig: { + name: "bailian", + base_url: "https://dashscope.aliyuncs.com/compatible-mode/v1", + api_key: "", + api_mode: "chat_completions", + models: [ + { id: "qwen3-coder-plus", name: "Qwen3 Coder Plus" }, + { id: "qwen3-max", name: "Qwen3 Max" }, + ], + }, + category: "cn_official", + icon: "bailian", + iconColor: "#624AFF", + suggestedDefaults: { + model: { default: "qwen3-coder-plus", provider: "bailian" }, + }, + }, + { + name: "Bailian For Coding", + websiteUrl: "https://bailian.console.aliyun.com", + settingsConfig: { + name: "bailian_coding", + base_url: "https://coding.dashscope.aliyuncs.com/apps/anthropic", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "qwen3-coder-plus", name: "Qwen3 Coder Plus" }, + { id: "qwen3-max", name: "Qwen3 Max" }, + ], + }, + category: "cn_official", + icon: "bailian", + iconColor: "#624AFF", + suggestedDefaults: { + model: { default: "qwen3-coder-plus", provider: "bailian_coding" }, + }, + }, + { + name: "Kimi", + websiteUrl: "https://platform.moonshot.cn/console", + settingsConfig: { + name: "kimi", + base_url: "https://api.moonshot.cn/v1", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "kimi-k2.6", name: "Kimi K2.6" }], + }, + category: "cn_official", + icon: "kimi", + iconColor: "#6366F1", + suggestedDefaults: { + model: { default: "kimi-k2.6", provider: "kimi" }, + }, + }, + { + name: "Kimi For Coding", + websiteUrl: "https://www.kimi.com/code/docs/", + settingsConfig: { + name: "kimi_coding", + base_url: "https://api.kimi.com/coding/", + api_key: "", + api_mode: "anthropic_messages", + models: [{ id: "kimi-for-coding", name: "Kimi For Coding" }], + }, + category: "cn_official", + icon: "kimi", + iconColor: "#6366F1", + suggestedDefaults: { + model: { default: "kimi-for-coding", provider: "kimi_coding" }, + }, + }, + { + name: "StepFun", + websiteUrl: "https://platform.stepfun.ai", + apiKeyUrl: "https://platform.stepfun.ai/interface-key", + settingsConfig: { + name: "stepfun", + base_url: "https://api.stepfun.ai/v1", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "step-3.5-flash", name: "Step 3.5 Flash" }], + }, + category: "cn_official", + icon: "stepfun", + iconColor: "#005AFF", + suggestedDefaults: { + model: { default: "step-3.5-flash", provider: "stepfun" }, + }, + }, + { + name: "ModelScope", + websiteUrl: "https://modelscope.cn", + settingsConfig: { + name: "modelscope", + base_url: "https://api-inference.modelscope.cn/v1", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "ZhipuAI/GLM-5", name: "ZhipuAI / GLM-5" }], + }, + category: "aggregator", + icon: "modelscope", + iconColor: "#624AFF", + suggestedDefaults: { + model: { default: "ZhipuAI/GLM-5", provider: "modelscope" }, + }, + }, + { + name: "KAT-Coder", + websiteUrl: "https://console.streamlake.ai", + apiKeyUrl: "https://console.streamlake.ai/console/api-key", + settingsConfig: { + name: "kat_coder", + base_url: + "https://vanchin.streamlake.ai/api/gateway/v1/endpoints/${ENDPOINT_ID}/claude-code-proxy", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "KAT-Coder-Pro V1", name: "KAT-Coder Pro V1" }, + { id: "KAT-Coder-Air V1", name: "KAT-Coder Air V1" }, + ], + }, + category: "cn_official", + templateValues: { + ENDPOINT_ID: { + label: "Vanchin Endpoint ID", + placeholder: "ep-xxx-xxx", + defaultValue: "", + editorValue: "", + }, + }, + icon: "catcoder", + suggestedDefaults: { + model: { default: "KAT-Coder-Pro V1", provider: "kat_coder" }, + }, + }, + { + name: "Longcat", + websiteUrl: "https://longcat.chat/platform", + apiKeyUrl: "https://longcat.chat/platform/api_keys", + settingsConfig: { + name: "longcat", + base_url: "https://api.longcat.chat/openai/v1", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "LongCat-Flash-Chat", name: "LongCat Flash Chat" }], + }, + category: "cn_official", + icon: "longcat", + iconColor: "#29E154", + suggestedDefaults: { + model: { default: "LongCat-Flash-Chat", provider: "longcat" }, + }, + }, + { + name: "MiniMax", + websiteUrl: "https://platform.minimaxi.com", + apiKeyUrl: "https://platform.minimaxi.com/subscribe/coding-plan", + settingsConfig: { + name: "minimax", + base_url: "https://api.minimaxi.com/v1", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "MiniMax-M2.7", name: "MiniMax M2.7" }], + }, + category: "cn_official", + isPartner: true, + partnerPromotionKey: "minimax_cn", + theme: { backgroundColor: "#f64551", textColor: "#FFFFFF" }, + icon: "minimax", + iconColor: "#FF6B6B", + suggestedDefaults: { + model: { default: "MiniMax-M2.7", provider: "minimax" }, + }, + }, + { + name: "MiniMax en", + websiteUrl: "https://platform.minimax.io", + apiKeyUrl: "https://platform.minimax.io/subscribe/coding-plan", + settingsConfig: { + name: "minimax_en", + base_url: "https://api.minimax.io/v1", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "MiniMax-M2.7", name: "MiniMax M2.7" }], + }, + category: "cn_official", + isPartner: true, + partnerPromotionKey: "minimax_en", + theme: { backgroundColor: "#f64551", textColor: "#FFFFFF" }, + icon: "minimax", + iconColor: "#FF6B6B", + suggestedDefaults: { + model: { default: "MiniMax-M2.7", provider: "minimax_en" }, + }, + }, + { + name: "DouBaoSeed", + websiteUrl: "https://www.volcengine.com/product/doubao", + apiKeyUrl: "https://www.volcengine.com/product/doubao", + settingsConfig: { + name: "doubao_seed", + base_url: "https://ark.cn-beijing.volces.com/api/coding", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { + id: "doubao-seed-2-0-code-preview-latest", + name: "Doubao Seed 2.0 Code Preview", + }, + ], + }, + category: "cn_official", + icon: "doubao", + iconColor: "#3370FF", + suggestedDefaults: { + model: { + default: "doubao-seed-2-0-code-preview-latest", + provider: "doubao_seed", + }, + }, + }, + { + name: "BaiLing", + websiteUrl: "https://alipaytbox.yuque.com/sxs0ba/ling/get_started", + settingsConfig: { + name: "bailing", + base_url: "https://api.tbox.cn/api/anthropic", + api_key: "", + api_mode: "anthropic_messages", + models: [{ id: "Ling-2.5-1T", name: "Ling 2.5 1T" }], + }, + category: "cn_official", + suggestedDefaults: { + model: { default: "Ling-2.5-1T", provider: "bailing" }, + }, + }, + { + name: "AiHubMix", + websiteUrl: "https://aihubmix.com", + apiKeyUrl: "https://aihubmix.com", + settingsConfig: { + name: "aihubmix", + base_url: "https://aihubmix.com/v1", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "gpt-5.4", name: "GPT-5.4" }], + }, + category: "aggregator", + icon: "aihubmix", + iconColor: "#006FFB", + suggestedDefaults: { + model: { default: "gpt-5.4", provider: "aihubmix" }, + }, + }, + { + name: "SiliconFlow", + websiteUrl: "https://siliconflow.cn", + apiKeyUrl: "https://cloud.siliconflow.cn/i/drGuwc9k", + settingsConfig: { + name: "siliconflow", + base_url: "https://api.siliconflow.cn/v1", + api_key: "", + api_mode: "chat_completions", + models: [ + { + id: "Pro/MiniMaxAI/MiniMax-M2.7", + name: "Pro / MiniMax M2.7", + }, + ], + }, + category: "aggregator", + isPartner: true, + partnerPromotionKey: "siliconflow", + icon: "siliconflow", + iconColor: "#6E29F6", + suggestedDefaults: { + model: { + default: "Pro/MiniMaxAI/MiniMax-M2.7", + provider: "siliconflow", + }, + }, + }, + { + name: "SiliconFlow en", + websiteUrl: "https://siliconflow.com", + apiKeyUrl: "https://cloud.siliconflow.cn/i/drGuwc9k", + settingsConfig: { + name: "siliconflow_en", + base_url: "https://api.siliconflow.com/v1", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "MiniMaxAI/MiniMax-M2.7", name: "MiniMax M2.7" }], + }, + category: "aggregator", + isPartner: true, + partnerPromotionKey: "siliconflow", + icon: "siliconflow", + iconColor: "#000000", + suggestedDefaults: { + model: { + default: "MiniMaxAI/MiniMax-M2.7", + provider: "siliconflow_en", + }, + }, + }, + { + name: "DMXAPI", + websiteUrl: "https://www.dmxapi.cn", + apiKeyUrl: "https://www.dmxapi.cn", + settingsConfig: { + name: "dmxapi", + base_url: "https://www.dmxapi.cn/v1", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "gpt-5.4", name: "GPT-5.4" }], + }, + category: "aggregator", + isPartner: true, + partnerPromotionKey: "dmxapi", + suggestedDefaults: { + model: { default: "gpt-5.4", provider: "dmxapi" }, + }, + }, + { + name: "PackyCode", + websiteUrl: "https://www.packyapi.com", + apiKeyUrl: "https://www.packyapi.com/register?aff=cc-switch", + settingsConfig: { + name: "packycode", + base_url: "https://www.packyapi.com", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "claude-opus-4-7", name: "Claude Opus 4.7" }, + { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" }, + { id: "claude-haiku-4-5-20251001", name: "Claude Haiku 4.5" }, + ], + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "packycode", + icon: "packycode", + suggestedDefaults: { + model: { default: "claude-opus-4-7", provider: "packycode" }, + }, + }, + { + name: "Cubence", + websiteUrl: "https://cubence.com", + apiKeyUrl: "https://cubence.com/signup?code=CCSWITCH&source=ccs", + settingsConfig: { + name: "cubence", + base_url: "https://api.cubence.com", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "claude-opus-4-7", name: "Claude Opus 4.7" }, + { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" }, + { id: "claude-haiku-4-5-20251001", name: "Claude Haiku 4.5" }, + ], + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "cubence", + icon: "cubence", + iconColor: "#000000", + suggestedDefaults: { + model: { default: "claude-opus-4-7", provider: "cubence" }, + }, + }, + { + name: "AIGoCode", + websiteUrl: "https://aigocode.com", + apiKeyUrl: "https://aigocode.com/invite/CC-SWITCH", + settingsConfig: { + name: "aigocode", + base_url: "https://api.aigocode.com", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "claude-opus-4-7", name: "Claude Opus 4.7" }, + { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" }, + { id: "claude-haiku-4-5-20251001", name: "Claude Haiku 4.5" }, + ], + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "aigocode", + icon: "aigocode", + iconColor: "#5B7FFF", + suggestedDefaults: { + model: { default: "claude-opus-4-7", provider: "aigocode" }, + }, + }, + { + name: "RightCode", + websiteUrl: "https://www.right.codes", + apiKeyUrl: "https://www.right.codes/register?aff=CCSWITCH", + settingsConfig: { + name: "rightcode", + base_url: "https://www.right.codes/claude", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "claude-opus-4-7", name: "Claude Opus 4.7" }, + { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" }, + { id: "claude-haiku-4-5-20251001", name: "Claude Haiku 4.5" }, + ], + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "rightcode", + icon: "rc", + iconColor: "#E96B2C", + suggestedDefaults: { + model: { default: "claude-opus-4-7", provider: "rightcode" }, + }, + }, + { + name: "AICodeMirror", + websiteUrl: "https://www.aicodemirror.com", + apiKeyUrl: "https://www.aicodemirror.com/register?invitecode=9915W3", + settingsConfig: { + name: "aicodemirror", + base_url: "https://api.aicodemirror.com/api/claudecode", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "claude-opus-4-7", name: "Claude Opus 4.7" }, + { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" }, + { id: "claude-haiku-4-5-20251001", name: "Claude Haiku 4.5" }, + ], + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "aicodemirror", + icon: "aicodemirror", + iconColor: "#000000", + suggestedDefaults: { + model: { default: "claude-opus-4-7", provider: "aicodemirror" }, + }, + }, + { + name: "AICoding", + websiteUrl: "https://aicoding.sh", + apiKeyUrl: "https://aicoding.sh/i/CCSWITCH", + settingsConfig: { + name: "aicoding", + base_url: "https://api.aicoding.sh", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "claude-opus-4-7", name: "Claude Opus 4.7" }, + { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" }, + { id: "claude-haiku-4-5-20251001", name: "Claude Haiku 4.5" }, + ], + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "aicoding", + icon: "aicoding", + iconColor: "#000000", + suggestedDefaults: { + model: { default: "claude-opus-4-7", provider: "aicoding" }, + }, + }, + { + name: "CrazyRouter", + websiteUrl: "https://www.crazyrouter.com", + apiKeyUrl: "https://www.crazyrouter.com/register?aff=OZcm&ref=cc-switch", + settingsConfig: { + name: "crazyrouter", + base_url: "https://crazyrouter.com", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "claude-opus-4-7", name: "Claude Opus 4.7" }, + { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" }, + { id: "claude-haiku-4-5-20251001", name: "Claude Haiku 4.5" }, + ], + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "crazyrouter", + icon: "crazyrouter", + iconColor: "#000000", + suggestedDefaults: { + model: { default: "claude-opus-4-7", provider: "crazyrouter" }, + }, + }, + { + name: "SSSAiCode", + websiteUrl: "https://www.sssaicode.com", + apiKeyUrl: "https://www.sssaicode.com/register?ref=DCP0SM", + settingsConfig: { + name: "sssaicode", + base_url: "https://node-hk.sssaicode.com/api", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "claude-opus-4-7", name: "Claude Opus 4.7" }, + { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" }, + { id: "claude-haiku-4-5-20251001", name: "Claude Haiku 4.5" }, + ], + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "sssaicode", + icon: "sssaicode", + iconColor: "#000000", + suggestedDefaults: { + model: { default: "claude-opus-4-7", provider: "sssaicode" }, + }, + }, + { + name: "Compshare", + nameKey: "providerForm.presets.ucloud", + websiteUrl: "https://www.compshare.cn", + apiKeyUrl: + "https://www.compshare.cn/coding-plan?ytag=GPU_YY_YX_git_cc-switch", + settingsConfig: { + name: "compshare", + base_url: "https://api.modelverse.cn/v1", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "gpt-5.4", name: "GPT-5.4" }], + }, + category: "aggregator", + isPartner: true, + partnerPromotionKey: "ucloud", + icon: "ucloud", + iconColor: "#000000", + suggestedDefaults: { + model: { default: "gpt-5.4", provider: "compshare" }, + }, + }, + { + name: "Compshare Coding Plan", + nameKey: "providerForm.presets.ucloudCoding", + websiteUrl: "https://www.compshare.cn", + apiKeyUrl: + "https://www.compshare.cn/coding-plan?ytag=GPU_YY_YX_git_cc-switch", + settingsConfig: { + name: "compshare_coding", + base_url: "https://cp.compshare.cn/v1", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "gpt-5.4", name: "GPT-5.4" }], + }, + category: "aggregator", + isPartner: true, + partnerPromotionKey: "ucloud", + icon: "ucloud", + iconColor: "#000000", + suggestedDefaults: { + model: { default: "gpt-5.4", provider: "compshare_coding" }, + }, + }, + { + name: "Micu", + websiteUrl: "https://www.openclaudecode.cn", + apiKeyUrl: "https://www.openclaudecode.cn/register?aff=aOYQ", + settingsConfig: { + name: "micu", + base_url: "https://www.openclaudecode.cn", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "claude-opus-4-7", name: "Claude Opus 4.7" }, + { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" }, + { id: "claude-haiku-4-5-20251001", name: "Claude Haiku 4.5" }, + ], + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "micu", + icon: "micu", + iconColor: "#000000", + suggestedDefaults: { + model: { default: "claude-opus-4-7", provider: "micu" }, + }, + }, + { + name: "CTok.ai", + websiteUrl: "https://ctok.ai", + apiKeyUrl: "https://ctok.ai", + settingsConfig: { + name: "ctok", + base_url: "https://api.ctok.ai", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "claude-opus-4-7", name: "Claude Opus 4.7" }, + { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" }, + { id: "claude-haiku-4-5-20251001", name: "Claude Haiku 4.5" }, + ], + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "ctok", + icon: "ctok", + iconColor: "#000000", + suggestedDefaults: { + model: { default: "claude-opus-4-7", provider: "ctok" }, + }, + }, + { + name: "DDSHub", + websiteUrl: "https://www.ddshub.cc", + apiKeyUrl: "https://ddshub.short.gy/ccswitch", + settingsConfig: { + name: "ddshub", + base_url: "https://www.ddshub.cc", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "claude-opus-4-7", name: "Claude Opus 4.7" }, + { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" }, + { id: "claude-haiku-4-5-20251001", name: "Claude Haiku 4.5" }, + ], + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "ddshub", + icon: "dds", + iconColor: "#000000", + suggestedDefaults: { + model: { default: "claude-opus-4-7", provider: "ddshub" }, + }, + }, + { + name: "E-FlowCode", + websiteUrl: "https://e-flowcode.cc", + apiKeyUrl: "https://e-flowcode.cc", + settingsConfig: { + name: "eflowcode", + base_url: "https://e-flowcode.cc", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "claude-opus-4-7", name: "Claude Opus 4.7" }, + { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" }, + { id: "claude-haiku-4-5-20251001", name: "Claude Haiku 4.5" }, + ], + }, + category: "third_party", + icon: "eflowcode", + iconColor: "#000000", + suggestedDefaults: { + model: { default: "claude-opus-4-7", provider: "eflowcode" }, + }, + }, + { + name: "LionCCAPI", + websiteUrl: "https://vibecodingapi.ai", + settingsConfig: { + name: "lionccapi", + base_url: "https://vibecodingapi.ai", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "claude-opus-4-7", name: "Claude Opus 4.7" }, + { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" }, + { id: "claude-haiku-4-5-20251001", name: "Claude Haiku 4.5" }, + ], + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "lionccapi", + icon: "lioncc", + suggestedDefaults: { + model: { default: "claude-opus-4-7", provider: "lionccapi" }, + }, + }, + { + name: "LemonData", + websiteUrl: "https://lemondata.cc", + apiKeyUrl: "https://lemondata.cc/r/FFX1ZDUP", + settingsConfig: { + name: "lemondata", + base_url: "https://api.lemondata.cc/v1", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "gpt-5.4", name: "GPT-5.4" }], + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "lemondata", + icon: "lemondata", + suggestedDefaults: { + model: { default: "gpt-5.4", provider: "lemondata" }, + }, + }, + { + name: "TheRouter", + websiteUrl: "https://therouter.ai", + apiKeyUrl: "https://dashboard.therouter.ai", + settingsConfig: { + name: "therouter", + base_url: "https://api.therouter.ai/v1", + api_key: "", + api_mode: "chat_completions", + models: [ + { id: "openai/gpt-5.4", name: "GPT-5.4" }, + { id: "openai/gpt-5.4-mini", name: "GPT-5.4 mini" }, + { id: "openai/gpt-5.4-nano", name: "GPT-5.4 nano" }, + ], + }, + category: "aggregator", + suggestedDefaults: { + model: { + default: "openai/gpt-5.4", + provider: "therouter", + }, + }, + }, + { + name: "Novita AI", + websiteUrl: "https://novita.ai", + apiKeyUrl: "https://novita.ai", + settingsConfig: { + name: "novita", + base_url: "https://api.novita.ai/v3/openai", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "zai-org/glm-5", name: "Zai-Org / GLM-5" }], + }, + category: "aggregator", + icon: "novita", + iconColor: "#000000", + suggestedDefaults: { + model: { default: "zai-org/glm-5", provider: "novita" }, + }, + }, + { + name: "Nvidia", + websiteUrl: "https://build.nvidia.com", + apiKeyUrl: "https://build.nvidia.com/settings/api-keys", + settingsConfig: { + name: "nvidia", + base_url: "https://integrate.api.nvidia.com", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "moonshotai/kimi-k2.5", name: "Moonshot Kimi K2.5" }], + }, + category: "aggregator", + icon: "nvidia", + iconColor: "#000000", + suggestedDefaults: { + model: { default: "moonshotai/kimi-k2.5", provider: "nvidia" }, + }, + }, + { + name: "PIPELLM", + websiteUrl: "https://code.pipellm.ai", + apiKeyUrl: "https://code.pipellm.ai/login?ref=uvw650za", + settingsConfig: { + name: "pipellm", + base_url: "https://cc-api.pipellm.ai", + api_key: "", + api_mode: "anthropic_messages", + models: [ + { id: "claude-opus-4-7", name: "Claude Opus 4.7" }, + { id: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" }, + { + id: "claude-haiku-4-5-20251001", + name: "Claude Haiku 4.5", + }, + ], + }, + category: "aggregator", + icon: "pipellm", + suggestedDefaults: { + model: { default: "claude-opus-4-7", provider: "pipellm" }, + }, + }, + { + name: "Xiaomi MiMo", + websiteUrl: "https://platform.xiaomimimo.com", + apiKeyUrl: "https://platform.xiaomimimo.com/#/console/api-keys", + settingsConfig: { + name: "xiaomi_mimo", + base_url: "https://api.xiaomimimo.com/v1", + api_key: "", + api_mode: "chat_completions", + models: [{ id: "mimo-v2-pro", name: "MiMo v2 Pro" }], + }, + category: "cn_official", + icon: "xiaomimimo", + iconColor: "#000000", + suggestedDefaults: { + model: { default: "mimo-v2-pro", provider: "xiaomi_mimo" }, + }, + }, +]; diff --git a/src/config/openclawProviderPresets.ts b/src/config/openclawProviderPresets.ts index d75822197..18a181077 100644 --- a/src/config/openclawProviderPresets.ts +++ b/src/config/openclawProviderPresets.ts @@ -69,8 +69,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -95,11 +95,11 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "shengsuanyun/claude-opus-4-6", + primary: "shengsuanyun/claude-opus-4-7", fallbacks: ["shengsuanyun/claude-sonnet-4-6"], }, modelCatalog: { - "shengsuanyun/claude-opus-4-6": { alias: "Opus" }, + "shengsuanyun/claude-opus-4-7": { alias: "Opus" }, "shengsuanyun/claude-sonnet-4-6": { alias: "Sonnet" }, }, }, @@ -115,16 +115,16 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "openai-completions", models: [ { - id: "deepseek-chat", - name: "DeepSeek V3.2", - contextWindow: 64000, - cost: { input: 0.0005, output: 0.002 }, + id: "deepseek-v4-pro", + name: "DeepSeek V4 Pro", + contextWindow: 1000000, + cost: { input: 1.68, output: 3.36 }, }, { - id: "deepseek-reasoner", - name: "DeepSeek R1", - contextWindow: 64000, - cost: { input: 0.0005, output: 0.002 }, + id: "deepseek-v4-flash", + name: "DeepSeek V4 Flash", + contextWindow: 1000000, + cost: { input: 0.14, output: 0.28 }, }, ], }, @@ -140,12 +140,12 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "deepseek/deepseek-chat", - fallbacks: ["deepseek/deepseek-reasoner"], + primary: "deepseek/deepseek-v4-flash", + fallbacks: ["deepseek/deepseek-v4-pro"], }, modelCatalog: { - "deepseek/deepseek-chat": { alias: "DeepSeek" }, - "deepseek/deepseek-reasoner": { alias: "R1" }, + "deepseek/deepseek-v4-flash": { alias: "Flash" }, + "deepseek/deepseek-v4-pro": { alias: "Pro" }, }, }, }, @@ -264,7 +264,7 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, }, { - name: "Kimi k2.5", + name: "Kimi k2.6", websiteUrl: "https://platform.moonshot.cn/console", apiKeyUrl: "https://platform.moonshot.cn/console/api-keys", settingsConfig: { @@ -273,8 +273,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "openai-completions", models: [ { - id: "kimi-k2.5", - name: "Kimi K2.5", + id: "kimi-k2.6", + name: "Kimi K2.6", contextWindow: 131072, cost: { input: 0.002, output: 0.006 }, }, @@ -297,13 +297,13 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, }, suggestedDefaults: { - model: { primary: "kimi/kimi-k2.5" }, - modelCatalog: { "kimi/kimi-k2.5": { alias: "Kimi" } }, + model: { primary: "kimi/kimi-k2.6" }, + modelCatalog: { "kimi/kimi-k2.6": { alias: "Kimi" } }, }, }, { name: "Kimi For Coding", - websiteUrl: "https://www.kimi.com/coding/docs/", + websiteUrl: "https://www.kimi.com/code/docs/", apiKeyUrl: "https://platform.moonshot.cn/console/api-keys", settingsConfig: { baseUrl: "https://api.kimi.com/v1", @@ -341,13 +341,18 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, { name: "StepFun", - websiteUrl: "https://platform.stepfun.ai", - apiKeyUrl: "https://platform.stepfun.ai/interface-key", + websiteUrl: "https://platform.stepfun.com/step-plan", + apiKeyUrl: "https://platform.stepfun.com/interface-key", settingsConfig: { - baseUrl: "https://api.stepfun.ai/v1", + baseUrl: "https://api.stepfun.com/step_plan/v1", apiKey: "", api: "openai-completions", models: [ + { + id: "step-3.5-flash-2603", + name: "Step 3.5 Flash 2603", + contextWindow: 262144, + }, { id: "step-3.5-flash", name: "Step 3.5 Flash", @@ -357,12 +362,12 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, category: "cn_official", icon: "stepfun", - iconColor: "#005AFF", + iconColor: "#16D6D2", templateValues: { baseUrl: { label: "Base URL", - placeholder: "https://api.stepfun.ai/v1", - defaultValue: "https://api.stepfun.ai/v1", + placeholder: "https://api.stepfun.com/step_plan/v1", + defaultValue: "https://api.stepfun.com/step_plan/v1", editorValue: "", }, apiKey: { @@ -372,8 +377,56 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, }, suggestedDefaults: { - model: { primary: "stepfun/step-3.5-flash" }, - modelCatalog: { "stepfun/step-3.5-flash": { alias: "StepFun" } }, + model: { primary: "stepfun/step-3.5-flash-2603" }, + modelCatalog: { + "stepfun/step-3.5-flash-2603": { alias: "StepFun" }, + "stepfun/step-3.5-flash": { alias: "StepFun Flash" }, + }, + }, + }, + { + name: "StepFun en", + websiteUrl: "https://platform.stepfun.ai/step-plan", + apiKeyUrl: "https://platform.stepfun.ai/interface-key", + settingsConfig: { + baseUrl: "https://api.stepfun.ai/step_plan/v1", + apiKey: "", + api: "openai-completions", + models: [ + { + id: "step-3.5-flash-2603", + name: "Step 3.5 Flash 2603", + contextWindow: 262144, + }, + { + id: "step-3.5-flash", + name: "Step 3.5 Flash", + contextWindow: 262144, + }, + ], + }, + category: "cn_official", + icon: "stepfun", + iconColor: "#16D6D2", + templateValues: { + baseUrl: { + label: "Base URL", + placeholder: "https://api.stepfun.ai/step_plan/v1", + defaultValue: "https://api.stepfun.ai/step_plan/v1", + editorValue: "", + }, + apiKey: { + label: "API Key", + placeholder: "step-...", + editorValue: "", + }, + }, + suggestedDefaults: { + model: { primary: "stepfun-en/step-3.5-flash-2603" }, + modelCatalog: { + "stepfun-en/step-3.5-flash-2603": { alias: "StepFun" }, + "stepfun-en/step-3.5-flash": { alias: "StepFun Flash" }, + }, }, }, { @@ -643,8 +696,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -668,11 +721,11 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "aihubmix/claude-opus-4-6", + primary: "aihubmix/claude-opus-4-7", fallbacks: ["aihubmix/claude-sonnet-4-6"], }, modelCatalog: { - "aihubmix/claude-opus-4-6": { alias: "Opus" }, + "aihubmix/claude-opus-4-7": { alias: "Opus" }, "aihubmix/claude-sonnet-4-6": { alias: "Sonnet" }, }, }, @@ -687,8 +740,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -712,11 +765,11 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "dmxapi/claude-opus-4-6", + primary: "dmxapi/claude-opus-4-7", fallbacks: ["dmxapi/claude-sonnet-4-6"], }, modelCatalog: { - "dmxapi/claude-opus-4-6": { alias: "Opus" }, + "dmxapi/claude-opus-4-7": { alias: "Opus" }, "dmxapi/claude-sonnet-4-6": { alias: "Sonnet" }, }, }, @@ -731,8 +784,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "openai-completions", models: [ { - id: "anthropic/claude-opus-4.6", - name: "Claude Opus 4.6", + id: "anthropic/claude-opus-4.7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -756,11 +809,11 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "openrouter/anthropic/claude-opus-4.6", + primary: "openrouter/anthropic/claude-opus-4.7", fallbacks: ["openrouter/anthropic/claude-sonnet-4.6"], }, modelCatalog: { - "openrouter/anthropic/claude-opus-4.6": { alias: "Opus" }, + "openrouter/anthropic/claude-opus-4.7": { alias: "Opus" }, "openrouter/anthropic/claude-sonnet-4.6": { alias: "Sonnet" }, }, }, @@ -1017,8 +1070,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "claude-opus-4-6", + id: "claude-opus-4-7", + name: "claude-opus-4-7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -1047,11 +1100,11 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "pipellm/claude-opus-4-6", + primary: "pipellm/claude-opus-4-7", fallbacks: ["pipellm/claude-sonnet-4-6"], }, modelCatalog: { - "pipellm/claude-opus-4-6": { alias: "Opus" }, + "pipellm/claude-opus-4-7": { alias: "Opus" }, "pipellm/claude-sonnet-4-6": { alias: "Sonnet" }, "pipellm/claude-haiku-4-5-20251001": { alias: "Haiku" }, }, @@ -1069,8 +1122,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -1095,11 +1148,11 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "packycode/claude-opus-4-6", + primary: "packycode/claude-opus-4-7", fallbacks: ["packycode/claude-sonnet-4-6"], }, modelCatalog: { - "packycode/claude-opus-4-6": { alias: "Opus" }, + "packycode/claude-opus-4-7": { alias: "Opus" }, "packycode/claude-sonnet-4-6": { alias: "Sonnet" }, }, }, @@ -1114,8 +1167,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -1141,11 +1194,11 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "cubence/claude-opus-4-6", + primary: "cubence/claude-opus-4-7", fallbacks: ["cubence/claude-sonnet-4-6"], }, modelCatalog: { - "cubence/claude-opus-4-6": { alias: "Opus" }, + "cubence/claude-opus-4-7": { alias: "Opus" }, "cubence/claude-sonnet-4-6": { alias: "Sonnet" }, }, }, @@ -1160,8 +1213,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -1187,11 +1240,11 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "aigocode/claude-opus-4-6", + primary: "aigocode/claude-opus-4-7", fallbacks: ["aigocode/claude-sonnet-4-6"], }, modelCatalog: { - "aigocode/claude-opus-4-6": { alias: "Opus" }, + "aigocode/claude-opus-4-7": { alias: "Opus" }, "aigocode/claude-sonnet-4-6": { alias: "Sonnet" }, }, }, @@ -1206,8 +1259,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -1233,11 +1286,11 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "rightcode/claude-opus-4-6", + primary: "rightcode/claude-opus-4-7", fallbacks: ["rightcode/claude-sonnet-4-6"], }, modelCatalog: { - "rightcode/claude-opus-4-6": { alias: "Opus" }, + "rightcode/claude-opus-4-7": { alias: "Opus" }, "rightcode/claude-sonnet-4-6": { alias: "Sonnet" }, }, }, @@ -1252,8 +1305,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -1279,11 +1332,11 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "aicodemirror/claude-opus-4-6", + primary: "aicodemirror/claude-opus-4-7", fallbacks: ["aicodemirror/claude-sonnet-4-6"], }, modelCatalog: { - "aicodemirror/claude-opus-4-6": { alias: "Opus" }, + "aicodemirror/claude-opus-4-7": { alias: "Opus" }, "aicodemirror/claude-sonnet-4-6": { alias: "Sonnet" }, }, }, @@ -1298,8 +1351,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -1325,11 +1378,11 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "aicoding/claude-opus-4-6", + primary: "aicoding/claude-opus-4-7", fallbacks: ["aicoding/claude-sonnet-4-6"], }, modelCatalog: { - "aicoding/claude-opus-4-6": { alias: "Opus" }, + "aicoding/claude-opus-4-7": { alias: "Opus" }, "aicoding/claude-sonnet-4-6": { alias: "Sonnet" }, }, }, @@ -1344,8 +1397,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -1371,11 +1424,11 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "crazyrouter/claude-opus-4-6", + primary: "crazyrouter/claude-opus-4-7", fallbacks: ["crazyrouter/claude-sonnet-4-6"], }, modelCatalog: { - "crazyrouter/claude-opus-4-6": { alias: "Opus" }, + "crazyrouter/claude-opus-4-7": { alias: "Opus" }, "crazyrouter/claude-sonnet-4-6": { alias: "Sonnet" }, }, }, @@ -1390,8 +1443,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -1417,11 +1470,11 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "sssaicode/claude-opus-4-6", + primary: "sssaicode/claude-opus-4-7", fallbacks: ["sssaicode/claude-sonnet-4-6"], }, modelCatalog: { - "sssaicode/claude-opus-4-6": { alias: "Opus" }, + "sssaicode/claude-opus-4-7": { alias: "Opus" }, "sssaicode/claude-sonnet-4-6": { alias: "Sonnet" }, }, }, @@ -1438,8 +1491,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -1459,10 +1512,50 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "compshare/claude-opus-4-6", + primary: "compshare/claude-opus-4-7", }, modelCatalog: { - "compshare/claude-opus-4-6": { alias: "Opus" }, + "compshare/claude-opus-4-7": { alias: "Opus" }, + }, + }, + }, + { + name: "Compshare Coding Plan", + nameKey: "providerForm.presets.ucloudCoding", + websiteUrl: "https://www.compshare.cn", + apiKeyUrl: + "https://www.compshare.cn/coding-plan?ytag=GPU_YY_YX_git_cc-switch", + settingsConfig: { + baseUrl: "https://cp.compshare.cn/v1", + apiKey: "", + api: "anthropic-messages", + models: [ + { + id: "claude-opus-4-7", + name: "Claude Opus 4.7", + contextWindow: 1000000, + cost: { input: 5, output: 25 }, + }, + ], + }, + category: "aggregator", + isPartner: true, // 合作伙伴 + partnerPromotionKey: "ucloud", // 促销信息 i18n key（复用） + icon: "ucloud", + iconColor: "#000000", + templateValues: { + apiKey: { + label: "API Key", + placeholder: "", + editorValue: "", + }, + }, + suggestedDefaults: { + model: { + primary: "compshare-coding/claude-opus-4-7", + }, + modelCatalog: { + "compshare-coding/claude-opus-4-7": { alias: "Opus" }, }, }, }, @@ -1476,8 +1569,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -1497,10 +1590,10 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "micu/claude-opus-4-6", + primary: "micu/claude-opus-4-7", }, modelCatalog: { - "micu/claude-opus-4-6": { alias: "Opus" }, + "micu/claude-opus-4-7": { alias: "Opus" }, }, }, }, @@ -1514,8 +1607,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -1535,10 +1628,10 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "ctok/claude-opus-4-6", + primary: "ctok/claude-opus-4-7", }, modelCatalog: { - "ctok/claude-opus-4-6": { alias: "Opus" }, + "ctok/claude-opus-4-7": { alias: "Opus" }, }, }, }, @@ -1551,8 +1644,8 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "anthropic-messages", models: [ { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, cost: { input: 5, output: 25 }, }, @@ -1577,11 +1670,11 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, suggestedDefaults: { model: { - primary: "lionccapi/claude-opus-4-6", + primary: "lionccapi/claude-opus-4-7", fallbacks: ["lionccapi/claude-sonnet-4-6"], }, modelCatalog: { - "lionccapi/claude-opus-4-6": { alias: "Opus" }, + "lionccapi/claude-opus-4-7": { alias: "Opus" }, "lionccapi/claude-sonnet-4-6": { alias: "Sonnet" }, }, }, @@ -1648,6 +1741,42 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ }, }, }, + { + name: "LemonData", + websiteUrl: "https://lemondata.cc", + apiKeyUrl: "https://lemondata.cc/r/FFX1ZDUP", + settingsConfig: { + baseUrl: "https://api.lemondata.cc/v1", + apiKey: "", + api: "openai-completions", + models: [ + { + id: "gpt-5.4", + name: "GPT-5.4", + contextWindow: 400000, + }, + ], + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "lemondata", + icon: "lemondata", + templateValues: { + apiKey: { + label: "API Key", + placeholder: "", + editorValue: "", + }, + }, + suggestedDefaults: { + model: { + primary: "lemondata/gpt-5.4", + }, + modelCatalog: { + "lemondata/gpt-5.4": { alias: "GPT-5.4" }, + }, + }, + }, // ========== Cloud Providers ========== { name: "AWS Bedrock", @@ -1659,10 +1788,10 @@ export const openclawProviderPresets: OpenClawProviderPreset[] = [ api: "bedrock-converse-stream", models: [ { - id: "anthropic.claude-opus-4-6-20250514-v1:0", - name: "Claude Opus 4.6", + id: "anthropic.claude-opus-4-7", + name: "Claude Opus 4.7", contextWindow: 1000000, - cost: { input: 15, output: 75, cacheRead: 1.5, cacheWrite: 18.75 }, + cost: { input: 5, output: 25, cacheRead: 0.5, cacheWrite: 6.25 }, }, { id: "anthropic.claude-sonnet-4-6", diff --git a/src/config/opencodeProviderPresets.ts b/src/config/opencodeProviderPresets.ts index f52080f6c..74dc18644 100644 --- a/src/config/opencodeProviderPresets.ts +++ b/src/config/opencodeProviderPresets.ts @@ -56,12 +56,17 @@ export const OPENCODE_PRESET_MODEL_VARIANTS: Record< modalities: { input: ["text"], output: ["text"] }, }, { - id: "kimi-k2.5", - name: "Kimi K2.5", + id: "kimi-k2.6", + name: "Kimi K2.6", contextLimit: 262144, outputLimit: 262144, modalities: { input: ["text", "image", "video"], output: ["text"] }, }, + { + id: "step-3.5-flash-2603", + name: "Step 3.5 Flash 2603", + contextLimit: 262144, + }, { id: "step-3.5-flash", name: "Step 3.5 Flash", @@ -161,8 +166,8 @@ export const OPENCODE_PRESET_MODEL_VARIANTS: Record< ], "@ai-sdk/amazon-bedrock": [ { - id: "global.anthropic.claude-opus-4-6-v1", - name: "Claude Opus 4.6", + id: "global.anthropic.claude-opus-4-7", + name: "Claude Opus 4.7", contextLimit: 1000000, outputLimit: 128000, modalities: { input: ["text", "image", "pdf"], output: ["text"] }, @@ -229,8 +234,8 @@ export const OPENCODE_PRESET_MODEL_VARIANTS: Record< }, }, { - id: "claude-opus-4-6", - name: "Claude Opus 4.6", + id: "claude-opus-4-7", + name: "Claude Opus 4.7", contextLimit: 1000000, outputLimit: 128000, modalities: { input: ["text", "image", "pdf"], output: ["text"] }, @@ -305,7 +310,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ setCacheKey: true, }, models: { - "claude-opus-4-6": { name: "Claude Opus 4.6" }, + "claude-opus-4-7": { name: "Claude Opus 4.7" }, "claude-sonnet-4-6": { name: "Claude Sonnet 4.6" }, }, }, @@ -333,8 +338,8 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ setCacheKey: true, }, models: { - "deepseek-chat": { name: "DeepSeek V3.2" }, - "deepseek-reasoner": { name: "DeepSeek R1" }, + "deepseek-v4-pro": { name: "DeepSeek V4 Pro" }, + "deepseek-v4-flash": { name: "DeepSeek V4 Flash" }, }, }, category: "cn_official", @@ -446,19 +451,19 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ }, }, { - name: "Kimi k2.5", + name: "Kimi k2.6", websiteUrl: "https://platform.moonshot.cn/console", apiKeyUrl: "https://platform.moonshot.cn/console/api-keys", settingsConfig: { npm: "@ai-sdk/openai-compatible", - name: "Kimi k2.5", + name: "Kimi k2.6", options: { baseURL: "https://api.moonshot.cn/v1", apiKey: "", setCacheKey: true, }, models: { - "kimi-k2.5": { name: "Kimi K2.5" }, + "kimi-k2.6": { name: "Kimi K2.6" }, }, }, category: "cn_official", @@ -480,7 +485,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ }, { name: "Kimi For Coding", - websiteUrl: "https://www.kimi.com/coding/docs/", + websiteUrl: "https://www.kimi.com/code/docs/", apiKeyUrl: "https://platform.moonshot.cn/console/api-keys", settingsConfig: { npm: "@ai-sdk/anthropic", @@ -513,28 +518,62 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ }, { name: "StepFun", - websiteUrl: "https://platform.stepfun.ai", - apiKeyUrl: "https://platform.stepfun.ai/interface-key", + websiteUrl: "https://platform.stepfun.com/step-plan", + apiKeyUrl: "https://platform.stepfun.com/interface-key", settingsConfig: { npm: "@ai-sdk/openai-compatible", name: "StepFun", options: { - baseURL: "https://api.stepfun.ai/v1", + baseURL: "https://api.stepfun.com/step_plan/v1", apiKey: "", setCacheKey: true, }, models: { + "step-3.5-flash-2603": { name: "Step 3.5 Flash 2603" }, "step-3.5-flash": { name: "Step 3.5 Flash" }, }, }, category: "cn_official", icon: "stepfun", - iconColor: "#005AFF", + iconColor: "#16D6D2", templateValues: { baseURL: { label: "Base URL", - placeholder: "https://api.stepfun.ai/v1", - defaultValue: "https://api.stepfun.ai/v1", + placeholder: "https://api.stepfun.com/step_plan/v1", + defaultValue: "https://api.stepfun.com/step_plan/v1", + editorValue: "", + }, + apiKey: { + label: "API Key", + placeholder: "step-...", + editorValue: "", + }, + }, + }, + { + name: "StepFun en", + websiteUrl: "https://platform.stepfun.ai/step-plan", + apiKeyUrl: "https://platform.stepfun.ai/interface-key", + settingsConfig: { + npm: "@ai-sdk/openai-compatible", + name: "StepFun en", + options: { + baseURL: "https://api.stepfun.ai/step_plan/v1", + apiKey: "", + }, + models: { + "step-3.5-flash-2603": { name: "Step 3.5 Flash 2603" }, + "step-3.5-flash": { name: "Step 3.5 Flash" }, + }, + }, + category: "cn_official", + icon: "stepfun", + iconColor: "#16D6D2", + templateValues: { + baseURL: { + label: "Base URL", + placeholder: "https://api.stepfun.ai/step_plan/v1", + defaultValue: "https://api.stepfun.ai/step_plan/v1", editorValue: "", }, apiKey: { @@ -839,7 +878,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ }, models: { "claude-sonnet-4-6": { name: "Claude Sonnet 4.6" }, - "claude-opus-4-6": { name: "Claude Opus 4.6" }, + "claude-opus-4-7": { name: "Claude Opus 4.7" }, }, }, category: "aggregator", @@ -867,7 +906,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ }, models: { "claude-sonnet-4-6": { name: "Claude Sonnet 4.6" }, - "claude-opus-4-6": { name: "Claude Opus 4.6" }, + "claude-opus-4-7": { name: "Claude Opus 4.7" }, }, }, category: "aggregator", @@ -895,7 +934,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ }, models: { "anthropic/claude-sonnet-4.6": { name: "Claude Sonnet 4.6" }, - "anthropic/claude-opus-4.6": { name: "Claude Opus 4.6" }, + "anthropic/claude-opus-4.7": { name: "Claude Opus 4.7" }, }, }, category: "aggregator", @@ -1007,7 +1046,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ setCacheKey: true, }, models: { - "claude-opus-4-6": { name: "claude-opus-4-6" }, + "claude-opus-4-7": { name: "claude-opus-4-7" }, "claude-sonnet-4-6": { name: "claude-sonnet-4-6" }, "claude-haiku-4-5-20251001": { name: "claude-haiku-4-5-20251001" }, }, @@ -1037,7 +1076,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ }, models: { "claude-sonnet-4-6": { name: "Claude Sonnet 4.6" }, - "claude-opus-4-6": { name: "Claude Opus 4.6" }, + "claude-opus-4-7": { name: "Claude Opus 4.7" }, }, }, category: "third_party", @@ -1066,7 +1105,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ }, models: { "claude-sonnet-4-6": { name: "Claude Sonnet 4.6" }, - "claude-opus-4-6": { name: "Claude Opus 4.6" }, + "claude-opus-4-7": { name: "Claude Opus 4.7" }, }, }, category: "third_party", @@ -1096,7 +1135,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ }, models: { "claude-sonnet-4-6": { name: "Claude Sonnet 4.6" }, - "claude-opus-4-6": { name: "Claude Opus 4.6" }, + "claude-opus-4-7": { name: "Claude Opus 4.7" }, }, }, category: "third_party", @@ -1155,7 +1194,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ }, models: { "claude-sonnet-4.6": { name: "Claude Sonnet 4.6" }, - "claude-opus-4.6": { name: "Claude Opus 4.6" }, + "claude-opus-4.7": { name: "Claude Opus 4.7" }, }, }, category: "third_party", @@ -1185,7 +1224,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ }, models: { "claude-sonnet-4-6": { name: "Claude Sonnet 4.6" }, - "claude-opus-4-6": { name: "Claude Opus 4.6" }, + "claude-opus-4-7": { name: "Claude Opus 4.7" }, }, }, category: "third_party", @@ -1215,7 +1254,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ }, models: { "claude-sonnet-4-6": { name: "Claude Sonnet 4.6" }, - "claude-opus-4-6": { name: "Claude Opus 4.6" }, + "claude-opus-4-7": { name: "Claude Opus 4.7" }, }, }, category: "third_party", @@ -1245,7 +1284,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ }, models: { "claude-sonnet-4-6": { name: "Claude Sonnet 4.6" }, - "claude-opus-4-6": { name: "Claude Opus 4.6" }, + "claude-opus-4-7": { name: "Claude Opus 4.7" }, }, }, category: "third_party", @@ -1274,7 +1313,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ setCacheKey: true, }, models: { - "claude-opus-4-6": { name: "Claude Opus 4.6" }, + "claude-opus-4-7": { name: "Claude Opus 4.7" }, "claude-sonnet-4-6": { name: "Claude Sonnet 4.6" }, }, }, @@ -1304,7 +1343,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ setCacheKey: true, }, models: { - "claude-opus-4-6": { name: "Claude Opus 4.6" }, + "claude-opus-4-7": { name: "Claude Opus 4.7" }, "claude-sonnet-4-6": { name: "Claude Sonnet 4.6" }, }, }, @@ -1333,7 +1372,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ setCacheKey: true, }, models: { - "claude-opus-4-6": { name: "Claude Opus 4.6" }, + "claude-opus-4-7": { name: "Claude Opus 4.7" }, "claude-sonnet-4-6": { name: "Claude Sonnet 4.6" }, }, }, @@ -1379,6 +1418,34 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ }, }, }, + { + name: "LemonData", + websiteUrl: "https://lemondata.cc", + apiKeyUrl: "https://lemondata.cc/r/FFX1ZDUP", + settingsConfig: { + npm: "@ai-sdk/openai-compatible", + name: "LemonData", + options: { + baseURL: "https://api.lemondata.cc/v1", + apiKey: "", + setCacheKey: true, + }, + models: { + "gpt-5.4": { name: "GPT-5.4" }, + }, + }, + category: "third_party", + isPartner: true, + partnerPromotionKey: "lemondata", + icon: "lemondata", + templateValues: { + apiKey: { + label: "API Key", + placeholder: "", + editorValue: "", + }, + }, + }, { name: "AWS Bedrock", websiteUrl: "https://aws.amazon.com/bedrock/", @@ -1392,7 +1459,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [ setCacheKey: true, }, models: { - "global.anthropic.claude-opus-4-6-v1": { name: "Claude Opus 4.6" }, + "global.anthropic.claude-opus-4-7": { name: "Claude Opus 4.7" }, "global.anthropic.claude-sonnet-4-6": { name: "Claude Sonnet 4.6", }, diff --git a/src/config/universalProviderPresets.ts b/src/config/universalProviderPresets.ts index 1f829308d..e99e506f9 100644 --- a/src/config/universalProviderPresets.ts +++ b/src/config/universalProviderPresets.ts @@ -40,17 +40,17 @@ export interface UniversalProviderPreset { */ const NEWAPI_DEFAULT_MODELS: UniversalProviderModels = { claude: { - model: "claude-sonnet-4-20250514", - haikuModel: "claude-haiku-4-20250514", - sonnetModel: "claude-sonnet-4-20250514", - opusModel: "claude-sonnet-4-20250514", + model: "claude-sonnet-4-6", + haikuModel: "claude-haiku-4-5-20251001", + sonnetModel: "claude-sonnet-4-6", + opusModel: "claude-opus-4-7", }, codex: { model: "gpt-5.4", reasoningEffort: "high", }, gemini: { - model: "gemini-2.5-pro", + model: "gemini-3.1-pro", }, }; diff --git a/src/hooks/useAutoCompact.ts b/src/hooks/useAutoCompact.ts index 3ba8abe5f..b5b7bca39 100644 --- a/src/hooks/useAutoCompact.ts +++ b/src/hooks/useAutoCompact.ts @@ -25,10 +25,13 @@ export function useAutoCompact( if (Date.now() < lockUntilRef.current) return; if (!compact) { - // Cache the total content width in normal mode - normalWidthRef.current = el.scrollWidth; // Overflow detected → switch to compact if (el.scrollWidth > el.clientWidth + 1) { + // Cache only at the overflow edge: when content fits, + // scrollWidth === clientWidth (DOM spec), so caching unconditionally + // would pollute normalWidthRef with the container width (e.g. after + // maximizing), making the expand threshold unreachable. + normalWidthRef.current = el.scrollWidth; setCompact(true); } } else if (normalWidthRef.current > 0) { diff --git a/src/hooks/useDarkMode.ts b/src/hooks/useDarkMode.ts new file mode 100644 index 000000000..a3db69c5f --- /dev/null +++ b/src/hooks/useDarkMode.ts @@ -0,0 +1,29 @@ +import { useEffect, useState } from "react"; + +/** + * Subscribe to the presence of `class="dark"` on ``. The theme-provider + * toggles this class whenever the effective theme changes (including when the + * OS changes theme while the app is in "system" mode), so observing the class + * is the simplest way to drive components that need a boolean `darkMode` prop + * (e.g. CodeMirror-based editors that don't consume the theme context). + */ +export function useDarkMode(): boolean { + const [isDark, setIsDark] = useState(() => + typeof document !== "undefined" + ? document.documentElement.classList.contains("dark") + : false, + ); + + useEffect(() => { + const observer = new MutationObserver(() => { + setIsDark(document.documentElement.classList.contains("dark")); + }); + observer.observe(document.documentElement, { + attributes: true, + attributeFilter: ["class"], + }); + return () => observer.disconnect(); + }, []); + + return isDark; +} diff --git a/src/hooks/useDirectorySettings.ts b/src/hooks/useDirectorySettings.ts index 51a28dc4a..70347328a 100644 --- a/src/hooks/useDirectorySettings.ts +++ b/src/hooks/useDirectorySettings.ts @@ -5,13 +5,15 @@ import { homeDir, join } from "@tauri-apps/api/path"; import { settingsApi, type AppId } from "@/lib/api"; import type { SettingsFormState } from "./useSettingsForm"; -type DirectoryKey = - | "appConfig" +export type DirectoryAppId = Exclude; +type AppDirectoryKey = | "claude" | "codex" | "gemini" | "opencode" - | "openclaw"; + | "openclaw" + | "hermes"; +type DirectoryKey = "appConfig" | AppDirectoryKey; export interface ResolvedDirectories { appConfig: string; @@ -20,8 +22,34 @@ export interface ResolvedDirectories { gemini: string; opencode: string; openclaw: string; + hermes: string; } +// Single source of truth for per-app directory metadata. +const APP_DIRECTORY_META: Record< + DirectoryAppId, + { key: AppDirectoryKey; defaultFolder: string } +> = { + claude: { key: "claude", defaultFolder: ".claude" }, + codex: { key: "codex", defaultFolder: ".codex" }, + gemini: { key: "gemini", defaultFolder: ".gemini" }, + opencode: { key: "opencode", defaultFolder: ".config/opencode" }, + openclaw: { key: "openclaw", defaultFolder: ".openclaw" }, + hermes: { key: "hermes", defaultFolder: ".hermes" }, +}; + +const DIRECTORY_KEY_TO_SETTINGS_FIELD: Record< + AppDirectoryKey, + keyof SettingsFormState +> = { + claude: "claudeConfigDir", + codex: "codexConfigDir", + gemini: "geminiConfigDir", + opencode: "opencodeConfigDir", + openclaw: "openclawConfigDir", + hermes: "hermesConfigDir", +}; + const sanitizeDir = (value?: string | null): string | undefined => { if (!value) return undefined; const trimmed = value.trim(); @@ -42,21 +70,11 @@ const computeDefaultAppConfigDir = async (): Promise => { }; const computeDefaultConfigDir = async ( - app: AppId, + app: DirectoryAppId, ): Promise => { try { const home = await homeDir(); - const folder = - app === "claude" - ? ".claude" - : app === "codex" - ? ".codex" - : app === "gemini" - ? ".gemini" - : app === "opencode" - ? ".config/opencode" - : ".openclaw"; - return await join(home, folder); + return await join(home, APP_DIRECTORY_META[app].defaultFolder); } catch (error) { console.error( "[useDirectorySettings] Failed to resolve default config dir", @@ -76,21 +94,19 @@ export interface UseDirectorySettingsResult { resolvedDirs: ResolvedDirectories; isLoading: boolean; initialAppConfigDir?: string; - updateDirectory: (app: AppId, value?: string) => void; + updateDirectory: (app: DirectoryAppId, value?: string) => void; updateAppConfigDir: (value?: string) => void; - browseDirectory: (app: AppId) => Promise; + browseDirectory: (app: DirectoryAppId) => Promise; browseAppConfigDir: () => Promise; - resetDirectory: (app: AppId) => Promise; + resetDirectory: (app: DirectoryAppId) => Promise; resetAppConfigDir: () => Promise; - resetAllDirectories: ( - claudeDir?: string, - codexDir?: string, - geminiDir?: string, - opencodeDir?: string, - openclawDir?: string, - ) => void; + resetAllDirectories: (overrides?: ResolvedAppDirectoryOverrides) => void; } +export type ResolvedAppDirectoryOverrides = Partial< + Record +>; + /** * useDirectorySettings - 目录管理 * 负责： @@ -116,6 +132,7 @@ export function useDirectorySettings({ gemini: "", opencode: "", openclaw: "", + hermes: "", }); const [isLoading, setIsLoading] = useState(true); @@ -126,6 +143,7 @@ export function useDirectorySettings({ gemini: "", opencode: "", openclaw: "", + hermes: "", }); const initialAppConfigDirRef = useRef(undefined); @@ -143,12 +161,14 @@ export function useDirectorySettings({ geminiDir, opencodeDir, openclawDir, + hermesDir, defaultAppConfig, defaultClaudeDir, defaultCodexDir, defaultGeminiDir, defaultOpencodeDir, defaultOpenclawDir, + defaultHermesDir, ] = await Promise.all([ settingsApi.getAppConfigDirOverride(), settingsApi.getConfigDir("claude"), @@ -156,12 +176,14 @@ export function useDirectorySettings({ settingsApi.getConfigDir("gemini"), settingsApi.getConfigDir("opencode"), settingsApi.getConfigDir("openclaw"), + settingsApi.getConfigDir("hermes"), computeDefaultAppConfigDir(), computeDefaultConfigDir("claude"), computeDefaultConfigDir("codex"), computeDefaultConfigDir("gemini"), computeDefaultConfigDir("opencode"), computeDefaultConfigDir("openclaw"), + computeDefaultConfigDir("hermes"), ]); if (!active) return; @@ -175,6 +197,7 @@ export function useDirectorySettings({ gemini: defaultGeminiDir ?? "", opencode: defaultOpencodeDir ?? "", openclaw: defaultOpenclawDir ?? "", + hermes: defaultHermesDir ?? "", }; setAppConfigDir(normalizedOverride); @@ -187,6 +210,7 @@ export function useDirectorySettings({ gemini: geminiDir || defaultsRef.current.gemini, opencode: opencodeDir || defaultsRef.current.opencode, openclaw: openclawDir || defaultsRef.current.openclaw, + hermes: hermesDir || defaultsRef.current.hermes, }); } catch (error) { console.error( @@ -212,23 +236,18 @@ export function useDirectorySettings({ if (key === "appConfig") { setAppConfigDir(sanitized); } else { - onUpdateSettings( - key === "claude" - ? { claudeConfigDir: sanitized } - : key === "codex" - ? { codexConfigDir: sanitized } - : key === "gemini" - ? { geminiConfigDir: sanitized } - : key === "opencode" - ? { opencodeConfigDir: sanitized } - : { openclawConfigDir: sanitized }, - ); + onUpdateSettings({ + [DIRECTORY_KEY_TO_SETTINGS_FIELD[key]]: sanitized, + }); } - setResolvedDirs((prev) => ({ - ...prev, - [key]: sanitized ?? defaultsRef.current[key], - })); + setResolvedDirs((prev) => { + const next = sanitized ?? defaultsRef.current[key]; + // Same-ref early-return: unchanged value shouldn't cascade renders + // through the settings tree. + if (prev[key] === next) return prev; + return { ...prev, [key]: next }; + }); }, [onUpdateSettings], ); @@ -241,45 +260,18 @@ export function useDirectorySettings({ ); const updateDirectory = useCallback( - (app: AppId, value?: string) => { - updateDirectoryState( - app === "claude" - ? "claude" - : app === "codex" - ? "codex" - : app === "gemini" - ? "gemini" - : app === "opencode" - ? "opencode" - : "openclaw", - value, - ); + (app: DirectoryAppId, value?: string) => { + updateDirectoryState(APP_DIRECTORY_META[app].key, value); }, [updateDirectoryState], ); const browseDirectory = useCallback( - async (app: AppId) => { - const key: DirectoryKey = - app === "claude" - ? "claude" - : app === "codex" - ? "codex" - : app === "gemini" - ? "gemini" - : app === "opencode" - ? "opencode" - : "openclaw"; + async (app: DirectoryAppId) => { + const key = APP_DIRECTORY_META[app].key; + const settingsField = DIRECTORY_KEY_TO_SETTINGS_FIELD[key]; const currentValue = - key === "claude" - ? (settings?.claudeConfigDir ?? resolvedDirs.claude) - : key === "codex" - ? (settings?.codexConfigDir ?? resolvedDirs.codex) - : key === "gemini" - ? (settings?.geminiConfigDir ?? resolvedDirs.gemini) - : key === "opencode" - ? (settings?.opencodeConfigDir ?? resolvedDirs.opencode) - : (settings?.openclawConfigDir ?? resolvedDirs.openclaw); + (settings?.[settingsField] as string | undefined) ?? resolvedDirs[key]; try { const picked = await settingsApi.selectConfigDirectory(currentValue); @@ -319,17 +311,8 @@ export function useDirectorySettings({ }, [appConfigDir, resolvedDirs.appConfig, t, updateDirectoryState]); const resetDirectory = useCallback( - async (app: AppId) => { - const key: DirectoryKey = - app === "claude" - ? "claude" - : app === "codex" - ? "codex" - : app === "gemini" - ? "gemini" - : app === "opencode" - ? "opencode" - : "openclaw"; + async (app: DirectoryAppId) => { + const key = APP_DIRECTORY_META[app].key; if (!defaultsRef.current[key]) { const fallback = await computeDefaultConfigDir(app); if (fallback) { @@ -358,22 +341,17 @@ export function useDirectorySettings({ }, [updateDirectoryState]); const resetAllDirectories = useCallback( - ( - claudeDir?: string, - codexDir?: string, - geminiDir?: string, - opencodeDir?: string, - openclawDir?: string, - ) => { + (overrides?: ResolvedAppDirectoryOverrides) => { setAppConfigDir(initialAppConfigDirRef.current); setResolvedDirs({ appConfig: initialAppConfigDirRef.current ?? defaultsRef.current.appConfig, - claude: claudeDir ?? defaultsRef.current.claude, - codex: codexDir ?? defaultsRef.current.codex, - gemini: geminiDir ?? defaultsRef.current.gemini, - opencode: opencodeDir ?? defaultsRef.current.opencode, - openclaw: openclawDir ?? defaultsRef.current.openclaw, + claude: overrides?.claude ?? defaultsRef.current.claude, + codex: overrides?.codex ?? defaultsRef.current.codex, + gemini: overrides?.gemini ?? defaultsRef.current.gemini, + opencode: overrides?.opencode ?? defaultsRef.current.opencode, + openclaw: overrides?.openclaw ?? defaultsRef.current.openclaw, + hermes: overrides?.hermes ?? defaultsRef.current.hermes, }); }, [], diff --git a/src/hooks/useHermes.ts b/src/hooks/useHermes.ts new file mode 100644 index 000000000..74bacf0ca --- /dev/null +++ b/src/hooks/useHermes.ts @@ -0,0 +1,174 @@ +import { useCallback } from "react"; +import { + useMutation, + useQuery, + useQueryClient, + type QueryClient, +} from "@tanstack/react-query"; +import { useTranslation } from "react-i18next"; +import { toast } from "sonner"; +import { hermesApi } from "@/lib/api/hermes"; +import { providersApi } from "@/lib/api/providers"; +import type { HermesMemoryKind } from "@/types"; +import { extractErrorMessage } from "@/utils/errorUtils"; + +/** + * Error code returned by the Rust `open_hermes_web_ui` command when probing + * `/api/status` fails. Must match the string constant in + * `src-tauri/src/commands/hermes.rs`. + */ +export const HERMES_WEB_OFFLINE_ERROR = "hermes_web_offline"; + +/** + * Centralized query keys for all Hermes-related queries. + * Import this from any file that needs to invalidate Hermes caches. + */ +export const hermesKeys = { + all: ["hermes"] as const, + liveProviderIds: ["hermes", "liveProviderIds"] as const, + modelConfig: ["hermes", "modelConfig"] as const, + memory: (kind: HermesMemoryKind) => ["hermes", "memory", kind] as const, + memoryLimits: ["hermes", "memoryLimits"] as const, +}; + +/** + * Invalidate all Hermes caches that may change when a provider is + * added/updated/deleted/switched. Runs invalidations in parallel so the + * caller doesn't await three sequential refetches. + */ +export function invalidateHermesProviderCaches(queryClient: QueryClient) { + return Promise.all([ + queryClient.invalidateQueries({ queryKey: hermesKeys.liveProviderIds }), + queryClient.invalidateQueries({ queryKey: hermesKeys.modelConfig }), + ]); +} + +// ============================================================ +// Query hooks +// ============================================================ + +export function useHermesLiveProviderIds(enabled: boolean) { + return useQuery({ + queryKey: hermesKeys.liveProviderIds, + queryFn: () => providersApi.getHermesLiveProviderIds(), + enabled, + }); +} + +export function useHermesModelConfig(enabled: boolean) { + return useQuery({ + queryKey: hermesKeys.modelConfig, + queryFn: () => hermesApi.getModelConfig(), + enabled, + }); +} + +export function useHermesMemory(kind: HermesMemoryKind, enabled: boolean) { + return useQuery({ + queryKey: hermesKeys.memory(kind), + queryFn: () => hermesApi.getMemory(kind), + enabled, + }); +} + +export function useHermesMemoryLimits(enabled: boolean) { + return useQuery({ + queryKey: hermesKeys.memoryLimits, + queryFn: () => hermesApi.getMemoryLimits(), + staleTime: 60_000, + enabled, + }); +} + +// ============================================================ +// Mutation hooks +// ============================================================ + +/** + * Save a Hermes memory file atomically and refresh the corresponding query. + * Error toasts are emitted here so caller components don't need their own + * try/catch; success toasts are intentionally left to the caller (to pick + * the right localized message per tab). + */ +export function useSaveHermesMemory() { + const queryClient = useQueryClient(); + const { t } = useTranslation(); + return useMutation({ + mutationFn: ({ + kind, + content, + }: { + kind: HermesMemoryKind; + content: string; + }) => hermesApi.setMemory(kind, content), + onSuccess: async (_data, variables) => { + await queryClient.invalidateQueries({ + queryKey: hermesKeys.memory(variables.kind), + }); + }, + onError: (error) => { + toast.error(t("hermes.memory.saveFailed"), { + description: extractErrorMessage(error) || undefined, + }); + }, + }); +} + +/** + * Toggle one memory blob's on/off flag in Hermes' `config.yaml`. Invalidates + * the limits query so the switch UI and disabled banner update immediately. + */ +export function useToggleHermesMemoryEnabled() { + const queryClient = useQueryClient(); + const { t } = useTranslation(); + return useMutation({ + mutationFn: ({ + kind, + enabled, + }: { + kind: HermesMemoryKind; + enabled: boolean; + }) => hermesApi.setMemoryEnabled(kind, enabled), + onSuccess: async () => { + await queryClient.invalidateQueries({ + queryKey: hermesKeys.memoryLimits, + }); + }, + onError: (error) => { + toast.error(t("hermes.memory.toggleFailed"), { + description: extractErrorMessage(error) || undefined, + }); + }, + }); +} + +/** + * Returns a handler that probes the local Hermes Web UI, opens it in the + * system browser, and surfaces a localized toast on failure. When + * `onOffline` is provided, it replaces the default offline toast — + * callers can use this to open a launch-dashboard confirm dialog instead. + */ +export function useOpenHermesWebUI(onOffline?: () => void) { + const { t } = useTranslation(); + return useCallback( + async (path?: string) => { + try { + await hermesApi.openWebUI(path); + } catch (error) { + const detail = extractErrorMessage(error); + if (detail === HERMES_WEB_OFFLINE_ERROR) { + if (onOffline) { + onOffline(); + } else { + toast.error(t("hermes.webui.offline")); + } + } else { + toast.error(t("hermes.webui.openFailed"), { + description: detail || undefined, + }); + } + } + }, + [t, onOffline], + ); +} diff --git a/src/hooks/useProviderActions.ts b/src/hooks/useProviderActions.ts index 64b2edf1c..295609f06 100644 --- a/src/hooks/useProviderActions.ts +++ b/src/hooks/useProviderActions.ts @@ -10,6 +10,7 @@ import type { OpenClawDefaultModel, } from "@/types"; import type { OpenClawSuggestedDefaults } from "@/config/openclawProviderPresets"; +import { injectCodingPlanUsageScript } from "@/config/codingPlanProviders"; import { useAddProviderMutation, useUpdateProviderMutation, @@ -72,7 +73,8 @@ export function useProviderActions( addToLive?: boolean; }, ) => { - await addProviderMutation.mutateAsync(provider); + const enhanced = injectCodingPlanUsageScript(activeApp, provider); + await addProviderMutation.mutateAsync(enhanced); // OpenClaw: register models to allowlist after adding provider if (activeApp === "openclaw" && provider.suggestedDefaults) { @@ -169,6 +171,13 @@ export function useProviderActions( proxyRequiredReason = t("notifications.proxyReasonOpenAIResponses", { defaultValue: "使用 OpenAI Responses 接口格式", }); + } else if ( + activeApp === "claude-desktop" && + provider.meta?.claudeDesktopMode === "proxy" + ) { + proxyRequiredReason = t("notifications.proxyReasonClaudeDesktop", { + defaultValue: "使用 Claude Desktop 本地路由模式", + }); } else if ( provider.meta?.isFullUrl && (activeApp === "claude" || activeApp === "codex") @@ -218,16 +227,21 @@ export function useProviderActions( // 若已弹过 proxyRequired 警告则不再弹 success if (!proxyRequiredReason) { - // OpenCode/OpenClaw: show "added to config" message instead of "switched" - const isMultiProviderApp = - activeApp === "opencode" || activeApp === "openclaw"; - const messageKey = isMultiProviderApp - ? "notifications.addToConfigSuccess" - : "notifications.switchSuccess"; - const defaultMessage = isMultiProviderApp - ? "已添加到配置" - : "切换成功！"; - + let messageKey = "notifications.switchSuccess"; + let defaultMessage = "切换成功！"; + if (activeApp === "claude-desktop") { + if (provider.meta?.claudeDesktopMode === "proxy") { + messageKey = "notifications.claudeDesktopProxyRestartRequired"; + defaultMessage = + "切换成功，请保持 CC Switch 运行，并重启 Claude Desktop 后生效"; + } else { + messageKey = "notifications.claudeDesktopRestartRequired"; + defaultMessage = "切换成功，重启 Claude Desktop 后生效"; + } + } else if (activeApp === "opencode" || activeApp === "openclaw") { + messageKey = "notifications.addToConfigSuccess"; + defaultMessage = "已添加到配置"; + } toast.success(t(messageKey, { defaultValue: defaultMessage }), { closeButton: true, }); diff --git a/src/hooks/useProxyStatus.ts b/src/hooks/useProxyStatus.ts index aa6d4a08e..072c9b884 100644 --- a/src/hooks/useProxyStatus.ts +++ b/src/hooks/useProxyStatus.ts @@ -57,12 +57,38 @@ export function useProxyStatus() { t("common.unknown", { defaultValue: "未知错误" }); toast.error( t("proxy.server.startFailed", { + detail, defaultValue: `启动代理服务失败: ${detail}`, }), ); }, }); + // 停止服务器（仅停止服务，不改写/恢复其它应用接管状态） + const stopProxyServerMutation = useMutation({ + mutationFn: () => invoke("stop_proxy_server"), + onSuccess: () => { + toast.success( + t("proxy.server.stopped", { + defaultValue: "代理服务已停止", + }), + { closeButton: true }, + ); + queryClient.invalidateQueries({ queryKey: ["proxyStatus"] }); + }, + onError: (error: Error) => { + const detail = + extractErrorMessage(error) || + t("common.unknown", { defaultValue: "未知错误" }); + toast.error( + t("proxy.server.stopFailed", { + detail, + defaultValue: `停止代理服务失败: ${detail}`, + }), + ); + }, + }); + // 停止服务器（总开关关闭：强制恢复所有已接管的 Live 配置） const stopWithRestoreMutation = useMutation({ mutationFn: () => invoke("stop_proxy_with_restore"), @@ -87,6 +113,7 @@ export function useProxyStatus() { t("common.unknown", { defaultValue: "未知错误" }); toast.error( t("proxy.stopWithRestoreFailed", { + detail, defaultValue: `停止失败: ${detail}`, }), ); @@ -129,6 +156,7 @@ export function useProxyStatus() { t("common.unknown", { defaultValue: "未知错误" }); toast.error( t("proxy.takeover.failed", { + detail, defaultValue: `操作失败: ${detail}`, }), ); @@ -191,6 +219,7 @@ export function useProxyStatus() { // 启动/停止（总开关） startProxyServer: startProxyServerMutation.mutateAsync, + stopProxyServer: stopProxyServerMutation.mutateAsync, stopWithRestore: stopWithRestoreMutation.mutateAsync, // 按应用接管开关 @@ -205,9 +234,11 @@ export function useProxyStatus() { // 加载状态 isStarting: startProxyServerMutation.isPending, + isStoppingServer: stopProxyServerMutation.isPending, isStopping: stopWithRestoreMutation.isPending, isPending: startProxyServerMutation.isPending || + stopProxyServerMutation.isPending || stopWithRestoreMutation.isPending || setTakeoverForAppMutation.isPending, }; diff --git a/src/hooks/useSettings.ts b/src/hooks/useSettings.ts index 121f25c72..558408900 100644 --- a/src/hooks/useSettings.ts +++ b/src/hooks/useSettings.ts @@ -1,13 +1,15 @@ import { useCallback, useMemo } from "react"; import { useTranslation } from "react-i18next"; import { toast } from "sonner"; -import { providersApi, settingsApi, type AppId } from "@/lib/api"; +import { useQueryClient } from "@tanstack/react-query"; +import { providersApi, settingsApi } from "@/lib/api"; import { syncCurrentProvidersLiveSafe } from "@/utils/postChangeSync"; import { useSettingsQuery, useSaveSettingsMutation } from "@/lib/query"; import type { Settings } from "@/types"; import { useSettingsForm, type SettingsFormState } from "./useSettingsForm"; import { useDirectorySettings, + type DirectoryAppId, type ResolvedDirectories, } from "./useDirectorySettings"; import { useSettingsMetadata } from "./useSettingsMetadata"; @@ -27,11 +29,11 @@ export interface UseSettingsResult { resolvedDirs: ResolvedDirectories; requiresRestart: boolean; updateSettings: (updates: Partial) => void; - updateDirectory: (app: AppId, value?: string) => void; + updateDirectory: (app: DirectoryAppId, value?: string) => void; updateAppConfigDir: (value?: string) => void; - browseDirectory: (app: AppId) => Promise; + browseDirectory: (app: DirectoryAppId) => Promise; browseAppConfigDir: () => Promise; - resetDirectory: (app: AppId) => Promise; + resetDirectory: (app: DirectoryAppId) => Promise; resetAppConfigDir: () => Promise; saveSettings: ( overrides?: Partial, @@ -63,6 +65,7 @@ export function useSettings(): UseSettingsResult { const { t } = useTranslation(); const { data } = useSettingsQuery(); const saveMutation = useSaveSettingsMutation(); + const queryClient = useQueryClient(); // 1️⃣ 表单状态管理 const { @@ -105,13 +108,14 @@ export function useSettings(): UseSettingsResult { const resetSettings = useCallback(() => { resetForm(data ?? null); syncLanguage(initialLanguage); - resetAllDirectories( - sanitizeDir(data?.claudeConfigDir), - sanitizeDir(data?.codexConfigDir), - sanitizeDir(data?.geminiConfigDir), - sanitizeDir(data?.opencodeConfigDir), - sanitizeDir(data?.openclawConfigDir), - ); + resetAllDirectories({ + claude: sanitizeDir(data?.claudeConfigDir), + codex: sanitizeDir(data?.codexConfigDir), + gemini: sanitizeDir(data?.geminiConfigDir), + opencode: sanitizeDir(data?.opencodeConfigDir), + openclaw: sanitizeDir(data?.openclawConfigDir), + hermes: sanitizeDir(data?.hermesConfigDir), + }); setRequiresRestart(false); }, [ data, @@ -122,6 +126,58 @@ export function useSettings(): UseSettingsResult { setRequiresRestart, ]); + // 同步 Claude 插件集成配置到 ~/.claude/settings.json + // 返回 true 表示已执行过 syncCurrentProvidersLiveSafe，调用方可跳过重复同步 + // prevEnabled 必须由调用方在 saveMutation 之前从实时缓存（queryClient.getQueryData）捕获， + // 避免 useCallback closure 中 data 因未 re-render 而滞后导致的快速连切 race。 + const syncClaudePluginIfChanged = useCallback( + async ( + enabled: boolean | undefined, + prevEnabled: boolean | undefined, + ): Promise => { + if (enabled === undefined || enabled === prevEnabled) return false; + try { + if (enabled) { + const currentId = await providersApi.getCurrent("claude"); + let isOfficial = false; + if (currentId) { + const allProviders = await providersApi.getAll("claude"); + isOfficial = allProviders[currentId]?.category === "official"; + } + await settingsApi.applyClaudePluginConfig({ official: isOfficial }); + } else { + await settingsApi.applyClaudePluginConfig({ official: true }); + } + + const syncResult = await syncCurrentProvidersLiveSafe(); + if (!syncResult.ok) { + console.warn( + "[useSettings] Failed to sync providers after toggling Claude plugin", + syncResult.error, + ); + toast.error( + t("notifications.syncClaudePluginFailed", { + defaultValue: "同步 Claude 插件失败", + }), + ); + } + return true; + } catch (error) { + console.warn( + "[useSettings] Failed to sync Claude plugin config", + error, + ); + toast.error( + t("notifications.syncClaudePluginFailed", { + defaultValue: "同步 Claude 插件失败", + }), + ); + return false; + } + }, + [t], + ); + // 即时保存设置（用于 General 标签页的实时更新） // 保存基础配置 + 独立的系统 API 调用（开机自启） const autoSaveSettings = useCallback( @@ -152,6 +208,12 @@ export function useSettings(): UseSettingsResult { language: mergedSettings.language, }; + // 在 mutate 之前从实时缓存捕获上一次持久化的插件集成状态， + // 避免 closure 里的 data 因 React 尚未 re-render 而滞后 + const prevPluginEnabled = queryClient.getQueryData([ + "settings", + ])?.enableClaudePluginIntegration; + // 保存到配置文件 await saveMutation.mutateAsync(payload); @@ -202,6 +264,11 @@ export function useSettings(): UseSettingsResult { } } + await syncClaudePluginIfChanged( + payload.enableClaudePluginIntegration, + prevPluginEnabled, + ); + // 持久化语言偏好 try { if (typeof window !== "undefined" && updates.language) { @@ -233,7 +300,7 @@ export function useSettings(): UseSettingsResult { throw error; } }, - [data, saveMutation, settings, t], + [data, queryClient, saveMutation, settings, syncClaudePluginIfChanged, t], ); // 完整保存设置（用于 Advanced 标签页的手动保存） @@ -275,6 +342,12 @@ export function useSettings(): UseSettingsResult { language: mergedSettings.language, }; + // 在 mutate 之前从实时缓存捕获上一次持久化的插件集成状态， + // 避免 closure 里的 data 因 React 尚未 re-render 而滞后 + const prevPluginEnabled = queryClient.getQueryData([ + "settings", + ])?.enableClaudePluginIntegration; + await saveMutation.mutateAsync(payload); await settingsApi.setAppConfigDirOverride(sanitizedAppDir ?? null); @@ -323,30 +396,10 @@ export function useSettings(): UseSettingsResult { } } - // 只在 Claude 插件集成状态真正改变时调用系统 API - if ( - payload.enableClaudePluginIntegration !== undefined && - payload.enableClaudePluginIntegration !== - data?.enableClaudePluginIntegration - ) { - try { - if (payload.enableClaudePluginIntegration) { - await settingsApi.applyClaudePluginConfig({ official: false }); - } else { - await settingsApi.applyClaudePluginConfig({ official: true }); - } - } catch (error) { - console.warn( - "[useSettings] Failed to sync Claude plugin config", - error, - ); - toast.error( - t("notifications.syncClaudePluginFailed", { - defaultValue: "同步 Claude 插件失败", - }), - ); - } - } + const pluginSynced = await syncClaudePluginIfChanged( + payload.enableClaudePluginIntegration, + prevPluginEnabled, + ); try { if (typeof window !== "undefined") { @@ -369,18 +422,19 @@ export function useSettings(): UseSettingsResult { } // 如果 Claude/Codex/Gemini/OpenCode/OpenClaw 的目录覆盖发生变化，则立即将"当前使用的供应商"写回对应应用的 live 配置 + // 如果插件同步已经执行过 syncCurrentProvidersLiveSafe，则跳过避免重复 const claudeDirChanged = sanitizedClaudeDir !== previousClaudeDir; const codexDirChanged = sanitizedCodexDir !== previousCodexDir; const geminiDirChanged = sanitizedGeminiDir !== previousGeminiDir; const opencodeDirChanged = sanitizedOpencodeDir !== previousOpencodeDir; - const openclawDirChanged = - sanitizedOpenclawDir !== previousOpenclawDir; + const openclawDirChanged = sanitizedOpenclawDir !== previousOpenclawDir; if ( - claudeDirChanged || - codexDirChanged || - geminiDirChanged || - opencodeDirChanged || - openclawDirChanged + !pluginSynced && + (claudeDirChanged || + codexDirChanged || + geminiDirChanged || + opencodeDirChanged || + openclawDirChanged) ) { const syncResult = await syncCurrentProvidersLiveSafe(); if (!syncResult.ok) { @@ -419,9 +473,11 @@ export function useSettings(): UseSettingsResult { appConfigDir, data, initialAppConfigDir, + queryClient, saveMutation, settings, setRequiresRestart, + syncClaudePluginIfChanged, t, ], ); diff --git a/src/hooks/useSkills.helpers.ts b/src/hooks/useSkills.helpers.ts new file mode 100644 index 000000000..01c7e011c --- /dev/null +++ b/src/hooks/useSkills.helpers.ts @@ -0,0 +1,19 @@ +import type { InstalledSkill } from "@/lib/api/skills"; + +/** + * 合并本次导入结果到已安装缓存，按 id 去重。 + * + * 同一技能重复出现时以新记录为准，避免 mutation 被重复触发时 + * 在 installed 列表中看到重复条目。imported 为空时返回原引用， + * 让 React Query 跳过无谓的订阅者通知。 + */ +export function mergeImportedSkills( + existing: InstalledSkill[] | undefined, + imported: InstalledSkill[], +): InstalledSkill[] { + if (!existing) return imported; + if (imported.length === 0) return existing; + const importedIds = new Set(imported.map((s) => s.id)); + const preserved = existing.filter((s) => !importedIds.has(s.id)); + return [...preserved, ...imported]; +} diff --git a/src/hooks/useSkills.ts b/src/hooks/useSkills.ts index ea641f099..095f14328 100644 --- a/src/hooks/useSkills.ts +++ b/src/hooks/useSkills.ts @@ -14,6 +14,7 @@ import { type SkillsShSearchResult, } from "@/lib/api/skills"; import type { AppId } from "@/lib/api/types"; +import { mergeImportedSkills } from "@/hooks/useSkills.helpers"; /** * 查询所有已安装的 Skills @@ -208,10 +209,7 @@ export function useImportSkillsFromApps() { // 直接更新 installed 缓存 queryClient.setQueryData( ["skills", "installed"], - (oldData) => { - if (!oldData) return importedSkills; - return [...oldData, ...importedSkills]; - }, + (oldData) => mergeImportedSkills(oldData, importedSkills), ); // 刷新 unmanaged 列表（已被导入的应该移除） queryClient.invalidateQueries({ queryKey: ["skills", "unmanaged"] }); diff --git a/src/hooks/useStreamCheck.ts b/src/hooks/useStreamCheck.ts index 196e65e9f..547865603 100644 --- a/src/hooks/useStreamCheck.ts +++ b/src/hooks/useStreamCheck.ts @@ -62,6 +62,20 @@ export function useStreamCheck(appId: AppId) { closeButton: true, }, ); + } else if (result.errorCategory === "quotaExceeded") { + toast.warning( + t("streamCheck.quotaExceeded", { + providerName: providerName, + defaultValue: `${providerName} Coding Plan quota has been exceeded`, + }), + { + description: t("streamCheck.quotaExceededHint", { + defaultValue: "", + }), + duration: 10000, + closeButton: true, + }, + ); } else { const httpStatus = result.httpStatus; const hintKey = httpStatus diff --git a/src/hooks/useUsageCacheBridge.ts b/src/hooks/useUsageCacheBridge.ts new file mode 100644 index 000000000..ed0deb13d --- /dev/null +++ b/src/hooks/useUsageCacheBridge.ts @@ -0,0 +1,66 @@ +import { useEffect } from "react"; +import { listen, type UnlistenFn } from "@tauri-apps/api/event"; +import { useQueryClient } from "@tanstack/react-query"; +import type { AppId } from "@/lib/api/types"; +import type { UsageResult } from "@/types"; +import type { SubscriptionQuota } from "@/types/subscription"; +import { usageKeys } from "@/lib/query/usage"; +import { subscriptionKeys } from "@/lib/query/subscription"; + +type UsageCacheUpdatedPayload = + | { + kind: "script"; + appType: AppId; + providerId: string; + data: UsageResult; + } + | { + kind: "subscription"; + appType: AppId; + data: SubscriptionQuota; + }; + +/** + * 后端 `UsageCache` 写入后会 emit `usage-cache-updated`，本 hook 把 payload 同步到 + * React Query 缓存，让托盘触发的刷新（不经前端）也能立刻反映到主界面，避免 + * React Query 与 Rust 侧两份缓存各自为战。 + */ +export function useUsageCacheBridge() { + const queryClient = useQueryClient(); + + useEffect(() => { + let unlisten: UnlistenFn | undefined; + let disposed = false; + + (async () => { + const off = await listen( + "usage-cache-updated", + (event) => { + const payload = event.payload; + if (payload.kind === "script") { + queryClient.setQueryData( + usageKeys.script(payload.providerId, payload.appType), + payload.data, + ); + } else if (payload.kind === "subscription") { + queryClient.setQueryData( + subscriptionKeys.quota(payload.appType), + payload.data, + ); + } + }, + ); + + if (disposed) { + off(); + } else { + unlisten = off; + } + })(); + + return () => { + disposed = true; + unlisten?.(); + }; + }, [queryClient]); +} diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json index cefc88203..184a32fb1 100644 --- a/src/i18n/locales/en.json +++ b/src/i18n/locales/en.json @@ -80,7 +80,7 @@ "hideAttribution": "Hide AI Attribution", "enableTeammates": "Teammates Mode", "enableToolSearch": "Enable Tool Search", - "effortHigh": "High Effort Thinking", + "effortMax": "Max Effort Thinking", "disableAutoUpgrade": "Disable Auto-Upgrade" }, "header": { @@ -104,6 +104,7 @@ "noProvidersDescription": "If you already have a config, click \"Import Current Config\" — all data will be safely saved in a default provider", "noProvidersDescriptionSnippet": "Settings other than API key and endpoint (e.g. plugins) will be saved to a common config snippet for sharing across providers", "importCurrent": "Import Current Config", + "importFromClaude": "Import Compatible Providers from Claude", "importCurrentDescription": "Import current live config as default provider", "currentlyUsing": "Currently Using", "enable": "Enable", @@ -141,6 +142,8 @@ "sortUpdateFailed": "Failed to update sort order", "configureUsage": "Configure usage query", "officialPartner": "Official Partner", + "managedByHermes": "Hermes Managed", + "managedByHermesHint": "Defined in Hermes' providers: dict. Edit or remove it via Hermes Web UI.", "openTerminal": "Open Terminal", "terminalOpened": "Terminal opened", "terminalOpenFailed": "Failed to open terminal", @@ -170,11 +173,46 @@ } } }, + "claudeDesktop": { + "mode": "Model handling", + "modeDirect": "Direct", + "modeProxy": "Requires routing", + "modelMappingToggle": "Needs model mapping", + "modelMappingOffHint": "Use this when the provider already exposes and accepts claude-* / anthropic/claude-* model IDs through Anthropic Messages. Claude Desktop connects to the provider directly.", + "modelMappingOnHint": "Claude Desktop currently restricts model IDs. If your provider offers non-Claude models, enable this switch and keep local routing running while in use.", + "routeMapTitle": "Model mapping", + "routeMapHint": "Enter the model name provided by your provider. The display name is shown in the Claude Desktop model list.", + "upstreamModelLabel": "Requested model", + "displayNameLabel": "Display name", + "supports1mLabel": "1M", + "directModelListTitle": "Manually specify Claude Desktop models (advanced, optional)", + "directModelListCollapsedHint": "Native Claude model providers usually do not need this. Claude Desktop will fetch /v1/models automatically.", + "directModelListHint": "Only fill this when the provider's /v1/models is unavailable or does not return Claude Desktop-safe claude-* model IDs. Checking 1M writes the [1M] marker after the model ID.", + "directModelInvalid": "Direct models must use claude-* / anthropic/claude-* model IDs", + "addModel": "Add model", + "addRoute": "Add model", + "routeInvalid": "Please enter the upstream model name", + "routesRequired": "At least one upstream model is required", + "statusTitle": "Claude Desktop configuration needs attention", + "statusUnsupported": "This platform does not support writing Claude Desktop 3P configuration yet.", + "statusStaleRawModels": "The Claude Desktop profile contains non-claude-* model IDs. Newer Claude Desktop versions may reject it; switch to the current provider again to repair it.", + "statusMissingRouteMappings": "The current provider has model mapping enabled but no valid routes. Edit the provider and add at least one mapping.", + "statusGatewayTokenMissing": "The local routing token has not been generated yet. Switching to this provider again will write a new local token.", + "statusBaseUrlMismatch": "The Claude Desktop profile points to a different URL than the current provider. Current: {{actual}}; expected: {{expected}}. Switch to the current provider again to repair it.", + "route": { + "tooltip": { + "active": "Claude Desktop local routing is running - {{address}}:{{port}}", + "inactive": "Turn on Claude Desktop local routing for providers that need model mapping or format conversion. Configured address: {{address}}:{{port}}" + } + } + }, "notifications": { "providerAdded": "Provider added", "providerSaved": "Provider configuration saved", "providerDeleted": "Provider deleted successfully", "switchSuccess": "Switch successful!", + "claudeDesktopRestartRequired": "Switched successfully. Restart Claude Desktop to apply changes.", + "claudeDesktopProxyRestartRequired": "Switched successfully. Keep CC Switch running and restart Claude Desktop to apply changes.", "addToConfigSuccess": "Added to config", "removeFromConfigSuccess": "Removed from config", "switchFailedTitle": "Switch failed", @@ -547,7 +585,8 @@ "kitty": "Kitty", "ghostty": "Ghostty", "wezterm": "WezTerm", - "kaku": "Kaku" + "kaku": "Kaku", + "warp": "Warp" }, "windows": { "cmd": "Command Prompt", @@ -579,11 +618,14 @@ "opencodeConfigDirDescription": "Override OpenCode configuration directory (opencode.json).", "openclawConfigDir": "OpenClaw Configuration Directory", "openclawConfigDirDescription": "Override OpenClaw configuration directory (openclaw.json).", + "hermesConfigDir": "Hermes Configuration Directory", + "hermesConfigDirDescription": "Override Hermes configuration directory (config.yaml).", "browsePlaceholderClaude": "e.g., /home//.claude", "browsePlaceholderCodex": "e.g., /home//.codex", "browsePlaceholderGemini": "e.g., /home//.gemini", "browsePlaceholderOpencode": "e.g., /home//.config/opencode", "browsePlaceholderOpenclaw": "e.g., /home//.openclaw", + "browsePlaceholderHermes": "e.g., /home//.hermes", "browseDirectory": "Browse Directory", "resetDefault": "Reset to default directory (takes effect after saving)", "checkForUpdates": "Check for Updates", @@ -601,6 +643,7 @@ "releaseNotes": "Release Notes", "viewReleaseNotes": "View release notes for this version", "viewCurrentReleaseNotes": "View current version release notes", + "officialWebsite": "Official Website", "oneClickInstall": "One-click Install", "oneClickInstallHint": "Install Claude Code / Codex / Gemini CLI / OpenCode", "localEnvCheck": "Local environment check", @@ -655,14 +698,17 @@ }, "apps": { "claude": "Claude", + "claudeDesktop": "Claude Desktop", + "claude-desktop": "Claude Desktop", "codex": "Codex", "gemini": "Gemini", "opencode": "OpenCode", - "openclaw": "OpenClaw" + "openclaw": "OpenClaw", + "hermes": "Hermes" }, "sessionManager": { "title": "Session Manager", - "subtitle": "Manage Claude Code, Codex, OpenCode, OpenClaw and Gemini CLI sessions", + "subtitle": "Manage Claude Code, Codex, OpenCode, OpenClaw, Hermes and Gemini CLI sessions", "searchPlaceholder": "Search by content, directory, or ID", "searchSessions": "Search sessions", "providerFilterAll": "All", @@ -791,10 +837,16 @@ "ctok": "Join the CTok community on the official website and subscribe to a plan.", "ddshub": "DDSHub offers a special bonus for CC Switch users — register via this link and get 10% extra credit on your first top-up (contact group admin to claim)!", "lionccapi": "LionCCAPI offers exclusive benefits for CC Switch users. After registration, add WeChat HSQBJ088888888 and mention 'cc-switch' to receive $10 free credits!", - "shengsuanyun": "Shengsuanyun offers exclusive benefits for CC Switch users. New users who register via this link get ¥10 free credits and 10% bonus on first top-up!" + "shengsuanyun": "Shengsuanyun offers exclusive benefits for CC Switch users. New users who register via this link get ¥10 free credits and 10% bonus on first top-up!", + "lemondata": "Lemon Code offers a special promotion for CC Switch users. Sign up via this link to receive $1 in free credits." }, "presets": { - "ucloud": "Compshare" + "ucloud": "Compshare", + "ucloudCoding": "Compshare Coding Plan", + "shengsuanyun": "Shengsuanyun", + "openrouter": "OpenRouter", + "deepseek": "DeepSeek", + "together": "Together AI" }, "parameterConfig": "Parameter Config - {{name}} *", "mainModel": "Main Model (optional)", @@ -812,6 +864,11 @@ "fillTemplateValue": "Please fill in {{label}}", "endpointRequired": "API endpoint is required for non-official providers", "apiKeyRequired": "API Key is required for non-official providers", + "softValidation": { + "title": "Configuration has the following issues", + "hint": "Save anyway? Switching to this provider may fail; you can fill these in later.", + "saveAnyway": "Save anyway" + }, "configJsonError": "Config JSON format error, please check syntax", "authJsonRequired": "auth.json must be a JSON object", "authJsonError": "auth.json format error, please check JSON syntax", @@ -820,7 +877,6 @@ "visitWebsite": "Visit {{url}}", "anthropicModel": "Main Model", "anthropicSmallFastModel": "Fast Model", - "anthropicReasoningModel": "Reasoning Model (Thinking)", "apiFormat": "API Format", "apiFormatHint": "Select the input format for the provider's API", "fullUrlLabel": "Full URL", @@ -864,6 +920,7 @@ "fetchModelsNeedConfig": "Please fill in API endpoint and API Key first", "fetchModelsAuthFailed": "API Key is invalid or lacks permission", "fetchModelsNotSupported": "This provider does not support fetching model list", + "fetchModelsEndpointNotFound": "No reachable models endpoint found. Please check the Base URL or confirm whether the provider exposes this API.", "fetchModelsTimeout": "Request timed out, please check network connection" }, "copilot": { @@ -919,7 +976,9 @@ "addAnotherAccount": "Add another account", "logoutAll": "Logout all accounts", "retry": "Retry", - "copyCode": "Copy code" + "copyCode": "Copy code", + "fastMode": "FAST mode", + "fastModeDescription": "Send service_tier=\"priority\" for lower latency. Off by default — enabling it consumes your ChatGPT quota at a higher rate." }, "endpointTest": { "title": "API Endpoint Management", @@ -1309,7 +1368,8 @@ "codex": "Codex", "gemini": "Gemini", "opencode": "OpenCode", - "openclaw": "OpenClaw" + "openclaw": "OpenClaw", + "hermes": "Hermes" } }, "userLevelPath": "User-level MCP path", @@ -1629,6 +1689,69 @@ "primaryModel": "Primary Model", "fallbackModel": "Fallback Model" }, + "hermes": { + "form": { + "baseUrl": "API Endpoint", + "baseUrlHint": "The API endpoint URL for this provider.", + "providerKey": "Provider Key", + "providerKeyPlaceholder": "my-provider", + "providerKeyHint": "Lowercase letters, numbers, and hyphens only. Used as the provider name in config.yaml.", + "providerKeyLockedHint": "This provider is in Hermes config; key is locked.", + "providerKeyRequired": "Provider key is required", + "providerKeyInvalid": "Provider key can only contain lowercase letters, numbers, and hyphens", + "providerKeyDuplicate": "This provider key already exists", + "apiMode": "API Mode", + "apiModeHint": "Provider API protocol. Choose the format that matches your endpoint.", + "apiModeChatCompletions": "OpenAI Chat Completions", + "apiModeAnthropicMessages": "Anthropic Messages", + "apiModeCodexResponses": "OpenAI Responses", + "apiModeBedrockConverse": "AWS Bedrock Converse", + "baseUrlRequired": "API endpoint is required", + "baseUrlScheme": "Use an http:// or https:// address", + "baseUrlInvalid": "API endpoint is not a valid URL", + "models": "Models", + "addModel": "Add model", + "noModels": "No models configured. Switching to this provider won't change the default model.", + "modelId": "Model ID", + "modelIdPlaceholder": "anthropic/claude-opus-4-7", + "modelName": "Display name", + "modelNamePlaceholder": "Claude Opus 4.7", + "contextLength": "Context length", + "advancedOptions": "Advanced options", + "modelsHint": "On switch, the first model is written to top-level model.default.", + "primaryModel": "Default", + "fallbackModel": "Alternate", + "providerAdvanced": "Provider advanced options", + "rateLimitDelay": "Rate limit delay (seconds)", + "rateLimitDelayHint": "Minimum delay in seconds between consecutive requests (optional). Leave empty for no limit." + }, + "webui": { + "open": "Open Hermes Web UI", + "offline": "Hermes Web UI is not running. Start it with `hermes dashboard` first.", + "openFailed": "Failed to open Hermes Web UI", + "launchConfirmTitle": "Hermes Dashboard is not running", + "launchConfirmMessage": "Open a terminal and start it now with `hermes dashboard`?\n\nThe browser will open automatically once startup completes.\n\nIf the terminal reports that `hermes` cannot be found or the web extras are missing, run first:\npip install hermes-agent[web]", + "launchConfirmAction": "Open terminal & launch", + "launching": "Started `hermes dashboard` in a terminal.", + "launchFailed": "Failed to open terminal" + }, + "memory": { + "title": "Memory", + "agentTab": "Agent Memory (MEMORY.md)", + "userTab": "User Profile (USER.md)", + "usage": "{{current}} / {{limit}} characters", + "overLimit": "Over budget — Hermes will truncate on next load", + "enableOn": "Enabled", + "enableOff": "Disabled", + "disabledHint": "Hermes will skip this memory until re-enabled", + "toggleFailed": "Failed to toggle memory", + "saveSuccess": "Memory saved", + "saveFailed": "Failed to save memory", + "loadFailed": "Failed to read memory file", + "openConfig": "Adjust limits in Hermes Web UI", + "runtimeNote": "Changes apply on Hermes restart or new session." + } + }, "env": { "warning": { "title": "Environment Variable Conflicts Detected", @@ -2057,7 +2180,7 @@ "hint": "Select apps to route — once enabled, requests from that app will go through local routing", "enabled": "{{app}} routing enabled", "disabled": "{{app}} routing disabled", - "failed": "Failed to toggle routing", + "failed": "Failed to toggle routing: {{detail}}", "tooltip": { "active": "{{appLabel}} is routing - {{address}}:{{port}}\nSwitch provider for hot switching", "broken": "{{appLabel}} is routing, but routing service is not running", @@ -2154,6 +2277,8 @@ "error": "{{providerName}} check error: {{error}}", "modelNotFound": "{{providerName}} test model {{model}} does not exist or has been deprecated", "modelNotFoundHint": "This model may have been retired by the provider. Update the default test model in \"Model Test Config\".", + "quotaExceeded": "{{providerName}} Coding Plan quota has been exceeded", + "quotaExceededHint": "Baidu Qianfan returned a Coding Plan quota-limit error. Wait for the 5-hour, weekly, or monthly quota refresh, or adjust the plan in the Qianfan console.", "httpHint": { "400": "Provider rejected request format. Health check probe may differ from actual usage.", "401": "API key may be invalid, or provider uses OAuth auth. Check failure doesn't mean it's unusable.", @@ -2208,6 +2333,9 @@ } }, "universalProvider": { + "duplicate": "Duplicate", + "duplicatedAndSynced": "Universal provider duplicated and synced", + "duplicateError": "Failed to duplicate universal provider", "title": "Universal Provider", "description": "Universal providers manage Claude, Codex, and Gemini configurations simultaneously. Changes are automatically synced to all enabled apps.", "add": "Add Universal Provider", @@ -2389,7 +2517,7 @@ "artistry": "Highly creative and artistic task category that inspires novel ideas and creative solutions. Defaults to Gemini 3 Pro max variant.", "quick": "Lightweight task category for single-file modifications, typo fixes, and simple adjustments. Defaults to Claude Haiku 4.5 fast model.", "unspecifiedLow": "Uncategorized low-effort task category for tasks that don't fit other categories with small workload. Defaults to Claude Sonnet 4.5.", - "unspecifiedHigh": "Uncategorized high-effort task category for tasks that don't fit other categories with large workload. Defaults to Claude Opus 4.6 max variant.", + "unspecifiedHigh": "Uncategorized high-effort task category for tasks that don't fit other categories with large workload. Defaults to Claude Opus 4.7 max variant.", "writing": "Writing category for documentation, prose and technical writing. Defaults to Gemini 3 Flash fast generation model." }, "slimAgentDesc": { diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json index 56c3968ae..31d4eb5af 100644 --- a/src/i18n/locales/ja.json +++ b/src/i18n/locales/ja.json @@ -80,7 +80,7 @@ "hideAttribution": "AI署名を非表示", "enableTeammates": "Teammates モード", "enableToolSearch": "Tool Search を有効化", - "effortHigh": "高強度思考", + "effortMax": "最大強度思考", "disableAutoUpgrade": "自動アップグレードを無効化" }, "header": { @@ -104,6 +104,7 @@ "noProvidersDescription": "既存の設定がある場合は「現在の設定をインポート」をクリックしてください。すべてのデータが default プロバイダーに安全に保存されます", "noProvidersDescriptionSnippet": "API キーとリクエスト URL 以外のデータ（プラグインなど）は共通設定スニペットに保存され、プロバイダー間で共有できます", "importCurrent": "現在の設定をインポート", + "importFromClaude": "Claude から互換プロバイダーをインポート", "importCurrentDescription": "現在使用中の設定をデフォルトプロバイダーとしてインポート", "currentlyUsing": "現在使用中", "enable": "有効化", @@ -141,6 +142,8 @@ "sortUpdateFailed": "並び順の更新に失敗しました", "configureUsage": "利用状況を設定", "officialPartner": "公式パートナー", + "managedByHermes": "Hermes 管理", + "managedByHermesHint": "Hermes の providers: dict で定義されています。Hermes Web UI で編集または削除してください。", "openTerminal": "ターミナルを開く", "terminalOpened": "ターミナルを開きました", "terminalOpenFailed": "ターミナルを開けませんでした", @@ -170,11 +173,46 @@ } } }, + "claudeDesktop": { + "mode": "モデル処理方式", + "modeDirect": "直結", + "modeProxy": "ルーティング必要", + "modelMappingToggle": "モデルマッピングが必要", + "modelMappingOffHint": "プロバイダーが Anthropic Messages で claude-* / anthropic/claude-* のモデル ID を公開し、そのまま受け付ける場合に使います。Claude Desktop はプロバイダーへ直接接続します。", + "modelMappingOnHint": "Claude Desktop は現在モデル ID を制限しています。お使いのプロバイダーが Claude 系列以外のモデルを提供する場合、このスイッチを有効にし、使用中はローカルルーティングを起動したままにしてください。", + "routeMapTitle": "モデルマッピング", + "routeMapHint": "プロバイダーが実際に提供するモデル名を入力してください。表示名は Claude Desktop のモデルリストに表示される名前です。", + "upstreamModelLabel": "リクエストモデル", + "displayNameLabel": "表示名", + "supports1mLabel": "1M", + "directModelListTitle": "Claude Desktop モデルを手動指定（高度・任意）", + "directModelListCollapsedHint": "ネイティブ Claude モデルのプロバイダーでは通常不要です。Claude Desktop が /v1/models を自動取得します。", + "directModelListHint": "プロバイダーの /v1/models が使えない、または Claude Desktop が認識できる claude-* モデル ID を返さない場合だけ入力してください。1M をオンにするとモデル ID の後ろに [1M] マーカーを書き込みます。", + "directModelInvalid": "直結モデルは claude-* / anthropic/claude-* のモデル ID を使う必要があります", + "addModel": "モデルを追加", + "addRoute": "モデルを追加", + "routeInvalid": "上流モデル名を入力してください", + "routesRequired": "少なくとも 1 つの上流モデルが必要です", + "statusTitle": "Claude Desktop 設定の確認が必要です", + "statusUnsupported": "このプラットフォームでは Claude Desktop 3P 設定の書き込みはまだサポートされていません。", + "statusStaleRawModels": "Claude Desktop profile に claude-* ではないモデル ID が含まれています。新しい Claude Desktop では拒否される可能性があります。現在のプロバイダーへ再度切り替えると修復できます。", + "statusMissingRouteMappings": "現在のプロバイダーはモデルマッピングを有効にしていますが、有効なルートがありません。プロバイダーを編集し、少なくとも 1 つのマッピングを追加してください。", + "statusGatewayTokenMissing": "ローカルルーティング token がまだ生成されていません。このプロバイダーへ再度切り替えると新しい token が書き込まれます。", + "statusBaseUrlMismatch": "Claude Desktop profile の URL が現在のプロバイダーと一致しません。現在: {{actual}}、期待値: {{expected}}。現在のプロバイダーへ再度切り替えると修復できます。", + "route": { + "tooltip": { + "active": "Claude Desktop ローカルルーティングは起動中です - {{address}}:{{port}}", + "inactive": "モデルマッピングや形式変換が必要なプロバイダー向けに Claude Desktop ローカルルーティングを起動します。設定アドレス: {{address}}:{{port}}" + } + } + }, "notifications": { "providerAdded": "プロバイダーを追加しました", "providerSaved": "プロバイダー設定を保存しました", "providerDeleted": "プロバイダーを削除しました", "switchSuccess": "切り替え成功！", + "claudeDesktopRestartRequired": "切り替えました。反映するには Claude Desktop を再起動してください", + "claudeDesktopProxyRestartRequired": "切り替えました。CC Switch を起動したまま Claude Desktop を再起動してください", "addToConfigSuccess": "設定に追加しました", "removeFromConfigSuccess": "設定から削除しました", "switchFailedTitle": "切り替えに失敗しました", @@ -547,7 +585,8 @@ "kitty": "Kitty", "ghostty": "Ghostty", "wezterm": "WezTerm", - "kaku": "Kaku" + "kaku": "Kaku", + "warp": "Warp" }, "windows": { "cmd": "コマンドプロンプト", @@ -579,11 +618,14 @@ "opencodeConfigDirDescription": "OpenCode の設定ディレクトリ（opencode.json）を上書きします。", "openclawConfigDir": "OpenClaw 設定ディレクトリ", "openclawConfigDirDescription": "OpenClaw の設定ディレクトリ（openclaw.json）を上書きします。", + "hermesConfigDir": "Hermes 設定ディレクトリ", + "hermesConfigDirDescription": "Hermes の設定ディレクトリ（config.yaml）を上書きします。", "browsePlaceholderClaude": "例: /home//.claude", "browsePlaceholderCodex": "例: /home//.codex", "browsePlaceholderGemini": "例: /home//.gemini", "browsePlaceholderOpencode": "例: /home//.config/opencode", "browsePlaceholderOpenclaw": "例: /home//.openclaw", + "browsePlaceholderHermes": "例: /home//.hermes", "browseDirectory": "ディレクトリを選択", "resetDefault": "デフォルトに戻す（保存後に反映）", "checkForUpdates": "アップデートを確認", @@ -601,6 +643,7 @@ "releaseNotes": "リリースノート", "viewReleaseNotes": "このバージョンのリリースノートを見る", "viewCurrentReleaseNotes": "現在のバージョンのリリースノートを見る", + "officialWebsite": "公式サイト", "oneClickInstall": "ワンクリックインストール", "oneClickInstallHint": "Claude Code / Codex / Gemini CLI / OpenCode をインストール", "localEnvCheck": "ローカル環境チェック", @@ -655,14 +698,17 @@ }, "apps": { "claude": "Claude", + "claudeDesktop": "Claude Desktop", + "claude-desktop": "Claude Desktop", "codex": "Codex", "gemini": "Gemini", "opencode": "OpenCode", - "openclaw": "OpenClaw" + "openclaw": "OpenClaw", + "hermes": "Hermes" }, "sessionManager": { "title": "セッション管理", - "subtitle": "Claude Code / Codex / OpenCode / OpenClaw / Gemini CLI のセッションを管理", + "subtitle": "Claude Code / Codex / OpenCode / OpenClaw / Hermes / Gemini CLI のセッションを管理", "searchPlaceholder": "内容・ディレクトリ・ID で検索", "searchSessions": "セッションを検索", "providerFilterAll": "すべて", @@ -791,10 +837,16 @@ "ctok": "公式サイトで CTok コミュニティに参加し、プランを購読してください。", "ddshub": "DDSHub は CC Switch ユーザー向けに特別ボーナスを提供しています。このリンクから登録すると、初回チャージで 10% の追加クレジットがもらえます（グループ管理者に連絡して受け取り）！", "lionccapi": "LionCCAPIはCC Switchユーザーに特別特典を提供しています。登録後、WeChat HSQBJ088888888を追加し、「cc-switch」と伝えると$10分のクレジットがもらえます！", - "shengsuanyun": "胜算云はCC Switchユーザーに特別特典を提供しています。このリンクから登録すると、10元分の無料クレジットと初回チャージ10%ボーナスがもらえます！" + "shengsuanyun": "胜算云はCC Switchユーザーに特別特典を提供しています。このリンクから登録すると、10元分の無料クレジットと初回チャージ10%ボーナスがもらえます！", + "lemondata": "Lemon Code は CC Switch ユーザー向けの特別オファーを提供しています。このリンクから登録すると 1 ドル分の無料クレジットがもらえます。" }, "presets": { - "ucloud": "Compshare" + "ucloud": "Compshare", + "ucloudCoding": "Compshare Coding Plan", + "shengsuanyun": "Shengsuanyun", + "openrouter": "OpenRouter", + "deepseek": "DeepSeek", + "together": "Together AI" }, "parameterConfig": "パラメーター設定 - {{name}} *", "mainModel": "メインモデル（任意）", @@ -812,6 +864,11 @@ "fillTemplateValue": "{{label}} を入力してください", "endpointRequired": "公式以外は API エンドポイントが必須です", "apiKeyRequired": "公式以外は API Key が必須です", + "softValidation": { + "title": "設定に以下の問題があります", + "hint": "それでも保存しますか？保存後、このプロバイダーへの切り替えが失敗する可能性がありますが、後から補完できます。", + "saveAnyway": "それでも保存" + }, "configJsonError": "Config JSON の形式が正しくありません。構文を確認してください", "authJsonRequired": "auth.json は JSON オブジェクトで入力してください", "authJsonError": "auth.json の形式が正しくありません。JSON を確認してください", @@ -820,7 +877,6 @@ "visitWebsite": "{{url}} を開く", "anthropicModel": "メインモデル", "anthropicSmallFastModel": "高速モデル", - "anthropicReasoningModel": "推論モデル（Thinking）", "apiFormat": "API フォーマット", "apiFormatHint": "プロバイダー API の入力フォーマットを選択", "fullUrlLabel": "フル URL", @@ -864,6 +920,7 @@ "fetchModelsNeedConfig": "先に API エンドポイントと API Key を入力してください", "fetchModelsAuthFailed": "API Key が無効か、権限がありません", "fetchModelsNotSupported": "このプロバイダーはモデル一覧の取得に対応していません", + "fetchModelsEndpointNotFound": "利用可能なモデル一覧エンドポイントが見つかりません。Base URL を確認するか、プロバイダーが該当 API を公開しているかご確認ください", "fetchModelsTimeout": "リクエストがタイムアウトしました。ネットワーク接続を確認してください" }, "copilot": { @@ -919,7 +976,9 @@ "addAnotherAccount": "別のアカウントを追加", "logoutAll": "すべてのアカウントをログアウト", "retry": "再試行", - "copyCode": "コードをコピー" + "copyCode": "コードをコピー", + "fastMode": "FAST モード", + "fastModeDescription": "低遅延のため service_tier=\"priority\" を送信します。既定ではオフ——オンにすると ChatGPT のクォータがより速く消費されます。" }, "endpointTest": { "title": "API エンドポイント管理", @@ -1309,7 +1368,8 @@ "codex": "Codex", "gemini": "Gemini", "opencode": "OpenCode", - "openclaw": "OpenClaw" + "openclaw": "OpenClaw", + "hermes": "Hermes" } }, "userLevelPath": "ユーザーレベルの MCP パス", @@ -1629,6 +1689,69 @@ "primaryModel": "プライマリモデル", "fallbackModel": "フォールバックモデル" }, + "hermes": { + "form": { + "baseUrl": "API エンドポイント", + "baseUrlHint": "プロバイダーの API エンドポイント URL。", + "providerKey": "プロバイダーキー", + "providerKeyPlaceholder": "my-provider", + "providerKeyHint": "小文字、数字、ハイフンのみ。config.yaml のプロバイダー名として使用されます。", + "providerKeyLockedHint": "このプロバイダーは Hermes 設定に追加済みのため、キーは変更できません。", + "providerKeyRequired": "プロバイダーキーは必須です", + "providerKeyInvalid": "プロバイダーキーは小文字、数字、ハイフンのみ使用できます", + "providerKeyDuplicate": "このプロバイダーキーは既に存在します", + "apiMode": "API モード", + "apiModeHint": "プロバイダーの API プロトコル。エンドポイントに合わせて正しい形式を選択してください。", + "apiModeChatCompletions": "OpenAI Chat Completions", + "apiModeAnthropicMessages": "Anthropic Messages", + "apiModeCodexResponses": "OpenAI Responses", + "apiModeBedrockConverse": "AWS Bedrock Converse", + "baseUrlRequired": "API エンドポイントは必須です", + "baseUrlScheme": "http:// または https:// で始まるアドレスを指定してください", + "baseUrlInvalid": "API エンドポイントは有効な URL ではありません", + "models": "モデル一覧", + "addModel": "モデルを追加", + "noModels": "モデル未設定。このプロバイダーに切り替えてもデフォルトモデルは更新されません。", + "modelId": "モデル ID", + "modelIdPlaceholder": "anthropic/claude-opus-4-7", + "modelName": "表示名", + "modelNamePlaceholder": "Claude Opus 4.7", + "contextLength": "コンテキスト長", + "advancedOptions": "詳細オプション", + "modelsHint": "切り替え時、最初のモデルが model.default に書き込まれます。", + "primaryModel": "デフォルト", + "fallbackModel": "予備", + "providerAdvanced": "プロバイダー詳細オプション", + "rateLimitDelay": "リクエスト間隔（秒）", + "rateLimitDelayHint": "連続したリクエスト間の最小待機秒数（任意）。空欄の場合は制限なし。" + }, + "webui": { + "open": "Hermes Web UI を開く", + "offline": "Hermes Web UI が起動していません。まず `hermes dashboard` を実行してください。", + "openFailed": "Hermes Web UI を開けませんでした", + "launchConfirmTitle": "Hermes Dashboard が起動していません", + "launchConfirmMessage": "ターミナルを開いて `hermes dashboard` を実行しますか？\n\n起動完了後、ブラウザが自動的に開きます。\n\nターミナルに `hermes` が見つからない、または web 依存が不足するというエラーが表示される場合は、まず次を実行してください：\npip install hermes-agent[web]", + "launchConfirmAction": "ターミナルを開いて起動", + "launching": "ターミナルで hermes dashboard を起動しました。", + "launchFailed": "ターミナルを開けませんでした" + }, + "memory": { + "title": "メモリ", + "agentTab": "エージェント記憶 (MEMORY.md)", + "userTab": "ユーザープロファイル (USER.md)", + "usage": "{{current}} / {{limit}} 文字", + "overLimit": "上限を超えました。Hermes は次回読み込み時に切り詰めます", + "enableOn": "有効", + "enableOff": "無効", + "disabledHint": "再度有効化するまで Hermes はこの記憶をスキップします", + "toggleFailed": "メモリの切り替えに失敗しました", + "saveSuccess": "記憶を保存しました", + "saveFailed": "記憶の保存に失敗しました", + "loadFailed": "記憶ファイルの読み込みに失敗しました", + "openConfig": "Hermes Web UI で上限を調整", + "runtimeNote": "変更は Hermes の再起動または新規セッション時に反映されます。" + } + }, "env": { "warning": { "title": "競合する環境変数を検出しました", @@ -2057,7 +2180,7 @@ "hint": "ルーティングするアプリを選択します。有効にすると、そのアプリのリクエストはローカルルーティング経由で転送されます", "enabled": "{{app}} ルーティング有効", "disabled": "{{app}} ルーティング無効", - "failed": "ルーティングの切り替えに失敗しました", + "failed": "ルーティングの切り替えに失敗しました: {{detail}}", "tooltip": { "active": "{{appLabel}} がルーティング中 - {{address}}:{{port}}\nホットスイッチングのためプロバイダを切り替え", "broken": "{{appLabel}} がルーティング中ですが、ルーティングサービスが実行されていません", @@ -2154,6 +2277,8 @@ "error": "{{providerName}} のチェックでエラーが発生しました: {{error}}", "modelNotFound": "{{providerName}} のテストモデル {{model}} は存在しないか廃止されています", "modelNotFoundHint": "このモデルはプロバイダーにより廃止された可能性があります。「モデルテスト設定」でデフォルトのテストモデルを更新してください。", + "quotaExceeded": "{{providerName}} の Coding Plan 利用枠を超過しました", + "quotaExceededHint": "Baidu Qianfan が Coding Plan の利用枠超過エラーを返しました。5時間・週次・月次の利用枠更新を待つか、Qianfan コンソールでプランを確認してください。", "httpHint": { "400": "リクエスト形式が拒否されました。ヘルスチェックの形式は実際の使用と異なる場合があります。", "401": "APIキーが無効か、OAuthなどの認証方式を使用しています。チェック失敗は実際に使えないことを意味しません。", @@ -2208,6 +2333,9 @@ } }, "universalProvider": { + "duplicate": "複製", + "duplicatedAndSynced": "統合プロバイダーを複製して同期しました", + "duplicateError": "統合プロバイダーの複製に失敗しました", "title": "統合プロバイダー", "description": "統合プロバイダーは Claude、Codex、Gemini の設定を同時に管理します。変更は有効なすべてのアプリに自動的に同期されます。", "add": "統合プロバイダーを追加", @@ -2389,7 +2517,7 @@ "artistry": "高度にクリエイティブで芸術的なタスクカテゴリ。斬新なアイデアとクリエイティブなソリューションを促進。デフォルトで Gemini 3 Pro の max バリアントを使用。", "quick": "軽量タスクカテゴリ。単一ファイルの修正、タイポ修正、簡単な調整などの些細な作業に使用。デフォルトで Claude Haiku 4.5 高速モデルを使用。", "unspecifiedLow": "未分類の低作業量タスクカテゴリ。他のカテゴリに該当せず作業量が小さいタスクに適用。デフォルトで Claude Sonnet 4.5 を使用。", - "unspecifiedHigh": "未分類の高作業量タスクカテゴリ。他のカテゴリに該当せず作業量が大きいタスクに適用。デフォルトで Claude Opus 4.6 の max バリアントを使用。", + "unspecifiedHigh": "未分類の高作業量タスクカテゴリ。他のカテゴリに該当せず作業量が大きいタスクに適用。デフォルトで Claude Opus 4.7 の max バリアントを使用。", "writing": "ライティングカテゴリ。ドキュメント、散文、技術文書に特化。デフォルトで Gemini 3 Flash 高速生成モデルを使用。" }, "slimAgentDesc": { diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json index 9059ef323..4b60f7e3c 100644 --- a/src/i18n/locales/zh.json +++ b/src/i18n/locales/zh.json @@ -80,7 +80,7 @@ "hideAttribution": "隐藏 AI 署名", "enableTeammates": "Teammates 模式", "enableToolSearch": "启用 Tool Search", - "effortHigh": "高强度思考", + "effortMax": "最大强度思考", "disableAutoUpgrade": "禁用自动升级" }, "header": { @@ -104,6 +104,7 @@ "noProvidersDescription": "如果你已有配置，请点击\"导入当前配置\"，所有数据将安全保存在 default 供应商中", "noProvidersDescriptionSnippet": "除 Key 和请求地址外的数据（如插件配置）会被保存到通用配置片段，用于在不同供应商之间共享", "importCurrent": "导入当前配置", + "importFromClaude": "从 Claude 导入兼容供应商", "importCurrentDescription": "将当前正在使用的配置导入为默认供应商", "currentlyUsing": "当前使用", "enable": "启用", @@ -141,6 +142,8 @@ "sortUpdateFailed": "排序更新失败", "configureUsage": "配置用量查询", "officialPartner": "官方合作伙伴", + "managedByHermes": "Hermes 托管", + "managedByHermesHint": "该条目定义在 Hermes 的 providers: dict，请在 Hermes Web UI 中编辑或删除。", "openTerminal": "打开终端", "terminalOpened": "终端已打开", "terminalOpenFailed": "打开终端失败", @@ -170,11 +173,46 @@ } } }, + "claudeDesktop": { + "mode": "模型处理方式", + "modeDirect": "直连", + "modeProxy": "需要路由", + "modelMappingToggle": "需要模型映射", + "modelMappingOffHint": "适合供应商已经暴露并接受 claude-* / anthropic/claude-* 模型名的 Anthropic Messages API；请求会由 Claude Desktop 直连供应商。", + "modelMappingOnHint": "Claude Desktop 目前对模型 ID 进行了限制，如果您的供应商提供的模型不是 Claude 系列模型，则需要打开本开关，并在使用过程中保持本地路由开启。", + "routeMapTitle": "模型映射", + "routeMapHint": "填写供应商实际提供的模型名，显示名为在 Claude Desktop 模型列表中展示的名称。", + "upstreamModelLabel": "实际请求模型", + "displayNameLabel": "显示名", + "supports1mLabel": "1M", + "directModelListTitle": "手动指定 Claude Desktop 模型列表（高级，可选）", + "directModelListCollapsedHint": "原生 Claude 模型供应商通常不用填写，Claude Desktop 会自动读取 /v1/models。", + "directModelListHint": "仅当供应商的 /v1/models 不可用或没有返回 Claude Desktop 可识别的 claude-* 模型名时填写；勾选 1M 会在模型名后写入 [1M] 标记。", + "directModelInvalid": "直连模型必须使用 claude-* / anthropic/claude-* 模型名", + "addModel": "添加模型", + "addRoute": "添加模型", + "routeInvalid": "请填写上游模型名", + "routesRequired": "至少填写一个上游模型", + "statusTitle": "Claude Desktop 配置需要检查", + "statusUnsupported": "当前平台暂不支持 Claude Desktop 3P 配置写入。", + "statusStaleRawModels": "Claude Desktop profile 中存在非 claude-* 模型名，新版 Claude Desktop 可能拒绝加载；重新切换当前供应商可修复。", + "statusMissingRouteMappings": "当前供应商启用了模型映射，但没有有效路由；请编辑供应商并补全至少一个模型映射。", + "statusGatewayTokenMissing": "当前本地路由 token 尚未生成；重新切换该供应商会写入新的本地 token。", + "statusBaseUrlMismatch": "Claude Desktop profile 指向的地址与当前供应商不一致；当前为 {{actual}}，应为 {{expected}}。重新切换当前供应商可修复。", + "route": { + "tooltip": { + "active": "Claude Desktop 本地路由已开启 - {{address}}:{{port}}", + "inactive": "开启 Claude Desktop 本地路由，用于需要模型映射或格式转换的供应商。当前配置地址：{{address}}:{{port}}" + } + } + }, "notifications": { "providerAdded": "供应商已添加", "providerSaved": "供应商配置已保存", "providerDeleted": "供应商删除成功", "switchSuccess": "切换成功！", + "claudeDesktopRestartRequired": "切换成功，重启 Claude Desktop 后生效", + "claudeDesktopProxyRestartRequired": "切换成功，请保持 CC Switch 运行，并重启 Claude Desktop 后生效", "addToConfigSuccess": "已添加到配置", "removeFromConfigSuccess": "已从配置移除", "switchFailedTitle": "切换失败", @@ -547,7 +585,8 @@ "kitty": "Kitty", "ghostty": "Ghostty", "wezterm": "WezTerm", - "kaku": "Kaku" + "kaku": "Kaku", + "warp": "Warp" }, "windows": { "cmd": "命令提示符", @@ -579,11 +618,14 @@ "opencodeConfigDirDescription": "覆盖 OpenCode 配置目录 (opencode.json)。", "openclawConfigDir": "OpenClaw 配置目录", "openclawConfigDirDescription": "覆盖 OpenClaw 配置目录 (openclaw.json)。", + "hermesConfigDir": "Hermes 配置目录", + "hermesConfigDirDescription": "覆盖 Hermes 配置目录 (config.yaml)。", "browsePlaceholderClaude": "例如：/home/<你的用户名>/.claude", "browsePlaceholderCodex": "例如：/home/<你的用户名>/.codex", "browsePlaceholderGemini": "例如：/home/<你的用户名>/.gemini", "browsePlaceholderOpencode": "例如：/home/<你的用户名>/.config/opencode", "browsePlaceholderOpenclaw": "例如：/home/<你的用户名>/.openclaw", + "browsePlaceholderHermes": "例如：/home/<你的用户名>/.hermes", "browseDirectory": "浏览目录", "resetDefault": "恢复默认目录（需保存后生效）", "checkForUpdates": "检查更新", @@ -601,6 +643,7 @@ "releaseNotes": "更新日志", "viewReleaseNotes": "查看该版本更新日志", "viewCurrentReleaseNotes": "查看当前版本更新日志", + "officialWebsite": "官方网站", "oneClickInstall": "一键安装", "oneClickInstallHint": "安装 Claude Code / Codex / Gemini CLI / OpenCode", "localEnvCheck": "本地环境检查", @@ -655,14 +698,17 @@ }, "apps": { "claude": "Claude", + "claudeDesktop": "Claude Desktop", + "claude-desktop": "Claude Desktop", "codex": "Codex", "gemini": "Gemini", "opencode": "OpenCode", - "openclaw": "OpenClaw" + "openclaw": "OpenClaw", + "hermes": "Hermes" }, "sessionManager": { "title": "会话管理", - "subtitle": "管理 Claude Code、Codex、OpenCode、OpenClaw 与 Gemini CLI 会话记录", + "subtitle": "管理 Claude Code、Codex、OpenCode、OpenClaw、Hermes 与 Gemini CLI 会话记录", "searchPlaceholder": "搜索会话内容、目录或 ID", "searchSessions": "搜索会话", "providerFilterAll": "全部", @@ -791,11 +837,16 @@ "ctok": "官网加入CTok社群，订阅套餐。", "ddshub": "呆呆兽为CC Switch 的用户提供了特别福利，通过此链接注册后，首单充值可额外赠送 10% 额度（联系群主领取）！", "lionccapi": "LionCCAPI 为 CC Switch 的用户提供了特别福利，注册后添加客服微信HSQBJ088888888，发暗号cc-switch备注即可送10美金额度！", - "shengsuanyun": "胜算云为 CC Switch 的用户提供了特别福利，使用此链接注册的新用户可获 10 元模力及首充 10% 赠送！" + "shengsuanyun": "胜算云为 CC Switch 的用户提供了特别福利，使用此链接注册的新用户可获 10 元模力及首充 10% 赠送！", + "lemondata": "Lemon Code 为 CC Switch 的用户提供了特别优惠。使用此链接注册可以获得1美元免费额度。" }, "presets": { "ucloud": "优云智算", - "shengsuanyun": "胜算云" + "ucloudCoding": "优云智算Coding Plan", + "shengsuanyun": "胜算云", + "openrouter": "OpenRouter", + "deepseek": "DeepSeek", + "together": "Together AI" }, "parameterConfig": "参数配置 - {{name}} *", "mainModel": "主模型 (可选)", @@ -813,6 +864,11 @@ "fillTemplateValue": "请填写 {{label}}", "endpointRequired": "非官方供应商请填写 API 端点", "apiKeyRequired": "非官方供应商请填写 API Key", + "softValidation": { + "title": "配置存在以下问题", + "hint": "仍要保存吗？保存后切换此供应商时可能失败，可以之后再补全。", + "saveAnyway": "仍要保存" + }, "configJsonError": "配置JSON格式错误，请检查语法", "authJsonRequired": "auth.json 必须是 JSON 对象", "authJsonError": "auth.json 格式错误，请检查JSON语法", @@ -821,7 +877,6 @@ "visitWebsite": "访问 {{url}}", "anthropicModel": "主模型", "anthropicSmallFastModel": "快速模型", - "anthropicReasoningModel": "推理模型 (Thinking)", "apiFormat": "API 格式", "apiFormatHint": "选择供应商 API 的输入格式", "fullUrlLabel": "完整 URL", @@ -865,6 +920,7 @@ "fetchModelsNeedConfig": "请先填写 API 端点和 API Key", "fetchModelsAuthFailed": "API Key 无效或无权限", "fetchModelsNotSupported": "该供应商不支持获取模型列表", + "fetchModelsEndpointNotFound": "未找到可用的模型列表端点，请检查 Base URL 或确认供应商是否开放该接口", "fetchModelsTimeout": "请求超时，请检查网络连接" }, "copilot": { @@ -920,7 +976,9 @@ "addAnotherAccount": "添加其他账号", "logoutAll": "注销所有账号", "retry": "重试", - "copyCode": "复制代码" + "copyCode": "复制代码", + "fastMode": "FAST 模式", + "fastModeDescription": "发送 service_tier=\"priority\" 换取更低延迟。默认关闭——开启后会按更高速率消耗 ChatGPT 配额。" }, "endpointTest": { "title": "请求地址管理", @@ -1310,7 +1368,8 @@ "codex": "Codex", "gemini": "Gemini", "opencode": "OpenCode", - "openclaw": "OpenClaw" + "openclaw": "OpenClaw", + "hermes": "Hermes" } }, "userLevelPath": "用户级 MCP 配置路径", @@ -1630,6 +1689,69 @@ "primaryModel": "默认模型", "fallbackModel": "回退模型" }, + "hermes": { + "form": { + "baseUrl": "API 端点", + "baseUrlHint": "供应商的 API 端点地址。", + "providerKey": "供应商标识", + "providerKeyPlaceholder": "my-provider", + "providerKeyHint": "只能使用小写字母、数字和连字符。用作 config.yaml 中的供应商名称。", + "providerKeyLockedHint": "该供应商已添加到 Hermes 配置中，标识不可修改。", + "providerKeyRequired": "供应商标识不能为空", + "providerKeyInvalid": "供应商标识只能包含小写字母、数字和连字符", + "providerKeyDuplicate": "该供应商标识已存在", + "apiMode": "API 模式", + "apiModeHint": "供应商 API 协议。请根据端点选择正确的协议。", + "apiModeChatCompletions": "OpenAI Chat Completions", + "apiModeAnthropicMessages": "Anthropic Messages", + "apiModeCodexResponses": "OpenAI Responses", + "apiModeBedrockConverse": "AWS Bedrock Converse", + "baseUrlRequired": "API 端点不能为空", + "baseUrlScheme": "请使用 http:// 或 https:// 开头的地址", + "baseUrlInvalid": "API 端点不是有效的 URL", + "models": "模型列表", + "addModel": "添加模型", + "noModels": "暂无模型配置。切换到此供应商时将不会更新默认模型。", + "modelId": "模型 ID", + "modelIdPlaceholder": "anthropic/claude-opus-4-7", + "modelName": "显示名称", + "modelNamePlaceholder": "Claude Opus 4.7", + "contextLength": "上下文长度", + "advancedOptions": "高级选项", + "modelsHint": "切换到此供应商时，第一个模型会写入顶层 model.default。", + "primaryModel": "默认模型", + "fallbackModel": "备选模型", + "providerAdvanced": "供应商高级选项", + "rateLimitDelay": "请求间隔（秒）", + "rateLimitDelayHint": "连续请求间的最小间隔秒数（可选）。留空表示无限制。" + }, + "webui": { + "open": "打开 Hermes Web UI", + "offline": "Hermes Web UI 未启动，请先运行 `hermes dashboard` 启动服务。", + "openFailed": "打开 Hermes Web UI 失败", + "launchConfirmTitle": "Hermes Dashboard 未启动", + "launchConfirmMessage": "是否打开终端并运行 `hermes dashboard` 启动服务？\n\n启动完成后会自动打开浏览器。\n\n若终端提示找不到 hermes 或缺少 web 依赖，请先运行：\npip install hermes-agent[web]", + "launchConfirmAction": "打开终端并启动", + "launching": "已在终端启动 hermes dashboard", + "launchFailed": "打开终端失败" + }, + "memory": { + "title": "记忆管理", + "agentTab": "Agent 记忆 (MEMORY.md)", + "userTab": "用户画像 (USER.md)", + "usage": "已用 {{current}} / {{limit}} 字符", + "overLimit": "已超过上限，Hermes 下次加载时会截断", + "enableOn": "已启用", + "enableOff": "已禁用", + "disabledHint": "在重新启用前 Hermes 会跳过此记忆", + "toggleFailed": "切换记忆状态失败", + "saveSuccess": "记忆已保存", + "saveFailed": "保存记忆失败", + "loadFailed": "读取记忆文件失败", + "openConfig": "在 Hermes Web UI 调整上限", + "runtimeNote": "更改将在 Hermes 下次启动或新建会话时生效。" + } + }, "env": { "warning": { "title": "检测到系统环境变量冲突", @@ -2058,7 +2180,7 @@ "hint": "选择要路由的应用，启用后该应用的请求将通过本地路由转发", "enabled": "{{app}} 路由已启用", "disabled": "{{app}} 路由已关闭", - "failed": "切换路由状态失败", + "failed": "切换路由状态失败: {{detail}}", "tooltip": { "active": "{{appLabel}} 路由中 - {{address}}:{{port}}\n切换该应用供应商为热切换", "broken": "{{appLabel}} 路由中，但路由服务未运行", @@ -2155,6 +2277,8 @@ "error": "{{providerName}} 检查出错: {{error}}", "modelNotFound": "{{providerName}} 测试模型 {{model}} 不存在或已下架", "modelNotFoundHint": "该模型可能已被供应商弃用。请在\"模型测试配置\"中更新默认测试模型。", + "quotaExceeded": "{{providerName}} Coding Plan 额度已用尽", + "quotaExceededHint": "百度千帆返回了 Coding Plan 超额错误。请等待 5 小时/每周/每月额度刷新，或在千帆控制台切换套餐。", "httpHint": { "400": "供应商拒绝了请求格式。健康检查的探测格式可能与实际使用不同。", "401": "API Key 可能无效，或供应商使用 OAuth 等认证方式。检查失败不代表实际不可用。", @@ -2209,6 +2333,9 @@ } }, "universalProvider": { + "duplicate": "复制", + "duplicatedAndSynced": "统一供应商已复制并同步", + "duplicateError": "复制统一供应商失败", "title": "统一供应商", "description": "统一供应商可以同时管理 Claude、Codex 和 Gemini 的配置。修改后会自动同步到所有启用的应用。", "add": "添加统一供应商", @@ -2390,7 +2517,7 @@ "artistry": "高度创意与艺术性任务类别，激发新颖想法和创造性解决方案，默认使用 Gemini 3 Pro 的最大变体。", "quick": "轻量任务类别，用于单文件修改、错别字修复、简单调整等琐碎工作，默认使用 Claude Haiku 4.5 快速模型。", "unspecifiedLow": "未归类低工作量任务类别，适用于不适合其他类别且工作量较小的任务，默认使用 Claude Sonnet 4.5。", - "unspecifiedHigh": "未归类高工作量任务类别，适用于不适合其他类别且工作量较大的任务，默认使用 Claude Opus 4.6 的最大变体。", + "unspecifiedHigh": "未归类高工作量任务类别，适用于不适合其他类别且工作量较大的任务，默认使用 Claude Opus 4.7 的最大变体。", "writing": "写作类别，专注于文档、散文和技术写作，默认使用 Gemini 3 Flash 快速生成模型。" }, "slimAgentDesc": { diff --git a/src/icons/extracted/claudecn.png b/src/icons/extracted/claudecn.png new file mode 100644 index 000000000..8867e40b4 Binary files /dev/null and b/src/icons/extracted/claudecn.png differ diff --git a/src/icons/extracted/hermes.png b/src/icons/extracted/hermes.png new file mode 100644 index 000000000..2d3fa5670 Binary files /dev/null and b/src/icons/extracted/hermes.png differ diff --git a/src/icons/extracted/index.ts b/src/icons/extracted/index.ts index 821de195f..00673e206 100644 --- a/src/icons/extracted/index.ts +++ b/src/icons/extracted/index.ts @@ -3,6 +3,8 @@ import _dds from "./dds.svg?url"; import _eflowcode from "./eflowcode.png"; +import _hermes from "./hermes.png"; +import _lemondata from "./lemondata.png"; import _pipellm from "./pipellm.png"; import _shengsuanyun from "./shengsuanyun.svg?url"; @@ -81,6 +83,8 @@ export const icons: Record = { export const iconUrls: Record = { dds: _dds, eflowcode: _eflowcode, + hermes: _hermes, + lemondata: _lemondata, pipellm: _pipellm, shengsuanyun: _shengsuanyun, }; diff --git a/src/icons/extracted/lemondata.png b/src/icons/extracted/lemondata.png new file mode 100644 index 000000000..8a6d7ace9 Binary files /dev/null and b/src/icons/extracted/lemondata.png differ diff --git a/src/icons/extracted/metadata.ts b/src/icons/extracted/metadata.ts index 04e986459..6252c321c 100644 --- a/src/icons/extracted/metadata.ts +++ b/src/icons/extracted/metadata.ts @@ -268,6 +268,20 @@ export const iconMetadata: Record = { keywords: ["openclaw", "lobster", "claw"], defaultColor: "#ff4f40", }, + hermes: { + name: "hermes", + displayName: "Hermes", + category: "ai-provider", + keywords: ["hermes", "agent", "nous", "nousresearch"], + defaultColor: "#000000", + }, + lemondata: { + name: "lemondata", + displayName: "LemonData", + category: "ai-provider", + keywords: ["lemondata", "lemon", "lemoncode"], + defaultColor: "#F5C518", + }, packycode: { name: "packycode", displayName: "PackyCode", diff --git a/src/icons/extracted/runapi.jpg b/src/icons/extracted/runapi.jpg new file mode 100644 index 000000000..66bdbaf8b Binary files /dev/null and b/src/icons/extracted/runapi.jpg differ diff --git a/src/index.css b/src/index.css index b5094c7f5..dab861f72 100644 --- a/src/index.css +++ b/src/index.css @@ -191,41 +191,3 @@ input[type="password"]::-ms-reveal, input[type="password"]::-ms-clear { display: none; } - -::view-transition-old(root), -::view-transition-new(root) { - animation: none; - mix-blend-mode: normal; -} - -::view-transition-old(root) { - z-index: 1; -} - -::view-transition-new(root) { - z-index: 9999; -} - -@keyframes theme-circle-expand { - from { - clip-path: circle( - 0% at var(--theme-transition-x, 50%) var(--theme-transition-y, 50%) - ); - } - - to { - clip-path: circle( - 150% at var(--theme-transition-x, 50%) var(--theme-transition-y, 50%) - ); - } -} - -::view-transition-new(root) { - animation: theme-circle-expand 0.4s ease-out; -} - -@media (prefers-reduced-motion: reduce) { - ::view-transition-new(root) { - animation: none; - } -} diff --git a/src/lib/api/hermes.ts b/src/lib/api/hermes.ts new file mode 100644 index 000000000..c212a0429 --- /dev/null +++ b/src/lib/api/hermes.ts @@ -0,0 +1,67 @@ +import { invoke } from "@tauri-apps/api/core"; +import type { + HermesMemoryKind, + HermesMemoryLimits, + HermesModelConfig, +} from "@/types"; + +/** + * Hermes Agent configuration API (CC Switch side). + * + * CC Switch intentionally keeps its Hermes surface minimal — deep configuration + * (model, agent behavior, env vars, skills, cron, logs, analytics) lives in + * the Hermes Web UI at http://127.0.0.1:9119. CC Switch only reads the `model` + * section to highlight the active provider and launches the Hermes Web UI for + * everything else. Writes to `model` happen implicitly via + * `apply_switch_defaults` when the user switches providers. + */ +export const hermesApi = { + async getModelConfig(): Promise { + return await invoke("get_hermes_model_config"); + }, + + /** + * Probe the local Hermes Web UI and open it in the system browser. + * Optional `path` lets callers deep-link to specific pages like `/config`. + */ + async openWebUI(path?: string): Promise { + await invoke("open_hermes_web_ui", { path: path ?? null }); + }, + + /** Open the preferred terminal and run `hermes dashboard` (non-blocking). */ + async launchDashboard(): Promise { + await invoke("launch_hermes_dashboard"); + }, + + /** + * Read one of Hermes' memory blobs (`MEMORY.md` or `USER.md`). Returns an + * empty string when the file hasn't been created yet. + */ + async getMemory(kind: HermesMemoryKind): Promise { + return await invoke("get_hermes_memory", { kind }); + }, + + /** Atomically overwrite a Hermes memory file. */ + async setMemory(kind: HermesMemoryKind, content: string): Promise { + await invoke("set_hermes_memory", { kind, content }); + }, + + /** + * Character budgets + enable flags for both memory blobs, read from + * config.yaml with Hermes defaults as fallback. + */ + async getMemoryLimits(): Promise { + return await invoke("get_hermes_memory_limits"); + }, + + /** + * Toggle the on/off flag for one memory blob. Other fields in the `memory:` + * section (budgets, external provider config) are preserved. + */ + async setMemoryEnabled( + kind: HermesMemoryKind, + enabled: boolean, + ): Promise { + await invoke("set_hermes_memory_enabled", { kind, enabled }); + }, +}; diff --git a/src/lib/api/model-fetch.ts b/src/lib/api/model-fetch.ts index 2595587d6..2b8cc1b71 100644 --- a/src/lib/api/model-fetch.ts +++ b/src/lib/api/model-fetch.ts @@ -10,15 +10,21 @@ export interface FetchedModel { /** * 从供应商获取可用模型列表 * - * 使用 OpenAI 兼容的 GET /v1/models 端点。 - * 主要面向第三方聚合站（硅基流动、OpenRouter 等）。 + * 使用 OpenAI 兼容的 GET /v1/models 端点。优先用 `modelsUrl` 精确覆写； + * 否则后端会对 baseURL 生成候选列表并按序尝试（含"剥离 /anthropic 等兼容子路径"兜底）。 */ export async function fetchModelsForConfig( baseUrl: string, apiKey: string, isFullUrl?: boolean, + modelsUrl?: string, ): Promise { - return invoke("fetch_models_for_config", { baseUrl, apiKey, isFullUrl }); + return invoke("fetch_models_for_config", { + baseUrl, + apiKey, + isFullUrl, + modelsUrl, + }); } /** @@ -50,8 +56,13 @@ export function showFetchModelsError( toast.error(t("providerForm.fetchModelsAuthFailed")); return; } + // 所有候选端点均返回 404/405：供应商可能未开放 /models 接口，或 Base URL 有误 + if (msg.includes("All candidates failed")) { + toast.error(t("providerForm.fetchModelsEndpointNotFound")); + return; + } if (msg.includes("HTTP 404") || msg.includes("HTTP 405")) { - toast.error(t("providerForm.fetchModelsNotSupported")); + toast.error(t("providerForm.fetchModelsEndpointNotFound")); return; } if (msg.includes("timeout") || msg.includes("timed out")) { diff --git a/src/lib/api/providers.ts b/src/lib/api/providers.ts index 89b6b7c7f..433c5f2bd 100644 --- a/src/lib/api/providers.ts +++ b/src/lib/api/providers.ts @@ -25,6 +25,28 @@ export interface OpenTerminalOptions { cwd?: string; } +export interface ClaudeDesktopStatus { + supported: boolean; + configured: boolean; + appliedId?: string | null; + profilePath?: string | null; + configLibraryPath?: string | null; + mode?: "direct" | "proxy" | null; + expectedBaseUrl?: string | null; + actualBaseUrl?: string | null; + proxyRunning: boolean; + staleRawModels: boolean; + missingRouteMappings: boolean; + gatewayTokenConfigured: boolean; +} + +export interface ClaudeDesktopDefaultRoute { + routeId: string; + envKey: string; + displayName: string; + supports1m: boolean; +} + export const providersApi = { async getAll(appId: AppId): Promise> { return await invoke("get_providers", { app: appId }); @@ -74,6 +96,18 @@ export const providersApi = { return await invoke("import_default_config", { app: appId }); }, + async importClaudeDesktopFromClaude(): Promise { + return await invoke("import_claude_desktop_providers_from_claude"); + }, + + async getClaudeDesktopStatus(): Promise { + return await invoke("get_claude_desktop_status"); + }, + + async getClaudeDesktopDefaultRoutes(): Promise { + return await invoke("get_claude_desktop_default_routes"); + }, + async updateTrayMenu(): Promise { return await invoke("update_tray_menu"); }, @@ -136,6 +170,14 @@ export const providersApi = { return await invoke("get_openclaw_live_provider_ids"); }, + /** + * 获取 Hermes live 配置中的供应商 ID 列表 + * 用于前端判断供应商是否已添加到 Hermes 配置 + */ + async getHermesLiveProviderIds(): Promise { + return await invoke("get_hermes_live_provider_ids"); + }, + /** * 从 OpenClaw live 配置导入供应商到数据库 * OpenClaw 特有功能：由于累加模式，用户可能已在 openclaw.json 中配置供应商 @@ -143,6 +185,14 @@ export const providersApi = { async importOpenClawFromLive(): Promise { return await invoke("import_openclaw_providers_from_live"); }, + + /** + * 从 Hermes live 配置导入供应商到数据库 + * Hermes 特有功能：由于累加模式，用户可能已在 Hermes 配置中配置供应商 + */ + async importHermesFromLive(): Promise { + return await invoke("import_hermes_providers_from_live"); + }, }; // ============================================================================ diff --git a/src/lib/api/skills.ts b/src/lib/api/skills.ts index 456e57b67..191ca384b 100644 --- a/src/lib/api/skills.ts +++ b/src/lib/api/skills.ts @@ -2,15 +2,24 @@ import { invoke } from "@tauri-apps/api/core"; import type { AppId } from "@/lib/api/types"; -export type AppType = "claude" | "codex" | "gemini" | "opencode" | "openclaw"; +export type AppType = + | "claude" + | "claude-desktop" + | "codex" + | "gemini" + | "opencode" + | "openclaw" + | "hermes"; /** Skill 应用启用状态 */ export interface SkillApps { claude: boolean; + "claude-desktop"?: boolean; codex: boolean; gemini: boolean; opencode: boolean; openclaw: boolean; + hermes: boolean; } /** 已安装的 Skill（v3.10.0+ 统一结构） */ diff --git a/src/lib/api/types.ts b/src/lib/api/types.ts index 1fff721fc..72b5ec28d 100644 --- a/src/lib/api/types.ts +++ b/src/lib/api/types.ts @@ -1,2 +1,9 @@ // 前端统一使用 AppId 作为应用标识（与后端命令参数 `app` 一致） -export type AppId = "claude" | "codex" | "gemini" | "opencode" | "openclaw"; +export type AppId = + | "claude" + | "claude-desktop" + | "codex" + | "gemini" + | "opencode" + | "openclaw" + | "hermes"; diff --git a/src/lib/query/mutations.ts b/src/lib/query/mutations.ts index e5ab2815c..51d3058dd 100644 --- a/src/lib/query/mutations.ts +++ b/src/lib/query/mutations.ts @@ -8,6 +8,7 @@ import type { Provider, SessionMeta, Settings } from "@/types"; import { extractErrorMessage } from "@/utils/errorUtils"; import { generateUUID } from "@/utils/uuid"; import { openclawKeys } from "@/hooks/useOpenClaw"; +import { invalidateHermesProviderCaches } from "@/hooks/useHermes"; export const useAddProviderMutation = (appId: AppId) => { const queryClient = useQueryClient(); @@ -22,7 +23,7 @@ export const useAddProviderMutation = (appId: AppId) => { ) => { let id: string; - if (appId === "opencode" || appId === "openclaw") { + if (appId === "opencode" || appId === "openclaw" || appId === "hermes") { if ( providerInput.category === "omo" || providerInput.category === "omo-slim" @@ -75,6 +76,10 @@ export const useAddProviderMutation = (appId: AppId) => { }); } + if (appId === "hermes") { + await invalidateHermesProviderCaches(queryClient); + } + try { await providersApi.updateTrayMenu(); } catch (trayError) { @@ -127,6 +132,9 @@ export const useUpdateProviderMutation = (appId: AppId) => { queryKey: openclawKeys.health, }); } + if (appId === "hermes") { + await invalidateHermesProviderCaches(queryClient); + } toast.success( t("notifications.updateSuccess", { defaultValue: "供应商更新成功", @@ -180,6 +188,10 @@ export const useDeleteProviderMutation = (appId: AppId) => { }); } + if (appId === "hermes") { + await invalidateHermesProviderCaches(queryClient); + } + try { await providersApi.updateTrayMenu(); } catch (trayError) { @@ -220,6 +232,12 @@ export const useSwitchProviderMutation = (appId: AppId) => { }, onSuccess: async () => { await queryClient.invalidateQueries({ queryKey: ["providers", appId] }); + if (appId === "claude-desktop") { + await queryClient.invalidateQueries({ queryKey: ["proxyStatus"] }); + await queryClient.invalidateQueries({ + queryKey: ["claudeDesktopStatus"], + }); + } // OpenCode/OpenClaw: also invalidate live provider IDs cache to update button state if (appId === "opencode") { @@ -244,6 +262,9 @@ export const useSwitchProviderMutation = (appId: AppId) => { queryKey: openclawKeys.health, }); } + if (appId === "hermes") { + await invalidateHermesProviderCaches(queryClient); + } try { await providersApi.updateTrayMenu(); diff --git a/src/lib/query/queries.ts b/src/lib/query/queries.ts index 43034d000..ef0711c36 100644 --- a/src/lib/query/queries.ts +++ b/src/lib/query/queries.ts @@ -17,6 +17,7 @@ import type { SessionMeta, SessionMessage, } from "@/types"; +import { usageKeys } from "@/lib/query/usage"; const sortProviders = ( providers: Record, @@ -113,7 +114,7 @@ export const useUsageQuery = ( : 5 * 60 * 1000; // 默认 5 分钟 const query = useQuery({ - queryKey: ["usage", providerId, appId], + queryKey: usageKeys.script(providerId, appId), queryFn: async () => usageApi.query(providerId, appId), enabled: enabled && !!providerId, refetchInterval: diff --git a/src/lib/query/subscription.ts b/src/lib/query/subscription.ts index f79dd1d6b..4262b55aa 100644 --- a/src/lib/query/subscription.ts +++ b/src/lib/query/subscription.ts @@ -7,13 +7,18 @@ import { PROVIDER_TYPES } from "@/config/constants"; const REFETCH_INTERVAL = 5 * 60 * 1000; // 5 minutes +export const subscriptionKeys = { + all: ["subscription"] as const, + quota: (appId: AppId) => [...subscriptionKeys.all, "quota", appId] as const, +}; + export function useSubscriptionQuota( appId: AppId, enabled: boolean, autoQuery = false, ) { return useQuery({ - queryKey: ["subscription", "quota", appId], + queryKey: subscriptionKeys.quota(appId), queryFn: () => subscriptionApi.getQuota(appId), enabled: enabled && ["claude", "codex", "gemini"].includes(appId), refetchInterval: autoQuery ? REFETCH_INTERVAL : false, diff --git a/src/lib/query/usage.ts b/src/lib/query/usage.ts index ed565508d..22cea395a 100644 --- a/src/lib/query/usage.ts +++ b/src/lib/query/usage.ts @@ -106,6 +106,8 @@ export const usageKeys = { pricing: () => [...usageKeys.all, "pricing"] as const, limits: (providerId: string, appType: string) => [...usageKeys.all, "limits", providerId, appType] as const, + script: (providerId: string, appType: string) => + [...usageKeys.all, providerId, appType] as const, }; // Hooks diff --git a/src/lib/schemas/settings.ts b/src/lib/schemas/settings.ts index aa0dad12e..82e9a510d 100644 --- a/src/lib/schemas/settings.ts +++ b/src/lib/schemas/settings.ts @@ -26,6 +26,7 @@ export const settingsSchema = z.object({ // 当前供应商 ID（设备级） currentProviderClaude: z.string().optional(), + currentProviderClaudeDesktop: z.string().optional(), currentProviderCodex: z.string().optional(), currentProviderGemini: z.string().optional(), diff --git a/src/types.ts b/src/types.ts index 8379c217b..2791a23bf 100644 --- a/src/types.ts +++ b/src/types.ts @@ -74,6 +74,20 @@ export interface UsageScript { }; } +const DEFAULT_USAGE_SCRIPT: UsageScript = { + enabled: false, + language: "javascript", + code: "", + timeout: 10, + autoQueryInterval: 5, +}; + +export function createUsageScript( + overrides?: Partial, +): UsageScript { + return { ...DEFAULT_USAGE_SCRIPT, ...overrides }; +} + // 单个套餐用量数据 export interface UsageData { planName?: string; // 套餐名称（可选） @@ -117,12 +131,22 @@ export interface AuthBinding { accountId?: string; } +export interface ClaudeDesktopModelRoute { + model: string; + displayName?: string; + supports1m?: boolean; +} + // 供应商元数据（字段名与后端一致，保持 snake_case） export interface ProviderMeta { // 自定义端点：以 URL 为键，值为端点信息 custom_endpoints?: Record; // 是否在切换/同步到 live 时应用通用配置片段 commonConfigEnabled?: boolean; + // Claude Desktop 3P 配置写入模式 + claudeDesktopMode?: "direct" | "proxy"; + // Claude Desktop 本地路由模式：Claude-safe route -> upstream model + claudeDesktopModelRoutes?: Record; // 用量查询脚本配置 usage_script?: UsageScript; // 请求地址管理：测速后自动选择最佳端点 @@ -155,6 +179,8 @@ export interface ProviderMeta { isFullUrl?: boolean; // Prompt cache key for OpenAI Responses-compatible endpoints (improves cache hit rate) promptCacheKey?: string; + // Codex OAuth FAST mode: injects service_tier="priority" on ChatGPT Codex requests + codexFastMode?: boolean; // 供应商类型（用于识别 Copilot 等特殊供应商） providerType?: string; // GitHub Copilot 关联账号 ID（旧字段，保留兼容读取） @@ -184,10 +210,12 @@ export type ClaudeApiKeyField = "ANTHROPIC_AUTH_TOKEN" | "ANTHROPIC_API_KEY"; // 主页面显示的应用配置 export interface VisibleApps { claude: boolean; + "claude-desktop": boolean; codex: boolean; gemini: boolean; opencode: boolean; openclaw: boolean; + hermes: boolean; } // WebDAV 同步状态 @@ -281,10 +309,14 @@ export interface Settings { opencodeConfigDir?: string; // 覆盖 OpenClaw 配置目录（可选） openclawConfigDir?: string; + // 覆盖 Hermes 配置目录（可选） + hermesConfigDir?: string; // ===== 当前供应商 ID（设备级）===== // 当前 Claude 供应商 ID（优先于数据库 is_current） currentProviderClaude?: string; + // 当前 Claude Desktop 供应商 ID（优先于数据库 is_current） + currentProviderClaudeDesktop?: string; // 当前 Codex 供应商 ID（优先于数据库 is_current） currentProviderCodex?: string; // 当前 Gemini 供应商 ID（优先于数据库 is_current） @@ -350,10 +382,12 @@ export interface McpServerSpec { // v3.7.0: MCP 服务器应用启用状态 export interface McpApps { claude: boolean; + "claude-desktop"?: boolean; codex: boolean; gemini: boolean; opencode: boolean; openclaw: boolean; + hermes: boolean; } // MCP 服务器条目（v3.7.0 统一结构） @@ -569,3 +603,25 @@ export interface OpenClawToolsConfig { deny?: string[]; [key: string]: unknown; // preserve unknown fields } + +// ============================================================================ +// Hermes Agent 专属配置 +// ============================================================================ + +export interface HermesModelConfig { + default?: string; + provider?: string; + base_url?: string; + context_length?: number; + max_tokens?: number; + [key: string]: unknown; +} + +export type HermesMemoryKind = "memory" | "user"; + +export interface HermesMemoryLimits { + memory: number; + user: number; + memoryEnabled: boolean; + userEnabled: boolean; +} diff --git a/src/types/omo.ts b/src/types/omo.ts index 2ce50efa6..665306c88 100644 --- a/src/types/omo.ts +++ b/src/types/omo.ts @@ -29,7 +29,7 @@ export const OMO_BUILTIN_AGENTS: OmoAgentDef[] = [ display: "Sisyphus", descKey: "omo.agentDesc.sisyphus", tooltipKey: "omo.agentTooltip.sisyphus", - recommended: "claude-opus-4-6", + recommended: "claude-opus-4-7", group: "main", }, { @@ -45,7 +45,7 @@ export const OMO_BUILTIN_AGENTS: OmoAgentDef[] = [ display: "Prometheus", descKey: "omo.agentDesc.prometheus", tooltipKey: "omo.agentTooltip.prometheus", - recommended: "claude-opus-4-6", + recommended: "claude-opus-4-7", group: "main", }, { @@ -93,7 +93,7 @@ export const OMO_BUILTIN_AGENTS: OmoAgentDef[] = [ display: "Metis", descKey: "omo.agentDesc.metis", tooltipKey: "omo.agentTooltip.metis", - recommended: "claude-opus-4-6", + recommended: "claude-opus-4-7", group: "sub", }, { @@ -161,7 +161,7 @@ export const OMO_BUILTIN_CATEGORIES: OmoCategoryDef[] = [ display: "Unspecified High", descKey: "omo.categoryDesc.unspecifiedHigh", tooltipKey: "omo.categoryTooltip.unspecifiedHigh", - recommended: "claude-opus-4-6", + recommended: "claude-opus-4-7", }, { key: "writing", @@ -280,7 +280,7 @@ export const OMO_BACKGROUND_TASK_PLACEHOLDER = `{ "google": 10 }, "modelConcurrency": { - "anthropic/claude-opus-4-6": 2, + "anthropic/claude-opus-4-7": 2, "google/gemini-3-flash": 10 } }`; @@ -319,7 +319,7 @@ export const OMO_SLIM_BUILTIN_AGENTS: OmoAgentDef[] = [ display: "Orchestrator", descKey: "omo.slimAgentDesc.orchestrator", tooltipKey: "omo.slimAgentTooltip.orchestrator", - recommended: "claude-opus-4-6", + recommended: "claude-opus-4-7", group: "main", }, { diff --git a/src/types/proxy.ts b/src/types/proxy.ts index 29fac7fc5..75f8c24b4 100644 --- a/src/types/proxy.ts +++ b/src/types/proxy.ts @@ -43,10 +43,12 @@ export interface ProxyServerInfo { export interface ProxyTakeoverStatus { claude: boolean; + "claude-desktop"?: boolean; codex: boolean; gemini: boolean; opencode: boolean; openclaw: boolean; + hermes: boolean; } export interface ProviderHealth { diff --git a/tests/components/CommonConfigEditor.test.tsx b/tests/components/CommonConfigEditor.test.tsx new file mode 100644 index 000000000..a4b0c9ceb --- /dev/null +++ b/tests/components/CommonConfigEditor.test.tsx @@ -0,0 +1,117 @@ +import type { ReactNode } from "react"; +import { fireEvent, render, screen } from "@testing-library/react"; +import { describe, expect, it, vi } from "vitest"; +import { CommonConfigEditor } from "@/components/providers/forms/CommonConfigEditor"; + +vi.mock("@/components/common/FullScreenPanel", () => ({ + FullScreenPanel: ({ + isOpen, + title, + onClose, + children, + footer, + }: { + isOpen: boolean; + title: string; + onClose: () => void; + children: ReactNode; + footer?: ReactNode; + }) => + isOpen ? ( +
+ +

{title}

+
{children}
+
{footer}
+
+ ) : null, +})); + +vi.mock("@/components/JsonEditor", () => ({ + default: ({ + value, + onChange, + }: { + value: string; + onChange: (value: string) => void; + }) => ( +