devcouncil 0.3.1 → 0.4.1

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

@@ -1,5 +1,7 @@
-import json
+from devcouncil.utils.json_persist import dump_json
+import logging
 from pathlib import Path
+from typing import Literal, cast, Any
 
 import typer
 from rich.console import Console
@@ -7,14 +9,45 @@ 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
+from devcouncil.storage.native import TaskLeaseRepository
+from devcouncil.telemetry.stages import log_stage, log_step
+from devcouncil.telemetry.traces import TraceLogger
 
 app = typer.Typer()
 console = Console()
+logger = logging.getLogger(__name__)
+
+
+def _lease_public_view(lease, *, expired: bool) -> dict[str, Any]:
+    return {
+        "owner": lease.owner,
+        "agent": lease.agent,
+        "expires_at": lease.expires_at,
+        "expired": expired,
+    }
+
+
+def _active_leases_by_task(session) -> dict[str, tuple[Any, bool]]:
+    return {
+        lease.task_id: (lease, expired)
+        for lease, expired in TaskLeaseRepository(session).list_leases(active_only=True)
+    }
+
+
+def _task_row_payload(task, leases_by_task: dict[str, tuple[Any, bool]]) -> Any:
+    payload = task.model_dump()
+    lease_pair = leases_by_task.get(task.id)
+    payload["lease"] = _lease_public_view(lease_pair[0], expired=lease_pair[1]) if lease_pair else None
+    return payload
+
 
 @app.callback(invoke_without_command=True)
 def tasks(
     ctx: typer.Context,
     json_format: bool = typer.Option(False, "--json", help="Output machine-readable JSON."),
+    status: str | None = typer.Option(None, "--status", help="Filter tasks by status."),
+    limit: int = typer.Option(100, "--limit", min=1, max=500, help="Max tasks to return (JSON pagination)."),
+    offset: int = typer.Option(0, "--offset", min=0, help="Skip this many tasks before returning results."),
     project_root: Path = typer.Option(Path("."), "--project-root", help="Repository root containing .devcouncil/."),
 ):
     """
@@ -24,32 +57,228 @@ def tasks(
         return
 
     root = project_root.expanduser().resolve()
+    from devcouncil.telemetry.logging_setup import set_log_dir
+    set_log_dir(root)
+    logger.info("dev tasks: json=%s", json_format)
     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()
+    with log_stage("tasks", project_root=root):
+        log_step("tasks/1: loading task graph", project_root=root, trace=True)
+        with db.get_session() as session:
+            task_repo = TaskRepository(session)
+            tasks_list = task_repo.get_all()
+            if status:
+                tasks_list = [t for t in tasks_list if t.status == status]
+            total = len(tasks_list)
+            window = tasks_list[offset:offset + limit]
+            leases_by_task = _active_leases_by_task(session)
+
+            if json_format:
+                typer.echo(dump_json({
+                    "tasks": [_task_row_payload(task, leases_by_task) for task in window],
+                    "total": total,
+                    "offset": offset,
+                    "limit": limit,
+                    "returned": len(window),
+                }, indent=2))
+                log_step("tasks/complete", project_root=root, count=len(window), trace=True)
+                return
+
+            tasks_list = window
+
+            if not tasks_list:
+                console.print("No tasks found. Run 'dev plan' to generate tasks.")
+                log_step("tasks/complete", project_root=root, count=0, trace=True)
+                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("Priority", style="yellow")
+            table.add_column("Lease", style="blue")
+            table.add_column("Linked Reqs", style="green")
+
+            for t in tasks_list:
+                reqs = ", ".join(t.requirement_ids)
+                priority = t.priority or "-"
+                lease_pair = leases_by_task.get(t.id)
+                lease_label = lease_pair[0].owner if lease_pair else "—"
+                table.add_row(t.id, t.title, t.status, priority, lease_label, reqs)
+
+            console.print(table)
+        log_step("tasks/complete", project_root=root, count=len(tasks_list), trace=True)
+
 
+@app.command("cancel")
+def cancel_task(
+    task_id: str = typer.Argument(..., help="Task ID to cancel, e.g. TASK-001."),
+    project_root: Path = typer.Option(Path("."), "--project-root", help="Repository root containing .devcouncil/."),
+    json_format: bool = typer.Option(False, "--json", help="Output machine-readable JSON."),
+):
+    """Cancel a task that is not already done or cancelled."""
+    root = project_root.expanduser().resolve()
+    from devcouncil.telemetry.logging_setup import set_log_dir
+    set_log_dir(root)
+    initialize_project(root, quiet=True)
+    db = get_db(root)
+    if not db:
+        message = "DevCouncil state is unavailable in this directory."
         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
+            typer.echo(dump_json({"ok": False, "error": message}, indent=2))
+        else:
+            console.print(f"[red]{message}[/red]")
+        raise typer.Exit(code=1)
+
+    with log_stage("tasks", project_root=root, subcommand="cancel"):
+        with db.get_session() as session:
+            task_repo = TaskRepository(session)
+            task = task_repo.get_by_id(task_id)
+            if task is None:
+                message = f"Task {task_id} not found."
+                if json_format:
+                    typer.echo(dump_json({"ok": False, "error": message}, indent=2))
+                else:
+                    console.print(f"[red]{message}[/red]")
+                raise typer.Exit(code=1)
+            if task.status in {"done", "cancelled"}:
+                message = f"Task {task_id} cannot be cancelled (status={task.status})."
+                if json_format:
+                    typer.echo(dump_json({"ok": False, "error": message, "task_id": task_id, "status": task.status}, indent=2))
+                else:
+                    console.print(f"[red]{message}[/red]")
+                raise typer.Exit(code=2)
+            previous_status = task.status
+            task.status = "cancelled"
+            task_repo.save(task)
+        TraceLogger(root).log_event(
+            "task_cancelled",
+            {"task_id": task_id, "previous_status": previous_status},
+            task_id=task_id,
+            summary=f"Cancelled {task_id} (was {previous_status})",
+        )
+        payload = {"ok": True, "task_id": task_id, "status": "cancelled", "previous_status": previous_status}
+        if json_format:
+            typer.echo(dump_json(payload, indent=2))
+        else:
+            console.print(f"[green]Cancelled {task_id}[/green] (was {previous_status})")
 
-        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)
+VALID_PRIORITIES = frozenset({"high", "medium", "low"})
 
-        console.print(table)
+
+@app.command("reprioritize")
+def reprioritize_task(
+    task_id: str = typer.Argument(..., help="Task ID to reprioritize, e.g. TASK-001."),
+    priority: str = typer.Option(..., "--priority", help="New priority: high, medium, or low."),
+    project_root: Path = typer.Option(Path("."), "--project-root", help="Repository root containing .devcouncil/."),
+    json_format: bool = typer.Option(False, "--json", help="Output machine-readable JSON."),
+):
+    """Set or update a task's optional priority hint."""
+    normalized = priority.strip().lower()
+    if normalized not in VALID_PRIORITIES:
+        message = f"--priority must be one of: {', '.join(sorted(VALID_PRIORITIES))}."
+        if json_format:
+            typer.echo(dump_json({"ok": False, "error": message}, indent=2))
+        else:
+            console.print(f"[red]{message}[/red]")
+        raise typer.Exit(code=2)
+
+    root = project_root.expanduser().resolve()
+    from devcouncil.telemetry.logging_setup import set_log_dir
+    set_log_dir(root)
+    initialize_project(root, quiet=True)
+    db = get_db(root)
+    if not db:
+        message = "DevCouncil state is unavailable in this directory."
+        if json_format:
+            typer.echo(dump_json({"ok": False, "error": message}, indent=2))
+        else:
+            console.print(f"[red]{message}[/red]")
+        raise typer.Exit(code=1)
+
+    with log_stage("tasks", project_root=root, subcommand="reprioritize"):
+        with db.get_session() as session:
+            task_repo = TaskRepository(session)
+            task = task_repo.get_by_id(task_id)
+            if task is None:
+                message = f"Task {task_id} not found."
+                if json_format:
+                    typer.echo(dump_json({"ok": False, "error": message}, indent=2))
+                else:
+                    console.print(f"[red]{message}[/red]")
+                raise typer.Exit(code=1)
+            previous = task.priority
+            task.priority = cast(Literal["high", "medium", "low"], normalized)
+            task_repo.save(task)
+        payload = {
+            "ok": True,
+            "task_id": task_id,
+            "priority": normalized,
+            "previous_priority": previous,
+        }
+        if json_format:
+            typer.echo(dump_json(payload, indent=2))
+        else:
+            prev_label = previous or "(none)"
+            console.print(f"[green]Set {task_id} priority[/green] to {normalized} (was {prev_label})")
+
+
+@app.command("edit")
+def edit_task(
+    task_id: str = typer.Argument(..., help="Task ID to edit, e.g. TASK-001."),
+    title: str | None = typer.Option(None, "--title", help="New task title."),
+    description: str | None = typer.Option(None, "--description", help="New task description."),
+    project_root: Path = typer.Option(Path("."), "--project-root", help="Repository root containing .devcouncil/."),
+    json_format: bool = typer.Option(False, "--json", help="Output machine-readable JSON."),
+):
+    """Edit a task's title and/or description."""
+    if title is None and description is None:
+        message = "Provide at least one of --title or --description."
+        if json_format:
+            typer.echo(dump_json({"ok": False, "error": message}, indent=2))
+        else:
+            console.print(f"[red]{message}[/red]")
+        raise typer.Exit(code=2)
+
+    root = project_root.expanduser().resolve()
+    from devcouncil.telemetry.logging_setup import set_log_dir
+    set_log_dir(root)
+    initialize_project(root, quiet=True)
+    db = get_db(root)
+    if not db:
+        message = "DevCouncil state is unavailable in this directory."
+        if json_format:
+            typer.echo(dump_json({"ok": False, "error": message}, indent=2))
+        else:
+            console.print(f"[red]{message}[/red]")
+        raise typer.Exit(code=1)
+
+    with log_stage("tasks", project_root=root, subcommand="edit"):
+        with db.get_session() as session:
+            task_repo = TaskRepository(session)
+            task = task_repo.get_by_id(task_id)
+            if task is None:
+                message = f"Task {task_id} not found."
+                if json_format:
+                    typer.echo(dump_json({"ok": False, "error": message}, indent=2))
+                else:
+                    console.print(f"[red]{message}[/red]")
+                raise typer.Exit(code=1)
+            changes: dict[str, tuple[str, str]] = {}
+            if title is not None:
+                changes["title"] = (task.title, title)
+                task.title = title
+            if description is not None:
+                changes["description"] = (task.description, description)
+                task.description = description
+            task_repo.save(task)
+        payload = {"ok": True, "task_id": task_id, "changes": {k: {"from": v[0], "to": v[1]} for k, v in changes.items()}}
+        if json_format:
+            typer.echo(dump_json(payload, indent=2))
+        else:
+            console.print(f"[green]Updated {task_id}[/green]: {', '.join(changes)}")

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

