Merge remote-tracking branch 'origin/main' into jahooma/freebuff-glm-limit

# Conflicts:
#	cli/src/hooks/use-freebuff-session.ts
#	web/src/app/api/v1/freebuff/session/_handlers.ts
#	web/src/server/free-session/public-api.ts

Author: jahooma

agents/__tests__/editor.test.ts

@@ -67,6 +67,11 @@ describe('editor agent', () => {
       expect(glmEditor.model).toBe('z-ai/glm-5.1')
     })
 
+    test('creates minimax editor', () => {
+      const minimaxEditor = createCodeEditor({ model: 'minimax' })
+      expect(minimaxEditor.model).toBe('minimax/minimax-m2.7')
+    })
+
     test('gpt-5 editor does not include think tags in instructions', () => {
       const gpt5Editor = createCodeEditor({ model: 'gpt-5' })
       expect(gpt5Editor.instructionsPrompt).not.toContain('<think>')
@@ -79,6 +84,12 @@ describe('editor agent', () => {
       expect(glmEditor.instructionsPrompt).not.toContain('</think>')
     })
 
+    test('minimax editor does not include think tags in instructions', () => {
+      const minimaxEditor = createCodeEditor({ model: 'minimax' })
+      expect(minimaxEditor.instructionsPrompt).not.toContain('<think>')
+      expect(minimaxEditor.instructionsPrompt).not.toContain('</think>')
+    })
+
     test('opus editor includes think tags in instructions', () => {
       const opusEditor = createCodeEditor({ model: 'opus' })
       expect(opusEditor.instructionsPrompt).toContain('<think>')

agents/editor/editor.ts

@@ -4,14 +4,16 @@ import { publisher } from '../constants'
 import type { AgentDefinition } from '../types/agent-definition'
 
 export const createCodeEditor = (options: {
-  model: 'gpt-5' | 'opus' | 'glm'
+  model: 'gpt-5' | 'opus' | 'glm' | 'minimax'
 }): Omit<AgentDefinition, 'id'> => {
   const { model } = options
   return {
     publisher,
     model:
       options.model === 'gpt-5'
         ? 'openai/gpt-5.1'
+        : options.model === 'minimax'
+          ? 'minimax/minimax-m2.7'
         : options.model === 'glm'
           ? 'z-ai/glm-5.1'
           : 'anthropic/claude-opus-4.7',
@@ -65,7 +67,7 @@ OR for new files or major rewrites:
 }
 </codebuff_tool_call>
 
-${model === 'gpt-5' || model === 'glm'
+${model === 'gpt-5' || model === 'glm' || model === 'minimax'
         ? ''
         : `Before you start writing your implementation, you should use <think> tags to think about the best way to implement the changes.
 

agents/types/agent-definition.ts

@@ -423,8 +423,6 @@ export type ModelName =
   // Other open source models
   | 'moonshotai/kimi-k2'
   | 'moonshotai/kimi-k2:nitro'
-  | 'moonshotai/kimi-k2.5'
-  | 'moonshotai/kimi-k2.5:nitro'
   | 'z-ai/glm-5'
   | 'z-ai/glm-5.1'
   | 'z-ai/glm-4.6'

cli/src/chat.tsx

@@ -11,9 +11,8 @@ import {
 } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 
-import { getAdsEnabled, handleAdsDisable } from './commands/ads'
+import { getAdsEnabled } from './commands/ads'
 import { routeUserPrompt, addBashMessageToHistory } from './commands/router'
-import { AdBanner } from './components/ad-banner'
 import { ChoiceAdBanner } from './components/choice-ad-banner'
 import { ChatInputBar } from './components/chat-input-bar'
 import { LoadPreviousButton } from './components/load-previous-button'
@@ -175,13 +174,7 @@ export const Chat = ({
   })
   const hasSubscription = subscriptionData?.hasSubscription ?? false
 
-  const { ad, adData, recordImpression } = useGravityAd({ enabled: IS_FREEBUFF || !hasSubscription })
-  const [adsManuallyDisabled, setAdsManuallyDisabled] = useState(false)
-
-  const handleDisableAds = useCallback(() => {
-    handleAdsDisable()
-    setAdsManuallyDisabled(true)
-  }, [])
+  const { adData, recordImpression } = useGravityAd({ enabled: IS_FREEBUFF || !hasSubscription })
 
   // Set initial mode from CLI flag on mount
   useEffect(() => {
@@ -1466,19 +1459,11 @@ export const Chat = ({
           />
         )}
 
-        {ad && (IS_FREEBUFF || (!adsManuallyDisabled && getAdsEnabled())) && (
-          adData?.variant === 'choice' ? (
-            <ChoiceAdBanner
-              ads={adData.ads}
-              onImpression={recordImpression}
-            />
-          ) : (
-            <AdBanner
-              ad={ad}
-              onDisableAds={handleDisableAds}
-              isFreeMode={IS_FREEBUFF}
-            />
-          )
+        {adData && (IS_FREEBUFF || getAdsEnabled()) && (
+          <ChoiceAdBanner
+            ads={adData.variant === 'choice' ? adData.ads : [adData.ad]}
+            onImpression={recordImpression}
+          />
         )}
 
         {reviewMode ? (