From 06a19519c57c81f703a14ec697fc8a2eec08493b Mon Sep 17 00:00:00 2001
From: Jason <farion1231@gmail.com>
Date: Sun, 31 Aug 2025 18:14:31 +0800
Subject: [PATCH] revert: restore app/appType param compatibility and revert
 segmented-thumb pointer-events change

- Restore backend commands to accept app_type/app/appType with priority app_type
- Frontend invoke() now passes both { app_type, app } again
- Revert CSS change that set pointer-events: none on segmented-thumb
- Keep minor fix: open_config_folder signature uses handle + respects both names

Note: warnings for non_snake_case (appType) are expected for compatibility.
---
 src-tauri/src/commands.rs          |  8 ++++----
 src/App.css                        |  4 +++-
 src/App.tsx                        | 10 ++++------
 src/components/ProviderForm.tsx    | 16 +++++++++-------
 src/config/codexProviderPresets.ts |  5 ++---
 src/lib/tauri-api.ts               | 11 +++++++++--
 6 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs
index 92921e9..ecbab8c 100644
--- a/src-tauri/src/commands.rs
+++ b/src-tauri/src/commands.rs
@@ -455,13 +455,13 @@ pub async fn get_claude_code_config_path() -> Result<String, String> {
 /// 兼容两种参数：`app_type`（推荐）或 `app`（字符串）
 #[tauri::command]
 pub async fn open_config_folder(
-    app: tauri::AppHandle,
+    handle: tauri::AppHandle,
     app_type: Option<AppType>,
-    app_str: Option<String>,
+    app: Option<String>,
     appType: Option<String>,
 ) -> Result<bool, String> {
     let app_type = app_type
-        .or_else(|| app_str.as_deref().map(|s| s.into()))
+        .or_else(|| app.as_deref().map(|s| s.into()))
         .or_else(|| appType.as_deref().map(|s| s.into()))
         .unwrap_or(AppType::Claude);
     
@@ -476,7 +476,7 @@ pub async fn open_config_folder(
     }
 
     // 使用 opener 插件打开文件夹
-    app.opener()
+    handle.opener()
         .open_path(config_dir.to_string_lossy().to_string(), None::<String>)
         .map_err(|e| format!("打开文件夹失败: {}", e))?;
 
diff --git a/src/App.css b/src/App.css
index 86ab1b2..186502e 100644
--- a/src/App.css
+++ b/src/App.css
@@ -50,7 +50,9 @@
   background: var(--seg-thumb);
   border-radius: 999px;
   box-shadow: 0 4px 10px rgba(0, 0, 0, 0.15);
-  transition: transform 220ms ease, width 220ms ease;
+  transition:
+    transform 220ms ease,
+    width 220ms ease;
   will-change: transform;
 }
 
diff --git a/src/App.tsx b/src/App.tsx
index e024edf..d4a0c9e 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -182,16 +182,14 @@ function App() {
       <header className="app-header">
         <h1>{activeApp === "claude" ? "Claude Code" : "Codex"} 供应商切换器</h1>
         <div className="app-tabs">
-          <div
-            className="segmented"
-            role="tablist"
-            aria-label="选择应用"
-          >
+          <div className="segmented" role="tablist" aria-label="选择应用">
             <span
               className="segmented-thumb"
               style={{
                 transform:
-                  activeApp === "claude" ? "translateX(0%)" : "translateX(100%)",
+                  activeApp === "claude"
+                    ? "translateX(0%)"
+                    : "translateX(100%)",
               }}
             />
             <button
diff --git a/src/components/ProviderForm.tsx b/src/components/ProviderForm.tsx
index 8dc3874..00881d5 100644
--- a/src/components/ProviderForm.tsx
+++ b/src/components/ProviderForm.tsx
@@ -48,7 +48,7 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
   const [codexConfig, setCodexConfig] = useState("");
   const [codexApiKey, setCodexApiKey] = useState("");
   const [selectedCodexPreset, setSelectedCodexPreset] = useState<number | null>(
-    null
+    null,
   );
 
   // 初始化 Codex 配置
@@ -151,7 +151,7 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
   };
 
   const handleChange = (
-    e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>
+    e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
   ) => {
     const { name, value } = e.target;
 
@@ -188,7 +188,7 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
     // 更新JSON配置
     const updatedConfig = updateCoAuthoredSetting(
       formData.settingsConfig,
-      checked
+      checked,
     );
     setFormData({
       ...formData,
@@ -219,7 +219,7 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
   // Codex: 应用预设
   const applyCodexPreset = (
     preset: (typeof codexProviderPresets)[0],
-    index: number
+    index: number,
   ) => {
     const authString = JSON.stringify(preset.auth || {}, null, 2);
     setCodexAuth(authString);
@@ -244,7 +244,7 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
     const configString = setApiKeyInConfig(
       formData.settingsConfig,
       key.trim(),
-      { createIfMissing: selectedPreset !== null }
+      { createIfMissing: selectedPreset !== null },
     );
 
     // 更新表单配置
@@ -298,7 +298,7 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
   useEffect(() => {
     if (initialData) {
       const parsedKey = getApiKeyFromConfig(
-        JSON.stringify(initialData.settingsConfig)
+        JSON.stringify(initialData.settingsConfig),
       );
       if (parsedKey) setApiKey(parsedKey);
     }
@@ -447,7 +447,9 @@ const ProviderForm: React.FC<ProviderFormProps> = ({
                       : "只需要填这里，下方 auth.json 会自动填充"
                   }
                   disabled={isCodexOfficialPreset}
-                  required={selectedCodexPreset !== null && !isCodexOfficialPreset}
+                  required={
+                    selectedCodexPreset !== null && !isCodexOfficialPreset
+                  }
                   autoComplete="off"
                   style={
                     isCodexOfficialPreset
diff --git a/src/config/codexProviderPresets.ts b/src/config/codexProviderPresets.ts
index f5342be..09497fd 100644
--- a/src/config/codexProviderPresets.ts
+++ b/src/config/codexProviderPresets.ts
@@ -16,7 +16,7 @@ export const codexProviderPresets: CodexProviderPreset[] = [
     isOfficial: true,
     // 官方的 key 为null
     auth: {
-      "OPENAI_API_KEY": null,
+      OPENAI_API_KEY: null,
     },
     config: ``,
   },
@@ -25,7 +25,7 @@ export const codexProviderPresets: CodexProviderPreset[] = [
     websiteUrl: "https://codex.packycode.com/",
     // PackyCode 一般通过 API Key；请将占位符替换为你的实际 key
     auth: {
-      "OPENAI_API_KEY": "sk-your-api-key-here",
+      OPENAI_API_KEY: "sk-your-api-key-here",
     },
     config: `model_provider = "packycode"
 model = "gpt-5"
@@ -38,4 +38,3 @@ wire_api = "responses"
 env_key = "packycode"`,
   },
 ];
-
diff --git a/src/lib/tauri-api.ts b/src/lib/tauri-api.ts
index 105cf67..78858e5 100644
--- a/src/lib/tauri-api.ts
+++ b/src/lib/tauri-api.ts
@@ -78,7 +78,11 @@ export const tauriAPI = {
     app?: AppType,
   ): Promise<boolean> => {
     try {
-      return await invoke("switch_provider", { id: providerId, app_type: app, app });
+      return await invoke("switch_provider", {
+        id: providerId,
+        app_type: app,
+        app,
+      });
     } catch (error) {
       console.error("切换供应商失败:", error);
       return false;
@@ -90,7 +94,10 @@ export const tauriAPI = {
     app?: AppType,
   ): Promise<ImportResult> => {
     try {
-      const success = await invoke<boolean>("import_default_config", { app_type: app, app });
+      const success = await invoke<boolean>("import_default_config", {
+        app_type: app,
+        app,
+      });
       return {
         success,
         message: success ? "成功导入默认配置" : "导入失败",