diff --git a/src/components/settings/SettingsPage.tsx b/src/components/settings/SettingsPage.tsx
index 3dec31c..654c266 100644
--- a/src/components/settings/SettingsPage.tsx
+++ b/src/components/settings/SettingsPage.tsx
@@ -106,8 +106,6 @@ export function SettingsPage({
     onOpenChange(false);
   }, [acknowledgeRestart, clearSelection, onOpenChange, resetStatus]);
 
-
-
   const handleSave = useCallback(async () => {
     try {
       const result = await saveSettings(undefined, { silent: false });
@@ -192,10 +190,7 @@ export function SettingsPage({
           </TabsList>
 
           <div className="flex-1 overflow-y-auto pr-2">
-            <TabsContent
-              value="general"
-              className="space-y-6 mt-0"
-            >
+            <TabsContent value="general" className="space-y-6 mt-0">
               {settings ? (
                 <>
                   <LanguageSettings
@@ -211,10 +206,7 @@ export function SettingsPage({
               ) : null}
             </TabsContent>
 
-            <TabsContent
-              value="advanced"
-              className="space-y-6 mt-0"
-            >
+            <TabsContent value="advanced" className="space-y-6 mt-0">
               {settings ? (
                 <>
                   <DirectorySettings
@@ -245,40 +237,43 @@ export function SettingsPage({
               ) : null}
             </TabsContent>
 
-          <TabsContent value="about" className="mt-0">
-            <AboutSection isPortable={isPortable} />
-          </TabsContent>
-        </div>
-
-        {activeTab === "advanced" ? (
-          <div className="flex-shrink-0 pt-6 border-t border-white/5 sticky bottom-0 bg-background/95 backdrop-blur-sm">
-            <Button
-              onClick={handleSave}
-              className="w-full bg-primary hover:bg-primary/90"
-              disabled={isSaving}
-            >
-              {isSaving ? (
-                <span className="inline-flex items-center gap-2">
-                  <Loader2 className="h-4 w-4 animate-spin" />
-                  {t("settings.saving")}
-                </span>
-              ) : (
-                <>
-                  <Save className="mr-2 h-4 w-4" />
-                  {t("common.save")}
-                </>
-              )}
-            </Button>
+            <TabsContent value="about" className="mt-0">
+              <AboutSection isPortable={isPortable} />
+            </TabsContent>
           </div>
-        ) : null}
-      </Tabs>
-    )}
+
+          {activeTab === "advanced" ? (
+            <div className="flex-shrink-0 pt-6 border-t border-white/5 sticky bottom-0 bg-background/95 backdrop-blur-sm">
+              <Button
+                onClick={handleSave}
+                className="w-full bg-primary hover:bg-primary/90"
+                disabled={isSaving}
+              >
+                {isSaving ? (
+                  <span className="inline-flex items-center gap-2">
+                    <Loader2 className="h-4 w-4 animate-spin" />
+                    {t("settings.saving")}
+                  </span>
+                ) : (
+                  <>
+                    <Save className="mr-2 h-4 w-4" />
+                    {t("common.save")}
+                  </>
+                )}
+              </Button>
+            </div>
+          ) : null}
+        </Tabs>
+      )}
 
       <Dialog
         open={showRestartPrompt}
         onOpenChange={(open) => !open && handleRestartLater()}
       >
-        <DialogContent zIndex="alert" className="max-w-md glass-card border-white/10">
+        <DialogContent
+          zIndex="alert"
+          className="max-w-md glass-card border-white/10"
+        >
           <DialogHeader>
             <DialogTitle>{t("settings.restartRequired")}</DialogTitle>
           </DialogHeader>
@@ -288,10 +283,17 @@ export function SettingsPage({
             </p>
           </div>
           <DialogFooter>
-            <Button variant="ghost" onClick={handleRestartLater} className="hover:bg-white/5">
+            <Button
+              variant="ghost"
+              onClick={handleRestartLater}
+              className="hover:bg-white/5"
+            >
               {t("settings.restartLater")}
             </Button>
-            <Button onClick={handleRestartNow} className="bg-primary hover:bg-primary/90">
+            <Button
+              onClick={handleRestartNow}
+              className="bg-primary hover:bg-primary/90"
+            >
               {t("settings.restartNow")}
             </Button>
           </DialogFooter>
diff --git a/src/components/settings/WindowSettings.tsx b/src/components/settings/WindowSettings.tsx
index 94ec79a..06f0d39 100644
--- a/src/components/settings/WindowSettings.tsx
+++ b/src/components/settings/WindowSettings.tsx
@@ -19,6 +19,13 @@ export function WindowSettings({ settings, onChange }: WindowSettingsProps) {
         </p>
       </header>
 
+      <ToggleRow
+        title={t("settings.launchOnStartup")}
+        description={t("settings.launchOnStartupDescription")}
+        checked={!!settings.launchOnStartup}
+        onCheckedChange={(value) => onChange({ launchOnStartup: value })}
+      />
+
       <ToggleRow
         title={t("settings.minimizeToTray")}
         description={t("settings.minimizeToTrayDescription")}
diff --git a/src/hooks/useSettings.ts b/src/hooks/useSettings.ts
index 2b1c9f3..840b1cd 100644
--- a/src/hooks/useSettings.ts
+++ b/src/hooks/useSettings.ts
@@ -125,108 +125,127 @@ export function useSettings(): UseSettingsResult {
     ): Promise<SaveResult | null> => {
       const mergedSettings = settings ? { ...settings, ...overrides } : null;
       if (!mergedSettings) return null;
-    try {
-      const sanitizedAppDir = sanitizeDir(appConfigDir);
-      const sanitizedClaudeDir = sanitizeDir(mergedSettings.claudeConfigDir);
-      const sanitizedCodexDir = sanitizeDir(mergedSettings.codexConfigDir);
-      const sanitizedGeminiDir = sanitizeDir(mergedSettings.geminiConfigDir);
-      const previousAppDir = initialAppConfigDir;
-      const previousClaudeDir = sanitizeDir(data?.claudeConfigDir);
-      const previousCodexDir = sanitizeDir(data?.codexConfigDir);
-      const previousGeminiDir = sanitizeDir(data?.geminiConfigDir);
-
-      const payload: Settings = {
-        ...mergedSettings,
-        claudeConfigDir: sanitizedClaudeDir,
-        codexConfigDir: sanitizedCodexDir,
-        geminiConfigDir: sanitizedGeminiDir,
-        language: mergedSettings.language,
-      };
-
-      await saveMutation.mutateAsync(payload);
-
-      await settingsApi.setAppConfigDirOverride(sanitizedAppDir ?? null);
-
       try {
-        if (payload.enableClaudePluginIntegration) {
-          await settingsApi.applyClaudePluginConfig({ official: false });
-        } else {
-          await settingsApi.applyClaudePluginConfig({ official: true });
+        const sanitizedAppDir = sanitizeDir(appConfigDir);
+        const sanitizedClaudeDir = sanitizeDir(mergedSettings.claudeConfigDir);
+        const sanitizedCodexDir = sanitizeDir(mergedSettings.codexConfigDir);
+        const sanitizedGeminiDir = sanitizeDir(mergedSettings.geminiConfigDir);
+        const previousAppDir = initialAppConfigDir;
+        const previousClaudeDir = sanitizeDir(data?.claudeConfigDir);
+        const previousCodexDir = sanitizeDir(data?.codexConfigDir);
+        const previousGeminiDir = sanitizeDir(data?.geminiConfigDir);
+
+        const payload: Settings = {
+          ...mergedSettings,
+          claudeConfigDir: sanitizedClaudeDir,
+          codexConfigDir: sanitizedCodexDir,
+          geminiConfigDir: sanitizedGeminiDir,
+          language: mergedSettings.language,
+        };
+
+        await saveMutation.mutateAsync(payload);
+
+        await settingsApi.setAppConfigDirOverride(sanitizedAppDir ?? null);
+
+        // 如果开机自启状态改变，调用系统 API
+        if (payload.launchOnStartup !== undefined) {
+          try {
+            await settingsApi.setAutoLaunch(payload.launchOnStartup);
+          } catch (error) {
+            console.error("Failed to update auto-launch:", error);
+            toast.error(
+              t("settings.autoLaunchFailed", {
+                defaultValue: "设置开机自启失败",
+              }),
+            );
+          }
         }
-      } catch (error) {
-        console.warn(
-          "[useSettings] Failed to sync Claude plugin config",
-          error,
-        );
-        toast.error(
-          t("notifications.syncClaudePluginFailed", {
-            defaultValue: "同步 Claude 插件失败",
-          }),
-        );
-      }
 
-      try {
-        if (typeof window !== "undefined") {
-          window.localStorage.setItem("language", payload.language as Language);
-        }
-      } catch (error) {
-        console.warn(
-          "[useSettings] Failed to persist language preference",
-          error,
-        );
-      }
-
-      try {
-        await providersApi.updateTrayMenu();
-      } catch (error) {
-        console.warn("[useSettings] Failed to refresh tray menu", error);
-      }
-
-      // 如果 Claude/Codex/Gemini 的目录覆盖发生变化，则立即将“当前使用的供应商”写回对应应用的 live 配置
-      const claudeDirChanged = sanitizedClaudeDir !== previousClaudeDir;
-      const codexDirChanged = sanitizedCodexDir !== previousCodexDir;
-      const geminiDirChanged = sanitizedGeminiDir !== previousGeminiDir;
-      if (claudeDirChanged || codexDirChanged || geminiDirChanged) {
-        const syncResult = await syncCurrentProvidersLiveSafe();
-        if (!syncResult.ok) {
+        try {
+          if (payload.enableClaudePluginIntegration) {
+            await settingsApi.applyClaudePluginConfig({ official: false });
+          } else {
+            await settingsApi.applyClaudePluginConfig({ official: true });
+          }
+        } catch (error) {
           console.warn(
-            "[useSettings] Failed to sync current providers after directory change",
-            syncResult.error,
+            "[useSettings] Failed to sync Claude plugin config",
+            error,
+          );
+          toast.error(
+            t("notifications.syncClaudePluginFailed", {
+              defaultValue: "同步 Claude 插件失败",
+            }),
           );
         }
-      }
 
-      const appDirChanged = sanitizedAppDir !== (previousAppDir ?? undefined);
-      setRequiresRestart(appDirChanged);
+        try {
+          if (typeof window !== "undefined") {
+            window.localStorage.setItem(
+              "language",
+              payload.language as Language,
+            );
+          }
+        } catch (error) {
+          console.warn(
+            "[useSettings] Failed to persist language preference",
+            error,
+          );
+        }
 
-      if (!options?.silent) {
-        toast.success(
-          t("notifications.settingsSaved", {
-            defaultValue: "设置已保存",
+        try {
+          await providersApi.updateTrayMenu();
+        } catch (error) {
+          console.warn("[useSettings] Failed to refresh tray menu", error);
+        }
+
+        // 如果 Claude/Codex/Gemini 的目录覆盖发生变化，则立即将“当前使用的供应商”写回对应应用的 live 配置
+        const claudeDirChanged = sanitizedClaudeDir !== previousClaudeDir;
+        const codexDirChanged = sanitizedCodexDir !== previousCodexDir;
+        const geminiDirChanged = sanitizedGeminiDir !== previousGeminiDir;
+        if (claudeDirChanged || codexDirChanged || geminiDirChanged) {
+          const syncResult = await syncCurrentProvidersLiveSafe();
+          if (!syncResult.ok) {
+            console.warn(
+              "[useSettings] Failed to sync current providers after directory change",
+              syncResult.error,
+            );
+          }
+        }
+
+        const appDirChanged = sanitizedAppDir !== (previousAppDir ?? undefined);
+        setRequiresRestart(appDirChanged);
+
+        if (!options?.silent) {
+          toast.success(
+            t("notifications.settingsSaved", {
+              defaultValue: "设置已保存",
+            }),
+          );
+        }
+
+        return { requiresRestart: appDirChanged };
+      } catch (error) {
+        console.error("[useSettings] Failed to save settings", error);
+        toast.error(
+          t("notifications.settingsSaveFailed", {
+            defaultValue: "保存设置失败: {{error}}",
+            error: (error as Error)?.message ?? String(error),
           }),
         );
+        throw error;
       }
-
-      return { requiresRestart: appDirChanged };
-    } catch (error) {
-      console.error("[useSettings] Failed to save settings", error);
-      toast.error(
-        t("notifications.settingsSaveFailed", {
-          defaultValue: "保存设置失败: {{error}}",
-          error: (error as Error)?.message ?? String(error),
-        }),
-      );
-      throw error;
-    }
-  }, [
-    appConfigDir,
-    data,
-    initialAppConfigDir,
-    saveMutation,
-    settings,
-    setRequiresRestart,
-    t,
-  ]);
+    },
+    [
+      appConfigDir,
+      data,
+      initialAppConfigDir,
+      saveMutation,
+      settings,
+      setRequiresRestart,
+      t,
+    ],
+  );
 
   const isLoading = useMemo(
     () => isFormLoading || isDirectoryLoading || isMetadataLoading,
diff --git a/src/lib/api/settings.ts b/src/lib/api/settings.ts
index dc5874a..8922d8b 100644
--- a/src/lib/api/settings.ts
+++ b/src/lib/api/settings.ts
@@ -107,4 +107,12 @@ export const settingsApi = {
     }
     await invoke("open_external", { url });
   },
+
+  async setAutoLaunch(enabled: boolean): Promise<boolean> {
+    return await invoke("set_auto_launch", { enabled });
+  },
+
+  async getAutoLaunchStatus(): Promise<boolean> {
+    return await invoke("get_auto_launch_status");
+  },
 };