diff --git a/crates/g3-core/src/lib.rs b/crates/g3-core/src/lib.rs
index cb53ea6..4ea376a 100644
--- a/crates/g3-core/src/lib.rs
+++ b/crates/g3-core/src/lib.rs
@@ -977,7 +977,9 @@ impl<W: UiWriter> Agent<W> {
             }
             "ollama" => {
                 // Ollama model context windows based on model name
-                if model_name.contains("qwen") {
+                if model_name.contains("qwen3-coder") {
+                    262144 // Qwen3-coder supports 256k context
+                } else if model_name.contains("qwen") {
                     32768 // Qwen2.5 supports 32k context
                 } else if model_name.contains("gpt-oss") {
                     131072 // GPT-OSS supports 128k context
diff --git a/crates/g3-providers/src/ollama.rs b/crates/g3-providers/src/ollama.rs
index 7967297..cb08453 100644
--- a/crates/g3-providers/src/ollama.rs
+++ b/crates/g3-providers/src/ollama.rs
@@ -81,6 +81,9 @@ pub const OLLAMA_KNOWN_MODELS: &[&str] = &[
     "qwen2.5:7b",
     "qwen2.5:14b",
     "qwen2.5:32b",
+    "qwen2.5-coder",
+    "qwen2.5-coder:7b",
+    "qwen3-coder",
     "phi3",
     "gemma2",
 ];