devcouncil 0.3.1 → 0.4.0

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

@@ -2,16 +2,20 @@ from rich.console import Console
 from rich.table import Table
 from rich.panel import Panel
 from pathlib import Path
-import json
+import logging
+
 import typer
+from devcouncil.utils.json_persist import dump_json
 from devcouncil.cli.commands.init import initialize_project
 from devcouncil.app.project_status import compute_phase
 from devcouncil.storage.db import get_db
 from devcouncil.storage.repositories import ArtifactGraphRepository, StateRepository
 from devcouncil.telemetry.cost import group_cost
 from devcouncil.live.summary import live_review_summary
+from devcouncil.telemetry.stages import log_stage, log_step
 
 console = Console()
+logger = logging.getLogger(__name__)
 
 def _status_payload(project_root: Path) -> dict:
     initialize_project(project_root, quiet=True)
@@ -62,71 +66,80 @@ def status(
     Show the current status of the DevCouncil project.
     """
     root = project_root.expanduser().resolve()
-    payload = _status_payload(root)
-
-    def _maybe_fail() -> None:
-        if fail_on_blocking and payload.get("blocking_gaps"):
-            raise typer.Exit(code=1)
+    from devcouncil.telemetry.logging_setup import set_log_dir
+    set_log_dir(root)
+    logger.info("dev status: json=%s fail_on_blocking=%s", json_format, fail_on_blocking)
+
+    with log_stage("status", project_root=root):
+        log_step("status/1: loading project state", project_root=root, trace=True)
+        payload = _status_payload(root)
+
+        def _maybe_fail() -> None:
+            if fail_on_blocking and payload.get("blocking_gaps"):
+                raise typer.Exit(code=1)
+
+        if json_format:
+            typer.echo(dump_json(payload, indent=2))
+            _maybe_fail()
+            log_step("status/complete", project_root=root, trace=True)
+            return
+
+        if not payload["initialized"]:
+            console.print("[yellow]DevCouncil state is not available in this directory.[/yellow]")
+            log_step("status/complete", project_root=root, trace=True)
+            return
+
+        summary = payload["coverage_summary"]
+        phase = payload["phase"]
+        phase_colors = {
+            "NEW": "yellow",
+            "REQUIREMENTS_DRAFTED": "cyan",
+            "PLAN_APPROVED": "green",
+            "TASK_EXECUTING": "blue",
+            "TASK_BLOCKED": "red",
+            "PROJECT_DONE": "green bold",
+        }
+        phase_color = phase_colors.get(phase, "white")
+
+        console.print(Panel(
+            f"[bold]Phase:[/bold] [{phase_color}]{phase}[/{phase_color}]\n"
+            f"[bold]Requirements:[/bold] {summary['total_requirements']} ({summary['requirements_without_tasks']} unmapped)\n"
+            f"[bold]Tasks:[/bold] {summary['total_tasks']} ({summary['tasks_without_requirements']} orphaned)\n"
+            f"[bold]Acceptance Criteria:[/bold] {summary['total_ac']} ({summary['ac_without_evidence']} unverified)\n"
+            f"[bold]Gaps:[/bold] {summary['total_gaps']} ({summary['blocking_gaps']} blocking)\n"
+            f"[bold]Live Review:[/bold] {payload['live_review']['cards']['critical_open']} open critical, "
+            f"{len(payload['live_review']['blocking_cards'])} blocking in scope, "
+            f"{payload['live_review']['pending_signals']} pending signal(s)\n"
+            f"[bold]Total Cost:[/bold] ${payload['total_cost']:.4f}",
+            title="DevCouncil Status",
+            expand=False,
+        ))
+
+        if payload["task_status_counts"]:
+            table = Table(title="Task Summary")
+            table.add_column("Status", style="magenta")
+            table.add_column("Count", justify="right")
+            for state, count in sorted(payload["task_status_counts"].items()):
+                table.add_row(state, str(count))
+            console.print(table)
+
+        cost_groups = payload.get("cost_by_task") or {}
+        if cost_groups:
+            cost_table = Table(title="Cost by Task")
+            cost_table.add_column("Task", style="cyan")
+            cost_table.add_column("Cost ($)", justify="right")
+            cost_table.add_column("Calls", justify="right")
+            for name, stats in sorted(cost_groups.items(), key=lambda kv: kv[1]["cost"], reverse=True):
+                cost_table.add_row(name, f"{stats['cost']:.4f}", str(stats["calls"]))
+            console.print(cost_table)
+
+        blocking_gaps = payload["blocking_gaps"]
+        if blocking_gaps:
+            console.print(f"\n[red bold]WARNING: {len(blocking_gaps)} blocking gap(s) must be resolved:[/red bold]")
+            for gap in blocking_gaps[:5]:
+                console.print(f"  - [red]{gap['id']}[/red]: {gap['description'][:80]}")
+            if len(blocking_gaps) > 5:
+                console.print(f"  ... and {len(blocking_gaps) - 5} more. Run [bold]dev report[/bold] for details.")
 
-    if json_format:
-        typer.echo(json.dumps(payload, indent=2))
         _maybe_fail()
-        return
-
-    if not payload["initialized"]:
-        console.print("[yellow]DevCouncil state is not available in this directory.[/yellow]")
-        return
-
-    summary = payload["coverage_summary"]
-    phase = payload["phase"]
-    phase_colors = {
-        "NEW": "yellow",
-        "REQUIREMENTS_DRAFTED": "cyan",
-        "PLAN_APPROVED": "green",
-        "TASK_EXECUTING": "blue",
-        "TASK_BLOCKED": "red",
-        "PROJECT_DONE": "green bold",
-    }
-    phase_color = phase_colors.get(phase, "white")
-
-    console.print(Panel(
-        f"[bold]Phase:[/bold] [{phase_color}]{phase}[/{phase_color}]\n"
-        f"[bold]Requirements:[/bold] {summary['total_requirements']} ({summary['requirements_without_tasks']} unmapped)\n"
-        f"[bold]Tasks:[/bold] {summary['total_tasks']} ({summary['tasks_without_requirements']} orphaned)\n"
-        f"[bold]Acceptance Criteria:[/bold] {summary['total_ac']} ({summary['ac_without_evidence']} unverified)\n"
-        f"[bold]Gaps:[/bold] {summary['total_gaps']} ({summary['blocking_gaps']} blocking)\n"
-        f"[bold]Live Review:[/bold] {payload['live_review']['cards']['critical_open']} open critical, "
-        f"{len(payload['live_review']['blocking_cards'])} blocking in scope, "
-        f"{payload['live_review']['pending_signals']} pending signal(s)\n"
-        f"[bold]Total Cost:[/bold] ${payload['total_cost']:.4f}",
-        title="DevCouncil Status",
-        expand=False,
-    ))
-
-    if payload["task_status_counts"]:
-        table = Table(title="Task Summary")
-        table.add_column("Status", style="magenta")
-        table.add_column("Count", justify="right")
-        for state, count in sorted(payload["task_status_counts"].items()):
-            table.add_row(state, str(count))
-        console.print(table)
-
-    cost_groups = payload.get("cost_by_task") or {}
-    if cost_groups:
-        cost_table = Table(title="Cost by Task")
-        cost_table.add_column("Task", style="cyan")
-        cost_table.add_column("Cost ($)", justify="right")
-        cost_table.add_column("Calls", justify="right")
-        for name, stats in sorted(cost_groups.items(), key=lambda kv: kv[1]["cost"], reverse=True):
-            cost_table.add_row(name, f"{stats['cost']:.4f}", str(stats["calls"]))
-        console.print(cost_table)
-
-    blocking_gaps = payload["blocking_gaps"]
-    if blocking_gaps:
-        console.print(f"\n[red bold]WARNING: {len(blocking_gaps)} blocking gap(s) must be resolved:[/red bold]")
-        for gap in blocking_gaps[:5]:
-            console.print(f"  - [red]{gap['id']}[/red]: {gap['description'][:80]}")
-        if len(blocking_gaps) > 5:
-            console.print(f"  ... and {len(blocking_gaps) - 5} more. Run [bold]dev report[/bold] for details.")
-
-    _maybe_fail()
+        log_step("status/complete", project_root=root, phase=phase, trace=True)

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

@@ -0,0 +1,295 @@
+"""CLI service layer for MCP-equivalent task gate operations."""
+
+from __future__ import annotations
+
+import logging
+from pathlib import Path
+
+import typer
+
+from devcouncil.execution.task_gate_ops import (
+    attach_committed_range_payload,
+    append_evidence_payload,
+    get_evidence_payload,
+    handoff_agent_payload,
+    next_task_payload,
+    policy_check_write_payload,
+    record_command_payload,
+    run_command_payload,
+    update_task_scope_payload,
+    verify_task_payload,
+)
+from devcouncil.telemetry.logging_setup import set_log_dir
+from devcouncil.telemetry.stages import log_stage, log_step
+from devcouncil.utils.json_persist import dump_json
+
+logger = logging.getLogger(__name__)
+
+scope_app = typer.Typer(help="Update task scope for a leased task.")
+
+
+def next_task(
+    status: str | None = typer.Option(None, "--status", help="Filter by task status."),
+    client_id: str | None = typer.Option(None, "--client-id", help="Client id for fleet routing."),
+    json_format: bool = typer.Option(False, "--json", help="Output machine-readable JSON."),
+    project_root: Path = typer.Option(Path("."), "--project-root"),
+) -> None:
+    """Select the next unblocked, unleased task."""
+    root = project_root.expanduser().resolve()
+    set_log_dir(root)
+    payload = next_task_payload(root, status_filter=status, client_id=client_id)
+    if json_format:
+        typer.echo(dump_json(payload, indent=2))
+        if not payload.get("ok"):
+            raise typer.Exit(code=1)
+        return
+    task = payload.get("task")
+    if not task:
+        typer.echo(payload.get("reason", "No task available."))
+        return
+    typer.echo(f"{task['id']}  status={task.get('status')}")
+
+
+@scope_app.command("update")
+def scope_update(
+    task_id: str = typer.Argument(...),
+    lease_token: str = typer.Option(..., "--lease-token"),
+    expected_test: list[str] = typer.Option([], "--expected-test", help="Repeatable expected test command."),
+    allowed_command: list[str] = typer.Option([], "--allowed-command", help="Repeatable allowed command."),
+    planned_file: list[str] = typer.Option(
+        [],
+        "--planned-file",
+        help="Repeatable path to append as modify-op planned file (lease-gated).",
+    ),
+    planned_file_create: list[str] = typer.Option(
+        [],
+        "--planned-file-create",
+        help="Repeatable path to append as create-op planned file (lease-gated).",
+    ),
+    json_format: bool = typer.Option(False, "--json"),
+    project_root: Path = typer.Option(Path("."), "--project-root"),
+) -> None:
+    """Append expected tests, allowed commands, or planned files to a leased task's scope."""
+    root = project_root.expanduser().resolve()
+    set_log_dir(root)
+    payload = update_task_scope_payload(
+        root,
+        task_id=task_id,
+        lease_token=lease_token,
+        expected_tests=expected_test,
+        allowed_commands=allowed_command,
+        planned_files=planned_file,
+        create_planned_files=planned_file_create,
+    )
+    if json_format:
+        typer.echo(dump_json(payload, indent=2))
+        if not payload.get("ok"):
+            raise typer.Exit(code=1)
+        return
+    if not payload.get("ok"):
+        typer.echo(payload.get("error", "scope update failed"))
+        raise typer.Exit(code=1)
+    typer.echo(f"Updated scope for {task_id}")
+
+
+def policy_check(
+    path: str = typer.Argument(..., help="Relative path to evaluate."),
+    task_id: str | None = typer.Option(None, "--task-id"),
+    json_format: bool = typer.Option(False, "--json"),
+    project_root: Path = typer.Option(Path("."), "--project-root"),
+) -> None:
+    """Evaluate whether a file write would be allowed by policy."""
+    root = project_root.expanduser().resolve()
+    set_log_dir(root)
+    payload = policy_check_write_payload(root, path=path, task_id=task_id)
+    if json_format:
+        typer.echo(dump_json(payload, indent=2))
+        return
+    typer.echo(f"{payload.get('action')}: {payload.get('reason')}")
+
+
+def record_command(
+    task_id: str = typer.Argument(...),
+    lease_token: str = typer.Option(..., "--lease-token"),
+    command: str = typer.Option(..., "--command"),
+    status: str = typer.Option(..., "--status"),
+    exit_code: int | None = typer.Option(None, "--exit-code"),
+    reason: str = typer.Option("", "--reason"),
+    json_format: bool = typer.Option(False, "--json"),
+    project_root: Path = typer.Option(Path("."), "--project-root"),
+) -> None:
+    """Record a shell command lifecycle event for a leased task."""
+    root = project_root.expanduser().resolve()
+    set_log_dir(root)
+    payload = record_command_payload(
+        root,
+        task_id=task_id,
+        lease_token=lease_token,
+        command=command,
+        status=status,
+        exit_code=exit_code,
+        reason=reason,
+    )
+    if json_format:
+        typer.echo(dump_json(payload, indent=2))
+        if not payload.get("ok"):
+            raise typer.Exit(code=1)
+        return
+    if not payload.get("ok"):
+        typer.echo(payload.get("error", "record failed"))
+        raise typer.Exit(code=1)
+    typer.echo(f"Recorded {status} for {task_id}")
+
+
+def run_cmd(
+    task_id: str = typer.Argument(...),
+    lease_token: str = typer.Option(..., "--lease-token"),
+    command: str = typer.Option(..., "--command"),
+    json_format: bool = typer.Option(False, "--json"),
+    project_root: Path = typer.Option(Path("."), "--project-root"),
+) -> None:
+    """Run an allowlisted command for a leased task through the policy gate."""
+    root = project_root.expanduser().resolve()
+    set_log_dir(root)
+    with log_stage("run-cmd", project_root=root, task_id=task_id):
+        payload = run_command_payload(root, task_id=task_id, lease_token=lease_token, command=command)
+        if json_format:
+            typer.echo(dump_json(payload, indent=2))
+            log_step("run-cmd/complete", project_root=root, task_id=task_id, trace=True)
+            if not payload.get("ok") and payload.get("code") != "command_not_allowed":
+                raise typer.Exit(code=1)
+            return
+        if not payload.get("ok"):
+            typer.echo(payload.get("error", "run failed"))
+            raise typer.Exit(code=1)
+        typer.echo(f"exit {payload.get('exit_code')}")
+        log_step("run-cmd/complete", project_root=root, task_id=task_id, trace=True)
+
+
+def attach_committed_range(
+    task_id: str = typer.Argument(...),
+    lease_token: str = typer.Option(..., "--lease-token"),
+    base: str = typer.Option(..., "--base"),
+    head: str = typer.Option("HEAD", "--head"),
+    json_format: bool = typer.Option(False, "--json"),
+    project_root: Path = typer.Option(Path("."), "--project-root"),
+) -> None:
+    """Associate post-commit verification with an existing commit range."""
+    root = project_root.expanduser().resolve()
+    set_log_dir(root)
+    payload = attach_committed_range_payload(
+        root,
+        task_id=task_id,
+        lease_token=lease_token,
+        base=base,
+        head=head,
+    )
+    if json_format:
+        typer.echo(dump_json(payload, indent=2))
+        if not payload.get("ok"):
+            raise typer.Exit(code=1)
+        return
+    if not payload.get("ok"):
+        typer.echo(payload.get("error", "committed range attachment failed"))
+        raise typer.Exit(code=1)
+    typer.echo(f"Attached {payload['range']} to {task_id}")
+
+
+def verify_leased(
+    task_id: str = typer.Argument(...),
+    lease_token: str = typer.Option(..., "--lease-token"),
+    sandbox: str = typer.Option("local", "--sandbox"),
+    json_format: bool = typer.Option(True, "--json/--no-json", help="MCP-compatible JSON output (default on)."),
+    project_root: Path = typer.Option(Path("."), "--project-root"),
+) -> None:
+    """Verify a leased task (MCP-compatible output)."""
+    root = project_root.expanduser().resolve()
+    set_log_dir(root)
+    with log_stage("verify-leased", project_root=root, task_id=task_id, sandbox=sandbox):
+        payload = verify_task_payload(root, task_id=task_id, lease_token=lease_token, sandbox=sandbox)
+        typer.echo(dump_json(payload, indent=2))
+        log_step("verify-leased/complete", project_root=root, task_id=task_id, trace=True)
+        if not payload.get("ok"):
+            raise typer.Exit(code=1)
+
+
+def evidence_append(
+    task_id: str = typer.Argument(...),
+    lease_token: str = typer.Option(..., "--lease-token"),
+    command: str = typer.Option(..., "--command"),
+    summary: str = typer.Option(..., "--summary"),
+    exit_code: int = typer.Option(0, "--exit-code"),
+    json_format: bool = typer.Option(False, "--json"),
+    project_root: Path = typer.Option(Path("."), "--project-root"),
+) -> None:
+    """Append command evidence for a leased task."""
+    root = project_root.expanduser().resolve()
+    set_log_dir(root)
+    payload = append_evidence_payload(
+        root,
+        task_id=task_id,
+        lease_token=lease_token,
+        command=command,
+        summary=summary,
+        exit_code=exit_code,
+    )
+    if json_format:
+        typer.echo(dump_json(payload, indent=2))
+        if not payload.get("ok"):
+            raise typer.Exit(code=1)
+        return
+    if not payload.get("ok"):
+        typer.echo(payload.get("error", "append failed"))
+        raise typer.Exit(code=1)
+    typer.echo(f"Recorded evidence for {task_id}")
+
+
+def evidence_list(
+    task_id: str = typer.Argument(...),
+    command: str | None = typer.Option(None, "--command"),
+    limit: int = typer.Option(20, "--limit", min=1, max=100),
+    json_format: bool = typer.Option(False, "--json"),
+    project_root: Path = typer.Option(Path("."), "--project-root"),
+) -> None:
+    """List stored command evidence for a task."""
+    root = project_root.expanduser().resolve()
+    set_log_dir(root)
+    payload = get_evidence_payload(root, task_id=task_id, command_filter=command, limit=limit)
+    if json_format:
+        typer.echo(dump_json(payload, indent=2))
+        if not payload.get("ok"):
+            raise typer.Exit(code=1)
+        return
+    for row in payload.get("evidence") or []:
+        typer.echo(f"{row.get('exit_code')}  {row.get('command')}")
+
+
+def handoff_leased(
+    task_id: str = typer.Argument(...),
+    lease_token: str = typer.Option(..., "--lease-token"),
+    from_agent: str = typer.Option(..., "--from"),
+    to_agent: str = typer.Option(..., "--to"),
+    instruction: str = typer.Option("", "--instruction"),
+    json_format: bool = typer.Option(False, "--json"),
+    project_root: Path = typer.Option(Path("."), "--project-root"),
+) -> None:
+    """Hand off a leased task between coding CLI agents."""
+    root = project_root.expanduser().resolve()
+    set_log_dir(root)
+    payload = handoff_agent_payload(
+        root,
+        task_id=task_id,
+        lease_token=lease_token,
+        from_agent=from_agent,
+        to_agent=to_agent,
+        instruction=instruction,
+    )
+    if json_format:
+        typer.echo(dump_json(payload, indent=2))
+        if not payload.get("ok"):
+            raise typer.Exit(code=1)
+        return
+    if not payload.get("ok"):
+        typer.echo(payload.get("error", "handoff failed"))
+        raise typer.Exit(code=1)
+    typer.echo(f"Handoff manifest: {payload.get('manifest_path')}")