Merge remote-tracking branch 'origin/main' into feat/cherry-claw-agent

Author: vaayne

.github/ISSUE_TEMPLATE/0_bug_report.yml

@@ -1,7 +1,8 @@
 name: 🐛 Bug Report
 description: Create a report to help us improve
-title: '[Bug]: '
-labels: ['BUG']
+title: "[Bug]: "
+labels: []
+type: Bug
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/1_feature_request.yml

@@ -1,7 +1,8 @@
 name: 💡 Feature Request
 description: Suggest an idea for this project
-title: '[Feature]: '
-labels: ['feature']
+title: "[Feature]: "
+labels: []
+type: Feature
 body:
   - type: markdown
     attributes:

packages/aiCore/src/core/options/factory.ts

@@ -114,10 +114,3 @@ export function createGoogleOptions(options: ExtractProviderOptions<'google'>) {
 export function createOpenRouterOptions(options: ExtractProviderOptions<'openrouter'> | Record<string, any>) {
   return createProviderOptions('openrouter', options)
 }
-
-/**
- * 创建XAI供应商选项的便捷函数
- */
-export function createXaiOptions(options: ExtractProviderOptions<'xai'>) {
-  return createProviderOptions('xai', options)
-}

packages/aiCore/src/core/plugins/built-in/webSearchPlugin/helper.ts

@@ -1,11 +1,11 @@
 import { anthropic } from '@ai-sdk/anthropic'
 import { google } from '@ai-sdk/google'
 import { openai } from '@ai-sdk/openai'
+import { xai } from '@ai-sdk/xai'
 import type { InferToolInput, InferToolOutput } from 'ai'
 import { type Tool } from 'ai'
 
-import { createOpenRouterOptions, createXaiOptions, mergeProviderOptions } from '../../../options'
-import type { ProviderOptionsMap } from '../../../options/types'
+import { createOpenRouterOptions, mergeProviderOptions } from '../../../options'
 import type { AiRequestContext } from '../../'
 import type { OpenRouterSearchConfig } from './openrouter'
 
@@ -16,14 +16,17 @@ export type OpenAISearchConfig = NonNullable<Parameters<typeof openai.tools.webS
 export type OpenAISearchPreviewConfig = NonNullable<Parameters<typeof openai.tools.webSearchPreview>[0]>
 export type AnthropicSearchConfig = NonNullable<Parameters<typeof anthropic.tools.webSearch_20250305>[0]>
 export type GoogleSearchConfig = NonNullable<Parameters<typeof google.tools.googleSearch>[0]>
-export type XAISearchConfig = NonNullable<ProviderOptionsMap['xai']['searchParameters']>
+export type XAIWebSearchConfig = NonNullable<Parameters<typeof xai.tools.webSearch>[0]>
+export type XAIXSearchConfig = NonNullable<Parameters<typeof xai.tools.xSearch>[0]>
 
 type NormalizeTool<T> = T extends Tool<infer INPUT, infer OUTPUT> ? Tool<INPUT, OUTPUT> : Tool<any, any>
 
 type AnthropicWebSearchTool = NormalizeTool<ReturnType<typeof anthropic.tools.webSearch_20250305>>
 type OpenAIWebSearchTool = NormalizeTool<ReturnType<typeof openai.tools.webSearch>>
 type OpenAIChatWebSearchTool = NormalizeTool<ReturnType<typeof openai.tools.webSearchPreview>>
 type GoogleWebSearchTool = NormalizeTool<ReturnType<typeof google.tools.googleSearch>>
+type XAIWebSearchTool = NormalizeTool<ReturnType<typeof xai.tools.webSearch>>
+type XAIXSearchTool = NormalizeTool<ReturnType<typeof xai.tools.xSearch>>
 
 /**
  * 插件初始化时接收的完整配置对象
@@ -34,7 +37,8 @@ export interface WebSearchPluginConfig {
   openai?: OpenAISearchConfig
   'openai-chat'?: OpenAISearchPreviewConfig
   anthropic?: AnthropicSearchConfig
-  xai?: ProviderOptionsMap['xai']['searchParameters']
+  xai?: XAIWebSearchConfig
+  'xai-xsearch'?: XAIXSearchConfig
   google?: GoogleSearchConfig
   openrouter?: OpenRouterSearchConfig
 }
@@ -47,10 +51,10 @@ export const DEFAULT_WEB_SEARCH_CONFIG: WebSearchPluginConfig = {
   openai: {},
   'openai-chat': {},
   xai: {
-    mode: 'on',
-    returnCitations: true,
-    maxSearchResults: 5,
-    sources: [{ type: 'web' }, { type: 'x' }, { type: 'news' }]
+    enableImageUnderstanding: true
+  },
+  'xai-xsearch': {
+    enableImageUnderstanding: true
   },
   anthropic: {
     maxUses: 5
@@ -87,13 +91,18 @@ export type WebSearchToolOutputSchema = {
       web?: { uri: string; title: string }
     }>
   }
+  // xAI 工具
+  xai: InferToolOutput<XAIWebSearchTool>
+  'xai-xsearch': InferToolOutput<XAIXSearchTool>
 }
 
 export type WebSearchToolInputSchema = {
   anthropic: InferToolInput<AnthropicWebSearchTool>
   openai: InferToolInput<OpenAIWebSearchTool>
   google: InferToolInput<GoogleWebSearchTool>
   'openai-chat': InferToolInput<OpenAIChatWebSearchTool>
+  xai: InferToolInput<XAIWebSearchTool>
+  'xai-xsearch': InferToolInput<XAIXSearchTool>
 }
 
 /**
@@ -141,8 +150,9 @@ export const switchWebSearchTool = (config: WebSearchPluginConfig, params: any,
     },
     xai: () => {
       const cfg = config.xai ?? DEFAULT_WEB_SEARCH_CONFIG.xai
-      const searchOptions = createXaiOptions({ searchParameters: { ...cfg, mode: 'on' } })
-      applyProviderOptionsSearch(params, searchOptions)
+      applyToolBasedSearch(params, 'web_search', xai.tools.webSearch(cfg))
+      const xSearchCfg = config['xai-xsearch'] ?? DEFAULT_WEB_SEARCH_CONFIG['xai-xsearch']
+      applyToolBasedSearch(params, 'x_search', xai.tools.xSearch(xSearchCfg))
     },
     openrouter: () => {
       const cfg = (config.openrouter ?? DEFAULT_WEB_SEARCH_CONFIG.openrouter) as OpenRouterSearchConfig

packages/aiCore/src/core/providers/schemas.ts

@@ -101,7 +101,15 @@ export const baseProviders = [
   {
     id: 'xai',
     name: 'xAI (Grok)',
-    creator: createXai,
+    creator: (options: Parameters<typeof createXai>[0]) => {
+      const provider = createXai(options)
+      return customProvider({
+        fallbackProvider: {
+          ...provider,
+          languageModel: (modelId: string) => provider.responses(modelId)
+        }
+      })
+    },
     supportsImageGeneration: true
   },
   {

src/main/services/CodeToolsService.ts

@@ -1201,7 +1201,8 @@ class CodeToolsService {
         detached: true,
         stdio: 'ignore',
         cwd: directory,
-        env: processEnv
+        env: processEnv,
+        shell: isWin
       })
 
       const successMessage = `Launched ${cliTool} in new terminal window`

src/main/services/OpenClawService.ts

@@ -244,8 +244,14 @@ class OpenClawService {
     const npmArgs = ['install', '-g', packageName]
     if (registryArg) npmArgs.push(registryArg)
 
-    // Keep the command string for logging and sudo retry
-    const npmCommand = `"${npmPath}" install -g ${packageName} ${registryArg}`.trim()
+    // Keep the command string for logging and sudo retry.
+    // On macOS/Linux, prepend npm's parent dir to PATH so that sudo (which runs in a
+    // clean environment without user PATH) can resolve `node` via npm's shebang
+    // (#!/usr/bin/env node).
+    const nodeDir = path.dirname(npmPath)
+    const npmCommand = isWin
+      ? `"${npmPath}" install -g ${packageName} ${registryArg}`.trim()
+      : `PATH="${nodeDir}:$PATH" "${npmPath}" install -g ${packageName} ${registryArg}`.trim()
 
     // On Windows, wrap npm path in quotes if it contains spaces and is not already quoted
     const needsQuotes = isWin && npmPath.includes(' ') && !npmPath.startsWith('"')
@@ -347,8 +353,12 @@ class OpenClawService {
 
     const npmArgs = ['uninstall', '-g', 'openclaw', '@qingchencloud/openclaw-zh']
 
-    // Keep the command string for logging and sudo retry
-    const npmCommand = `"${npmPath}" uninstall -g openclaw @qingchencloud/openclaw-zh`
+    // Keep the command string for logging and sudo retry.
+    // On macOS/Linux, prepend npm's parent dir to PATH so that sudo can resolve `node`.
+    const nodeDir = path.dirname(npmPath)
+    const npmCommand = isWin
+      ? `"${npmPath}" uninstall -g openclaw @qingchencloud/openclaw-zh`
+      : `PATH="${nodeDir}:$PATH" "${npmPath}" uninstall -g openclaw @qingchencloud/openclaw-zh`
 
     // On Windows, wrap npm path in quotes if it contains spaces and is not already quoted
     const needsQuotes = isWin && npmPath.includes(' ') && !npmPath.startsWith('"')

src/main/services/agents/drizzle.config.ts

@@ -18,16 +18,12 @@
  * Drizzle Kit configuration for agents database
  */
 
-import os from 'node:os'
 import path from 'node:path'
 
 import { defineConfig } from 'drizzle-kit'
 import { app } from 'electron'
 
 function getDbPath() {
-  if (process.env.NODE_ENV === 'development') {
-    return path.join(os.homedir(), '.cherrystudio', 'data', 'agents.db')
-  }
   return path.join(app.getPath('userData'), 'Data', 'agents.db')
 }
 

src/main/services/agents/services/claudecode/index.ts

@@ -169,6 +169,37 @@ class ClaudeCodeService implements AgentServiceInterface {
       ...(customGitBashPath ? { CLAUDE_CODE_GIT_BASH_PATH: customGitBashPath } : {})
     }
 
+    // Merge user-defined environment variables from session configuration
+    const userEnvVars = session.configuration?.env_vars
+    if (userEnvVars && typeof userEnvVars === 'object') {
+      const BLOCKED_ENV_KEYS = new Set([
+        'ANTHROPIC_API_KEY',
+        'ANTHROPIC_AUTH_TOKEN',
+        'ANTHROPIC_BASE_URL',
+        'ANTHROPIC_MODEL',
+        'ANTHROPIC_DEFAULT_OPUS_MODEL',
+        'ANTHROPIC_DEFAULT_SONNET_MODEL',
+        'ANTHROPIC_DEFAULT_HAIKU_MODEL',
+        'ELECTRON_RUN_AS_NODE',
+        'ELECTRON_NO_ATTACH_CONSOLE',
+        'CLAUDE_CONFIG_DIR',
+        'CLAUDE_CODE_USE_BEDROCK',
+        'CLAUDE_CODE_GIT_BASH_PATH',
+        'NODE_OPTIONS',
+        '__PROTO__',
+        'CONSTRUCTOR',
+        'PROTOTYPE'
+      ])
+      for (const [key, value] of Object.entries(userEnvVars)) {
+        const upperKey = key.toUpperCase()
+        if (BLOCKED_ENV_KEYS.has(upperKey)) {
+          logger.warn('Blocked user env var override for system-critical variable', { key })
+        } else if (typeof value === 'string') {
+          env[key] = value
+        }
+      }
+    }
+
     const errorChunks: string[] = []
 
     const sessionAllowedTools = new Set<string>(session.allowed_tools ?? [])

src/main/utils/ipService.ts

@@ -13,7 +13,7 @@ export async function getIpCountry(): Promise<string> {
     const controller = new AbortController()
     const timeoutId = setTimeout(() => controller.abort(), 5000)
 
-    const ipinfo = await net.fetch(`https://api.ipinfo.io/lite/me?token=2a42580355dae4`, {
+    const ipinfo = await net.fetch(`https://api.ipinfo.io/lite/me?token=5aa4105b40adbc`, {
       signal: controller.signal
     })