feat(desktop): add state-aware Git next action - #217
Merged
Conversation
11 tasks
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
Interaction behavior
The priority is local changes, unpushed commits, change-request creation, conflicts, failed checks,
requested changes, pending checks, remote updates, draft/review state, merge readiness, and merged
worktree cleanup. The chevron exposes only distinct valid alternatives. A merge-ready action is
labelled “Review & merge PR” because it opens the existing guarded PR surface rather than merging
immediately.
Verification
bun test: 850 passed, 0 failed, 5,039 expectations across 147 filesbun run build:renderer: ESLint, Stylelint, TypeScript, and 6,600-module Vite build passedgit diff --checkpassedConflict boundary
This branch is based directly on the current
origin/mainand is clean against it. PR #215 overlapsthis change in
App.tsxandstrings.ts. A read-only combined merge simulation reports anApp.tsxconflict whilestrings.tsauto-merges; PR #215 is alreadyDIRTYagainst current mainbecause of additional TaskBoard conflicts. Resolve #215 onto current main before combining the two
changes.
Lifecycle
The implementation and rendered interaction were accepted by Chenli on 2026-09-01. Merge and
release remain separate Gates. See
docs/sdlc/changes/2026-09-01-git-next-action/change.md.