cli-consumption 0.0.2__tar.gz → 0.0.3__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/.agents/skills/yolo/SKILL.md +6 -6
- cli_consumption-0.0.3/.agents/skills/yolo/agents/openai.yaml +4 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/.github/workflows/ci.yml +2 -2
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/.github/workflows/release.yaml +6 -6
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/PKG-INFO +27 -3
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/README.md +26 -2
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/docs/architecture.md +2 -1
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/docs/provider-support.md +18 -1
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/docs/roadmap.md +2 -1
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/pyproject.toml +1 -1
- cli_consumption-0.0.3/src/cli_consumption/adapters/__init__.py +4 -0
- cli_consumption-0.0.3/src/cli_consumption/adapters/claude.py +394 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/src/cli_consumption/cli.py +84 -29
- cli_consumption-0.0.3/tests/test_claude_adapter.py +218 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/tests/test_cli.py +81 -2
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/uv.lock +1 -1
- cli_consumption-0.0.2/.agents/skills/yolo/agents/openai.yaml +0 -4
- cli_consumption-0.0.2/src/cli_consumption/adapters/__init__.py +0 -3
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/.agents/skills/add-cli-adapter/SKILL.md +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/.agents/skills/add-cli-adapter/agents/openai.yaml +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/.agents/skills/audit-usage-privacy/SKILL.md +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/.agents/skills/audit-usage-privacy/agents/openai.yaml +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/.agents/skills/evolve-storage-schema/SKILL.md +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/.agents/skills/evolve-storage-schema/agents/openai.yaml +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/.agents/skills/yeet-github/SKILL.md +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/.agents/skills/yeet-github/agents/openai.yaml +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/.gitignore +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/.pre-commit-config.yaml +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/.python-version +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/AGENTS.md +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/CONTRIBUTING.md +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/LICENSE +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/NOTICE +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/docs/privacy.md +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/src/cli_consumption/__init__.py +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/src/cli_consumption/__main__.py +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/src/cli_consumption/adapters/base.py +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/src/cli_consumption/adapters/codex.py +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/src/cli_consumption/api.py +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/src/cli_consumption/dashboard.py +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/src/cli_consumption/exporting.py +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/src/cli_consumption/models.py +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/src/cli_consumption/py.typed +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/src/cli_consumption/storage.py +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/src/cli_consumption/sync.py +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/tests/conftest.py +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/tests/test_api.py +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/tests/test_codex_adapter.py +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/tests/test_storage_and_exports.py +0 -0
- {cli_consumption-0.0.2 → cli_consumption-0.0.3}/tests/test_sync.py +0 -0
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
---
|
|
2
2
|
name: yolo
|
|
3
|
-
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.
|
|
3
|
+
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.
|
|
4
4
|
---
|
|
5
5
|
|
|
6
6
|
# Publish, merge, and clean up
|
|
7
7
|
|
|
8
|
-
Run each phase in order from the repository root. The implicit pull request is the one for the current Codex work and current branch.
|
|
8
|
+
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.
|
|
9
9
|
|
|
10
10
|
## 1. Publish
|
|
11
11
|
|
|
12
12
|
1. Read all repository instructions and the product specification referenced by `AGENTS.md`.
|
|
13
|
-
2. Load and follow `$yeet-github` in full to inspect, validate, commit, push, and open a draft pull request.
|
|
13
|
+
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.
|
|
14
14
|
3. Retain the exact source and target branches, pushed SHA, pull-request number, and URL.
|
|
15
15
|
4. Stop after any failure or ambiguous external result. Never merge or clean up after a partial failure.
|
|
16
16
|
|
|
@@ -21,8 +21,8 @@ Run each phase in order from the repository root. The implicit pull request is t
|
|
|
21
21
|
3. Inspect required checks, reviews, conversations, and protections with `gh pr checks` and `gh pr view --json mergeStateStatus,reviewDecision,statusCheckRollup`.
|
|
22
22
|
4. Mark a ready draft with `gh pr ready <number>`.
|
|
23
23
|
5. Watch pending checks with `gh pr checks <number> --watch --interval 10`; stop and report any failing check.
|
|
24
|
-
6. Present the final state
|
|
25
|
-
7.
|
|
24
|
+
6. Present the verified final state as a progress update, then continue without requesting approval.
|
|
25
|
+
7. Use `gh pr merge <number> --squash --delete-branch --match-head-commit <source-sha>`.
|
|
26
26
|
8. If GitHub queues the merge, keep monitoring. Clean up only after `gh pr view <number> --json state,mergedAt,mergeCommit` reports `MERGED`.
|
|
27
27
|
|
|
28
28
|
## 3. Clean up
|
|
@@ -32,7 +32,7 @@ Run each phase in order from the repository root. The implicit pull request is t
|
|
|
32
32
|
3. Run `git fetch --prune origin`.
|
|
33
33
|
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>`.
|
|
34
34
|
5. Delete the exact local source branch if it remains. `git branch -D <source-branch>` is allowed only after verified squash merge.
|
|
35
|
-
6. If the unprotected remote branch remains,
|
|
35
|
+
6. If the exact unprotected remote source branch remains, delete it with `git push origin --delete <source-branch>` without requesting additional approval.
|
|
36
36
|
7. Run `git status --short --branch` and report the final state.
|
|
37
37
|
|
|
38
38
|
## Guardrails
|
|
@@ -25,7 +25,7 @@ jobs:
|
|
|
25
25
|
release-sha: ${{ steps.version.outputs.release-sha }}
|
|
26
26
|
version: ${{ steps.version.outputs.version }}
|
|
27
27
|
steps:
|
|
28
|
-
- uses: actions/checkout@
|
|
28
|
+
- uses: actions/checkout@v7.0.1
|
|
29
29
|
with:
|
|
30
30
|
fetch-depth: 0
|
|
31
31
|
ref: ${{ inputs.release_sha || github.sha }}
|
|
@@ -77,10 +77,10 @@ jobs:
|
|
|
77
77
|
permissions:
|
|
78
78
|
contents: read
|
|
79
79
|
steps:
|
|
80
|
-
- uses: actions/checkout@
|
|
80
|
+
- uses: actions/checkout@v7.0.1
|
|
81
81
|
with:
|
|
82
82
|
ref: ${{ needs.detect-version.outputs.release-sha }}
|
|
83
|
-
- uses: astral-sh/setup-uv@
|
|
83
|
+
- uses: astral-sh/setup-uv@v10.0.1
|
|
84
84
|
with:
|
|
85
85
|
enable-cache: true
|
|
86
86
|
python-version: "3.14"
|
|
@@ -92,7 +92,7 @@ jobs:
|
|
|
92
92
|
- run: uv run pytest --cov --cov-report=term-missing
|
|
93
93
|
- run: uv build
|
|
94
94
|
- name: Upload distributions
|
|
95
|
-
uses: actions/upload-artifact@
|
|
95
|
+
uses: actions/upload-artifact@v7.0.1
|
|
96
96
|
with:
|
|
97
97
|
name: python-package-distributions
|
|
98
98
|
path: dist/
|
|
@@ -105,7 +105,7 @@ jobs:
|
|
|
105
105
|
permissions:
|
|
106
106
|
contents: write
|
|
107
107
|
steps:
|
|
108
|
-
- uses: actions/checkout@
|
|
108
|
+
- uses: actions/checkout@v7.0.1
|
|
109
109
|
with:
|
|
110
110
|
fetch-depth: 0
|
|
111
111
|
ref: ${{ needs.detect-version.outputs.release-sha }}
|
|
@@ -141,7 +141,7 @@ jobs:
|
|
|
141
141
|
id-token: write
|
|
142
142
|
steps:
|
|
143
143
|
- name: Download distributions
|
|
144
|
-
uses: actions/download-artifact@
|
|
144
|
+
uses: actions/download-artifact@v8.0.1
|
|
145
145
|
with:
|
|
146
146
|
name: python-package-distributions
|
|
147
147
|
path: dist/
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.5
|
|
2
2
|
Name: cli-consumption
|
|
3
|
-
Version: 0.0.
|
|
3
|
+
Version: 0.0.3
|
|
4
4
|
Summary: Analyze and consolidate AI coding CLI consumption across machines.
|
|
5
5
|
Project-URL: Homepage, https://github.com/Guillaume-Lombardo/cli-consumption
|
|
6
6
|
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,
|
|
|
33
33
|
consolidate copied data from several machines, or send metadata-only snapshots to a
|
|
34
34
|
central collector.
|
|
35
35
|
|
|
36
|
-
Codex
|
|
37
|
-
the same provider-neutral adapter contract.
|
|
36
|
+
Codex and the core Claude Code local transcript format are supported. OpenCode, Kilo
|
|
37
|
+
Code, and Pi are planned behind the same provider-neutral adapter contract.
|
|
38
38
|
|
|
39
39
|
The collector deliberately excludes prompts, responses, tool arguments, and
|
|
40
40
|
credentials. See [Privacy](docs/privacy.md) before sharing a database or export.
|
|
@@ -96,6 +96,22 @@ hostname:
|
|
|
96
96
|
uv run cli-consumption collect --database usage.sqlite
|
|
97
97
|
```
|
|
98
98
|
|
|
99
|
+
Select Claude Code to read `~/.claude/projects/` instead:
|
|
100
|
+
|
|
101
|
+
```bash
|
|
102
|
+
uv run cli-consumption collect --provider claude --database usage.sqlite
|
|
103
|
+
```
|
|
104
|
+
|
|
105
|
+
Use `all` to detect and collect every supported provider present on the machine:
|
|
106
|
+
|
|
107
|
+
```bash
|
|
108
|
+
uv run cli-consumption collect --provider all --database usage.sqlite
|
|
109
|
+
```
|
|
110
|
+
|
|
111
|
+
With explicit copied sources, each path is inspected for the provider-specific
|
|
112
|
+
`sessions/` or `projects/` directory. Sources that contain no supported provider data
|
|
113
|
+
are rejected instead of silently skipped.
|
|
114
|
+
|
|
99
115
|
For an offline multi-machine workflow, copy only each machine's Codex `sessions/`
|
|
100
116
|
directory into a trusted analysis location. Do not copy `auth.json` or other
|
|
101
117
|
credentials. Then repeat `--source`:
|
|
@@ -118,6 +134,14 @@ uv run cli-consumption collect \
|
|
|
118
134
|
--project cli-consumption=/home/me/dev/cli-consumption
|
|
119
135
|
```
|
|
120
136
|
|
|
137
|
+
Copied Claude Code sources point to the configuration directory containing `projects/`:
|
|
138
|
+
|
|
139
|
+
```bash
|
|
140
|
+
uv run cli-consumption collect --provider claude \
|
|
141
|
+
--source desktop=/data/claude/desktop \
|
|
142
|
+
--source laptop=/data/claude/laptop
|
|
143
|
+
```
|
|
144
|
+
|
|
121
145
|
## SQLite and PostgreSQL
|
|
122
146
|
|
|
123
147
|
A file path selects SQLite. A SQLAlchemy URL selects PostgreSQL:
|
|
@@ -5,8 +5,8 @@ models, tokens, tools, conversations, and turns. It can analyze one workstation,
|
|
|
5
5
|
consolidate copied data from several machines, or send metadata-only snapshots to a
|
|
6
6
|
central collector.
|
|
7
7
|
|
|
8
|
-
Codex
|
|
9
|
-
the same provider-neutral adapter contract.
|
|
8
|
+
Codex and the core Claude Code local transcript format are supported. OpenCode, Kilo
|
|
9
|
+
Code, and Pi are planned behind the same provider-neutral adapter contract.
|
|
10
10
|
|
|
11
11
|
The collector deliberately excludes prompts, responses, tool arguments, and
|
|
12
12
|
credentials. See [Privacy](docs/privacy.md) before sharing a database or export.
|
|
@@ -68,6 +68,22 @@ hostname:
|
|
|
68
68
|
uv run cli-consumption collect --database usage.sqlite
|
|
69
69
|
```
|
|
70
70
|
|
|
71
|
+
Select Claude Code to read `~/.claude/projects/` instead:
|
|
72
|
+
|
|
73
|
+
```bash
|
|
74
|
+
uv run cli-consumption collect --provider claude --database usage.sqlite
|
|
75
|
+
```
|
|
76
|
+
|
|
77
|
+
Use `all` to detect and collect every supported provider present on the machine:
|
|
78
|
+
|
|
79
|
+
```bash
|
|
80
|
+
uv run cli-consumption collect --provider all --database usage.sqlite
|
|
81
|
+
```
|
|
82
|
+
|
|
83
|
+
With explicit copied sources, each path is inspected for the provider-specific
|
|
84
|
+
`sessions/` or `projects/` directory. Sources that contain no supported provider data
|
|
85
|
+
are rejected instead of silently skipped.
|
|
86
|
+
|
|
71
87
|
For an offline multi-machine workflow, copy only each machine's Codex `sessions/`
|
|
72
88
|
directory into a trusted analysis location. Do not copy `auth.json` or other
|
|
73
89
|
credentials. Then repeat `--source`:
|
|
@@ -90,6 +106,14 @@ uv run cli-consumption collect \
|
|
|
90
106
|
--project cli-consumption=/home/me/dev/cli-consumption
|
|
91
107
|
```
|
|
92
108
|
|
|
109
|
+
Copied Claude Code sources point to the configuration directory containing `projects/`:
|
|
110
|
+
|
|
111
|
+
```bash
|
|
112
|
+
uv run cli-consumption collect --provider claude \
|
|
113
|
+
--source desktop=/data/claude/desktop \
|
|
114
|
+
--source laptop=/data/claude/laptop
|
|
115
|
+
```
|
|
116
|
+
|
|
93
117
|
## SQLite and PostgreSQL
|
|
94
118
|
|
|
95
119
|
A file path selects SQLite. A SQLAlchemy URL selects PostgreSQL:
|
|
@@ -16,7 +16,8 @@ provider files -> adapter -> metadata-only snapshot -> SQL storage -> dashboard/
|
|
|
16
16
|
|
|
17
17
|
- `adapters`: parse a CLI's local data into conversations, turns, model calls, tool
|
|
18
18
|
calls, context-pressure samples, bounded turn settings, compactions, and content-free
|
|
19
|
-
work-item intervals. Codex
|
|
19
|
+
work-item intervals. Codex exposes the complete analytics contract; Claude Code
|
|
20
|
+
exposes the core dimensions available in its local transcripts.
|
|
20
21
|
- `models`: define the transport boundary shared by offline and API ingestion.
|
|
21
22
|
- `storage`: owns the normalized schema, idempotent replacement rules, SQLite, and
|
|
22
23
|
PostgreSQL engine creation.
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
| Provider | Status | Initial source |
|
|
4
4
|
| --- | --- | --- |
|
|
5
5
|
| Codex | Supported | Local rollout JSONL and optional metadata-only subagent state |
|
|
6
|
-
| Claude Code |
|
|
6
|
+
| Claude Code | Supported (core) | Local project transcript JSONL |
|
|
7
7
|
| OpenCode | Planned | To be verified before implementation |
|
|
8
8
|
| Kilo Code | Planned | To be verified before implementation |
|
|
9
9
|
| Pi | Planned | To be verified before implementation |
|
|
@@ -12,6 +12,10 @@
|
|
|
12
12
|
models, token usage, and tool names when available, and passes privacy regression tests.
|
|
13
13
|
It does not mean that token counters are equivalent to invoices.
|
|
14
14
|
|
|
15
|
+
`--provider all` detects every supported provider from its expected data directory and
|
|
16
|
+
ingests each metadata-only snapshot independently. With no explicit source it checks
|
|
17
|
+
the local default homes; repeated `--source` paths are filtered by detected format.
|
|
18
|
+
|
|
15
19
|
Codex additionally exposes provider-reported turn duration and TTFT, model context
|
|
16
20
|
window samples, bounded reasoning/collaboration/service-tier labels, timestamped
|
|
17
21
|
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
|
|
|
19
23
|
Subagent state can remain `open` after a child thread is technically closed; reporting
|
|
20
24
|
therefore derives closure from collected child turns when they are available.
|
|
21
25
|
|
|
26
|
+
Claude Code reads top-level sessions from
|
|
27
|
+
`~/.claude/projects/<project>/<session-id>.jsonl` (or `CLAUDE_CONFIG_DIR`). It extracts
|
|
28
|
+
main-session turns, models, token usage, tool names, and compaction timestamps while
|
|
29
|
+
discarding prompts, responses, tool inputs/results, paths, branches, and arbitrary
|
|
30
|
+
metadata. Streaming fragments are deduplicated by request or message identifier.
|
|
31
|
+
|
|
32
|
+
Claude Code emits uncached, cache-read, and cache-creation input separately. Normalized
|
|
33
|
+
`input_tokens` is their sum, with each component retained in its corresponding field.
|
|
34
|
+
The internal transcript schema can change between Claude Code releases and local usage
|
|
35
|
+
is not billing data. This first increment does not collect subagent transcripts,
|
|
36
|
+
context-window sizes, effort/service-tier settings, TTFT, provider-reported duration,
|
|
37
|
+
or technical work-item intervals.
|
|
38
|
+
|
|
22
39
|
Provider formats can change without notice. Unknown fields are ignored; malformed JSONL
|
|
23
40
|
records are counted and skipped. Compatibility fixes should add a fixture for both the
|
|
24
41
|
old and new format whenever possible.
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
## Current foundation
|
|
4
4
|
|
|
5
5
|
- Complete Codex local collector
|
|
6
|
+
- Core Claude Code local transcript collector
|
|
6
7
|
- Offline multi-machine deduplication
|
|
7
8
|
- SQLite and PostgreSQL storage
|
|
8
9
|
- Metadata-only central collection API
|
|
@@ -11,7 +12,7 @@
|
|
|
11
12
|
|
|
12
13
|
## Next provider increments
|
|
13
14
|
|
|
14
|
-
1.
|
|
15
|
+
1. Extend Claude Code support only where local metadata has reliable semantics.
|
|
15
16
|
2. Add OpenCode with the same normalized contract.
|
|
16
17
|
3. Add Kilo Code and Pi after format and licensing review.
|
|
17
18
|
4. Add cross-provider comparison views once at least two adapters expose reliable model
|