monoco-toolkit 0.3.3__py3-none-any.whl → 0.3.5__py3-none-any.whl

monoco/features/issue/validator.py

@@ -8,6 +8,7 @@ from monoco.features.i18n.core import detect_language
 from .models import IssueMetadata
 from .domain.parser import MarkdownParser
 from .domain.models import ContentBlock
+from .resolver import ReferenceResolver, ResolutionContext
 
 
 class IssueValidator:
@@ -20,9 +21,19 @@ class IssueValidator:
         self.issue_root = issue_root
 
     def validate(
-        self, meta: IssueMetadata, content: str, all_issue_ids: Set[str] = set()
+        self,
+        meta: IssueMetadata,
+        content: str,
+        all_issue_ids: Set[str] = set(),
+        current_project: Optional[str] = None,
+        workspace_root: Optional[str] = None,
     ) -> List[Diagnostic]:
+        """
+        Validate an issue and return diagnostics.
+        """
         diagnostics = []
+        self._current_project = current_project
+        self._workspace_root = workspace_root
 
         # Parse Content into Blocks (Domain Layer)
         # Handle case where content might be just body (from update_issue) or full file
@@ -311,7 +322,11 @@ class IssueValidator:
                 if stripped == expected_header:
                     header_found = True
 
-                if stripped == "## Review Comments":
+                # Flexible matching for Review Comments header
+                if any(
+                    kw in stripped
+                    for kw in ["Review Comments", "评审备注", "评审记录", "Review"]
+                ):
                     review_header_found = True
                     review_header_index = i
 
@@ -406,6 +421,16 @@ class IssueValidator:
     ) -> List[Diagnostic]:
         diagnostics = []
 
+        # Initialize Resolver
+        resolver = None
+        if all_ids:
+            context = ResolutionContext(
+                current_project=self._current_project or "local",
+                workspace_root=self._workspace_root,
+                available_ids=all_ids,
+            )
+            resolver = ReferenceResolver(context)
+
         # Malformed ID Check
         if meta.parent and meta.parent.startswith("#"):
             line = self._get_field_line(content, "parent")
@@ -441,7 +466,7 @@ class IssueValidator:
                         )
                     )
 
-        if not all_ids:
+        if not all_ids or not resolver:
             return diagnostics
 
         # Logic: Epics must have a parent (unless it is the Sink Root EPIC-0000)
@@ -457,8 +482,9 @@ class IssueValidator:
 
         if (
             meta.parent
-            and meta.parent not in all_ids
+            and meta.parent != "EPIC-0000"
             and not meta.parent.startswith("#")
+            and not resolver.is_valid_reference(meta.parent)
         ):
             line = self._get_field_line(content, "parent")
             diagnostics.append(
@@ -470,7 +496,7 @@ class IssueValidator:
             )
 
         for dep in meta.dependencies:
