code-puppy-core-plugins 0.0.38__tar.gz → 0.0.40__tar.gz

{code_puppy_core_plugins-0.0.38 → code_puppy_core_plugins-0.0.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: code-puppy-core-plugins
-Version: 0.0.38
+Version: 0.0.40
 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.38 → code_puppy_core_plugins-0.0.40}/code_puppy_core_plugins/claude_code_oauth/prompt_handler.py

@@ -17,8 +17,11 @@ from __future__ import annotations
 
 from typing import Any, Dict, Optional
 
-# System-prompt override the Claude Code CLI expects. For OAuth claude-code models the
-# real system prompt moves into the user turn instead (see the callback below).
+# The OAuth endpoint fingerprints this exact string as the FIRST system block.
+# It ships as the agent's standing ``system_prompt`` (its own SystemPromptPart);
+# the real system prompt follows as the ``instructions`` block — a separate
+# system block, never the user turn. Mirrors CLAUDE_CODE_SYSTEM_PROMPT in
+# core's claude_cache_client.
 CLAUDE_CODE_INSTRUCTIONS = "You are Claude Code, Anthropic's official CLI for Claude."
 
 # Prefix used by every claude-code-* model (as registered by this plugin).
@@ -43,8 +46,14 @@ def prepare_claude_code_prompt(
 ) -> Optional[Dict[str, Any]]:
     """Callback for the ``prepare_model_prompt`` hook.
 
-    For claude-code models, swap in the Anthropic-expected instruction string
-    and (optionally) fold the caller's system prompt into the user message.
+    For claude-code models, the Anthropic-expected identity line becomes the
+    standing ``system_prompt`` (a separate ``SystemPromptPart``, rendered as
+    the first system block) and the caller's system prompt is passed through
+    as ``instructions`` (the block right after it). The user prompt is never
+    touched.
+
+    ``prepend_system_to_user`` is part of the hook signature core fires with,
+    but this plugin never folds the system prompt into the user message.
 
     Returns ``None`` for non-claude-code models so other handlers / the
     default passthrough can take over.
@@ -52,13 +61,10 @@ def prepare_claude_code_prompt(
     if not is_claude_code_model(model_name):
         return None
 
-    modified_prompt = user_prompt
-    if prepend_system_to_user and system_prompt:
-        modified_prompt = f"{system_prompt}\n\n{user_prompt}"
-
     return {
         "handled": True,
-        "instructions": CLAUDE_CODE_INSTRUCTIONS,
-        "user_prompt": modified_prompt,
+        "system_prompt": CLAUDE_CODE_INSTRUCTIONS,
+        "instructions": system_prompt,
+        "user_prompt": user_prompt,
         "is_claude_code": True,
     }

{code_puppy_core_plugins-0.0.38 → code_puppy_core_plugins-0.0.40}/code_puppy_core_plugins/ollama/register_callbacks.py

@@ -30,17 +30,19 @@ Note: Code Puppy requires models with strong tool/function calling support.
 Models without tool calling will notwork properly.
 """
 
+from __future__ import annotations
+
 import logging
 import os
-from typing import Any
-
-from pydantic_ai.models.openai import OpenAIChatModel
-from pydantic_ai.providers.openai import OpenAIProvider
+from typing import TYPE_CHECKING, Any
 
 from code_puppy.callbacks import register_callback
 from code_puppy.http_utils import create_async_client
 from code_puppy.model_factory import get_custom_config
 
+if TYPE_CHECKING:
+    from pydantic_ai.models.openai import OpenAIChatModel
+
 logger = logging.getLogger(__name__)
 
 # Ollama defaults
@@ -71,6 +73,12 @@ def create_ollama_model(
     Returns:
         OpenAIChatModel instance, or None if creation fails.
     """
+    # Imported here, not at module scope: this plugin loads on every boot and
+    # the openai SDK behind OpenAIChatModel is ~200ms cold -- only runs that
+    # actually pick an Ollama model should pay for it.
+    from pydantic_ai.models.openai import OpenAIChatModel
+    from pydantic_ai.providers.openai import OpenAIProvider
+
     try:
         if "custom_endpoint" in model_config:
             url, headers, verify, api_key, _timeout = get_custom_config(model_config)

{code_puppy_core_plugins-0.0.38 → code_puppy_core_plugins-0.0.40}/pyproject.toml

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