Skip to content

chore: record upstream sync up to 91a03e07 (no tree change)#78

Merged
aaditagrawal merged 39 commits intomainfrom
chore/record-upstream-sync-91a03e07
May 5, 2026
Merged

chore: record upstream sync up to 91a03e07 (no tree change)#78
aaditagrawal merged 39 commits intomainfrom
chore/record-upstream-sync-91a03e07

Conversation

@aaditagrawal
Copy link
Copy Markdown
Owner

@aaditagrawal aaditagrawal commented May 5, 2026

Summary

PRs #75 and #77 brought every upstream commit through 91a03e07 into this fork as a manual reconciliation rather than a true git merge, so git's merge-base never advanced. GitHub still reports this fork as ~38 commits behind pingdotgg/t3code:main even though the content is already in tree.

This is a git merge -s ours 91a03e07 — a no-tree-change merge that records 91a03e07 as a second parent so the merge-base advances. After this lands, the GitHub "behind" count drops from 46 → 8, and the next upstream sync only has to deal with the genuinely new commits since 91a03e07.

What this changes

  • 1 commit, 0 files changed.
  • New merge commit has two parents: current main HEAD and upstream 91a03e07.
  • Tree is byte-for-byte identical to current main.

Verification

git diff main..chore/record-upstream-sync-91a03e07  # empty
git log --oneline upstream/main ^HEAD | wc -l       # 8 (was 46)

Test plan

  • git diff main..HEAD --stat returns empty (no tree change)
  • Branch contains exactly one new merge commit with the expected parents
  • git log upstream/main ^HEAD returns 8 (the genuinely new commits)

