newcode 0.2.8__tar.gz → 0.2.10__tar.gz

{newcode-0.2.8 → newcode-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: newcode
-Version: 0.2.8
+Version: 0.2.10
 Summary: AI-powered code generation agent platform
 Project-URL: repository, https://github.com/janfeddersen-wq/new_code
 Project-URL: HomePage, https://github.com/janfeddersen-wq/new_code
@@ -17,7 +17,6 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Code Generators
 Requires-Python: <3.14,>=3.11
 Requires-Dist: anthropic==0.79.0
-Requires-Dist: dbos>=2.11.0
 Requires-Dist: fastapi>=0.109.0
 Requires-Dist: httpx[http2]>=0.24.1
 Requires-Dist: json-repair>=0.46.2

{newcode-0.2.8 → newcode-0.2.10}/newcode/agents/base_agent.py

@@ -27,7 +27,6 @@ from typing import (
 import mcp
 import pydantic
 import pydantic_ai.models
-from dbos import DBOS, SetWorkflowID
 from pydantic_ai import Agent as PydanticAgent
 from pydantic_ai import (
     BinaryContent,
@@ -37,7 +36,6 @@ from pydantic_ai import (
     UsageLimitExceeded,
     UsageLimits,
 )
-from pydantic_ai.durable_exec.dbos import DBOSAgent
 from pydantic_ai.messages import (
     ModelMessage,
     ModelRequest,
@@ -67,7 +65,6 @@ from newcode.config import (
     get_global_model_name,
     get_message_limit,
     get_protected_token_count,
-    get_use_dbos,
     get_value,
 )
 from newcode.error_logging import log_error
@@ -1423,65 +1420,48 @@ class BaseAgent(ABC):
             )
 
         self._last_model_name = resolved_model_name
-        # expose for run_with_mcp
-        # Wrap it with DBOS, but handle MCP servers separately to avoid serialization issues
         global _reload_count
         _reload_count += 1
-        if get_use_dbos():
-            # Don't pass MCP servers to the agent constructor when using DBOS
-            # This prevents the "cannot pickle async_generator object" error
-            # MCP servers will be handled separately in run_with_mcp
-            agent_without_mcp = PydanticAgent(
-                model=model,
-                instructions=instructions,
-                output_type=str,
-                retries=10,
-                toolsets=[],  # Don't include MCP servers here
-                history_processors=[self.message_history_accumulator],
-                model_settings=model_settings,
-            )
 
-            # Register regular tools (non-MCP) on the new agent
-            agent_tools = self.get_available_tools()
-            register_tools_for_agent(
-                agent_without_mcp, agent_tools, model_name=resolved_model_name
-            )
+        p_agent = PydanticAgent(
+            model=model,
+            instructions=instructions,
+            output_type=str,
+            retries=10,
+            toolsets=filtered_mcp_servers,
+            history_processors=[self.message_history_accumulator],
+            model_settings=model_settings,
+        )
+        # Register regular tools on the agent
+        agent_tools = self.get_available_tools()
+        register_tools_for_agent(p_agent, agent_tools, model_name=resolved_model_name)
 
-            # Wrap with DBOS - pass event_stream_handler at construction time
-            # so DBOSModel gets the handler for streaming output
-            dbos_agent = DBOSAgent(
-                agent_without_mcp,
-                name=f"{self.name}-{_reload_count}",
-                event_stream_handler=event_stream_handler,
-            )
-            self.pydantic_agent = dbos_agent
-            self._code_generation_agent = dbos_agent
+        self.pydantic_agent = p_agent
+        self._code_generation_agent = p_agent
+        self._mcp_servers = filtered_mcp_servers
+        return self._code_generation_agent
 
-            # Store filtered MCP servers separately for runtime use
-            self._mcp_servers = filtered_mcp_servers
-        else:
-            # Normal path without DBOS - include filtered MCP servers in the agent
-            # Re-create agent with filtered MCP servers
-            p_agent = PydanticAgent(
-                model=model,
-                instructions=instructions,
-                output_type=str,
-                retries=10,
-                toolsets=filtered_mcp_servers,
-                history_processors=[self.message_history_accumulator],
-                model_settings=model_settings,
-            )
-            # Register regular tools on the agent
-            agent_tools = self.get_available_tools()
-            register_tools_for_agent(
-                p_agent, agent_tools, model_name=resolved_model_name
+    def _reload_live_agent_after_token_refresh(
+        self,
+        *,
+        output_type: Optional[Type[Any]] = None,
+        message_group: Optional[str] = None,
+    ) -> Optional[PydanticAgent]:
+        """Rebuild the live agent so refreshed OAuth tokens take effect immediately."""
+        try:
+            self.reload_code_generation_agent(message_group=message_group)
+            if output_type is not None:
+                return self._create_agent_with_output_type(output_type)
+            return self._code_generation_agent
+        except Exception as exc:
+            emit_warning(
+                (
+                    "Token refresh succeeded, but rebuilding the live model client "
+                    f"failed: {exc}"
+                ),
+                group_id=message_group,
             )
-
-            self.pydantic_agent = p_agent
-            self._code_generation_agent = p_agent
-            self._mcp_servers = filtered_mcp_servers
-            self._mcp_servers = mcp_servers
-        return self._code_generation_agent
+            return None
 
     def _create_agent_with_output_type(self, output_type: Type[Any]) -> PydanticAgent:
         """Create a temporary agent configured with a custom output_type.
@@ -1494,7 +1474,7 @@ class BaseAgent(ABC):
             output_type: The Pydantic model or type for structured output.
 
         Returns:
-            A configured PydanticAgent (or DBOSAgent wrapper) with the custom output_type.
+            A configured PydanticAgent with the custom output_type.
         """
         from newcode.model_utils import prepare_prompt_for_model
         from newcode.tools import register_tools_for_agent
@@ -1521,45 +1501,21 @@ class BaseAgent(ABC):
         global _reload_count
         _reload_count += 1
 
-        if get_use_dbos():
-            temp_agent = PydanticAgent(
-                model=model,
-                instructions=instructions,
-                output_type=output_type,
-                retries=10,
-                toolsets=[],
-                history_processors=[self.message_history_accumulator],
-                model_settings=model_settings,
-            )
-            agent_tools = self.get_available_tools()
-            register_tools_for_agent(
-                temp_agent, agent_tools, model_name=resolved_model_name
-            )
-            # Pass event_stream_handler at construction time for streaming output
-            dbos_agent = DBOSAgent(
-                temp_agent,
-                name=f"{self.name}-structured-{_reload_count}",
-                event_stream_handler=event_stream_handler,
-            )
-            return dbos_agent
-        else:
-            temp_agent = PydanticAgent(
-                model=model,
-                instructions=instructions,
-                output_type=output_type,
-                retries=10,
-                toolsets=mcp_servers,
-                history_processors=[self.message_history_accumulator],
-                model_settings=model_settings,
-            )
-            agent_tools = self.get_available_tools()
-            register_tools_for_agent(
-                temp_agent, agent_tools, model_name=resolved_model_name
-            )
-            return temp_agent
+        temp_agent = PydanticAgent(
+            model=model,
+            instructions=instructions,
+            output_type=output_type,
+            retries=10,
+            toolsets=mcp_servers,
+            history_processors=[self.message_history_accumulator],
+            model_settings=model_settings,
+        )
+        agent_tools = self.get_available_tools()
+        register_tools_for_agent(
+            temp_agent, agent_tools, model_name=resolved_model_name
+        )
+        return temp_agent
 
-    # It's okay to decorate it with DBOS.step even if not using DBOS; the decorator is a no-op in that case.
-    @DBOS.step()
     def message_history_accumulator(self, ctx: RunContext, messages: List[Any]):
         _message_history = self.get_message_history()
 
@@ -1829,10 +1785,11 @@ class BaseAgent(ABC):
         pydantic_agent = (
             self._code_generation_agent or self.reload_code_generation_agent()
         )
+        current_output_type = output_type
 
         # If a custom output_type is specified, create a temporary agent with that type
-        if output_type is not None:
-            pydantic_agent = self._create_agent_with_output_type(output_type)
+        if current_output_type is not None:
+            pydantic_agent = self._create_agent_with_output_type(current_output_type)
 
         # Handle model-specific prompt transformations via prepare_prompt_for_model()
         # This uses the get_model_system_prompt hook, so plugins can register their own handlers
@@ -1888,6 +1845,7 @@ class BaseAgent(ABC):
             prompt_payload = prompt
 
         async def run_agent_task():
+            nonlocal pydantic_agent
             _cloudflare_retry_attempted = False
 
             while True:
@@ -1914,51 +1872,14 @@ class BaseAgent(ABC):
 
                     usage_limits = UsageLimits(request_limit=get_message_limit())
 
-                    # Handle MCP servers - add them temporarily when using DBOS
-                    if (
-                        get_use_dbos()
-                        and hasattr(self, "_mcp_servers")
-                        and self._mcp_servers
-                    ):
-                        # Temporarily add MCP servers to the DBOS agent using internal _toolsets
-                        original_toolsets = pydantic_agent._toolsets
-                        pydantic_agent._toolsets = original_toolsets + self._mcp_servers
-                        pydantic_agent._toolsets = original_toolsets + self._mcp_servers
-
-                        try:
-                            # Set the workflow ID for DBOS context so DBOS and the agent ID match
-                            with SetWorkflowID(group_id):
-                                result_ = await pydantic_agent.run(
-                                    prompt_payload,
-                                    message_history=self.get_message_history(),
-                                    usage_limits=usage_limits,
-                                    event_stream_handler=event_stream_handler,
-                                    **kwargs,
-                                )
-                                return result_
-                        finally:
-                            # Always restore original toolsets
-                            pydantic_agent._toolsets = original_toolsets
-                    elif get_use_dbos():
-                        with SetWorkflowID(group_id):
-                            result_ = await pydantic_agent.run(
-                                prompt_payload,
-                                message_history=self.get_message_history(),
-                                usage_limits=usage_limits,
-                                event_stream_handler=event_stream_handler,
-                                **kwargs,
-                            )
-                            return result_
-                    else:
-                        # Non-DBOS path (MCP servers are already included)
-                        result_ = await pydantic_agent.run(
-                            prompt_payload,
-                            message_history=self.get_message_history(),
-                            usage_limits=usage_limits,
-                            event_stream_handler=event_stream_handler,
-                            **kwargs,
-                        )
-                        return result_
+                    result_ = await pydantic_agent.run(
+                        prompt_payload,
+                        message_history=self.get_message_history(),
+                        usage_limits=usage_limits,
+                        event_stream_handler=event_stream_handler,
+                        **kwargs,
+                    )
+                    return result_
                 except* UsageLimitExceeded as ule:
                     emit_info(f"Usage limit exceeded: {str(ule)}", group_id=group_id)
                     emit_info(
@@ -1974,12 +1895,8 @@ class BaseAgent(ABC):
                     )
                 except* asyncio.exceptions.CancelledError:
                     emit_info("Cancelled")
-                    if get_use_dbos():
-                        await DBOS.cancel_workflow_async(group_id)
                 except* InterruptedError as ie:
                     emit_info(f"Interrupted: {str(ie)}")
-                    if get_use_dbos():
-                        await DBOS.cancel_workflow_async(group_id)
                 except* Exception as other_error:
 
                     def contains_cloudflare_auth_error(exc: Exception) -> bool:
@@ -2013,11 +1930,22 @@ class BaseAgent(ABC):
                             )
 
                         if refreshed_token:
-                            emit_info(
-                                "Token refresh successful, retrying request...",
-                                group_id=group_id,
+                            rebuilt_agent = self._reload_live_agent_after_token_refresh(
+                                output_type=current_output_type,
+                                message_group=group_id,
                             )
-                            _retry_after_cloudflare_refresh = True
+                            if rebuilt_agent is not None:
+                                pydantic_agent = rebuilt_agent
+                                emit_info(
+                                    "Token refresh successful, rebuilt Claude Code client, retrying request...",
+                                    group_id=group_id,
+                                )
+                                _retry_after_cloudflare_refresh = True
+                            else:
+                                emit_info(
+                                    "Token refresh succeeded, but retry aborted because the live Claude Code client could not be rebuilt.",
+                                    group_id=group_id,
+                                )
 
                     if not _retry_after_cloudflare_refresh:
                         # Filter out CancelledError and UsageLimitExceeded from the exception group - let it propagate

{newcode-0.2.8 → newcode-0.2.10}/newcode/cli_runner.py

@@ -12,10 +12,8 @@ import argparse
 import asyncio
 import os
 import sys
-import time
 from pathlib import Path
 
-from dbos import DBOS, DBOSConfig
 from rich.console import Console
 
 from newcode import __version__, callbacks, plugins
@@ -25,10 +23,8 @@ from newcode.command_line.clipboard import get_clipboard_manager
 from newcode.config import (
     AUTOSAVE_DIR,
     COMMAND_HISTORY_FILE,
-    DBOS_DATABASE_URL,
     ensure_config_exists,
     finalize_autosave_session,
-    get_use_dbos,
     initialize_command_history_file,
     save_command_to_history,
 )
@@ -271,33 +267,6 @@ async def main():
 
     await callbacks.on_startup()
 
-    # Initialize DBOS if not disabled
-    if get_use_dbos():
-        # Append a Unix timestamp in ms to the version for uniqueness
-        dbos_app_version = os.environ.get(
-            "DBOS_APP_VERSION", f"{current_version}-{int(time.time() * 1000)}"
-        )
-        dbos_config: DBOSConfig = {
-            "name": "dbos-code-agent",
-            "system_database_url": DBOS_DATABASE_URL,
-            "run_admin_server": False,
-            "conductor_key": os.environ.get(
-                "DBOS_CONDUCTOR_KEY"
-            ),  # Optional, if set in env, connect to conductor
-            "log_level": os.environ.get(
-                "DBOS_LOG_LEVEL", "ERROR"
-            ),  # Default to ERROR level to suppress verbose logs
-            "application_version": dbos_app_version,  # Match DBOS app version
-        }
-        try:
-            DBOS(config=dbos_config)
-            DBOS.launch()
-        except Exception as e:
-            emit_error(f"Error initializing DBOS: {e}")
-            sys.exit(1)
-    else:
-        pass
-
     global shutdown_flag
     shutdown_flag = False
     try:
@@ -322,8 +291,6 @@ async def main():
         if bus_renderer:
             bus_renderer.stop()
         await callbacks.on_shutdown()
-        if get_use_dbos():
-            DBOS.destroy()
 
 
 async def interactive_mode(message_renderer, initial_command: str = None) -> None:
@@ -981,8 +948,6 @@ def main_entry():
         asyncio.run(main())
     except KeyboardInterrupt:
         # Normal exit via Ctrl+C – not a crash, so just clean up quietly
-        if get_use_dbos():
-            DBOS.destroy()
         return 0
     finally:
         # Reset terminal on Unix-like systems (not Windows)

{newcode-0.2.8 → newcode-0.2.10}/newcode/command_line/config_commands.py

@@ -42,7 +42,6 @@ def handle_show_command(command: str) -> bool:
         get_protected_token_count,
         get_resume_message_count,
         get_temperature,
-        get_use_dbos,
         get_yolo_mode,
     )
     from newcode.keymap import (
@@ -69,7 +68,6 @@ def handle_show_command(command: str) -> bool:
 [bold]default_agent:[/bold]        [cyan]{default_agent}[/cyan]
 [bold]model:[/bold]                 [green]{model}[/green]
 [bold]YOLO_MODE:[/bold]             {"[red]ON[/red]" if yolo_mode else "[yellow]off[/yellow]"}
-[bold]DBOS:[/bold]                  {"[green]enabled[/green]" if get_use_dbos() else "[yellow]disabled[/yellow]"} (toggle: /set enable_dbos true|false)
 [bold]auto_save_session:[/bold]     {"[green]enabled[/green]" if auto_save else "[yellow]disabled[/yellow]"}
 [bold]protected_tokens:[/bold]      [cyan]{protected_tokens:,}[/cyan] recent tokens preserved
 [bold]compaction_threshold:[/bold]     [cyan]{compaction_threshold:.1%}[/cyan] context usage triggers compaction
@@ -211,14 +209,6 @@ def handle_set_command(command: str) -> bool:
         )
         return True
     if key:
-        # Check if we're toggling DBOS enablement
-        if key == "enable_dbos":
-            emit_info(
-                Text.from_markup(
-                    "[yellow]⚠️ DBOS configuration changed. Please restart the application for this change to take effect.[/yellow]"
-                )
-            )
-
         # Validate cancel_agent_key before setting
         if key == "cancel_agent_key":
             from newcode.keymap import VALID_CANCEL_KEYS

{newcode-0.2.8 → newcode-0.2.10}/newcode/config.py

@@ -49,7 +49,6 @@ EXTRA_MODELS_FILE = os.path.join(DATA_DIR, "extra_models.json")
 AGENTS_DIR = os.path.join(DATA_DIR, "agents")
 SKILLS_DIR = os.path.join(DATA_DIR, "skills")
 CONTEXTS_DIR = os.path.join(DATA_DIR, "contexts")
-_DEFAULT_SQLITE_FILE = os.path.join(DATA_DIR, "dbos_store.sqlite")
 
 # OAuth plugin model files (XDG_DATA_HOME)
 GEMINI_MODELS_FILE = os.path.join(DATA_DIR, "gemini_models.json")
@@ -62,19 +61,6 @@ AUTOSAVE_DIR = os.path.join(CACHE_DIR, "autosaves")
 
 # State files (XDG_STATE_HOME)
 COMMAND_HISTORY_FILE = os.path.join(STATE_DIR, "command_history.txt")
-DBOS_DATABASE_URL = os.environ.get(
-    "DBOS_SYSTEM_DATABASE_URL", f"sqlite:///{_DEFAULT_SQLITE_FILE}"
-)
-# DBOS enable switch is controlled solely via puppy.cfg using key 'enable_dbos'.
-# Default: True (DBOS enabled) unless explicitly disabled.
-
-
-def get_use_dbos() -> bool:
-    """Return True if DBOS should be used based on 'enable_dbos' (default True)."""
-    cfg_val = get_value("enable_dbos")
-    if cfg_val is None:
-        return True
-    return str(cfg_val).strip().lower() in {"1", "true", "yes", "on"}
 
 
 def get_subagent_verbose() -> bool:
@@ -288,8 +274,6 @@ def get_config_keys():
         "frontend_emitter_max_recent_events",
         "frontend_emitter_queue_size",
     ]
-    # Add DBOS control key
-    default_keys.append("enable_dbos")
     # Add pack agents control key
     default_keys.append("enable_pack_agents")
     # Add universal constructor control key
@@ -1193,11 +1177,6 @@ def set_http2(enabled: bool) -> None:
     set_config_value("http2", "true" if enabled else "false")
 
 
-def set_enable_dbos(enabled: bool) -> None:
-    """Enable DBOS via config (true enables, default false)."""
-    set_config_value("enable_dbos", "true" if enabled else "false")
-
-
 def get_message_limit(default: int = 1000) -> int:
     """
     Returns the user-configured message/request limit for the agent.

{newcode-0.2.8 → newcode-0.2.10}/newcode/summarization_agent.py

@@ -82,7 +82,7 @@ def run_summarization_sync(prompt: str, message_history: List) -> List:
         """
         Run the async agent in a dedicated thread with its own event loop.
         Uses run_until_complete instead of asyncio.run to avoid shutting down
-        the default executor (which breaks DBOS in the main thread).
+        the default executor (which can break in the main thread).
         Does NOT touch global event loop state.
         """
         loop = asyncio.new_event_loop()
@@ -158,9 +158,9 @@ def reload_summarization_agent():
         retries=1,  # Fewer retries for summarization
         model_settings=model_settings,
     )
-    # NOTE: We intentionally DON'T wrap in DBOSAgent here.
+    # NOTE: We intentionally avoid additional durable wrappers here.
     # Summarization is a simple one-shot call that doesn't need durable execution,
-    # and DBOSAgent causes async event loop conflicts with run_sync().
+    # because durable wrappers can cause async event loop conflicts with run_sync().
     return agent