Skip to content

fix: integrate upstream checkpoint ef4cc6085e24 - #17

Merged
Nurozen merged 24 commits into
mainfrom
upstream/batch-ef4cc6085e24-355cea
Sep 11, 2026
Merged

Nurozen merged 24 commits into
mainfrom
upstream/batch-ef4cc6085e24-355cea

Conversation

@Nurozen

@Nurozen Nurozen commented Sep 11, 2026

Copy link
Copy Markdown
Owner

Integrate upstream checkpoint ef4cc60 (23 commits after 645d585): composer collapse settings, right-panel tab scrolling, PR panel loading reuse, settlement worktree PR lookup, a/ b/ patch prefixes, OpenCode full-access auto-approval, mobile working pill and back-swipe patch.

Problem: 23 upstream fixes were unintegrated. Result: a real two-parent merge with fork behavior preserved.

Server: the settlement sweep now looks up a thread's branch PR from its live worktree when it still exists (falling back to the workspace root) so it shares GitManager's PR cache with the sidebar; this is ported into the fork's Stave settlement path and skipped for Stave spaces, which resolve PRs per edit repo. Rendered git patches force a/ and b/ prefixes so repositories with diff.noprefix still parse. Full-access OpenCode threads auto-reply once to doom-loop and child-session asks and fall back to the dialog if the reply fails. Antigravity discovers legacy .agent/skills.

Web: Settings > General gains "Collapse composer" (On unfocus / On scroll / neither); banner and bottom-row interactions no longer expand a resting composer; right-panel tabs get overflow chevrons and vertical-wheel scrolling; the PR detail ghost is seeded from the list row and "Approve workflows" moves beside checks; reviewer/label pickers become comboboxes; the floating browser preview stays above the compact sheet and re-shows on automation use; automatic project icons default to Lucide instead of emoji; smaller fixes (OpenCode icon hole, traits chevron, previews on white, collapsed viewed images).

Desktop: hold-to-quit accepts a quick second press; annotation styles regenerated (tailwind 4.3.3, fork font variables kept).

Mobile: loading/syncing status moves into the floating working pill, the machine glyph hugs the environment label, the react-native-screens patch lets the iOS 26 back swipe pop from a horizontal ScrollView at its leading edge, and the Antigravity icon match is normalized.

Merge notes: eight conflicts resolved (settlement reactor, contracts import in GitVcsDriver, branch selector popup props, preview host imports, PR panel key plus list-entry match with host check, Antigravity docs branding, lockfile regenerated with pnpm 11.10.0, generated annotation styles regenerated). Two upstream identifiers in auto-merged files were translated (@lecturn/contracts import in PullRequestGhosts, font-lecturn-medium in the mobile pill). Lockfile differs from base only by the six react-native-screens/native-stack patch-hash lines; frozen install succeeds and the merged patch is applied in node_modules.

Checks: focused vp tests pass in server (222), web (196), desktop (32) and contracts (84); tsgo/tsc typechecks pass in server, web, desktop, mobile and contracts; lint and format pass on the 70 changed files; git diff --cached --check clean.

UI evidence (isolated web stacks, fork base vs integrated, disposable state, fixture project):

Not exercised in a client: PR detail panel changes (need a GitHub PR), desktop-only floating preview and hosted webview, collapsed-composer interaction paths (need an existing provider thread), and all mobile changes (no simulator has a Lecturn build and CocoaPods is unavailable, so the native react-native-screens patch was verified only by applying and installing). Docs updated for the composer setting, Antigravity skill paths, OpenCode full-access asks and the mobile back-swipe patch.

🤖 Generated with Claude Code

Integrates 23 upstream commits through ef4cc6085e24d6309252412c6dab5482ac11a09f. 23 newly reachable linear upstream commits past accepted 645d585 (limit 50), ~1,860 changed lines excluding .repos (~150 of them pnpm-lock.yaml; limit 15,000). All are self-contained squash-merged PRs from Sep 3: web composer/PR-panel/right-panel/browser-preview fixes, mobile working pill, thread-list glyph and iOS back-swipe screens patch, server fixes (settlement PR-state reuse pingdotgg#9459, a/ b/ patch prefixes pingdotgg#9438, OpenCode full-access auto-approval pingdotgg#9282), desktop quit fallback, and two tiny Antigravity fixes (pingdotgg#9410, pingdotgg#9495). Stopping here keeps the Antigravity sign-in chain together for the next batch: e01c153 (pingdotgg#9425) adds a stderr handler that eb334ca (pingdotgg#9514) rewrites with a signature change and runtime-closing error propagation, and between them sits the ~7,500-line desktop browser cookie import stack (pingdotgg#7255/pingdotgg#7260/pingdotgg#7261) with new native C code, build scripts, and libsecret steps in fork-owned ci.yml/release.yml, which warrants its own reviewed PR. Next coherent batch: e01c153..eb334ca (7 commits, ~7,700 lines). Conflict profile for this batch: one semantic conflict in apps/server/src/orchestration/ThreadSettlementReactor.ts where the fork's Stave settlement rewrite overlaps upstream's worktree-cwd PR lookup (port the lookupCwd map into the fork version; both test files grew on both sides); mechanical conflicts in pnpm-lock.yaml (react-native-screens patch hash, both sides edited the patch file in different regions, regenerate lockfile), AnnotationStyles.generated.ts (regenerate), an adjacent @lecturn/contracts import line in GitVcsDriver.ts, an insertion clash near pullRequestKey in PullRequestDetailPanel.tsx, append clashes in OpenCodeAdapter/CheckpointStore/GitVcsDriverCore test files, and Lecturn branding text in docs/user/composer.md, project-settings.md, providers-antigravity.md and docs/internals/providers.md. ChatComposer, ChatView, SettingsPanels, settingsSearch, contracts settings, mobile thread screens, thread-list-v2-items (upstream edits 749+, fork edits end at 719) and GitVcsDriverCore should auto-merge.

Fresh independent review approved tree c53530d743c494ed9f7b543abb833149460a0c09 after controller-rerun focused checks. Merge commit required; no squash/rebase.

Before:
Before

After:
After

panel-tabs-before-after.mp4

Implemented and independently reviewed by fresh Claude Code agents (claude-fable-5-1 top-level, claude-opus-5 subagents).

maria-rcks and others added 24 commits September 3, 2026 13:53
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…9466)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…pingdotgg#9282)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…9492)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
@Nurozen
Nurozen merged commit 3b60852 into main Sep 11, 2026
9 checks passed
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.

10 participants