Skip to content

Commit 7d5dc12

Browse files
lroolleclaude
lroolle
and
claude
committed
feat(trace): switch --trace backend from claude-trace to cctrace
claude-trace's fetch hook only sees /v1/messages and is dead on native Claude binaries. cctrace MITM-captures the full surface (messages, OAuth, usage/credits, MCP) and auto-detects npm vs native installs. Snapshots land in .cctrace/ in the workspace. - run `cctrace --no-open -- <claude args>`; entrypoint injects --dangerously-skip-permissions after the first "--" - compile the cctrace standalone binary at image build; bun's CLI eats a leading "--", the compiled binary receives argv directly - install bun system-wide via BUN_INSTALL=/usr/local; the old /root/.bun symlink was unusable by the deva user - rename pin CLAUDE_TRACE_VERSION -> CCTRACE_VERSION=0.4.0 across versions.env, Makefile, Dockerfiles, CI workflows, and registry Close #396 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
1 parent e9338ad commit 7d5dc12

25 files changed

Lines changed: 186 additions & 98 deletions

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ references/
3434

3535
# Claude trace logs
3636
.claude-trace/
37+
.cctrace/
3738

3839
# Build artifacts
3940
*.tar

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
--build-arg TMUX_VERSION="${{ steps.pins.outputs.tmux_version }}" \
7777
--build-arg TMUX_SHA256="${{ steps.pins.outputs.tmux_sha256 }}" \
7878
--build-arg CLAUDE_CODE_VERSION="${{ steps.pins.outputs.claude_code_version }}" \
79-
--build-arg CLAUDE_TRACE_VERSION="${{ steps.pins.outputs.claude_trace_version }}" \
79+
--build-arg CCTRACE_VERSION="${{ steps.pins.outputs.cctrace_version }}" \
8080
--build-arg CODEX_VERSION="${{ steps.pins.outputs.codex_version }}" \
8181
--build-arg GEMINI_CLI_VERSION="${{ steps.pins.outputs.gemini_cli_version }}" \
8282
--build-arg ATLAS_CLI_VERSION="${{ steps.pins.outputs.atlas_cli_version }}" \
@@ -97,7 +97,7 @@ jobs:
9797
TMUX_VERSION="${{ steps.pins.outputs.tmux_version }}" \
9898
TMUX_SHA256="${{ steps.pins.outputs.tmux_sha256 }}" \
9999
CLAUDE_CODE_VERSION="${{ steps.pins.outputs.claude_code_version }}" \
100-
CLAUDE_TRACE_VERSION="${{ steps.pins.outputs.claude_trace_version }}" \
100+
CCTRACE_VERSION="${{ steps.pins.outputs.cctrace_version }}" \
101101
CODEX_VERSION="${{ steps.pins.outputs.codex_version }}" \
102102
GEMINI_CLI_VERSION="${{ steps.pins.outputs.gemini_cli_version }}" \
103103
ATLAS_CLI_VERSION="${{ steps.pins.outputs.atlas_cli_version }}" \

