cli-consumption 0.0.1__tar.gz → 0.0.2__tar.gz

{cli_consumption-0.0.1 → cli_consumption-0.0.2}/.github/workflows/release.yaml

@@ -4,6 +4,12 @@ on:
   push:
     branches: [main]
     paths: [pyproject.toml]
+  workflow_dispatch:
+    inputs:
+      release_sha:
+        description: Commit on main where the version first appeared
+        required: true
+        type: string
 
 concurrency:
   group: release
@@ -16,32 +22,49 @@ jobs:
       contents: read
     outputs:
       changed: ${{ steps.version.outputs.changed }}
+      release-sha: ${{ steps.version.outputs.release-sha }}
       version: ${{ steps.version.outputs.version }}
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: astral-sh/setup-uv@v6
-        with:
-          python-version: "3.14"
+          ref: ${{ inputs.release_sha || github.sha }}
       - name: Detect project version change
         id: version
         env:
           BEFORE_SHA: ${{ github.event.before }}
+          EVENT_NAME: ${{ github.event_name }}
         run: |
           set -euo pipefail
 
-          current_version="$(uv version --short)"
+          release_commit="$(git rev-parse HEAD)"
+          if ! git merge-base --is-ancestor "${release_commit}" origin/main; then
+            echo "Release commit ${release_commit} is not on main." >&2
+            exit 1
+          fi
+
+          current_version="$(
+            python3 -c 'import tomllib; print(tomllib.load(open("pyproject.toml", "rb"))["project"]["version"])'
+          )"
           previous_version=""
-          if git cat-file -e "${BEFORE_SHA}:pyproject.toml" 2>/dev/null; then
+          comparison_sha="${BEFORE_SHA}"
+          if [[ "${EVENT_NAME}" == "workflow_dispatch" ]]; then
+            comparison_sha="${release_commit}^"
+          fi
+          if git cat-file -e "${comparison_sha}:pyproject.toml" 2>/dev/null; then
             previous_version="$(
-              git show "${BEFORE_SHA}:pyproject.toml" |
-                python -c 'import sys, tomllib; print(tomllib.load(sys.stdin.buffer)["project"]["version"])'
+              git show "${comparison_sha}:pyproject.toml" |
+                python3 -c 'import sys, tomllib; print(tomllib.load(sys.stdin.buffer)["project"]["version"])'
             )"
           fi
 
+          echo "release-sha=${release_commit}" >> "${GITHUB_OUTPUT}"
           echo "version=${current_version}" >> "${GITHUB_OUTPUT}"
           if [[ "${current_version}" == "${previous_version}" ]]; then
+            if [[ "${EVENT_NAME}" == "workflow_dispatch" ]]; then
+              echo "Version ${current_version} did not first appear in ${release_commit}." >&2
+              exit 1
+            fi
             echo "changed=false" >> "${GITHUB_OUTPUT}"
           else
             echo "changed=true" >> "${GITHUB_OUTPUT}"
@@ -55,6 +78,8 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.detect-version.outputs.release-sha }}
       - uses: astral-sh/setup-uv@v6
         with:
           enable-cache: true
@@ -83,8 +108,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ needs.detect-version.outputs.release-sha }}
       - name: Tag version commit
         env:
+          RELEASE_SHA: ${{ needs.detect-version.outputs.release-sha }}
           RELEASE_VERSION: ${{ needs.detect-version.outputs.version }}
         run: |
           set -euo pipefail
@@ -93,14 +120,14 @@ jobs:
           git fetch --tags origin
           if git rev-parse --verify --quiet "refs/tags/${tag}" >/dev/null; then
             tagged_commit="$(git rev-list -n 1 "${tag}")"
-            if [[ "${tagged_commit}" != "${GITHUB_SHA}" ]]; then
-              echo "Tag ${tag} already points to ${tagged_commit}, not ${GITHUB_SHA}." >&2
+            if [[ "${tagged_commit}" != "${RELEASE_SHA}" ]]; then
+              echo "Tag ${tag} already points to ${tagged_commit}, not ${RELEASE_SHA}." >&2
               exit 1
             fi
           else
             git config user.name "github-actions[bot]"
             git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-            git tag --annotate "${tag}" --message "Release ${RELEASE_VERSION}" "${GITHUB_SHA}"
+            git tag --annotate "${tag}" --message "Release ${RELEASE_VERSION}" "${RELEASE_SHA}"
             git push origin "refs/tags/${tag}"
           fi
 

{cli_consumption-0.0.1 → cli_consumption-0.0.2}/CONTRIBUTING.md

@@ -36,3 +36,7 @@ Update the project version with `uv version <version>` and include the resulting
 squash-merged into `main`, the release workflow reruns the quality gates, builds the
 distributions, tags the merge commit as `v<version>`, and publishes to PyPI through
 Trusted Publishing. Do not create the release tag manually.
+
+If a release fails before publication, rerun it for the original version commit with
+`gh workflow run release.yaml --ref main -f release_sha=<merge-commit>`. The workflow
+rejects commits outside `main` and conflicting existing tags.

