w0x7ce f363bb1dd0 Merge origin/main into main ...

Resolved conflict in src-tauri/src/commands/misc.rs by combining imports from both sides.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

2026-01-04 09:12:12 +08:00

..

commands

Merge origin/main into main

2026-01-04 09:12:12 +08:00

database

feat(skills): unified management architecture with SSOT and React Query

2026-01-02 22:04:02 +08:00

deeplink

fix: resolve test failures and clippy warnings

2025-12-30 08:54:48 +08:00

mcp

fix: MCP同步时优雅处理无效的Codex config.toml (#461)

2025-12-27 18:05:58 +08:00

proxy

Feat/usage improvements (#508)

2025-12-31 22:57:00 +08:00

services

fix(skills): skip hidden directories when scanning for skills

2026-01-03 11:42:10 +08:00

app_config.rs

feat(skills): unified management architecture with SSOT and React Query

2026-01-02 22:04:02 +08:00

app_store.rs

feat(tray): add Gemini support to system tray menu (#209)

2025-11-12 23:38:43 +08:00

auto_launch.rs

refactor(commands): improve terminal launch code structure and fix env vars

2025-12-31 09:17:36 +08:00

claude_mcp.rs

fix(windows): wrap npx/npm commands with cmd /c for MCP export

2025-12-29 23:20:32 +08:00

claude_plugin.rs

feat(gemini): add Gemini provider integration (#202)

2025-11-12 10:47:34 +08:00

codex_config.rs

Refactor/storage (#277)

2025-11-24 11:00:45 +08:00

config.rs

Refactor/storage (#277)

2025-11-24 11:00:45 +08:00

error.rs

Feat/usage improvements (#508)

2025-12-31 22:57:00 +08:00

gemini_config.rs

fix(gemini): persist settings json edits

2025-11-20 20:23:22 +08:00

gemini_mcp.rs

fix(mcp): improve upsert and import robustness

2025-12-18 15:14:37 +08:00

init_status.rs

feat(skills): unified management architecture with SSOT and React Query

2026-01-02 22:04:02 +08:00

lib.rs

Merge origin/main into main

2026-01-04 09:12:12 +08:00

main.rs

fix(linux): resolve WebKitGTK DMA-BUF rendering issue and preserve user .desktop customizations

2025-11-27 19:37:18 +08:00

prompt_files.rs

fix(prompt): correct live file backfill priority in enable flow (#225)

2025-11-15 16:09:00 +08:00

prompt.rs

feat(prompts+i18n): add prompt management and improve prompt editor i18n (#193)

2025-11-12 16:41:41 +08:00

provider_defaults.rs

Refactor/UI (#273)

2025-11-22 19:18:35 +08:00

provider.rs

Feat/usage improvements (#508)

2025-12-31 22:57:00 +08:00

settings.rs

feat(settings): add option to skip Claude Code first-run confirmation

2025-12-20 23:55:10 +08:00

store.rs

Feat/proxy server (#355)

2025-12-05 11:26:41 +08:00

tray.rs

refactor(mcp): modularize MCP and tray menu logic

2025-11-29 10:29:10 +08:00

usage_script.rs

Feat/provider icon color (#385)

2025-12-11 17:20:44 +08:00