Skip to content

hotfix(doctor): resolve formatBytes duplicate-identifier collision from #1242 × #1243#1248

Merged
waleedkadous merged 1 commit into
mainfrom
hotfix/doctor-formatbytes-collision
Jul 25, 2026
Merged

hotfix(doctor): resolve formatBytes duplicate-identifier collision from #1242 × #1243#1248
waleedkadous merged 1 commit into
mainfrom
hotfix/doctor-formatbytes-collision

Conversation

@waleedkadous

Copy link
Copy Markdown
Contributor

Main is red: PR #1242 and PR #1243 each added a formatBytes helper and each imported it into doctor.ts. Git merged the two import statements cleanly (no textual conflict); each PR's CI was green against its own pre-other base; nothing tested the combination (strict=false). Result: TS2300: Duplicate identifier 'formatBytes' — main does not build.

Fix (minimal for red-main urgency): alias the session-log-sweep import to formatLogBytes and move its single call site (line 111) with it. Line 847 keeps the migration-backup formatter. Alias direction chosen deliberately — the two helpers differ at ≥10 units (19.0 GB vs 19 GB), so each call site must keep its own module's formatter; both do (credit: air-1239 flagged the silent-rebind trap before it could happen).

Verified: full root build green in a clean worktree off broken main (deps installed first — no silent-tsc pass). Zero behavior change.

Follow-up (not this PR): consolidate the two duplicate helpers into one shared util; and consider a merge queue or strict=true — per-PR required checks structurally cannot catch cross-PR semantic collisions.

@waleedkadous
waleedkadous merged commit 0e46e23 into main Jul 25, 2026
6 checks passed
waleedkadous added a commit that referenced this pull request Jul 25, 2026
Picks up the doctor formatBytes hotfix (PR #1248) that was blocking the build.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant