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

src/components/settings/DirectorySettings.tsx

@@ -15,6 +15,7 @@ interface DirectorySettingsProps {
   claudeDir?: string;
   codexDir?: string;
   geminiDir?: string;
+  opencodeDir?: string;
   onDirectoryChange: (app: AppId, value?: string) => void;
   onBrowseDirectory: (app: AppId) => Promise<void>;
   onResetDirectory: (app: AppId) => Promise<void>;
@@ -29,6 +30,7 @@ export function DirectorySettings({
   claudeDir,
   codexDir,
   geminiDir,
+  opencodeDir,
   onDirectoryChange,
   onBrowseDirectory,
   onResetDirectory,
@@ -117,6 +119,17 @@ export function DirectorySettings({
           onBrowse={() => onBrowseDirectory("gemini")}
           onReset={() => onResetDirectory("gemini")}
         />
+
+        <DirectoryInput
+          label={t("settings.opencodeConfigDir")}
+          description={undefined}
+          value={opencodeDir}
+          resolvedValue={resolvedDirs.opencode}
+          placeholder={t("settings.browsePlaceholderOpencode")}
+          onChange={(val) => onDirectoryChange("opencode", val)}
+          onBrowse={() => onBrowseDirectory("opencode")}
+          onReset={() => onResetDirectory("opencode")}
+        />
       </section>
     </>
   );

src/components/settings/SettingsPage.tsx

@@ -36,6 +36,7 @@ import { ThemeSettings } from "@/components/settings/ThemeSettings";
 import { WindowSettings } from "@/components/settings/WindowSettings";
 import { AppVisibilitySettings } from "@/components/settings/AppVisibilitySettings";
 import { SkillSyncMethodSettings } from "@/components/settings/SkillSyncMethodSettings";
+import { TerminalSettings } from "@/components/settings/TerminalSettings";
 import { DirectorySettings } from "@/components/settings/DirectorySettings";
 import { ImportExportSection } from "@/components/settings/ImportExportSection";
 import { AboutSection } from "@/components/settings/AboutSection";
@@ -256,6 +257,12 @@ export function SettingsPage({
                       handleAutoSave({ skillSyncMethod: method })
                     }
                   />
+                  <TerminalSettings
+                    value={settings.preferredTerminal}
+                    onChange={(terminal) =>
+                      handleAutoSave({ preferredTerminal: terminal })
+                    }
+                  />
                 </motion.div>
               ) : null}
             </TabsContent>
@@ -300,6 +307,7 @@ export function SettingsPage({
                           claudeDir={settings.claudeConfigDir}
                           codexDir={settings.codexConfigDir}
                           geminiDir={settings.geminiConfigDir}
+                          opencodeDir={settings.opencodeConfigDir}
                           onDirectoryChange={updateDirectory}
                           onBrowseDirectory={browseDirectory}
                           onResetDirectory={resetDirectory}

src/components/settings/TerminalSettings.tsx

@@ -0,0 +1,111 @@
+import { useTranslation } from "react-i18next";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import { isMac, isWindows, isLinux } from "@/lib/platform";
+
+// Terminal options per platform
+const MACOS_TERMINALS = [
+  { value: "terminal", labelKey: "settings.terminal.options.macos.terminal" },
+  { value: "iterm2", labelKey: "settings.terminal.options.macos.iterm2" },
+  { value: "alacritty", labelKey: "settings.terminal.options.macos.alacritty" },
+  { value: "kitty", labelKey: "settings.terminal.options.macos.kitty" },
+  { value: "ghostty", labelKey: "settings.terminal.options.macos.ghostty" },
+] as const;
+
+const WINDOWS_TERMINALS = [
+  { value: "cmd", labelKey: "settings.terminal.options.windows.cmd" },
+  {
+    value: "powershell",
+    labelKey: "settings.terminal.options.windows.powershell",
+  },
+  { value: "wt", labelKey: "settings.terminal.options.windows.wt" },
+] as const;
+
+const LINUX_TERMINALS = [
+  {
+    value: "gnome-terminal",
+    labelKey: "settings.terminal.options.linux.gnomeTerminal",
+  },
+  { value: "konsole", labelKey: "settings.terminal.options.linux.konsole" },
+  {
+    value: "xfce4-terminal",
+    labelKey: "settings.terminal.options.linux.xfce4Terminal",
+  },
+  { value: "alacritty", labelKey: "settings.terminal.options.linux.alacritty" },
+  { value: "kitty", labelKey: "settings.terminal.options.linux.kitty" },
+  { value: "ghostty", labelKey: "settings.terminal.options.linux.ghostty" },
+] as const;
+
+// Get terminals for the current platform
+function getTerminalOptions() {
+  if (isMac()) {
+    return MACOS_TERMINALS;
+  }
+  if (isWindows()) {
+    return WINDOWS_TERMINALS;
+  }
+  if (isLinux()) {
+    return LINUX_TERMINALS;
+  }
+  // Fallback to macOS options
+  return MACOS_TERMINALS;
+}
+
+// Get default terminal for the current platform
+function getDefaultTerminal(): string {
+  if (isMac()) {
+    return "terminal";
+  }
+  if (isWindows()) {
+    return "cmd";
+  }
+  if (isLinux()) {
+    return "gnome-terminal";
+  }
+  return "terminal";
+}
+
+export interface TerminalSettingsProps {
+  value?: string;
+  onChange: (value: string) => void;
+}
+
+export function TerminalSettings({ value, onChange }: TerminalSettingsProps) {
+  const { t } = useTranslation();
+  const terminals = getTerminalOptions();
+  const defaultTerminal = getDefaultTerminal();
+
+  // Use value or default
+  const currentValue = value || defaultTerminal;
+
+  return (
+    <section className="space-y-2">
+      <header className="space-y-1">
+        <h3 className="text-sm font-medium">{t("settings.terminal.title")}</h3>
+        <p className="text-xs text-muted-foreground">
+          {t("settings.terminal.description")}
+        </p>
+      </header>
+      <Select value={currentValue} onValueChange={onChange}>
+        <SelectTrigger className="w-[200px]">
+          <SelectValue />
+        </SelectTrigger>
+        <SelectContent>
+          {terminals.map((terminal) => (
+            <SelectItem key={terminal.value} value={terminal.value}>
+              {t(terminal.labelKey)}
+            </SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
+      <p className="text-xs text-muted-foreground">
+        {t("settings.terminal.fallbackHint")}
+      </p>
+    </section>
+  );
+}

src/components/settings/WindowSettings.tsx

@@ -1,6 +1,6 @@
 import { useTranslation } from "react-i18next";
 import type { SettingsFormState } from "@/hooks/useSettings";
-import { AppWindow, MonitorUp, Power } from "lucide-react";
+import { AppWindow, MonitorUp, Power, EyeOff } from "lucide-react";
 import { ToggleRow } from "@/components/ui/toggle-row";
 
 interface WindowSettingsProps {
@@ -27,6 +27,14 @@ export function WindowSettings({ settings, onChange }: WindowSettingsProps) {
           onCheckedChange={(value) => onChange({ launchOnStartup: value })}
         />
 
+        <ToggleRow
+          icon={<EyeOff className="h-4 w-4 text-green-500" />}
+          title={t("settings.silentStartup")}
+          description={t("settings.silentStartupDescription")}
+          checked={!!settings.silentStartup}
+          onCheckedChange={(value) => onChange({ silentStartup: value })}
+        />
+
         <ToggleRow
           icon={<MonitorUp className="h-4 w-4 text-purple-500" />}
           title={t("settings.enableClaudePluginIntegration")}

src/hooks/useDirectorySettings.ts

@@ -5,13 +5,14 @@ import { homeDir, join } from "@tauri-apps/api/path";
 import { settingsApi, type AppId } from "@/lib/api";
 import type { SettingsFormState } from "./useSettingsForm";
 
-type DirectoryKey = "appConfig" | "claude" | "codex" | "gemini";
+type DirectoryKey = "appConfig" | "claude" | "codex" | "gemini" | "opencode";
 
 export interface ResolvedDirectories {
   appConfig: string;
   claude: string;
   codex: string;
   gemini: string;
+  opencode: string;
 }
 
 const sanitizeDir = (value?: string | null): string | undefined => {
@@ -39,7 +40,13 @@ const computeDefaultConfigDir = async (
   try {
     const home = await homeDir();
     const folder =
-      app === "claude" ? ".claude" : app === "codex" ? ".codex" : ".gemini";
+      app === "claude"
+        ? ".claude"
+        : app === "codex"
+          ? ".codex"
+          : app === "gemini"
+            ? ".gemini"
+            : ".config/opencode";
     return await join(home, folder);
   } catch (error) {
     console.error(
@@ -70,6 +77,7 @@ export interface UseDirectorySettingsResult {
     claudeDir?: string,
     codexDir?: string,
     geminiDir?: string,
+    opencodeDir?: string,
   ) => void;
 }
 
@@ -96,6 +104,7 @@ export function useDirectorySettings({
     claude: "",
     codex: "",
     gemini: "",
+    opencode: "",
   });
   const [isLoading, setIsLoading] = useState(true);
 
@@ -104,6 +113,7 @@ export function useDirectorySettings({
     claude: "",
     codex: "",
     gemini: "",
+    opencode: "",
   });
   const initialAppConfigDirRef = useRef<string | undefined>(undefined);
 
@@ -119,19 +129,23 @@ export function useDirectorySettings({
           claudeDir,
           codexDir,
           geminiDir,
+          opencodeDir,
           defaultAppConfig,
           defaultClaudeDir,
           defaultCodexDir,
           defaultGeminiDir,
+          defaultOpencodeDir,
         ] = await Promise.all([
           settingsApi.getAppConfigDirOverride(),
           settingsApi.getConfigDir("claude"),
           settingsApi.getConfigDir("codex"),
           settingsApi.getConfigDir("gemini"),
+          settingsApi.getConfigDir("opencode"),
           computeDefaultAppConfigDir(),
           computeDefaultConfigDir("claude"),
           computeDefaultConfigDir("codex"),
           computeDefaultConfigDir("gemini"),
+          computeDefaultConfigDir("opencode"),
         ]);
 
         if (!active) return;
@@ -143,6 +157,7 @@ export function useDirectorySettings({
           claude: defaultClaudeDir ?? "",
           codex: defaultCodexDir ?? "",
           gemini: defaultGeminiDir ?? "",
+          opencode: defaultOpencodeDir ?? "",
         };
 
         setAppConfigDir(normalizedOverride);
@@ -153,6 +168,7 @@ export function useDirectorySettings({
           claude: claudeDir || defaultsRef.current.claude,
           codex: codexDir || defaultsRef.current.codex,
           gemini: geminiDir || defaultsRef.current.gemini,
+          opencode: opencodeDir || defaultsRef.current.opencode,
         });
       } catch (error) {
         console.error(
@@ -183,7 +199,9 @@ export function useDirectorySettings({
             ? { claudeConfigDir: sanitized }
             : key === "codex"
               ? { codexConfigDir: sanitized }
-              : { geminiConfigDir: sanitized },
+              : key === "gemini"
+                ? { geminiConfigDir: sanitized }
+                : { opencodeConfigDir: sanitized },
         );
       }
 
@@ -205,7 +223,13 @@ export function useDirectorySettings({
   const updateDirectory = useCallback(
     (app: AppId, value?: string) => {
       updateDirectoryState(
-        app === "claude" ? "claude" : app === "codex" ? "codex" : "gemini",
+        app === "claude"
+          ? "claude"
+          : app === "codex"
+            ? "codex"
+            : app === "gemini"
+              ? "gemini"
+              : "opencode",
         value,
       );
     },
@@ -215,13 +239,21 @@ export function useDirectorySettings({
   const browseDirectory = useCallback(
     async (app: AppId) => {
       const key: DirectoryKey =
-        app === "claude" ? "claude" : app === "codex" ? "codex" : "gemini";
+        app === "claude"
+          ? "claude"
+          : app === "codex"
+            ? "codex"
+            : app === "gemini"
+              ? "gemini"
+              : "opencode";
       const currentValue =
         key === "claude"
           ? (settings?.claudeConfigDir ?? resolvedDirs.claude)
           : key === "codex"
             ? (settings?.codexConfigDir ?? resolvedDirs.codex)
-            : (settings?.geminiConfigDir ?? resolvedDirs.gemini);
+            : key === "gemini"
+              ? (settings?.geminiConfigDir ?? resolvedDirs.gemini)
+              : (settings?.opencodeConfigDir ?? resolvedDirs.opencode);
 
       try {
         const picked = await settingsApi.selectConfigDirectory(currentValue);
@@ -263,7 +295,13 @@ export function useDirectorySettings({
   const resetDirectory = useCallback(
     async (app: AppId) => {
       const key: DirectoryKey =
-        app === "claude" ? "claude" : app === "codex" ? "codex" : "gemini";
+        app === "claude"
+          ? "claude"
+          : app === "codex"
+            ? "codex"
+            : app === "gemini"
+              ? "gemini"
+              : "opencode";
       if (!defaultsRef.current[key]) {
         const fallback = await computeDefaultConfigDir(app);
         if (fallback) {
@@ -292,7 +330,12 @@ export function useDirectorySettings({
   }, [updateDirectoryState]);
 
   const resetAllDirectories = useCallback(
-    (claudeDir?: string, codexDir?: string, geminiDir?: string) => {
+    (
+      claudeDir?: string,
+      codexDir?: string,
+      geminiDir?: string,
+      opencodeDir?: string,
+    ) => {
       setAppConfigDir(initialAppConfigDirRef.current);
       setResolvedDirs({
         appConfig:
@@ -300,6 +343,7 @@ export function useDirectorySettings({
         claude: claudeDir ?? defaultsRef.current.claude,
         codex: codexDir ?? defaultsRef.current.codex,
         gemini: geminiDir ?? defaultsRef.current.gemini,
+        opencode: opencodeDir ?? defaultsRef.current.opencode,
       });
     },
     [],

src/hooks/useSettings.ts

@@ -109,6 +109,7 @@ export function useSettings(): UseSettingsResult {
       sanitizeDir(data?.claudeConfigDir),
       sanitizeDir(data?.codexConfigDir),
       sanitizeDir(data?.geminiConfigDir),
+      sanitizeDir(data?.opencodeConfigDir),
     );
     setRequiresRestart(false);
   }, [
@@ -131,12 +132,16 @@ export function useSettings(): UseSettingsResult {
         const sanitizedClaudeDir = sanitizeDir(mergedSettings.claudeConfigDir);
         const sanitizedCodexDir = sanitizeDir(mergedSettings.codexConfigDir);
         const sanitizedGeminiDir = sanitizeDir(mergedSettings.geminiConfigDir);
+        const sanitizedOpencodeDir = sanitizeDir(
+          mergedSettings.opencodeConfigDir,
+        );
 
         const payload: Settings = {
           ...mergedSettings,
           claudeConfigDir: sanitizedClaudeDir,
           codexConfigDir: sanitizedCodexDir,
           geminiConfigDir: sanitizedGeminiDir,
+          opencodeConfigDir: sanitizedOpencodeDir,
           language: mergedSettings.language,
         };
 
@@ -238,16 +243,21 @@ export function useSettings(): UseSettingsResult {
         const sanitizedClaudeDir = sanitizeDir(mergedSettings.claudeConfigDir);
         const sanitizedCodexDir = sanitizeDir(mergedSettings.codexConfigDir);
         const sanitizedGeminiDir = sanitizeDir(mergedSettings.geminiConfigDir);
+        const sanitizedOpencodeDir = sanitizeDir(
+          mergedSettings.opencodeConfigDir,
+        );
         const previousAppDir = initialAppConfigDir;
         const previousClaudeDir = sanitizeDir(data?.claudeConfigDir);
         const previousCodexDir = sanitizeDir(data?.codexConfigDir);
         const previousGeminiDir = sanitizeDir(data?.geminiConfigDir);
+        const previousOpencodeDir = sanitizeDir(data?.opencodeConfigDir);
 
         const payload: Settings = {
           ...mergedSettings,
           claudeConfigDir: sanitizedClaudeDir,
           codexConfigDir: sanitizedCodexDir,
           geminiConfigDir: sanitizedGeminiDir,
+          opencodeConfigDir: sanitizedOpencodeDir,
           language: mergedSettings.language,
         };
 
@@ -344,11 +354,17 @@ export function useSettings(): UseSettingsResult {
           console.warn("[useSettings] Failed to refresh tray menu", error);
         }
 
-        // 如果 Claude/Codex/Gemini 的目录覆盖发生变化，则立即将“当前使用的供应商”写回对应应用的 live 配置
+        // 如果 Claude/Codex/Gemini/OpenCode 的目录覆盖发生变化，则立即将"当前使用的供应商"写回对应应用的 live 配置
         const claudeDirChanged = sanitizedClaudeDir !== previousClaudeDir;
         const codexDirChanged = sanitizedCodexDir !== previousCodexDir;
         const geminiDirChanged = sanitizedGeminiDir !== previousGeminiDir;
-        if (claudeDirChanged || codexDirChanged || geminiDirChanged) {
+        const opencodeDirChanged = sanitizedOpencodeDir !== previousOpencodeDir;
+        if (
+          claudeDirChanged ||
+          codexDirChanged ||
+          geminiDirChanged ||
+          opencodeDirChanged
+        ) {
           const syncResult = await syncCurrentProvidersLiveSafe();
           if (!syncResult.ok) {
             console.warn(

src/hooks/useSettingsForm.ts

@@ -83,9 +83,12 @@ export function useSettingsForm(): UseSettingsFormResult {
       minimizeToTrayOnClose: data.minimizeToTrayOnClose ?? true,
       enableClaudePluginIntegration:
         data.enableClaudePluginIntegration ?? false,
+      silentStartup: data.silentStartup ?? false,
       skipClaudeOnboarding: data.skipClaudeOnboarding ?? false,
       claudeConfigDir: sanitizeDir(data.claudeConfigDir),
       codexConfigDir: sanitizeDir(data.codexConfigDir),
+      geminiConfigDir: sanitizeDir(data.geminiConfigDir),
+      opencodeConfigDir: sanitizeDir(data.opencodeConfigDir),
       language: normalizedLanguage,
     };
 
@@ -138,9 +141,12 @@ export function useSettingsForm(): UseSettingsFormResult {
         minimizeToTrayOnClose: serverData.minimizeToTrayOnClose ?? true,
         enableClaudePluginIntegration:
           serverData.enableClaudePluginIntegration ?? false,
+        silentStartup: serverData.silentStartup ?? false,
         skipClaudeOnboarding: serverData.skipClaudeOnboarding ?? false,
         claudeConfigDir: sanitizeDir(serverData.claudeConfigDir),
         codexConfigDir: sanitizeDir(serverData.codexConfigDir),
+        geminiConfigDir: sanitizeDir(serverData.geminiConfigDir),
+        opencodeConfigDir: sanitizeDir(serverData.opencodeConfigDir),
         language: normalizedLanguage,
       };
 

src/i18n/locales/en.json

@@ -266,6 +266,8 @@
     "windowBehaviorHint": "Configure window minimize and Claude plugin integration policies.",
     "launchOnStartup": "Launch on Startup",
     "launchOnStartupDescription": "Automatically run CC Switch when system starts",
+    "silentStartup": "Silent Startup",
+    "silentStartupDescription": "Start in background mode without showing main window",
     "autoLaunchFailed": "Failed to set auto-launch",
     "minimizeToTray": "Minimize to tray on close",
     "minimizeToTrayDescription": "When checked, clicking the close button will hide to system tray, otherwise the app will exit directly.",
@@ -288,6 +290,33 @@
       "copy": "Copy Files",
       "symlinkHint": "Symlinks save disk space and enable real-time sync. Note: May require admin privileges or Developer Mode on Windows"
     },
+    "terminal": {
+      "title": "Preferred Terminal",
+      "description": "Choose which terminal app to use when clicking the terminal button",
+      "fallbackHint": "If the selected terminal is unavailable, the system default will be used",
+      "options": {
+        "macos": {
+          "terminal": "Terminal.app",
+          "iterm2": "iTerm2",
+          "alacritty": "Alacritty",
+          "kitty": "Kitty",
+          "ghostty": "Ghostty"
+        },
+        "windows": {
+          "cmd": "Command Prompt",
+          "powershell": "PowerShell",
+          "wt": "Windows Terminal"
+        },
+        "linux": {
+          "gnomeTerminal": "GNOME Terminal",
+          "konsole": "Konsole",
+          "xfce4Terminal": "Xfce4 Terminal",
+          "alacritty": "Alacritty",
+          "kitty": "Kitty",
+          "ghostty": "Ghostty"
+        }
+      }
+    },
     "configDirectoryOverride": "Configuration Directory Override (Advanced)",
     "configDirectoryDescription": "When using Claude Code or Codex in environments like WSL, you can manually specify the configuration directory to the one in WSL to keep provider data consistent with the main environment.",
     "appConfigDir": "CC Switch Configuration Directory",
@@ -299,9 +328,12 @@
     "codexConfigDirDescription": "Override Codex configuration directory.",
     "geminiConfigDir": "Gemini Configuration Directory",
     "geminiConfigDirDescription": "Override Gemini configuration directory (.env).",
+    "opencodeConfigDir": "OpenCode Configuration Directory",
+    "opencodeConfigDirDescription": "Override OpenCode configuration directory (opencode.json).",
     "browsePlaceholderClaude": "e.g., /home/<your-username>/.claude",
     "browsePlaceholderCodex": "e.g., /home/<your-username>/.codex",
     "browsePlaceholderGemini": "e.g., /home/<your-username>/.gemini",
+    "browsePlaceholderOpencode": "e.g., /home/<your-username>/.config/opencode",
     "browseDirectory": "Browse Directory",
     "resetDefault": "Reset to default directory (takes effect after saving)",
     "checkForUpdates": "Check for Updates",

src/i18n/locales/ja.json

@@ -266,6 +266,8 @@
     "windowBehaviorHint": "最小化動作や Claude プラグイン連携を設定します。",
     "launchOnStartup": "起動時に自動実行",
     "launchOnStartupDescription": "システム起動時に CC Switch を自動起動します",
+    "silentStartup": "サイレント起動",
+    "silentStartupDescription": "起動時にメインウィンドウを表示せず、トレイのみで起動",
     "autoLaunchFailed": "自動起動の設定に失敗しました",
     "minimizeToTray": "閉じるときトレイへ最小化",
     "minimizeToTrayDescription": "チェックすると閉じるボタンでトレイに隠し、オフならアプリを終了します。",
@@ -288,6 +290,33 @@
       "copy": "ファイルコピー",
       "symlinkHint": "シンボリックリンクはディスク容量を節約し、リアルタイム同期を有効にします。注意：Windowsでは管理者権限または開発者モードが必要な場合があります"
     },
+    "terminal": {
+      "title": "優先ターミナル",
+      "description": "ターミナルボタンをクリックした時に使用するターミナルアプリを選択",
+      "fallbackHint": "選択したターミナルが利用できない場合、システムのデフォルトが使用されます",
+      "options": {
+        "macos": {
+          "terminal": "Terminal.app",
+          "iterm2": "iTerm2",
+          "alacritty": "Alacritty",
+          "kitty": "Kitty",
+          "ghostty": "Ghostty"
+        },
+        "windows": {
+          "cmd": "コマンドプロンプト",
+          "powershell": "PowerShell",
+          "wt": "Windows Terminal"
+        },
+        "linux": {
+          "gnomeTerminal": "GNOME Terminal",
+          "konsole": "Konsole",
+          "xfce4Terminal": "Xfce4 Terminal",
+          "alacritty": "Alacritty",
+          "kitty": "Kitty",
+          "ghostty": "Ghostty"
+        }
+      }
+    },
     "configDirectoryOverride": "設定ディレクトリの上書き（詳細）",
     "configDirectoryDescription": "WSL などで Claude Code や Codex を使う場合、ここで設定ディレクトリを WSL 側に合わせるとデータを揃えられます。",
     "appConfigDir": "CC Switch 設定ディレクトリ",
@@ -299,9 +328,12 @@
     "codexConfigDirDescription": "Codex の設定ディレクトリを上書きします。",
     "geminiConfigDir": "Gemini 設定ディレクトリ",
     "geminiConfigDirDescription": "Gemini の設定ディレクトリ（.env）を上書きします。",
+    "opencodeConfigDir": "OpenCode 設定ディレクトリ",
+    "opencodeConfigDirDescription": "OpenCode の設定ディレクトリ（opencode.json）を上書きします。",
     "browsePlaceholderClaude": "例: /home/<your-username>/.claude",
     "browsePlaceholderCodex": "例: /home/<your-username>/.codex",
     "browsePlaceholderGemini": "例: /home/<your-username>/.gemini",
+    "browsePlaceholderOpencode": "例: /home/<your-username>/.config/opencode",
     "browseDirectory": "ディレクトリを選択",
     "resetDefault": "デフォルトに戻す（保存後に反映）",
     "checkForUpdates": "アップデートを確認",

src/i18n/locales/zh.json

@@ -266,6 +266,8 @@
     "windowBehaviorHint": "配置窗口最小化与 Claude 插件联动策略。",
     "launchOnStartup": "开机自启",
     "launchOnStartupDescription": "随系统启动自动运行 CC Switch",
+    "silentStartup": "静默启动",
+    "silentStartupDescription": "程序启动时不显示主窗口，仅在系统托盘运行",
     "autoLaunchFailed": "设置开机自启失败",
     "minimizeToTray": "关闭时最小化到托盘",
     "minimizeToTrayDescription": "勾选后点击关闭按钮会隐藏到系统托盘，取消则直接退出应用。",
@@ -288,6 +290,33 @@
       "copy": "文件复制",
       "symlinkHint": "软连接节省磁盘空间并支持实时同步。注意：Windows 可能需要管理员权限或开启开发者模式"
     },
+    "terminal": {
+      "title": "首选终端",
+      "description": "选择点击终端按钮时使用的终端应用",
+      "fallbackHint": "如果选择的终端不可用，将自动使用系统默认终端",
+      "options": {
+        "macos": {
+          "terminal": "Terminal.app",
+          "iterm2": "iTerm2",
+          "alacritty": "Alacritty",
+          "kitty": "Kitty",
+          "ghostty": "Ghostty"
+        },
+        "windows": {
+          "cmd": "命令提示符",
+          "powershell": "PowerShell",
+          "wt": "Windows Terminal"
+        },
+        "linux": {
+          "gnomeTerminal": "GNOME Terminal",
+          "konsole": "Konsole",
+          "xfce4Terminal": "Xfce4 Terminal",
+          "alacritty": "Alacritty",
+          "kitty": "Kitty",
+          "ghostty": "Ghostty"
+        }
+      }
+    },
     "configDirectoryOverride": "配置目录覆盖（高级）",
     "configDirectoryDescription": "在 WSL 等环境使用 Claude Code 或 Codex 的时候，可手动指定为 WSL 里的配置目录，供应商数据与主环境保持一致。",
     "appConfigDir": "CC Switch 配置目录",
@@ -299,9 +328,12 @@
     "codexConfigDirDescription": "覆盖 Codex 配置目录。",
     "geminiConfigDir": "Gemini 配置目录",
     "geminiConfigDirDescription": "覆盖 Gemini 配置目录 (.env)。",
+    "opencodeConfigDir": "OpenCode 配置目录",
+    "opencodeConfigDirDescription": "覆盖 OpenCode 配置目录 (opencode.json)。",
     "browsePlaceholderClaude": "例如：/home/<你的用户名>/.claude",
     "browsePlaceholderCodex": "例如：/home/<你的用户名>/.codex",
     "browsePlaceholderGemini": "例如：/home/<你的用户名>/.gemini",
+    "browsePlaceholderOpencode": "例如：/home/<你的用户名>/.config/opencode",
     "browseDirectory": "浏览目录",
     "resetDefault": "恢复默认目录（需保存后生效）",
     "checkForUpdates": "检查更新",

src/types.ts

@@ -172,6 +172,8 @@ export interface Settings {
   skipClaudeOnboarding?: boolean;
   // 是否开机自启
   launchOnStartup?: boolean;
+  // 静默启动（程序启动时不显示主窗口）
+  silentStartup?: boolean;
   // 首选语言（可选，默认中文）
   language?: "en" | "zh" | "ja";
 
@@ -199,6 +201,13 @@ export interface Settings {
   // ===== Skill 同步设置 =====
   // Skill 同步方式：auto（默认，优先 symlink）、symlink、copy
   skillSyncMethod?: SkillSyncMethod;
+
+  // ===== 终端设置 =====
+  // 首选终端应用（可选，默认使用系统默认终端）
+  // macOS: "terminal" | "iterm2" | "warp" | "alacritty" | "kitty" | "ghostty"
+  // Windows: "cmd" | "powershell" | "wt"
+  // Linux: "gnome-terminal" | "konsole" | "xfce4-terminal" | "alacritty" | "kitty" | "ghostty"
+  preferredTerminal?: string;
 }
 
 // MCP 服务器连接参数（宽松：允许扩展字段）