juliusmarminge and others added 30 commits April 27, 2026 02:30
@juliusmarminge @codex
fix(release): use configured node for smoke manifest merge (pingdotgg…
5cf83ff 
…#2364)

Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
Ignore stale WebSocket lifecycle events after reconnect (pingdotgg#2372)
dbebc38
@joshmeads @juliusmarminge
Stop OpenCode refresh from leaking serve processes
3582288 
OpenCode can leave the long-lived serve child in the spawned process group after the wrapper exits. Provider refresh owns only a scoped inventory probe, so cleanup targets that local process group when the refresh scope closes.

Constraint: Keep active OpenCode thread sessions scoped to their own session lifecycle.
Rejected: Disable provider refresh | would hide model and auth state changes.
Confidence: high
Scope-risk: narrow
Tested: bun run test src/provider/Layers/OpenCodeProvider.test.ts src/provider/Layers/OpenCodeAdapter.test.ts
Tested: bun fmt
Tested: bun lint
Tested: bun typecheck
Tested: bun run build:desktop
@juliusmarminge @claude @codex
feat: Multi-Provider support (pingdotgg#2277)
08e6d4c 
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@zurielbm
fix: updated UI "add project" icon to match the command pallete icon (p…
7da6522 
…ingdotgg#2176)
@pompydev
Add OpenCode to README (pingdotgg#2154)
fe2fde5
@juliusmarminge @codex
[codex] Fix visited timestamp under clock skew (pingdotgg#2408)
22b7d8c 
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge @codex
[codex] fix terminal dimension validation (pingdotgg#2411)
02903f2 
Co-authored-by: codex <codex@users.noreply.github.com>
@basmilius
fix(server): key AskUserQuestion answers by question text (pingdotgg#…
44b39fe 
…2404)
@bergholmm @claude
@codex @juliusmarminge
fix(web): prevent iOS Safari auto-zoom on input focus (pingdotgg#1652)
9acf46a 
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@GuilhermeVieiraDev
fix(git): hide stale merged/closed PRs on the default branch (pingdot…
69d9a65 
…gg#1966)
@pedrokpp
fix(web): allow closing diff panel in non-git projects (pingdotgg#2413)
86c94b4
@murataslan1 @juliusmarminge
fix(web): hide mobile sidebar after thread selection or creation (pin…
a4298f1 
…gdotgg#1293)

Co-authored-by: Murat Aslan <murataslan1@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@jappyjan @claude @juliusmarminge
fix(web): make new thread button always visible on mobile (pingdotgg#…
9e2f712 
…2419)

Co-authored-by: Claude Haiku 4.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@jappyjan @claude @juliusmarminge
fix(web): make thread archive button always visible on mobile (pingdo…
532a1d8 
…tgg#2423)

Co-authored-by: Claude Sonnet 4.7 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
Add new GitHub users to VOUCHED.td (pingdotgg#2425)
e25ce07
@shivamhwp
Narrow the right sidebar and update task panel and diff panel (pingdo…
f54f438 
…tgg#2409)
@jappyjan @claude @juliusmarminge
fix(web): respect iOS safe areas across mobile chrome & other mobile …
d649ccf 
…layout fixes (pingdotgg#2392)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@nmggithub
fix: bump electron version to v40.9.3 and add it to our trusted dep…
c07ac59 
…endencies (pingdotgg#2427)
@jappyjan @claude @juliusmarminge
fix(mobile): enable touch scrolling in file picker modal (pingdotgg#2420
4ef361d 
)

Co-authored-by: Claude Haiku 4.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@adammansfield
fix: opencode is not on PATH on Windows (pingdotgg#2183)
1eb6fce
@juliusmarminge @cursoragent
Add Discord release announcements (pingdotgg#2429)
a480f07 
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Julius Marminge <juliusmarminge@users.noreply.github.com>
@juliusmarminge
Optimize release workflow job execution (pingdotgg#2430)
e5c7ac5 
Co-authored-by: Julius Marminge <julius@macmini.local>
@juliusmarminge
Add structured Discord webhook logging for release notifications (pin…
17b4396 
…gdotgg#2431)

Co-authored-by: Julius Marminge <julius@macmini.local>
@juliusmarminge
[codex] fix Discord release version flag (pingdotgg#2449)
7a3f21e 
Co-authored-by: Julius Marminge <julius@macmini.local>
@juliusmarminge
Fix dialog footer button clipping in Git actions dialog (pingdotgg#2458)
4ceabac 
Co-authored-by: Julius Marminge <julius@macmini.local>
@Saikrishna1876
fix(web): show friendly error for invalid pairing token (pingdotgg#2222)
8f50ca8
@D3OXY
fix(claude-agent): opt into claude_code system prompt preset (pingdot…
cb8015a 
…gg#2472)
@juliusmarminge
Refactor provider settings to declarative metadata (pingdotgg#2452)
460d9c3 
Co-authored-by: Julius Marminge <julius@macmini.local>
@juliusmarminge @cursoragent
@codex @cursor
Introduce pluggable VCS driver foundation (pingdotgg#2435)
6d7fe2e 
Co-authored-by: Julius Marminge <julius@macmini.local>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: cursor[bot] <206951365+cursor[bot]@users.noreply.github.com>
juliusmarminge and others added 9 commits May 2, 2026 16:59
@juliusmarminge
[codex] Align GitHub source control adapter errors (pingdotgg#2476)
350d76e 
Co-authored-by: Julius Marminge <julius@macmini.local>
@juliusmarminge
feat(scm): Gitlab (pingdotgg#2462)
0ce7e56 
Co-authored-by: Julius Marminge <julius@macmini.local>
@ipanasenko
feat: add "hide whitespace changes" option for diffs (pingdotgg#2389)
f7748a0
@juliusmarminge @codex
@cursoragent @cursor
Add remote repository publish and discovery support (pingdotgg#2482)
d796926 
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: cursor[bot] <206951365+cursor[bot]@users.noreply.github.com>
@chirino @juliusmarminge @codex
feat(web): collapse mobile composer by default (pingdotgg#1263)
92e340d 
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Julius Marminge <jmarminge@gmail.com>
@juliusmarminge @codex
feat: Hosted Frontend, Tailscale Integration & SSH Lancher (pingdotgg…
3772fa1 
…#2361)

Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
fix version test (pingdotgg#2490)
d501ebe
@juliusmarminge @cursoragent @cursor
feat(source-control): add Bitbucket & Azure Devops providers (pingdot…
91a03e0 
…gg#2473)

Co-authored-by: Julius Marminge <julius@macmini.local>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: cursor[bot] <206951365+cursor[bot]@users.noreply.github.com>
@aaditagrawal
chore: record upstream sync up to 91a03e0 (PRs #75, #77)
87b15db 
Already-integrated upstream commits 91a03e0 and earlier were merged
into this fork via PR #75 and PR #77 as a manual reconciliation, so
git's merge-base never advanced and GitHub still reports this fork as
~38 commits behind upstream/main even though the content is in tree.

This is a no-tree-change merge (-s ours) that records 91a03e0 as a
parent so the merge-base advances. After this lands, the next
upstream sync only has to deal with the genuinely new commits since
91a03e0.
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XS 0-9 effective changed lines (test files excluded in mixed PRs). labels May 5, 2026
@aaditagrawal aaditagrawal merged commit ed24c37 into main May 5, 2026
6 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

size:XS 0-9 effective changed lines (test files excluded in mixed PRs). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.