code-puppy-core-plugins 0.0.41__tar.gz → 0.0.42__tar.gz

{code_puppy_core_plugins-0.0.41 → code_puppy_core_plugins-0.0.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: code-puppy-core-plugins
-Version: 0.0.41
+Version: 0.0.42
 Summary: Official plugin bundle for Code Puppy
 Project-URL: Repository, https://github.com/mpfaffenberger/code_puppy_core_plugins
 Project-URL: Homepage, https://github.com/mpfaffenberger/code_puppy_core_plugins

{code_puppy_core_plugins-0.0.41 → code_puppy_core_plugins-0.0.42}/code_puppy_core_plugins/chatgpt_oauth/config.py

@@ -28,8 +28,13 @@ CHATGPT_OAUTH_CONFIG: Dict[str, Any] = {
     # backend serves — never the raw number (openai/codex#31860, #32806).
     "default_context_length": 258400,
     "api_key_env_var": "CHATGPT_OAUTH_API_KEY",
-    # Codex CLI version info (for User-Agent header)
-    "client_version": "0.144.1",
+    # Codex CLI version info (for User-Agent header AND the /models
+    # ``client_version`` query param). The catalog gates models on it:
+    # gpt-6-astra has ``minimal_client_version: 0.153.0``, so an older value
+    # here silently hides newer models. Bump when a new generation lands.
+    "client_version": "0.153.3",
+    # Model selected right after a successful OAuth login.
+    "default_model": "codex-gpt-6-astra",
     "originator": "codex_cli_rs",
 }
 

{code_puppy_core_plugins-0.0.41 → code_puppy_core_plugins-0.0.42}/code_puppy_core_plugins/chatgpt_oauth/register_callbacks.py

@@ -129,7 +129,7 @@ def _handle_custom_command(command: str, name: str) -> Optional[bool]:
 
     if name in {"chatgpt-auth", "codex-auth"}:
         run_oauth_flow()
-        set_model_and_reload_agent("codex-gpt-5.6-sol")
+        set_model_and_reload_agent(CHATGPT_OAUTH_CONFIG["default_model"])
         # Auth just succeeded: re-discover the auth-gated codex-imagegen skill now
         # rather than waiting for the next process restart.
         refresh_skill_cache()
@@ -205,7 +205,7 @@ def _create_chatgpt_oauth_model(
 
     # Build headers for ChatGPT Codex API
     originator = CHATGPT_OAUTH_CONFIG.get("originator", "codex_cli_rs")
-    client_version = CHATGPT_OAUTH_CONFIG.get("client_version", "0.144.1")
+    client_version = CHATGPT_OAUTH_CONFIG.get("client_version", "0.153.3")
 
     headers = {
         "ChatGPT-Account-Id": account_id,

{code_puppy_core_plugins-0.0.41 → code_puppy_core_plugins-0.0.42}/code_puppy_core_plugins/chatgpt_oauth/test_plugin.py

@@ -314,10 +314,47 @@ def test_auth_command_refreshes_skill_cache():
         )
 
     oauth_flow.assert_called_once_with()
-    set_model.assert_called_once_with("codex-gpt-5.6-sol")
+    set_model.assert_called_once_with("codex-gpt-6-astra")
     refresh_skills.assert_called_once_with()
 
 
+def test_default_model_is_in_fallback_catalog():
+    """A default that isn't in the fallback list would 404 when /models is down."""
+    from code_puppy_core_plugins.chatgpt_oauth.config import CHATGPT_OAUTH_CONFIG
+
+    default = CHATGPT_OAUTH_CONFIG["default_model"]
+    prefix = CHATGPT_OAUTH_CONFIG["prefix"]
+    assert default.startswith(prefix)
+    assert default[len(prefix) :] in utils.DEFAULT_CODEX_MODELS
+
+
+def test_client_version_meets_gpt6_minimum():
+    """gpt-6-astra carries minimal_client_version 0.153.0 in the catalog."""
+    from code_puppy_core_plugins.chatgpt_oauth.config import CHATGPT_OAUTH_CONFIG
+
+    version = tuple(int(p) for p in CHATGPT_OAUTH_CONFIG["client_version"].split("."))
+    assert version >= (0, 153, 0)
+
+
+@pytest.mark.parametrize(
+    "name,xhigh,max_effort,responses_controls",
+    [
+        ("gpt-6-astra", True, True, True),
+        ("gpt-6-astra-pro", True, True, True),
+        ("gpt-5.6-sol", True, True, True),
+        ("gpt-5.5", True, False, False),
+        ("gpt-5.4-mini", True, False, False),
+        ("gpt-5.3-codex-spark", True, False, False),
+        ("codex-auto-review", True, False, False),
+        ("gpt-4o", False, False, False),
+    ],
+)
+def test_reasoning_gates_by_gpt_generation(name, xhigh, max_effort, responses_controls):
+    assert utils._supports_xhigh_reasoning(name) is xhigh
+    assert utils._supports_max_reasoning(name) is max_effort
+    assert utils._supports_responses_reasoning_controls(name) is responses_controls
+
+
 def test_codex_imagegen_agent_tool(tmp_path):
     registered = {}
 
@@ -679,5 +716,18 @@ def test_add_models_to_chatgpt_config(tmp_path):
         assert loaded["codex-gpt-4o"]["context_length"] == 258400
 
 
+def test_gpt6_astra_entry_gets_full_reasoning_surface(tmp_path):
+    with patch.object(
+        utils, "get_chatgpt_models_path", return_value=tmp_path / "chatgpt_models.json"
+    ):
+        assert utils.add_models_to_extra_config(["gpt-6-astra"])
+        entry = utils.load_chatgpt_models()["codex-gpt-6-astra"]
+
+    assert entry["supports_xhigh_reasoning"] is True
+    assert entry["supports_max_reasoning"] is True
+    assert "reasoning_context" in entry["supported_settings"]
+    assert "reasoning_mode" in entry["supported_settings"]
+
+
 if __name__ == "__main__":
     pytest.main([__file__, "-v"])

{code_puppy_core_plugins-0.0.41 → code_puppy_core_plugins-0.0.42}/code_puppy_core_plugins/chatgpt_oauth/utils.py

@@ -7,10 +7,11 @@ import datetime
 import hashlib
 import json
 import logging
+import re
 import secrets
 import time
 from dataclasses import dataclass
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Tuple, Union
 from urllib.parse import parse_qs as urllib_parse_qs
 from urllib.parse import urlencode, urlparse
 
@@ -377,6 +378,7 @@ def exchange_code_for_tokens(
 # Models known to work with ChatGPT OAuth tokens (sourced from codex-rs CLI
 # and shell-scripts/codex-call.sh).
 DEFAULT_CODEX_MODELS = [
+    "gpt-6-astra",
     "gpt-5.6-sol",
     "gpt-5.6-terra",
     "gpt-5.6-luna",
@@ -399,17 +401,39 @@ CODEX_MODEL_CONTEXT_LENGTHS = {
 }
 
 
+_GPT_VERSION_RE = re.compile(r"^gpt-(\d+)(?:\.(\d+))?")
+
+
+def _gpt_version(model_name: str) -> Optional[Tuple[int, int]]:
+    """``(major, minor)`` for a ``gpt-X[.Y]...`` Codex slug, else ``None``.
+
+    Kept local (rather than importing ``code_puppy.model_utils``) so this
+    plugin doesn't hard-require a core release that ships the shared helper.
+    """
+    match = _GPT_VERSION_RE.match(model_name.lower())
+    if not match:
+        return None
+    return int(match.group(1)), int(match.group(2) or 0)
+
+
+def _gpt_at_least(model_name: str, minimum: Tuple[int, int]) -> bool:
+    version = _gpt_version(model_name)
+    return version is not None and version >= minimum
+
+
 def _supports_xhigh_reasoning(model_name: str) -> bool:
     """Return whether a ChatGPT OAuth model supports xhigh reasoning."""
-    normalized_model_name = model_name.lower()
-    return "codex" in normalized_model_name or normalized_model_name.startswith(
-        ("gpt-5.4", "gpt-5.5", "gpt-5.6")
-    )
+    return "codex" in model_name.lower() or _gpt_at_least(model_name, (5, 4))
 
 
 def _supports_max_reasoning(model_name: str) -> bool:
     """Return whether a ChatGPT OAuth model supports max reasoning effort."""
-    return model_name.lower().startswith("gpt-5.6")
+    return _gpt_at_least(model_name, (5, 6))
+
+
+def _supports_responses_reasoning_controls(model_name: str) -> bool:
+    """GPT-5.6+ (incl. GPT-6) expose reasoning_context / reasoning_mode."""
+    return _gpt_at_least(model_name, (5, 6))
 
 
 def fetch_chatgpt_models(access_token: str, account_id: str) -> List[CodexModelInfo]:
@@ -431,7 +455,7 @@ def fetch_chatgpt_models(access_token: str, account_id: str) -> List[CodexModelI
     import platform
 
     # Build the models URL with client version
-    client_version = CHATGPT_OAUTH_CONFIG.get("client_version", "0.144.1")
+    client_version = CHATGPT_OAUTH_CONFIG.get("client_version", "0.153.3")
     base_url = CHATGPT_OAUTH_CONFIG["api_base_url"].rstrip("/")
     models_url = f"{base_url}/models"
 
@@ -525,7 +549,7 @@ def add_models_to_extra_config(models: List[Union[str, CodexModelInfo]]) -> bool
             # Responses-API models always support reasoning effort, summaries,
             # and text verbosity; per-model extras are added below.
             supported_settings = ["reasoning_effort", "summary", "verbosity"]
-            if model_name.lower().startswith("gpt-5.6"):
+            if _supports_responses_reasoning_controls(model_name):
                 supported_settings.extend(["reasoning_context", "reasoning_mode"])
 
             # xhigh: codex + GPT-5.4+; max: GPT-5.6+. Separate flags so a stronger

{code_puppy_core_plugins-0.0.41 → code_puppy_core_plugins-0.0.42}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "code-puppy-core-plugins"
-version = "0.0.41"
+version = "0.0.42"
 description = "Official plugin bundle for Code Puppy"
 readme = "README.md"
 requires-python = ">=3.11,<3.15"