1059 Commits

This Branch

This Branch

All Branches

• merge: resolve conflicts from main branch, keep both pricing and common config features
  YoVinchen · 2026-01-27 12:49:36 +08:00
  40373538d3
• style(misc): inline format string variable
  YoVinchen · 2026-01-27 12:35:59 +08:00
  11a9bb0c14
• fix(config): resolve common config sync issues across frontend and backend

  - Fix backfill pollution: extract custom config from live when common config enabled
  - Fix proxy backup: merge common config before backup to preserve full config
  - Unify null override semantics: null no longer overrides in both frontend and backend
  - Add missing i18n keys for common config UI
  - Hide format button in readonly JsonEditor
  - Add mapGeminiWarningToI18n for user-friendly warning messages

  YoVinchen · 2026-01-27 12:28:46 +08:00
  9e25ecf475
• fix(settings): correct footer layout in advanced settings tab

  - Establish proper flexbox height chain from App to SettingsPage
  - Move save button to fixed footer outside scrollable area
  - Align footer styling with FullScreenPanel for consistency

  Jason · 2026-01-27 10:46:27 +08:00
  c74f801d66
• Feat/pricing config enhancement (#781)

  * feat(db): add pricing config fields to proxy_config table
  
  - Add default_cost_multiplier field per app type
  - Add pricing_model_source field (request/response)
  - Add request_model field to proxy_request_logs table
  - Implement schema migration v5
  
  * feat(api): add pricing config commands and provider meta fields
  
  - Add get/set commands for default cost multiplier
  - Add get/set commands for pricing model source
  - Extend ProviderMeta with cost_multiplier and pricing_model_source
  - Register new commands in Tauri invoke handler
  
  * fix(proxy): apply cost multiplier to total cost only
  
  - Move multiplier calculation from per-item to total cost
  - Add resolve_pricing_config for provider-level override
  - Include request_model and cost_multiplier in usage logs
  - Return new fields in get_request_logs API
  
  * feat(ui): add pricing config UI and usage log enhancements
  
  - Add pricing config section to provider advanced settings
  - Refactor PricingConfigPanel to compact table layout
  - Display all three apps (Claude/Codex/Gemini) in one view
  - Add multiplier column and request model display to logs
  - Add frontend API wrappers for pricing config
  
  * feat(i18n): add pricing config translations
  
  - Add zh/en/ja translations for pricing defaults config
  - Add translations for multiplier, requestModel, responseModel
  - Add provider pricing config translations
  
  * fix(pricing): align backfill cost calculation with real-time logic
  
  - Fix backfill to deduct cache_read_tokens from input (avoid double billing)
  - Apply multiplier only to total cost, not to each item
  - Add multiplier display in request detail panel with i18n support
  - Use AppError::localized for backend error messages
  - Fix init_proxy_config_rows to use per-app default values
  - Fix silent failure in set_default_cost_multiplier/set_pricing_model_source
  - Add clippy allow annotation for test mutex across await
  
  * style: format code with cargo fmt and prettier
  
  * fix(tests): correct error type assertions in proxy DAO tests
  
  The tests expected AppError::InvalidInput but the DAO functions use
  AppError::localized() which returns AppError::Localized variant.
  Updated assertions to match the correct error type with key validation.
  
  ---------
  
  Co-authored-by: Jason <farion1231@gmail.com>

  Dex Miller · 2026-01-27 10:43:05 +08:00
  785e1b5add
• merge: resolve conflict in live.rs, keep write_live_snapshot_with_merge

  - Combine doc comments from both branches
  - Keep write_live_snapshot_with_merge for common config runtime merge
  - Fix indentation to match main branch style

  YoVinchen · 2026-01-26 23:00:44 +08:00
  733605ae5c
• fix(config): improve Gemini common config parsing robustness

  - Add ENV format quote stripping (KEY="value" -> value)
  - Add toast warnings for filtered forbidden keys
  - Unify error codes with GEMINI_CONFIG_ERROR_CODES constants
  - Remove duplicate isPlainObject, use shared implementation
  - Fix type guard for filter entries

  YoVinchen · 2026-01-26 22:46:24 +08:00
  542d4635c4
• fix(config): improve Gemini merge and remove duplicate logging

  Address multiple audit findings:
  
  1. config_merge.rs:701 - Gemini merge now initializes env from common
     config when custom config has no env field, ensuring common API keys
     and base URLs are applied correctly.
  
  2. Remove duplicate logging - merge functions now only return warnings,
     callers (live.rs, proxy.rs) handle logging in one place.
  
  3. live.rs:169 - Unify error message style to plain English descriptions
     instead of error codes embedded in messages.
  
  Changes:
  - Add fallback to initialize env from common_env when missing
  - Remove log::warn! calls from merge functions
  - Use descriptive error messages consistently

  YoVinchen · 2026-01-26 17:13:38 +08:00
  4e4a445922
• fix(dialog): support wrapped format for Gemini common config

  Address audit finding: EditProviderDialog.tsx:121 only parsed flat JSON
  format, not the wrapped {"env": {...}} format.
  
  Changes:
  - Detect if common config is wrapped or flat format
  - Extract env object from either format
  - Properly compute difference for live settings extraction
  
  This ensures backward compatibility with existing wrapped-format data.

  YoVinchen · 2026-01-26 17:13:07 +08:00
  d5d7c87fd6
• fix(form): use JSON parsing for Gemini common config snippet

  Address audit finding: ProviderForm.tsx:944 was using envStringToObj()
  (KEY=VALUE format) to parse Gemini common config, but it's stored as JSON.
  
  Changes:
  - Add parseGeminiCommonConfig() helper function
  - Support both flat {"KEY": "VALUE"} and wrapped {"env": {...}} formats
  - Properly extract difference between custom and common env
  
  This prevents common config values from being incorrectly saved as
  custom config when the formats don't match.

  YoVinchen · 2026-01-26 17:11:18 +08:00
  1e1080c813
• fix(form): add type guard for Gemini env values

  Address code audit finding #10:
  
  Replace unsafe type assertion with proper type guard when extracting
  custom env config. Convert all values to strings explicitly using
  String() to prevent runtime type errors when env contains non-string
  values (numbers, booleans, etc).
  
  Before: envObj = customConfig as Record<string, string>
  After: Iterate and convert each value with String(value)

  YoVinchen · 2026-01-26 15:55:58 +08:00
  e393dda68e
• refactor(hooks): improve error handling and user feedback

  Address code audit findings #3, #5, #9:
  
  Save queue improvements:
  - Add error logging in enqueueSave() catch handlers
  - Use console.error with [SaveQueue] prefix for debugging
  - Prevent silent failures in async save operations
  
  Extract operation improvements:
  - Add toast.success() notification after extract completes
  - Notify user that custom config was automatically updated
  - Add error logging for failed settingsConfig updates
  
  I18n improvements:
  - Replace MCP i18n keys with dedicated Codex keys:
    - codexConfig.tomlFormatError
    - codexConfig.tomlSyntaxError
    - codexConfig.extractedTomlInvalid
  - Avoid namespace pollution between modules

  YoVinchen · 2026-01-26 15:55:40 +08:00
  0ecf6891c0
• feat(opencode): sync all providers to live config on directory change

  Add additive mode support for OpenCode in sync_current_to_live:
  - Add AppType::is_additive_mode() to distinguish switch vs additive mode
  - Add AppType::all() iterator to avoid hardcoding app lists
  - Add sync_all_providers_to_live() for additive mode apps
  - Refactor sync_current_to_live to handle both modes
  
  Frontend changes (directory settings):
  - Track opencodeDirChanged in useDirectorySettings
  - Trigger syncCurrentProvidersLiveSafe when OpenCode dir changes
  - Add i18n strings for OpenCode directory settings

  Jason · 2026-01-26 15:46:51 +08:00
  c00f431d67
• fix(dialog): unify Gemini common config format parsing

  Address code audit finding #4:
  
  The frontend was incorrectly parsing Gemini common config as KEY=VALUE
  format while the backend expects JSON format. Unify to use JSON parsing
  {"KEY": "VALUE"} which matches the format stored by useGeminiCommonConfig.
  
  Also add type guard when converting to string record to prevent type
  assertion issues with non-string values.

  YoVinchen · 2026-01-26 15:29:19 +08:00
  cfab768f95
• refactor(config): extract common config merge to shared function

  Address code audit findings #1, #2, #6, #7, #11:
  
  - Extract merge logic to merge_config_for_live() in config_merge.rs
  - Add is_common_config_enabled() helper function
  - Add MergeResult struct with config and optional warning
  - Update live.rs and proxy.rs to use the shared function
  - Add logging for JSON parse failures instead of silent fallback
  - Convert Chinese error messages to error codes (CODEX_CONFIG_*)
  - Support both flat and wrapped formats for Gemini common config
  
  This eliminates code duplication between live.rs and proxy.rs,
  making future maintenance easier and preventing behavioral drift.

  YoVinchen · 2026-01-26 15:25:13 +08:00
  73fea48049
• feat(dialog): extract custom config from live settings on edit

  Update EditProviderDialog to extract custom configuration from live
  settings when common config is enabled, ensuring the edit form shows
  only the provider-specific values.
  
  When loading live settings for editing:
  - Check if common config is enabled for the provider and app type
  - Fetch the common config snippet from database
  - Extract the difference (custom config) from live settings
  - Handle all three formats: Claude (JSON), Codex (TOML), Gemini (env)
  
  This prevents the merged common config values from appearing in the
  edit form, which would cause them to be saved as custom config and
  result in duplicate values after the next merge.

  YoVinchen · 2026-01-26 14:12:42 +08:00
  e54e4d47ae
• feat(form): extract custom config difference on provider save

  Update ProviderForm to extract only the custom (provider-specific)
  configuration when saving, removing common config values that would
  be merged at runtime.
  
  Changes:
  - Import configMerge utilities (extractDifference, extractTomlDifference)
  - Pass finalConfig from hooks to config editor components
  - On save, extract difference between current config and common snippet
  - Apply extraction for all three app types (Claude JSON, Codex TOML, Gemini env)
  
  This ensures the database stores only the provider's unique configuration,
  while the common config is stored separately and merged at runtime when
  writing to live files.

  YoVinchen · 2026-01-26 14:11:13 +08:00
  403c3f0690
• feat(ui): add merge preview to common config editor components

  Add real-time merge preview functionality to all config editor components
  (Claude, Codex, Gemini) that shows the final merged configuration when
  common config is enabled.
  
  UI changes:
  - Add finalConfig/finalEnv prop to display merged result
  - Add toggle button to show/hide merge preview (Eye/EyeOff icons)
  - Auto-show preview when common config is enabled
  - Display custom config editor with label when preview is visible
  - Show read-only merged preview below custom config
  - Add visual indicators: "只读" badge, green hint text
  
  The preview helps users understand how their custom configuration
  combines with the shared common config template before saving.

  YoVinchen · 2026-01-26 14:09:39 +08:00
  b3b3c0732a
• refactor(hooks): redesign common config hooks for runtime merge architecture

  Refactor all three common config hooks (Claude, Codex, Gemini) to support
  the new runtime merge architecture where:
  - settingsConfig stores only custom (provider-specific) configuration
  - commonConfigSnippet stores shared template configuration in database
  - finalConfig is computed at runtime: merge(commonConfig, customConfig)
  - Toggling common config only changes enabled state, not settingsConfig
  
  Key changes across all hooks:
  - Add finalConfig/finalEnv return value for merge preview
  - Use configMerge utilities (computeFinalConfig, extractDifference)
  - Remove direct config manipulation on toggle (no more inject/remove)
  - Add proper TypeScript return type interfaces
  - Simplify state management by removing unnecessary refs
  - Improve code organization with clear section comments
  
  This refactor enables:
  - Clean separation between custom and common configuration
  - Real-time merge preview in the UI
  - Consistent behavior across Claude (JSON), Codex (TOML), and Gemini (env)

  YoVinchen · 2026-01-26 14:09:13 +08:00
  2ff329f6c0
• feat(editor): add readOnly mode to JsonEditor component

  Add a readOnly prop to the JsonEditor component that:
  - Enables CodeMirror's EditorState.readOnly extension
  - Applies visual styling (reduced opacity, default cursor)
  - Prevents user modifications to the editor content
  
  This feature is needed for displaying merged config previews where
  users should see the final result but not edit it directly.

  YoVinchen · 2026-01-26 14:08:34 +08:00
  5817c9aa77
• fix(deeplink): disable common config for deeplink imported providers

  Set common_config_enabled to false by default for providers imported
  via deeplink URLs. This prevents unexpected configuration merging when
  users import providers from external sources.
  
  Deeplink imported providers should use their settings_config directly
  without merging with the global common config snippet, as the imported
  configuration is expected to be complete and self-contained.
  
  Changes:
  - Always return ProviderMeta with common_config_enabled = false
  - Refactor build_provider_meta to handle usage_script conditionally
  - Add documentation explaining the design decision

  YoVinchen · 2026-01-26 14:08:00 +08:00
  6425826e66
• feat(proxy): add common config merge to proxy live config restore

  Extend the proxy service's restore_live_config function to support
  common config runtime merge when restoring live configuration after
  proxy takeover ends.
  
  This ensures that when the proxy releases control and restores the
  original provider configuration, the common config merge is applied
  consistently with the main provider switching logic.
  
  The merge follows the same pattern as live.rs:
  - Check common_config_enabled flag per app type
  - Merge common snippet with provider's custom config
  - customConfig overrides commonConfig

  YoVinchen · 2026-01-26 14:07:37 +08:00
  2f18764490
• feat(provider): add common config runtime merge to live config sync

  Implement runtime merge of common config snippet with provider's custom
  config when writing to live configuration files. This enables shared
  configuration templates across providers while preserving provider-specific
  overrides.
  
  Key changes:
  - Add write_live_snapshot_with_merge() function that performs runtime merge
  - Support JSON merge for Claude, TOML merge for Codex, and env merge for Gemini
  - Update sync_current_to_live() to use the new merge function
  - Update provider switch and update operations to use merge function
  - Merge rule: customConfig (provider-specific) overrides commonConfig (shared)
  
  The merge is only performed when common_config_enabled is true for the
  provider and the corresponding app type.

  YoVinchen · 2026-01-26 14:07:05 +08:00
  7ad5a76c7a
• feat(config): add core utilities for config merge and difference extraction

  Add comprehensive config merge utilities for both Rust backend and TypeScript frontend
  to support the new common config architecture where customConfig overrides commonConfig.
  
  Backend (Rust):
  - Add config_merge.rs module with JSON and TOML merge functions
  - Support deep merge where source overrides target for nested objects
  - Add extract_difference functions to identify custom-only keys
  - Include compute_final_*_config functions for runtime merge calculation
  - Register module in lib.rs
  
  Frontend (TypeScript):
  - Add configMerge.ts with isPlainObject, deepClone, deepEqual, deepMerge utilities
  - Implement computeFinalConfig for merging common + custom configs
  - Add extractDifference to identify keys unique to live config
  - Add tomlConfigMerge.ts with TOML-specific merge/extract functions
  - Use smol-toml for parsing and serialization
  
  These utilities form the foundation for the refactored common config system
  where providers store only custom config and merge with shared templates at runtime.

  YoVinchen · 2026-01-26 13:57:48 +08:00
  b1446d0227
• refactor(config): consolidate get_home_dir into single public function

  Follow-up to #644: Extract duplicate get_home_dir() implementations
  into a single pub fn in config.rs, reducing code duplication across
  codex_config.rs, gemini_config.rs, and settings.rs.
  
  Also adds documentation comments to build.rs explaining the Windows
  manifest workaround for test binaries.

  Jason · 2026-01-26 11:24:28 +08:00
  29a0643d74
• feat(settings): add preferred terminal selection

  Allow users to choose their preferred terminal app for opening
  provider terminals. Supports platform-specific options:
  - macOS: Terminal.app, iTerm2, Alacritty, Kitty, Ghostty
  - Windows: cmd, PowerShell, Windows Terminal
  - Linux: GNOME Terminal, Konsole, Xfce4, Alacritty, Kitty, Ghostty
  
  Falls back to system default if selected terminal is unavailable.

  Jason · 2026-01-26 11:20:33 +08:00
  5e92111771
• refactor(terminal): consolidate redundant terminal launch functions

  Merge macOS Alacritty/Kitty/Ghostty launchers into a single generic
  `launch_macos_open_app` function with a `use_e_flag` parameter.
  Replace Windows cmd/PowerShell/wt launchers with a shared
  `run_windows_start_command` helper. Reduces ~98 lines of duplicate code.

  Jason · 2026-01-26 11:20:33 +08:00
  beebd9847f
• fix(windows): stabilize test environment (#644)

  * fix(windows): embed common-controls manifest
  
  * fix(windows): prefer HOME for config paths
  
  * test(windows): fix export_sql invalid path
  
  * fix(windows): remove unused env import in config.rs

  Xyfer · 2026-01-26 11:18:14 +08:00
  d99a3c2fee
• feat: add silent startup option to prevent window popup on launch (issue #708) (#713)
  funnytime · 2026-01-26 10:54:59 +08:00
  a0ca8c2517
• Merge branch 'main' into fix/common-config-sync-improvements
  YoVinchen · 2026-01-26 01:44:37 +08:00
  3da25e59cd
• fix(skills): prevent duplicate skill installation from different repos (#778)

  - Add directory conflict detection before installation
  - Fix installed status check to match repo owner and name
  - Add i18n translations for conflict error messages

  Dex Miller · 2026-01-25 23:35:04 +08:00
  3434dcb87c
• Merge branch 'main' into fix/common-config-sync-improvements
  YoVinchen · 2026-01-25 13:39:38 +08:00
  0938bd5e41
• refactor(config): improve TOML common config merge without markers

  - Remove cc-switch:common-config:start/end marker injection
  - Allow table definitions in common config snippets
  - Add intelligent TOML structure parsing and merging
  - Keep legacy marker cleanup for backward compatibility

  YoVinchen · 2026-01-25 04:38:38 +08:00
  62523ee17e
• chore: update Cargo.lock and format providerConfigUtils
  YoVinchen · 2026-01-25 03:46:45 +08:00
  0e75193e84
• feat(backend): add CommonConfigEnabledByApp to ProviderMeta

  - Add CommonConfigEnabledByApp struct for per-app tracking
  - Add common_config_enabled and common_config_enabled_by_app to ProviderMeta
  - Add is_empty() method to CommonConfigSnippets
  - Skip serializing empty common_config_snippets in config.json

  YoVinchen · 2026-01-25 03:46:22 +08:00
  078a3a6a53
• fix(form): add common config loading check and meta persistence

  - Check common config loading state before submit
  - Add validation for common config errors on submit
  - Add TOML validation for Codex before submit
  - Persist commonConfigEnabledByApp to provider meta
  - Pass currentProviderId to common config hooks for sync skip

  YoVinchen · 2026-01-25 03:45:51 +08:00
  d52f8855ea
• refactor(hooks): improve config state hooks for codex and gemini

  - Improve type safety in config state management
  - Better error handling for config parsing

  YoVinchen · 2026-01-25 03:45:19 +08:00
  628a659c0e
• feat(types): add CommonConfigEnabledByApp type for per-app tracking

  - Add CommonConfigEnabledByApp type for claude/codex/gemini
  - Add commonConfigEnabled field to ProviderMeta
  - Add commonConfigEnabledByApp field with higher priority

  YoVinchen · 2026-01-25 03:44:30 +08:00
  86cfa452e9
• feat(i18n): add common config sync related translations

  - Add providerForm.commonConfigLoading key
  - Add providerForm.commonConfigSyncFailed key
  - Support zh/en/ja languages

  YoVinchen · 2026-01-25 03:43:07 +08:00
  06d69caf79
• fix(gemini): add clearing sync and save queue for common config

  - Trigger sync when clearing common config to remove from all providers
  - Add saveSequenceRef and enqueueSave for ordered async saves
  - Add toast notification for sync failures
  - Prevent stale sync operations with sequence ID check

  YoVinchen · 2026-01-25 03:42:52 +08:00
  58f7be1517
• fix(codex): add TOML validation and clearing sync for common config

  - Add TomlValidationErrorCode type for structured error handling
  - Add TOML syntax validation in getSnippetApplyError
  - Trigger sync when clearing common config
  - Add saveSequenceRef and enqueueSave for ordered async saves
  - Add toast notification for sync failures

  YoVinchen · 2026-01-25 03:42:32 +08:00
  5d48dd7908
• fix(claude): add clearing sync and save queue for common config

  - Trigger sync when clearing common config to remove from all providers
  - Add saveSequenceRef and enqueueSave for ordered async saves
  - Add toast notification for sync failures
  - Prevent stale sync operations with sequence ID check

  YoVinchen · 2026-01-25 03:41:29 +08:00
  0e7e04581d
• fix(utils): add type validation and error codes for config utilities

  - Add isPlainObject validation in replaceGeminiCommonConfigSnippet
  - Return error codes instead of hardcoded Chinese strings
  - Add CONFIG_NOT_OBJECT, ENV_NOT_OBJECT, COMMON_CONFIG_JSON_INVALID codes
  - Use TOML marker constants to avoid hardcoded strings

  YoVinchen · 2026-01-25 03:39:02 +08:00
  788e138ece
• fix(sync): add in-flight lock and callback support for common config sync

  - Add SyncResult interface for structured sync results
  - Add SyncResultCallback type for async notification
  - Add syncInFlight lock per appType to prevent concurrent syncs
  - Add executeSyncWithLock function for concurrency control
  - Add meta fallback detection with automatic backfill
  - Improve error handling with detailed error messages

  YoVinchen · 2026-01-25 03:38:45 +08:00
  b692bb4053
• chore: update Cargo.lock version to 3.10.2
  Jason · 2026-01-24 23:49:06 +08:00
  1c6689a0bc
• feat(ui): replace update badge dot with ArrowUpCircle icon

  - Replace blue dot indicator with lucide ArrowUpCircle icon
  - Change color scheme from blue to green for better visibility
  - Enlarge button (h-8 w-8) and icon (h-5 w-5) for better UX
  - Move UpdateBadge from title area to after settings icon

  Jason · 2026-01-24 23:32:05 +08:00
  9404341f14
• chore: release v3.10.2
  Jason · 2026-01-24 22:15:21 +08:00
  v3.10.2 53dd0a90f3
• feat(skills): add skill sync method setting (symlink/copy)

  - Add SyncMethod enum (Auto/Symlink/Copy) in Rust backend
  - Implement sync_to_app_dir with symlink support (cross-platform)
  - Add SkillSyncMethodSettings UI component (simplified 2-button selector)
  - Add i18n support for zh/en/ja
  - Replace copy_to_app with configurable sync_to_app_dir
  - Add skill_sync_method field to AppSettings
  
  User can now choose between symlink (disk space saving) or copy (best compatibility) in Settings > General.

  Jason · 2026-01-24 18:24:05 +08:00
  779fefd86d
• feat(partner): add RightCode as official partner

  Update RightCode referral link to use CCSWITCH affiliate code and mark
  as official partner with promotional messages in all supported languages.

  Jason · 2026-01-23 22:59:48 +08:00
  096c1d57c4
• fix(prompt): clear prompt file when all prompts are disabled

  When disabling a prompt, check if any other prompts remain enabled.
  If all prompts are disabled, clear the prompt file to ensure UI state
  matches the actual configuration that Claude Code reads.

  Jason · 2026-01-23 22:43:07 +08:00
  adb868d0cf