merge: resolve conflicts from origin/dev into PR #1495

- Use PR branch (dev-nofxi) as authority for agent/ module code
- Merge dev's newer model names (MiniMax-M2.7, deepseek-v4-flash)
  with PR's blockrun provider entries
- Fix duplicate agent init in main.go, keep defer-based Stop()
- Fix var type bug in store/ai_model.go (model → models)
- Remove dev-only test files incompatible with PR's evolved agent code
  (to be re-synced after merge)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
shinchan-zhai
2026-05-11 16:52:04 +08:00
parent ca8bed4a58
commit 32e8a03a85
20 changed files with 2861 additions and 86 deletions

View File

@@ -7,6 +7,7 @@ export interface Claw402Model {
desc: string
icon: string
price: number // USD per call
isNew?: boolean
}
export interface AIProviderConfig {
@@ -41,8 +42,12 @@ export function getShortName(fullName: string): string {
return parts.length > 1 ? parts[parts.length - 1] : fullName
}
export const DEFAULT_CLAW402_MODEL = 'deepseek-v4-flash'
// Models available through Claw402 (x402 USDC payment protocol)
export const CLAW402_MODELS: Claw402Model[] = [
{ id: 'deepseek-v4-flash', name: 'DeepSeek V4 Flash', provider: 'DeepSeek', desc: '$0.003/call', icon: '⚡', price: 0.003, isNew: true },
{ id: 'deepseek-v4-pro', name: 'DeepSeek V4 Pro', provider: 'DeepSeek', desc: '$0.01/call', icon: '🧠', price: 0.01, isNew: true },
{ id: 'deepseek', name: 'DeepSeek V3', provider: 'DeepSeek', desc: '$0.003/call', icon: '🔥', price: 0.003 },
{ id: 'deepseek-reasoner', name: 'DeepSeek R1', provider: 'DeepSeek', desc: '$0.005/call', icon: '🤔', price: 0.005 },
{ id: 'gpt-5-mini', name: 'GPT-5 Mini', provider: 'OpenAI', desc: '$0.005/call', icon: '🚀', price: 0.005 },
@@ -125,7 +130,7 @@ export const AI_PROVIDER_CONFIG: Record<string, AIProviderConfig> = {
apiName: 'MiniMax',
},
claw402: {
defaultModel: 'glm-5',
defaultModel: DEFAULT_CLAW402_MODEL,
apiUrl: 'https://claw402.ai',
apiName: 'Claw402',
},