devcouncil 0.1.0 → 0.1.1

package/src/devcouncil/cli/commands/tasks.py

@@ -1,41 +1,55 @@
-import typer
-from rich.console import Console
-from rich.table import Table
-from devcouncil.storage.db import get_db
-from devcouncil.storage.repositories import TaskRepository
-
-app = typer.Typer()
-console = Console()
-
-@app.callback(invoke_without_command=True)
-def tasks(ctx: typer.Context):
-    """
-    List task graph and task gate status.
-    """
-    if ctx.invoked_subcommand is not None:
-        return
-
-    db = get_db()
-    if not db:
-        console.print("[red]DevCouncil not initialized. Run 'dev init' first.[/red]")
-        raise typer.Exit(code=1)
-
-    with db.get_session() as session:
-        task_repo = TaskRepository(session)
-        tasks_list = task_repo.get_all()
-        
-        if not tasks_list:
-            console.print("No tasks found. Run 'dev plan' to generate tasks.")
-            return
-
-        table = Table(title="DevCouncil Tasks")
-        table.add_column("Task ID", style="cyan", no_wrap=True)
-        table.add_column("Title", style="white")
-        table.add_column("Status", style="magenta")
-        table.add_column("Linked Reqs", style="green")
-
-        for t in tasks_list:
-            reqs = ", ".join(t.requirement_ids)
-            table.add_row(t.id, t.title, t.status, reqs)
-
-        console.print(table)
+import json
+from pathlib import Path
+
+import typer
+from rich.console import Console
+from rich.table import Table
+from devcouncil.cli.commands.init import initialize_project
+from devcouncil.storage.db import get_db
+from devcouncil.storage.repositories import TaskRepository
+
+app = typer.Typer()
+console = Console()
+
+@app.callback(invoke_without_command=True)
+def tasks(
+    ctx: typer.Context,
+    json_format: bool = typer.Option(False, "--json", help="Output machine-readable JSON."),
+    project_root: Path = typer.Option(Path("."), "--project-root", help="Repository root containing .devcouncil/."),
+):
+    """
+    List task graph and task gate status.
+    """
+    if ctx.invoked_subcommand is not None:
+        return
+
+    root = project_root.expanduser().resolve()
+    initialize_project(root, quiet=True)
+    db = get_db(root)
+    if not db:
+        console.print("[red]DevCouncil state is unavailable in this directory.[/red]")
+        raise typer.Exit(code=1)
+
+    with db.get_session() as session:
+        task_repo = TaskRepository(session)
+        tasks_list = task_repo.get_all()
+
+        if json_format:
+            typer.echo(json.dumps({"tasks": [task.model_dump() for task in tasks_list]}, indent=2))
+            return
+        
+        if not tasks_list:
+            console.print("No tasks found. Run 'dev plan' to generate tasks.")
+            return
+
+        table = Table(title="DevCouncil Tasks")
+        table.add_column("Task ID", style="cyan", no_wrap=True)
+        table.add_column("Title", style="white")
+        table.add_column("Status", style="magenta")
+        table.add_column("Linked Reqs", style="green")
+
+        for t in tasks_list:
+            reqs = ", ".join(t.requirement_ids)
+            table.add_row(t.id, t.title, t.status, reqs)
+
+        console.print(table)

package/src/devcouncil/cli/commands/trace.py

@@ -16,9 +16,10 @@ def tail(
     follow: bool = typer.Option(False, "--follow", "-f", help="Continue polling for new events."),
     limit: int = typer.Option(50, "--limit", "-n", help="Maximum events to print before following."),
     jsonl: bool = typer.Option(True, "--jsonl/--pretty", help="Print JSONL or compact text rows."),
+    project_root: Path = typer.Option(Path("."), "--project-root", help="Repository root containing .devcouncil/."),
 ):
     """Print the DevCouncil trace JSONL stream for replay or debugging."""
-    project_root = Path(".")
+    project_root = project_root.expanduser().resolve()
     printed = 0
 
     def emit_new(start_index: int) -> int:

package/src/devcouncil/cli/commands/verify.py

