Northern_Lights/cherry-studio
1
0
Fork 0
mirror of https://github.com/CherryHQ/cherry-studio.git synced 2026-01-09 06:49:02 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

refactor(ClaudeCodeService): remove unused anthropicService import and update oauth handling

Browse Source
This commit is contained in:
Vaayne 2025-09-20 23:26:37 +08:00
parent a5d4a01ad8
commit 01ffd4c4ca
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/services/agents/services/claudecode/index.ts
View File

@ -6,7 +6,6 @@ import { McpHttpServerConfig, Options, query, SDKMessage } from '@anthropic-ai/c
import { loggerService } from '@logger' import { loggerService } from '@logger'
import { config as apiConfigService } from '@main/apiServer/config' import { config as apiConfigService } from '@main/apiServer/config'
import { validateModelId } from '@main/apiServer/utils' import { validateModelId } from '@main/apiServer/utils'
import anthropicService from "@main/services/AnthropicService";
import { GetAgentSessionResponse } from '../..' import { GetAgentSessionResponse } from '../..'
import { AgentServiceInterface, AgentStream, AgentStreamEvent } from '../../interfaces/AgentStreamInterface' import { AgentServiceInterface, AgentStream, AgentStreamEvent } from '../../interfaces/AgentStreamInterface'
@ -74,8 +73,9 @@ class ClaudeCodeService implements AgentServiceInterface {
} }
if (modelInfo.provider.authType === 'oauth') { if (modelInfo.provider.authType === 'oauth') {
env['ANTHROPIC_AUTH_TOKEN'] = await anthropicService.getValidAccessToken() // TODO: support claude code max oauth
env['ANTHROPIC_BASE_URL'] = 'https://api.anthropic.com' // env['ANTHROPIC_AUTH_TOKEN'] = await anthropicService.getValidAccessToken()
// env['ANTHROPIC_BASE_URL'] = 'https://api.anthropic.com'
} else { } else {
env['ANTHROPIC_AUTH_TOKEN'] = modelInfo.provider.apiKey env['ANTHROPIC_AUTH_TOKEN'] = modelInfo.provider.apiKey
env['ANTHROPIC_API_KEY'] = modelInfo.provider.apiKey env['ANTHROPIC_API_KEY'] = modelInfo.provider.apiKey
@ -86,6 +86,8 @@ class ClaudeCodeService implements AgentServiceInterface {
const options: Options = { const options: Options = {
abortController, abortController,
cwd, cwd,
env,
model: modelInfo.modelId,
pathToClaudeCodeExecutable: this.claudeExecutablePath, pathToClaudeCodeExecutable: this.claudeExecutablePath,
stderr: (chunk: string) => { stderr: (chunk: string) => {
logger.info('claude stderr', { chunk }) logger.info('claude stderr', { chunk })