+
+
+
+ `)
+ } else {
+ res.writeHead(400, { 'Content-Type': 'text/plain' })
+ res.end('Missing authorization code')
}
} catch (error) {
logger.error('Error processing OAuth callback:', error as Error)
diff --git a/src/main/services/ocr/builtin/OvOcrService.ts b/src/main/services/ocr/builtin/OvOcrService.ts
index 6e0eee1c37..052682be64 100644
--- a/src/main/services/ocr/builtin/OvOcrService.ts
+++ b/src/main/services/ocr/builtin/OvOcrService.ts
@@ -1,5 +1,6 @@
import { loggerService } from '@logger'
import { isWin } from '@main/constant'
+import { HOME_CHERRY_DIR } from '@shared/config/constant'
import type { OcrOvConfig, OcrResult, SupportedOcrFile } from '@types'
import { isImageFileMetadata } from '@types'
import { exec } from 'child_process'
@@ -13,7 +14,7 @@ import { OcrBaseService } from './OcrBaseService'
const logger = loggerService.withContext('OvOcrService')
const execAsync = promisify(exec)
-const PATH_BAT_FILE = path.join(os.homedir(), '.cherrystudio', 'ovms', 'ovocr', 'run.npu.bat')
+const PATH_BAT_FILE = path.join(os.homedir(), HOME_CHERRY_DIR, 'ovms', 'ovocr', 'run.npu.bat')
export class OvOcrService extends OcrBaseService {
constructor() {
@@ -30,7 +31,7 @@ export class OvOcrService extends OcrBaseService {
}
private getOvOcrPath(): string {
- return path.join(os.homedir(), '.cherrystudio', 'ovms', 'ovocr')
+ return path.join(os.homedir(), HOME_CHERRY_DIR, 'ovms', 'ovocr')
}
private getImgDir(): string {
diff --git a/src/main/utils/file.ts b/src/main/utils/file.ts
index 17155f423b..1432dccc8a 100644
--- a/src/main/utils/file.ts
+++ b/src/main/utils/file.ts
@@ -5,7 +5,7 @@ import os from 'node:os'
import path from 'node:path'
import { loggerService } from '@logger'
-import { audioExts, documentExts, imageExts, MB, textExts, videoExts } from '@shared/config/constant'
+import { audioExts, documentExts, HOME_CHERRY_DIR, imageExts, MB, textExts, videoExts } from '@shared/config/constant'
import type { FileMetadata, NotesTreeNode } from '@types'
import { FileTypes } from '@types'
import chardet from 'chardet'
@@ -160,7 +160,7 @@ export function getNotesDir() {
}
export function getConfigDir() {
- return path.join(os.homedir(), '.cherrystudio', 'config')
+ return path.join(os.homedir(), HOME_CHERRY_DIR, 'config')
}
export function getCacheDir() {
@@ -172,7 +172,7 @@ export function getAppConfigDir(name: string) {
}
export function getMcpDir() {
- return path.join(os.homedir(), '.cherrystudio', 'mcp')
+ return path.join(os.homedir(), HOME_CHERRY_DIR, 'mcp')
}
/**
diff --git a/src/main/utils/init.ts b/src/main/utils/init.ts
index 63cf69e89b..20884b1eeb 100644
--- a/src/main/utils/init.ts
+++ b/src/main/utils/init.ts
@@ -3,6 +3,7 @@ import os from 'node:os'
import path from 'node:path'
import { isLinux, isPortable, isWin } from '@main/constant'
+import { HOME_CHERRY_DIR } from '@shared/config/constant'
import { app } from 'electron'
// Please don't import any other modules which is not node/electron built-in modules
@@ -17,7 +18,7 @@ function hasWritePermission(path: string) {
}
function getConfigDir() {
- return path.join(os.homedir(), '.cherrystudio', 'config')
+ return path.join(os.homedir(), HOME_CHERRY_DIR, 'config')
}
export function initAppDataDir() {
diff --git a/src/main/utils/process.ts b/src/main/utils/process.ts
index f028f2d3c7..f36e86861d 100644
--- a/src/main/utils/process.ts
+++ b/src/main/utils/process.ts
@@ -1,4 +1,5 @@
import { loggerService } from '@logger'
+import { HOME_CHERRY_DIR } from '@shared/config/constant'
import { spawn } from 'child_process'
import fs from 'fs'
import os from 'os'
@@ -46,11 +47,11 @@ export async function getBinaryName(name: string): Promise${title}
+${message}
+
+
+ )
+}
+
+export default PermissionModeDisplay
diff --git a/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/BashTool.tsx b/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/BashTool.tsx
index d92b6461a4..9b9d98054d 100644
--- a/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/BashTool.tsx
+++ b/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/BashTool.tsx
@@ -1,10 +1,12 @@
import type { CollapseProps } from 'antd'
-import { Tag } from 'antd'
+import { Popover, Tag } from 'antd'
import { Terminal } from 'lucide-react'
import { ToolTitle } from './GenericTools'
import type { BashToolInput as BashToolInputType, BashToolOutput as BashToolOutputType } from './types'
+const MAX_TAG_LENGTH = 100
+
export function BashTool({
input,
output
@@ -15,6 +17,13 @@ export function BashTool({
// 如果有输出，计算输出行数
const outputLines = output ? output.split('\n').length : 0
+ // 处理命令字符串的截断
+ const command = input.command
+ const needsTruncate = command.length > MAX_TAG_LENGTH
+ const displayCommand = needsTruncate ? `${command.slice(0, MAX_TAG_LENGTH)}...` : command
+
+ const tagContent =
+
+ {modeConfig.icon}
+
+
+
+ {t(modeCard.titleKey, modeCard.titleFallback)}
+
+
+ {t(modeCard.descriptionKey, modeCard.descriptionFallback)}{' '}
+ {t(modeCard.behaviorKey, modeCard.behaviorFallback)}
+
+
- {input.command}
+ {needsTruncate ? (
+ {command}
}
+ trigger="hover">
+ {tagContent}
+
+ ) : (
+ tagContent
+ )}
),
diff --git a/src/renderer/src/pages/home/Navbar.tsx b/src/renderer/src/pages/home/Navbar.tsx
index fc3e1a76a1..837d727975 100644
--- a/src/renderer/src/pages/home/Navbar.tsx
+++ b/src/renderer/src/pages/home/Navbar.tsx
@@ -95,7 +95,7 @@ const HeaderNavbar: FC
-
- {server.name}
+ ) {
- return ) {
- return ) {
- return ) {
- return ) {
- return ) {
- return & {
- inset?: boolean
-}) {
- return (
-
- {children}
-
- )
-}
-
-function ContextMenuSubContent({ className, ...props }: React.ComponentProps) {
- return (
- ) {
- return (
-
-
- )
-}
-
-function ContextMenuItem({
- className,
- inset,
- variant = 'default',
- ...props
-}: React.ComponentProps & {
- inset?: boolean
- variant?: 'default' | 'destructive'
-}) {
- return (
- ) {
- return (
-
-
-
-
-
- {children}
-
- )
-}
-
-function ContextMenuRadioItem({
- className,
- children,
- ...props
-}: React.ComponentProps) {
- return (
-
-
-
-
-
- {children}
-
- )
-}
-
-function ContextMenuLabel({
- className,
- inset,
- ...props
-}: React.ComponentProps & {
- inset?: boolean
-}) {
- return (
- ) {
- return (
-
+ = ({
items={pluginTypeTabItems}
className="w-full"
size="small"
+ centered
/>
diff --git a/src/renderer/src/store/index.ts b/src/renderer/src/store/index.ts
index 7b13f14f7a..1906d2e55d 100644
--- a/src/renderer/src/store/index.ts
+++ b/src/renderer/src/store/index.ts
@@ -71,7 +71,7 @@ const persistedReducer = persistReducer(
{
key: 'cherry-studio',
storage,
- version: 171,
+ version: 172,
blacklist: ['runtime', 'messages', 'messageBlocks', 'tabs', 'toolPermissions'],
migrate
},
diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts
index 5ca545d838..7fb7f40d2e 100644
--- a/src/renderer/src/store/migrate.ts
+++ b/src/renderer/src/store/migrate.ts
@@ -2628,132 +2628,6 @@ const migrateConfig = {
return state
}
},
- '162': (state: RootState) => {
- try {
- // @ts-ignore
- if (state?.agents?.agents) {
- // @ts-ignore
- state.assistants.presets = [...state.agents.agents]
- // @ts-ignore
- delete state.agents.agents
- }
-
- if (state.settings.sidebarIcons) {
- state.settings.sidebarIcons.visible = state.settings.sidebarIcons.visible.map((icon) => {
- // @ts-ignore
- return icon === 'agents' ? 'store' : icon
- })
- state.settings.sidebarIcons.disabled = state.settings.sidebarIcons.disabled.map((icon) => {
- // @ts-ignore
- return icon === 'agents' ? 'store' : icon
- })
- }
-
- state.llm.providers.forEach((provider) => {
- if (provider.anthropicApiHost) {
- return
- }
-
- switch (provider.id) {
- case 'deepseek':
- provider.anthropicApiHost = 'https://api.deepseek.com/anthropic'
- break
- case 'moonshot':
- provider.anthropicApiHost = 'https://api.moonshot.cn/anthropic'
- break
- case 'zhipu':
- provider.anthropicApiHost = 'https://open.bigmodel.cn/api/anthropic'
- break
- case 'dashscope':
- provider.anthropicApiHost = 'https://dashscope.aliyuncs.com/api/v2/apps/claude-code-proxy'
- break
- case 'modelscope':
- provider.anthropicApiHost = 'https://api-inference.modelscope.cn'
- break
- case 'aihubmix':
- provider.anthropicApiHost = 'https://aihubmix.com'
- break
- case 'new-api':
- provider.anthropicApiHost = 'http://localhost:3000'
- break
- case 'grok':
- provider.anthropicApiHost = 'https://api.x.ai'
- }
- })
- return state
- } catch (error) {
- logger.error('migrate 162 error', error as Error)
- return state
- }
- },
- '163': (state: RootState) => {
- try {
- addOcrProvider(state, BUILTIN_OCR_PROVIDERS_MAP.ovocr)
- state.llm.providers.forEach((provider) => {
- if (provider.id === 'cherryin') {
- provider.anthropicApiHost = 'https://open.cherryin.net'
- }
- })
- state.paintings.ovms_paintings = []
- return state
- } catch (error) {
- logger.error('migrate 163 error', error as Error)
- return state
- }
- },
- '164': (state: RootState) => {
- try {
- addMiniApp(state, 'ling')
- return state
- } catch (error) {
- logger.error('migrate 164 error', error as Error)
- return state
- }
- },
- '165': (state: RootState) => {
- try {
- addMiniApp(state, 'huggingchat')
- return state
- } catch (error) {
- logger.error('migrate 165 error', error as Error)
- return state
- }
- },
- '166': (state: RootState) => {
- try {
- if (state.assistants.presets === undefined) {
- state.assistants.presets = []
- }
- state.assistants.presets.forEach((preset) => {
- if (!preset.settings) {
- preset.settings = DEFAULT_ASSISTANT_SETTINGS
- } else if (!preset.settings.toolUseMode) {
- preset.settings.toolUseMode = DEFAULT_ASSISTANT_SETTINGS.toolUseMode
- }
- })
- // 更新阿里云百炼的 Anthropic API 地址
- const dashscopeProvider = state.llm.providers.find((provider) => provider.id === 'dashscope')
- if (dashscopeProvider) {
- dashscopeProvider.anthropicApiHost = 'https://dashscope.aliyuncs.com/apps/anthropic'
- }
-
- state.llm.providers.forEach((provider) => {
- if (provider.id === SystemProviderIds['new-api'] && provider.type !== 'new-api') {
- provider.type = 'new-api'
- }
- if (provider.id === SystemProviderIds.longcat) {
- // https://longcat.chat/platform/docs/zh/#anthropic-api-%E6%A0%BC%E5%BC%8F
- if (!provider.anthropicApiHost) {
- provider.anthropicApiHost = 'https://api.longcat.chat/anthropic'
- }
- }
- })
- return state
- } catch (error) {
- logger.error('migrate 166 error', error as Error)
- return state
- }
- },
'167': (state: RootState) => {
try {
addProvider(state, 'huggingface')
@@ -2822,6 +2696,98 @@ const migrateConfig = {
logger.error('migrate 171 error', error as Error)
return state
}
+ },
+ '172': (state: RootState) => {
+ try {
+ // Add ling and huggingchat mini apps
+ addMiniApp(state, 'ling')
+ addMiniApp(state, 'huggingchat')
+
+ // Add ovocr provider and clear ovms paintings
+ addOcrProvider(state, BUILTIN_OCR_PROVIDERS_MAP.ovocr)
+ if (isEmpty(state.paintings.ovms_paintings)) {
+ state.paintings.ovms_paintings = []
+ }
+
+ // Migrate agents to assistants presets
+ // @ts-ignore
+ if (state?.agents?.agents) {
+ // @ts-ignore
+ state.assistants.presets = [...state.agents.agents]
+ // @ts-ignore
+ delete state.agents.agents
+ }
+
+ // Initialize assistants presets
+ if (state.assistants.presets === undefined) {
+ state.assistants.presets = []
+ }
+
+ // Migrate assistants presets
+ state.assistants.presets.forEach((preset) => {
+ if (!preset.settings) {
+ preset.settings = DEFAULT_ASSISTANT_SETTINGS
+ } else if (!preset.settings.toolUseMode) {
+ preset.settings.toolUseMode = DEFAULT_ASSISTANT_SETTINGS.toolUseMode
+ }
+ })
+
+ // Migrate sidebar icons
+ if (state.settings.sidebarIcons) {
+ state.settings.sidebarIcons.visible = state.settings.sidebarIcons.visible.map((icon) => {
+ // @ts-ignore
+ return icon === 'agents' ? 'store' : icon
+ })
+ state.settings.sidebarIcons.disabled = state.settings.sidebarIcons.disabled.map((icon) => {
+ // @ts-ignore
+ return icon === 'agents' ? 'store' : icon
+ })
+ }
+
+ // Migrate llm providers
+ state.llm.providers.forEach((provider) => {
+ if (provider.id === SystemProviderIds['new-api'] && provider.type !== 'new-api') {
+ provider.type = 'new-api'
+ }
+
+ switch (provider.id) {
+ case 'deepseek':
+ provider.anthropicApiHost = 'https://api.deepseek.com/anthropic'
+ break
+ case 'moonshot':
+ provider.anthropicApiHost = 'https://api.moonshot.cn/anthropic'
+ break
+ case 'zhipu':
+ provider.anthropicApiHost = 'https://open.bigmodel.cn/api/anthropic'
+ break
+ case 'dashscope':
+ provider.anthropicApiHost = 'https://dashscope.aliyuncs.com/apps/anthropic'
+ break
+ case 'modelscope':
+ provider.anthropicApiHost = 'https://api-inference.modelscope.cn'
+ break
+ case 'aihubmix':
+ provider.anthropicApiHost = 'https://aihubmix.com'
+ break
+ case 'new-api':
+ provider.anthropicApiHost = 'http://localhost:3000'
+ break
+ case 'grok':
+ provider.anthropicApiHost = 'https://api.x.ai'
+ break
+ case 'cherryin':
+ provider.anthropicApiHost = 'https://open.cherryin.net'
+ break
+ case 'longcat':
+ provider.anthropicApiHost = 'https://api.longcat.chat/anthropic'
+ break
+ }
+ })
+ return state
+ } catch (error) {
+ logger.error('migrate 172 error', error as Error)
+ return state
+ }
}
}
diff --git a/src/renderer/src/ui/context-menu.tsx b/src/renderer/src/ui/context-menu.tsx
deleted file mode 100644
index 7fdd27c38f..0000000000
--- a/src/renderer/src/ui/context-menu.tsx
+++ /dev/null
@@ -1,207 +0,0 @@
-'use client'
-
-import * as React from 'react'
-import * as ContextMenuPrimitive from '@radix-ui/react-context-menu'
-import { CheckIcon, ChevronRightIcon, CircleIcon } from 'lucide-react'
-import { cn } from '@renderer/utils'
-
-function ContextMenu({ ...props }: React.ComponentProps
+
+ {server.logoUrl && (
+ 
+ )}
+ {server.name}
+
{server.description ? (
- {server.description}
+
+ {server.description}
+
) : null}