- Replace global `is_empty_for_first_import()` with independent checks:
- `is_mcp_table_empty()` for MCP server imports
- `is_prompts_table_empty()` for prompt imports
- Skills and providers already have built-in idempotency checks
- Fix misleading logs in provider import:
- Change `import_default_config` return type from `Result<()>` to `Result<bool>`
- Return `true` when actually imported, `false` when skipped
- Only log success message when import actually occurred
- Add idempotency protection to `import_from_file_on_first_launch`
This allows each data type to be independently recovered if deleted,
rather than requiring all tables to be empty for any import to trigger.
Add recursive directory scanning to discover SKILL.md files in nested
directories. When a SKILL.md is found, treat sibling directories as
functional folders rather than separate skills.
Add get_effective_current_provider() to validate local settings ID
against database, with automatic cleanup and fallback to DB is_current.
This fixes edge cases in multi-device cloud sync scenarios where local
settings may contain stale provider IDs:
- current(): now returns validated effective provider ID
- update(): correctly syncs live config when local ID differs from DB
- delete(): checks both local settings and DB to prevent deletion
- switch(): backfill logic now targets valid provider
- sync_current_to_live(): uses validated ID with auto-fallback
- tray menu: displays correct checkmark on startup
Also fixes test issues:
- Add missing test setup calls (mutex, reset_test_fs, ensure_test_home)
- Correct Gemini security settings path to ~/.gemini/settings.json
Complete the device-level settings separation for cloud sync support.
Backend changes:
- Modify switch() to update both local settings and database is_current
- Modify current() to read from local settings first, fallback to database
- Rename sync_current_from_db() to sync_current_to_live()
- Update tray menu to read current provider from local settings
Frontend changes:
- Update Settings interface: remove legacy fields (customEndpoints*, security)
- Add currentProviderClaude/Codex/Gemini fields
- Update settings schema accordingly
Test fixes:
- Update Gemini security tests to check ~/.gemini/settings.json
instead of ~/.cc-switch/settings.json (security field was never
stored in CC Switch settings)
This ensures each device maintains its own current provider selection
independently when database is synced across devices.
write_live_snapshot was incorrectly passing the already-extracted env
sub-field to json_to_env, which expects the full settings_config object.
This caused json_to_env to look for env.env (nested), returning an empty
HashMap and writing an empty .env file.
Fix by delegating to write_gemini_live which correctly handles env file
writing and security flag configuration in one place.
- Remove redundant security.auth.selectedType from CC Switch settings
- Fix Generic provider type not writing security flag on switch
- All non-Google Official providers now correctly write "gemini-api-key"
- Delete unused ensure_packycode_security_flag function
- Clean up SecuritySettings and SecurityAuthSettings types from AppSettings
Split the 1446-line services/provider.rs into 5 focused modules:
- gemini_auth.rs (250 lines): Gemini authentication type detection
- PackyCode, Google OAuth, and generic provider detection
- Security flag management for different auth types
- live.rs (300 lines): Live configuration operations
- LiveSnapshot backup/restore
- Reading and writing live config files
- Sync current provider to live config
- usage.rs (150 lines): Usage script execution
- Query and test usage scripts
- Format usage results
- Validate usage script configuration
- endpoints.rs (80 lines): Custom endpoints management
- CRUD operations for provider custom endpoints
- Last-used timestamp tracking
- mod.rs (650 lines): Core provider CRUD and service facade
- ProviderService struct with all public methods
- Provider add/update/delete/switch operations
- Claude model key normalization
- Credential extraction and validation
All 107 tests pass. This improves maintainability by:
- Separating concerns into cohesive modules
- Making Gemini-specific logic easier to find and modify
- Reducing cognitive load when working on specific features
Jason