Guard Worktrees in the Windows preview - #604
Merged
coneilen merged 3 commits intoOct 2, 2026
Merged
Conversation
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Signed-off-by: Colin Neilens <coneilen@microsoft.com>
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Signed-off-by: Colin Neilens <coneilen@microsoft.com>
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Signed-off-by: Colin Neilens <coneilen@microsoft.com>
coneilen
deleted the
coneilen-microsoft-guard-windows-preview-worktrees
branch
October 2, 2026 18:59
This was referenced Oct 2, 2026
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
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.
Summary
Guard every Windows Worktrees action in early-preview release-candidate builds before synchronous inspection or stale reclaim/policy state can run. Normal developer and local-development builds retain the existing Worktrees implementation.
Part of #560. This does not close #560, change #587's harness, implement the speculative async fix, or alter the superseded
0.1.78-beta1tag/artifacts.Changes
guardWorktreesPreviewdecision point that clears in-memory Worktrees state and exposes the exact statusWorktrees are deferred for this preview.-Dworktrees-deferredoption that defaults tofalse; ordinary release-candidate packaging sets it totrue, local packages set it tofalse, and packaging verifies the compiled binary state.Test plan
RED: pwsh -NoProfile -File Tools\windows\Tests\WorktreePreviewGuard.Tests.ps1 -> RED: production Worktrees routes do not expose the required preview deferral message
GREEN: pwsh -NoProfile -File Tools\windows\Tests\WorktreePreviewGuard.Tests.ps1 -> Worktree preview guard contracts: 41 passed
REGRESSION: pwsh -NoProfile -File Tools\windows\validate.ps1 -Task windows-shell -ShellPart unit -SkipTrayLive -> 52/52 sections and 735/735 tests passed
preview Worktrees guard-> 1/1 passed with inspection attempt count 0 and exact deferred text.-Dworktrees-deferred=true-> binary reported version0.0.0-preview-guardand Worktrees statedeferred.pwsh -NoProfile -File Tools\windows\Tests\Packaging.Tests.ps1-> passed, including release-candidate/local flag semantics and package lifecycle.pwsh -NoProfile -File Tools\windows\validate.ps1 -Task packaging -PackagingPart real-> passed.git diff --check origin/main...HEAD-> passed.Checklist
git commit -s) per the DCOmake test)make check)