diff --git a/common/src/__tests__/free-agents.test.ts b/common/src/__tests__/free-agents.test.ts
index 2a790b190a..ed52eb0a5e 100644
--- a/common/src/__tests__/free-agents.test.ts
+++ b/common/src/__tests__/free-agents.test.ts
@@ -123,6 +123,24 @@ describe('free mode agent model allowlist', () => {
     ).toBe(true)
   })
 
+  test('allows the tmux-cli subagent with its bundled model', () => {
+    expect(
+      isFreeModeAllowedAgentModel('tmux-cli', FREEBUFF_MINIMAX_MODEL_ID),
+    ).toBe(true)
+    expect(
+      isFreeModeAllowedAgentModel(
+        'codebuff/tmux-cli@0.0.1',
+        FREEBUFF_MINIMAX_MODEL_ID,
+      ),
+    ).toBe(true)
+    expect(
+      isFreeModeAllowedAgentModel(
+        'other/tmux-cli@0.0.1',
+        FREEBUFF_MINIMAX_MODEL_ID,
+      ),
+    ).toBe(false)
+  })
+
   test('allows Gemini Pro for the thinker subagent but not the freebuff root', () => {
     expect(
       isFreeModeAllowedAgentModel('base2-free', FREEBUFF_GEMINI_PRO_MODEL_ID),
diff --git a/common/src/constants/free-agents.ts b/common/src/constants/free-agents.ts
index a14ca9f870..535056331d 100644
--- a/common/src/constants/free-agents.ts
+++ b/common/src/constants/free-agents.ts
@@ -91,6 +91,7 @@ export const FREE_MODE_AGENT_MODELS: Record<string, Set<string>> = {
 
   // Command execution
   basher: new Set(['google/gemini-3.1-flash-lite-preview']),
+  'tmux-cli': new Set([FREEBUFF_MINIMAX_MODEL_ID]),
 
   // Code reviewer for free mode
   'code-reviewer-minimax': new Set([