@@ -1,105 +1,120 @@
-import typer
-import asyncio
-from rich.console import Console
-from rich.table import Table
-from pathlib import Path
-from typing import Optional
-from devcouncil.storage.db import get_db
-from devcouncil.storage.repositories import TaskRepository, RequirementRepository, GapRepository, EvidenceRepository, StateRepository
-from devcouncil.verification.verifier import Verifier
-from devcouncil.llm.provider import OpenRouterProvider
-from devcouncil.llm.router import ModelRouter
-from devcouncil.domain.evidence import CommandResult, DiffEvidence, TestEvidence
+import typer
+import asyncio
+import json
+from rich.console import Console
+from rich.table import Table
+from pathlib import Path
+from typing import Optional
+from devcouncil.cli.commands.init import initialize_project
+from devcouncil.storage.db import get_db
+from devcouncil.storage.repositories import TaskRepository, RequirementRepository, GapRepository, EvidenceRepository, StateRepository
+from devcouncil.verification.verifier import Verifier
+from devcouncil.llm.provider import create_provider, validate_model_provider
+from devcouncil.llm.router import ModelRouter
+from devcouncil.domain.evidence import CommandResult, DiffEvidence, TestEvidence
 from devcouncil.app.config import load_config, get_api_key
 from devcouncil.app.state_machine import ProjectPhase
 from devcouncil.integrations.code_review_graph import CodeReviewGraphAdapter
 from devcouncil.telemetry.traces import TraceLogger
-
-console = Console()
-MAX_RENDERED_GAPS = 20
-
-def verify(
-    task_id: Optional[str] = typer.Argument(None, help="Optional ID of the task to verify"),
-):
-    """
-    Verify one task, or all tasks when TASK_ID is omitted.
-    """
-    db = get_db()
-    if not db:
-        console.print("[red]DevCouncil not initialized. Run 'dev init' first.[/red]")
-        return
-
-    with db.get_session() as session:
-        task_repo = TaskRepository(session)
-        req_repo = RequirementRepository(session)
-        gap_repo = GapRepository(session)
-        evidence_repo = EvidenceRepository(session)
-        
-        tasks = [task_repo.get_by_id(task_id)] if task_id else task_repo.get_all()
-        tasks = [task for task in tasks if task is not None]
-        if not tasks:
-            missing = f"Task {task_id} not found." if task_id else "No tasks found to verify."
-            console.print(f"[red]{missing}[/red]")
-            return
-
-        reqs = req_repo.get_all()
-        
-        # Load router for LLM review if possible
-        router = None
-        try:
-            config = load_config(Path("."))
-            api_key = get_api_key(config.models.provider)
-            provider = OpenRouterProvider(api_key)
-            role_config = {name: role.model_dump() for name, role in config.models.roles.items()}
-            router = ModelRouter(provider, role_config)
-        except Exception:
-            pass
-
-        verifier = Verifier(Path("."), router=router)
-        total_gaps = 0
-        blocked_tasks = 0
-
+
+console = Console()
+MAX_RENDERED_GAPS = 20
+
+def verify(
+    task_id: Optional[str] = typer.Argument(None, help="Optional ID of the task to verify"),
+    json_format: bool = typer.Option(False, "--json", help="Output machine-readable JSON."),
+    project_root: Path = typer.Option(Path("."), "--project-root", help="Repository root containing .devcouncil/."),
+):
+    """
+    Verify one task, or all tasks when TASK_ID is omitted.
+    """
+    root = project_root.expanduser().resolve()
+    initialize_project(root, quiet=True)
+    db = get_db(root)
+    if not db:
+        if json_format:
+            typer.echo(json.dumps({"ok": False, "error": "DevCouncil state is unavailable in this directory."}, indent=2))
+        else:
+            console.print("[red]DevCouncil state is unavailable in this directory.[/red]")
+        return
+
+    with db.get_session() as session:
+        task_repo = TaskRepository(session)
+        req_repo = RequirementRepository(session)
+        gap_repo = GapRepository(session)
+        evidence_repo = EvidenceRepository(session)
+        
+        tasks = [task_repo.get_by_id(task_id)] if task_id else task_repo.get_all()
+        tasks = [task for task in tasks if task is not None]
+        if not tasks:
+            missing = f"Task {task_id} not found." if task_id else "No tasks found to verify."
+            if json_format:
+                typer.echo(json.dumps({"ok": False, "error": missing}, indent=2))
+            else:
+                console.print(f"[red]{missing}[/red]")
+            return
+
+        reqs = req_repo.get_all()
+        
+        # Load router for LLM review if possible
+        router = None
+        try:
+            config = load_config(root)
+            validate_model_provider(config.models.provider)
+            api_key = get_api_key(config.models.provider, root)
+            provider = create_provider(config.models.provider, api_key)
+            role_config = {name: role.model_dump() for name, role in config.models.roles.items()}
+            router = ModelRouter(provider, role_config)
+        except Exception:
+            pass
+
+        verifier = Verifier(root, router=router)
+        total_gaps = 0
+        blocked_tasks = 0
+        task_results = []
+
         for task in tasks:
