@lobehub/lobehub 2.0.0-next.252 → 2.0.0-next.253

package/src/app/[variants]/(desktop)/desktop-onboarding/features/PermissionsStep.tsx

@@ -1,5 +1,6 @@
 'use client';
 
+import { useWatchBroadcast } from '@lobechat/electron-client-ipc';
 import { Block, Button, Flexbox, Icon, Text } from '@lobehub/ui';
 import { cssVar } from 'antd-style';
 import {
@@ -93,12 +94,15 @@ const PermissionsStep = memo<PermissionsStepProps>(({ onBack, onNext }) => {
     const micStatus = await ipc.system.getMediaAccessStatus('microphone');
     const screenStatus = await ipc.system.getMediaAccessStatus('screen');
     const accessibilityStatus = await ipc.system.getAccessibilityStatus();
+    // Full Disk Access can now be checked by attempting to read protected directories
+    const fullDiskStatus = await ipc.system.getFullDiskAccessStatus();
 
     setPermissions((prev) =>
       prev.map((p) => {
         if (p.id === 1) return { ...p, granted: notifStatus === 'authorized' };
-        // Full Disk Access cannot be checked programmatically, so it remains manual
-        if (p.id === 2) return { ...p, buttonKey: 'screen3.actions.openSettings', granted: false };
+        // Full Disk Access status is detected by reading protected directories
+        if (p.id === 2)
+          return { ...p, buttonKey: 'screen3.actions.openSettings', granted: fullDiskStatus };
         if (p.id === 3)
           return { ...p, granted: micStatus === 'granted' && screenStatus === 'granted' };
         if (p.id === 4) return { ...p, granted: accessibilityStatus };
@@ -111,28 +115,11 @@ const PermissionsStep = memo<PermissionsStepProps>(({ onBack, onNext }) => {
     checkAllPermissions();
   }, [checkAllPermissions]);
 
-  // When this page regains focus (e.g. back from System Settings), re-check permission states and refresh UI.
-  useEffect(() => {
-    if (typeof window === 'undefined') return;
-
-    const handleFocus = () => {
-      checkAllPermissions();
-    };
-
-    const handleVisibilityChange = () => {
-      if (document.visibilityState === 'visible') {
-        checkAllPermissions();
-      }
-    };
-
-    window.addEventListener('focus', handleFocus);
-    document.addEventListener('visibilitychange', handleVisibilityChange);
-
-    return () => {
-      window.removeEventListener('focus', handleFocus);
-      document.removeEventListener('visibilitychange', handleVisibilityChange);
-    };
-  }, [checkAllPermissions]);
+  // Listen for window focus event from Electron main process
+  // This is more reliable than browser focus events in Electron environment
+  useWatchBroadcast('windowFocused', () => {
+    checkAllPermissions();
+  });
 
   const handlePermissionRequest = async (permissionId: number) => {
     const ipc = ensureElectronIpc();
@@ -143,7 +130,8 @@ const PermissionsStep = memo<PermissionsStepProps>(({ onBack, onNext }) => {
         break;
       }
       case 2: {
-        await ipc.system.openFullDiskAccessSettings({ autoAdd: true });
+        // Use native prompt dialog for Full Disk Access
+        await ipc.system.promptFullDiskAccessIfNotGranted();
         break;
       }
       case 3: {
@@ -175,7 +163,7 @@ const PermissionsStep = memo<PermissionsStepProps>(({ onBack, onNext }) => {
         {permissions.map((permission) => (
           <Block
             align={'center'}
-            clickable={!permission.granted || permission.id === 2}
+            clickable={!permission.granted}
             gap={16}
             horizontal
             key={permission.id}
@@ -197,7 +185,7 @@ const PermissionsStep = memo<PermissionsStepProps>(({ onBack, onNext }) => {
                 {t(permission.descriptionKey as any)}
               </Text>
             </Flexbox>
-            {permission.granted && permission.id !== 2 ? (
+            {permission.granted ? (
               <Icon color={cssVar.colorSuccess} icon={Check} size={20} />
             ) : (
               <Button
@@ -213,9 +201,7 @@ const PermissionsStep = memo<PermissionsStepProps>(({ onBack, onNext }) => {
                 }}
                 type={'text'}
               >
-                {permission.granted && permission.id === 2
-                  ? t('screen3.actions.granted')
-                  : t(permission.buttonKey)}
+                {t(permission.buttonKey)}
               </Button>
             )}
           </Block>

package/src/app/[variants]/(desktop)/desktop-onboarding/index.tsx

@@ -2,27 +2,37 @@
 
 import { Flexbox, Skeleton } from '@lobehub/ui';
 import { Suspense, memo, useCallback, useEffect, useState } from 'react';
-import { useNavigate, useSearchParams } from 'react-router-dom';
+import { useSearchParams } from 'react-router-dom';
 
 import Loading from '@/components/Loading/BrandTextLoading';
 import { electronSystemService } from '@/services/electron/system';
-import { isDev } from '@/utils/env';
 
 import OnboardingContainer from './_layout';
 import DataModeStep from './features/DataModeStep';
 import LoginStep from './features/LoginStep';
 import PermissionsStep from './features/PermissionsStep';
 import WelcomeStep from './features/WelcomeStep';
-import { getDesktopOnboardingCompleted, setDesktopOnboardingCompleted } from './storage';
+import {
+  clearDesktopOnboardingStep,
+  getDesktopOnboardingStep,
+  setDesktopOnboardingCompleted,
+  setDesktopOnboardingStep,
+} from './storage';
 
 const DesktopOnboardingPage = memo(() => {
-  const navigate = useNavigate();
   const [searchParams, setSearchParams] = useSearchParams();
   const [isMac, setIsMac] = useState(true);
   const [isLoading, setIsLoading] = useState(true);
 
-  // 从 URL query 参数获取初始步骤，默认为 1
+  // 从 localStorage 或 URL query 参数获取初始步骤
+  // 优先使用 localStorage 以支持重启后恢复
   const getInitialStep = useCallback(() => {
+    // First try localStorage (for app restart scenario)
+    const savedStep = getDesktopOnboardingStep();
+    if (savedStep !== null) {
+      return savedStep;
+    }
+    // Then try URL params
     const stepParam = searchParams.get('step');
     if (stepParam) {
       const step = parseInt(stepParam, 10);
@@ -33,11 +43,10 @@ const DesktopOnboardingPage = memo(() => {
 
   const [currentStep, setCurrentStep] = useState(getInitialStep);
 
-  // 检查是否已完成 onboarding
+  // 持久化当前步骤到 localStorage
   useEffect(() => {
-    if (isDev) return;
-    if (getDesktopOnboardingCompleted()) navigate('/', { replace: true });
-  }, [navigate]);
+    setDesktopOnboardingStep(currentStep);
+  }, [currentStep]);
 
   // 设置窗口大小和可调整性
   useEffect(() => {
@@ -117,6 +126,7 @@ const DesktopOnboardingPage = memo(() => {
         case 4: {
           // 如果是第4步（LoginStep），完成 onboarding
           setDesktopOnboardingCompleted();
+          clearDesktopOnboardingStep(); // Clear persisted step since onboarding is complete
           // Restore window resizable before hard reload (cleanup won't run due to hard navigation)
           electronSystemService
             .setWindowResizable({ resizable: true })

package/src/app/[variants]/(desktop)/desktop-onboarding/storage.ts

@@ -1,4 +1,5 @@
 export const DESKTOP_ONBOARDING_STORAGE_KEY = 'lobechat:desktop:onboarding:completed:v1';
+export const DESKTOP_ONBOARDING_STEP_KEY = 'lobechat:desktop:onboarding:step:v1';
 
 export const getDesktopOnboardingCompleted = () => {
   if (typeof window === 'undefined') return true;
@@ -32,3 +33,51 @@ export const clearDesktopOnboardingCompleted = () => {
     return false;
   }
 };
+
+/**
+ * Get the persisted onboarding step (for restoring after app restart)
+ */
+export const getDesktopOnboardingStep = (): number | null => {
+  if (typeof window === 'undefined') return null;
+
+  try {
+    const step = window.localStorage.getItem(DESKTOP_ONBOARDING_STEP_KEY);
+    if (step) {
+      const parsedStep = Number.parseInt(step, 10);
+      if (parsedStep >= 1 && parsedStep <= 4) {
+        return parsedStep;
+      }
+    }
+    return null;
+  } catch {
+    return null;
+  }
+};
+
+/**
+ * Persist the current onboarding step
+ */
+export const setDesktopOnboardingStep = (step: number) => {
+  if (typeof window === 'undefined') return false;
+
+  try {
+    window.localStorage.setItem(DESKTOP_ONBOARDING_STEP_KEY, step.toString());
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+/**
+ * Clear the persisted onboarding step (called when onboarding completes)
+ */
+export const clearDesktopOnboardingStep = () => {
+  if (typeof window === 'undefined') return false;
+
+  try {
+    window.localStorage.removeItem(DESKTOP_ONBOARDING_STEP_KEY);
+    return true;
+  } catch {
+    return false;
+  }
+};

package/src/features/ChatInput/ActionBar/Params/Controls.tsx

@@ -80,10 +80,10 @@ const ParamControlWrapper = memo<ParamControlWrapperProps>(
         <Checkbox
           checked={checked}
           className={styles.checkbox}
-          onChange={(v) => {
-            onToggle(v);
+          onClick={(e) => {
+            e.stopPropagation();
+            onToggle(!checked);
           }}
-          onClick={(e) => e.stopPropagation()}
         />
         <div style={{ flex: 1 }}>
           <Component disabled={disabled} onChange={onChange} value={value} />
@@ -275,6 +275,7 @@ const Controls = memo<ControlsProps>(({ setUpdating }) => {
           disabled={!enabled}
           onToggle={(checked) => handleToggle(key, checked)}
           styles={styles}
+          value={form.getFieldValue(PARAM_NAME_MAP[key])}
         />
       ),
       label: (
@@ -297,9 +298,9 @@ const Controls = memo<ControlsProps>(({ setUpdating }) => {
         mobile
           ? baseItems
           : baseItems.map(({ tag, ...item }) => ({
-              ...item,
-              desc: <Tag size={'small'}>{tag}</Tag>,
-            }))
+            ...item,
+            desc: <Tag size={'small'}>{tag}</Tag>,
+          }))
       }
       itemsType={'flat'}
       onValuesChange={handleValuesChange}

package/apps/desktop/src/main/controllers/scripts/full-disk-access.applescript

@@ -1,85 +0,0 @@
-on run argv
-  set appBundlePath to item 1 of argv
-
-  set settingsBundleIds to {"com.apple.SystemSettings", "com.apple.systempreferences"}
-
-  -- Bring System Settings/Preferences to front (Ventura+ / older). If it doesn't exist, ignore.
-  repeat with bundleId in settingsBundleIds
-    try
-      tell application id bundleId to activate
-      exit repeat
-    end try
-  end repeat
-
-  tell application "System Events"
-    set settingsProcess to missing value
-    repeat 30 times
-      repeat with bundleId in settingsBundleIds
-        try
-          if exists (first process whose bundle identifier is bundleId) then
-            set settingsProcess to first process whose bundle identifier is bundleId
-            exit repeat
-          end if
-        end try
-      end repeat
-
-      if settingsProcess is not missing value then exit repeat
-      delay 0.2
-    end repeat
-
-    if settingsProcess is missing value then return "no-settings-process"
-
-    tell settingsProcess
-      set frontmost to true
-
-      repeat 30 times
-        if exists window 1 then exit repeat
-        delay 0.2
-      end repeat
-      if not (exists window 1) then return "no-window"
-
-      -- Best-effort: find an "add" button in the front window and click it.
-      set clickedAdd to false
-      repeat 30 times
-        try
-          repeat with b in (buttons of window 1)
-            set bDesc to ""
-            set bName to ""
-            set bTitle to ""
-            try set bDesc to description of b end try
-            try set bName to name of b end try
-            try set bTitle to title of b end try
-
-            if (bDesc is "Add") or (bTitle is "Add") or (bName is "+") or (bTitle is "+") then
-              click b
-              set clickedAdd to true
-              exit repeat
-            end if
-          end repeat
-        end try
-
-        if clickedAdd is true then exit repeat
-        delay 0.2
-      end repeat
-
-      if clickedAdd is false then return "no-add-button"
-
-      -- Wait for open panel / sheet
-      repeat 30 times
-        if exists sheet 1 of window 1 then exit repeat
-        delay 0.2
-      end repeat
-      if not (exists sheet 1 of window 1) then return "no-sheet"
-
-      -- Open "Go to the folder" and input the app bundle path, then confirm.
-      keystroke "G" using {command down, shift down}
-      delay 0.3
-      keystroke appBundlePath
-      key code 36
-      delay 0.6
-      -- Confirm "Open" in the panel (Enter usually triggers default)
-      key code 36
-      return "ok"
-    end tell
-  end tell
-end run