{cli_consumption-0.0.1 → cli_consumption-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: cli-consumption
-Version: 0.0.1
+Version: 0.0.2
 Summary: Analyze and consolidate AI coding CLI consumption across machines.
 Project-URL: Homepage, https://github.com/Guillaume-Lombardo/cli-consumption
 Project-URL: Documentation, https://github.com/Guillaume-Lombardo/cli-consumption#readme
@@ -53,7 +53,7 @@ uv run cli-consumption export --output reports
 ```
 
 Open `reports/dashboard.html` locally. The generated dashboard is self-contained and
-makes no network requests.
+makes no network requests. Detailed normalized CSV tables are opt-in with `--csv`.
 
 The dashboard supports time, provider, machine, project, and model filters. It reports
 period-over-period activity, token composition, cache efficiency, turn latency and
@@ -62,7 +62,7 @@ duration and reliability, configuration cohorts, compactions, subagent delegatio
 ingestion quality. Token events are local usage metadata rather than billing records,
 and a technically completed turn is not a measure of task quality or productivity.
 
-For a dashboard that is safer to share, omit the detailed CSV exports, pseudonymize
+For a dashboard that is safer to share, pseudonymize
 machine, project, model, and role labels, group tool names, round timestamps to days,
 and hide small rows in the cohort-comparison view:
 
@@ -162,7 +162,7 @@ server. See [Architecture](docs/architecture.md) for trade-offs.
 cli-consumption collect    Collect local or copied provider data into SQL
 cli-consumption sync       Collect and send a snapshot to a central API
 cli-consumption serve      Run the central collection API
-cli-consumption export     Write CSV tables and the HTML dashboard
+cli-consumption export     Write the HTML dashboard and optional CSV tables
 cli-consumption providers  Show supported and planned providers
 ```
 

{cli_consumption-0.0.1 → cli_consumption-0.0.2}/README.md

@@ -25,7 +25,7 @@ uv run cli-consumption export --output reports
 ```
 
 Open `reports/dashboard.html` locally. The generated dashboard is self-contained and
-makes no network requests.
+makes no network requests. Detailed normalized CSV tables are opt-in with `--csv`.
 
 The dashboard supports time, provider, machine, project, and model filters. It reports
 period-over-period activity, token composition, cache efficiency, turn latency and
@@ -34,7 +34,7 @@ duration and reliability, configuration cohorts, compactions, subagent delegatio
 ingestion quality. Token events are local usage metadata rather than billing records,
 and a technically completed turn is not a measure of task quality or productivity.
 
-For a dashboard that is safer to share, omit the detailed CSV exports, pseudonymize
+For a dashboard that is safer to share, pseudonymize
 machine, project, model, and role labels, group tool names, round timestamps to days,
 and hide small rows in the cohort-comparison view:
 
@@ -134,7 +134,7 @@ server. See [Architecture](docs/architecture.md) for trade-offs.
 cli-consumption collect    Collect local or copied provider data into SQL
 cli-consumption sync       Collect and send a snapshot to a central API
 cli-consumption serve      Run the central collection API
-cli-consumption export     Write CSV tables and the HTML dashboard
+cli-consumption export     Write the HTML dashboard and optional CSV tables
 cli-consumption providers  Show supported and planned providers
 ```
 

{cli_consumption-0.0.1 → cli_consumption-0.0.2}/docs/architecture.md

@@ -7,7 +7,7 @@ and reporting. This lets users compare multiple AI coding CLIs without forcing t
 local formats into one parser.
 
 ```text
-provider files -> adapter -> metadata-only snapshot -> SQL storage -> CSV/dashboard
+provider files -> adapter -> metadata-only snapshot -> SQL storage -> dashboard/CSV
                                       |
                                       +-> HTTPS collector -> central SQL storage
 ```
@@ -21,7 +21,8 @@ provider files -> adapter -> metadata-only snapshot -> SQL storage -> CSV/dashbo
 - `storage`: owns the normalized schema, idempotent replacement rules, SQLite, and
   PostgreSQL engine creation.
 - `api` and `sync`: offer an optional push workflow for recurring multi-machine use.
-- `exporting` and `dashboard`: provide portable CSV files and an offline HTML view.
+- `dashboard` and `exporting`: provide an offline HTML view by default and portable CSV
+  tables when explicitly requested.
 - `cli`: exposes the same capabilities through one executable.
 
 When Codex exposes its local thread graph, the adapter also records metadata-only

{cli_consumption-0.0.1 → cli_consumption-0.0.2}/docs/privacy.md

@@ -59,7 +59,8 @@ and period comparisons are computed inside the document. The remaining project n
 machine labels, model names, tool names, roles, token counters, statuses, and activity
 timestamps are still private operational metadata.
 
-`export --share-safe` writes only the HTML dashboard and omits CSV tables. Within that
+The normal `export` command writes only the HTML dashboard; detailed CSV tables require
+the explicit `--csv` option. `export --share-safe` rejects that option. Within its HTML
 document, machine, project, model, and subagent-role labels are replaced with local
 aliases; tools are reduced to broad categories; timestamps are rounded to UTC days;
 and the comparison table hides cohorts smaller than five closed turns. The underlying

{cli_consumption-0.0.1 → cli_consumption-0.0.2}/docs/roadmap.md

@@ -6,7 +6,7 @@
 - Offline multi-machine deduplication
 - SQLite and PostgreSQL storage
 - Metadata-only central collection API
-- CSV exports, a self-contained dashboard, and a share-safe dashboard profile
+- Opt-in CSV exports, a self-contained dashboard, and a share-safe dashboard profile
 - Context-pressure, work-item reliability, configuration-cohort, and delegation views
 
 ## Next provider increments

{cli_consumption-0.0.1 → cli_consumption-0.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "cli-consumption"
-version = "0.0.1"
+version = "0.0.2"
 description = "Analyze and consolidate AI coding CLI consumption across machines."
 readme = "README.md"
 requires-python = ">=3.14"

{cli_consumption-0.0.1 → cli_consumption-0.0.2}/src/cli_consumption/cli.py

@@ -132,17 +132,28 @@ def export_command(
     ] = "cli-consumption.sqlite",
     output: Annotated[Path, typer.Option("--output", "-o")] = Path("reports"),
     dashboard: Annotated[bool, typer.Option("--dashboard/--no-dashboard")] = True,
+    csv_exports: Annotated[
+        bool,
+        typer.Option(
+            "--csv/--no-csv",
+            help="Also write detailed normalized SQL tables as CSV files.",
+        ),
+    ] = False,
     share_safe: Annotated[
         bool,
         typer.Option(
             "--share-safe",
-            help=("Write only a pseudonymized dashboard; omit detailed CSV exports."),
+            help="Write a pseudonymized dashboard and reject detailed CSV exports.",
         ),
     ] = False,
 ) -> None:
-    """Export normalized SQL tables to CSV and a self-contained HTML dashboard."""
+    """Write a self-contained HTML dashboard and optional detailed CSV tables."""
     if share_safe and not dashboard:
         raise typer.BadParameter("--share-safe requires --dashboard")
+    if share_safe and csv_exports:
+        raise typer.BadParameter("--share-safe cannot be combined with --csv")
+    if not dashboard and not csv_exports:
+        raise typer.BadParameter("enable --dashboard or --csv")
     if (
         share_safe
         and output.is_dir()
@@ -154,7 +165,7 @@ def export_command(
     engine = create_database_engine(database)
     try:
         initialize_database(engine)
-        paths = [] if share_safe else export_csv(engine, output)
+        paths = export_csv(engine, output) if csv_exports else []
         if dashboard:
             dashboard_path = output / "dashboard.html"
             generate_dashboard(engine, dashboard_path, share_safe=share_safe)

{cli_consumption-0.0.1 → cli_consumption-0.0.2}/src/cli_consumption/dashboard.py

@@ -309,45 +309,55 @@ def _document(payload: str) -> str:
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <title>CLI Consumption</title>
   <style>
-    :root {{ color-scheme:dark; --bg:#07111f; --panel:#101e31; --panel2:#0c1929; --ink:#eef6ff; --muted:#91a7bf; --accent:#5eead4; --blue:#60a5fa; --violet:#a78bfa; --amber:#fbbf24; --red:#fb7185; --line:#233b55; }}
+    :root {{ color-scheme:light; --bg:#f7f8fa; --ink:#172033; --muted:#64748b; --accent:#087f6d; --blue:#2563eb; --violet:#7c3aed; --amber:#b45309; --red:#be123c; --line:#d7dde7; --control:#fff; --track:#e3e8ef; --hover:#edf1f6; }}
+    @media (prefers-color-scheme:dark) {{ :root:not([data-theme]) {{ color-scheme:dark; --bg:#09111d; --ink:#edf4fc; --muted:#94a3b8; --accent:#5eead4; --blue:#60a5fa; --violet:#a78bfa; --amber:#fbbf24; --red:#fb7185; --line:#26364a; --control:#111c2b; --track:#1b2a3d; --hover:#142235; }} }}
+    :root[data-theme="dark"] {{ color-scheme:dark; --bg:#09111d; --ink:#edf4fc; --muted:#94a3b8; --accent:#5eead4; --blue:#60a5fa; --violet:#a78bfa; --amber:#fbbf24; --red:#fb7185; --line:#26364a; --control:#111c2b; --track:#1b2a3d; --hover:#142235; }}
+    :root[data-theme="light"] {{ color-scheme:light; --bg:#f7f8fa; --ink:#172033; --muted:#64748b; --accent:#087f6d; --blue:#2563eb; --violet:#7c3aed; --amber:#b45309; --red:#be123c; --line:#d7dde7; --control:#fff; --track:#e3e8ef; --hover:#edf1f6; }}
     * {{ box-sizing:border-box }}
-    body {{ margin:0; background:radial-gradient(circle at 85% 0,#12335a 0,transparent 32%),var(--bg); color:var(--ink); font:15px/1.5 Inter,ui-sans-serif,system-ui,sans-serif }}
-    main {{ max-width:1440px; margin:auto; padding:40px 24px 64px }}
-    h1 {{ margin:0; font-size:clamp(32px,5vw,58px); letter-spacing:-.04em }}
+    body {{ margin:0; background:var(--bg); color:var(--ink); font:15px/1.5 Inter,ui-sans-serif,system-ui,sans-serif }}
+    main {{ max-width:1440px; margin:auto; padding:30px 24px 64px }}
+    h1 {{ margin:0; font-size:clamp(30px,4vw,48px); letter-spacing:-.04em; white-space:nowrap }}
     h2 {{ margin:0; font-size:18px }} h3 {{ margin:0 0 12px; font-size:14px; color:var(--muted) }}
+    .header {{ display:grid; grid-template-columns:auto minmax(280px,1fr) auto; gap:28px; align-items:center }}
+    .header-copy {{ max-width:760px }}
     .eyebrow {{ color:var(--accent); text-transform:uppercase; letter-spacing:.15em; font-size:12px; font-weight:800 }}
-    .subtitle,.muted,.definition {{ color:var(--muted) }} .subtitle {{ max-width:780px }}
+    .subtitle,.muted,.definition {{ color:var(--muted) }} .subtitle {{ margin:4px 0 0 }}
+    .theme-toggle {{ border:1px solid var(--line); background:var(--control); color:var(--ink); border-radius:999px; padding:9px 13px; cursor:pointer; font:inherit; white-space:nowrap }}
+    .theme-toggle:hover {{ background:var(--hover) }}
     .filters,.cards,.grid,.metric-grid,.quality-grid {{ display:grid; gap:14px }}
     .filters {{ grid-template-columns:repeat(auto-fit,minmax(170px,1fr)); margin:28px 0 14px }}
     .custom-dates {{ display:none; grid-template-columns:1fr 1fr; gap:14px; margin-bottom:14px }} .custom-dates.visible {{ display:grid }}
     .cards {{ grid-template-columns:repeat(auto-fit,minmax(170px,1fr)); margin:18px 0 }}
     .grid {{ grid-template-columns:repeat(2,minmax(0,1fr)); margin-bottom:14px }}
     .metric-grid,.quality-grid {{ grid-template-columns:repeat(2,minmax(0,1fr)) }}
-    .panel,.card,select,input {{ border:1px solid var(--line); background:color-mix(in srgb,var(--panel) 93%,transparent); border-radius:16px }}
-    .panel {{ padding:21px; overflow:auto }} .panel.full {{ margin-bottom:14px }} .card {{ padding:17px }}
+    .panel,.card {{ border:0; background:var(--bg) }}
+    select,input {{ border:1px solid var(--line); background:var(--control); border-radius:12px }}
+    .panel {{ padding:18px 0; overflow:auto }} .panel.full {{ margin-bottom:14px }} .card {{ padding:14px 0 }}
     .panel-head {{ display:flex; align-items:baseline; justify-content:space-between; gap:12px; margin-bottom:17px }}
-    .card strong {{ display:block; font-size:27px; letter-spacing:-.03em }} .card span,label {{ color:var(--muted) }}
+    .card-label {{ display:flex; align-items:center; gap:6px; color:var(--muted) }}
+    .card strong {{ display:block; font-size:27px; letter-spacing:-.03em }} label {{ color:var(--muted) }}
+    .info {{ position:relative; width:18px; height:18px; border:1px solid var(--line); border-radius:50%; background:transparent; color:var(--muted); padding:0; cursor:help; font:700 11px/16px Inter,ui-sans-serif,system-ui,sans-serif }}
+    .info::after {{ content:attr(data-tooltip); position:absolute; z-index:5; left:50%; bottom:calc(100% + 8px); width:min(280px,70vw); padding:9px 11px; border:1px solid var(--line); border-radius:9px; background:var(--control); color:var(--ink); font:12px/1.4 Inter,ui-sans-serif,system-ui,sans-serif; text-align:left; text-transform:none; letter-spacing:0; box-shadow:0 8px 24px rgb(0 0 0 / .16); opacity:0; pointer-events:none; transform:translate(-50%,4px); transition:opacity .12s,transform .12s }}
+    .info:hover::after,.info:focus-visible::after {{ opacity:1; transform:translate(-50%,0) }}
     .delta {{ font-size:12px; margin-top:4px }} .delta.better {{ color:var(--accent) }} .delta.worse {{ color:var(--red) }} .delta.neutral {{ color:var(--muted) }}
     .badge {{ display:none; width:max-content; margin-top:10px; padding:5px 9px; border:1px solid var(--accent); border-radius:99px; color:var(--accent); font-size:11px; text-transform:uppercase; letter-spacing:.08em }} .badge.visible {{ display:block }}
     label {{ display:grid; gap:6px; font-size:11px; text-transform:uppercase; letter-spacing:.08em }}
     select,input {{ color:var(--ink); padding:10px 12px; width:100% }}
     table {{ width:100%; border-collapse:collapse; white-space:nowrap }} th,td {{ padding:9px 8px; border-bottom:1px solid var(--line); text-align:left }}
-    th {{ color:var(--muted); font-size:11px; text-transform:uppercase; cursor:pointer }} tbody tr:hover {{ background:#13243a }}
+    th {{ color:var(--muted); font-size:11px; text-transform:uppercase; cursor:pointer }} tbody tr:hover {{ background:var(--hover) }}
     .bars {{ display:grid; gap:10px }} .bar {{ display:grid; grid-template-columns:minmax(110px,1.2fr) 4fr auto; gap:10px; align-items:center }}
-    .track {{ height:11px; display:flex; background:#1a2d43; border-radius:99px; overflow:hidden }} .fill {{ height:100%; background:linear-gradient(90deg,var(--blue),var(--accent)) }}
+    .track {{ height:11px; display:flex; background:var(--track); border-radius:99px; overflow:hidden }} .fill {{ height:100%; background:var(--blue) }}
     .seg-cache {{ background:var(--blue) }} .seg-uncached {{ background:var(--violet) }} .seg-visible {{ background:var(--accent) }} .seg-reasoning {{ background:var(--amber) }} .seg-other {{ background:var(--red) }}
     .legend {{ display:flex; flex-wrap:wrap; gap:12px; margin:0 0 15px; color:var(--muted); font-size:12px }} .legend i {{ display:inline-block; width:9px; height:9px; border-radius:2px; margin-right:5px }}
-    .stat {{ padding:12px; border:1px solid var(--line); border-radius:12px; background:var(--panel2) }} .stat b {{ display:block; font-size:20px }}
-    .status {{ display:flex; height:13px; border-radius:99px; overflow:hidden; background:#1a2d43; margin:12px 0 }} .completed {{ background:var(--accent) }} .aborted {{ background:var(--red) }} .progress {{ background:var(--amber) }}
+    .stat {{ padding:12px 0; border:0; background:var(--bg) }} .stat b {{ display:block; font-size:20px }}
+    .status {{ display:flex; height:13px; border-radius:99px; overflow:hidden; background:var(--track); margin:12px 0 }} .completed {{ background:var(--accent) }} .aborted {{ background:var(--red) }} .progress {{ background:var(--amber) }}
     .empty {{ color:var(--muted); padding:26px 0 }} .definition {{ font-size:12px; margin:12px 0 0 }} footer {{ color:var(--muted); margin-top:26px }}
     details {{ border-top:1px solid var(--line); margin-top:18px; padding-top:14px }} summary {{ cursor:pointer; color:var(--muted) }}
-    @media (max-width:850px) {{ .grid {{ grid-template-columns:1fr }} .bar {{ grid-template-columns:minmax(90px,1fr) 2fr auto }} }}
+    @media (max-width:850px) {{ .header {{ grid-template-columns:1fr auto; gap:12px }} .header-copy {{ grid-column:1 / -1; grid-row:2 }} .grid {{ grid-template-columns:1fr }} .bar {{ grid-template-columns:minmax(90px,1fr) 2fr auto }} }}
   </style>
 </head>
 <body><main>
-  <div class="eyebrow">Local-first AI CLI observability</div>
-  <h1>CLI Consumption</h1>
-  <p class="subtitle">Understand activity, responsiveness, token composition, and workflows without exporting prompts, responses, or tool arguments.</p>
+  <header class="header"><h1>CLI Consumption</h1><div class="header-copy"><div class="eyebrow">Local-first AI CLI observability</div><p class="subtitle">Understand activity, responsiveness, token composition, and workflows without exporting prompts, responses, or tool arguments.</p></div><button class="theme-toggle" id="themeToggle" type="button" aria-label="Switch color theme">Theme</button></header>
   <div class="badge" id="privacyBadge">Share-safe dashboard</div>
   <section class="filters">
     <label>Period<select id="period"><option value="all">All history</option><option value="7">Latest 7 days</option><option value="30">Latest 30 days</option><option value="90">Latest 90 days</option><option value="custom">Custom range</option></select></label>
@@ -360,11 +370,11 @@ def _document(payload: str) -> str:
   <section class="cards" id="cards"></section>
   <section class="grid">
     <article class="panel"><div class="panel-head"><h2>Activity and token composition</h2><span class="muted" id="activityCaption"></span></div><div class="legend"><span><i class="seg-cache"></i>Cached input</span><span><i class="seg-uncached"></i>Uncached input</span><span><i class="seg-visible"></i>Visible output</span><span><i class="seg-reasoning"></i>Reasoning</span><span><i class="seg-other"></i>Unattributed</span></div><div class="bars" id="activity"></div></article>
-    <article class="panel"><div class="panel-head"><h2>Turn performance</h2><span class="muted">p50 / p75 / p95</span></div><div id="performance"></div><p class="definition">Duration is provider-reported. Technical throughput is closed turns per active hour: overlapping intervals are merged in detailed reports, while share-safe reports sum turn durations. It is not a productivity score.</p></article>
+    <article class="panel"><div class="panel-head"><h2>Tools</h2><span class="muted">names only</span></div><h3>Top tools</h3><div class="bars" id="tools"></div><h3 style="margin-top:20px">Categories</h3><div class="bars" id="toolCategories"></div><h3 style="margin-top:20px">Frequent transitions</h3><div class="bars" id="toolTransitions"></div></article>
   </section>
   <section class="grid">
     <article class="panel"><div class="panel-head"><h2>Models</h2><span class="muted">tokens and efficiency</span></div><div id="models"></div></article>
-    <article class="panel"><div class="panel-head"><h2>Tools</h2><span class="muted">names only</span></div><h3>Top tools</h3><div class="bars" id="tools"></div><h3 style="margin-top:20px">Categories</h3><div class="bars" id="toolCategories"></div><h3 style="margin-top:20px">Frequent transitions</h3><div class="bars" id="toolTransitions"></div></article>
+    <article class="panel"><div class="panel-head"><h2>Turn performance</h2><span class="muted">p50 / p75 / p95</span></div><div id="performance"></div><p class="definition">Duration is provider-reported. Technical throughput is closed turns per active hour: overlapping intervals are merged in detailed reports, while share-safe reports sum turn durations. It is not a productivity score.</p></article>
   </section>
   <section class="grid">
     <article class="panel"><div class="panel-head"><h2>Workflow complexity</h2><span class="muted">turns, context, delegation</span></div><div class="metric-grid" id="workflow"></div><h3 style="margin-top:20px">Subagent roles</h3><div class="bars" id="agentRoles"></div></article>
@@ -403,7 +413,7 @@ function activeMs(turns){{if(data.meta.shareSafe)return total(turns,'durationMs'
 function maxConcurrent(turns){{if(data.meta.shareSafe)return null;const byMachine={{}};turns.forEach(t=>{{const c=convByKey[t.conversationKey];if(!c||!validDate(t.startedAt)||!validDate(t.endedAt))return;(byMachine[c.machine]??=[]).push([Date.parse(t.startedAt),1],[Date.parse(t.endedAt),-1]);}});let peak=0;Object.values(byMachine).forEach(points=>{{points.sort((a,b)=>a[0]-b[0]||a[1]-b[1]);let active=0;points.forEach(([,change])=>{{active+=change;peak=Math.max(peak,active);}});}});return peak;}}
 function metrics(s){{const closed=s.turns.filter(t=>t.status==='completed'||t.status==='aborted'),closedKeys=new Set(closed.map(t=>t.key)),closedCalls=s.calls.filter(c=>c.turnKey!==null&&closedKeys.has(c.turnKey)),durations=closed.map(t=>t.durationMs).filter(x=>x!==null),ttfts=closed.map(t=>t.ttftMs).filter(x=>x!==null),turnTokens=closed.map(t=>t.total_tokens),turnTools=closed.map(t=>t.toolCalls),input=total(closedCalls,'input_tokens'),cached=total(closedCalls,'cached_input_tokens'),output=total(closedCalls,'output_tokens'),tokens=total(closedCalls,'total_tokens'),active=activeMs(closed),pressures=s.contexts.map(c=>100*Number(c.inputTokens)/Number(c.contextWindowTokens)).filter(Number.isFinite),activeDays=new Set(s.turns.map(t=>day(t.startedAt)).filter(x=>x!=='unknown')).size;return{{turns:s.turns.length,completed:s.turns.filter(t=>t.status==='completed').length,aborted:s.turns.filter(t=>t.status==='aborted').length,tokens,tokensPerTurn:percentile(turnTokens,.5),toolsPerTurn:percentile(turnTools,.5),cacheRate:ratio(cached,input),durationP50:percentile(durations,.5),durationP75:percentile(durations,.75),durationP95:percentile(durations,.95),ttftP50:percentile(ttfts,.5),ttftP75:percentile(ttfts,.75),ttftP95:percentile(ttfts,.95),tokenP75:percentile(turnTokens,.75),tokenP95:percentile(turnTokens,.95),toolP75:percentile(turnTools,.75),toolP95:percentile(turnTools,.95),abortRate:ratio(s.turns.filter(t=>t.status==='aborted').length,closed.length),reasoningShare:ratio(total(closedCalls,'reasoning_output_tokens'),output),activeMs:active,throughput:active?3600000*closed.length/active:0,pressureP50:percentile(pressures,.5),pressureP95:percentile(pressures,.95),activeDays}};}}
 function delta(current,previous,preference='neutral'){{if(previous===null||previous===undefined||!Number.isFinite(previous)||previous===0)return'';const change=100*(current-previous)/Math.abs(previous),better=preference==='higher'?change>0:preference==='lower'?change<0:null,style=better===null?'neutral':better?'better':'worse';return`<div class="delta ${{style}}">${{change>=0?'+':''}}${{change.toFixed(1)}}% vs previous period</div>`;}}
-function card(label,value,current,previous,preference='neutral'){{return`<div class="card"><span>${{label}}</span><strong>${{value}}</strong>${{delta(current,previous,preference)}}</div>`;}}
+function card(label,value,current,previous,tooltip,preference='neutral'){{return`<div class="card"><div class="card-label"><span>${{label}}</span><button class="info" type="button" aria-label="${{escapeHtml(label)}}: ${{escapeHtml(tooltip)}}" data-tooltip="${{escapeHtml(tooltip)}}" title="${{escapeHtml(tooltip)}}">i</button></div><strong>${{value}}</strong>${{delta(current,previous,preference)}}</div>`;}}
 function stat(label,value,detail=''){{return`<div class="stat"><span class="muted">${{label}}</span><b>${{value}}</b>${{detail?`<small class="muted">${{detail}}</small>`:''}}</div>`;}}
 function group(rows,key,value=null){{const out={{}};rows.forEach(r=>{{const label=r[key]||'unknown';out[label]=(out[label]||0)+(value?(Number(r[value])||0):1);}});return Object.entries(out).sort((a,b)=>b[1]-a[1]);}}
 function toolCategory(name){{const categories=['Agent coordination','Shell and processes','Files and workspace','Web','Planning','Media','Integrations','Other'];if(categories.includes(name))return name;if(['spawn_agent','wait_agent','list_agents','send_message','followup_task','interrupt_agent'].includes(name))return'Agent coordination';if(['exec_command','write_stdin','wait'].includes(name))return'Shell and processes';if(['apply_patch','view_image'].includes(name))return'Files and workspace';if(name==='web__run')return'Web';if(['update_plan','create_goal','get_goal','update_goal'].includes(name))return'Planning';if(name.includes('imagegen'))return'Media';if(name.startsWith('mcp__')||name.includes('mcp_resource'))return'Integrations';return'Other';}}
@@ -423,9 +433,10 @@ function sortExplorer(key){{if(tableSort.key===key)tableSort.direction*=-1;else
 function renderTable(conversations,turns){{const statuses={{}};turns.forEach(t=>{{const s=statuses[t.conversationKey]??={{completed:0,aborted:0,progress:0}};if(t.status==='completed')s.completed++;else if(t.status==='aborted')s.aborted++;else s.progress++;}});const outcome=c=>{{const s=statuses[c.key];return s?.aborted?'contains abort':s?.progress?'in progress':s?.completed?'technically closed':'unknown';}},value=(c,key)=>key==='models'?c.models.join(', '):key==='outcome'?outcome(c):c[key];const rows=conversations.slice().sort((a,b)=>{{const av=value(a,tableSort.key)??'',bv=value(b,tableSort.key)??'';return tableSort.direction*(typeof av==='number'&&typeof bv==='number'?av-bv:String(av).localeCompare(String(bv)));}});$('conversationCount').textContent=`${{rows.length}} conversations`;$('conversationDetail').innerHTML='';$('table').innerHTML=rows.length?`<table><thead><tr><th onclick="sortExplorer('startedAt')">Started</th><th onclick="sortExplorer('provider')">Provider</th><th onclick="sortExplorer('machine')">Machine</th><th onclick="sortExplorer('project')">Project</th><th onclick="sortExplorer('models')">Models</th><th onclick="sortExplorer('turns')">Turns</th><th onclick="sortExplorer('outcome')">Technical status</th><th onclick="sortExplorer('compactions')">Compactions</th><th onclick="sortExplorer('total_tokens')">Tokens</th><th onclick="sortExplorer('durationSeconds')">Wall duration</th></tr></thead><tbody>${{rows.map(c=>`<tr style="cursor:pointer" onclick="showConversation(${{c.key}})"><td>${{escapeHtml(c.startedAt||'')}}</td><td>${{escapeHtml(c.provider)}}</td><td>${{escapeHtml(c.machine)}}</td><td>${{escapeHtml(c.project)}}</td><td>${{escapeHtml(c.models.join(', '))}}</td><td>${{fmt(c.turns)}}</td><td>${{outcome(c)}}</td><td>${{fmt(c.compactions)}}</td><td>${{fmt(c.total_tokens)}}</td><td>${{formatDuration((Number(c.durationSeconds)||0)*1000)}}</td></tr>`).join('')}}</tbody></table>`:'<div class="empty">No conversations match these filters.</div>';}}
 function showConversation(key){{if(!currentSlice)return;const c=convByKey[key],turns=currentSlice.turns.filter(t=>t.conversationKey===key),calls=currentSlice.calls.filter(x=>x.conversationKey===key),tools=currentSlice.tools.filter(x=>x.conversationKey===key),work=currentSlice.work.filter(x=>x.conversationKey===key),contexts=currentSlice.contexts.filter(x=>x.conversationKey===key),closed=turns.filter(t=>t.status==='completed'||t.status==='aborted'),durations=closed.map(t=>t.durationMs).filter(x=>x!==null),ttfts=closed.map(t=>t.ttftMs).filter(x=>x!==null),pressures=contexts.map(x=>100*Number(x.inputTokens)/Number(x.contextWindowTokens));$('conversationDetail').innerHTML=`<details open><summary>${{escapeHtml(c.project)}} · ${{escapeHtml(c.startedAt||'')}}</summary><div class="quality-grid" style="margin-top:14px">${{stat('Turns in range',fmt(turns.length))}}${{stat('Tokens in range',fmt(total(calls,'total_tokens')))}}${{stat('Median TTFT',formatDuration(percentile(ttfts,.5)))}}${{stat('Median duration',formatDuration(percentile(durations,.5)))}}${{stat('Context p95',pct(percentile(pressures,.95)))}}${{stat('Technical work items',fmt(work.length))}}</div><h3 style="margin-top:16px">Tools in this conversation</h3><div class="bars">${{group(tools,'tool').slice(0,8).map(([name,count])=>`<div class="bar"><span>${{escapeHtml(name)}}</span><div class="track"><div class="fill" style="width:${{100*count/Math.max(tools.length,1)}}%"></div></div><b>${{fmt(count)}}</b></div>`).join('')||'<div class="empty">No tool calls.</div>'}}</div></details>`;}}
 function formatDuration(ms){{if(ms===null||ms===undefined||!Number.isFinite(Number(ms)))return'—';const seconds=Number(ms)/1000;if(seconds<60)return`${{seconds.toFixed(1)}}s`;if(seconds<3600)return`${{(seconds/60).toFixed(1)}}m`;return`${{(seconds/3600).toFixed(1)}}h`;}}
-function render(){{const f=selected(),s=slice(f),m=metrics(s),previous=f.range?.previous?metrics(slice(f,f.range.previous)):null,closed=s.turns.filter(t=>t.status==='completed'||t.status==='aborted'),delegation=delegationStats(s),peak=maxConcurrent(closed),compacted=new Set(s.compactions.map(c=>c.conversationKey)).size,delegated=new Set(s.subagents.map(x=>x.conversationKey)).size,subTokens=total(s.subagents,'tokens');currentSlice=s;$('cards').innerHTML=card('Closed turns',fmt(m.completed+m.aborted),m.completed+m.aborted,previous?previous.completed+previous.aborted:null)+card('Active days',fmt(m.activeDays),m.activeDays,previous?.activeDays,'higher')+card('Total tokens',short(m.tokens),m.tokens,previous?.tokens)+card('Median tokens / turn',short(m.tokensPerTurn),m.tokensPerTurn,previous?.tokensPerTurn)+card('Median TTFT',formatDuration(m.ttftP50),m.ttftP50,previous?.ttftP50,'lower')+card('Median duration',formatDuration(m.durationP50),m.durationP50,previous?.durationP50,'lower')+card('Technical throughput',m.throughput.toFixed(1)+'/h',m.throughput,previous?.throughput,'higher')+card('Context pressure p95',pct(m.pressureP95),m.pressureP95,previous?.pressureP95,'lower')+card(data.meta.shareSafe?'Summed turn time':'Active time',formatDuration(m.activeMs),m.activeMs,previous?.activeMs);drawActivity(s.calls,f.range);renderPerformance(m);renderModels(s.calls);drawBars('tools',group(s.tools,'tool'));drawBars('toolCategories',group(s.tools.map(t=>({{category:toolCategory(t.tool)}})),'category'));drawBars('toolTransitions',toolTransitions(s.tools));$('workflow').innerHTML=stat('Turns using tools',pct(ratio(s.turns.filter(t=>t.toolCalls>0).length,s.turns.length)))+stat('Compacted conversations',pct(ratio(compacted,s.conversations.length)))+stat('Delegating conversations',pct(ratio(delegated,s.conversations.length)),`${{fmt(s.subagents.length)}} edges`)+stat('Mapped child threads',fmt(delegation.mapped),`${{fmt(delegation.closed)}} technically closed`)+stat('Max delegation fan-out',fmt(delegation.maxFanout))+stat('Max delegation depth',fmt(delegation.maxDepth))+stat('Reported subagent tokens',short(subTokens),'may overlap parent totals')+stat('Peak concurrent turns',peak===null?'Hidden':fmt(peak),data.meta.shareSafe?'exact times rounded':'per-machine peak');drawBars('agentRoles',group(s.subagents,'role'));renderOutcomes(s.turns);renderContext(s,m);renderWork(s);renderCohorts(s);renderQuality(s,f);renderTable(s.conversations,s.turns);}}
+function render(){{const f=selected(),s=slice(f),m=metrics(s),previous=f.range?.previous?metrics(slice(f,f.range.previous)):null,closed=s.turns.filter(t=>t.status==='completed'||t.status==='aborted'),delegation=delegationStats(s),peak=maxConcurrent(closed),compacted=new Set(s.compactions.map(c=>c.conversationKey)).size,delegated=new Set(s.subagents.map(x=>x.conversationKey)).size,subTokens=total(s.subagents,'tokens'),activeLabel=data.meta.shareSafe?'Summed turn time':'Active time',activeHelp=data.meta.shareSafe?'Sum of provider-reported durations for closed turns; exact overlap cannot be recovered from day-rounded timestamps.':'Union of provider-reported closed-turn intervals per machine, so overlapping turns are counted once.';currentSlice=s;$('cards').innerHTML=card('Closed turns',fmt(m.completed+m.aborted),m.completed+m.aborted,previous?previous.completed+previous.aborted:null,'Turns whose provider status is completed or aborted in the selected range.')+card('Active days',fmt(m.activeDays),m.activeDays,previous?.activeDays,'Distinct UTC calendar days containing at least one turn in the selected range.','higher')+card('Total tokens',short(m.tokens),m.tokens,previous?.tokens,'Provider-reported total tokens from model usage events attributed to closed turns; this is not billing data.')+card('Median tokens / turn',short(m.tokensPerTurn),m.tokensPerTurn,previous?.tokensPerTurn,'Median provider-reported total-token count across completed and aborted turns.')+card('Median TTFT',formatDuration(m.ttftP50),m.ttftP50,previous?.ttftP50,'Median provider-reported time to first token across closed turns with TTFT data.','lower')+card('Median duration',formatDuration(m.durationP50),m.durationP50,previous?.durationP50,'Median provider-reported elapsed duration across completed and aborted turns with duration data.','lower')+card('Technical throughput',m.throughput.toFixed(1)+'/h',m.throughput,previous?.throughput,'Completed and aborted turns divided by active hours. This is a technical activity rate, not a productivity score.','higher')+card('Context pressure p95',pct(m.pressureP95),m.pressureP95,previous?.pressureP95,'95th percentile of latest model-call input tokens divided by the reported context-window size.','lower')+card(activeLabel,formatDuration(m.activeMs),m.activeMs,previous?.activeMs,activeHelp);drawActivity(s.calls,f.range);renderPerformance(m);renderModels(s.calls);drawBars('tools',group(s.tools,'tool'));drawBars('toolCategories',group(s.tools.map(t=>({{category:toolCategory(t.tool)}})),'category'));drawBars('toolTransitions',toolTransitions(s.tools));$('workflow').innerHTML=stat('Turns using tools',pct(ratio(s.turns.filter(t=>t.toolCalls>0).length,s.turns.length)))+stat('Compacted conversations',pct(ratio(compacted,s.conversations.length)))+stat('Delegating conversations',pct(ratio(delegated,s.conversations.length)),`${{fmt(s.subagents.length)}} edges`)+stat('Mapped child threads',fmt(delegation.mapped),`${{fmt(delegation.closed)}} technically closed`)+stat('Max delegation fan-out',fmt(delegation.maxFanout))+stat('Max delegation depth',fmt(delegation.maxDepth))+stat('Reported subagent tokens',short(subTokens),'may overlap parent totals')+stat('Peak concurrent turns',peak===null?'Hidden':fmt(peak),data.meta.shareSafe?'exact times rounded':'per-machine peak');drawBars('agentRoles',group(s.subagents,'role'));renderOutcomes(s.turns);renderContext(s,m);renderWork(s);renderCohorts(s);renderQuality(s,f);renderTable(s.conversations,s.turns);}}
 options('provider',data.conversations.map(c=>c.provider));options('machine',data.conversations.map(c=>c.machine));options('project',data.conversations.map(c=>c.project));options('model',data.modelCalls.map(c=>c.model));
 const dates=data.conversations.map(c=>c.startedAt).filter(validDate).sort();if(dates.length){{$('from').value=dates[0].slice(0,10);$('to').value=dates.at(-1).slice(0,10);}}
 if(data.meta.shareSafe)$('privacyBadge').classList.add('visible');
+const themeButton=$('themeToggle');let savedTheme=null;try{{savedTheme=localStorage.getItem('cli-consumption-theme');}}catch{{}}if(savedTheme==='light'||savedTheme==='dark')document.documentElement.dataset.theme=savedTheme;function currentTheme(){{return document.documentElement.dataset.theme||(matchMedia('(prefers-color-scheme: dark)').matches?'dark':'light');}}function updateThemeButton(){{const theme=currentTheme(),next=theme==='dark'?'light':'dark';themeButton.textContent=theme==='dark'?'Light mode':'Dark mode';themeButton.setAttribute('aria-label',`Switch to ${{next}} mode`);}}themeButton.addEventListener('click',()=>{{const next=currentTheme()==='dark'?'light':'dark';document.documentElement.dataset.theme=next;try{{localStorage.setItem('cli-consumption-theme',next);}}catch{{}}updateThemeButton();}});updateThemeButton();
 document.querySelectorAll('select,input').forEach(e=>e.addEventListener('change',()=>{{$('customDates').classList.toggle('visible',$('period').value==='custom');render();}}));render();
 </script></body></html>"""

{cli_consumption-0.0.1 → cli_consumption-0.0.2}/tests/test_cli.py

@@ -10,6 +10,11 @@ from cli_consumption.cli import app
 runner = CliRunner()
 
 
+def normalized_cli_output(output: str) -> str:
+    """Remove terminal formatting and wrapping from CLI output assertions."""
+    return " ".join(strip_ansi(output).split())
+
+
 def test_provider_status_is_explicit() -> None:
     result = runner.invoke(app, ["providers"])
     assert result.exit_code == 0
@@ -54,6 +59,24 @@ def test_collect_and_export(tmp_path: Path, rollout_factory) -> None:
     )
     assert result.exit_code == 0, result.output
     assert (reports / "dashboard.html").is_file()
+    assert [path.name for path in reports.iterdir()] == ["dashboard.html"]
+
+    csv_reports = tmp_path / "csv-reports"
+    result = runner.invoke(
+        app,
+        [
+            "export",
+            "--database",
+            str(database),
+            "--output",
+            str(csv_reports),
+            "--csv",
+            "--no-dashboard",
+        ],
+    )
+    assert result.exit_code == 0, result.output
+    assert (csv_reports / "conversations.csv").is_file()
+    assert not (csv_reports / "dashboard.html").exists()
 
     safe_reports = tmp_path / "safe-reports"
     result = runner.invoke(
@@ -97,5 +120,18 @@ def test_collect_and_export(tmp_path: Path, rollout_factory) -> None:
         ],
     )
     assert result.exit_code == 2
-    normalized_output = " ".join(strip_ansi(result.output).split())
-    assert "requires --dashboard" in normalized_output
+    assert "requires --dashboard" in normalized_cli_output(result.output)
+
+    result = runner.invoke(
+        app,
+        ["export", "--database", str(database), "--share-safe", "--csv"],
+    )
+    assert result.exit_code == 2
+    assert "cannot be combined" in normalized_cli_output(result.output)
+
+    result = runner.invoke(
+        app,
+        ["export", "--database", str(database), "--no-dashboard"],
+    )
+    assert result.exit_code == 2
+    assert "enable --dashboard or --csv" in normalized_cli_output(result.output)

{cli_consumption-0.0.1 → cli_consumption-0.0.2}/tests/test_storage_and_exports.py

@@ -56,6 +56,13 @@ def test_ingestion_is_idempotent_and_exports_are_self_contained(
     html = dashboard.read_text(encoding="utf-8")
     assert "CLI Consumption" in html
     assert "Turn performance" in html
+    assert 'id="themeToggle"' in html
+    assert "localStorage.getItem('cli-consumption-theme')" in html
+    assert "radial-gradient" not in html
+    assert "linear-gradient" not in html
+    assert html.index("<h2>Models</h2>") < html.index("<h2>Turn performance</h2>")
+    assert "Median provider-reported total-token count" in html
+    assert html.count('class="info"') == 1
     assert "Data quality" in html
     assert "https://" not in html
     assert "secret value" not in html

{cli_consumption-0.0.1 → cli_consumption-0.0.2}/uv.lock

@@ -56,7 +56,7 @@ wheels = [
 
 [[package]]
 name = "cli-consumption"
-version = "0.0.1"
+version = "0.0.2"
 source = { editable = "." }
 dependencies = [
     { name = "fastapi" },