newcode 0.2.9__tar.gz → 0.2.11__tar.gz

{newcode-0.2.9 → newcode-0.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: newcode
-Version: 0.2.9
+Version: 0.2.11
 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: fastapi>=0.109.0
 Requires-Dist: httpx[http2]>=0.24.1
 Requires-Dist: json-repair>=0.46.2
 Requires-Dist: mcp>=1.9.4
@@ -35,8 +34,6 @@ Requires-Dist: ripgrep==14.1.0
 Requires-Dist: tenacity>=8.2.0
 Requires-Dist: termflow-md>=0.1.8
 Requires-Dist: typer>=0.12.0
-Requires-Dist: uvicorn[standard]>=0.27.0
-Requires-Dist: websockets>=12.0
 Description-Content-Type: text/markdown
 
 # NewCode
@@ -94,7 +91,6 @@ On first run, NewCode starts onboarding to help configure API keys and defaults.
 /model          # Select or switch model
 /agent          # Select or switch agent
 /colors         # Customize terminal UI colors
-/api            # Manage built-in API server (start|stop|status)
 ```
 
 ## Requirements

{newcode-0.2.9 → newcode-0.2.11}/README.md

@@ -53,7 +53,6 @@ On first run, NewCode starts onboarding to help configure API keys and defaults.
 /model          # Select or switch model
 /agent          # Select or switch agent
 /colors         # Customize terminal UI colors
-/api            # Manage built-in API server (start|stop|status)
 ```
 
 ## Requirements

{newcode-0.2.9 → newcode-0.2.11}/newcode/agents/base_agent.py

@@ -1441,6 +1441,28 @@ class BaseAgent(ABC):
         self._mcp_servers = filtered_mcp_servers
         return self._code_generation_agent
 
+    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,
+            )
+            return None
+
     def _create_agent_with_output_type(self, output_type: Type[Any]) -> PydanticAgent:
         """Create a temporary agent configured with a custom output_type.
 
@@ -1763,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
@@ -1822,6 +1845,7 @@ class BaseAgent(ABC):
             prompt_payload = prompt
 
         async def run_agent_task():
+            nonlocal pydantic_agent
             _cloudflare_retry_attempted = False
 
             while True:
@@ -1906,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.9 → newcode-0.2.11}/newcode/command_line/core_commands.py

@@ -678,91 +678,6 @@ def handle_mcp_command(command: str) -> bool:
     return handler.handle_mcp_command(command)
 
 
-@register_command(
-    name="api",
-    description="Manage the API server",
-    usage="/api [start|stop|status]",
-    category="core",
-    detailed_help="Start, stop, or check status of the local FastAPI server for GUI integration.",
-)
-def handle_api_command(command: str) -> bool:
-    """Handle the /api command."""
-    import os
-    import signal
-    import subprocess
-    import sys
-    from pathlib import Path
-
-    from newcode.config import STATE_DIR
-    from newcode.messaging import emit_error, emit_info, emit_success
-
-    parts = command.split()
-    subcommand = parts[1] if len(parts) > 1 else "status"
-
-    pid_file = Path(STATE_DIR) / "api_server.pid"
-
-    if subcommand == "start":
-        # Check if already running
-        if pid_file.exists():
-            try:
-                pid = int(pid_file.read_text().strip())
-                os.kill(pid, 0)  # Check if process exists
-                emit_info(f"API server already running (PID {pid})")
-                return True
-            except (OSError, ValueError):
-                pid_file.unlink(missing_ok=True)  # Stale PID file
-
-        # Start the server in background
-        emit_info("Starting API server on http://127.0.0.1:8765 ...")
-        proc = subprocess.Popen(
-            [sys.executable, "-m", "newcode.api.main"],
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL,
-            start_new_session=True,
-        )
-        pid_file.parent.mkdir(parents=True, exist_ok=True)
-        pid_file.write_text(str(proc.pid))
-        emit_success(f"API server started (PID {proc.pid})")
-        emit_info("Docs available at http://127.0.0.1:8765/docs")
-        return True
-
-    elif subcommand == "stop":
-        if not pid_file.exists():
-            emit_info("API server is not running")
-            return True
-
-        try:
-            pid = int(pid_file.read_text().strip())
-            os.kill(pid, signal.SIGTERM)
-            pid_file.unlink()
-            emit_success(f"API server stopped (PID {pid})")
-        except (OSError, ValueError) as e:
-            pid_file.unlink(missing_ok=True)
-            emit_error(f"Error stopping server: {e}")
-        return True
-
-    elif subcommand == "status":
-        if not pid_file.exists():
-            emit_info("API server is not running")
-            return True
-
-        try:
-            pid = int(pid_file.read_text().strip())
-            os.kill(pid, 0)  # Check if process exists
-            emit_success(f"API server is running (PID {pid})")
-            emit_info("URL: http://127.0.0.1:8765")
-            emit_info("Docs: http://127.0.0.1:8765/docs")
-        except (OSError, ValueError):
-            pid_file.unlink(missing_ok=True)
-            emit_info("API server is not running (stale PID file removed)")
-        return True
-
-    else:
-        emit_error(f"Unknown subcommand: {subcommand}")
-        emit_info("Usage: /api [start|stop|status]")
-        return True
-
-
 @register_command(
     name="generate-pr-description",
     description="Generate comprehensive PR description",

{newcode-0.2.9 → newcode-0.2.11}/newcode/tools/browser/terminal_tools.py

@@ -317,7 +317,7 @@ async def start_api_server(port: int = 8765) -> Dict[str, Any]:
 
     This starts the API server that provides the terminal endpoint for
     browser-based terminal testing. The server runs in the background
-    and persists until stopped with /api stop or the process is killed.
+    and persists until the process is killed.
 
     Args:
         port: The port to run the server on (default: 8765).

{newcode-0.2.9 → newcode-0.2.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "newcode"
-version = "0.2.9"
+version = "0.2.11"
 description = "AI-powered code generation agent platform"
 readme = "README.md"
 requires-python = ">=3.11,<3.14"
@@ -24,9 +24,6 @@ dependencies = [
     "ripgrep==14.1.0",
     "tenacity>=8.2.0",
     "playwright>=1.40.0",
-    "fastapi>=0.109.0",
-    "uvicorn[standard]>=0.27.0",
-    "websockets>=12.0",
     "termflow-md>=0.1.8",
     "Pillow>=10.0.0",
     "anthropic==0.79.0"

newcode-0.2.9/newcode/api/__init__.py

@@ -1,13 +0,0 @@
-"""REST API module.
-
-This module provides a FastAPI-based REST API for the application configuration,
-sessions, commands, and real-time WebSocket communication.
-
-Exports:
-    create_app: Factory function to create the FastAPI application
-    main: Entry point to run the server
-"""
-
-from newcode.api.app import create_app
-
-__all__ = ["create_app"]

newcode-0.2.9/newcode/api/app.py

@@ -1,169 +0,0 @@
-"""FastAPI application factory."""
-
-import asyncio
-import logging
-from contextlib import asynccontextmanager
-from pathlib import Path
-from typing import AsyncGenerator
-
-from fastapi import FastAPI, Request
-from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import FileResponse, HTMLResponse, JSONResponse
-from starlette.middleware.base import BaseHTTPMiddleware
-
-logger = logging.getLogger(__name__)
-
-# Default request timeout (seconds) - fail fast!
-REQUEST_TIMEOUT = 30.0
-
-
-class TimeoutMiddleware(BaseHTTPMiddleware):
-    """Middleware to enforce request timeouts and prevent hanging requests."""
-
-    def __init__(self, app, timeout: float = REQUEST_TIMEOUT):
-        super().__init__(app)
-        self.timeout = timeout
-
-    async def dispatch(self, request: Request, call_next):
-        # Skip timeout for WebSocket upgrades and streaming endpoints
-        if request.headers.get(
-            "upgrade", ""
-        ).lower() == "websocket" or request.url.path.startswith("/ws/"):
-            return await call_next(request)
-
-        try:
-            return await asyncio.wait_for(
-                call_next(request),
-                timeout=self.timeout,
-            )
-        except asyncio.TimeoutError:
-            return JSONResponse(
-                status_code=504,
-                content={
-                    "detail": f"Request timed out after {self.timeout}s",
-                    "error": "timeout",
-                },
-            )
-
-
-@asynccontextmanager
-async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:
-    """Lifespan context manager for startup and shutdown events.
-
-    Handles graceful cleanup of resources when the server shuts down.
-    """
-    # Startup: nothing special needed yet, but this is where you'd do it
-    logger.info("API starting up...")
-    yield
-    # Shutdown: clean up all the things!
-    logger.info("API shutting down, cleaning up...")
-
-    # 1. Close all PTY sessions
-    try:
-        from newcode.api.pty_manager import get_pty_manager
-
-        pty_manager = get_pty_manager()
-        await pty_manager.close_all()
-        logger.info("✓ All PTY sessions closed")
-    except Exception as e:
-        logger.error(f"Error closing PTY sessions: {e}")
-
-    # 2. Remove PID file so /api status knows we're gone
-    try:
-        from newcode.config import STATE_DIR
-
-        pid_file = Path(STATE_DIR) / "api_server.pid"
-        if pid_file.exists():
-            pid_file.unlink()
-            logger.info("✓ PID file removed")
-    except Exception as e:
-        logger.error(f"Error removing PID file: {e}")
-
-
-def create_app() -> FastAPI:
-    """Create and configure the FastAPI application."""
-    app = FastAPI(
-        lifespan=lifespan,
-        title="Code Agent API",
-        description="REST API and Interactive Terminal",
-        version="1.0.0",
-        docs_url="/docs",
-        redoc_url="/redoc",
-    )
-
-    # Timeout middleware - added first so it wraps everything
-    app.add_middleware(TimeoutMiddleware, timeout=REQUEST_TIMEOUT)
-
-    # CORS middleware for frontend access
-    app.add_middleware(
-        CORSMiddleware,
-        allow_origins=["*"],  # Local/trusted
-        allow_credentials=True,
-        allow_methods=["*"],
-        allow_headers=["*"],
-    )
-
-    # Include routers
-    from newcode.api.routers import agents, commands, config, sessions
-
-    app.include_router(config.router, prefix="/api/config", tags=["config"])
-    app.include_router(commands.router, prefix="/api/commands", tags=["commands"])
-    app.include_router(sessions.router, prefix="/api/sessions", tags=["sessions"])
-    app.include_router(agents.router, prefix="/api/agents", tags=["agents"])
-
-    # WebSocket endpoints (events + terminal)
-    from newcode.api.websocket import setup_websocket
-
-    setup_websocket(app)
-
-    # Templates directory
-    templates_dir = Path(__file__).parent / "templates"
-
-    @app.get("/")
-    async def root():
-        """Landing page with links to terminal and docs."""
-        return HTMLResponse(
-            content="""
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Code Agent</title>
-    <script src="https://cdn.tailwindcss.com"></script>
-</head>
-<body class="bg-gray-900 text-white min-h-screen flex items-center justify-center">
-    <div class="text-center">
-        <h1 class="text-6xl mb-4">&#x2699;</h1>
-        <h2 class="text-3xl font-bold mb-8">Code Agent</h2>
-        <div class="space-x-4">
-            <a href="/terminal" class="px-6 py-3 bg-blue-600 hover:bg-blue-700 rounded-lg text-lg font-semibold">
-                Open Terminal
-            </a>
-            <a href="/docs" class="px-6 py-3 bg-gray-700 hover:bg-gray-600 rounded-lg text-lg">
-                API Docs
-            </a>
-        </div>
-        <p class="mt-8 text-gray-400">
-            WebSocket: ws://localhost:8765/ws/terminal
-        </p>
-    </div>
-</body>
-</html>
-        """
-        )
-
-    @app.get("/terminal")
-    async def terminal_page():
-        """Serve the interactive terminal page."""
-        html_file = templates_dir / "terminal.html"
-        if html_file.exists():
-            return FileResponse(html_file, media_type="text/html")
-        return HTMLResponse(
-            content="<h1>Terminal template not found</h1>",
-            status_code=404,
-        )
-
-    @app.get("/health")
-    async def health():
-        return {"status": "healthy"}
-
-    return app

newcode-0.2.9/newcode/api/main.py

@@ -1,21 +0,0 @@
-"""Entry point for running the FastAPI server."""
-
-import uvicorn
-
-from newcode.api.app import create_app
-
-app = create_app()
-
-
-def main(host: str = "127.0.0.1", port: int = 8765) -> None:
-    """Run the FastAPI server.
-
-    Args:
-        host: The host address to bind to. Defaults to localhost.
-        port: The port number to listen on. Defaults to 8765.
-    """
-    uvicorn.run(app, host=host, port=port)
-
-
-if __name__ == "__main__":
-    main()