Repository navigation
feat: show unresolved Git conflicts before continuing Pi - #83
Merged
Merged
Conversation
Co-authored-by: OpenAI Codex <noreply@openai.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
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.
Show unresolved Git conflict counts before starting Pi and prioritise them in collapsed saved-history status. Expanded status previews up to three root-relative paths, keeps change review and continuation available, and clears the warning after resolved files are staged and inspection refreshes. Unmerged files count once in the working copy and appear in staged totals only after resolution is staged.
Part of #1. Closes #82.
The final commit
5dbe138passes the hosted build gates with the repository's pinned Node 22.23.0 and Bun 1.3.14.bun install --frozen-lockfilepassed.bun run lintpassed.bun run typecheckpassed.bun run test:unitpassed, 104 tests across 10 files.bun run test:integrationpassed, 109 tests across 14 files.mise run buildpassed, including all gates and main, preload and renderer compilation.mise run test:e2epassed on macOS, 70 tests across 8 files, including Playwright against the compiled Electron app and its isolated Vite renderer. Electron run and output.Native screenshot proof is uploaded in the pidex-e2e artefact, under
Users/runner/work/pidex/pidex/test-results/workspace-status/. The capture helper writes PNGs under.tmp/proof/and copies them intotest-results/for CI upload. Scratch captures are not committed.workspace-conflicts.pngandworkspace-conflicts-narrow.pngshow the new-session warning and corrected staged/unstaged totals.history-conflicts.pngandhistory-conflicts-narrow.pngshow conflict counts before continuation with history status collapsed.history-conflicts-expanded-narrow.pngshows the root-relative path preview with transcript and composer visible at native 900 by 600.Hosted Playwright capture succeeded. Local
bun run test:e2ewas blocked by an incomplete Electron runtime and was not retried. Inline attachment upload was unavailable because the browser access host could not start, so the uploaded screenshot artefact is linked above.The added tests cover a real merge conflict with newline and Unicode filenames, nested-root scoping, staging resolutions and aborting a merge. Component tests cover a bounded literal path preview, singular/plural counts, collapsed history, review access and suppression of stale warnings during unavailable or loading states. The Electron scenario covers both continuation surfaces, draft preservation, focus refresh and native 900 by 600 layout bounds.
Local installation, lint, typechecking, component checks and bundling passed. An earlier full local build passed; subsequent runs encountered Git test timeouts on the loaded host, including existing tests. The new multi-step merge fixture has a 15-second budget; existing tests and global timeouts are unchanged. The final hosted unit, component, build and Electron gates all pass.
This slice reports unmerged index entries within the selected root. It does not manage merge, rebase or cherry-pick operations or infer whether a staged resolution is correct. Broader repository operation status remains a follow-up. Counts use the existing focus, navigation and 15-second refresh.