Adds end-to-end flow for installing and keeping the per-user filtered
Claude Code marketplace in sync with the user's Agnes stack
(admin RBAC grants \ MyAIStack opt-outs U /store installs).
Setup (one-liner in install prompt step 5):
`agnes refresh-marketplace --bootstrap` clones the per-user marketplace
bare repo to ~/.agnes/marketplace, strips PAT from the cloned origin
URL, registers the local path with Claude Code, and installs every
plugin in the served manifest at --scope project. Replaces a 15-line
inline shell sequence that tripped Claude Code's agent-driven `rm -rf`
permission gate.
Auto-refresh (SessionStart hook installed by `agnes init`):
`agnes refresh-marketplace --quiet` runs every Claude Code session,
fetches+resets the clone (server rebuilds as orphan commits, so
pull --ff-only is impossible), and version-aware reconciles:
- missing in workspace -> claude plugin install <name>@agnes --scope project
- version differs -> claude plugin update <name>@agnes
- matches -> skip
Don't auto-uninstall plugins that disappeared from the manifest --
a transient empty manifest from the server would wipe the stack.
Hook output: when --quiet AND something actually changed, emits Claude
Code hook JSON on stdout -- `systemMessage` (transient toast) and
`hookSpecificOutput.additionalContext` (model-side system reminder),
both carrying the change summary plus a "/exit + restart Claude Code"
instruction (Claude only scans plugins at session start).
Windows hook compatibility: the refresh-marketplace hook command is
wrapped in `bash -c "..."` because Claude Code on Windows runs hook
commands directly without invoking a shell, so `2>/dev/null || true`
would otherwise be passed as literal argv tokens.
Cross-cutting:
- cli/lib/marketplace.py: shared CLONE_DIR + MARKETPLACE_NAME constants.
- cli/lib/hooks.py: SessionStart now has two independent entries
(pull + refresh-marketplace) so a failure in one doesn't suppress
the other; legacy `da sync` and prior single-pull layouts upgrade
cleanly on re-init.
- PAT injection on every git fetch via per-invocation credential
helper (token in \$AGNES_TOKEN env, never in argv or .git/config).
- Pre-snapshot of installed plugins captured BEFORE
`claude plugin marketplace update` so silent auto-applied version
bumps still fire notifications.
- scripts/dev/agnes-client-reset.sh: cleans ~/.claude/plugins/marketplaces/agnes,
~/.claude/plugins/cache/agnes, drops uv build cache, documents
workspace-scoped residue that can't be enumerated from the script.
- app/web/setup_instructions.py: legacy AGNES_DEBUG_AUTH path also
uses clone (direct HTTPS marketplace add is broken end-to-end on
every Claude Code distribution -- stores response as single file,
plugin source paths then 404).
28 new tests (test_cli_refresh_marketplace.py) + extended hook + setup
template tests cover bootstrap, fetch+reset ordering, version-aware
reconcile, project-path filtering, hook JSON shape, and the bash-c
Windows wrapper invariant.
171 lines
6.2 KiB
Python
171 lines
6.2 KiB
Python
"""agnes — CLI tool for AI Data Analyst.
|
|
|
|
Primary interface for AI agents. Install: uv tool install agnes-the-ai-analyst
|
|
"""
|
|
|
|
import sys
|
|
from importlib.metadata import PackageNotFoundError
|
|
from importlib.metadata import version as _pkg_version
|
|
|
|
import typer
|
|
|
|
# Force UTF-8 on Windows stdout/stderr at import time. The default Windows
|
|
# console codepage (cp1250 on cs-CZ, cp1252 on en-US, …) cannot encode the
|
|
# Braille spinner glyphs Rich uses for `agnes pull` progress, nor the
|
|
# em-dash / accented chars that show up in skill markdown via
|
|
# `agnes skills list`. Both crash with UnicodeEncodeError /
|
|
# UnicodeDecodeError before any command-level code runs. `reconfigure` is
|
|
# a no-op on non-TextIOWrapper streams (pytest capture, pipes wrapped by
|
|
# other tooling) — swallow the AttributeError there.
|
|
if sys.platform == "win32":
|
|
try:
|
|
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
sys.stderr.reconfigure(encoding="utf-8", errors="replace")
|
|
except (AttributeError, OSError):
|
|
pass
|
|
|
|
from cli.commands.auth import auth_app
|
|
from cli.commands.init import init_app
|
|
from cli.commands.pull import pull_app
|
|
from cli.commands.push import push_app
|
|
from cli.commands.refresh_marketplace import refresh_marketplace_app
|
|
from cli.commands.query import query_command
|
|
from cli.commands.status import status_app
|
|
from cli.commands.admin import admin_app
|
|
from cli.commands.diagnose import diagnose_app
|
|
from cli.commands.skills import skills_app
|
|
from cli.commands.self_upgrade import self_upgrade_app
|
|
from cli.commands.setup import setup_app
|
|
from cli.commands.server import server_app
|
|
from cli.commands.explore import explore_app
|
|
from cli.commands.catalog import catalog_app
|
|
from cli.commands.schema import schema_app
|
|
from cli.commands.describe import describe_app
|
|
from cli.commands.snapshot import snapshot_app
|
|
from cli.commands.disk_info import disk_info_app
|
|
from cli.commands.store import store_app
|
|
from cli.commands.my_stack import my_stack_app
|
|
|
|
|
|
def _cli_version() -> str:
|
|
"""Return the installed CLI version from package metadata.
|
|
|
|
Falls back to `"unknown"` when the package is not installed (e.g. running
|
|
from a source checkout without `uv pip install -e .`). Deliberately does
|
|
not read pyproject.toml at runtime — that file is not shipped with the
|
|
wheel and the metadata lookup is the canonical source.
|
|
"""
|
|
try:
|
|
return _pkg_version("agnes-the-ai-analyst")
|
|
except PackageNotFoundError:
|
|
return "unknown"
|
|
|
|
|
|
def _version_callback(value: bool) -> None:
|
|
if value:
|
|
typer.echo(f"agnes {_cli_version()}")
|
|
raise typer.Exit()
|
|
|
|
|
|
app = typer.Typer(
|
|
name="agnes",
|
|
help="Agnes — AI Data Analyst CLI",
|
|
no_args_is_help=True,
|
|
)
|
|
|
|
|
|
@app.callback()
|
|
def _root(
|
|
version: bool = typer.Option(
|
|
None,
|
|
"--version",
|
|
"-V",
|
|
callback=_version_callback,
|
|
is_eager=True,
|
|
help="Show the CLI version and exit.",
|
|
),
|
|
) -> None:
|
|
"""Root callback — carries the --version option and fires the auto-update check.
|
|
|
|
Update check runs before subcommand dispatch but after the --version flag
|
|
(which exits early). It's best-effort: any failure is swallowed so a bad
|
|
network never blocks a working `agnes` command. Disable with
|
|
`AGNES_NO_UPDATE_CHECK=1`.
|
|
"""
|
|
_maybe_warn_outdated()
|
|
|
|
|
|
def _maybe_warn_outdated() -> None:
|
|
"""Hit /cli/latest on the configured server (cached 24h) and emit a
|
|
one-line stderr warning if the installed CLI is older. Never raises."""
|
|
try:
|
|
from cli.config import get_server_url
|
|
from cli.update_check import check, format_outdated_notice
|
|
info = check(get_server_url())
|
|
if info and info.is_outdated():
|
|
typer.echo(format_outdated_notice(info), err=True)
|
|
except Exception:
|
|
pass # best-effort: never fail a command on the probe
|
|
|
|
# Register subcommands
|
|
app.add_typer(auth_app, name="auth")
|
|
app.add_typer(init_app, name="init")
|
|
app.add_typer(pull_app, name="pull")
|
|
app.add_typer(push_app, name="push")
|
|
app.add_typer(refresh_marketplace_app, name="refresh-marketplace")
|
|
app.command("query")(query_command)
|
|
app.add_typer(status_app, name="status")
|
|
app.add_typer(admin_app, name="admin")
|
|
app.add_typer(diagnose_app, name="diagnose")
|
|
app.add_typer(skills_app, name="skills")
|
|
app.add_typer(self_upgrade_app, name="self-upgrade")
|
|
app.add_typer(setup_app, name="setup")
|
|
app.add_typer(server_app, name="server")
|
|
app.add_typer(explore_app, name="explore")
|
|
app.add_typer(catalog_app, name="catalog")
|
|
app.add_typer(schema_app, name="schema")
|
|
app.add_typer(describe_app, name="describe")
|
|
app.add_typer(snapshot_app, name="snapshot")
|
|
app.add_typer(disk_info_app, name="disk-info")
|
|
app.add_typer(store_app, name="store")
|
|
app.add_typer(my_stack_app, name="my-stack")
|
|
|
|
|
|
def _run_with_clean_errors() -> None:
|
|
"""Wrap ``app()`` so AgnesTransportError (and other typed CLI errors)
|
|
surface as a one-line message + exit, never as a Python traceback. The
|
|
full traceback is already logged to ``~/.config/agnes/last-error.log``
|
|
by the api_* helpers — operators read it from there for support
|
|
forwarding. Anything that escapes this wrapper IS a CLI bug worth
|
|
fixing — log + print "internal error" so the analyst doesn't see a
|
|
Pythonist's traceback either.
|
|
|
|
Pavel's #185 Phase 3B: previously a `httpx.ReadTimeout` from an
|
|
`agnes query --remote` against a slow BQ view dumped a 30-frame
|
|
traceback to the analyst's terminal. Now: one clean line + a hint,
|
|
return code 1.
|
|
"""
|
|
from cli.client import AgnesTransportError, _log_traceback, _LOG_FILE
|
|
try:
|
|
app()
|
|
except (AgnesTransportError) as exc:
|
|
typer.echo(f"Error: {exc.user_message}", err=True)
|
|
if exc.hint:
|
|
typer.echo(exc.hint, err=True)
|
|
sys.exit(1)
|
|
except typer.Exit:
|
|
raise
|
|
except (KeyboardInterrupt, SystemExit):
|
|
raise
|
|
except Exception as exc: # last-resort net — escaped exceptions are bugs
|
|
log = _log_traceback(exc, context="unhandled at CLI top-level")
|
|
typer.echo(
|
|
f"Error: internal CLI error ({type(exc).__name__}). "
|
|
f"Full traceback logged to {log}.",
|
|
err=True,
|
|
)
|
|
sys.exit(1)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
_run_with_clean_errors()
|