Fix incorrect divergence warnings on checkout#1446
Merged
Conversation
Collaborator
Author
|
While testing here I keep hitting issues because the workflow is out of date somehow with the state file, and so the versions are different (because the state is different). Why is this? Is it because I'm just doing things that don't make sense locally? Did I forget to pull? Or is it something deeper. Like the checked out workflow is simply behind the statefile? Oh that could well be something:
So I need to be comparing the local history to the app's history. Bit of a wrinkle there is that the app might have squashed versions - the client kinda needs to maintain versions. This is getting hairy. Well, one thing about that is that it's live in production now. Not new to this branch. I think I'm at least solving some things here. |
josephjclark
added a commit
that referenced
this pull request
Jun 9, 2026
* CLI: add --workflows flag to merge and deploy (#1437) * add --workflows flag * rename --workflows to --workflow and alias * changelog * update tests * format * mock: fix an issue where project obejts can get scribbed on * fix tests * update integration tests * improve error messages for invalid workspace * better diverence message * Fix incorrect divergence warnings on checkout (#1446) * improve error messages for invalid workspace * better diverence message * add failing test and notes * project: set the alias on a checked out project * fix divergence on checkout * fixes for tests * fix tests and enable project alias to be null * update tests * update more tests * relax alias lookup to fix tests * when merging, force-checkout the result * remove comment * types * fix one more test * update test * hide merge command
josephjclark
added a commit
that referenced
this pull request
Jun 9, 2026
* create output directory if it doesn't exist (#1452) * fix(cli): create output directory if it doesn't exist (#1445) The compile and collections commands threw ENOENT when --output-path pointed to a directory that hadn't been created yet. Add mkdir({ recursive: true }) before writeFile in both handlers, matching the pattern already used in the execute command's serialize-output.ts. Fixes #859 * changeset --------- Co-authored-by: Lamine Gueye <[email protected]> * Fix gitignore cache (#1453) * fix(cli): fix cache .gitignore written to fs root and undefined workflow name (#1444) * fix(cli): fix cache .gitignore written to fs root and undefined workflow name - Replace ensureGitIgnore path-walking logic with a direct getCacheRoot helper. The old loop used endsWith('.cli-cache') to find the cache root, but if the path never contained that segment (custom cachePath) it would walk all the way to '/' and write /.gitignore - Fall back to 'workflow' when plan.workflow.name is undefined, avoiding .cli-cache/undefined directories - Add cachePath to saveToCache/clearCache options types so custom cache paths set by workspace projects are correctly forwarded to getCachePath - Remove spurious await on the now-synchronous getCachePath call - Add regression tests covering expressionPath + cacheSteps (the exact scenario reported in #669, which had no test coverage) Fixes #669 * fix test: use correct cache subdir name derived from filename * refactor(cli): address review feedback on cache fix - Eliminate getCacheRoot helper: getCachePath(options) with no workflowName/stepId already returns the CACHE_DIR root naturally - Use .filter(Boolean) spread into path.resolve so undefined workflowName does not cause ERR_INVALID_ARG_TYPE (path.resolve throws on undefined) - Keep cachePath in saveToCache/clearCache Pick types so custom paths work - Rename gitignore test name to be more accurate Co-Authored-By: Claude Sonnet 4.6 <[email protected]> * style(cli): fix prettier formatting Co-Authored-By: Claude Sonnet 4.6 <[email protected]> * Revert "style(cli): fix prettier formatting" This reverts commit 1e47fad. * style(cli): fix prettier v2 formatting Co-Authored-By: Claude Sonnet 4.6 <[email protected]> * refactor(cli): simplify workflowName fallback per review Use workflowName ?? '' instead of .filter(Boolean) spread. path.resolve treats '' as a no-op so undefined workflowName still resolves to the bare CACHE_DIR root. Co-Authored-By: Claude Sonnet 4.6 <[email protected]> --------- Co-authored-by: Claude Sonnet 4.6 <[email protected]> * clean up test * changeset * tidying up * typing --------- Co-authored-by: Lamine Gueye <[email protected]> Co-authored-by: Claude Sonnet 4.6 <[email protected]> * Merge & Sync improvements (#1450) * CLI: add --workflows flag to merge and deploy (#1437) * add --workflows flag * rename --workflows to --workflow and alias * changelog * update tests * format * mock: fix an issue where project obejts can get scribbed on * fix tests * update integration tests * improve error messages for invalid workspace * better diverence message * Fix incorrect divergence warnings on checkout (#1446) * improve error messages for invalid workspace * better diverence message * add failing test and notes * project: set the alias on a checked out project * fix divergence on checkout * fixes for tests * fix tests and enable project alias to be null * update tests * update more tests * relax alias lookup to fix tests * when merging, force-checkout the result * remove comment * types * fix one more test * update test * hide merge command * chore: ignore sentry errors by regexp (#1440) * feat: ignore sentry errors by regexp * chore: remove debug * feat: add severity override to ignored errors * changeset --------- Co-authored-by: Joe Clark <[email protected]> * versions --------- Co-authored-by: Lamine Gueye <[email protected]> Co-authored-by: Claude Sonnet 4.6 <[email protected]> Co-authored-by: Farhan Y. <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Short Description
The checkout code is using the wrong algorithm to detect whether there are "unstaged" changes that could be lost on checkout. I think this was probably broken when updating the algorithm for other reasons, which subtly broke checkout.
Checkout didn't have good divergence tests so the changes went unnoticed.
This PR introduces bespoke algorithm which does the job a lot better.
Fixes #1433
AI Usage
Please disclose whether you've used AI anywhere in this PR (it's cool, we just
want to know!):
You can read more details in our
Responsible AI Policy