fix(ci sync): probe a state commit that bundles source edits instead of trusting convergence - #10598
fix(ci sync): probe a state commit that bundles source edits instead of trusting convergence#10598luvkapur wants to merge 4 commits into
Conversation
…of trusting convergence a commit changing .bitmap AND sources is its own state commit, so the dev-commit count started after it and the edits read as converged — the exact shape the conflict-halt comment's resolve-by-hand recipe produces, stranding the resolution (and a later lane move would import-lane over it). git names alone cannot tell whether those sources are already inside the recorded snap, so the planner treats them as suspected work: a probe-only export-branch lets the snap decide — nothing pending settles as converged with zero writes, real work exports to the lane. suspected work counts as work on every path where a wrong 'no work' answer could lose something (deletion, divergence, first contact). the state-model cells that locked the old Stage-1 delta are rewritten to the new contract
PR Summary by QodoFix
AI Description
Diagram
High-Level Assessment
Files changed (7)
|
Code Review by Qodo
1.
|
![qodo-free-for-open-source-projects[bot]](https://avatars.githubusercontent.com/in/1068000?s=60&v=4){kind=small}
…n diff a state commit changed .bitmap by definition, so its first-parent diff is never legitimately empty — empty output is simple-git resolving on a non-zero exit, and must fail toward probing
…robe first contact with bundled sources routes to adopt-branch (adoption already probes via bit status); the different-lane guard's gate widens to suspected work so a bundles-only branch cannot be adopted over another lane's live claim; deletion cascade keeps master's shape with mayCarryWork feeding the unmerged-work check
|
Code review by qodo was updated up to the latest commit e4cf976 |
…ds stateCommitBundlesSources, not hasDevCommits
| if (probeOnly && exported.status === 'noop') { | ||
| return `${laneName} -> noop (converged; the sources bundled into the state commit were already snapped — nothing to export)`; | ||
| } |
There was a problem hiding this comment.
1. Misleading probe noop text 🐞 Bug ◔ Observability
When probeOnly is set and snapAndExportOntoLane() returns noop, executeExportBranch() reports that the “sources bundled into the state commit were already snapped”, but the noop result only proves Bit found nothing pending to snap/export (it can also happen when the bundled non-.bitmap files are non-component files like docs). This makes the CLI output assert a cause the implementation cannot actually know from the probe result.
Agent Prompt
### Issue description
The probe-only `export-branch` path returns a `noop` summary that claims the bundled sources were “already snapped”, but the probe’s only signal is `NO_CHANGES_TO_SNAP` (i.e., no *Bit component* changes to snap/export). This message can be wrong/misleading when the bundled non-`.bitmap` files are not Bit-tracked component changes (e.g., docs).
### Issue Context
- `stateCommitBundlesSources` is triggered by *any* file change beyond `.bitmap`.
- `snapAndExportOntoLane()` maps Bit’s `NO_CHANGES_TO_SNAP` to `exported.status === 'noop'`.
- Therefore, the executor should only report what it actually knows: the probe found nothing to snap/export.
### Fix Focus Areas
- scopes/git/ci/sync/lane-sync-executor.ts[709-711]
ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools
|
Code review by qodo was updated up to the latest commit 1348de3 |
1 participant
Proposed Changes
bit ci syncwrongly reporting "converged" when one git commit contains both a source edit and a.bitmapchange. The edit never reached the lane, and the next lane update would overwrite it on the branch.The bug
Sync decides "does the branch have new work?" by counting commits AFTER the last commit that touched
.bitmap. When a single commit changes.bitmapAND source files, that count is zero — so sync reportsnoop (converged)even though the source edit was never snapped. The lane never gets the edit, and a laterimport-laneoverwrites it.This is exactly the commit shape sync's own conflict-resolution instructions produce (
bit lane import, fix the files, commit once). Found live while testing the halt → resolve → resume flow.The fix
Git alone can't tell whether the bundled files are already inside the recorded snap (a dev who snapped, exported, and committed everything at once) or were never snapped. So instead of guessing, sync checks with bit:
Where a wrong "no work" answer could lose something (branch deletion, divergence, first contact), the bundled commit counts as work — the safe direction. Sync's own ledger commits are exempt (they legitimately bundle merged sources).
Tests
noop (converged)), green with the fix (the lane gets the edit; the next run converges).ci-sync-state.e2e.tscells that had locked the old behavior are updated: the converged-dev case still ends with zero writes, the invisible-edit case exports immediately.Note
Master (with #10593 merged) is merged in. At first contact, a bundled commit routes to
adopt-branch— adoption already checks with bit before writing — and the different-lane guard now also fires for bundled commits.