agent-brain-cli 10.0.4__tar.gz → 10.0.6__tar.gz

{agent_brain_cli-10.0.4 → agent_brain_cli-10.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agent-brain-cli
-Version: 10.0.4
+Version: 10.0.6
 Summary: Agent Brain CLI - Command-line interface for managing AI agent memory and knowledge retrieval
 Home-page: https://github.com/SpillwaveSolutions/agent-brain
 License: MIT
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: agent-brain-rag (>=10.0.4,<11.0.0)
+Requires-Dist: agent-brain-rag (>=10.0.6,<11.0.0)
 Requires-Dist: click (>=8.1.0,<9.0.0)
 Requires-Dist: httpx (>=0.28.0,<0.29.0)
 Requires-Dist: pydantic (>=2.10.0,<3.0.0)

{agent_brain_cli-10.0.4 → agent_brain_cli-10.0.6}/agent_brain_cli/__init__.py

@@ -1,3 +1,3 @@
 """Doc-Serve CLI - Command-line interface for managing Doc-Serve server."""
 
-__version__ = "10.0.4"
+__version__ = "10.0.6"

{agent_brain_cli-10.0.4 → agent_brain_cli-10.0.6}/agent_brain_cli/commands/doctor.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import json
+
 import click
 from rich.console import Console
 from rich.panel import Panel
@@ -11,6 +13,7 @@ from agent_brain_cli.diagnostics import (
     SEVERITY_FAIL,
     SEVERITY_OK,
     SEVERITY_WARN,
+    apply_safe_fixes,
     report_to_json,
     run_doctor,
 )
@@ -33,18 +36,40 @@ _STATUS_STYLE = {
     help="Server URL to probe (default: resolved from runtime.json or config).",
 )
 @click.option("--json", "json_output", is_flag=True, help="Emit machine-readable JSON.")
-def doctor_command(url: str | None, json_output: bool) -> None:
+@click.option(
+    "--fix",
+    "apply_fixes",
+    is_flag=True,
+    help=(
+        "Apply safe, idempotent, offline fixes (add .agent-brain/ to .gitignore, "
+        "create state dir + stub config.json). Will not touch API keys, network, "
+        "or user code. Re-runs the report after fixing."
+    ),
+)
+def doctor_command(url: str | None, json_output: bool, apply_fixes: bool) -> None:
     """Diagnose your Agent Brain setup.
 
     Inspects Python version, project init state, provider config, required
     API keys, optional dependencies, .gitignore hygiene, and whether the
     server is reachable. Exits non-zero on any critical failure so it can
     be used in scripts (``agent-brain doctor || agent-brain init``).
+
+    Pass ``--fix`` to auto-apply the safe subset of remediations and re-run.
     """
     report = run_doctor(server_url_override=url)
 
+    fix_actions: list[str] = []
+    if apply_fixes:
+        fix_actions = apply_safe_fixes(report)
+        if fix_actions:
+            # Re-run so the printed report reflects the fixed state.
+            report = run_doctor(server_url_override=url)
+
     if json_output:
-        click.echo(report_to_json(report))
+        payload = json.loads(report_to_json(report))
+        if apply_fixes:
+            payload["applied_fixes"] = fix_actions
+        click.echo(json.dumps(payload, indent=2))
         raise SystemExit(report.exit_code)
 
     header_color = "green" if report.exit_code == 0 else "red"
@@ -75,6 +100,17 @@ def doctor_command(url: str | None, json_output: bool) -> None:
 
     console.print(table)
 
+    if apply_fixes:
+        if fix_actions:
+            console.print("\n[cyan]Applied safe fixes:[/]")
+            for action in fix_actions:
+                console.print(f"  • {action}")
+        else:
+            console.print(
+                "\n[dim]No safe fixes applied (nothing actionable, or all "
+                "checks already passing).[/]"
+            )
+
     if report.exit_code != 0:
         console.print(
             "\n[red]Doctor reported critical issues.[/] "

{agent_brain_cli-10.0.4 → agent_brain_cli-10.0.6}/agent_brain_cli/commands/jobs.py

@@ -25,13 +25,32 @@ def _format_timestamp(ts: str | None) -> str:
     return ts
 
 
-def _format_progress(progress: float | None, total: int | None) -> str:
-    """Format progress for display."""
+def _format_progress(
+    progress: float | int | dict[str, Any] | None,
+    total: int | None,
+) -> str:
+    """Format progress for display.
+
+    Copes with both the legacy float shape and the structured ``JobProgress``
+    dict the server emits today (#150). Falls back to a string coercion for
+    unknown types so the CLI never raises.
+    """
     if progress is None:
         return "-"
-    if total:
-        return f"{progress:.1f}% ({total} files)"
-    return f"{progress:.1f}%"
+    if isinstance(progress, dict):
+        pct = progress.get("percent_complete")
+        if isinstance(pct, (int, float)):
+            files_total = progress.get("files_total") or 0
+            files_done = progress.get("files_processed") or 0
+            if files_total:
+                return f"{pct:.1f}% ({files_done}/{files_total} files)"
+            return f"{pct:.1f}%"
+        return ", ".join(f"{k}={v}" for k, v in progress.items())
+    if isinstance(progress, (int, float)):
+        if total:
+            return f"{progress:.1f}% ({total} files)"
+        return f"{progress:.1f}%"
+    return str(progress)
 
 
 def _get_status_style(status: str) -> str:
@@ -121,12 +140,17 @@ def _create_job_detail_panel(job: dict[str, Any]) -> Panel:
     if (progress := job.get("progress_percent", job.get("progress"))) is not None:
         total = job.get("total_files", 0)
         processed = job.get("processed_files", 0)
-        if total:
+        # #150: server emits structured JobProgress dicts in addition to floats.
+        # Defer formatting to _format_progress so list-view and detail-view
+        # never diverge on type handling.
+        if isinstance(progress, (int, float)) and total:
             lines.append(
                 f"[bold]Progress:[/] {progress:.1f}% ({processed}/{total} files)"
             )
         else:
-            lines.append(f"[bold]Progress:[/] {progress:.1f}%")
+            lines.append(
+                f"[bold]Progress:[/] {_format_progress(progress, total or None)}"
+            )
 
     if enqueued := job.get("enqueued_at", job.get("created_at")):
         lines.append(f"[bold]Enqueued:[/] {_format_timestamp(enqueued)}")

{agent_brain_cli-10.0.4 → agent_brain_cli-10.0.6}/agent_brain_cli/config.py

@@ -254,6 +254,20 @@ def load_config(start_path: Path | None = None) -> AgentBrainConfig:
 def resolve_project_root(start_path: Path | None = None) -> Path:
     """Find the project root by looking for markers.
 
+    Thin wrapper around :func:`resolve_project_root_with_strategy` that drops
+    the strategy label for callers that only need the path.
+    """
+    return resolve_project_root_with_strategy(start_path)[0]
+
+
+def resolve_project_root_with_strategy(
+    start_path: Path | None = None,
+) -> tuple[Path, str]:
+    """Find the project root and report *which* rule matched.
+
+    Used by ``agent-brain doctor`` to explain why a given directory was
+    selected (issue #146).
+
     Resolution order (first match wins):
     1. Walk up from ``start_path`` looking for ``.agent-brain/`` — this lets a
        sub-project inside a mono-repo keep its own state dir and not get
@@ -263,11 +277,10 @@ def resolve_project_root(start_path: Path | None = None) -> Path:
     4. Walk up looking for ``.claude/`` or ``pyproject.toml``.
     5. Fall back to ``start_path``.
 
-    Args:
-        start_path: Starting directory. Defaults to cwd.
-
     Returns:
-        Project root path.
+        ``(root, strategy)`` where ``strategy`` is one of
+        ``"agent_brain_dir"``, ``"legacy_claude_dir"``, ``"git_root"``,
+        ``"claude_dir"``, ``"pyproject"``, ``"cwd_fallback"``.
     """
     import subprocess
 
@@ -277,9 +290,9 @@ def resolve_project_root(start_path: Path | None = None) -> Path:
     current = start
     while current != current.parent:
         if (current / STATE_DIR_NAME).is_dir():
-            return current
+            return current, "agent_brain_dir"
         if (current / LEGACY_STATE_DIR_NAME).is_dir():
-            return current
+            return current, "legacy_claude_dir"
         current = current.parent
 
     # 3. Git root next — useful when this is the first time the user runs init.
@@ -292,7 +305,7 @@ def resolve_project_root(start_path: Path | None = None) -> Path:
             cwd=str(start),
         )
         if result.returncode == 0:
-            return Path(result.stdout.strip()).resolve()
+            return Path(result.stdout.strip()).resolve(), "git_root"
     except (subprocess.TimeoutExpired, FileNotFoundError, OSError):
         pass
 
@@ -300,12 +313,12 @@ def resolve_project_root(start_path: Path | None = None) -> Path:
     current = start
     while current != current.parent:
         if (current / ".claude").is_dir():
-            return current
+            return current, "claude_dir"
         if (current / "pyproject.toml").is_file():
-            return current
+            return current, "pyproject"
         current = current.parent
 
-    return start
+    return start, "cwd_fallback"
 
 
 # Backwards-compatible alias for any external callers.