diff --git a/src/agents/utils.test.ts b/src/agents/utils.test.ts
index e5c2588a7..ac8c6cd82 100644
--- a/src/agents/utils.test.ts
+++ b/src/agents/utils.test.ts
@@ -807,6 +807,7 @@ describe("Hephaestus environment context toggle", () => {
       undefined,
       undefined,
       undefined,
+      undefined,
       disableFlag
     )
   }
@@ -866,6 +867,7 @@ describe("Sisyphus and Librarian environment context toggle", () => {
       undefined,
       undefined,
       undefined,
+      undefined,
       disableFlag
     )
   }
@@ -925,6 +927,7 @@ describe("Atlas is unaffected by environment context toggle", () => {
       undefined,
       undefined,
       undefined,
+      undefined,
       false
     )
 
@@ -941,6 +944,7 @@ describe("Atlas is unaffected by environment context toggle", () => {
       undefined,
       undefined,
       undefined,
+      undefined,
       true
     )
 
diff --git a/src/cli/__snapshots__/model-fallback.test.ts.snap b/src/cli/__snapshots__/model-fallback.test.ts.snap
index 73075227a..cceb3b344 100644
--- a/src/cli/__snapshots__/model-fallback.test.ts.snap
+++ b/src/cli/__snapshots__/model-fallback.test.ts.snap
@@ -4,15 +4,9 @@ exports[`generateModelConfig no providers available returns ULTIMATE_FALLBACK fo
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "opencode/big-pickle",
-    },
     "atlas": {
       "model": "opencode/gpt-5-nano",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "model": "opencode/gpt-5-nano",
     },
@@ -74,16 +68,9 @@ exports[`generateModelConfig single native provider uses Claude models when only
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "anthropic/claude-opus-4-6",
-      "variant": "max",
-    },
     "atlas": {
       "model": "anthropic/claude-sonnet-4.6",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "fallback_models": [
         {
@@ -152,16 +139,9 @@ exports[`generateModelConfig single native provider uses Claude models with isMa
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "anthropic/claude-opus-4-6",
-      "variant": "max",
-    },
     "atlas": {
       "model": "anthropic/claude-sonnet-4.6",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "fallback_models": [
         {
@@ -231,17 +211,10 @@ exports[`generateModelConfig single native provider uses OpenAI models when only
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "openai/gpt-5.2",
-      "variant": "high",
-    },
     "atlas": {
       "model": "openai/gpt-5.4",
       "variant": "medium",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "model": "openai/gpt-5.4",
       "variant": "medium",
@@ -328,17 +301,10 @@ exports[`generateModelConfig single native provider uses OpenAI models with isMa
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "openai/gpt-5.2",
-      "variant": "high",
-    },
     "atlas": {
       "model": "openai/gpt-5.4",
       "variant": "medium",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "model": "openai/gpt-5.4",
       "variant": "medium",
@@ -425,16 +391,9 @@ exports[`generateModelConfig single native provider uses Gemini models when only
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "google/gemini-3-pro",
-      "variant": "high",
-    },
     "atlas": {
       "model": "opencode/gpt-5-nano",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "model": "opencode/gpt-5-nano",
     },
@@ -496,16 +455,9 @@ exports[`generateModelConfig single native provider uses Gemini models with isMa
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "google/gemini-3-pro",
-      "variant": "high",
-    },
     "atlas": {
       "model": "opencode/gpt-5-nano",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "model": "opencode/gpt-5-nano",
     },
@@ -584,8 +536,6 @@ exports[`generateModelConfig all native providers uses preferred models from fal
           },
         ],
       },
-      "model": "anthropic/claude-opus-4-6",
-      "variant": "max",
     },
     "atlas": {
       "fallback_models": [
@@ -596,9 +546,6 @@ exports[`generateModelConfig all native providers uses preferred models from fal
       ],
       "model": "anthropic/claude-sonnet-4.6",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "fallback_models": [
         {
@@ -811,8 +758,6 @@ exports[`generateModelConfig all native providers uses preferred models with isM
           },
         ],
       },
-      "model": "anthropic/claude-opus-4-6",
-      "variant": "max",
     },
     "atlas": {
       "fallback_models": [
@@ -823,9 +768,6 @@ exports[`generateModelConfig all native providers uses preferred models with isM
       ],
       "model": "anthropic/claude-sonnet-4.6",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "fallback_models": [
         {
@@ -1019,10 +961,6 @@ exports[`generateModelConfig fallback providers uses OpenCode Zen models when on
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "opencode/claude-opus-4-6",
-      "variant": "max",
-    },
     "atlas": {
       "fallback_models": [
         {
@@ -1032,9 +970,6 @@ exports[`generateModelConfig fallback providers uses OpenCode Zen models when on
       ],
       "model": "opencode/claude-sonnet-4-6",
     },
-    "council-member": {
-      "model": "opencode/gpt-5-nano",
-    },
     "explore": {
       "fallback_models": [
         {
@@ -1251,10 +1186,6 @@ exports[`generateModelConfig fallback providers uses OpenCode Zen models with is
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "opencode/claude-opus-4-6",
-      "variant": "max",
-    },
     "atlas": {
       "fallback_models": [
         {
@@ -1264,9 +1195,6 @@ exports[`generateModelConfig fallback providers uses OpenCode Zen models with is
       ],
       "model": "opencode/claude-sonnet-4-6",
     },
-    "council-member": {
-      "model": "opencode/gpt-5-nano",
-    },
     "explore": {
       "fallback_models": [
         {
@@ -1487,10 +1415,6 @@ exports[`generateModelConfig fallback providers uses GitHub Copilot models when
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "github-copilot/claude-opus-4.6",
-      "variant": "max",
-    },
     "atlas": {
       "fallback_models": [
         {
@@ -1500,9 +1424,6 @@ exports[`generateModelConfig fallback providers uses GitHub Copilot models when
       ],
       "model": "github-copilot/claude-sonnet-4.6",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "fallback_models": [
         {
@@ -1680,10 +1601,6 @@ exports[`generateModelConfig fallback providers uses GitHub Copilot models with
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "github-copilot/claude-opus-4.6",
-      "variant": "max",
-    },
     "atlas": {
       "fallback_models": [
         {
@@ -1693,9 +1610,6 @@ exports[`generateModelConfig fallback providers uses GitHub Copilot models with
       ],
       "model": "github-copilot/claude-sonnet-4.6",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "fallback_models": [
         {
@@ -1875,15 +1789,9 @@ exports[`generateModelConfig fallback providers uses ZAI model for librarian whe
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "zai-coding-plan/glm-4.7",
-    },
     "atlas": {
       "model": "opencode/gpt-5-nano",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "model": "opencode/gpt-5-nano",
     },
@@ -1942,15 +1850,9 @@ exports[`generateModelConfig fallback providers uses ZAI model for librarian wit
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "zai-coding-plan/glm-4.7",
-    },
     "atlas": {
       "model": "opencode/gpt-5-nano",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "model": "opencode/gpt-5-nano",
     },
@@ -2009,10 +1911,6 @@ exports[`generateModelConfig mixed provider scenarios uses Claude + OpenCode Zen
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "anthropic/claude-opus-4-6",
-      "variant": "max",
-    },
     "atlas": {
       "fallback_models": [
         {
@@ -2025,9 +1923,6 @@ exports[`generateModelConfig mixed provider scenarios uses Claude + OpenCode Zen
       ],
       "model": "anthropic/claude-sonnet-4.6",
     },
-    "council-member": {
-      "model": "opencode/gpt-5-nano",
-    },
     "explore": {
       "fallback_models": [
         {
@@ -2301,10 +2196,6 @@ exports[`generateModelConfig mixed provider scenarios uses OpenAI + Copilot comb
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "github-copilot/claude-opus-4.6",
-      "variant": "max",
-    },
     "atlas": {
       "fallback_models": [
         {
@@ -2318,9 +2209,6 @@ exports[`generateModelConfig mixed provider scenarios uses OpenAI + Copilot comb
       ],
       "model": "github-copilot/claude-sonnet-4.6",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "fallback_models": [
         {
@@ -2559,16 +2447,9 @@ exports[`generateModelConfig mixed provider scenarios uses Claude + ZAI combinat
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "anthropic/claude-opus-4-6",
-      "variant": "max",
-    },
     "atlas": {
       "model": "anthropic/claude-sonnet-4.6",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "fallback_models": [
         {
@@ -2668,15 +2549,10 @@ exports[`generateModelConfig mixed provider scenarios uses Gemini + Claude combi
           },
         ],
       },
-      "model": "anthropic/claude-opus-4-6",
-      "variant": "max",
     },
     "atlas": {
       "model": "anthropic/claude-sonnet-4.6",
     },
-    "council-member": {
-      "model": "opencode/big-pickle",
-    },
     "explore": {
       "fallback_models": [
         {
@@ -2810,10 +2686,6 @@ exports[`generateModelConfig mixed provider scenarios uses all fallback provider
 {
   "$schema": "https://raw.githubusercontent.com/code-yeongyu/oh-my-openagent/dev/assets/oh-my-opencode.schema.json",
   "agents": {
-    "athena": {
-      "model": "github-copilot/claude-opus-4.6",
-      "variant": "max",
-    },
     "atlas": {
       "fallback_models": [
         {
@@ -2830,9 +2702,6 @@ exports[`generateModelConfig mixed provider scenarios uses all fallback provider
       ],
       "model": "github-copilot/claude-sonnet-4.6",
     },
-    "council-member": {
-      "model": "opencode/gpt-5-nano",
-    },
     "explore": {
       "fallback_models": [
         {
@@ -3225,8 +3094,6 @@ exports[`generateModelConfig mixed provider scenarios uses all providers togethe
           },
         ],
       },
-      "model": "anthropic/claude-opus-4-6",
-      "variant": "max",
     },
     "atlas": {
       "fallback_models": [
@@ -3251,9 +3118,6 @@ exports[`generateModelConfig mixed provider scenarios uses all providers togethe
       ],
       "model": "anthropic/claude-sonnet-4.6",
     },
-    "council-member": {
-      "model": "opencode/gpt-5-nano",
-    },
     "explore": {
       "fallback_models": [
         {
@@ -3802,8 +3666,6 @@ exports[`generateModelConfig mixed provider scenarios uses all providers with is
           },
         ],
       },
-      "model": "anthropic/claude-opus-4-6",
-      "variant": "max",
     },
     "atlas": {
       "fallback_models": [
@@ -3828,9 +3690,6 @@ exports[`generateModelConfig mixed provider scenarios uses all providers with is
       ],
       "model": "anthropic/claude-sonnet-4.6",
     },
-    "council-member": {
-      "model": "opencode/gpt-5-nano",
-    },
     "explore": {
       "fallback_models": [
         {