@@ -1,4 +1,9 @@
-import json
+"""DELIBERATELY UNINSTRUMENTED: this command's subject *is* the trace/log
+stream. Emitting log records or trace events from here mutates what the user
+asked to inspect (``log_step`` appends to the very traces.jsonl being tailed)
+and pollutes the machine-readable JSONL/--json output consumers parse. An
+introspection command must not modify what it introspects."""
+
 import time
 from pathlib import Path
 from typing import Optional
@@ -7,6 +12,7 @@ import typer
 from rich.console import Console
 
 from devcouncil.telemetry.traces import read_trace_events, read_trace_events_since
+from devcouncil.utils.json_persist import dump_json
 
 app = typer.Typer(help="Inspect DevCouncil trace events.")
 console = Console()
@@ -37,15 +43,15 @@ def tail(
     agent gets only the events appended after the cursor plus a ``next_cursor`` to
     pass back on the next poll, so each poll is O(new) rather than O(all).
     """
-    project_root = project_root.expanduser().resolve()
+    root = project_root.expanduser().resolve()
 
     # Incremental cursor mode: any of --since / --json / explicit --no-follow.
     incremental = since is not None or json_summary
     if incremental:
-        events, next_cursor = read_trace_events_since(project_root, since)
+        events, next_cursor = read_trace_events_since(root, since)
         if json_summary:
             typer.echo(
-                json.dumps(
+                dump_json(
                     {
                         "events": [event.model_dump(by_alias=True) for event in events],
                         "next_cursor": next_cursor,
@@ -59,7 +65,7 @@ def tail(
             else:
                 console.print(
                     f"{event.timestamp} {event.type} "
-                    f"{event.task_id or '-'} {event.summary or json.dumps(event.details)}"
+                    f"{event.task_id or '-'} {event.summary or dump_json(event.details)}"
                 )
         console.print(f"[dim]next_cursor: {next_cursor}[/dim]")
         return
@@ -67,7 +73,7 @@ def tail(
     printed = 0
 
     def emit_new(start_index: int) -> int:
-        events = list(read_trace_events(project_root))
+        events = list(read_trace_events(root))
         selected = events[start_index:]
         for event in selected:
             if jsonl:
@@ -75,11 +81,11 @@ def tail(
             else:
                 console.print(
                     f"{event.timestamp} {event.type} "
-                    f"{event.task_id or '-'} {event.summary or json.dumps(event.details)}"
+                    f"{event.task_id or '-'} {event.summary or dump_json(event.details)}"
                 )
         return len(events)
 
-    events = list(read_trace_events(project_root))
+    events = list(read_trace_events(root))
     start = max(0, len(events) - limit)
     printed = emit_new(start)
 

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

@@ -1,6 +1,6 @@
 import typer
 import asyncio
-import json
+from devcouncil.utils.json_persist import dump_json
 import logging
 from rich.console import Console
 from rich.table import Table
@@ -19,6 +19,7 @@ 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
+from devcouncil.telemetry.stages import log_stage, log_step
 
 console = Console()
 logger = logging.getLogger(__name__)
@@ -64,11 +65,24 @@ def verify(
     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))
+            typer.echo(dump_json({"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 log_stage("verify", project_root=root, task_id=task_id or "ALL", sandbox=sandbox):
+        _run_verify_body(
+            root, task_id, sandbox, json_format, db,
+        )
+
+
+def _run_verify_body(
+    root: Path,
+    task_id: Optional[str],
+    sandbox: str,
+    json_format: bool,
+    db,
+) -> None:
     with db.get_session() as session:
         task_repo = TaskRepository(session)
         req_repo = RequirementRepository(session)
@@ -80,7 +94,7 @@ def verify(
         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))
+                typer.echo(dump_json({"ok": False, "error": missing}, indent=2))
             else:
                 console.print(f"[red]{missing}[/red]")
             return
@@ -96,8 +110,9 @@ def verify(
             provider = create_provider(config.models.provider, api_key, project_root=root, provider_prefs=config.provider)
             role_config = {name: role.model_dump() for name, role in config.models.roles.items()}
             router = ModelRouter(provider, role_config, project_root=root)
-        except Exception:
-            pass
+        except Exception as e:
+            # Verification still runs, but silently without the LLM review layer.
+            logger.warning("Failed to build model router, verifying without LLM review: %s", e)
 
         from devcouncil.verification.sandbox import get_sandbox
 
@@ -111,13 +126,19 @@ def verify(
         per_task_gaps: dict[str, list] = {}
 
         for task in tasks:
+            log_step(
+                f"verify task {task.id}",
+                project_root=root,
+                task_id=task.id,
+                sandbox=sandbox,
+            )
             if sandbox != "local":
                 commands = task.expected_tests or task.allowed_commands
                 sandbox_result = get_sandbox(sandbox, root).run(task, commands, reqs)
                 if sandbox_result.status == "unsupported":
                     message = f"Sandbox {sandbox} is unavailable."
                     if json_format:
-                        typer.echo(json.dumps({"ok": False, "error": message, "sandbox": sandbox}, indent=2))
+                        typer.echo(dump_json({"ok": False, "error": message, "sandbox": sandbox}, indent=2))
                     else:
                         console.print(f"[red]{message}[/red]")
                     return
@@ -134,7 +155,7 @@ def verify(
                         "gaps": [],
                     })
                     if json_format:
-                        typer.echo(json.dumps({
+                        typer.echo(dump_json({
                             "ok": False,
                             "task_id": task.id,
                             "sandbox": sandbox,
@@ -231,6 +252,10 @@ def verify(
                 "diff_empty": outcome.diff_empty if outcome else False,
                 "coverage_measured": outcome.coverage_measured if outcome else False,
                 "coverage_skipped_reason": outcome.coverage_skipped_reason if outcome else None,
+                # Anti-laziness rigor: the task's difficulty classification and which
+                # escalations (blocking stub/effort gates, enforced coverage) applied.
+                "difficulty": outcome.difficulty if outcome else None,
+                "rigor_applied": list(outcome.rigor_applied) if outcome else [],
             })
 
         # Cross-task acceptance reconciliation (only meaningful across the full set).
@@ -276,7 +301,7 @@ def verify(
         )
 
         if json_format:
-            typer.echo(json.dumps({
+            typer.echo(dump_json({
                 "ok": blocked_tasks == 0,
                 "verified_tasks": len(tasks),
                 "blocked_tasks": blocked_tasks,

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

@@ -1,9 +1,13 @@
+import logging
 import typer
 from rich.console import Console
 import importlib.metadata
 
+from devcouncil.telemetry.stages import log_stage, log_step
+
 app = typer.Typer()
 console = Console()
+logger = logging.getLogger(__name__)
 
 @app.callback(invoke_without_command=True)
 def version(ctx: typer.Context):
@@ -12,9 +16,13 @@ def version(ctx: typer.Context):
     """
     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]")
+
+    logger.info("dev version")
+    with log_stage("version"):
+        log_step("version/1: reading package metadata", trace=True)
+        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]")
+        log_step("version/complete", trace=True)