‎.github/workflows/nightly-images.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
delta_version: ${{ steps.pins.outputs.delta_version }}
2929
tmux_version: ${{ steps.pins.outputs.tmux_version }}
3030
tmux_sha256: ${{ steps.pins.outputs.tmux_sha256 }}
31-
claude_trace_version: ${{ steps.pins.outputs.claude_trace_version }}
31+
cctrace_version: ${{ steps.pins.outputs.cctrace_version }}
3232
playwright_version: ${{ steps.pins.outputs.playwright_version }}
3333
rust_toolchains: ${{ steps.pins.outputs.rust_toolchains }}
3434
rust_default_toolchain: ${{ steps.pins.outputs.rust_default_toolchain }}
@@ -137,7 +137,7 @@ jobs:
137137
TMUX_VERSION=${{ needs.load-version-pins.outputs.tmux_version }}
138138
TMUX_SHA256=${{ needs.load-version-pins.outputs.tmux_sha256 }}
139139
CLAUDE_CODE_VERSION=${{ needs.resolve-versions.outputs.claude_code_version }}
140-
CLAUDE_TRACE_VERSION=${{ needs.load-version-pins.outputs.claude_trace_version }}
140+
CCTRACE_VERSION=${{ needs.load-version-pins.outputs.cctrace_version }}
141141
CODEX_VERSION=${{ needs.resolve-versions.outputs.codex_version }}
142142
GEMINI_CLI_VERSION=${{ needs.resolve-versions.outputs.gemini_cli_version }}
143143
ATLAS_CLI_VERSION=${{ needs.resolve-versions.outputs.atlas_cli_version }}
@@ -190,7 +190,7 @@ jobs:
190190
build-args: |
191191
BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly-${{ needs.resolve-versions.outputs.stamp }}
192192
CLAUDE_CODE_VERSION=${{ needs.resolve-versions.outputs.claude_code_version }}
193-
CLAUDE_TRACE_VERSION=${{ needs.load-version-pins.outputs.claude_trace_version }}
193+
CCTRACE_VERSION=${{ needs.load-version-pins.outputs.cctrace_version }}
194194
CODEX_VERSION=${{ needs.resolve-versions.outputs.codex_version }}
195195
GEMINI_CLI_VERSION=${{ needs.resolve-versions.outputs.gemini_cli_version }}
196196
ATLAS_CLI_VERSION=${{ needs.resolve-versions.outputs.atlas_cli_version }}

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
tmux_version: ${{ steps.pins.outputs.tmux_version }}
4848
tmux_sha256: ${{ steps.pins.outputs.tmux_sha256 }}
4949
claude_code_version: ${{ steps.pins.outputs.claude_code_version }}
50-
claude_trace_version: ${{ steps.pins.outputs.claude_trace_version }}
50+
cctrace_version: ${{ steps.pins.outputs.cctrace_version }}
5151
codex_version: ${{ steps.pins.outputs.codex_version }}
5252
gemini_cli_version: ${{ steps.pins.outputs.gemini_cli_version }}
5353
atlas_cli_version: ${{ steps.pins.outputs.atlas_cli_version }}
@@ -81,7 +81,7 @@ jobs:
8181
- Python: \`${{ steps.pins.outputs.python_version }}\`
8282
- Delta: \`${{ steps.pins.outputs.delta_version }}\`
8383
- Claude Code: \`${{ steps.pins.outputs.claude_code_version }}\`
84-
- Claude Trace: \`${{ steps.pins.outputs.claude_trace_version }}\`
84+
- cctrace: \`${{ steps.pins.outputs.cctrace_version }}\`
8585
- Codex: \`${{ steps.pins.outputs.codex_version }}\`
8686
- Gemini CLI: \`${{ steps.pins.outputs.gemini_cli_version }}\`
8787
- Atlas CLI: \`${{ steps.pins.outputs.atlas_cli_version }}\`
@@ -144,7 +144,7 @@ jobs:
144144
TMUX_VERSION=${{ needs.load-version-pins.outputs.tmux_version }}
145145
TMUX_SHA256=${{ needs.load-version-pins.outputs.tmux_sha256 }}
146146
CLAUDE_CODE_VERSION=${{ needs.load-version-pins.outputs.claude_code_version }}
147-
CLAUDE_TRACE_VERSION=${{ needs.load-version-pins.outputs.claude_trace_version }}
147+
CCTRACE_VERSION=${{ needs.load-version-pins.outputs.cctrace_version }}
148148
CODEX_VERSION=${{ needs.load-version-pins.outputs.codex_version }}
149149
GEMINI_CLI_VERSION=${{ needs.load-version-pins.outputs.gemini_cli_version }}
150150
ATLAS_CLI_VERSION=${{ needs.load-version-pins.outputs.atlas_cli_version }}
@@ -199,7 +199,7 @@ jobs:
199199
build-args: |
200200
BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ needs.prepare.outputs.release_tag }}
201201
CLAUDE_CODE_VERSION=${{ needs.load-version-pins.outputs.claude_code_version }}
202-
CLAUDE_TRACE_VERSION=${{ needs.load-version-pins.outputs.claude_trace_version }}
202+
CCTRACE_VERSION=${{ needs.load-version-pins.outputs.cctrace_version }}
203203
CODEX_VERSION=${{ needs.load-version-pins.outputs.codex_version }}
204204
GEMINI_CLI_VERSION=${{ needs.load-version-pins.outputs.gemini_cli_version }}
205205
ATLAS_CLI_VERSION=${{ needs.load-version-pins.outputs.atlas_cli_version }}

‎CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Changed
11+
- Replace claude-trace (@mariozechner/claude-trace) with cctrace
12+
(thevibeworks/cctrace) as the `--trace` backend. cctrace is a
13+
TLS-intercepting proxy that captures all Anthropic traffic
14+
(messages, OAuth, usage/credits, MCP), not just `/v1/messages`,
15+
and works on both npm and native-binary Claude installs. Trace
16+
logs and HTML snapshots land in `.cctrace/` inside the workspace
17+
mount. Version pin renamed `CLAUDE_TRACE_VERSION` ->
18+
`CCTRACE_VERSION`; image label renamed to
19+
`org.opencontainers.image.cctrace_version`
20+
- Install bun system-wide at `/usr/local/bin/bun` (real binary via
21+
`BUN_INSTALL=/usr/local`) instead of a symlink into `/root/.bun`
22+
that non-root users could not execute. cctrace is compiled with it
23+
at image build into a standalone binary at
24+
`~/.local/bin/cctrace` (no bun needed at runtime)
25+
1026
## [0.12.0] - 2026-05-27
1127

1228
### Added

‎DEV-LOGS.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@
1313
- Minimal markdown markers, no unnecessary formatting, minimal emojis.
1414
- Reference issue numbers in the format `#<issue-number>` for easy linking.
1515

