Skip to content

feat: show unresolved Git conflicts before continuing Pi - #83

Merged
johnnyhuy merged 2 commits into
mainfrom
agent/issue-82-workspace-conflicts
Nov 16, 2026
Merged

johnnyhuy merged 2 commits into
mainfrom
agent/issue-82-workspace-conflicts

Conversation

@johnnyhuy

@johnnyhuy johnnyhuy commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

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 5dbe138 passes the hosted build gates with the repository's pinned Node 22.23.0 and Bun 1.3.14.

  • bun install --frozen-lockfile passed.
  • bun run lint passed.
  • bun run typecheck passed.
  • bun run test:unit passed, 104 tests across 10 files.
  • bun run test:integration passed, 109 tests across 14 files.
  • mise run build passed, including all gates and main, preload and renderer compilation.
  • mise run test:e2e passed on macOS, 70 tests across 8 files, including Playwright against the compiled Electron app and its isolated Vite renderer. Electron run and output.
✓ warns before new and saved continuation, keeps drafts and clears conflicts after resolution 2781ms
Test Files  8 passed (8)
Tests       70 passed (70)

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 into test-results/ for CI upload. Scratch captures are not committed.

  • workspace-conflicts.png and workspace-conflicts-narrow.png show the new-session warning and corrected staged/unstaged totals.
  • history-conflicts.png and history-conflicts-narrow.png show conflict counts before continuation with history status collapsed.
  • history-conflicts-expanded-narrow.png shows the root-relative path preview with transcript and composer visible at native 900 by 600.

Hosted Playwright capture succeeded. Local bun run test:e2e was 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.

johnnyhuy and others added 2 commits November 16, 2026 13:16
Co-authored-by: OpenAI Codex <noreply@openai.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
@johnnyhuy
johnnyhuy marked this pull request as ready for review November 16, 2026 04:51
@johnnyhuy
johnnyhuy merged commit 2226afe into main Nov 16, 2026
15 checks passed
@johnnyhuy
johnnyhuy deleted the agent/issue-82-workspace-conflicts branch November 16, 2026 04:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Show unresolved Git conflicts before starting or resuming Pi

1 participant