Merge upstream/main into main

Resolved conflicts in src-tauri/src/lib.rs:
- Kept both: open_provider_terminal (my feature) and universal provider commands (upstream)

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

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

src/lib/api/providers.ts

@@ -1,6 +1,10 @@
 import { invoke } from "@tauri-apps/api/core";
 import { listen, type UnlistenFn } from "@tauri-apps/api/event";
-import type { Provider } from "@/types";
+import type {
+  Provider,
+  UniversalProvider,
+  UniversalProvidersMap,
+} from "@/types";
 import type { AppId } from "./types";
 
 export interface ProviderSortUpdate {
@@ -71,3 +75,44 @@ export const providersApi = {
     return await invoke("open_provider_terminal", { providerId, app: appId });
   },
 };
+
+// ============================================================================
+// 统一供应商（Universal Provider）API
+// ============================================================================
+
+export const universalProvidersApi = {
+  /**
+   * 获取所有统一供应商
+   */
+  async getAll(): Promise<UniversalProvidersMap> {
+    return await invoke("get_universal_providers");
+  },
+
+  /**
+   * 获取单个统一供应商
+   */
+  async get(id: string): Promise<UniversalProvider | null> {
+    return await invoke("get_universal_provider", { id });
+  },
+
+  /**
+   * 添加或更新统一供应商
+   */
+  async upsert(provider: UniversalProvider): Promise<boolean> {
+    return await invoke("upsert_universal_provider", { provider });
+  },
+
+  /**
+   * 删除统一供应商
+   */
+  async delete(id: string): Promise<boolean> {
+    return await invoke("delete_universal_provider", { id });
+  },
+
+  /**
+   * 手动同步统一供应商到各应用
+   */
+  async sync(id: string): Promise<boolean> {
+    return await invoke("sync_universal_provider", { id });
+  },
+};