Skip to content

Commit e282ae2

Browse files
committed
refactor(agent-tars): merge redundant setup constants across threads
1 parent 5c89a88 commit e282ae2

File tree

4 files changed

+69
-87
lines changed

4 files changed

+69
-87
lines changed

apps/agent-tars/src/main/store/setting.ts

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,59 +4,18 @@
44
*/
55
import { BrowserWindow } from 'electron';
66
import ElectronStore from 'electron-store';
7-
import {
8-
ModelProvider,
9-
ModelSettings,
10-
SearchProvider,
11-
SearchSettings,
12-
FileSystemSettings,
13-
AppSettings,
14-
MCPSettings,
15-
} from '@agent-infra/shared';
7+
import { AppSettings } from '@agent-infra/shared';
168
import { logger } from '@main/utils/logger';
179
import { maskSensitiveData } from '@main/utils/maskSensitiveData';
18-
19-
const DEFAULT_MODEL_SETTINGS: ModelSettings = {
20-
provider: ModelProvider.OPENAI,
21-
model: 'gpt-4o',
22-
apiKey: '',
23-
apiVersion: '',
24-
endpoint: '',
25-
};
26-
27-
const DEFAULT_FILESYSTEM_SETTINGS: FileSystemSettings = {
28-
availableDirectories: [],
29-
};
30-
31-
const DEFAULT_SEARCH_SETTINGS: SearchSettings = {
32-
provider: SearchProvider.BrowserSearch,
33-
providerConfig: {
34-
count: 10,
35-
engine: 'google',
36-
needVisitedUrls: false,
37-
},
38-
apiKey: '',
39-
};
40-
41-
const DEFAULT_MCP_SERVERS_SETTINGS: MCPSettings = {
42-
mcpServers: [],
43-
};
44-
45-
export const DEFAULT_SETTING: AppSettings = {
46-
model: DEFAULT_MODEL_SETTINGS,
47-
fileSystem: DEFAULT_FILESYSTEM_SETTINGS,
48-
search: DEFAULT_SEARCH_SETTINGS,
49-
mcp: DEFAULT_MCP_SERVERS_SETTINGS,
50-
};
51-
10+
import { DEFAULT_SETTINGS } from '@shared/constants';
5211
export class SettingStore {
5312
private static instance: ElectronStore<AppSettings>;
5413

5514
public static getInstance(): ElectronStore<AppSettings> {
5615
if (!SettingStore.instance) {
5716
SettingStore.instance = new ElectronStore<AppSettings>({
5817
name: 'agent_tars.setting',
59-
defaults: DEFAULT_SETTING,
18+
defaults: DEFAULT_SETTINGS,
6019
});
6120

6221
SettingStore.instance.onDidAnyChange((newValue, oldValue) => {
@@ -99,7 +58,7 @@ export class SettingStore {
9958
}
10059

10160
public static clear(): void {
102-
SettingStore.getInstance().set(DEFAULT_SETTING);
61+
SettingStore.getInstance().set(DEFAULT_SETTINGS);
10362
}
10463

10564
public static openInEditor(): void {

apps/agent-tars/src/renderer/src/components/LeftSidebar/Settings/useAppSettings.ts

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,22 @@
11
import { useEffect, useRef } from 'react';
22
import {
33
AppSettings,
4-
FileSystemSettings,
54
ModelSettings,
65
ModelProvider,
76
SearchSettings,
8-
MCPSettings,
97
SearchProvider,
108
} from '@agent-infra/shared';
119
import { ipcClient } from '@renderer/api';
1210
import { isReportHtmlMode } from '@renderer/constants';
1311
import { atom, useAtom } from 'jotai';
1412
import toast from 'react-hot-toast';
15-
16-
/**
17-
* FIXME: Merge inconsistent settings between main and renderer threads.
18-
*/
19-
const DEFAULT_MODEL_SETTINGS: ModelSettings = {
20-
provider: ModelProvider.ANTHROPIC,
21-
model: 'claude-3-7-sonnet-latest',
22-
apiKey: '',
23-
apiVersion: '',
24-
endpoint: '',
25-
};
26-
27-
const DEFAULT_FILESYSTEM_SETTINGS: FileSystemSettings = {
28-
availableDirectories: [],
29-
};
30-
31-
const DEFAULT_SEARCH_SETTINGS: SearchSettings = {
32-
provider: SearchProvider.BrowserSearch,
33-
providerConfig: {
34-
count: 10,
35-
engine: 'google',
36-
needVisitedUrls: false,
37-
},
38-
apiKey: '',
39-
};
40-
41-
const DEFAULT_MCP_SETTINGS: MCPSettings = {
42-
mcpServers: [],
43-
};
44-
45-
export const DEFAULT_SETTINGS: AppSettings = {
46-
model: DEFAULT_MODEL_SETTINGS,
47-
fileSystem: DEFAULT_FILESYSTEM_SETTINGS,
48-
search: DEFAULT_SEARCH_SETTINGS,
49-
mcp: DEFAULT_MCP_SETTINGS,
50-
};
13+
import {
14+
DEFAULT_SETTINGS,
15+
DEFAULT_MODEL_SETTINGS,
16+
DEFAULT_FILESYSTEM_SETTINGS,
17+
DEFAULT_SEARCH_SETTINGS,
18+
DEFAULT_MCP_SETTINGS,
19+
} from '@shared/constants';
5120

5221
export const appSettingsAtom = atom<AppSettings>(DEFAULT_SETTINGS);
5322

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
import {
2+
AppSettings,
3+
FileSystemSettings,
4+
ModelSettings,
5+
ModelProvider,
6+
SearchSettings,
7+
MCPSettings,
8+
SearchProvider,
9+
} from '@agent-infra/shared';
10+
11+
export const DEFAULT_MODEL_SETTINGS: ModelSettings = {
12+
provider: ModelProvider.ANTHROPIC,
13+
model: 'claude-3-7-sonnet-latest',
14+
apiKey: '',
15+
apiVersion: '',
16+
endpoint: '',
17+
};
18+
19+
export const DEFAULT_FILESYSTEM_SETTINGS: FileSystemSettings = {
20+
availableDirectories: [],
21+
};
22+
23+
export const DEFAULT_SEARCH_SETTINGS: SearchSettings = {
24+
provider: SearchProvider.BrowserSearch,
25+
providerConfig: {
26+
count: 10,
27+
engine: 'google',
28+
needVisitedUrls: false,
29+
},
30+
apiKey: '',
31+
};
32+
33+
export const DEFAULT_MCP_SETTINGS: MCPSettings = {
34+
mcpServers: [],
35+
};
36+
37+
export const DEFAULT_SETTINGS: AppSettings = {
38+
model: DEFAULT_MODEL_SETTINGS,
39+
fileSystem: DEFAULT_FILESYSTEM_SETTINGS,
40+
search: DEFAULT_SEARCH_SETTINGS,
41+
mcp: DEFAULT_MCP_SETTINGS,
42+
};

apps/agent-tars/tsconfig.node.json

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
{
2-
"extends": ["@electron-toolkit/tsconfig/tsconfig.node.json", "./tsconfig.base.json"],
3-
"include": ["electron.vite.config.*", "src/main/**/*", "forge.config.ts", "src/preload/**/*", "app/electron.vite.config.ts"],
2+
"extends": [
3+
"@electron-toolkit/tsconfig/tsconfig.node.json",
4+
"./tsconfig.base.json"
5+
],
6+
"include": [
7+
"electron.vite.config.*",
8+
"src/main/**/*",
9+
"forge.config.ts",
10+
"src/preload/**/*",
11+
"src/shared/**/*",
12+
"app/electron.vite.config.ts"
13+
],
414
"compilerOptions": {
515
"composite": true,
616
"esModuleInterop": true,
717
"allowSyntheticDefaultImports": true,
8-
"types": ["electron-vite/node"]
18+
"types": [
19+
"electron-vite/node"
20+
]
921
}
10-
}
22+
}

0 commit comments

Comments
 (0)