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

{cli_consumption-0.0.1 → cli_consumption-0.0.3}/.agents/skills/yolo/SKILL.md

@@ -1,16 +1,16 @@
 ---
 name: yolo
-description: Publish the current Codex work in a GitHub pull request, squash-merge it, then clean up its local and remote branches. Use only when the user explicitly invokes `$yolo` or requests the full publish, merge, and cleanup sequence.
+description: Publish the current Codex work in a GitHub pull request, squash-merge it, then clean up its local and remote branches without additional approval prompts. Use only when the user explicitly invokes `$yolo` or requests the full publish, merge, and cleanup sequence.
 ---
 
 # Publish, merge, and clean up
 
-Run each phase in order from the repository root. The implicit pull request is the one for the current Codex work and current branch.
+Run each phase in order from the repository root. The implicit pull request is the one for the current Codex work and current branch. Treat the explicit `$yolo` invocation as advance approval to push, create or ready the pull request, squash-merge it, and delete its exact source branch. Do not pause for additional confirmation during a successful, unambiguous run.
 
 ## 1. Publish
 
 1. Read all repository instructions and the product specification referenced by `AGENTS.md`.
-2. Load and follow `$yeet-github` in full to inspect, validate, commit, push, and open a draft pull request.
+2. Load and follow `$yeet-github` in full to inspect, validate, commit, push, and open a draft pull request, except do not request its approval before pushing or publishing: the explicit `$yolo` invocation already provides that approval.
 3. Retain the exact source and target branches, pushed SHA, pull-request number, and URL.
 4. Stop after any failure or ambiguous external result. Never merge or clean up after a partial failure.
 
@@ -21,8 +21,8 @@ Run each phase in order from the repository root. The implicit pull request is t
 3. Inspect required checks, reviews, conversations, and protections with `gh pr checks` and `gh pr view --json mergeStateStatus,reviewDecision,statusCheckRollup`.
 4. Mark a ready draft with `gh pr ready <number>`.
 5. Watch pending checks with `gh pr checks <number> --watch --interval 10`; stop and report any failing check.
-6. Present the final state and obtain explicit approval immediately before merging and deleting branches.
-7. After approval, use `gh pr merge <number> --squash --delete-branch --match-head-commit <source-sha>`.
+6. Present the verified final state as a progress update, then continue without requesting approval.
+7. Use `gh pr merge <number> --squash --delete-branch --match-head-commit <source-sha>`.
 8. If GitHub queues the merge, keep monitoring. Clean up only after `gh pr view <number> --json state,mergedAt,mergeCommit` reports `MERGED`.
 
 ## 3. Clean up
@@ -32,7 +32,7 @@ Run each phase in order from the repository root. The implicit pull request is t
 3. Run `git fetch --prune origin`.
 4. Switch to the target branch and update it only by fast-forward with `git switch <target-branch>` and `git pull --ff-only origin <target-branch>`.
 5. Delete the exact local source branch if it remains. `git branch -D <source-branch>` is allowed only after verified squash merge.
-6. If the unprotected remote branch remains, obtain fresh explicit approval before `git push origin --delete <source-branch>`.
+6. If the exact unprotected remote source branch remains, delete it with `git push origin --delete <source-branch>` without requesting additional approval.
 7. Run `git status --short --branch` and report the final state.
 
 ## Guardrails

cli_consumption-0.0.3/.agents/skills/yolo/agents/openai.yaml

@@ -0,0 +1,4 @@
+interface:
+  display_name: "Yolo GitHub"
+  short_description: "Publish, squash-merge, and clean up without prompts"
+  default_prompt: "Use $yolo to publish, squash-merge, and clean up the current GitHub work without additional approval prompts."

{cli_consumption-0.0.1 → cli_consumption-0.0.3}/.github/workflows/ci.yml

@@ -12,8 +12,8 @@ jobs:
   quality:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v6
+      - uses: actions/checkout@v7.0.1
+      - uses: astral-sh/setup-uv@v10.0.1
         with:
           enable-cache: true
           python-version: "3.14"

{cli_consumption-0.0.1 → cli_consumption-0.0.3}/.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
+      - uses: actions/checkout@v7.0.1
         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}"
