ouroboros-ai 0.26.2.dev32__tar.gz → 0.26.2.dev33__tar.gz

{ouroboros_ai-0.26.2.dev32 → ouroboros_ai-0.26.2.dev33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ouroboros-ai
-Version: 0.26.2.dev32
+Version: 0.26.2.dev33
 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.26.2.dev32 → ouroboros_ai-0.26.2.dev33}/src/ouroboros/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.26.2.dev32'
-__version_tuple__ = version_tuple = (0, 26, 2, 'dev32')
+__version__ = version = '0.26.2.dev33'
+__version_tuple__ = version_tuple = (0, 26, 2, 'dev33')
 
 __commit_id__ = commit_id = None

{ouroboros_ai-0.26.2.dev32 → ouroboros_ai-0.26.2.dev33}/src/ouroboros/cli/commands/run.py

@@ -8,6 +8,7 @@ import asyncio
 from enum import Enum
 from pathlib import Path
 from typing import TYPE_CHECKING, Annotated, Any
+from uuid import uuid4
 
 import click
 import typer
@@ -20,6 +21,12 @@ if TYPE_CHECKING:
 from ouroboros.cli.formatters import console
 from ouroboros.cli.formatters.panels import print_error, print_info, print_success, print_warning
 from ouroboros.core.security import InputValidator
+from ouroboros.core.worktree import (
+    TaskWorkspace,
+    WorktreeError,
+    maybe_prepare_task_workspace,
+    maybe_restore_task_workspace,
+)
 
 
 class _DefaultWorkflowGroup(typer.core.TyperGroup):
@@ -180,6 +187,7 @@ async def _run_orchestrator(
     """
     from ouroboros.core.seed import Seed
     from ouroboros.orchestrator import OrchestratorRunner, create_agent_runtime
+    from ouroboros.orchestrator.session import SessionRepository
     from ouroboros.persistence.event_store import EventStore
 
     # Load seed
@@ -210,9 +218,42 @@ async def _run_orchestrator(
     event_store = EventStore(f"sqlite+aiosqlite:///{db_path}")
     await event_store.initialize()
 
+    session_repo = SessionRepository(event_store)
+    workspace: TaskWorkspace | None = None
+    execution_id: str | None = None
+    session_id_for_run: str | None = None
+
+    try:
+        if resume_session:
+            reconstructed = await session_repo.reconstruct_session(resume_session)
+            if reconstructed.is_err:
+                print_error(f"Failed to reconstruct session: {reconstructed.error}")
+                raise typer.Exit(1)
+            persisted = TaskWorkspace.from_progress_dict(
+                reconstructed.value.progress.get("workspace")
+            )
+            workspace = maybe_restore_task_workspace(
+                resume_session,
+                persisted,
+                fallback_source_cwd=Path.cwd(),
+            )
+            session_id_for_run = resume_session
+            execution_id = reconstructed.value.execution_id
+        else:
+            session_id_for_run = f"orch_{uuid4().hex[:12]}"
+            execution_id = f"exec_{uuid4().hex[:12]}"
+            workspace = maybe_prepare_task_workspace(Path.cwd(), session_id_for_run)
+    except WorktreeError as e:
+        print_error(f"Task workspace error: {e.message}")
+        raise typer.Exit(1) from e
+
+    if workspace is not None:
+        print_info(f"Task worktree: {workspace.worktree_path}")
+        print_info(f"Task branch: {workspace.branch}")
+
     adapter = create_agent_runtime(
         backend=runtime_backend,
-        cwd=Path.cwd(),
+        cwd=Path(workspace.effective_cwd) if workspace else Path.cwd(),
     )
     runner = OrchestratorRunner(
         adapter,
@@ -221,6 +262,7 @@ async def _run_orchestrator(
         mcp_manager=mcp_manager,
         mcp_tool_prefix=mcp_tool_prefix,
         debug=debug,
+        task_workspace=workspace,
     )
 
     # Execute
@@ -236,7 +278,12 @@ async def _run_orchestrator(
                 print_info("Parallel mode: independent ACs will run concurrently")
             else:
                 print_info("Sequential mode: ACs will run one at a time")
-            result = await runner.execute_seed(seed, parallel=parallel)
+            result = await runner.execute_seed(
+                seed,
+                execution_id=execution_id,
+                session_id=session_id_for_run,
+                parallel=parallel,
+            )
 
         # Handle result
         if result.is_ok:

{ouroboros_ai-0.26.2.dev32 → ouroboros_ai-0.26.2.dev33}/src/ouroboros/config/models.py

@@ -294,6 +294,10 @@ class OrchestratorConfig(BaseModel, frozen=True):
             - ~ expansion: ~/.local/bin/opencode
             - None: Resolve from PATH at runtime
         default_max_turns: Default max turns for agent execution
+        use_worktrees: Whether mutating workflows run in dedicated git worktrees
+        worktree_root: Root directory for managed task worktrees
+        worktree_cleanup: Cleanup policy for managed task worktrees
+        worktree_lock_stale_after_minutes: Staleness threshold for task lock recovery
     """
 
     runtime_backend: Literal["claude", "codex", "opencode"] = "claude"
@@ -305,6 +309,10 @@ class OrchestratorConfig(BaseModel, frozen=True):
     codex_cli_path: str | None = None
     opencode_cli_path: str | None = None
     default_max_turns: int = Field(default=10, ge=1)
+    use_worktrees: bool = True
+    worktree_root: str = "~/.ouroboros/worktrees"
+    worktree_cleanup: Literal["keep"] = "keep"
+    worktree_lock_stale_after_minutes: int = Field(default=60, ge=1)
 
     @field_validator("cli_path", "codex_cli_path", "opencode_cli_path")
     @classmethod
@@ -314,6 +322,12 @@ class OrchestratorConfig(BaseModel, frozen=True):
             return None
         return str(Path(v).expanduser())
 
+    @field_validator("worktree_root")
+    @classmethod
+    def expand_worktree_root(cls, v: str) -> str:
+        """Expand ~ in worktree_root."""
+        return str(Path(v).expanduser())
+
 
 class OuroborosConfig(BaseModel, frozen=True):
     """Top-level Ouroboros configuration.