16+
# [2026-07-07] Dev Log: switch --trace default from claude-trace to cctrace
17+
- Why: claude-trace's node --require fetch hook only sees /v1/messages and dies on native Claude binaries; cctrace (thevibeworks/cctrace) MITM-captures everything (OAuth, usage/credits, MCP) and auto-detects npm vs native installs
18+
- What:
19+
- `--trace` now runs `cctrace --no-open -- <claude args>` in agents/claude.sh, claude.sh (local + docker), and docker-entrypoint.sh (dsp injected after the first `--` instead of after `--run-with`)
20+
- install-agent-tooling.sh compiles cctrace from the npm tarball with `bun build --compile` into `~/.local/bin/cctrace`; compiled binary is required because bun's CLI eats the leading `--` separator
21+
- bun now installed system-wide via `BUN_INSTALL=/usr/local` (was a symlink into /root/.bun, unusable by the deva user)
22+
- pin renamed CLAUDE_TRACE_VERSION -> CCTRACE_VERSION=0.4.0 across versions.env, Makefile, Dockerfiles, CI workflows, release-utils registry, and tests
23+
- Result: `deva.sh claude -- --trace` captures the full request surface; snapshots persist to `.cctrace/` in the workspace mount; claude-trace fully removed from images
24+
1625
# [2026-04-28] Dev Log: agent-context consolidation — ~/.claude as single source of truth [WIP]
1726
- Why: agent customizations are scattered across three directories (=~/.claude/=, =~/.codex/=, =~/.agents/=), 10 concepts are duplicated between Claude Code agents and Codex skills and are already diverging, and the shared global instructions (GENERAL-AGENTS.md) copied into both =~/.claude/CLAUDE.md= and =~/.codex/AGENTS.md= are 30 lines out of sync
1827
- What:

