code-puppy-core-plugins 0.0.61__tar.gz → 0.0.63__tar.gz

{code_puppy_core_plugins-0.0.61 → code_puppy_core_plugins-0.0.63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: code-puppy-core-plugins
-Version: 0.0.61
+Version: 0.0.63
 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
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: <3.15,>=3.11
 Requires-Dist: httpx<1,>=0.24.1
-Requires-Dist: pydantic-ai-slim[anthropic,mcp,openai]<3,>=2.35.0
+Requires-Dist: pydantic-ai-slim[anthropic,mcp,openai]<3,>=2.47.0
 Description-Content-Type: text/markdown
 
 # Code Puppy Core Plugins

{code_puppy_core_plugins-0.0.61 → code_puppy_core_plugins-0.0.63}/code_puppy_core_plugins/chatgpt_oauth/image_tool.py

@@ -19,7 +19,7 @@ TOOL_NAME = "codex_imagegen"
 def register_codex_imagegen(agent: Any) -> None:
     """Register image generation on a pydantic-ai agent."""
 
-    @agent.tool
+    @agent.tool(metadata={"speculatable": True})
     async def codex_imagegen(
         context: RunContext,
         prompt: str,

{code_puppy_core_plugins-0.0.61 → code_puppy_core_plugins-0.0.63}/code_puppy_core_plugins/chatgpt_oauth/model_catalog.py

@@ -7,6 +7,10 @@ from typing import Any, Iterable
 
 DEFAULT_EFFECTIVE_CONTEXT_WINDOW_PERCENT = 95
 
+# Explicit model options that may be absent from an account's discovery catalog.
+# Registration is not an entitlement check; the backend still controls access.
+SUPPLEMENTAL_CODEX_MODELS = ("gpt-6-luna", "gpt-6-sol")
+
 # Effective windows below this are catalog garbage (the smallest real Codex
 # model serves ~131K). Treat them as absent so a hostile or buggy catalog
 # can't force hyper-aggressive compaction with e.g. context_window=2.
@@ -72,6 +76,17 @@ def parse_model_catalog(payload: Any) -> list[CodexModelInfo]:
     return catalog
 
 
+def supplement_model_catalog(catalog: list[CodexModelInfo]) -> list[CodexModelInfo]:
+    """Keep explicit options without replacing live metadata or duplicating names."""
+    discovered = {entry.name for entry in catalog}
+    return [
+        *catalog,
+        *fallback_catalog(
+            name for name in SUPPLEMENTAL_CODEX_MODELS if name not in discovered
+        ),
+    ]
+
+
 def fallback_catalog(model_names: Iterable[str]) -> list[CodexModelInfo]:
     """Build metadata-free entries for the conservative fallback model list."""
     return [CodexModelInfo(name=name) for name in model_names]

{code_puppy_core_plugins-0.0.61 → code_puppy_core_plugins-0.0.63}/code_puppy_core_plugins/chatgpt_oauth/test_plugin.py

@@ -355,11 +355,23 @@ def test_reasoning_gates_by_gpt_generation(name, xhigh, max_effort, responses_co
     assert utils._supports_responses_reasoning_controls(name) is responses_controls
 
 
+def test_codex_imagegen_is_speculatable():
+    from pydantic_ai import Agent
+
+    agent = Agent("test")
+    image_tool.register_codex_imagegen(agent)
+    assert (
+        agent._function_toolset.tools["codex_imagegen"].metadata["speculatable"] is True
+    )
+
+
 def test_codex_imagegen_agent_tool(tmp_path):
     registered = {}
 
     class FakeAgent:
-        def tool(self, function):
+        def tool(self, function=None, **_kwargs):
+            if function is None:
+                return lambda fn: self.tool(fn)
             registered[function.__name__] = function
             return function
 
@@ -385,7 +397,9 @@ def test_codex_imagegen_agent_tool_forwards_reference_images(tmp_path):
     registered = {}
 
     class FakeAgent:
-        def tool(self, function):
+        def tool(self, function=None, **_kwargs):
+            if function is None:
+                return lambda fn: self.tool(fn)
             registered[function.__name__] = function
             return function
 

{code_puppy_core_plugins-0.0.61 → code_puppy_core_plugins-0.0.63}/code_puppy_core_plugins/chatgpt_oauth/utils.py

@@ -23,9 +23,11 @@ from .config import (
     get_token_storage_path,
 )
 from .model_catalog import (
+    SUPPLEMENTAL_CODEX_MODELS,
     CodexModelInfo,
     fallback_catalog,
     parse_model_catalog,
+    supplement_model_catalog,
 )
 
 logger = logging.getLogger(__name__)
@@ -379,8 +381,7 @@ def exchange_code_for_tokens(
 # and shell-scripts/codex-call.sh).
 DEFAULT_CODEX_MODELS = [
     "gpt-6-astra",
-    "gpt-6-luna",
-    "gpt-6-sol",
+    *SUPPLEMENTAL_CODEX_MODELS,
     "gpt-5.6-sol",
     "gpt-5.6-terra",
     "gpt-5.6-luna",
@@ -493,7 +494,7 @@ def fetch_chatgpt_models(access_token: str, account_id: str) -> List[CodexModelI
             try:
                 catalog = parse_model_catalog(response.json())
                 if catalog:
-                    return catalog
+                    return supplement_model_catalog(catalog)
             except (json.JSONDecodeError, ValueError) as exc:
                 logger.warning("Failed to parse models response: %s", exc)
             logger.info(

{code_puppy_core_plugins-0.0.61 → code_puppy_core_plugins-0.0.63}/code_puppy_core_plugins/claude_code_oauth/utils.py

@@ -457,7 +457,7 @@ def _build_model_entry(model_name: str, access_token: str, context_length: int)
             "headers": {
                 "anthropic-beta": "oauth-2025-04-20,interleaved-thinking-2025-05-14",
                 "x-app": "cli",
-                "User-Agent": "claude-cli/2.0.61 (external, cli)",
+                "User-Agent": "claude-cli/2.1.280 (external, cli)",
             },
         },
         "context_length": context_length,

{code_puppy_core_plugins-0.0.61 → code_puppy_core_plugins-0.0.63}/code_puppy_core_plugins/logfire_oauth/query_tool.py

@@ -47,7 +47,7 @@ async def _query_mcp(
 def register_logfire_query(agent: Any) -> None:
     """Register the ``logfire_query`` tool on an agent."""
 
-    @agent.tool
+    @agent.tool(metadata={"speculatable": True})
     async def logfire_query(
         context: RunContext,
         query: str = Field(description="Read-only SQL query over Logfire records."),

{code_puppy_core_plugins-0.0.61 → code_puppy_core_plugins-0.0.63}/code_puppy_core_plugins/namespace_skill_search/search_tool.py

@@ -58,7 +58,7 @@ def _query_terms(query: Optional[str]) -> List[str]:
 def register_browse_skill_namespace(agent):
     """Register the browse_skill_namespace tool on an agent."""
 
-    @agent.tool
+    @agent.tool(metadata={"speculatable": True})
     async def browse_skill_namespace(
         context: RunContext,
         namespace: Optional[str] = None,

{code_puppy_core_plugins-0.0.61 → code_puppy_core_plugins-0.0.63}/code_puppy_core_plugins/puppy_kennel/tools.py

@@ -157,7 +157,7 @@ def _resolve_scope(wing: str, scope: str, agent_name: str, cwd: Any) -> list[str
 def register_kennel_recall(agent: Any) -> None:
     """Register the ``kennel_recall`` tool on the given agent."""
 
-    @agent.tool
+    @agent.tool(metadata={"speculatable": True})
     async def kennel_recall(
         context: RunContext,
         query: str,
@@ -314,7 +314,7 @@ def register_kennel_remember(agent: Any) -> None:
 def register_kennel_recent(agent: Any) -> None:
     """Register the ``kennel_recent`` tool — time-ordered drawer browsing."""
 
-    @agent.tool
+    @agent.tool(metadata={"speculatable": True})
     async def kennel_recent(
         context: RunContext,
         wing: str = "",
@@ -366,7 +366,7 @@ def register_kennel_recent(agent: Any) -> None:
 def register_kennel_list_wings(agent: Any) -> None:
     """Register the ``kennel_list_wings`` tool — wing discovery."""
 
-    @agent.tool
+    @agent.tool(metadata={"speculatable": True})
     async def kennel_list_wings(context: RunContext) -> KennelWingsOutput:
         """List every wing in the kennel with its drawer count.
 
@@ -392,7 +392,7 @@ def register_kennel_list_wings(agent: Any) -> None:
 def register_kennel_stats(agent: Any) -> None:
     """Register the ``kennel_stats`` tool — kennel-wide totals + size."""
 
-    @agent.tool
+    @agent.tool(metadata={"speculatable": True})
     async def kennel_stats(context: RunContext) -> KennelStatsOutput:
         """Return kennel-wide totals: drawers, wings, and on-disk size.
 

{code_puppy_core_plugins-0.0.61 → code_puppy_core_plugins-0.0.63}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "hatchling.build"
 
 [project]
 name = "code-puppy-core-plugins"
-version = "0.0.61"
+version = "0.0.63"
 description = "Official plugin bundle for Code Puppy"
 readme = "README.md"
 requires-python = ">=3.11,<3.15"
 dependencies = [
     "httpx>=0.24.1,<1",
-    "pydantic-ai-slim[openai,anthropic,mcp]>=2.35.0,<3",
+    "pydantic-ai-slim[openai,anthropic,mcp]>=2.47.0,<3",
 ]
 license = {text = "MIT"}
 authors = [{name = "Michael Pfaffenberger"}]