@@ -54,8 +77,10 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v6
+      - uses: actions/checkout@v7.0.1
+        with:
+          ref: ${{ needs.detect-version.outputs.release-sha }}
+      - uses: astral-sh/setup-uv@v10.0.1
         with:
           enable-cache: true
           python-version: "3.14"
@@ -67,7 +92,7 @@ jobs:
       - run: uv run pytest --cov --cov-report=term-missing
       - run: uv build
       - name: Upload distributions
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7.0.1
         with:
           name: python-package-distributions
           path: dist/
@@ -80,11 +105,13 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7.0.1
         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
 
@@ -114,7 +141,7 @@ jobs:
       id-token: write
     steps:
       - name: Download distributions
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8.0.1
         with:
           name: python-package-distributions
           path: dist/

{cli_consumption-0.0.1 → cli_consumption-0.0.3}/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.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: cli-consumption
-Version: 0.0.1
+Version: 0.0.3
 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
@@ -33,8 +33,8 @@ models, tokens, tools, conversations, and turns. It can analyze one workstation,
 consolidate copied data from several machines, or send metadata-only snapshots to a
 central collector.
 
-Codex is fully supported. Claude Code, OpenCode, Kilo Code, and Pi are planned behind
-the same provider-neutral adapter contract.
+Codex and the core Claude Code local transcript format are supported. OpenCode, Kilo
+Code, and Pi are planned behind the same provider-neutral adapter contract.
 
 The collector deliberately excludes prompts, responses, tool arguments, and
 credentials. See [Privacy](docs/privacy.md) before sharing a database or export.
@@ -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:
 
@@ -96,6 +96,22 @@ hostname:
 uv run cli-consumption collect --database usage.sqlite
 ```
 
+Select Claude Code to read `~/.claude/projects/` instead:
+
+```bash
+uv run cli-consumption collect --provider claude --database usage.sqlite
+```
+
+Use `all` to detect and collect every supported provider present on the machine:
+
+```bash
+uv run cli-consumption collect --provider all --database usage.sqlite
+```
+
+With explicit copied sources, each path is inspected for the provider-specific
+`sessions/` or `projects/` directory. Sources that contain no supported provider data
+are rejected instead of silently skipped.
+
 For an offline multi-machine workflow, copy only each machine's Codex `sessions/`
 directory into a trusted analysis location. Do not copy `auth.json` or other
 credentials. Then repeat `--source`:
@@ -118,6 +134,14 @@ uv run cli-consumption collect \
   --project cli-consumption=/home/me/dev/cli-consumption
 ```
 
+Copied Claude Code sources point to the configuration directory containing `projects/`:
+
+```bash
+uv run cli-consumption collect --provider claude \
+  --source desktop=/data/claude/desktop \
+  --source laptop=/data/claude/laptop
+```
+
 ## SQLite and PostgreSQL
 
 A file path selects SQLite. A SQLAlchemy URL selects PostgreSQL:
@@ -162,7 +186,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.3}/README.md

@@ -5,8 +5,8 @@ models, tokens, tools, conversations, and turns. It can analyze one workstation,
 consolidate copied data from several machines, or send metadata-only snapshots to a
 central collector.
 
-Codex is fully supported. Claude Code, OpenCode, Kilo Code, and Pi are planned behind
-the same provider-neutral adapter contract.
+Codex and the core Claude Code local transcript format are supported. OpenCode, Kilo
+Code, and Pi are planned behind the same provider-neutral adapter contract.
 
 The collector deliberately excludes prompts, responses, tool arguments, and
 credentials. See [Privacy](docs/privacy.md) before sharing a database or export.
@@ -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:
 
@@ -68,6 +68,22 @@ hostname:
 uv run cli-consumption collect --database usage.sqlite
 ```
 
+Select Claude Code to read `~/.claude/projects/` instead:
+
+```bash
+uv run cli-consumption collect --provider claude --database usage.sqlite
+```
+
+Use `all` to detect and collect every supported provider present on the machine:
+
+```bash
+uv run cli-consumption collect --provider all --database usage.sqlite
+```
+
+With explicit copied sources, each path is inspected for the provider-specific
+`sessions/` or `projects/` directory. Sources that contain no supported provider data
+are rejected instead of silently skipped.
+
 For an offline multi-machine workflow, copy only each machine's Codex `sessions/`
 directory into a trusted analysis location. Do not copy `auth.json` or other
 credentials. Then repeat `--source`:
@@ -90,6 +106,14 @@ uv run cli-consumption collect \
   --project cli-consumption=/home/me/dev/cli-consumption
 ```
 