‎Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
5050
apt-get install -y --no-install-recommends nodejs && \
5151
apt-get -y clean && rm -rf /var/lib/apt/lists/*
5252

53-
# Install bun runtime before building Copilot API fork
54-
RUN curl -fsSL https://bun.sh/install | bash && \
55-
ln -s /root/.bun/bin/bun /usr/local/bin/bun
53+
# Install bun runtime system-wide (real binary, not a symlink into /root,
54+
# so non-root users can run it too — cctrace compiles with it at image build)
55+
RUN curl -fsSL https://bun.sh/install | BUN_INSTALL=/usr/local bash
5656

5757
# Install stable runtimes BEFORE volatile packages to maximize cache reuse
5858
RUN curl -LsSf https://astral.sh/uv/install.sh | sh
@@ -208,13 +208,13 @@ FROM agent-base AS final
208208

209209
# Declare ARGs immediately before usage to minimize cache invalidation
210210
ARG CLAUDE_CODE_VERSION=2.1.143
211-
ARG CLAUDE_TRACE_VERSION=1.0.9
211+
ARG CCTRACE_VERSION=0.4.0
212212
ARG CODEX_VERSION=0.131.0
213213
ARG GEMINI_CLI_VERSION=0.42.0
214214

215215
# Record key tool versions as labels for quick inspection
216216
LABEL org.opencontainers.image.claude_code_version=${CLAUDE_CODE_VERSION}
217-
LABEL org.opencontainers.image.claude_trace_version=${CLAUDE_TRACE_VERSION}
217+
LABEL org.opencontainers.image.cctrace_version=${CCTRACE_VERSION}
218218
LABEL org.opencontainers.image.codex_version=${CODEX_VERSION}
219219
LABEL org.opencontainers.image.gemini_cli_version=${GEMINI_CLI_VERSION}
220220

‎Dockerfile.rust‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LABEL org.opencontainers.image.title="deva-rust"
99
LABEL org.opencontainers.image.description="Rust development environment with full toolchain"
1010

1111
ARG CLAUDE_CODE_VERSION=2.1.143
12-
ARG CLAUDE_TRACE_VERSION=1.0.9
12+
ARG CCTRACE_VERSION=0.4.0
1313
ARG CODEX_VERSION=0.131.0
1414
ARG GEMINI_CLI_VERSION=0.42.0
1515
ARG CCX_VERSION=v0.7.0
@@ -19,7 +19,7 @@ ARG RUST_DEFAULT_TOOLCHAIN="stable"
1919
ARG RUST_TARGETS="wasm32-unknown-unknown"
2020

2121
LABEL org.opencontainers.image.claude_code_version=${CLAUDE_CODE_VERSION}
22-
LABEL org.opencontainers.image.claude_trace_version=${CLAUDE_TRACE_VERSION}
22+
LABEL org.opencontainers.image.cctrace_version=${CCTRACE_VERSION}
2323
LABEL org.opencontainers.image.codex_version=${CODEX_VERSION}
2424
LABEL org.opencontainers.image.gemini_cli_version=${GEMINI_CLI_VERSION}
2525
LABEL org.opencontainers.image.ccx_version=${CCX_VERSION}

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ DELTA_VERSION ?= 0.19.2
3131
TMUX_VERSION ?= 3.6a
3232
TMUX_SHA256 ?= b6d8d9c76585db8ef5fa00d4931902fa4b8cbe8166f528f44fc403961a3f3759
3333
CLAUDE_CODE_VERSION ?= 2.1.143
34-
CLAUDE_TRACE_VERSION ?= 1.0.9
34+
CCTRACE_VERSION ?= 0.4.0
3535
CODEX_VERSION ?= 0.131.0
3636
GEMINI_CLI_VERSION ?= 0.42.0
3737
CCX_VERSION ?= v0.1.4
@@ -56,7 +56,7 @@ CORE_BUILD_ARGS := $(TOOLCHAIN_BUILD_ARGS) \
5656

5757
AGENT_BUILD_ARGS := \
5858
--build-arg CLAUDE_CODE_VERSION=$(CLAUDE_CODE_VERSION) \
59-
--build-arg CLAUDE_TRACE_VERSION=$(CLAUDE_TRACE_VERSION) \
59+
--build-arg CCTRACE_VERSION=$(CCTRACE_VERSION) \
6060
--build-arg CODEX_VERSION=$(CODEX_VERSION) \
6161
--build-arg GEMINI_CLI_VERSION=$(GEMINI_CLI_VERSION) \
6262
--build-arg CCX_VERSION=$(CCX_VERSION)
@@ -78,7 +78,7 @@ VERSION_QUERY_OVERRIDES := \
7878
$(if $(filter command line environment environment\ override override,$(origin TMUX_VERSION)),TMUX_VERSION=$(TMUX_VERSION)) \
7979
$(if $(filter command line environment environment\ override override,$(origin TMUX_SHA256)),TMUX_SHA256=$(TMUX_SHA256)) \
8080
$(if $(filter command line environment environment\ override override,$(origin CLAUDE_CODE_VERSION)),CLAUDE_CODE_VERSION=$(CLAUDE_CODE_VERSION)) \
81-
$(if $(filter command line environment environment\ override override,$(origin CLAUDE_TRACE_VERSION)),CLAUDE_TRACE_VERSION=$(CLAUDE_TRACE_VERSION)) \
81+
$(if $(filter command line environment environment\ override override,$(origin CCTRACE_VERSION)),CCTRACE_VERSION=$(CCTRACE_VERSION)) \
8282
$(if $(filter command line environment environment\ override override,$(origin CODEX_VERSION)),CODEX_VERSION=$(CODEX_VERSION)) \
8383
$(if $(filter command line environment environment\ override override,$(origin GEMINI_CLI_VERSION)),GEMINI_CLI_VERSION=$(GEMINI_CLI_VERSION)) \
8484
$(if $(filter command line environment environment\ override override,$(origin CCX_VERSION)),CCX_VERSION=$(CCX_VERSION)) \
@@ -329,7 +329,7 @@ dev: build shell
329329

330330
context-size:
331331
@echo "📏 Build context size:"
332-
@du -sh . --exclude='.git' --exclude='node_modules' --exclude='.claude-trace'
332+
@du -sh . --exclude='.git' --exclude='node_modules' --exclude='.claude-trace' --exclude='.cctrace'
333333

334334
lint:
335335
@echo "🔍 Linting Dockerfile..."
@@ -400,7 +400,7 @@ help:
400400
@echo " DELTA_VERSION delta version (default: $(DELTA_VERSION))"
401401
@echo " TMUX_VERSION tmux version (default: $(TMUX_VERSION))"
402402
@echo " CLAUDE_CODE_VERSION Claude CLI version (default: $(CLAUDE_CODE_VERSION))"
403-
@echo " CLAUDE_TRACE_VERSION Claude trace version (default: $(CLAUDE_TRACE_VERSION))"
403+
@echo " CCTRACE_VERSION cctrace version (default: $(CCTRACE_VERSION))"
404404
@echo " CODEX_VERSION Codex CLI version (default: $(CODEX_VERSION))"
405405
@echo " GEMINI_CLI_VERSION Gemini CLI version (default: $(GEMINI_CLI_VERSION))"
406406
@echo " CCX_VERSION Atlas CLI version (default: $(CCX_VERSION))"

‎agents/claude.sh‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ agent_prepare() {
1515
AUTH_METHOD="$PARSED_AUTH_METHOD"
1616
local -a remaining_args=("${PARSED_REMAINING_ARGS[@]+"${PARSED_REMAINING_ARGS[@]}"}")
1717

18-
# Detect --trace flag and extract trace options
18+
# Detect --trace flag
1919
local use_trace=false
20-
local -a trace_args=()
2120
local -a claude_args=()
2221

2322
if [ ${#remaining_args[@]} -gt 0 ]; then
@@ -27,8 +26,6 @@ agent_prepare() {
2726
case "$arg" in
2827
--trace)
2928
use_trace=true
30-
# Default trace options - include all requests for visibility
31-
trace_args+=("--include-all-requests")
3229
;;
3330
*)
3431
claude_args+=("$arg")
@@ -48,10 +45,9 @@ agent_prepare() {
4845
done
4946

5047
if [ "$use_trace" = true ]; then
51-
# Use claude-trace wrapper
52-
AGENT_COMMAND=("claude-trace")
53-
AGENT_COMMAND+=("${trace_args[@]}")
54-
AGENT_COMMAND+=("--run-with")
48+
# Use cctrace wrapper: captures everything by default,
49+
# claude args go after "--"
50+
AGENT_COMMAND=("cctrace" "--no-open" "--")
5551
if [ "$has_dangerously" = false ]; then
5652
AGENT_COMMAND+=("--dangerously-skip-permissions")
5753
fi

0 commit comments

Comments
 (0)