-            if dep not in all_ids:
+            if not resolver.is_valid_reference(dep):
                 line = self._get_field_line(content, "dependencies")
                 diagnostics.append(
                     self._create_diagnostic(
@@ -503,24 +529,27 @@ class IssueValidator:
             matches = re.finditer(r"\b((?:EPIC|FEAT|CHORE|FIX)-\d{4})\b", line)
             for match in matches:
                 ref_id = match.group(1)
-                if ref_id != meta.id and ref_id not in all_ids:
-                    # Check if it's a namespaced ID? The regex only catches local IDs.
-                    # If users use MON::FEAT-0001, the regex might catch FEAT-0001.
-                    # But all_ids contains full IDs (potentially namespaced).
-                    # Simple logic: if ref_id isn't in all_ids, check if any id ENDS with ref_id
-
-                    found_namespaced = any(
-                        known.endswith(f"::{ref_id}") for known in all_ids
-                    )
+                # Check for namespaced ID before this match?
+                # The regex above only catches the ID part.
+                # Let's adjust regex to optionally catch namespace::
+                full_match = re.search(
+                    r"\b(?:([a-z0-9_-]+)::)?(" + re.escape(ref_id) + r")\b",
+                    line[max(0, match.start() - 50) : match.end()],
+                )
 
-                    if not found_namespaced:
-                        diagnostics.append(
-                            self._create_diagnostic(
-                                f"Broken Reference: Issue '{ref_id}' not found.",
-                                DiagnosticSeverity.Warning,
-                                line=i,
-                            )
+                check_id = ref_id
+                if full_match and full_match.group(1):
+                    check_id = f"{full_match.group(1)}::{ref_id}"
+
+                if ref_id != meta.id and not resolver.is_valid_reference(check_id):
+                    diagnostics.append(
+                        self._create_diagnostic(
+                            f"Broken Reference: Issue '{check_id}' not found.",
+                            DiagnosticSeverity.Warning,
+                            line=i,
                         )
+                    )
+        return diagnostics
         return diagnostics
 
     def _validate_time_consistency(

monoco/features/scheduler/cli.py

@@ -7,6 +7,90 @@ from monoco.core.config import get_config
 from monoco.features.scheduler import SessionManager, load_scheduler_config
 
 app = typer.Typer(name="agent", help="Manage agent sessions")
+role_app = typer.Typer(name="role", help="Manage agent roles")
+
+
+@role_app.command(name="list")
+def list_roles():
+    """
+    List available agent roles and their sources.
+    """
+    from monoco.features.scheduler.config import RoleLoader
+
+    settings = get_config()
+    project_root = Path(settings.paths.root).resolve()
+
+    loader = RoleLoader(project_root)
+    roles = loader.load_all()
+
+    output = []
+    for name, role in roles.items():
+        output.append(
+            {
+                "role": name,
+                "engine": role.engine,
+                "source": loader.sources.get(name, "unknown"),
+                "description": role.description,
+            }
+        )
+
+    print_output(output, title="Agent Roles")
+
+
+@app.command()
+def draft(
+    desc: str = typer.Option(..., "--desc", "-d", help="Description of the task"),
+    type: str = typer.Option(
+        "feature", "--type", "-t", help="Issue type (feature/chore/fix)"
+    ),
+):
+    """
+    Draft a new issue based on a natural language description.
+    This creates a temporary 'drafter' agent session.
+    """
+    from monoco.core.output import print_error
+
+    settings = get_config()
+    project_root = Path(settings.paths.root).resolve()
+
+    # Load Roles
+    roles = load_scheduler_config(project_root)
+    # Use 'crafter' as the role for drafting (it handles new tasks)
+    role_name = "crafter"
+    selected_role = roles.get(role_name)
+
+    if not selected_role:
+        print_error(f"Role '{role_name}' not found.")
+        raise typer.Exit(code=1)
+
+    print_output(
+        f"Drafting {type} from description: '{desc}'",
+        title="Agent Drafter",
+    )
+
+    manager = SessionManager()
+    # We use a placeholder ID as we don't know the ID yet.
+    # The agent is expected to create the file, so the ID will be generated then.
+    session = manager.create_session("NEW_TASK", selected_role)
+
+    context = {"description": desc, "type": type}
+
+    try:
+        session.start(context=context)
+
+        # Monitoring Loop
+        while session.refresh_status() == "running":
+            time.sleep(1)
+
+        if session.model.status == "failed":
+            print_error("Drafting failed.")
+        else:
+            print_output("Drafting completed.", title="Agent Drafter")
+
+    except KeyboardInterrupt:
+        print("\nStopping...")
+        session.terminate()
+        print_output("Drafting cancelled.")
 
 
 @app.command()
@@ -43,6 +127,7 @@ def run(
         role_name = role or "builder"
         description = None
     else:
+        # Implicit Draft Mode via run command
         issue_id = "NEW_TASK"
         role_name = role or "crafter"
         description = target
@@ -84,7 +169,7 @@ def run(
             session.start(context=context)
 
         # Monitoring Loop
-        while session.model.status == "running":
+        while session.refresh_status() == "running":
             time.sleep(1)
 
         if session.model.status == "failed":
@@ -141,9 +226,15 @@ def autopsy(
         if re.match(r"^[a-zA-Z]+-\d+$", target):
             print_output(f"Session not in memory. Analyzing Issue {target} directly.")
             # We create a transient session just to trigger the coroner
-            from .defaults import DEFAULT_ROLES
+            settings = get_config()
+            project_root = Path(settings.paths.root).resolve()
+            roles = load_scheduler_config(project_root)
+            builder_role = roles.get("builder")
+
+            if not builder_role:
+                print_output("Builder role not found.", style="red")
+                raise typer.Exit(code=1)
 
-            builder_role = next(r for r in DEFAULT_ROLES if r.name == "builder")
             session = manager.create_session(target.upper(), builder_role)
             session.model.status = "failed"
         else:
@@ -192,13 +283,3 @@ def logs(session_id: str):
     # Placeholder
     print("[12:00:00] Session started")
     print("[12:00:01] Worker initialized")
-
-
-@app.command()
-def kill(session_id: str):
-    """
-    Terminate a session.
-    """
-    print_output(f"Killing session {session_id}...", title="Kill Session")
-    # Placeholder
-    print("Signal sent.")

monoco/features/scheduler/config.py

@@ -1,32 +1,68 @@
+from typing import Dict, Optional
 import yaml
 from pathlib import Path
-from typing import Dict
 from .models import RoleTemplate, SchedulerConfig
 from .defaults import DEFAULT_ROLES
 
 
-def load_scheduler_config(project_root: Path) -> Dict[str, RoleTemplate]:
+class RoleLoader:
     """
-    Load scheduler configuration from .monoco/scheduler.yaml
-    Merges with default roles.
+    Tiered configuration loader for Agent Roles.
+    Level 1: Builtin Fallback
+    Level 2: Global (~/.monoco/roles.yaml)
+    Level 3: Project (./.monoco/roles.yaml)
     """
-    roles = {role.name: role for role in DEFAULT_ROLES}
 
-    config_path = project_root / ".monoco" / "scheduler.yaml"
-    if config_path.exists():
+    def __init__(self, project_root: Optional[Path] = None):
+        self.project_root = project_root
+        self.user_home = Path.home()
+        self.roles: Dict[str, RoleTemplate] = {}
+        self.sources: Dict[str, str] = {}  # role_name -> source description
+
+    def load_all(self) -> Dict[str, RoleTemplate]:
+        # Level 1: Defaults
+        for role in DEFAULT_ROLES:
+            self.roles[role.name] = role
+            self.sources[role.name] = "builtin"
+
+        # Level 2: Global
+        global_path = self.user_home / ".monoco" / "roles.yaml"
+        self._load_from_path(global_path, "global")
+
+        # Level 3: Project
+        if self.project_root:
+            project_path = self.project_root / ".monoco" / "roles.yaml"
+            self._load_from_path(project_path, "project")
+
+        return self.roles
+
+    def _load_from_path(self, path: Path, source_label: str):
+        if not path.exists():
+            return
+
         try:
-            with open(config_path, "r") as f:
+            with open(path, "r") as f:
                 data = yaml.safe_load(f) or {}
 
-            # Use Pydantic to validate the whole config if possible, or just the roles list
-            # Depending on file structure. Assuming the file has a 'roles' key.
             if "roles" in data:
-                # We can validate using SchedulerConfig
+                # Validate using SchedulerConfig
                 config = SchedulerConfig(roles=data["roles"])
                 for role in config.roles:
-                    roles[role.name] = role
+                    # Level 3 > Level 2 > Level 1 (名字相同的 Role 进行覆盖/Merge)
+                    # Currently we do total replacement for same-named roles
+                    self.roles[role.name] = role
+                    self.sources[role.name] = str(path)
         except Exception as e:
-            # For now, just log or print. Ideally use a logger.
-            print(f"Warning: Failed to load scheduler config: {e}")
+            # We don't want to crash the whole tool if a config is malformed,
+            # but we should probably warn.
+            import sys
+
+            print(f"Warning: Failed to load roles from {path}: {e}", file=sys.stderr)
+
 
-    return roles
+def load_scheduler_config(project_root: Path) -> Dict[str, RoleTemplate]:
+    """
+    Legacy compatibility wrapper for functional access.
+    """
+    loader = RoleLoader(project_root)
+    return loader.load_all()

monoco/features/scheduler/engines.py

@@ -0,0 +1,149 @@
+"""
+Agent Engine Adapters for Monoco Scheduler.
+
+This module provides a unified interface for different AI agent execution engines,
+allowing the Worker to seamlessly switch between Gemini, Claude, and future engines.
+"""
+
+from abc import ABC, abstractmethod
+from typing import List
+
+
+class EngineAdapter(ABC):
+    """
+    Abstract base class for agent engine adapters.
+
+    Each adapter is responsible for:
+    1. Constructing the correct CLI command for its engine
+    2. Handling engine-specific error scenarios
+    3. Providing metadata about the engine's capabilities
+    """
+
+    @abstractmethod
+    def build_command(self, prompt: str) -> List[str]:
+        """
+        Build the CLI command to execute the agent with the given prompt.
+
+        Args:
+            prompt: The instruction/context to send to the agent
+
+        Returns:
+            List of command arguments (e.g., ["gemini", "-y", "prompt text"])
+        """
+        pass
+
+    @property
+    @abstractmethod
+    def name(self) -> str:
+        """Return the canonical name of this engine."""
+        pass
+
+    @property
+    def supports_yolo_mode(self) -> bool:
+        """Whether this engine supports auto-approval mode."""
+        return False
+
+
+class GeminiAdapter(EngineAdapter):
+    """
+    Adapter for Google Gemini CLI.
+
+    Command format: gemini -y <prompt>
+    The -y flag enables "YOLO mode" (auto-approval of actions).
+    """
+
+    def build_command(self, prompt: str) -> List[str]:
+        return ["gemini", "-y", prompt]
+
+    @property
+    def name(self) -> str:
+        return "gemini"
+
+    @property
+    def supports_yolo_mode(self) -> bool:
+        return True
+
+
+class ClaudeAdapter(EngineAdapter):
+    """
+    Adapter for Anthropic Claude CLI.
+
+    Command format: claude -p <prompt>
+    The -p/--print flag enables non-interactive mode (print response and exit).
+    """
+
+    def build_command(self, prompt: str) -> List[str]:
+        return ["claude", "-p", prompt]
+
+    @property
+    def name(self) -> str:
+        return "claude"
+
+    @property
+    def supports_yolo_mode(self) -> bool:
+        # Claude uses -p for non-interactive mode, similar concept
+        return True
+
+
+class QwenAdapter(EngineAdapter):
+    """
+    Adapter for Qwen Code CLI.
+
+    Command format: qwen -y <prompt>
+    The -y flag enables "YOLO mode" (auto-approval of actions).
+    """
+
+    def build_command(self, prompt: str) -> List[str]:
+        return ["qwen", "-y", prompt]
+
+    @property
+    def name(self) -> str:
+        return "qwen"
+
+    @property
+    def supports_yolo_mode(self) -> bool:
+        return True
+
+
+class EngineFactory:
+    """
+    Factory for creating engine adapter instances.
+
+    Usage:
+        adapter = EngineFactory.create("gemini")
+        command = adapter.build_command("Write a test")
+    """
+
+    _adapters = {
+        "gemini": GeminiAdapter,
+        "claude": ClaudeAdapter,
+        "qwen": QwenAdapter,
+    }
+
+    @classmethod
+    def create(cls, engine_name: str) -> EngineAdapter:
+        """
+        Create an adapter instance for the specified engine.
+
+        Args:
+            engine_name: Name of the engine (e.g., "gemini", "claude")
+
+        Returns:
+            An instance of the appropriate EngineAdapter
+
+        Raises:
+            ValueError: If the engine is not supported
+        """
+        adapter_class = cls._adapters.get(engine_name.lower())
+        if not adapter_class:
+            supported = ", ".join(cls._adapters.keys())
+            raise ValueError(
+                f"Unsupported engine: '{engine_name}'. "
+                f"Supported engines: {supported}"
+            )
+        return adapter_class()
+
+    @classmethod
+    def supported_engines(cls) -> List[str]:
+        """Return a list of all supported engine names."""
+        return list(cls._adapters.keys())

monoco/features/scheduler/reliability.py

@@ -1,6 +1,8 @@
+from pathlib import Path
+from monoco.core.config import get_config
 from .manager import SessionManager
 from .session import RuntimeSession
-from .defaults import DEFAULT_ROLES
+from .config import load_scheduler_config
 
 
 class ApoptosisManager:
@@ -11,10 +13,15 @@ class ApoptosisManager:
 
     def __init__(self, session_manager: SessionManager):
         self.session_manager = session_manager
+
+        # Load roles dynamically based on current project context
+        settings = get_config()
+        project_root = Path(settings.paths.root).resolve()
+        roles = load_scheduler_config(project_root)
+
         # Find coroner role
-        self.coroner_role = next(
-            (r for r in DEFAULT_ROLES if r.name == "coroner"), None
-        )
+        self.coroner_role = roles.get("coroner")
+
         if not self.coroner_role:
             raise ValueError("Coroner role not defined!")
 

monoco/features/scheduler/worker.py

@@ -1,5 +1,6 @@
 from typing import Optional
 from .models import RoleTemplate
+from .engines import EngineFactory
 
 
 class Worker:
@@ -37,7 +38,8 @@ class Worker:
         import sys
 
         # Prepare the prompt
-        if self.role.name == "drafter" and context:
+        # We treat 'crafter' as a drafter when context is provided (Draft Mode)
+        if (self.role.name == "drafter" or self.role.name == "crafter") and context:
             issue_type = context.get("type", "feature")
             description = context.get("description", "No description")
             prompt = (
@@ -64,10 +66,9 @@ class Worker:
         print(f"[{self.role.name}] Goal: {self.role.goal}")
 
         try:
-            # Execute CLI agent with YOLO mode
-            engine_args = (
-                [engine, "-y", prompt] if engine == "gemini" else [engine, prompt]
-            )
+            # Use factory to get the appropriate engine adapter
+            adapter = EngineFactory.create(engine)
+            engine_args = adapter.build_command(prompt)
 
             self._process = subprocess.Popen(
                 engine_args, stdout=sys.stdout, stderr=sys.stderr, text=True
@@ -77,6 +78,9 @@ class Worker:
             # DO NOT WAIT HERE.
             # The scheduler/monitoring loop is responsible for checking status.
 
+        except ValueError as e:
+            # Engine not supported by factory
+            raise RuntimeError(f"Unsupported engine '{engine}'. {str(e)}")
         except FileNotFoundError:
             raise RuntimeError(
                 f"Agent engine '{engine}' not found. Please ensure it is installed and in PATH."

monoco/main.py

@@ -169,6 +169,7 @@ app.add_typer(workspace_cmd.app, name="workspace", help="Manage workspace")
 from monoco.features.scheduler import cli as scheduler_cmd
 
 app.add_typer(scheduler_cmd.app, name="agent", help="Manage agent sessions")
+app.add_typer(scheduler_cmd.role_app, name="role", help="Manage agent roles")
 
 
 from monoco.daemon.commands import serve