wealthbox-cli 1.2.0__tar.gz → 1.3.0__tar.gz

{wealthbox_cli-1.2.0 → wealthbox_cli-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wealthbox-cli
-Version: 1.2.0
+Version: 1.3.0
 Summary: CLI and client library for the Wealthbox CRM API
 Project-URL: Homepage, https://github.com/massive-value/wealthbox-cli
 Project-URL: Documentation, https://massive-value.github.io/wealthbox-cli/

{wealthbox_cli-1.2.0 → wealthbox_cli-1.3.0}/docs/changelog.md

@@ -6,6 +6,22 @@ This project uses [Semantic Versioning](https://semver.org/).
 
 ---
 
+## [1.3.0](https://github.com/massive-value/wealthbox-cli/releases/tag/v1.3.0) — 2026-05-03
+
+### Added
+
+- **`wbox doctor`** — comprehensive top-level health check at the CLI root. Reports the wbox CLI version + Python version + binary location; authentication source detection (flag / env var / config file / `.env`) plus a smoke test against `/me`; agent CLI presence (`claude` / `codex` on PATH); legacy skill installs; plugin installs (managed via `claude plugin install` / `codex plugin install`); firm data state with file count, generated-vs-hand-edited split, and oldest-generated-file timestamp; and a Summary section listing actionable issues. `wbox skills doctor` keeps working as an alias of the new top-level command — both call the same function so output never drifts.
+- `wbox skills list` and `wbox skills doctor` now detect plugin-installed copies of `wealthbox-crm` under `~/.claude/plugins/cache/.../skills/wealthbox-crm/` and `~/.codex/plugins/cache/.../skills/wealthbox-crm/`. Previously a user who installed via the marketplace plugin path saw "not installed" everywhere even though the plugin was actively serving the skill.
+- Bootstrap installer (`scripts/install.sh` / `scripts/install.ps1`) now prefers the Claude Code plugin marketplace path when `claude` is on PATH — runs `claude plugin marketplace add` + `claude plugin install` directly, then offers a separate Codex install. Falls back to the legacy `wbox skills install` picker when no `claude` CLI is detected.
+- Bootstrap installer pre-flight checks Windows PowerShell `ExecutionPolicy` and offers to set `RemoteSigned` for the current user if needed (no admin required), instead of bombing partway through with Astral's terse error.
+
+### Fixed
+
+- Bootstrap `install.sh` no longer hangs at startup. The previous version did `exec </dev/tty` at the top, which cut off bash's source of piped script content (`curl … | bash`) and waited forever for the rest of the script to arrive on the user's keyboard. The whole body is now wrapped in a `main()` function so bash reads it fully before executing.
+- Bootstrap `install.ps1` no longer auto-closes its window on error. Wrapped in try/catch/finally with explicit step headers and a "Press Enter to close" pause so a transient PowerShell host stays open long enough to show the actual error.
+
+---
+
 ## [1.2.0](https://github.com/massive-value/wealthbox-cli/releases/tag/v1.2.0) — 2026-05-02
 
 ### Changed

{wealthbox_cli-1.2.0 → wealthbox_cli-1.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "wealthbox-cli"
-version = "1.2.0"
+version = "1.3.0"
 description = "CLI and client library for the Wealthbox CRM API"
 readme = "README.md"
 requires-python = ">=3.11"

{wealthbox_cli-1.2.0 → wealthbox_cli-1.3.0}/src/wealthbox_tools/cli/_skill_platforms.py

@@ -4,6 +4,8 @@ import shutil
 from dataclasses import dataclass
 from pathlib import Path
 
+SKILL_NAME = "wealthbox-crm"
+
 
 @dataclass(frozen=True)
 class Platform:
@@ -14,10 +16,81 @@ class Platform:
     requires_project_cwd: bool
 
 
+@dataclass(frozen=True)
+class PluginInstall:
+    """A copy of `wealthbox-crm` discovered inside an agent host's plugin cache.
+
+    These are managed by the host CLI (`claude plugin install ...` or the
+    Codex equivalent) — `wbox skills install` does not write here, and
+    `wbox skills uninstall` does not touch them.
+    """
+    host: str        # 'claude-code-user' | 'claude-code-project' | 'codex'
+    marketplace: str
+    version: str
+    skill_dir: Path
+
+
 def _home() -> Path:
     return Path.home()
 
 
+def _scan_plugin_cache(cache_root: Path, host: str) -> list[PluginInstall]:
+    """Find any `<marketplace>/<plugin-name>/<version>/skills/wealthbox-crm/`
+    matches under a Claude Code- or Codex-style plugin cache root."""
+    if not cache_root.is_dir():
+        return []
+    out: list[PluginInstall] = []
+    for marketplace_dir in cache_root.iterdir():
+        if not marketplace_dir.is_dir():
+            continue
+        plugin_dir = marketplace_dir / SKILL_NAME
+        if not plugin_dir.is_dir():
+            continue
+        for version_dir in plugin_dir.iterdir():
+            if not version_dir.is_dir():
+                continue
+            skill_dir = version_dir / "skills" / SKILL_NAME
+            if (skill_dir / "SKILL.md").is_file():
+                out.append(PluginInstall(
+                    host=host,
+                    marketplace=marketplace_dir.name,
+                    version=version_dir.name,
+                    skill_dir=skill_dir,
+                ))
+    return out
+
+
+def detect_plugin_installs() -> list[PluginInstall]:
+    """Discover every host-managed plugin copy of wealthbox-crm on this
+    machine. Includes Claude Code user scope, Claude Code project scope
+    (cwd-relative), and Codex.
+
+    Deduped by resolved skill_dir path so a single install isn't reported
+    twice when home and cwd point at the same directory (rare in real use,
+    common in tests).
+    """
+    home = _home()
+    cwd = Path.cwd()
+    candidates = [
+        (home / ".claude" / "plugins" / "cache", "claude-code-user"),
+        (cwd / ".claude" / "plugins" / "cache", "claude-code-project"),
+        (home / ".codex" / "plugins" / "cache", "codex"),
+    ]
+    installs: list[PluginInstall] = []
+    seen: set[Path] = set()
+    for cache_root, host in candidates:
+        for pi in _scan_plugin_cache(cache_root, host=host):
+            try:
+                key = pi.skill_dir.resolve()
+            except OSError:
+                key = pi.skill_dir
+            if key in seen:
+                continue
+            seen.add(key)
+            installs.append(pi)
+    return installs
+
+
 def detect_platforms() -> list[Platform]:
     home = _home()
     cwd = Path.cwd()

wealthbox_cli-1.3.0/src/wealthbox_tools/cli/doctor.py

@@ -0,0 +1,199 @@
+"""Comprehensive health check across the wbox install.
+
+`wbox doctor` and `wbox skills doctor` both call into `run_doctor()` so
+the legacy `skills doctor` command keeps working as an alias.
+"""
+from __future__ import annotations
+
+import os
+import platform as _platform_module
+import shutil
+import sys
+from datetime import datetime
+from importlib.metadata import version as _pkg_version
+
+import typer
+
+from ._config import _config_path, load_config
+from ._skill_bootstrap import migrate_legacy_firm, read_firm_meta, read_meta
+from ._skill_paths import firm_dir, firm_meta_path
+from ._skill_platforms import (
+    detect_platforms,
+    detect_plugin_installs,
+    is_installed,
+    skill_dir,
+)
+
+
+def _detect_token_source(token_arg: str | None) -> tuple[str | None, str]:
+    """Return (token, source_label) matching get_client's resolution order:
+    --token flag > WEALTHBOX_TOKEN env > config file > .env (loaded as env)."""
+    if token_arg:
+        return token_arg, "--token flag"
+    env_token = os.environ.get("WEALTHBOX_TOKEN")
+    if env_token:
+        return env_token, "env var (WEALTHBOX_TOKEN or .env)"
+    cfg = load_config()
+    cfg_token = cfg.get("token")
+    if cfg_token:
+        return cfg_token, f"config file ({_config_path()})"
+    return None, "not set"
+
+
+def run_doctor(token: str | None = None) -> int:
+    """Run all health checks. Returns exit code (0 = healthy, 1 = issues found)."""
+    issues: list[str] = []
+
+    migrated_from = _ensure_firm_migrated()
+    if migrated_from is not None:
+        typer.echo(f"! migrated legacy firm/ data from {migrated_from} to {firm_dir()}")
+        typer.echo("")
+
+    # --- wbox CLI ---------------------------------------------------------
+    typer.echo("# wbox CLI")
+    cli_version = _pkg_version("wealthbox-cli")
+    py_version = ".".join(str(v) for v in sys.version_info[:3])
+    binary = shutil.which("wbox") or "(not on PATH -running via python -m)"
+    typer.echo(f"  version:  {cli_version}")
+    typer.echo(f"  python:   {py_version} ({_platform_module.system()})")
+    typer.echo(f"  binary:   {binary}")
+
+    # --- Authentication ---------------------------------------------------
+    typer.echo("\n# Authentication")
+    config_path = _config_path()
+    if config_path.exists():
+        cfg = load_config()
+        cfg_token = cfg.get("token", "")
+        masked = f"...{cfg_token[-4:]}" if len(cfg_token) > 4 else "****"
+        typer.echo(f"  config:   {config_path} (present, masked: {masked})")
+    else:
+        typer.echo(f"  config:   {config_path} (not present)")
+    resolved_token, source = _detect_token_source(token)
+    typer.echo(f"  source:   {source}")
+    if not resolved_token:
+        typer.echo("  smoke:    skipped (no token)")
+        issues.append("token not configured - run 'wbox config set-token'")
+    else:
+        from wealthbox_tools.client import WealthboxAPIError
+
+        from ._util import run_client
+        try:
+            me = run_client(token, lambda c: c.get_me())
+            accounts = me.get("accounts") or []
+            firm_name = accounts[0].get("name") if accounts else "(no firm)"
+            typer.echo(
+                f"  smoke:    OK /me returned {me.get('name')} "
+                f"({firm_name}, user {me.get('id')})"
+            )
+        except WealthboxAPIError as e:
+            typer.echo(f"  smoke:    FAILED token rejected by /me: {e}")
+            issues.append("token rejected by /me - check it's still valid")
+        except Exception as e:
+            typer.echo(f"  smoke:    FAILED network/config error: {e}")
+            issues.append(f"smoke test failed: {e}")
+
+    # --- Agent CLIs -------------------------------------------------------
+    typer.echo("\n# Agent CLIs on PATH")
+    claude_path = shutil.which("claude") or shutil.which("claude.exe")
+    codex_path = shutil.which("codex") or shutil.which("codex.exe")
+    typer.echo(f"  claude:   {claude_path or 'not detected'}")
+    typer.echo(f"  codex:    {codex_path or 'not detected'}")
+
+    # --- Legacy skill installs --------------------------------------------
+    typer.echo("\n# Skill installs (legacy template-copy)")
+    for p in detect_platforms():
+        status = "installed" if is_installed(p) else "not installed"
+        meta = read_meta(skill_dir(p)) if is_installed(p) else {}
+        template_v = (meta.get("template") or {}).get("cli_version", "-")
+        upgrade_hint = ""
+        if template_v not in ("-", cli_version):
+            upgrade_hint = f"  [upgrade: {template_v} -> {cli_version}]"
+            issues.append(
+                f"{p.id} skill template is {template_v}, latest is {cli_version} "
+                f"- run 'wbox skills upgrade'"
+            )
+        typer.echo(
+            f"  {p.id:<22} {status:<16} template={template_v:<10} {skill_dir(p)}{upgrade_hint}"
+        )
+
+    # --- Plugin installs --------------------------------------------------
+    plugin_installs = detect_plugin_installs()
+    typer.echo("\n# Plugin installs (managed by host CLI: claude/codex plugin)")
+    if not plugin_installs:
+        typer.echo("  (none detected)")
+    else:
+        for pi in plugin_installs:
+            typer.echo(
+                f"  {pi.host:<22} plugin@{pi.marketplace:<18} "
+                f"version={pi.version:<10} {pi.skill_dir}"
+            )
+
+    # --- Firm data --------------------------------------------------------
+    typer.echo("\n# Firm data (canonical)")
+    typer.echo(f"  path:     {firm_dir()}")
+    typer.echo(f"  meta:     {firm_meta_path()}")
+    firm_meta = read_firm_meta()
+    if not firm_meta:
+        typer.echo("  state:    not bootstrapped")
+        issues.append("firm data not bootstrapped - run 'wbox skills bootstrap'")
+    else:
+        identity = firm_meta.get("identity") or {}
+        if firm_meta.get("onboarded_at"):
+            firm_state = "onboarded"
+        else:
+            firm_state = "bootstrapped (qualitative pending)"
+            issues.append(
+                "firm onboarding incomplete - open the skill in your agent to "
+                "walk through bootstrap.md (it'll call 'wbox skills mark-onboarded')"
+            )
+        typer.echo(f"  state:    {firm_state}")
+        typer.echo(f"  firm:     {identity.get('name', '-')}")
+        typer.echo(f"  user:     {identity.get('user_name', '-')}")
+        if firm_dir().exists():
+            md_files = sorted(p.name for p in firm_dir().glob("*.md"))
+            generated_set = set((firm_meta.get("files") or {}).keys())
+            handed = [f for f in md_files if f not in generated_set and not f.startswith("_")]
+            typer.echo(
+                f"  files:    {len(md_files)} markdown ({len(generated_set)} generated, "
+                f"{len(handed)} hand-edited)"
+            )
+            file_ts = list((firm_meta.get("files") or {}).values())
+            if file_ts:
+                try:
+                    oldest = min(datetime.fromisoformat(t).date() for t in file_ts)
+                    typer.echo(f"  oldest:   {oldest}")
+                except (ValueError, TypeError):
+                    pass
+
+    # --- Summary ----------------------------------------------------------
+    typer.echo("\n# Summary")
+    if not issues:
+        typer.echo("  All checks passed.")
+        return 0
+    typer.echo(f"  {len(issues)} issue(s) found:")
+    for i in issues:
+        typer.echo(f"    ! {i}")
+    return 1
+
+
+def _ensure_firm_migrated():
+    """Migrate legacy firm/ data on first read (idempotent)."""
+    installed = [skill_dir(p) for p in detect_platforms() if is_installed(p)]
+    return migrate_legacy_firm(installed)
+
+
+def doctor_cmd(
+    token: str | None = typer.Option(
+        None, "--token",
+        help="Override the API token for the smoke test. Overrides env var, config, .env.",
+    ),
+) -> None:
+    """Run the comprehensive doctor.
+
+    Always exits 0 — issues are surfaced in the Summary section. The doctor
+    is informational, not a CI gate. (A future --strict flag could change
+    this for scripting.) Token is intentionally NOT bound to
+    `envvar=WEALTHBOX_TOKEN` so the doctor can report whether the token came
+    from the flag, env var, config file, or .env file.
+    """
+    run_doctor(token=token)

{wealthbox_cli-1.2.0 → wealthbox_cli-1.3.0}/src/wealthbox_tools/cli/main.py

@@ -8,6 +8,7 @@ from .activity import app as activity_app
 from .categories import app as categories_app
 from .config import app as config_app
 from .contacts import app as contacts_app
+from .doctor import doctor_cmd as _doctor_cmd
 from .events import app as events_app
 from .households import app as households_app
 from .me import app as me_app
@@ -35,6 +36,12 @@ def _main(
         raise typer.Exit()
 
 
+app.command(
+    "doctor",
+    help="Comprehensive health check: CLI version, auth, agent CLIs, skills, plugins, firm.",
+)(_doctor_cmd)
+
+
 app.add_typer(activity_app, name="activity")
 app.add_typer(categories_app, name="categories")
 app.add_typer(config_app, name="config")

{wealthbox_cli-1.2.0 → wealthbox_cli-1.3.0}/src/wealthbox_tools/cli/skills.py

@@ -14,11 +14,12 @@ from ._skill_bootstrap import (
     read_meta,
     update_template_meta,
 )
-from ._skill_paths import firm_dir, firm_meta_path
+from ._skill_paths import firm_dir
 from ._skill_platforms import (
     Platform,
     SkillInstallError,
     detect_platforms,
+    detect_plugin_installs,
     install_skill,
     is_installed,
     skill_dir,
@@ -43,7 +44,7 @@ def _ensure_firm_migrated() -> Path | None:
     return migrate_legacy_firm(installed)
 
 
-@app.command("list", help="Show where the skill is installed per platform.")
+@app.command("list", help="Show every skill copy on this machine: legacy installs and plugin-managed.")
 def list_platforms() -> None:
     _ensure_firm_migrated()
     firm_meta = read_firm_meta()
@@ -55,7 +56,7 @@ def list_platforms() -> None:
             last_bootstrap = max(files_map.values())
         onboarded = firm_meta.get("onboarded_at") or "no"
 
-    header = ("platform", "path", "status", "template-version")
+    header = ("source", "path", "status", "version")
     rows: list[tuple[str, str, str, str]] = []
     for p in detect_platforms():
         dest = skill_dir(p)
@@ -69,6 +70,13 @@ def list_platforms() -> None:
             "installed" if installed else "not installed",
             template_version,
         ))
+    for pi in detect_plugin_installs():
+        rows.append((
+            f"plugin:{pi.host}",
+            str(pi.skill_dir),
+            f"plugin@{pi.marketplace}",
+            pi.version,
+        ))
 
     widths = [
         max(len(r[i]) for r in ([header] + rows))
@@ -278,59 +286,23 @@ def upgrade_cmd(
             typer.echo(f"OK upgraded {t.id}: {existing} -> {current}")
 
 
-@app.command("doctor", help="Diagnose install state and token.")
+@app.command(
+    "doctor",
+    help="Diagnose install state, auth, and firm data. Alias of `wbox doctor`.",
+)
 def doctor_cmd(
-    token: str | None = typer.Option(None, envvar="WEALTHBOX_TOKEN", hidden=True),
+    token: str | None = typer.Option(
+        None, "--token",
+        help="Override the API token for the smoke test.",
+    ),
 ) -> None:
-    from wealthbox_tools.client import WealthboxAPIError
-
-    from ._util import run_client
-
-    migrated_from = _ensure_firm_migrated()
-    if migrated_from is not None:
-        typer.echo(f"! migrated legacy firm/ data from {migrated_from} to {firm_dir()}")
-
-    current = _pkg_version("wealthbox-cli")
-    typer.echo("# Skill install state")
-    for p in detect_platforms():
-        status = "installed" if is_installed(p) else "not installed"
-        meta = read_meta(skill_dir(p)) if is_installed(p) else {}
-        template_v = (meta.get("template") or {}).get("cli_version", "-")
-        upgrade_hint = ""
-        if template_v not in ("-", current):
-            upgrade_hint = f"  [upgrade available: {template_v} -> {current}]"
-        typer.echo(
-            f"  {p.id:<22} {status:<16} template={template_v:<10} {skill_dir(p)}{upgrade_hint}"
-        )
-
-    typer.echo("\n# Firm data (canonical)")
-    firm_meta = read_firm_meta()
-    if not firm_meta:
-        firm_state = "not bootstrapped"
-    elif firm_meta.get("onboarded_at"):
-        firm_state = "onboarded"
-    else:
-        firm_state = "bootstrapped (qualitative pending)"
-    identity = firm_meta.get("identity") or {}
-    typer.echo(f"  state:     {firm_state}")
-    typer.echo(f"  firm:      {identity.get('name', '-')}")
-    typer.echo(f"  user:      {identity.get('user_name', '-')}")
-    typer.echo(f"  path:      {firm_dir()}")
-    typer.echo(f"  meta:      {firm_meta_path()}")
-
-    typer.echo("\n# Token")
-    try:
-        me = run_client(token, lambda c: c.get_me())
-        accounts = me.get("accounts") or []
-        firm_name = accounts[0].get("name") if accounts else "(no firm)"
-        typer.echo(
-            f"  token ok - authenticated as {me.get('name')} "
-            f"(firm: {firm_name}, user id={me.get('id')})"
-        )
-    except WealthboxAPIError as e:
-        typer.echo(f"  token failed: {e}")
-    except Exception as e:  # network, config, etc.
-        typer.echo(f"  token check failed: {e}")
+    # `wbox skills doctor` is the older entry point; `wbox doctor` is the
+    # canonical top-level form. Both call the same function so the output
+    # never drifts. Token is intentionally not bound to envvar= so the
+    # doctor can report whether the token came from the flag, env var,
+    # config file, or .env file.
+    from .doctor import run_doctor
+    run_doctor(token=token)
 
 
 @app.command(