@aerovato/operator-helper 1.1.1 → 1.1.3

package/dist/code-puppy/register_callbacks.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import asyncio
+import importlib.metadata
 import os
 import subprocess
 import threading
@@ -10,7 +11,7 @@ from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager, suppress
 from typing import Any
 
-from code_puppy.callbacks import CustomCommandResult, register_callback
+from code_puppy.callbacks import register_callback
 from code_puppy.config import get_current_session_name
 from code_puppy.messaging import emit_warning
 from code_puppy.tools.subagent_context import get_conversation_root_id
@@ -27,6 +28,20 @@ from pydantic_ai.settings import ModelSettings
 
 _MARKER_KEY = "operator_memory"
 _MARKER_VALUE = "synthetic-preamble-v1"
+_MODEL_MESSAGE_TRANSFORM_VERSION = (0, 0, 753)
+
+try:
+    from code_puppy.callbacks import CustomCommandResult
+except ImportError:
+    try:
+        # Code Puppy < 0.0.698 exposes the same contract in the
+        # customizable-commands plugin.
+        from code_puppy.plugins.customizable_commands.register_callbacks import (
+            MarkdownCommandResult as CustomCommandResult,
+        )
+    except ImportError:
+        CustomCommandResult = None
+
 _RENDER_TIMEOUT_SECONDS = 30
 _COMMAND_TIMEOUT_SECONDS = 60
 _render_tasks: dict[str, asyncio.Task[str]] = {}
@@ -107,6 +122,12 @@ async def _inject_preamble(
     return transformed
 
 
+async def _transform_model_messages(
+    _agent_name: str | None, messages: list[ModelMessage]
+) -> None:
+    messages[:] = await _inject_preamble(messages, _conversation_key())
+
+
 def _is_operator_request(message: ModelMessage) -> bool:
     return (
         isinstance(message, ModelRequest)
@@ -187,6 +208,31 @@ def _conversation_key() -> str:
     return get_conversation_root_id() or get_current_session_name()
 
 
+def _installed_code_puppy_version() -> str | None:
+    try:
+        return importlib.metadata.version("code-puppy")
+    except Exception:
+        return None
+
+
+def _supports_model_message_transform(version: str | None) -> bool:
+    if version is None:
+        return False
+    release = version.partition("+")[0].partition("-")[0]
+    try:
+        parts = tuple(int(part) for part in release.split("."))
+    except ValueError:
+        return False
+    return parts >= _MODEL_MESSAGE_TRANSFORM_VERSION
+
+
+def _register_preamble_injection(version: str | None) -> None:
+    if _supports_model_message_transform(version):
+        register_callback("transform_model_messages", _transform_model_messages)
+    else:
+        register_callback("agent_run_context", _agent_run_context)
+
+
 @asynccontextmanager
 async def _agent_run_context(
     _agent: Any, pydantic_agent: Any, _group_id: str, _mcp_servers: Any
@@ -195,10 +241,36 @@ async def _agent_run_context(
     if model is None:
         yield
         return
+    if _is_dbos_agent(pydantic_agent):
+        _warn_dbos_incompatible()
+        yield
+        return
     with pydantic_agent.override(model=OperatorModel(model, _conversation_key())):
         yield
 
 
+def _is_dbos_agent(pydantic_agent: Any) -> bool:
+    # DBOSAgent installs its own captured DBOSModel through a nested
+    # override inside run(), which supersedes any override applied here.
+    # Duck-type: avoid importing the optional durable_exec module.
+    return hasattr(pydantic_agent, "_dbos_overrides")
+
+
+_DBOS_WARNED = False
+
+
+def _warn_dbos_incompatible() -> None:
+    global _DBOS_WARNED
+    if _DBOS_WARNED:
+        return
+    _DBOS_WARNED = True
+    emit_warning(
+        "Operator Memory preamble injection is disabled: DBOS durable execution "
+        "supersedes the model override it relies on. Disable DBOS to restore "
+        "Operator Memory: /set enable_dbos false, then restart Code Puppy."
+    )
+
+
 async def _session_end() -> None:
     tasks = tuple(_render_tasks.values())
     _render_tasks.clear()
@@ -361,10 +433,17 @@ async def _agent_run_end(*_args: Any) -> None:
         _paint_status_indicator("")
 
 
-register_callback("agent_run_context", _agent_run_context)
+_register_preamble_injection(_installed_code_puppy_version())
 register_callback("session_end", _session_end)
-register_callback("custom_command", _custom_command)
-register_callback("custom_command_help", _custom_command_help)
+if CustomCommandResult is not None:
+    register_callback("custom_command", _custom_command)
+    register_callback("custom_command_help", _custom_command_help)
+else:
+    emit_warning(
+        "Operator commands are disabled: this Code Puppy version is too old to "
+        "process command output as user input. Preamble injection still works. "
+        "Upgrade Code Puppy to enable the /operator:* commands."
+    )
 register_callback("startup", _show_status_indicator)
 register_callback("agent_run_start", _agent_run_start)
 register_callback("agent_run_end", _agent_run_end)