-            TraceLogger(Path(".")).log_event(
+            TraceLogger(root).log_event(
                 "task_verification_started",
                 {"task_id": task.id},
                 task_id=task.id,
                 summary=f"Verifying {task.id}",
             )
-            graph_context = CodeReviewGraphAdapter(Path(".")).get_context(
+            graph_context = CodeReviewGraphAdapter(root).get_context(
                 [planned.path for planned in task.planned_files]
             )
             if graph_context.available:
-                TraceLogger(Path(".")).log_event(
+                TraceLogger(root).log_event(
                     "graph_context_loaded",
                     graph_context.model_dump(),
                     task_id=task.id,
                     summary=f"Loaded graph context for {task.id}",
                 )
             StateRepository(session).record_phase(ProjectPhase.TASK_VERIFYING.value)
-            gap_repo.delete_for_task(task.id)
-            evidence_repo.delete_for_task(task.id)
-
-            gaps, evidence = asyncio.run(verifier.verify_task(task, reqs))
-            total_gaps += len(gaps)
-
-            for gap in gaps:
-                gap_repo.save(gap)
-
-            for ev in evidence:
-                if isinstance(ev, CommandResult):
-                    evidence_repo.save_command_result(task.id, ev)
-                elif isinstance(ev, DiffEvidence):
-                    evidence_repo.save_diff_evidence(ev)
-                elif isinstance(ev, TestEvidence):
-                    evidence_repo.save_test_evidence(ev, task.id)
-
-            _print_task_result(task.id, gaps)
-
+            gap_repo.delete_for_task(task.id)
+            evidence_repo.delete_for_task(task.id)
+
+            gaps, evidence = asyncio.run(verifier.verify_task(task, reqs))
+            total_gaps += len(gaps)
+
+            for gap in gaps:
+                gap_repo.save(gap)
+
+            for ev in evidence:
+                if isinstance(ev, CommandResult):
+                    evidence_repo.save_command_result(task.id, ev)
+                elif isinstance(ev, DiffEvidence):
+                    evidence_repo.save_diff_evidence(ev)
+                elif isinstance(ev, TestEvidence):
+                    evidence_repo.save_test_evidence(ev, task.id)
+
+            if not json_format:
+                _print_task_result(task.id, gaps)
+
             if any(gap.blocking for gap in gaps):
                 task.status = "blocked"
                 blocked_tasks += 1
-                TraceLogger(Path(".")).log_event(
+                TraceLogger(root).log_event(
                     "gate_failed",
                     {"task_id": task.id, "gap_count": len(gaps)},
                     task_id=task.id,
@@ -107,57 +122,72 @@ def verify(
                 )
             else:
                 task.status = "verified"
-                TraceLogger(Path(".")).log_event(
+                TraceLogger(root).log_event(
                     "task_verified",
                     {"task_id": task.id, "gap_count": len(gaps)},
                     task_id=task.id,
                     summary=f"{task.id} verified",
                 )
             task_repo.save(task)
-
-        StateRepository(session).record_phase(
-            ProjectPhase.TASK_BLOCKED.value if blocked_tasks else ProjectPhase.TASK_VERIFIED.value
-        )
-
-        if len(tasks) > 1:
-            if blocked_tasks:
-                console.print(
-                    f"\n[yellow]Verified {len(tasks)} tasks: {blocked_tasks} blocked, "
-                    f"{total_gaps} total gap(s).[/yellow]"
-                )
-            else:
-                console.print(f"\n[green]Verified {len(tasks)} tasks successfully.[/green]")
-
-
-def _print_task_result(task_id: str, gaps):
-    if not gaps:
-        console.print(f"[green]Task {task_id} verified successfully! No gaps found.[/green]")
-        return
-
-    console.print(f"[yellow]Verification finished for task {task_id} with {len(gaps)} gaps:[/yellow]")
-
-    table = Table(title="Detected Gaps")
-    table.add_column("ID", style="cyan")
-    table.add_column("Severity", style="magenta")
-    table.add_column("Description", style="white")
-    table.add_column("Blocking", style="red")
-
-    for gap in gaps[:MAX_RENDERED_GAPS]:
-        table.add_row(
-            gap.id,
-            gap.severity,
-            gap.description,
-            "YES" if gap.blocking else "NO",
-        )
-
-    console.print(table)
-    if len(gaps) > MAX_RENDERED_GAPS:
-        console.print(
-            f"[yellow]Showing first {MAX_RENDERED_GAPS} of {len(gaps)} gaps. "
-            "Run [bold]dev report --json[/bold] for the full list.[/yellow]"
-        )
-
-    if any(gap.blocking for gap in gaps):
-        console.print(f"\n[red]Task {task_id} is BLOCKED due to critical gaps.[/red]")
-    else:
-        console.print(f"\n[green]Task {task_id} passed with non-blocking gaps.[/green]")
+            task_results.append({
+                "task_id": task.id,
+                "status": task.status,
+                "gap_count": len(gaps),
+                "blocking_gap_count": len([gap for gap in gaps if gap.blocking]),
+                "gaps": [gap.model_dump() for gap in gaps],
+            })
+
+        StateRepository(session).record_phase(
+            ProjectPhase.TASK_BLOCKED.value if blocked_tasks else ProjectPhase.TASK_VERIFIED.value
+        )
+
+        if json_format:
+            typer.echo(json.dumps({
+                "ok": blocked_tasks == 0,
+                "verified_tasks": len(tasks),
+                "blocked_tasks": blocked_tasks,
+                "total_gaps": total_gaps,
+                "tasks": task_results,
+            }, indent=2))
+        elif len(tasks) > 1:
+            if blocked_tasks:
+                console.print(
+                    f"\n[yellow]Verified {len(tasks)} tasks: {blocked_tasks} blocked, "
+                    f"{total_gaps} total gap(s).[/yellow]"
+                )
+            else:
+                console.print(f"\n[green]Verified {len(tasks)} tasks successfully.[/green]")
+
+
+def _print_task_result(task_id: str, gaps):
+    if not gaps:
+        console.print(f"[green]Task {task_id} verified successfully! No gaps found.[/green]")
+        return
+
+    console.print(f"[yellow]Verification finished for task {task_id} with {len(gaps)} gaps:[/yellow]")
+
+    table = Table(title="Detected Gaps")
+    table.add_column("ID", style="cyan")
+    table.add_column("Severity", style="magenta")
+    table.add_column("Description", style="white")
+    table.add_column("Blocking", style="red")
+
+    for gap in gaps[:MAX_RENDERED_GAPS]:
+        table.add_row(
+            gap.id,
+            gap.severity,
+            gap.description,
+            "YES" if gap.blocking else "NO",
+        )
+
+    console.print(table)
+    if len(gaps) > MAX_RENDERED_GAPS:
+        console.print(
+            f"[yellow]Showing first {MAX_RENDERED_GAPS} of {len(gaps)} gaps. "
+            "Run [bold]dev report --json[/bold] for the full list.[/yellow]"
+        )
+
+    if any(gap.blocking for gap in gaps):
+        console.print(f"\n[red]Task {task_id} is BLOCKED due to critical gaps.[/red]")
+    else:
+        console.print(f"\n[green]Task {task_id} passed with non-blocking gaps.[/green]")

package/src/devcouncil/cli/commands/version.py

@@ -1,20 +1,20 @@
-import typer
-from rich.console import Console
-import importlib.metadata
-
-app = typer.Typer()
-console = Console()
-
-@app.callback(invoke_without_command=True)
-def version(ctx: typer.Context):
-    """
-    Display the current version of DevCouncil.
-    """
-    if ctx.invoked_subcommand is not None:
-        return
-        
-    try:
-        ver = importlib.metadata.version("devcouncil")
-        console.print(f"DevCouncil version: [bold cyan]{ver}[/bold cyan]")
-    except importlib.metadata.PackageNotFoundError:
-        console.print("DevCouncil version: [yellow]unknown (editable/uninstalled)[/yellow]")
+import typer
+from rich.console import Console
+import importlib.metadata
+
+app = typer.Typer()
+console = Console()
+
+@app.callback(invoke_without_command=True)
+def version(ctx: typer.Context):
+    """
+    Display the current version of DevCouncil.
+    """
+    if ctx.invoked_subcommand is not None:
+        return
+        
+    try:
+        ver = importlib.metadata.version("devcouncil")
+        console.print(f"DevCouncil version: [bold cyan]{ver}[/bold cyan]")
+    except importlib.metadata.PackageNotFoundError:
+        console.print("DevCouncil version: [yellow]unknown (editable/uninstalled)[/yellow]")