Skip to content

sync upstream main#68

Merged
tarik02 merged 10 commits into
mainfrom
sync-upstream-main-20260719
Jul 19, 2026
Merged

sync upstream main#68
tarik02 merged 10 commits into
mainfrom
sync-upstream-main-20260719

Conversation

@tarik02

@tarik02 tarik02 commented Jul 19, 2026

Copy link
Copy Markdown
Owner

What Changed

  • Merge the latest upstream/main into the fork.
  • Resolve the terminal selection integration and regenerate the lockfile.

Why

Keep the fork current with upstream while retaining fork-specific terminal launch context.

UI Changes

None.

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes
  • I included a video for animation/interaction changes

tarik02 and others added 10 commits July 19, 2026 00:05
Co-authored-by: codex <codex@users.noreply.github.com>
…dotgg#4130)

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <jmarminge@gmail.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
…20260719

# Conflicts:
#	apps/web/src/components/ThreadTerminalDrawer.tsx
#	pnpm-lock.yaml
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL labels Jul 19, 2026
@tarik02
tarik02 merged commit 3e80b9a into main Jul 19, 2026
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants