Skip to content

Show Ready for review merge conflicts and cached GitHub facts - #1672

Merged
JacobStephens2 merged 3 commits into
mainfrom
issue-1662
Oct 30, 2026
Merged

JacobStephens2 merged 3 commits into
mainfrom
issue-1662

Conversation

@JacobStephens2

@JacobStephens2 JacobStephens2 commented Oct 30, 2026 •

Copy link
Copy Markdown
Owner

Summary

 Ready for review
   CI green
+  Merge conflict

 status --json
+  github_mergeable: mergeable | conflicting | unknown

 show --json
+  locally cached GitHub facts and observation times

Conflicting pull requests stay Ready for review. CI and mergeability remain independent. show reads the cache even when stale and preserves frozen History observations without calling GitHub. The manual and hand-written site pages describe the indicators and JSON fields.

Closes #1662

Test seams

  • Console HTTP Inbox and commands SSE with fake GitHub responses; CLI status text/JSON against the same cache.
  • CLI show JSON against current, stale and frozen local GitHub answers, including issue facts and absent/old cache entries.
  • Rendered Console rows in browser contexts with and without JavaScript across Focus/Signal light/dark themes at desktop, 768 px and phone widths.

Evidence

  • Before: cargo test --test console mergeability_changes_wake_ready_rows_independently_of_ci -- --nocapture failed because green-CI rows had no mergeability. cargo test --test status show_reads_cached_github_facts_without_refreshing -- --nocapture failed because show omitted the cached state.
    After: both regressions pass. The mergeability test exercises changes with unchanged green CI, Inbox stream updates, row placement, text/JSON status and cache reuse.
  • cargo test --test status cached_github -- --nocapture: 3 passed, covering stale answers without network access, old cache defaults, missing cache, issue facts and frozen observations.
  • node --test --test-name-pattern='Ready rows show CI and merge conflicts' console/tests/inbox.test.cjs: passed across Focus/Signal light/dark at 1440, 768 and 390 px, with and without JavaScript, including live updates.
  • npm run docs --prefix site, npm run docs:check --prefix site, cargo fmt --check and cargo clippy --all-targets -- -D warnings: passed.
  • scripts/affected-tests main: passed — 60 site tests, 126 Console browser tests, and 3,616 Rust tests passed (75 skipped).
  • Full Rust validation used cargo nextest run: 2,924.69 s including compilation; test execution was 2,720.363 s. The complete affected-test selection took 3,301.09 s. Browser files ran serially (--test-concurrency=1), with 3 Rust test slots.
  • The unchanged clipboard-feedback test timed out in one parallel browser run, then passed alone and in the complete serial run. CI's Console, site and macOS gate jobs also passed on the published head.

Review coverage

Independent Standards and Spec reviews against main, including one follow-up for the shared cached-facts projection. Standards: 1 design finding, addressed. Spec: 0 findings. Both axes read all 18 changed files, including generated manual hunks; no generated-output exclusions and no unread changed files.

Merge Danger

Door: two-way

Blast Radius: Inbox

Adds an optional JSON field and a backward-compatible cached mergeability value; affects cached GitHub presentation in the Console, status and show.

Unaddressed findings

Standards

None. The duplicated projection finding was addressed in 202be3a7 by sharing CommandAnswer and Kept::command_answer between Inbox and show.

Spec

None.

Security

None.

Built with codex codex-cli 0.164.0 · gpt-6.1-sol · xhigh

Security review outcome

No unaddressed introduced findings.

Preserve both the Console version description from main and the merge-conflict and cached-GitHub-facts descriptions from issue-1662.
@JacobStephens2
JacobStephens2 merged commit 2dff7bd into main Oct 30, 2026
21 checks passed
@JacobStephens2
JacobStephens2 deleted the issue-1662 branch October 30, 2026 19:57
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.

Surface pull request merge conflicts on Ready for review rows

1 participant