ouroboros-ai 0.28.1.dev3__tar.gz → 0.28.1.dev4__tar.gz

{ouroboros_ai-0.28.1.dev3 → ouroboros_ai-0.28.1.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ouroboros-ai
-Version: 0.28.1.dev3
+Version: 0.28.1.dev4
 Summary: Specification-first workflow engine for AI coding agents. Works with Claude Code and Codex CLI.
 Author-email: Q00 <jqyu.lee@gmail.com>
 License-File: LICENSE

{ouroboros_ai-0.28.1.dev3 → ouroboros_ai-0.28.1.dev4}/src/ouroboros/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.28.1.dev3'
-__version_tuple__ = version_tuple = (0, 28, 1, 'dev3')
+__version__ = version = '0.28.1.dev4'
+__version_tuple__ = version_tuple = (0, 28, 1, 'dev4')
 
 __commit_id__ = commit_id = None

{ouroboros_ai-0.28.1.dev3 → ouroboros_ai-0.28.1.dev4}/src/ouroboros/cli/commands/mcp.py

@@ -7,8 +7,11 @@ from __future__ import annotations
 
 import asyncio
 from enum import Enum
+import json
 import os
 from pathlib import Path
+import subprocess
+import sys
 from typing import Annotated
 
 from rich.console import Console
@@ -98,6 +101,60 @@ def _check_stale_instance() -> bool:
         return True
 
 
+def _ensure_shell_env(*, timeout: float = 10.0) -> None:
+    """Load login-shell environment when launched outside a login shell.
+
+    When a gateway process (e.g., OpenClaw) spawns ``ouroboros mcp serve``,
+    the child inherits only a minimal environment. This sources the user's
+    shell profile to recover PATH, ANTHROPIC_API_KEY, etc.
+
+    Uses JSON serialization to avoid multiline env value parsing issues.
+    Avoids the ``-i`` (interactive) flag which hangs on oh-my-zsh/p10k.
+    """
+    # Fast path: if key indicators are already present, skip
+    if os.environ.get("ANTHROPIC_API_KEY"):
+        return
+
+    shell = os.environ.get("SHELL", "/bin/zsh" if sys.platform == "darwin" else "/bin/bash")
+    shell_name = Path(shell).name
+
+    # Dump env as JSON — unambiguous, handles multiline values
+    dump_cmd = 'python3 -c "import os,json,sys; json.dump(dict(os.environ), sys.stdout)"'
+
+    if shell_name == "zsh":
+        cmd = [shell, "-l", "-c", f"[[ -f ~/.zshrc ]] && source ~/.zshrc 2>/dev/null; {dump_cmd}"]
+    elif shell_name == "bash":
+        cmd = [shell, "-l", "-c", f"[[ -f ~/.bashrc ]] && source ~/.bashrc 2>/dev/null; {dump_cmd}"]
+    else:
+        cmd = [shell, "-l", "-c", dump_cmd]
+
+    try:
+        result = subprocess.run(cmd, capture_output=True, text=True, timeout=timeout)
+    except (FileNotFoundError, subprocess.TimeoutExpired, OSError) as e:
+        _stderr_console.print(f"[yellow]Warning: shell env load failed: {e}[/yellow]")
+        return
+
+    if result.returncode != 0:
+        return
+
+    try:
+        env = json.loads(result.stdout)
+    except json.JSONDecodeError:
+        _stderr_console.print("[yellow]Warning: could not parse shell env output[/yellow]")
+        return
+
+    current_path_dirs = set(os.environ.get("PATH", "").split(os.pathsep))
+    for key, val in env.items():
+        if key == "PATH":
+            new_dirs = [d for d in val.split(os.pathsep) if d and d not in current_path_dirs]
+            if new_dirs:
+                os.environ["PATH"] = (
+                    os.pathsep.join(new_dirs) + os.pathsep + os.environ.get("PATH", "")
+                )
+        elif key not in os.environ:
+            os.environ[key] = val
+
+
 app = typer.Typer(
     name="mcp",
     help="MCP (Model Context Protocol) server commands.",
@@ -123,6 +180,9 @@ async def _run_mcp_server(
         runtime_backend: Optional orchestrator runtime backend override.
         llm_backend: Optional LLM-only backend override.
     """
+    # Ensure login-shell environment is available (critical for gateway-spawned processes)
+    _ensure_shell_env()
+
     from ouroboros.mcp.server.adapter import create_ouroboros_server, validate_transport
     from ouroboros.orchestrator.session import SessionRepository
     from ouroboros.persistence.event_store import EventStore

{ouroboros_ai-0.28.1.dev3 → ouroboros_ai-0.28.1.dev4}/src/ouroboros/mcp/server/adapter.py

@@ -1257,7 +1257,8 @@ def create_ouroboros_server(
         validator=_evolution_validator,
     )
     job_manager = JobManager(event_store)
-    openclaw_db_path = state_dir / "openclaw.db"
+    cwd = Path.cwd()
+    openclaw_db_path = Path.home() / ".ouroboros" / "ouroboros.db"
     workflow_manager = ChannelWorkflowManager(openclaw_db_path)
     repo_registry = ChannelRepoRegistry(openclaw_db_path)
 
@@ -1327,6 +1328,7 @@ def create_ouroboros_server(
         ChannelWorkflowHandler(
             workflow_manager=workflow_manager,
             repo_registry=repo_registry,
+            default_repo=str(cwd) if str(cwd) != "/" else None,
             interview_handler=InterviewHandler(
                 interview_engine=interview_engine,
                 event_store=event_store,

{ouroboros_ai-0.28.1.dev3 → ouroboros_ai-0.28.1.dev4}/src/ouroboros/mcp/tools/channel_workflow_handler.py

@@ -44,6 +44,7 @@ class ChannelWorkflowHandler:
     job_status_handler: JobStatusHandler | None = field(default=None, repr=False)
     job_wait_handler: JobWaitHandler | None = field(default=None, repr=False)
     job_result_handler: JobResultHandler | None = field(default=None, repr=False)
+    default_repo: str | None = field(default=None, repr=False)
 
     def __post_init__(self) -> None:
         self._workflow_manager = self.workflow_manager or ChannelWorkflowManager()
@@ -348,6 +349,7 @@ class ChannelWorkflowHandler:
             arguments.get("repo")
             or self._repo_registry.get(channel)
             or (active.repo if active else None)
+            or self.default_repo
         )
         if not isinstance(repo, str) or not repo.strip():
             return Result.err(

{ouroboros_ai-0.28.1.dev3 → ouroboros_ai-0.28.1.dev4}/src/ouroboros/mcp/tools/definitions.py

@@ -152,6 +152,7 @@ def channel_workflow_handler(
     job_wait_handler: JobWaitHandler | None = None,
     job_status_handler: JobStatusHandler | None = None,
     job_result_handler: JobResultHandler | None = None,
+    default_repo: str | None = None,
 ) -> ChannelWorkflowHandler:
     """Create a ChannelWorkflowHandler instance.
 
@@ -171,6 +172,7 @@ def channel_workflow_handler(
         job_wait_handler=job_wait_handler or JobWaitHandler(),
         job_status_handler=job_status_handler or JobStatusHandler(),
         job_result_handler=job_result_handler or JobResultHandler(),
+        default_repo=default_repo,
     )
 
 

{ouroboros_ai-0.28.1.dev3 → ouroboros_ai-0.28.1.dev4}/src/ouroboros/openclaw/store.py

@@ -11,7 +11,7 @@ from typing import Any
 
 def default_openclaw_db_path() -> Path:
     """Return the default SQLite database path for OpenClaw workflow state."""
-    return Path.cwd() / ".ouroboros" / "openclaw.db"
+    return Path.home() / ".ouroboros" / "ouroboros.db"
 
 
 class OpenClawStateStore:

{ouroboros_ai-0.28.1.dev3 → ouroboros_ai-0.28.1.dev4}/tests/integration/mcp/test_server_adapter.py

@@ -590,7 +590,7 @@ class TestCreateOuroborosServer:
         assert status_result.is_ok
         assert "Channel Workflow Summary" in status_result.value.text_content
         assert str(tmp_path / "repo") in status_result.value.text_content
-        assert (tmp_path / "data" / "openclaw.db").exists()
+        assert (Path.home() / ".ouroboros" / "ouroboros.db").exists()
 
 
 class TestMCPServerAdapterConcurrency: