feat: settings support electron-store

ycjcl868 · ycjcl868 · commit 372590591146 · 2025-03-20T15:23:53.000+08:00
diff --git a/apps/agent-tars/src/main/ipcRoutes/index.ts b/apps/agent-tars/src/main/ipcRoutes/index.ts
@@ -5,7 +5,7 @@ import { actionRoute } from './action';
 import { browserRoute } from './browser';
 import { fileSystemRoute } from './filesystem';
 import { searchRoute } from './search';
-
+import { settingsRoute } from './settings';
 const t = initIpc.create();
 
 export const ipcRoutes = t.router({
@@ -15,6 +15,7 @@ export const ipcRoutes = t.router({
   ...browserRoute,
   ...fileSystemRoute,
   ...searchRoute,
+  ...settingsRoute,
 });
 export type Router = typeof ipcRoutes;
 
diff --git a/apps/agent-tars/src/main/ipcRoutes/llm.ts b/apps/agent-tars/src/main/ipcRoutes/llm.ts
@@ -23,6 +23,7 @@ function getLLMProviderConfig(settings: ModelSettings): LLMConfig {
     model,
     apiKey,
     apiVersion,
+    // TODO: baseURL || endpoint
     baseURL: endpoint,
   };
 }
diff --git a/apps/agent-tars/src/main/ipcRoutes/settings.ts b/apps/agent-tars/src/main/ipcRoutes/settings.ts
@@ -0,0 +1,26 @@
+import { AppSettings } from '@agent-infra/shared';
+import { SettingStore } from '@main/store/setting';
+import { initIpc } from '@ui-tars/electron-ipc/main';
+
+const t = initIpc.create();
+
+export const settingsRoute = t.router({
+  getSettings: t.procedure.input<void>().handle(async () => {
+    return SettingStore.getStore();
+  }),
+  getFileSystemSettings: t.procedure.input<void>().handle(async () => {
+    return SettingStore.get('fileSystem');
+  }),
+  updateAppSettings: t.procedure
+    .input<AppSettings>()
+    .handle(async ({ input }) => {
+      SettingStore.setStore(input);
+      return true;
+    }),
+  updateFileSystemSettings: t.procedure
+    .input<AppSettings['fileSystem']>()
+    .handle(async ({ input }) => {
+      SettingStore.set('fileSystem', input);
+      return true;
+    }),
+});
diff --git a/apps/agent-tars/src/renderer/src/agent/AgentFlow.ts b/apps/agent-tars/src/renderer/src/agent/AgentFlow.ts
@@ -17,7 +17,6 @@ import { Greeter } from './Greeter';
 import { extractHistoryEvents } from '@renderer/utils/extractHistoryEvents';
 import { EventItem, EventType } from '@renderer/type/event';
 import { SNAPSHOT_BROWSER_ACTIONS } from '@renderer/constants';
-import { loadLLMSettings } from '@renderer/services/llmSettings';
 
 export interface AgentContext {
   plan: PlanTask[];
@@ -40,23 +39,6 @@ export class AgentFlow {
   private loadingStatusTip = '';
 
   constructor(private appContext: AppContext) {
-    // Load LLM settings and update the configuration
-    const llmSettings = loadLLMSettings();
-    if (llmSettings) {
-      // Update LLM configuration when starting the agent flow
-      ipcClient
-        .updateLLMConfig({
-          configName: llmSettings.provider,
-          model: llmSettings.model,
-          apiKey: llmSettings.apiKey,
-          apiVersion: llmSettings.apiVersion,
-          baseURL: llmSettings.endpoint,
-        })
-        .catch((error) => {
-          console.error('Failed to update LLM configuration:', error);
-        });
-    }
-
     const omegaHistoryEvents = this.parseHistoryEvents();
     this.eventManager = new EventManager(omegaHistoryEvents);
     this.abortController = new AbortController();
diff --git a/apps/agent-tars/src/renderer/src/api/fileSystemInterceptor.ts b/apps/agent-tars/src/renderer/src/api/fileSystemInterceptor.ts
@@ -87,14 +87,18 @@ export async function interceptToolCalls(
           toolName === ToolCallType.DirectoryTree ||
           toolName === ToolCallType.GetFileInfo
         ) {
-          updatedParams.path = normalizePath(params.path);
+          updatedParams.path = await normalizePath(params.path);
         } else if (toolName === ToolCallType.ReadMultipleFiles) {
-          updatedParams.paths = (params.paths || []).map(normalizePath);
+          updatedParams.paths = await Promise.all(
+            (params.paths || []).map((path: string) => {
+              return normalizePath(path);
+            }),
+          );
         } else if (toolName === ToolCallType.MoveFile) {
-          updatedParams.source = normalizePath(params.source);
-          updatedParams.destination = normalizePath(params.destination);
+          updatedParams.source = await normalizePath(params.source);
+          updatedParams.destination = await normalizePath(params.destination);
         } else if (toolName === ToolCallType.SearchFiles) {
-          updatedParams.path = normalizePath(params.path);
+          updatedParams.path = await normalizePath(params.path);
         }
 
         // Update the tool call with normalized paths
diff --git a/apps/agent-tars/src/renderer/src/components/FilePermissionModal/index.tsx b/apps/agent-tars/src/renderer/src/components/FilePermissionModal/index.tsx
@@ -10,10 +10,6 @@ import {
 } from '@nextui-org/react';
 import { IoWarningOutline } from 'react-icons/io5';
 import { ipcClient } from '@renderer/api';
-import {
-  loadFileSystemSettings,
-  saveFileSystemSettings,
-} from '@renderer/services/fileSystemSettings';
 import path from 'path-browserify';
 import { resolvePermission } from '@renderer/services/filePermissionService';
 import { useAppSettings } from '../LeftSidebar/Settings/useAppSettings';
@@ -35,12 +31,13 @@ export function FilePermissionModal({
     setIsProcessing(true);
     try {
       // Add this directory to allowed directories
-      const settings = loadFileSystemSettings() || {
+      const settings = (await ipcClient.getFileSystemSettings()) || {
         availableDirectories: [],
       };
+
       if (!settings.availableDirectories.includes(directoryPath)) {
         settings.availableDirectories.push(directoryPath);
-        saveFileSystemSettings(settings);
+        await ipcClient.updateFileSystemSettings(settings);
         setSettings((appSettings) => {
           return {
             ...appSettings,
diff --git a/apps/agent-tars/src/renderer/src/components/LeftSidebar/Settings/useAppSettings.ts b/apps/agent-tars/src/renderer/src/components/LeftSidebar/Settings/useAppSettings.ts
@@ -7,22 +7,9 @@ import {
   SearchSettings,
   SearchProvider,
 } from '@agent-infra/shared';
-import {
-  loadLLMSettings,
-  saveLLMSettings,
-} from '../../../services/llmSettings';
-import { updateLLMConfig } from '../../../api/llmConfig';
-import {
-  loadFileSystemSettings,
-  saveFileSystemSettings,
-} from '../../../services/fileSystemSettings';
 import { ipcClient } from '@renderer/api';
 import { atom, useAtom } from 'jotai';
 import toast from 'react-hot-toast';
-import {
-  loadSearchSettings,
-  saveSearchSettings,
-} from '../../../services/searchSettings';
 
 const DEFAULT_MODEL_SETTINGS: ModelSettings = {
   provider: ModelProvider.OPENAI,
@@ -50,17 +37,18 @@ export const appSettingsAtom = atom<AppSettings>({
 export function useAppSettings() {
   const [settings, setSettings] = useAtom<AppSettings>(appSettingsAtom);
 
-  // Load settings from localStorage on mount
+  // Load settings from store on mount
   useEffect(() => {
-    const savedModelSettings = loadLLMSettings();
-    const savedFileSystemSettings = loadFileSystemSettings();
-    const savedSearchSettings = loadSearchSettings();
-
-    setSettings({
-      model: savedModelSettings || DEFAULT_MODEL_SETTINGS,
-      fileSystem: savedFileSystemSettings || DEFAULT_FILESYSTEM_SETTINGS,
-      search: savedSearchSettings || DEFAULT_SEARCH_SETTINGS,
-    });
+    async function loadSettings() {
+      const settings = await ipcClient.getSettings();
+
+      setSettings({
+        model: settings.model || DEFAULT_MODEL_SETTINGS,
+        fileSystem: settings.fileSystem || DEFAULT_FILESYSTEM_SETTINGS,
+        search: settings.search || DEFAULT_SEARCH_SETTINGS,
+      });
+    }
+    loadSettings();
   }, []);
 
   const validateModelSettings = (
@@ -125,14 +113,7 @@ export function useAppSettings() {
 
     try {
       // Save all settings
-      saveLLMSettings(settings.model);
-      await updateLLMConfig(settings.model);
-
-      saveFileSystemSettings(settings.fileSystem);
-      await ipcClient.updateFileSystemConfig(settings.fileSystem);
-
-      saveSearchSettings(settings.search);
-      await ipcClient.updateSearchConfig(settings.search);
+      await ipcClient.updateAppSettings(settings);
 
       toast.success('Settings saved successfully');
       return true;
diff --git a/apps/agent-tars/src/renderer/src/components/LeftSidebar/Settings/useModelSettings.ts b/apps/agent-tars/src/renderer/src/components/LeftSidebar/Settings/useModelSettings.ts
@@ -1,10 +1,7 @@
 import { useState, useEffect } from 'react';
-import {
-  loadLLMSettings,
-  saveLLMSettings,
-} from '../../../services/llmSettings';
 import { updateLLMConfig } from '../../../api/llmConfig';
 import { ModelProvider, ModelSettings } from '@agent-infra/shared';
+import { ipcClient } from '@renderer/api';
 
 export function useModelSettings() {
   const [settings, setSettings] = useState<ModelSettings>({
@@ -15,21 +12,19 @@ export function useModelSettings() {
     endpoint: '',
   });
 
-  // Load settings from localStorage on mount
+  // Load settings from store on mount
   useEffect(() => {
-    const savedSettings = loadLLMSettings();
-    if (savedSettings) {
-      setSettings(savedSettings);
+    async function loadSettings() {
+      const settings = await ipcClient.getSettings();
+      setSettings(settings.model);
     }
+    loadSettings();
   }, []);
 
   const saveSettings = async () => {
     // Save settings directly without modifying the model field
     const finalSettings = { ...settings };
 
-    // Save to localStorage
-    saveLLMSettings(finalSettings);
-
     // Update LLM configuration in main process
     await updateLLMConfig(finalSettings);
   };
diff --git a/apps/agent-tars/src/renderer/src/hooks/useFileSystemSettings.ts b/apps/agent-tars/src/renderer/src/hooks/useFileSystemSettings.ts
@@ -1,9 +1,5 @@
 import { useEffect, useState } from 'react';
 import { ipcClient } from '@renderer/api';
-import {
-  loadFileSystemSettings,
-  saveFileSystemSettings,
-} from '@renderer/services/fileSystemSettings';
 
 export function useFileSystemSettings() {
   const [initialized, setInitialized] = useState(false);
@@ -14,12 +10,15 @@ export function useFileSystemSettings() {
         // Get current allowed directories from main process
         const allowedDirectories = await ipcClient.getAllowedDirectories();
 
-        // Load settings from localStorage
-        const settings = loadFileSystemSettings();
+        // Load settings from store
+        const appSettings = await ipcClient.getSettings();
+        const settings = appSettings?.fileSystem;
 
         // If no settings exist, create them with the allowed directories
         if (!settings) {
-          saveFileSystemSettings({ availableDirectories: allowedDirectories });
+          await ipcClient.updateFileSystemSettings({
+            availableDirectories: allowedDirectories,
+          });
         } else {
           // Make sure the settings match the main process
           const updatedSettings = {
@@ -33,7 +32,7 @@ export function useFileSystemSettings() {
           };
 
           // Save updated settings
-          saveFileSystemSettings(updatedSettings);
+          await ipcClient.updateFileSystemSettings(updatedSettings);
 
           // Update main process if needed
           if (
diff --git a/apps/agent-tars/src/renderer/src/services/filePermissionService.ts b/apps/agent-tars/src/renderer/src/services/filePermissionService.ts
@@ -18,14 +18,14 @@ export const pendingPermissionRequestAtom = atom<PermissionRequest | null>(
  * @param filePath The file path to normalize
  * @returns Normalized path (absolute)
  */
-export function normalizePath(filePath: string): string {
+export async function normalizePath(filePath: string): Promise<string> {
   // If it's already an absolute path, return it
   if (filePath.startsWith('/')) {
     return filePath;
   }
 
   // Otherwise, make it relative to the default directory
-  const defaultDir = getDefaultDirectory();
+  const defaultDir = await getDefaultDirectory();
   if (!defaultDir) {
     throw new Error('No default directory configured');
   }
@@ -40,10 +40,10 @@ export function normalizePath(filePath: string): string {
  */
 export async function checkPathPermission(filePath: string): Promise<boolean> {
   // Normalize path first
-  const normalizedPath = normalizePath(filePath);
+  const normalizedPath = await normalizePath(filePath);
 
   // If path is allowed, return immediately
-  if (isPathAllowed(normalizedPath)) {
+  if (await isPathAllowed(normalizedPath)) {
     return true;
   }
 
diff --git a/apps/agent-tars/src/renderer/src/services/fileSystemSettings.ts b/apps/agent-tars/src/renderer/src/services/fileSystemSettings.ts
@@ -1,36 +1,15 @@
-import { FileSystemSettings } from '@agent-infra/shared';
+import { ipcClient } from '@renderer/api';
 
-const FILE_SYSTEM_SETTINGS_KEY = 'omega-filesystem-settings';
-
-export function loadFileSystemSettings(): FileSystemSettings | null {
-  try {
-    const settingsJson = localStorage.getItem(FILE_SYSTEM_SETTINGS_KEY);
-    if (!settingsJson) return null;
-    return JSON.parse(settingsJson) as FileSystemSettings;
-  } catch (error) {
-    console.error('Failed to load file system settings:', error);
-    return null;
-  }
-}
-
-export function saveFileSystemSettings(settings: FileSystemSettings): void {
-  try {
-    localStorage.setItem(FILE_SYSTEM_SETTINGS_KEY, JSON.stringify(settings));
-  } catch (error) {
-    console.error('Failed to save file system settings:', error);
-  }
-}
-
-export function getDefaultDirectory(): string | null {
-  const settings = loadFileSystemSettings();
+export async function getDefaultDirectory(): Promise<string | null> {
+  const settings = await ipcClient.getFileSystemSettings();
   if (settings && settings.availableDirectories.length > 0) {
     return settings.availableDirectories[0];
   }
   return null;
 }
 
-export function isPathAllowed(path: string): boolean {
-  const settings = loadFileSystemSettings();
+export async function isPathAllowed(path: string): Promise<boolean> {
+  const settings = await ipcClient.getFileSystemSettings();
   if (!settings || !settings.availableDirectories.length) return false;
 
   // If path is not absolute, it's allowed (will be relative to default dir)
diff --git a/apps/agent-tars/src/renderer/src/services/llmSettings.ts b/apps/agent-tars/src/renderer/src/services/llmSettings.ts
diff --git a/apps/agent-tars/src/renderer/src/services/searchSettings.ts b/apps/agent-tars/src/renderer/src/services/searchSettings.ts

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ function getLLMProviderConfig(settings: ModelSettings): LLMConfig {`
`23`	`23`	`model,`
`24`	`24`	`apiKey,`
`25`	`25`	`apiVersion,`
	`26`	`+ // TODO: baseURL \|\| endpoint`
`26`	`27`	`baseURL: endpoint,`
`27`	`28`	`};`
`28`	`29`	`}`