Configure freebuff agents by model

Author: jahooma

agents/base2/base2-free-deepseek-v4.ts

@@ -1,10 +1,7 @@
-import { createBase2 } from './base2'
+import base2FreeDeepseek from './base2-free-deepseek'
 
 const definition = {
-  ...createBase2('free', {
-    noAskUser: true,
-    model: 'deepseek/deepseek-v4-pro',
-  }),
+  ...base2FreeDeepseek,
   id: 'base2-free-deepseek-v4',
   displayName: 'Buffy the DeepSeek V4 Free Orchestrator',
 }

agents/base2/base2-free-deepseek.ts

@@ -0,0 +1,15 @@
+import { FREEBUFF_DEEPSEEK_V4_PRO_MODEL_ID } from '@codebuff/common/constants/freebuff-models'
+
+import { createBase2 } from './base2'
+
+const definition = {
+  ...createBase2('free', {
+    noAskUser: true,
+    model: FREEBUFF_DEEPSEEK_V4_PRO_MODEL_ID,
+    freeCodeReviewerAgentId: 'code-reviewer-deepseek',
+  }),
+  id: 'base2-free-deepseek',
+  displayName: 'Buffy the DeepSeek Free Orchestrator',
+}
+
+export default definition

agents/base2/base2-free-kimi.ts

@@ -0,0 +1,14 @@
+import { FREEBUFF_KIMI_MODEL_ID } from '@codebuff/common/constants/freebuff-models'
+
+import { createBase2 } from './base2'
+
+const definition = {
+  ...createBase2('free', {
+    model: FREEBUFF_KIMI_MODEL_ID,
+    freeCodeReviewerAgentId: 'code-reviewer-kimi',
+  }),
+  id: 'base2-free-kimi',
+  displayName: 'Buffy the Kimi Free Orchestrator',
+}
+
+export default definition

agents/base2/base2-free.ts

@@ -1,7 +1,9 @@
 import { createBase2 } from './base2'
 
 const definition = {
-  ...createBase2('free'),
+  ...createBase2('free', {
+    freeCodeReviewerAgentId: 'code-reviewer-lite',
+  }),
   id: 'base2-free',
   displayName: 'Buffy the Free Orchestrator',
 }

agents/base2/base2.ts

@@ -5,6 +5,10 @@ import {
   FREEBUFF_GEMINI_THINKER_STEP_PROMPT,
   FREEBUFF_GEMINI_THINKER_SYSTEM_INSTRUCTION,
 } from '@codebuff/common/constants/freebuff-gemini-thinker'
