stacktrace-cli 0.7.0__tar.gz → 0.7.1__tar.gz

{stacktrace_cli-0.7.0 → stacktrace_cli-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: stacktrace-cli
-Version: 0.7.0
+Version: 0.7.1
 Summary: CLI for Stacktrace — Detection and Response platform for AI Agents.
 Project-URL: Homepage, https://stacktrace.ai
 Author-email: "Stacktrace AI, Inc" <founders@stacktrace.ai>
@@ -51,7 +51,7 @@ Requires Python 3.11 or newer.
 
 ```console
 $ stacktrace --version
-stacktrace 0.7.0 (openaca 0.8.0)
+stacktrace 0.7.1 (openaca 0.8.0)
 ```
 
 ## Quick start

{stacktrace_cli-0.7.0 → stacktrace_cli-0.7.1}/README.md

@@ -24,7 +24,7 @@ Requires Python 3.11 or newer.
 
 ```console
 $ stacktrace --version
-stacktrace 0.7.0 (openaca 0.8.0)
+stacktrace 0.7.1 (openaca 0.8.0)
 ```
 
 ## Quick start

{stacktrace_cli-0.7.0 → stacktrace_cli-0.7.1}/docs/adrs/0087-deploy-compiled-policy-with-a-privileged-scheduled-job.md

@@ -69,11 +69,16 @@ prior artifact and installed revision unchanged. A failure in the directory
 sync or independent state write after the rename is recovered by recompiling
 and repeating the idempotent atomic install on the next poll. Missing or corrupt
 state after enrollment fails static; same-deployment re-enrollment preserves a
-valid revision anchor rather than constructing a new one from Fleet. Fresh
-bootstrap is the only exception: enrollment is first marked incomplete, the
-empty state anchor is written, and enrollment is then marked complete. A retry
-may recreate only that incomplete empty anchor before any service or artifact
-exists; a completed enrollment with missing state remains `state_lost`.
+valid revision anchor rather than constructing a new one from Fleet. An
+explicitly confirmed organization switch on the same API origin and pinned
+account stops the timer, removes the previous organization's artifact, resets
+the organization-scoped revision anchor and installs the new enrollment before
+reconciliation resumes. API-origin or pinned-account changes remain refused.
+Fresh bootstrap is the only other reset: enrollment is first marked incomplete,
+the empty state anchor is written, and enrollment is then marked complete. A
+retry may recreate only that incomplete empty anchor before any service or
+artifact exists; a completed enrollment with missing state remains
+`state_lost`.
 
 The job preserves Fleet's policy revision in the client contract, rechecks it
 after compilation, and discards a candidate if the revision changed mid-run.
@@ -144,6 +149,16 @@ reinstalls it. This duplication is accepted for the short-lived Claude bridge
 and disappears with hook-based enforcement. One user per machine is the
 supported scope.
 
+Every interactive `stacktrace remote configure` retries reconciliation of an
+already-installed, same-version root policy runtime, including when
+credentials are unchanged. Reconciliation is idempotent, so no retry marker is
+stored in the developer's config; a second interactive run retries a failed,
+declined or interrupted update. Noninteractive configuration never inspects
+the privileged runtime or opens a sudo prompt. An interactive configuration
+with a missing or version-mismatched root runtime directs the developer back
+to the one-line installer, which remains the only bootstrap and upgrade path
+for `/opt`.
+
 The file's installation is not proof that every key is effective. Claude can
 select a higher-ranked server or MDM source; current versions combine some
 restrictive MCP keys across sources, but not every key the compiler emits.

stacktrace_cli-0.7.1/docs/releases/v0.7.1.md

@@ -0,0 +1,76 @@
+# 0.7.1 — Switching organizations, and a shorter daemon status
+
+0.7.0 installed Fleet policy automatically, but a machine stayed enrolled in
+the first organization it joined: pointing it at another one was refused. This
+release lets you switch organizations once you confirm it, and keeps automatic
+policy sync current when you change credentials. `daemon status` and
+`remote status` also get shorter, clearer output.
+
+## Switching a machine to another organization
+
+Rerunning the one-line installer with a token from a different organization
+now asks first:
+
+```
+Switch automatic policy sync to <organization>?
+This removes the previous organization's managed policy
+```
+
+If you confirm, the scheduled job stops, the previous organization's policy is
+removed, the new organization is enrolled and its policy is installed before
+the job starts again (ADR-0087). The switch only works on the same Fleet server
+and the same enrolled user. Changing the Fleet URL or the user is still
+refused. Fleet's organization name has its control characters stripped before
+it appears in the prompt, so a name from Fleet can't rewrite or hide the
+warning.
+
+## `remote configure` keeps automatic policy sync current
+
+When automatic policy sync is installed, an interactive
+`stacktrace remote configure` now also updates it with the new credentials,
+asking for administrator approval. A failed attempt is retried by running
+`configure` again. If policy sync isn't installed, or was installed by a
+different version, `configure` tells you to rerun the installer instead. A
+noninteractive `configure`, such as one in a script, never opens a sudo prompt.
+
+Two concurrent `configure` runs can no longer leave the older credentials
+enrolled. An install whose credentials were replaced while it waited for the
+lock is refused with `enrollment_attempt_stale`.
+
+## Shorter status output
+
+- **`daemon status` is a quick health check by default.** It shows whether
+  the daemon is running, the running and installed versions, watermark age,
+  queue depth, parked rows and the last error. `--verbose` adds the start
+  time and the full support detail.
+- **`remote status` says "Connected"** once Fleet accepts the token, and
+  shows the organization, key name, masked token and local asset id. It no
+  longer prints per-agent BOM, last-seen or component counts. Those came from a
+  Fleet route that needs a dashboard login, so they stay in Fleet.
+
+## Also in this release
+
+- **Monitor:** the page uses Fleet's favicon, so its tab is easy to find.
+- **Bug fixes.** A build from a branch or editable checkout no longer reports
+  its own root policy runtime as out of date.
+
+## Install
+
+`uv tool install stacktrace-cli==0.7.1` or `pip install stacktrace-cli==0.7.1`.
+Python 3.11 or newer; macOS and Linux.
+
+## Compatibility
+
+Beta — no back-compat hedging.
+
+- **`remote status` output changed.** The `Latest BOM`, `Last seen` and
+  `Components` lines are gone, `Asset:` prints only the local asset id, and the
+  `Token:` line shows the masked token (`ot_••••abcd`) instead of the token id.
+  `remote configure` masks the token the same way, where it used to print
+  `ot_...abcd`. Update any script that parses either.
+- **`daemon status` output is shorter.** Pass `--verbose` for the full detail
+  0.7.0 printed by default.
+- **Interactive `remote configure` may ask for sudo.** On a machine with
+  automatic policy sync installed, it now updates the privileged enrollment
+  every time it runs interactively.
+- **Dependencies**: `openaca==0.8.0` and `openaidr==0.3.2`, both unchanged.

{stacktrace_cli-0.7.0 → stacktrace_cli-0.7.1}/docs/specs/daemon-scanning.md

@@ -182,6 +182,7 @@ acquired".
 
 ```
 stacktrace daemon status
+stacktrace daemon status --verbose
 ```
 
 Host configuration controls whether the process exists. A native supervisor
@@ -200,8 +201,12 @@ handled into a clean shutdown rather than left to the default, so a stop closes
 the composition thread, flushes telemetry and removes the socket file instead of
 leaving a half-open socket behind the process that bound it.
 
-`daemon status` is the support surface — how anyone answers "is this endpoint
-working" without reading a log:
+`daemon status` gives a quick health check by default: running state, running
+and installed versions, watermark age, queue depth, parked rows and last error
+— a parked row is the one durable failure signal `docs/specs/daemon-uploads.md`
+requires surviving a restart, so it stays out of `--verbose`. Pass `--verbose`
+for start time and the full support surface used to diagnose a quiet or
+misconfigured endpoint:
 
 | Shows | Because |
 |---|---|

{stacktrace_cli-0.7.0 → stacktrace_cli-0.7.1}/docs/specs/managed-policy-deployment.md

@@ -131,15 +131,25 @@ into a separate root-only configuration. It explicitly passes the API origin
 used by the one-line onboarding flow and refuses a mismatch with the user's
 saved configuration. Fleet's authenticated `/me` response supplies the
 organization attached to that collector token, so onboarding does not ask the
-developer to look up or re-enter an organization ID. Later `stacktrace remote
-configure` calls change only the user channel and do not silently retarget the
-root service. Re-running `install-service` for the same API origin,
-Fleet-confirmed organization and pinned account may rotate the root token, but
-it preserves the existing revision state; changing any of those deployment
-identities is refused by this temporary bridge. Enrollment and the initial
-state anchor use the explicit incomplete-bootstrap protocol described under
-Atomic installation. A retry never infers "fresh install" merely from a
-missing file or artifact; only the durable incomplete marker permits repair.
+developer to look up or re-enter an organization ID. Every interactive
+`stacktrace remote configure` retries reconciliation of an existing
+same-version root runtime, even when the credentials are unchanged. The
+operation is idempotent, so no retry marker is stored in the developer's
+config. Noninteractive configuration neither inspects the privileged runtime
+nor opens a sudo prompt; rerunning `configure` interactively retries it. An
+interactive call with a missing or stale root runtime directs the developer to
+rerun the installer.
+Re-running `install-service` for the same API origin, Fleet-confirmed
+organization and pinned account may rotate the root token while preserving the
+existing revision state. A different Fleet-confirmed organization on that same
+origin and pinned account requires explicit confirmation. The transition stops
+the timer, removes the prior organization's artifact, resets the
+organization-scoped revision state and installs the new enrollment before
+reconciliation resumes. API-origin and pinned-account changes remain refused.
+Enrollment and the initial state anchor use the explicit incomplete-bootstrap
+protocol described under Atomic installation. A retry never infers "fresh
+install" merely from a missing file or artifact; only the durable incomplete
+marker permits repair.
 Service re-enrollment,
 `install-service` and `uninstall-service` are explicit privileged operations
 that acquire the same apply lock described above before touching any
@@ -424,7 +434,8 @@ deployed or enforced.
 | Fresh install stops after writing incomplete enrollment but before completing the empty state anchor | A same-deployment retry finishes that explicitly incomplete bootstrap only while no service or artifact exists |
 | Service state is missing or unparseable after enrollment | Fail static with `state_lost`; keep the artifact; require administrator recovery without deriving a new anchor from Fleet |
 | Same-deployment re-enrollment | Preserve the revision anchor; update credentials and reconcile |
-| Re-enrollment changes API origin, organization or pinned account | Refuse it in this temporary bridge |
+| Re-enrollment changes organization on the same API origin and pinned account | Require explicit confirmation; stop the timer, remove the old artifact, reset revision state, enroll and reconcile |
+| Re-enrollment changes API origin or pinned account | Refuse it in this temporary bridge |
 | Timer fires while apply is active | Coalesce; the active pass owns progress |
 | Initial reconciliation coalesces with the newly started timer | Report that reconciliation is already running; do not claim a revision was installed |
 | Re-enrollment, `install-service` or `uninstall-service` runs while an apply pass is active | Wait for the same lock the pass holds; never race it |
@@ -481,10 +492,12 @@ Implementation is not complete until tests establish:
     retry while no service or artifact exists; after completion, a missing or
     unparseable state file fails static without deriving a revision from the
     current Fleet envelope or changing the artifact;
-14. same-deployment re-enrollment preserves the revision anchor, a
-    cross-deployment change is refused, and every accepted higher revision is
-    persisted as the monotonic floor even when its compile later fails or its
-    post-rename directory sync reports an error;
+14. same-deployment re-enrollment preserves the revision anchor; an explicitly
+    confirmed organization switch on the same origin and pinned account stops
+    reconciliation, removes the old artifact and resets the organization-scoped
+    anchor, while origin or account changes are refused; every accepted higher
+    revision is persisted as the monotonic floor even when its compile later
+    fails or its post-rename directory sync reports an error;
 15. `install-service`, `uninstall-service` and re-enrollment each wait for the
     apply lock rather than racing an active pass, so an upgrade cannot replace
     the running runtime or configuration mid-pass and an uninstall cannot be

{stacktrace_cli-0.7.0 → stacktrace_cli-0.7.1}/docs/specs/remote-sync.md

@@ -104,8 +104,13 @@ dropped and nothing is left behind talking to the Cloud.
 | `openaca remote sync endpoint` | `stacktrace remote sync endpoint` |
 | `openaca remote policy compile` | `stacktrace remote policy compile` |
 
-And all five of its client calls, so no capability is quietly lost:
-`register_asset`, `upload_bom`, `get_me`, `get_policy_document`, `get_asset`.
+The collector-authenticated client keeps `register_asset`, `upload_bom`,
+`get_me` and `get_policy_document`. `remote status` uses `get_me` for the
+verified organization and key name, then reports the configured key suffix and
+locally registered asset id. It does not call Fleet's `/assets/{id}` dashboard
+route: that surface requires a Clerk session, while this client holds a
+collector token. Rich asset, BOM and component status stays in Fleet until a
+narrow collector-authenticated status endpoint exists.
 
 Nothing else in OpenACA reaches the Cloud — verified rather than assumed:
 `tools/cli.py` is the only module outside `tools/remote/` importing it, and
@@ -436,7 +441,12 @@ scope would name none. Carrying the exclusion forward preserves current
 behaviour; changing it is a separate decision involving the Cloud.
 
 **Command output.** `configure` echoes the URL and the token masked as
-`ot_...abcd`. `status` prints org, token, asset and per-agent latest BOM.
+`ot_••••abcd`. `status` verifies the collector token through `/me`, then prints
+`Connected to <api_url>`, the org, key name and masked configured token, plus
+the locally registered asset id. The `Connected` line appears only after `/me`
+accepts the token; a refused token or an unreachable server prints the error
+alone. Rich asset and per-agent BOM status remains in Fleet because its dashboard
+route requires a Clerk session.
 `--dry-run` prints NDJSON, one payload per line, nothing else on stdout, so it
 stays pipeable.
 

{stacktrace_cli-0.7.0 → stacktrace_cli-0.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "stacktrace-cli"
-version = "0.7.0"
+version = "0.7.1"
 description = "CLI for Stacktrace — Detection and Response platform for AI Agents."
 readme = "README.md"
 requires-python = ">=3.11"

{stacktrace_cli-0.7.0 → stacktrace_cli-0.7.1}/src/stacktrace_cli/__init__.py

@@ -2,7 +2,7 @@
 
 import logging as _logging
 
-__version__ = "0.7.0"
+__version__ = "0.7.1"
 
 # Only the daemon attaches a handler (ADR-0048). Without this one, a WARNING
 # logged in any other process would reach Python's last-resort handler and

{stacktrace_cli-0.7.0 → stacktrace_cli-0.7.1}/src/stacktrace_cli/daemon/cli.py

@@ -210,14 +210,13 @@ def _reject_unobservable_kinds(config: DaemonConfig) -> None:
 
 
 @daemon.command()
-def status() -> None:
+@click.option("--verbose", is_flag=True, help="Include detailed daemon diagnostics.")
+def status(verbose: bool) -> None:
     """Report whether this endpoint is working, without reading a log.
 
-    Every row answers a question someone asks when a machine looks quiet: a
-    watermark hours old means the scanner has stopped; a queue that grows with
-    a reader attached means the reader is not draining; a database that only
-    grows means retention is not pruning; and a configuration without its source
-    makes fleet-wide drift undebuggable (`docs/specs/daemon-scanning.md`).
+    The default output is a quick health check. Pass ``--verbose`` for the
+    diagnostic details used to investigate a quiet or misconfigured machine
+    (`docs/specs/daemon-scanning.md`).
     """
     from stacktrace_cli.build import version_label
 
@@ -242,7 +241,8 @@ def status() -> None:
     if live is not None:
         click.echo(f"version: {live.build}")
         click.echo(f"installed: {version_label()}")
-        click.echo(f"started: {live.started_at}")
+        if verbose:
+            click.echo(f"started: {live.started_at}")
 
     try:
         # One `_store()` call apiece, all against the same file: if the first
@@ -251,9 +251,10 @@ def status() -> None:
         # them can print a partial line before that first failure.
         click.echo(f"watermark: {_watermark_line(paths)}")
         click.echo(f"queue depth: {_queue_line(paths)}")
-        click.echo(f"cursors: {_cursor_line(paths)}")
         click.echo(f"parked: {_parked_line(paths)}")
-        click.echo(f"database: {_database_line(paths)}")
+        if verbose:
+            click.echo(f"cursors: {_cursor_line(paths)}")
+            click.echo(f"database: {_database_line(paths)}")
     except (sqlite3.DatabaseError, ValueError) as exc:
         # A corrupt file or a schema newer than this build reads raises here
         # (`_check_version`'s own refusal) -- precisely the moment the daemon
@@ -263,6 +264,9 @@ def status() -> None:
         click.echo(f"database: unreadable — {exc}")
     click.echo(f"last error: {last_error(paths.log) or 'none reported'}")
 
+    if not verbose:
+        return
+
     try:
         config = _effective_config(live.config if live is not None else None)
     except ValueError as exc:

{stacktrace_cli-0.7.0 → stacktrace_cli-0.7.1}/src/stacktrace_cli/monitor/server.py

@@ -43,6 +43,10 @@ _ASSETS: dict[str, str] = {
     "/app.js": "app.js",
     "/styles.css": "styles.css",
     "/inventory.js": "inventory.js",
+    # The same icons Fleet's web app ships, copied rather than shared.
+    "/favicon.ico": "favicon.ico",
+    "/icon.svg": "icon.svg",
+    "/apple-icon.png": "apple-icon.png",
     # Vendored rather than fetched, so they are served rather than linked. An
     # allow-list of exact names is why they have to be named here: a font
     # missing from it 404s and the page falls back silently, which is the
@@ -57,6 +61,9 @@ _CONTENT_TYPES: dict[str, str] = {
     "app.js": "text/javascript; charset=utf-8",
     "styles.css": "text/css; charset=utf-8",
     "inventory.js": "text/javascript; charset=utf-8",
+    "favicon.ico": "image/x-icon",
+    "icon.svg": "image/svg+xml",
+    "apple-icon.png": "image/png",
     "fonts/dm-sans-latin.woff2": "font/woff2",
     "fonts/dm-mono-400-latin.woff2": "font/woff2",
     "fonts/dm-mono-500-latin.woff2": "font/woff2",

stacktrace_cli-0.7.1/src/stacktrace_cli/monitor/site/icon.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" fill="none">
+<rect width="48" height="48" rx="11" fill="#17130e"></rect>
+<g transform="translate(24 24) scale(0.72) translate(-24 -24)"><path d="M38 8H18A8.5 8.5 0 0 0 18 25H20.5" stroke="#ede3d0" stroke-width="5" stroke-linecap="round" fill="none"></path>
+  <path d="M27.5 25H30A8.5 8.5 0 0 1 30 42H12" stroke="#ede3d0" stroke-width="5" stroke-linecap="round" fill="none"></path>
+  <circle cx="38" cy="8" r="5" fill="#e8681f"></circle>
+  <circle cx="12" cy="42" r="5" fill="#e8681f"></circle></g>
+</svg>

{stacktrace_cli-0.7.0 → stacktrace_cli-0.7.1}/src/stacktrace_cli/monitor/site/index.html

@@ -4,6 +4,9 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width,initial-scale=1">
 <title>Stacktrace — monitor</title>
+<link rel="icon" href="favicon.ico" sizes="any">
+<link rel="icon" href="icon.svg" type="image/svg+xml">
+<link rel="apple-touch-icon" href="apple-icon.png">
 <link rel="stylesheet" href="styles.css">
 </head>
 <body>

{stacktrace_cli-0.7.0 → stacktrace_cli-0.7.1}/src/stacktrace_cli/remote/cli.py

@@ -15,12 +15,17 @@ openaca's is copied into this repository — not copying it is the point.
 from __future__ import annotations
 
 import json
+import os
+import pwd
+import re
+import sys
 from pathlib import Path
 
 import click
 import httpx
 from openaca.core import KindSelectionError, validate_kind_selection
 
+from stacktrace_cli.build import version_label
 from stacktrace_cli.detector.run import DEFAULT_BUDGET, DEFAULT_SAMPLE_BUDGET
 from stacktrace_cli.options import analyzer_option, resolve_analyzer
 from stacktrace_cli.remote.client import (
@@ -39,6 +44,7 @@ from stacktrace_cli.remote.config import (
 from stacktrace_cli.remote.policy import compile_remote_policy
 from stacktrace_cli.remote.policy_service import (
     ApplyResult,
+    EnrollmentReplacementRequired,
     PolicyServiceError,
     default_policy_service,
 )
@@ -111,7 +117,11 @@ def configure(token: str, api_url: str) -> None:
             # asset id are still the ones in effect. Purging first would delete
             # the backlog they need before the switch away from them ever lands.
             save_remote_config(
-                RemoteConfig(api_url=api_url, token=token, asset_id=preserved_asset_id),
+                RemoteConfig(
+                    api_url=api_url,
+                    token=token,
+                    asset_id=preserved_asset_id,
+                ),
                 config_path,
             )
             if preserved_asset_id is None and existing.asset_id is not None:
@@ -119,11 +129,51 @@ def configure(token: str, api_url: str) -> None:
     except (ConfigError, OSError) as exc:
         raise click.ClickException(str(exc)) from exc
     click.echo(f"Remote configured at {api_url} with token {_mask_token(token)}")
+    _update_policy_enrollment(api_url)
+
+
+def _update_policy_enrollment(api_url: str) -> None:
+    if not _stdin_is_tty():
+        return
+    runtime_version = _policy_runtime_version()
+    if runtime_version is None:
+        click.echo(
+            "Automatic policy sync is not installed; run https://stacktrace.ai/install.sh "
+            "to enable it"
+        )
+        return
+    if runtime_version != version_label():
+        click.echo(
+            f"Automatic policy sync uses stacktrace {runtime_version}; "
+            "rerun https://stacktrace.ai/install.sh to upgrade it"
+        )
+        return
+    click.echo("Updating automatic organization policy sync (administrator approval required)...")
+    try:
+        _install_policy_enrollment(user=_current_user(), api_url=api_url)
+    except PolicyServiceError as exc:
+        raise click.ClickException("automatic policy sync update failed") from exc
+
+
+def _policy_runtime_version() -> str | None:
+    return default_policy_service().runtime_version()
+
+
+def _install_policy_enrollment(*, user: str, api_url: str) -> None:
+    default_policy_service().install_via_sudo(user=user, expected_api_url=api_url)
+
+
+def _stdin_is_tty() -> bool:
+    return sys.stdin.isatty()
+
+
+def _current_user() -> str:
+    return pwd.getpwuid(os.getuid()).pw_name
 
 
 @main.command()
 def status() -> None:
-    """Show remote token and asset status."""
+    """Show remote connection and local asset registration."""
     try:
         config = load_remote_config(get_config_path())
     except ConfigError as exc:
@@ -134,29 +184,22 @@ def status() -> None:
     client = RemoteClient(api_url=config.api_url, token=config.token)
     try:
         me = client.get_me()
-        click.echo(f"Org: {me.org.name} ({me.org.id})")
-        click.echo(f"Token: {me.token.name} ({me.token.id})")
-        if config.asset_id is None:
-            click.echo(NO_ASSET_YET)
-            return
-        asset = client.get_asset(config.asset_id)
     except httpx.TransportError as exc:
         raise click.ClickException(f"Remote API unreachable: {exc}") from exc
     except RemoteClientError as exc:
         raise click.ClickException(str(exc)) from exc
 
-    click.echo(f"Asset: {asset.display_name} ({asset.id})")
-    # Per agent, because an asset has no BOM of its own: one upload per agent
-    # kind, each with its own id.
-    if asset.agents:
-        click.echo("Latest BOM:")
-        for agent in asset.agents:
-            coverage = f" ({agent.composition_coverage})" if agent.composition_coverage else ""
-            click.echo(f"  {agent.agent_kind}: {agent.latest_bom_id or 'none'}{coverage}")
+    # Printed only once `/me` has accepted the token, so it never claims a
+    # connection the server refused.
+    click.echo(f"Connected to {config.api_url}")
+    click.echo(f"Org: {me.org.name} ({me.org.id})")
+    click.echo(f"Token: {me.token.name} ({_mask_token(config.token)})")
+    if config.asset_id is None:
+        click.echo(NO_ASSET_YET)
     else:
-        click.echo("Latest BOM: none — no agent has synced yet")
-    click.echo(f"Last seen: {asset.last_seen_at or 'never'}")
-    click.echo(f"Components: {asset.component_count} components")
+        # Asset detail is a Clerk-authenticated dashboard surface. The local
+        # registration id is the collector-token-safe status this client owns.
+        click.echo(f"Asset: {config.asset_id}")
 
 
 @main.group()
@@ -215,11 +258,27 @@ def policy_apply() -> None:
 @click.option("--api-url", required=True, help="Administrator-confirmed Fleet API origin.")
 def policy_install_service(user: str, api_url: str) -> None:
     """Enroll and install automatic privileged policy reconciliation."""
+    service = default_policy_service()
     try:
-        result = default_policy_service().install(
+        result = service.install(
             user=user,
             expected_api_url=api_url,
         )
+    except EnrollmentReplacementRequired as exc:
+        click.confirm(
+            f"Switch automatic policy sync to {_sanitize_for_terminal(exc.new_org_name)}?\n"
+            "This removes the previous organization's managed policy",
+            abort=True,
+        )
+        try:
+            result = service.install(
+                user=user,
+                expected_api_url=api_url,
+                replace_enrollment=True,
+                confirmed_org_id=exc.new_org_id,
+            )
+        except PolicyServiceError as replacement_exc:
+            raise click.ClickException(replacement_exc.code) from replacement_exc
     except PolicyServiceError as exc:
         raise click.ClickException(exc.code) from exc
     if result.action == "no_policy":
@@ -424,6 +483,22 @@ def _print_upload_result(result: BomUploadResult) -> None:
     click.echo(f"Dashboard: {result.dashboard_url}")
 
 
+#: C0 controls and DEL: newline, carriage return, tab, and ESC (the lead byte
+#: of every ANSI escape sequence) among them. A name from Fleet is whoever
+#: holds a token to that org's own word, not this CLI's — stripping these
+#: before it reaches a destructive confirmation prompt is what keeps it from
+#: rewriting or hiding the warning beside it.
+_UNSAFE_TERMINAL_CHARS = re.compile(r"[\x00-\x1f\x7f]")
+_MAX_PROMPT_NAME_LENGTH = 200
+
+
+def _sanitize_for_terminal(value: str) -> str:
+    cleaned = _UNSAFE_TERMINAL_CHARS.sub("", value)
+    if len(cleaned) > _MAX_PROMPT_NAME_LENGTH:
+        cleaned = cleaned[:_MAX_PROMPT_NAME_LENGTH] + "…"
+    return cleaned
+
+
 def _mask_token(token: str) -> str:
     # Prefix + last 4 — the same last-4 the backend stores for console
     # display — so a user with several tokens can tell which one is
@@ -431,8 +506,8 @@ def _mask_token(token: str) -> str:
     # reveal little; real tokens are ot_ + 20+ chars.
     if token.startswith("ot_"):
         if len(token) >= 23:  # ot_ (3) + 20+ real secret chars
-            return f"ot_...{token[-4:]}"
-        return "ot_..."
+            return f"ot_••••{token[-4:]}"
+        return "ot_••••"
     return "***"