mirror of
https://github.com/fabro-sh/fabro.git
synced 2026-08-28 05:27:41 +00:00
Conflicts were between this branch's parallel-branch identity work and main's stage billing, review targets, and live stage timing. - Stage fixtures: main added `billing` to each per-file `makeStage`; this branch had hoisted one builder into `lib/test-utils`. Kept the hoisted builder and gave it `billing: makeBilledTokenCounts()`, so both intents hold and the field list stays in one place. `stage-sidebar.test.ts` also builds raw `RunStage` wire payloads, so it keeps importing `makeBilledTokenCounts` directly. - Import lists (`run_projection.rs`, `fabro-api/src/lib.rs`, `run_state.rs`, `stage_projection_round_trip.rs`): unioned both sides — `ParallelBranchId` alongside `timing`, `ReviewTarget`, `ReviewTargetKind`, `AttrValue`, `Node`, and `StageToolBatchProjection`. - `fabro-server` tests: git interleaved two unrelated new tests into one body. Split them back into `list_run_stages_exposes_parallel_branch_identity` and `run_billing_includes_live_stage_timing_in_rows_and_totals`. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| client-sdks.mdx | ||
| fabro-api.yaml | ||
| overview.mdx | ||