+import {
+  canFreebuffModelSpawnGeminiThinker,
+  FREEBUFF_MINIMAX_MODEL_ID,
+} from '@codebuff/common/constants/freebuff-models'
 
 import { publisher } from '../constants'
 import {
@@ -20,6 +24,7 @@ export function createBase2(
     noAskUser?: boolean
     model?: SecretAgentDefinition['model']
     providerOptions?: SecretAgentDefinition['providerOptions']
+    freeCodeReviewerAgentId?: string
   },
 ): Omit<SecretAgentDefinition, 'id'> {
   const {
@@ -28,6 +33,7 @@ export function createBase2(
     noAskUser = false,
     model: modelOverride,
     providerOptions,
+    freeCodeReviewerAgentId = 'code-reviewer-lite',
   } = options ?? {}
   const isDefault = mode === 'default'
   const isFast = mode === 'fast'
@@ -38,20 +44,18 @@ export function createBase2(
   // Lite (paid Codebuff) defaults to Kimi: no data-retention surface in the
   // CLI today, so we don't want to silently route Codebuff prompts through a
   // model whose provider trains on user data. Free (freebuff) defaults to
-  // DeepSeek and surfaces the data-collection caveat in the picker; the CLI
-  // overrides the model anyway based on the user's freebuff selection.
+  // MiniMax M2.7; Kimi and DeepSeek are separate free agent variants.
   const model =
     modelOverride ??
     (mode === 'lite'
       ? 'moonshotai/kimi-k2.6'
       : mode === 'free'
-        ? 'deepseek/deepseek-v4-pro'
+        ? FREEBUFF_MINIMAX_MODEL_ID
         : 'anthropic/claude-opus-4.7')
-  // Bundled free-mode definitions ship with the gemini-thinker spawnable +
-  // prompts; the CLI strips them at runtime if the user picks a fast model
-  // that doesn't benefit (e.g. MiniMax). Smart freebuff models (Kimi,
-  // DeepSeek) keep it so they can offload deeper reasoning.
-  const hasFreeGeminiThinker = isFree
+  // Smart freebuff model variants (Kimi, DeepSeek) can offload deeper
+  // reasoning. Fast MiniMax omits the extra round trip by construction.
+  const hasFreeGeminiThinker =
+    isFree && canFreebuffModelSpawnGeminiThinker(model)
   const defaultProviderOptions = isFree
     ? {
         data_collection: 'deny' as const,
@@ -114,7 +118,7 @@ export function createBase2(
       isMax && 'editor-multi-prompt',
       'tmux-cli',
       'browser-use',
-      isFree && 'code-reviewer-lite',
+      isFree && freeCodeReviewerAgentId,
       isDefault && 'code-reviewer',
       isMax && 'code-reviewer-multi-prompt',
       hasFreeGeminiThinker && FREEBUFF_GEMINI_THINKER_AGENT_ID,
@@ -183,7 +187,7 @@ Use the spawn_agents tool to spawn specialized agents to help you complete the u
     isMax &&
       `- IMPORTANT: You must spawn the editor-multi-prompt agent to implement the changes after you have gathered all the context you need. You must spawn this agent for non-trivial changes, since it writes much better code than you would with the str_replace or write_file tools. Don't spawn the editor in parallel with context-gathering agents.`,
     isFree &&
-      '- Spawn a code-reviewer-lite to review the changes after you have implemented the changes.',
+      `- Spawn a ${freeCodeReviewerAgentId} to review the changes after you have implemented the changes.`,
     '- Spawn bashers sequentially if the second command depends on the the first.',
     isDefault &&
       '- Spawn a code-reviewer to review the changes after you have implemented the changes.',
@@ -252,7 +256,7 @@ ${
   isDefault
     ? `[ You spawn a code-reviewer, a basher to typecheck the changes, and another basher to run tests, all in parallel ]`
     : isFree
-      ? `[ You spawn a code-reviewer-lite to review the changes, a basher to typecheck the local changes, a basher to typecheck the whole project, and another basher to run tests, all in parallel ]`
+      ? `[ You spawn a ${freeCodeReviewerAgentId} to review the changes, a basher to typecheck the local changes, a basher to typecheck the whole project, and another basher to run tests, all in parallel ]`
       : isMax
         ? `[  You spawn a basher to typecheck the changes, and another basher to run tests, in parallel. Then, you spawn a code-reviewer-multi-prompt to review the changes. ]`
         : '[ You spawn a basher to typecheck the changes and another basher to run tests, all in parallel ]'
@@ -262,7 +266,7 @@ ${
   isDefault
     ? `[ You fix the issues found by the code-reviewer and type/test errors ]`
     : isFree
-      ? `[ You fix the issues found by the code-reviewer-lite and type/test errors ]`
+      ? `[ You fix the issues found by the ${freeCodeReviewerAgentId} and type/test errors ]`
       : isMax
         ? `[ You fix the issues found by the code-reviewer-multi-prompt and type/test errors ]`
         : '[ You fix the issues found by the type/test errors and spawn more bashers to confirm ]'
@@ -305,6 +309,7 @@ ${PLACEHOLDER.GIT_CHANGES_PROMPT}
           hasFreeGeminiThinker,
           hasNoValidation,
           noAskUser,
+          freeCodeReviewerAgentId,
         }),
     stepPrompt: planOnly
       ? buildPlanOnlyStepPrompt({})
@@ -317,6 +322,7 @@ ${PLACEHOLDER.GIT_CHANGES_PROMPT}
           isFree,
           hasFreeGeminiThinker,
           noAskUser,
+          freeCodeReviewerAgentId,
         }),
 
     // handleSteps is serialized via .toString() and re-eval'd, so closure
@@ -367,6 +373,7 @@ function buildImplementationInstructionsPrompt({
   hasFreeGeminiThinker,
   hasNoValidation,
   noAskUser,
+  freeCodeReviewerAgentId,
 }: {
   isSonnet: boolean
   isFast: boolean
@@ -376,6 +383,7 @@ function buildImplementationInstructionsPrompt({
   hasFreeGeminiThinker: boolean
   hasNoValidation: boolean
   noAskUser: boolean
+  freeCodeReviewerAgentId: string
 }) {
   return `Act as a helpful assistant and freely respond to the user's request however would be most helpful to the user. Use your judgement to orchestrate the completion of the user's request using your specialized sub-agents and tools as needed. Take your time and be comprehensive. Don't surprise the user. For example, don't modify files if the user has not asked you to do so at least implicitly.
 
@@ -407,7 +415,7 @@ ${buildArray(
   (isDefault || isMax) &&
     `- Spawn a ${isDefault ? 'code-reviewer' : 'code-reviewer-multi-prompt'} to review the changes after you have implemented changes. (Skip this step only if the change is extremely straightforward and obvious.)`,
   isFree &&
-    `- Spawn a code-reviewer-lite to review the changes after you have implemented changes. (Skip this step only if the change is extremely straightforward and obvious.)`,
+    `- Spawn a ${freeCodeReviewerAgentId} to review the changes after you have implemented changes. (Skip this step only if the change is extremely straightforward and obvious.)`,
   `- Inform the user that you have completed the task in one sentence or a few short bullet points.${isSonnet ? " Don't create any markdown summary files or example documentation files, unless asked by the user." : ''}`,
   !isFast &&
     !noAskUser &&
@@ -424,6 +432,7 @@ function buildImplementationStepPrompt({
   isFree,
   hasFreeGeminiThinker,
   noAskUser,
+  freeCodeReviewerAgentId,
 }: {
   isDefault: boolean
   isFast: boolean
@@ -433,6 +442,7 @@ function buildImplementationStepPrompt({
   isFree: boolean
   hasFreeGeminiThinker: boolean
   noAskUser: boolean
+  freeCodeReviewerAgentId: string
 }) {
   return buildArray(
     isMax &&
@@ -444,7 +454,7 @@ function buildImplementationStepPrompt({
     (isDefault || isMax) &&
       `You must spawn a ${isDefault ? 'code-reviewer' : 'code-reviewer-multi-prompt'} to review the changes after you have implemented the changes and in parallel with typechecking or testing.`,
     isFree &&
-      `You must spawn a code-reviewer-lite to review the changes after you have implemented the changes and in parallel with typechecking or testing.`,
+      `You must spawn a ${freeCodeReviewerAgentId} to review the changes after you have implemented the changes and in parallel with typechecking or testing.`,
     `After completing the user request, summarize your changes in a sentence${isFast ? '' : ' or a few short bullet points'}.${isSonnet ? " Don't create any summary markdown files or example documentation files, unless asked by the user." : ''}.`,
     !isFast &&
       !noAskUser &&

agents/reviewer/code-reviewer-deepseek.ts

@@ -0,0 +1,11 @@
+import { publisher } from '../constants'
+import type { SecretAgentDefinition } from '../types/secret-agent-definition'
+import { createReviewer } from './code-reviewer'
+
+const definition: SecretAgentDefinition = {
+  id: 'code-reviewer-deepseek',
+  publisher,
+  ...createReviewer('deepseek/deepseek-v4-pro'),
+}
+
+export default definition

agents/reviewer/code-reviewer-kimi.ts

@@ -0,0 +1,11 @@
+import { publisher } from '../constants'
+import type { SecretAgentDefinition } from '../types/secret-agent-definition'
+import { createReviewer } from './code-reviewer'
+
+const definition: SecretAgentDefinition = {
+  id: 'code-reviewer-kimi',
+  publisher,
+  ...createReviewer('moonshotai/kimi-k2.6'),
+}
+
+export default definition

agents/reviewer/code-reviewer-lite.ts

@@ -5,7 +5,7 @@ import { createReviewer } from './code-reviewer'
 const definition: SecretAgentDefinition = {
   id: 'code-reviewer-lite',
   publisher,
-  ...createReviewer('moonshotai/kimi-k2.6'),
+  ...createReviewer('minimax/minimax-m2.7'),
 }
 
 export default definition

cli/src/__tests__/integration/local-agents.test.ts

@@ -3,17 +3,6 @@ import os from 'os'
 import path from 'path'
 
 import { validateAgents } from '@codebuff/sdk'
-import {
-  FREEBUFF_GEMINI_THINKER_AGENT_ID,
-  FREEBUFF_GEMINI_THINKER_INSTRUCTIONS_PROMPT,
-  FREEBUFF_GEMINI_THINKER_STEP_PROMPT,
-  FREEBUFF_GEMINI_THINKER_SYSTEM_INSTRUCTION,
-} from '@codebuff/common/constants/freebuff-gemini-thinker'
-import {
-  FREEBUFF_DEEPSEEK_V4_PRO_MODEL_ID,
-  FREEBUFF_KIMI_MODEL_ID,
-  FREEBUFF_MINIMAX_MODEL_ID,
-} from '@codebuff/common/constants/freebuff-models'
 import { describe, test, expect, beforeEach, afterEach, mock } from 'bun:test'
 
 // Mock the logger to prevent analytics initialization errors in tests
@@ -31,7 +20,6 @@ import { setProjectRoot, getProjectRoot } from '../../project-files'
 import {
   loadAgentDefinitions,
   loadLocalAgents,
-  configureFreebuffBaseAgentForModel,
   initializeAgentRegistry,
   findAgentsDirectory,
   getLoadedAgentsData,
@@ -42,87 +30,6 @@ import {
 
 const MODEL_NAME = 'anthropic/claude-sonnet-4'
 
-describe('configureFreebuffBaseAgentForModel', () => {
-  const makeBase2Free = () => ({
-    id: 'base2-free',
-    spawnableAgents: ['file-picker', FREEBUFF_GEMINI_THINKER_AGENT_ID],
-    systemPrompt: [
-      'before',
-      FREEBUFF_GEMINI_THINKER_SYSTEM_INSTRUCTION,
-      'after',
-    ].join('\n'),
-    instructionsPrompt: [
-      'before',
-      FREEBUFF_GEMINI_THINKER_INSTRUCTIONS_PROMPT,
-      'after',
-    ].join('\n'),
-    stepPrompt: ['before', FREEBUFF_GEMINI_THINKER_STEP_PROMPT, 'after'].join(
-      '\n',
-    ),
-  })
-
-  test('keeps the Gemini thinker and prompt guidance for Kimi', () => {
-    const definition = makeBase2Free()
-
-    configureFreebuffBaseAgentForModel(definition, FREEBUFF_KIMI_MODEL_ID)
-
-    expect(definition.spawnableAgents).toContain(
-      FREEBUFF_GEMINI_THINKER_AGENT_ID,
-    )
-    expect(definition.systemPrompt).toContain(
-      FREEBUFF_GEMINI_THINKER_SYSTEM_INSTRUCTION,
-    )
-    expect(definition.instructionsPrompt).toContain(
-      FREEBUFF_GEMINI_THINKER_INSTRUCTIONS_PROMPT,
-    )
-    expect(definition.stepPrompt).toContain(FREEBUFF_GEMINI_THINKER_STEP_PROMPT)
-  })
-
-  test('keeps the Gemini thinker and prompt guidance for DeepSeek', () => {
-    const definition = makeBase2Free()
-
-    configureFreebuffBaseAgentForModel(
-      definition,
-      FREEBUFF_DEEPSEEK_V4_PRO_MODEL_ID,
-    )
-
-    expect(definition.spawnableAgents).toContain(
-      FREEBUFF_GEMINI_THINKER_AGENT_ID,
-    )
-    expect(definition.systemPrompt).toContain(
-      FREEBUFF_GEMINI_THINKER_SYSTEM_INSTRUCTION,
-    )
-    expect(definition.instructionsPrompt).toContain(
-      FREEBUFF_GEMINI_THINKER_INSTRUCTIONS_PROMPT,
-    )
-    expect(definition.stepPrompt).toContain(FREEBUFF_GEMINI_THINKER_STEP_PROMPT)
-  })
-
-  test('removes only exact Gemini thinker prompt guidance for MiniMax', () => {
-    const definition = makeBase2Free()
-    definition.systemPrompt +=
-      '\nUser text mentioning thinker-with-files-gemini should stay.'
-
-    configureFreebuffBaseAgentForModel(definition, FREEBUFF_MINIMAX_MODEL_ID)
-
-    expect(definition.spawnableAgents).not.toContain(
-      FREEBUFF_GEMINI_THINKER_AGENT_ID,
-    )
-    expect(definition.systemPrompt).not.toContain(
-      FREEBUFF_GEMINI_THINKER_SYSTEM_INSTRUCTION,
-    )
-    expect(definition.instructionsPrompt).not.toContain(
-      FREEBUFF_GEMINI_THINKER_INSTRUCTIONS_PROMPT,
-    )
-    expect(definition.stepPrompt).not.toContain(
-      FREEBUFF_GEMINI_THINKER_STEP_PROMPT,
-    )
-    expect(definition.systemPrompt).toContain(
-      'User text mentioning thinker-with-files-gemini should stay.',
-    )
-  })
-})
-
 const writeAgentFile = (
   agentsDir: string,
   fileName: string,

cli/src/hooks/use-send-message.ts

@@ -5,13 +5,10 @@ import { createStreamController } from './stream-state'
 import { useChatStore } from '../state/chat-store'
 import { getFreebuffInstanceId } from './use-freebuff-session'
 import { getCodebuffClient } from '../utils/codebuff-client'
-import {
-  AGENT_MODE_TO_ID,
-  AGENT_MODE_TO_COST_MODE,
-  IS_FREEBUFF,
-} from '../utils/constants'
+import { AGENT_MODE_TO_COST_MODE, IS_FREEBUFF } from '../utils/constants'
 import { createEventHandlerState } from '../utils/create-event-handler-state'
 import { createRunConfig } from '../utils/create-run-config'
+import { getAgentIdForMode } from '../utils/freebuff-agent-selection'
 import { loadAgentDefinitions } from '../utils/local-agent-registry'
 import { logger } from '../utils/logger'
 import {
@@ -81,7 +78,7 @@ const resolveAgent = (
       ? agentDefinitions.find((definition) => definition.id === agentId)
       : undefined
 
-  return selectedAgentDefinition ?? agentId ?? AGENT_MODE_TO_ID[agentMode]
+  return selectedAgentDefinition ?? agentId ?? getAgentIdForMode(agentMode)
 }
 
 // Respect bash context, but avoid sending empty prompts when only images are attached.