diff --git a/aider/models.py b/aider/models.py
index 4a5d86a69..db0c28d1e 100644
--- a/aider/models.py
+++ b/aider/models.py
@@ -98,7 +98,8 @@ MODEL_ALIASES = {
     "quasar": "openrouter/openrouter/quasar-alpha",
     "r1": "deepseek/deepseek-reasoner",
     "gemini-2.5-pro": "gemini/gemini-2.5-pro",
-    "gemini": "gemini/gemini-2.5-pro",
+    "gemini-3-pro-preview": "gemini/gemini-3-pro-preview",
+    "gemini": "gemini/gemini-3-pro-preview",
     "gemini-exp": "gemini/gemini-2.5-pro-exp-03-25",
     "grok3": "xai/grok-3-beta",
     "optimus": "openrouter/openrouter/optimus-alpha",
diff --git a/aider/resources/model-settings.yml b/aider/resources/model-settings.yml
index b118a1592..051ba434d 100644
--- a/aider/resources/model-settings.yml
+++ b/aider/resources/model-settings.yml
@@ -1465,6 +1465,29 @@
   weak_model_name: openrouter/google/gemini-2.5-flash
   accepts_settings: ["thinking_tokens"]
 
+- name: gemini/gemini-3-pro-preview
+  overeager: true
+  edit_format: diff-fenced
+  use_repo_map: true
+  weak_model_name: gemini/gemini-2.5-flash
+  use_temperature: false
+  accepts_settings: ["thinking_tokens"]
+
+- name: vertex_ai/gemini-3-pro-preview
+  edit_format: diff-fenced
+  use_repo_map: true
+  weak_model_name: vertex_ai/gemini-2.5-flash
+  overeager: true
+  editor_model_name: vertex_ai/gemini-2.5-flash
+  accepts_settings: ["thinking_tokens"]
+
+- name: openrouter/google/gemini-3-pro-preview
+  overeager: true
+  edit_format: diff-fenced
+  use_repo_map: true
+  weak_model_name: openrouter/google/gemini-2.5-flash
+  accepts_settings: ["thinking_tokens"]
+
 #- name: openrouter/qwen/qwen3-235b-a22b
 #  system_prompt_prefix: "/no_think"
 #  use_temperature: 0.7
@@ -1842,6 +1865,17 @@
   accepts_settings: ["reasoning_effort"]
   overeager: true
 
+- name: gpt-5-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: gpt-5-mini
+  use_repo_map: true
+  editor_model_name: gpt-5
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+
 - name: gpt-5-2025-08-07
   edit_format: diff
   weak_model_name: gpt-5-nano-2025-08-07
@@ -1849,6 +1883,21 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: gpt-5.1
+  edit_format: diff
+  weak_model_name: gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+  overeager: true
+
+- name: gpt-5.1-2025-11-13
+  edit_format: diff
+  weak_model_name: gpt-5-nano-2025-08-07
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: gpt-5-mini
   edit_format: diff
   weak_model_name: gpt-5-nano
@@ -1891,6 +1940,20 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: gpt-5.1-chat
+  edit_format: diff
+  weak_model_name: gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: gpt-5.1-chat-latest
+  edit_format: diff
+  weak_model_name: gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: gpt-5-codex
   edit_format: diff
   weak_model_name: gpt-5-nano
@@ -1898,6 +1961,13 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: gpt-5.1-codex
+  edit_format: diff
+  weak_model_name: gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: azure/gpt-5
   edit_format: diff
   weak_model_name: azure/gpt-5-nano
@@ -1905,6 +1975,17 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: azure/gpt-5-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: azure/gpt-5-mini
+  use_repo_map: true
+  editor_model_name: azure/gpt-5
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+
 - name: azure/gpt-5-2025-08-07
   edit_format: diff
   weak_model_name: azure/gpt-5-nano-2025-08-07
@@ -1912,6 +1993,20 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: azure/gpt-5.1
+  edit_format: diff
+  weak_model_name: azure/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: azure/gpt-5.1-2025-11-13
+  edit_format: diff
+  weak_model_name: azure/gpt-5-nano-2025-08-07
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: azure/gpt-5-mini
   edit_format: diff
   weak_model_name: azure/gpt-5-nano
@@ -1954,6 +2049,20 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: azure/gpt-5.1-chat
+  edit_format: diff
+  weak_model_name: azure/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: azure/gpt-5.1-chat-latest
+  edit_format: diff
+  weak_model_name: azure/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: openai/gpt-5
   edit_format: diff
   weak_model_name: openai/gpt-5-nano
@@ -1961,6 +2070,17 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openai/gpt-5-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: openai/gpt-5-mini
+  use_repo_map: true
+  editor_model_name: openai/gpt-5
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+
 - name: openai/gpt-5-2025-08-07
   edit_format: diff
   weak_model_name: openai/gpt-5-nano-2025-08-07
@@ -1968,6 +2088,20 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openai/gpt-5.1
+  edit_format: diff
+  weak_model_name: openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: openai/gpt-5.1-2025-11-13
+  edit_format: diff
+  weak_model_name: openai/gpt-5-nano-2025-08-07
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: openai/gpt-5-mini
   edit_format: diff
   weak_model_name: openai/gpt-5-nano
@@ -2010,6 +2144,20 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openai/gpt-5.1-chat
+  edit_format: diff
+  weak_model_name: openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: openai/gpt-5.1-chat-latest
+  edit_format: diff
+  weak_model_name: openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: openrouter/openai/gpt-5
   edit_format: diff
   weak_model_name: openrouter/openai/gpt-5-nano
@@ -2017,6 +2165,17 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openrouter/openai/gpt-5-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-5-mini
+  use_repo_map: true
+  editor_model_name: openrouter/openai/gpt-5
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+
 - name: openrouter/openai/gpt-5-2025-08-07
   edit_format: diff
   weak_model_name: openrouter/openai/gpt-5-nano-2025-08-07
@@ -2024,6 +2183,20 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openrouter/openai/gpt-5.1
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: openrouter/openai/gpt-5.1-2025-11-13
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-5-nano-2025-08-07
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: openrouter/openai/gpt-5-mini
   edit_format: diff
   weak_model_name: openrouter/openai/gpt-5-nano
@@ -2066,3 +2239,16 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openrouter/openai/gpt-5.1-chat
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: openrouter/openai/gpt-5.1-chat-latest
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]