+Copied Claude Code sources point to the configuration directory containing `projects/`:
+
+```bash
+uv run cli-consumption collect --provider claude \
+  --source desktop=/data/claude/desktop \
+  --source laptop=/data/claude/laptop
+```
+
 ## SQLite and PostgreSQL
 
 A file path selects SQLite. A SQLAlchemy URL selects PostgreSQL:
@@ -134,7 +158,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.3}/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
 ```
@@ -16,12 +16,14 @@ provider files -> adapter -> metadata-only snapshot -> SQL storage -> CSV/dashbo
 
 - `adapters`: parse a CLI's local data into conversations, turns, model calls, tool
   calls, context-pressure samples, bounded turn settings, compactions, and content-free
-  work-item intervals. Codex is the first complete implementation.
+  work-item intervals. Codex exposes the complete analytics contract; Claude Code
+  exposes the core dimensions available in its local transcripts.
 - `models`: define the transport boundary shared by offline and API ingestion.
 - `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.3}/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.3}/docs/provider-support.md

@@ -3,7 +3,7 @@
 | Provider | Status | Initial source |
 | --- | --- | --- |
 | Codex | Supported | Local rollout JSONL and optional metadata-only subagent state |
-| Claude Code | Planned | To be verified before implementation |
+| Claude Code | Supported (core) | Local project transcript JSONL |
 | OpenCode | Planned | To be verified before implementation |
 | Kilo Code | Planned | To be verified before implementation |
 | Pi | Planned | To be verified before implementation |
@@ -12,6 +12,10 @@
 models, token usage, and tool names when available, and passes privacy regression tests.
 It does not mean that token counters are equivalent to invoices.
 
+`--provider all` detects every supported provider from its expected data directory and
+ingests each metadata-only snapshot independently. With no explicit source it checks
+the local default homes; repeated `--source` paths are filtered by detected format.
+
 Codex additionally exposes provider-reported turn duration and TTFT, model context
 window samples, bounded reasoning/collaboration/service-tier labels, timestamped
 compactions, technical work-item categories and durations, and local thread-spawn
@@ -19,6 +23,19 @@ relationships. Work-item content and rate-limit payloads are deliberately exclud
 Subagent state can remain `open` after a child thread is technically closed; reporting
 therefore derives closure from collected child turns when they are available.
 
+Claude Code reads top-level sessions from
+`~/.claude/projects/<project>/<session-id>.jsonl` (or `CLAUDE_CONFIG_DIR`). It extracts
+main-session turns, models, token usage, tool names, and compaction timestamps while
+discarding prompts, responses, tool inputs/results, paths, branches, and arbitrary
+metadata. Streaming fragments are deduplicated by request or message identifier.
+
+Claude Code emits uncached, cache-read, and cache-creation input separately. Normalized
+`input_tokens` is their sum, with each component retained in its corresponding field.
+The internal transcript schema can change between Claude Code releases and local usage
+is not billing data. This first increment does not collect subagent transcripts,
+context-window sizes, effort/service-tier settings, TTFT, provider-reported duration,
+or technical work-item intervals.
+
 Provider formats can change without notice. Unknown fields are ignored; malformed JSONL
 records are counted and skipped. Compatibility fixes should add a fixture for both the
 old and new format whenever possible.

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

@@ -3,15 +3,16 @@
 ## Current foundation
 
 - Complete Codex local collector
+- Core Claude Code local transcript collector
 - 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
 
-1. Validate Claude Code's local and endpoint formats, then add its adapter.
+1. Extend Claude Code support only where local metadata has reliable semantics.
 2. Add OpenCode with the same normalized contract.
 3. Add Kilo Code and Pi after format and licensing review.
 4. Add cross-provider comparison views once at least two adapters expose reliable model

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

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

cli_consumption-0.0.3/src/cli_consumption/adapters/__init__.py

@@ -0,0 +1,4 @@
+from cli_consumption.adapters.claude import ClaudeAdapter
+from cli_consumption.adapters.codex import CodexAdapter
+
+__all__ = ["ClaudeAdapter", "CodexAdapter"]