mirror of
https://github.com/hanzoai/dev.git
synced 2026-10-25 03:32:32 +00:00
zeekay
5480a29f95
origin/main carried five commits our sync branch had not seen, four of them repairs to a release pipeline that had published nothing to npm since April. Resolved eleven conflicts by combining rather than choosing, because on every one of them the two sides were additive, not opposed: - .github/workflows/release.yml — ours is the superset (npm-auth-check and release-notes jobs, and `cancel-in-progress: false`, which is what you want for a release; theirs said true). Grafted in their three real fixes: the ubuntu-24.04 pin (ubuntu-latest sat fifteen minutes unacquired on run 31128398197 and took the release with it), and the "assert every architecture built" step, which is the actual cure for a green release that shipped a partial matrix. Dropped their inline OpenAI proxy step: our release-notes job already starts that proxy on port 5058, so taking it would have run two. - code-rs/tui/src/chatwidget/smoke_helpers.rs — kept both sides. Theirs pins the snapshot cwd to /snapshot so snapshots stop embedding the recording machine's checkout path; ours forces the minimal header and test mode. The minimal header means the Directory line never renders, so the pin is belt-and-braces, but it is correct and cheap to keep. - code-rs/cli/src/main.rs — kept ours whole. Both sides made the same semantic fix (derive the expected completion name from CLI_COMMAND_NAME instead of restating "_code"); theirs was only the tidier phrasing of it. - the 8 vt100 snapshots — regenerated, not hand-merged, and the regenerated output is byte-identical to what this branch already had. The header they record now reads "Hanzo Dev" where origin/main's read "Code". - codex-cli/package.json — took theirs (0.6.92); ours was a stale 0.2.190. Verified: cargo test -p code-tui --test vt100_chatwidget_snapshot 43/43 pass; cargo test -p code-core --test hanzo_identity 4/4 pass.