Skip to content

fix: backport 6 upstream app fixes (B17-B22)#18

Merged
e6qu merged 7 commits intodevfrom
fix/upstream-backports-p3
Mar 18, 2026
Merged

fix: backport 6 upstream app fixes (B17-B22)#18
e6qu merged 7 commits intodevfrom
fix/upstream-backports-p3

Conversation

@e6qu
Copy link
Copy Markdown
Owner

@e6qu e6qu commented Mar 18, 2026

Summary

Phase 3 of upstream backport — cherry-picks 6 app-only commits from upstream that apply cleanly to our fork:

Also includes Phase 2 docs update (tracking docs for B10-B16 completion).

Skipped: B23 (docs-only in packages/web/, negligible value), Windows CI bun linker workaround.

All remaining upstream divergence is the Effect-ification refactor chain (Phase 4, requires full rebase).

Test plan

  • bun typecheck — 13/13 packages pass
  • bun test (packages/opencode) — 1401 tests pass
  • All cherry-picks applied cleanly, no conflicts

Adrian Mârza and others added 7 commits March 18, 2026 02:49
@e6qu e6qu merged commit 41fa144 into dev Mar 18, 2026
1 check passed
@e6qu e6qu deleted the fix/upstream-backports-p3 branch March 18, 2026 01:04
e6qu added a commit that referenced this pull request Mar 18, 2026
* docs: update tracking docs for Phase 2 backport completion

Mark P1 and P2 as complete in all tracking docs. Update STATUS.md
with branch history and backported fix summary. Update PLAN.md
recommended approach to reflect P3 (re-scan) and P4 (rebase) as
next steps.

* fix(app): avoid prompt tooltip Switch on startup (#17857)

* fix(app): agent switch should not reset thinking level (#17470)

* app: inherit owner when creating prompt session

* tweak(ui): remove open label (#17512)

* tweak(ui): add an empty state to the sidebar when no projects (#17971)

Co-authored-by: Shoubhit Dash <shoubhit2005@gmail.com>

* test(app): deflake slash terminal toggle flow (#17881)

---------

Co-authored-by: Adrian Mârza <adi11235 at gmail dot com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: Michal Šlesár <unpainted.ragweed0@tordohm.net>
Co-authored-by: Brendan Allan <git@brendonovich.dev>
Co-authored-by: David Hill <1879069+iamdavidhill@users.noreply.github.com>
Co-authored-by: Shoubhit Dash <shoubhit2005@gmail.com>
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.

5 participants