Merge upstream/main into fork/dev (23 commits) - #401

Merged
patroza merged 24 commits into
fork/devfrom
sync/upstream-2026-08-13
Aug 14, 2026
Merged

Merge upstream/main into fork/dev (23 commits)#401
patroza merged 24 commits into
fork/devfrom
sync/upstream-2026-08-13

Conversation

@omegent-app

@omegent-appomegent-appBot commented Aug 14, 2026

Copy link
Copy Markdown

23 upstream commits. Sixteen conflicts — this batch is mostly mobile, which is exactly where the fork carries the most product divergence.

Not for merging yet. Opened for review while I investigate the mobile slowness report; some of what's in here is a candidate explanation.

Resolutions

Android sidebar header. Upstream deleted the native header-button module (#6520) so Android falls back to the shared component. The fork's list-mode buttons already live in that shared component, so the deletions were taken and nothing was lost.

ThreadComposer. Upstream renamed ComposerToolbarTrigger.tsx → ComposerToolbar.tsx, and the trigger to ComposerInlineControl (#6224). The fork's usage-marked provider icon and quota note were ported onto the renamed component; upstream's queue-count line taken (the fork had none).

HomeScreen / ThreadNavigationSidebar. Upstream extracted the v2-list preference into useThreadListV2Enabled. Both surfaces now read that hook with the fork's list-mode gate on top, so they still agree with each other. Also picked up upstream's autoSettleOnMerge.

Sidebar.tsx. The fork hoists isUnread/status above this point, so upstream's re-declaration would not have compiled. Kept the fork's, carried upstream's explanatory note.

Markdown tables. Upstream's cell runs pass props.skills; the fork's local tableCellRuns helper dropped them, so skills never highlighted inside a table cell. Took upstream's and removed the now-dead helper.

build-desktop-artifact. Kept the fork's extracted promoteDesktopBuildArtifacts (it also copies directories, and has its own test) and took upstream's new Windows self-containment check.

AGENTS.md. Took upstream's How it works / Where code lives / Taste / Additional tips. Deliberately not its verification and pull-request sections — upstream's "do not run repo-wide checks, CI owns the full suite" contradicts this fork's automated ship gate, and two contradictory policies in one agent file is worse than either alone.

Two welds the auto-merge produced

Both compiled clean in one place and broke in another, which is worth noting given how often this class recurs:

  • build-desktop-artifact.test.ts got duplicate FileSystem/Path imports — both sides added them. vpr typecheck did not flag it; only running the test did.
  • My own union in mobile-preferences.ts left sanitizePreferencesunclosed, taking down two unrelated mobile suites. Again typecheck stayed silent — the transform error only surfaced under test.

Verification

pnpm typecheck (0 errors) · pnpm test — 272 files, 0 failures · vp build in apps/web · vp check --fix.

Co-authored-by: Patrick Roza 42661+patroza@users.noreply.github.com

🤖 Generated with Claude Code via T3 Chat on Discord

none23and others added 24 commits August 13, 2026 10:31
@none23
fix(server): align Codex collaboration prompts (pingdotgg#6432)
df19f6c
@extoci
fix(web): keep turn minimap stable as composer grows (pingdotgg#6414)
5015d7c
@Bil0000
fix(web): keep pull request panel within viewport (pingdotgg#6451)
97db94c
@maria-rcks
Add bil0000 to VOUCHED contributors list (pingdotgg#6462)
9513e62
@t3-code@juliusmarminge
fix: ignore pull request actions in latency tracker (pingdotgg#6476)
2ab188f
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
@juliusmarminge
Remove rebase requirement before opening PR (pingdotgg#6479)
9e20194
@chrisdeeming
fix(mobile): extend blockquotes across wrapped lines (pingdotgg#6482)
fd51561
@Lucenx9
fix(mobile): prevent invalid HTML entities from crashing markdown (pi…
83ad26c
…ngdotgg#6495)
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
@t3-codet3-code[bot]@StiensWout
fix(web): avoid Clerk close button overlap (pingdotgg#6442)
1b16ed6
Co-authored-by: t3-code[bot] <236186684+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Wout Stiens <71498452+StiensWout@users.noreply.github.com>
@UtkarshUsername
fix(web): show unlinked icon when viewport aspect ratio is unlocked (p…
2fab18e
…ingdotgg#6509)
@Adamulek123@juliusmarminge
fix(web): scope pull request errors to their environment (pingdotgg#6490
92d4a2e
)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@paul-vd@claude
fix(mobile): show a real settings cog in the Android sidebar header (p…
bad1143
…ingdotgg#6520)
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
@t3-code@maria-rcks
fix(web): restore default stage artwork colors (pingdotgg#6535)
23d45d9
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
@WarheadTaylor
fix(web): align sidebar wordmark label (pingdotgg#6086)
5ff3a03
@RakshithBhat03
fix(web): align the snoozed thread wake icon (pingdotgg#6215)
96bfa67
@t3dotgg
feat: allow disabling auto-settle on merge (pingdotgg#5880)
db1507e
@juliusmarminge@codex@claude
Nest mobile task settings in bottom sheets (pingdotgg#6224)
85389b9
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3-code@codex
chore(mobile): bump app version to 1.0.4
5304f3e
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): simplify the desktop-managed server update banner copy (pin…
59be6f7
…gdotgg#6549)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@davidhu2000
fix(web): show background policy tooltips sooner (pingdotgg#6506)
e15f655
@chrisdeeming
feat(desktop): add favicons to the Browser panel (pingdotgg#5644)
710fd0e
@chrisdeeming
fix(preview): only show browser-ready local servers (pingdotgg#6021)
9fd788b
@tsouth89@t3-code
@UtkarshUsername@shivamhwp
perf(build): stop unpacking node_modules wholesale from the Windows a…
7e01d33
…sar (pingdotgg#5877)
Co-authored-by: tsouth89 <tsouth89@users.noreply.github.com>
Co-authored-by: t3-code[bot] <t3-code[bot]@users.noreply.github.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
@omegent-app@patroza
Merge upstream/main into fork/dev
8fb7e3c
23 upstream commits, sixteen conflicts — this batch is mostly mobile, which is
also where the fork carries the most product divergence.
Resolutions:
- Android sidebar header: upstream deleted the native header-button module
(pingdotgg#6520) so Android falls back to the shared component. The fork's list-mode
buttons already live in that shared component, so the deletions were taken
and nothing was lost.
- ThreadComposer: upstream renamed ComposerToolbarTrigger.tsx to
ComposerToolbar.tsx and the trigger to ComposerInlineControl (pingdotgg#6224). The
fork's usage-marked provider icon and quota note were ported onto the renamed
component, and upstream's queue-count line taken (the fork had none).
- HomeScreen / ThreadNavigationSidebar: upstream extracted the v2-list
preference into useThreadListV2Enabled. Both now read that hook and keep the
fork's list-mode gate on top, so the two surfaces still agree. Also picked up
upstream's autoSettleOnMerge.
- Sidebar.tsx: the fork hoists isUnread/status above this point, so upstream's
re-declaration would not compile; kept the fork's, carried upstream's note.
- Markdown tables: upstream's cell runs pass `props.skills`, which the fork's
local tableCellRuns helper dropped — skills never highlighted inside a table
cell. Took upstream's and removed the now-dead helper.
- mobile-preferences: unioned the fork's filter/grouping fields with upstream's
planModeEnabled and autoSettleOnMerge.
- build-desktop-artifact: kept the fork's extracted promote helper (it also
copies directories) and took upstream's new Windows self-containment check.
- AGENTS.md: took upstream's How it works / Where code lives / Taste / tips.
Deliberately not its verification and pull-request sections: this fork runs
an automated ship gate and has its own stricter handoff, and two
contradictory policies in one agent file is worse than either alone.
- app.config: upstream's 1.0.4 bump with the fork's OTA override kept.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
@github-actionsgithub-actionsBot added the 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. label Aug 14, 2026
@patroza
patroza merged commit 5e63531 into fork/devAug 14, 2026
5 checks passed
patroza added a commit that referenced this pull request Aug 14, 2026
@github-actions@patroza
chore(sync): record the upstream lineage#401squashed away
be39ee3
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
This was referenced Aug 14, 2026
Merged
Merged
Merged
omegent-appBot added a commit that referenced this pull request Aug 15, 2026
@omegent-app@patroza
ci: fail when an upstream sync loses its merge parent (#403)
a19e4ec
#401 was squash-merged. That kept the code and threw the lineage away:
the 23 upstream commits stopped being ancestors, so `fork/dev` read as
**29 commits behind upstream when only 6 were genuinely outstanding**,
and the next sync would have re-merged and re-resolved all 23 — on the
same mobile files that took sixteen conflicts to land the first time.
Nobody noticed for two merges. It surfaced in a deploy alert that said
**"Commits (2)"** for a range that had carried 23.
## What this adds
A `push`-triggered check on `fork/dev` that fails when a commit which
carried a sync has fewer than two parents, and prints the `-s ours`
repair in the log.
Sync commits are identified by **the head branch of the PR they came
from**, not by their subject, because subjects vary by merge method:
```
Merge pull request #400 from patroza/sync/upstream-2026-08-12b
Merge upstream/main into fork/dev (23 commits) (#401)
merge: sync upstream through b73232b
```
A merge-button commit names the branch inline, so no API call is needed;
squash and rebase commits are resolved through the API, with the subject
line as a fallback when that is unavailable. **Ordinary fork PRs are
untouched** — they are expected to squash, and are never checked.
## Verified against the real commits
| commit | what it is | result |
|---|---|---|
| `5e63531b1` | #401, squash-merged sync | **fails**, exit 1 |
| `0bf7835cc` | #400, sync merged properly | recognised as a sync,
passes (2 parents) |
| `a76069bd9` | #402, an ordinary squashed PR | not flagged |
The third row is the one that matters most: the guard has to stay silent
on your normal workflow.
## This detects, it does not prevent
Worth being explicit, since it was the first question asked: **clicking
merge does not fail.** The check runs after the merge lands, because
GitHub has no per-PR merge-method control, and a repository-wide setting
cannot allow squash for ordinary fork PRs while requiring a merge commit
for syncs. Squash merges do fire `push` — `5e63531b1` triggered Fork CI
at 08:08 — so this turns a silent, weeks-later discovery into a red
check within a minute.
Actual prevention is `gh pr merge <n> --merge`, which is how #398, #399
and #400 all landed correctly. That is now written into the sync runbook
in `AGENTS.md`.
If you would rather it be enforced at the button, the next step is a
`sync:upstream` label workflow that merges the PR through the API once
checks pass — say the word and I will add it.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
🤖 Generated with [Claude Code](https://claude.com/claude-code) via [T3
Chat](https://t3.chat) on Discord
---------
Co-authored-by: omegent-app[bot] <306514130+omegent-app[bot]@users.noreply.github.com>
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

📱 Native ChangeChanges the native fingerprint; merging blocks production OTAs until a new store build ships.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

16 participants

@patroza@none23@extoci@Bil0000@maria-rcks@juliusmarminge@chrisdeeming@Lucenx9@UtkarshUsername@Adamulek123@paul-vd@WarheadTaylor@RakshithBhat03@t3dotgg@davidhu2000@tsouth89
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Merge upstream/main into fork/dev (23 commits) - #401
Merged
patroza merged 24 commits into
fork/devfrom 
sync/upstream-2026-08-13
Aug 14, 2026
Merged
Merge upstream/main into fork/dev (23 commits)#401
patroza merged 24 commits into
fork/devfrom 
sync/upstream-2026-08-13
Conversation
@omegent-app
@omegent-appomegent-appBot
commented
Aug 14, 2026

Copy link


Copy Markdown

23 upstream commits. Sixteen conflicts — this batch is mostly mobile, which is exactly where the fork carries the most product divergence.
Not for merging yet. Opened for review while I investigate the mobile slowness report; some of what's in here is a candidate explanation.
Resolutions
Android sidebar header. Upstream deleted the native header-button module (#6520) so Android falls back to the shared component. The fork's list-mode buttons already live in that shared component, so the deletions were taken and nothing was lost.
ThreadComposer. Upstream renamed ComposerToolbarTrigger.tsx → ComposerToolbar.tsx, and the trigger to ComposerInlineControl (#6224). The fork's usage-marked provider icon and quota note were ported onto the renamed component; upstream's queue-count line taken (the fork had none).
HomeScreen / ThreadNavigationSidebar. Upstream extracted the v2-list preference into useThreadListV2Enabled. Both surfaces now read that hook with the fork's list-mode gate on top, so they still agree with each other. Also picked up upstream's autoSettleOnMerge.
Sidebar.tsx. The fork hoists isUnread/status above this point, so upstream's re-declaration would not have compiled. Kept the fork's, carried upstream's explanatory note.
Markdown tables. Upstream's cell runs pass props.skills; the fork's local tableCellRuns helper dropped them, so skills never highlighted inside a table cell. Took upstream's and removed the now-dead helper.
build-desktop-artifact. Kept the fork's extracted promoteDesktopBuildArtifacts (it also copies directories, and has its own test) and took upstream's new Windows self-containment check.
AGENTS.md. Took upstream's How it works / Where code lives / Taste / Additional tips. Deliberately not its verification and pull-request sections — upstream's "do not run repo-wide checks, CI owns the full suite" contradicts this fork's automated ship gate, and two contradictory policies in one agent file is worse than either alone.
Two welds the auto-merge produced
Both compiled clean in one place and broke in another, which is worth noting given how often this class recurs:
  • build-desktop-artifact.test.ts got duplicate FileSystem/Path imports — both sides added them. vpr typecheck did not flag it; only running the test did.
  • My own union in mobile-preferences.ts left sanitizePreferencesunclosed, taking down two unrelated mobile suites. Again typecheck stayed silent — the transform error only surfaced under test.
Verification
pnpm typecheck (0 errors) · pnpm test — 272 files, 0 failures · vp build in apps/web · vp check --fix.
Co-authored-by: Patrick Roza 42661+patroza@users.noreply.github.com
🤖 Generated with Claude Code via T3 Chat on Discord
none23and others
added 24 commits
August 13, 2026 10:31
@none23
fix(server): align Codex collaboration prompts (pingdotgg#6432)
df19f6c
@extoci
fix(web): keep turn minimap stable as composer grows (pingdotgg#6414)
5015d7c
@Bil0000
fix(web): keep pull request panel within viewport (pingdotgg#6451)
97db94c
@maria-rcks
Add bil0000 to VOUCHED contributors list (pingdotgg#6462)
9513e62
@t3-code@juliusmarminge
fix: ignore pull request actions in latency tracker (pingdotgg#6476)
2ab188f
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
@juliusmarminge
Remove rebase requirement before opening PR (pingdotgg#6479)
9e20194
@chrisdeeming
fix(mobile): extend blockquotes across wrapped lines (pingdotgg#6482)
fd51561
@Lucenx9
fix(mobile): prevent invalid HTML entities from crashing markdown (pi…
83ad26c
…ngdotgg#6495)
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
@t3-codet3-code[bot]@StiensWout
fix(web): avoid Clerk close button overlap (pingdotgg#6442)
1b16ed6
Co-authored-by: t3-code[bot] <236186684+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Wout Stiens <71498452+StiensWout@users.noreply.github.com>
@UtkarshUsername
fix(web): show unlinked icon when viewport aspect ratio is unlocked (p…
2fab18e
…ingdotgg#6509)
@Adamulek123@juliusmarminge
fix(web): scope pull request errors to their environment (pingdotgg#6490
92d4a2e
)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@paul-vd@claude
fix(mobile): show a real settings cog in the Android sidebar header (p…
bad1143
…ingdotgg#6520)
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
@t3-code@maria-rcks
fix(web): restore default stage artwork colors (pingdotgg#6535)
23d45d9
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
@WarheadTaylor
fix(web): align sidebar wordmark label (pingdotgg#6086)
5ff3a03
@RakshithBhat03
fix(web): align the snoozed thread wake icon (pingdotgg#6215)
96bfa67
@t3dotgg
feat: allow disabling auto-settle on merge (pingdotgg#5880)
db1507e
@juliusmarminge@codex@claude
Nest mobile task settings in bottom sheets (pingdotgg#6224)
85389b9
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3-code@codex
chore(mobile): bump app version to 1.0.4
5304f3e
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): simplify the desktop-managed server update banner copy (pin…
59be6f7
…gdotgg#6549)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@davidhu2000
fix(web): show background policy tooltips sooner (pingdotgg#6506)
e15f655
@chrisdeeming
feat(desktop): add favicons to the Browser panel (pingdotgg#5644)
710fd0e
@chrisdeeming
fix(preview): only show browser-ready local servers (pingdotgg#6021)
9fd788b
@tsouth89@t3-code
@UtkarshUsername@shivamhwp
perf(build): stop unpacking node_modules wholesale from the Windows a…
7e01d33
…sar (pingdotgg#5877)
Co-authored-by: tsouth89 <tsouth89@users.noreply.github.com>
Co-authored-by: t3-code[bot] <t3-code[bot]@users.noreply.github.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
@omegent-app@patroza
Merge upstream/main into fork/dev
8fb7e3c
23 upstream commits, sixteen conflicts — this batch is mostly mobile, which is
also where the fork carries the most product divergence.
Resolutions:
- Android sidebar header: upstream deleted the native header-button module
(pingdotgg#6520) so Android falls back to the shared component. The fork's list-mode
buttons already live in that shared component, so the deletions were taken
and nothing was lost.
- ThreadComposer: upstream renamed ComposerToolbarTrigger.tsx to
ComposerToolbar.tsx and the trigger to ComposerInlineControl (pingdotgg#6224). The
fork's usage-marked provider icon and quota note were ported onto the renamed
component, and upstream's queue-count line taken (the fork had none).
- HomeScreen / ThreadNavigationSidebar: upstream extracted the v2-list
preference into useThreadListV2Enabled. Both now read that hook and keep the
fork's list-mode gate on top, so the two surfaces still agree. Also picked up
upstream's autoSettleOnMerge.
- Sidebar.tsx: the fork hoists isUnread/status above this point, so upstream's
re-declaration would not compile; kept the fork's, carried upstream's note.
- Markdown tables: upstream's cell runs pass `props.skills`, which the fork's
local tableCellRuns helper dropped — skills never highlighted inside a table
cell. Took upstream's and removed the now-dead helper.
- mobile-preferences: unioned the fork's filter/grouping fields with upstream's
planModeEnabled and autoSettleOnMerge.
- build-desktop-artifact: kept the fork's extracted promote helper (it also
copies directories) and took upstream's new Windows self-containment check.
- AGENTS.md: took upstream's How it works / Where code lives / Taste / tips.
Deliberately not its verification and pull-request sections: this fork runs
an automated ship gate and has its own stricter handoff, and two
contradictory policies in one agent file is worse than either alone.
- app.config: upstream's 1.0.4 bump with the fork's OTA override kept.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
@github-actionsgithub-actionsBot
added
the 
📱 Native Change
Changes the native fingerprint; merging blocks production OTAs until a new store build ships.
label
Aug 14, 2026
@patroza
patroza
merged commit 5e63531
into
fork/devAug 14, 2026

5 checks passed

patroza added a commit
that referenced
this pull request
Aug 14, 2026
@github-actions@patroza
chore(sync): record the upstream lineage#401squashed away
be39ee3
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>

This was referenced Aug 14, 2026
 Merged

 Merged

 Merged

omegent-appBot
added a commit
that referenced
this pull request
Aug 15, 2026
@omegent-app@patroza
ci: fail when an upstream sync loses its merge parent (#403)
a19e4ec
#401 was squash-merged. That kept the code and threw the lineage away:
the 23 upstream commits stopped being ancestors, so `fork/dev` read as
**29 commits behind upstream when only 6 were genuinely outstanding**,
and the next sync would have re-merged and re-resolved all 23 — on the
same mobile files that took sixteen conflicts to land the first time.
Nobody noticed for two merges. It surfaced in a deploy alert that said
**"Commits (2)"** for a range that had carried 23.
## What this adds
A `push`-triggered check on `fork/dev` that fails when a commit which
carried a sync has fewer than two parents, and prints the `-s ours`
repair in the log.
Sync commits are identified by **the head branch of the PR they came
from**, not by their subject, because subjects vary by merge method:
```
Merge pull request #400 from patroza/sync/upstream-2026-08-12b
Merge upstream/main into fork/dev (23 commits) (#401)
merge: sync upstream through b73232b
```
A merge-button commit names the branch inline, so no API call is needed;
squash and rebase commits are resolved through the API, with the subject
line as a fallback when that is unavailable. **Ordinary fork PRs are
untouched** — they are expected to squash, and are never checked.
## Verified against the real commits
| commit | what it is | result |
|---|---|---|
| `5e63531b1` | #401, squash-merged sync | **fails**, exit 1 |
| `0bf7835cc` | #400, sync merged properly | recognised as a sync,
passes (2 parents) |
| `a76069bd9` | #402, an ordinary squashed PR | not flagged |
The third row is the one that matters most: the guard has to stay silent
on your normal workflow.
## This detects, it does not prevent
Worth being explicit, since it was the first question asked: **clicking
merge does not fail.** The check runs after the merge lands, because
GitHub has no per-PR merge-method control, and a repository-wide setting
cannot allow squash for ordinary fork PRs while requiring a merge commit
for syncs. Squash merges do fire `push` — `5e63531b1` triggered Fork CI
at 08:08 — so this turns a silent, weeks-later discovery into a red
check within a minute.
Actual prevention is `gh pr merge <n> --merge`, which is how #398, #399
and #400 all landed correctly. That is now written into the sync runbook
in `AGENTS.md`.
If you would rather it be enforced at the button, the next step is a
`sync:upstream` label workflow that merges the PR through the API once
checks pass — say the word and I will add it.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
🤖 Generated with [Claude Code](https://claude.com/claude-code) via [T3
Chat](https://t3.chat) on Discord
---------
Co-authored-by: omegent-app[bot] <306514130+omegent-app[bot]@users.noreply.github.com>
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels

📱 Native ChangeChanges the native fingerprint; merging blocks production OTAs until a new store build ships.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

16 participants

@patroza@none23@extoci@Bil0000@maria-rcks@juliusmarminge@chrisdeeming@Lucenx9@UtkarshUsername@Adamulek123@paul-vd@WarheadTaylor@RakshithBhat03@t3dotgg@davidhu2000@tsouth89

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Merge upstream/main into fork/dev (23 commits) - #401
Merged
patroza merged 24 commits into
fork/devfrom 
sync/upstream-2026-08-13
Aug 14, 2026
Merged
Merge upstream/main into fork/dev (23 commits)#401
patroza merged 24 commits into
fork/devfrom 
sync/upstream-2026-08-13
Conversation
@omegent-app
@omegent-appomegent-appBot
commented
Aug 14, 2026

Copy link


Copy Markdown

23 upstream commits. Sixteen conflicts — this batch is mostly mobile, which is exactly where the fork carries the most product divergence.
Not for merging yet. Opened for review while I investigate the mobile slowness report; some of what's in here is a candidate explanation.
Resolutions
Android sidebar header. Upstream deleted the native header-button module (#6520) so Android falls back to the shared component. The fork's list-mode buttons already live in that shared component, so the deletions were taken and nothing was lost.
ThreadComposer. Upstream renamed ComposerToolbarTrigger.tsx → ComposerToolbar.tsx, and the trigger to ComposerInlineControl (#6224). The fork's usage-marked provider icon and quota note were ported onto the renamed component; upstream's queue-count line taken (the fork had none).
HomeScreen / ThreadNavigationSidebar. Upstream extracted the v2-list preference into useThreadListV2Enabled. Both surfaces now read that hook with the fork's list-mode gate on top, so they still agree with each other. Also picked up upstream's autoSettleOnMerge.
Sidebar.tsx. The fork hoists isUnread/status above this point, so upstream's re-declaration would not have compiled. Kept the fork's, carried upstream's explanatory note.
Markdown tables. Upstream's cell runs pass props.skills; the fork's local tableCellRuns helper dropped them, so skills never highlighted inside a table cell. Took upstream's and removed the now-dead helper.
build-desktop-artifact. Kept the fork's extracted promoteDesktopBuildArtifacts (it also copies directories, and has its own test) and took upstream's new Windows self-containment check.
AGENTS.md. Took upstream's How it works / Where code lives / Taste / Additional tips. Deliberately not its verification and pull-request sections — upstream's "do not run repo-wide checks, CI owns the full suite" contradicts this fork's automated ship gate, and two contradictory policies in one agent file is worse than either alone.
Two welds the auto-merge produced
Both compiled clean in one place and broke in another, which is worth noting given how often this class recurs:
  • build-desktop-artifact.test.ts got duplicate FileSystem/Path imports — both sides added them. vpr typecheck did not flag it; only running the test did.
  • My own union in mobile-preferences.ts left sanitizePreferencesunclosed, taking down two unrelated mobile suites. Again typecheck stayed silent — the transform error only surfaced under test.
Verification
pnpm typecheck (0 errors) · pnpm test — 272 files, 0 failures · vp build in apps/web · vp check --fix.
Co-authored-by: Patrick Roza 42661+patroza@users.noreply.github.com
🤖 Generated with Claude Code via T3 Chat on Discord
none23and others
added 24 commits
August 13, 2026 10:31
@none23
fix(server): align Codex collaboration prompts (pingdotgg#6432)
df19f6c
@extoci
fix(web): keep turn minimap stable as composer grows (pingdotgg#6414)
5015d7c
@Bil0000
fix(web): keep pull request panel within viewport (pingdotgg#6451)
97db94c
@maria-rcks
Add bil0000 to VOUCHED contributors list (pingdotgg#6462)
9513e62
@t3-code@juliusmarminge
fix: ignore pull request actions in latency tracker (pingdotgg#6476)
2ab188f
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
@juliusmarminge
Remove rebase requirement before opening PR (pingdotgg#6479)
9e20194
@chrisdeeming
fix(mobile): extend blockquotes across wrapped lines (pingdotgg#6482)
fd51561
@Lucenx9
fix(mobile): prevent invalid HTML entities from crashing markdown (pi…
83ad26c
…ngdotgg#6495)
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
@t3-codet3-code[bot]@StiensWout
fix(web): avoid Clerk close button overlap (pingdotgg#6442)
1b16ed6
Co-authored-by: t3-code[bot] <236186684+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Wout Stiens <71498452+StiensWout@users.noreply.github.com>
@UtkarshUsername
fix(web): show unlinked icon when viewport aspect ratio is unlocked (p…
2fab18e
…ingdotgg#6509)
@Adamulek123@juliusmarminge
fix(web): scope pull request errors to their environment (pingdotgg#6490
92d4a2e
)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@paul-vd@claude
fix(mobile): show a real settings cog in the Android sidebar header (p…
bad1143
…ingdotgg#6520)
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
@t3-code@maria-rcks
fix(web): restore default stage artwork colors (pingdotgg#6535)
23d45d9
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
@WarheadTaylor
fix(web): align sidebar wordmark label (pingdotgg#6086)
5ff3a03
@RakshithBhat03
fix(web): align the snoozed thread wake icon (pingdotgg#6215)
96bfa67
@t3dotgg
feat: allow disabling auto-settle on merge (pingdotgg#5880)
db1507e
@juliusmarminge@codex@claude
Nest mobile task settings in bottom sheets (pingdotgg#6224)
85389b9
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3-code@codex
chore(mobile): bump app version to 1.0.4
5304f3e
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): simplify the desktop-managed server update banner copy (pin…
59be6f7
…gdotgg#6549)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@davidhu2000
fix(web): show background policy tooltips sooner (pingdotgg#6506)
e15f655
@chrisdeeming
feat(desktop): add favicons to the Browser panel (pingdotgg#5644)
710fd0e
@chrisdeeming
fix(preview): only show browser-ready local servers (pingdotgg#6021)
9fd788b
@tsouth89@t3-code
@UtkarshUsername@shivamhwp
perf(build): stop unpacking node_modules wholesale from the Windows a…
7e01d33
…sar (pingdotgg#5877)
Co-authored-by: tsouth89 <tsouth89@users.noreply.github.com>
Co-authored-by: t3-code[bot] <t3-code[bot]@users.noreply.github.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
@omegent-app@patroza
Merge upstream/main into fork/dev
8fb7e3c
23 upstream commits, sixteen conflicts — this batch is mostly mobile, which is
also where the fork carries the most product divergence.
Resolutions:
- Android sidebar header: upstream deleted the native header-button module
(pingdotgg#6520) so Android falls back to the shared component. The fork's list-mode
buttons already live in that shared component, so the deletions were taken
and nothing was lost.
- ThreadComposer: upstream renamed ComposerToolbarTrigger.tsx to
ComposerToolbar.tsx and the trigger to ComposerInlineControl (pingdotgg#6224). The
fork's usage-marked provider icon and quota note were ported onto the renamed
component, and upstream's queue-count line taken (the fork had none).
- HomeScreen / ThreadNavigationSidebar: upstream extracted the v2-list
preference into useThreadListV2Enabled. Both now read that hook and keep the
fork's list-mode gate on top, so the two surfaces still agree. Also picked up
upstream's autoSettleOnMerge.
- Sidebar.tsx: the fork hoists isUnread/status above this point, so upstream's
re-declaration would not compile; kept the fork's, carried upstream's note.
- Markdown tables: upstream's cell runs pass `props.skills`, which the fork's
local tableCellRuns helper dropped — skills never highlighted inside a table
cell. Took upstream's and removed the now-dead helper.
- mobile-preferences: unioned the fork's filter/grouping fields with upstream's
planModeEnabled and autoSettleOnMerge.
- build-desktop-artifact: kept the fork's extracted promote helper (it also
copies directories) and took upstream's new Windows self-containment check.
- AGENTS.md: took upstream's How it works / Where code lives / Taste / tips.
Deliberately not its verification and pull-request sections: this fork runs
an automated ship gate and has its own stricter handoff, and two
contradictory policies in one agent file is worse than either alone.
- app.config: upstream's 1.0.4 bump with the fork's OTA override kept.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
@github-actionsgithub-actionsBot
added
the 
📱 Native Change
Changes the native fingerprint; merging blocks production OTAs until a new store build ships.
label
Aug 14, 2026
@patroza
patroza
merged commit 5e63531
into
fork/devAug 14, 2026

5 checks passed

patroza added a commit
that referenced
this pull request
Aug 14, 2026
@github-actions@patroza
chore(sync): record the upstream lineage#401squashed away
be39ee3
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>

This was referenced Aug 14, 2026
 Merged

 Merged

 Merged

omegent-appBot
added a commit
that referenced
this pull request
Aug 15, 2026
@omegent-app@patroza
ci: fail when an upstream sync loses its merge parent (#403)
a19e4ec
#401 was squash-merged. That kept the code and threw the lineage away:
the 23 upstream commits stopped being ancestors, so `fork/dev` read as
**29 commits behind upstream when only 6 were genuinely outstanding**,
and the next sync would have re-merged and re-resolved all 23 — on the
same mobile files that took sixteen conflicts to land the first time.
Nobody noticed for two merges. It surfaced in a deploy alert that said
**"Commits (2)"** for a range that had carried 23.
## What this adds
A `push`-triggered check on `fork/dev` that fails when a commit which
carried a sync has fewer than two parents, and prints the `-s ours`
repair in the log.
Sync commits are identified by **the head branch of the PR they came
from**, not by their subject, because subjects vary by merge method:
```
Merge pull request #400 from patroza/sync/upstream-2026-08-12b
Merge upstream/main into fork/dev (23 commits) (#401)
merge: sync upstream through b73232b
```
A merge-button commit names the branch inline, so no API call is needed;
squash and rebase commits are resolved through the API, with the subject
line as a fallback when that is unavailable. **Ordinary fork PRs are
untouched** — they are expected to squash, and are never checked.
## Verified against the real commits
| commit | what it is | result |
|---|---|---|
| `5e63531b1` | #401, squash-merged sync | **fails**, exit 1 |
| `0bf7835cc` | #400, sync merged properly | recognised as a sync,
passes (2 parents) |
| `a76069bd9` | #402, an ordinary squashed PR | not flagged |
The third row is the one that matters most: the guard has to stay silent
on your normal workflow.
## This detects, it does not prevent
Worth being explicit, since it was the first question asked: **clicking
merge does not fail.** The check runs after the merge lands, because
GitHub has no per-PR merge-method control, and a repository-wide setting
cannot allow squash for ordinary fork PRs while requiring a merge commit
for syncs. Squash merges do fire `push` — `5e63531b1` triggered Fork CI
at 08:08 — so this turns a silent, weeks-later discovery into a red
check within a minute.
Actual prevention is `gh pr merge <n> --merge`, which is how #398, #399
and #400 all landed correctly. That is now written into the sync runbook
in `AGENTS.md`.
If you would rather it be enforced at the button, the next step is a
`sync:upstream` label workflow that merges the PR through the API once
checks pass — say the word and I will add it.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
🤖 Generated with [Claude Code](https://claude.com/claude-code) via [T3
Chat](https://t3.chat) on Discord
---------
Co-authored-by: omegent-app[bot] <306514130+omegent-app[bot]@users.noreply.github.com>
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels

📱 Native ChangeChanges the native fingerprint; merging blocks production OTAs until a new store build ships.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

16 participants

@patroza@none23@extoci@Bil0000@maria-rcks@juliusmarminge@chrisdeeming@Lucenx9@UtkarshUsername@Adamulek123@paul-vd@WarheadTaylor@RakshithBhat03@t3dotgg@davidhu2000@tsouth89

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Merge upstream/main into fork/dev (23 commits) - #401
Merged
patroza merged 24 commits into
fork/devfrom 
sync/upstream-2026-08-13
Aug 14, 2026
Merged
Merge upstream/main into fork/dev (23 commits)#401
patroza merged 24 commits into
fork/devfrom 
sync/upstream-2026-08-13
Conversation
@omegent-app
@omegent-appomegent-appBot
commented
Aug 14, 2026

Copy link


Copy Markdown

23 upstream commits. Sixteen conflicts — this batch is mostly mobile, which is exactly where the fork carries the most product divergence.
Not for merging yet. Opened for review while I investigate the mobile slowness report; some of what's in here is a candidate explanation.
Resolutions
Android sidebar header. Upstream deleted the native header-button module (#6520) so Android falls back to the shared component. The fork's list-mode buttons already live in that shared component, so the deletions were taken and nothing was lost.
ThreadComposer. Upstream renamed ComposerToolbarTrigger.tsx → ComposerToolbar.tsx, and the trigger to ComposerInlineControl (#6224). The fork's usage-marked provider icon and quota note were ported onto the renamed component; upstream's queue-count line taken (the fork had none).
HomeScreen / ThreadNavigationSidebar. Upstream extracted the v2-list preference into useThreadListV2Enabled. Both surfaces now read that hook with the fork's list-mode gate on top, so they still agree with each other. Also picked up upstream's autoSettleOnMerge.
Sidebar.tsx. The fork hoists isUnread/status above this point, so upstream's re-declaration would not have compiled. Kept the fork's, carried upstream's explanatory note.
Markdown tables. Upstream's cell runs pass props.skills; the fork's local tableCellRuns helper dropped them, so skills never highlighted inside a table cell. Took upstream's and removed the now-dead helper.
build-desktop-artifact. Kept the fork's extracted promoteDesktopBuildArtifacts (it also copies directories, and has its own test) and took upstream's new Windows self-containment check.
AGENTS.md. Took upstream's How it works / Where code lives / Taste / Additional tips. Deliberately not its verification and pull-request sections — upstream's "do not run repo-wide checks, CI owns the full suite" contradicts this fork's automated ship gate, and two contradictory policies in one agent file is worse than either alone.
Two welds the auto-merge produced
Both compiled clean in one place and broke in another, which is worth noting given how often this class recurs:
  • build-desktop-artifact.test.ts got duplicate FileSystem/Path imports — both sides added them. vpr typecheck did not flag it; only running the test did.
  • My own union in mobile-preferences.ts left sanitizePreferencesunclosed, taking down two unrelated mobile suites. Again typecheck stayed silent — the transform error only surfaced under test.
Verification
pnpm typecheck (0 errors) · pnpm test — 272 files, 0 failures · vp build in apps/web · vp check --fix.
Co-authored-by: Patrick Roza 42661+patroza@users.noreply.github.com
🤖 Generated with Claude Code via T3 Chat on Discord
none23and others
added 24 commits
August 13, 2026 10:31
@none23
fix(server): align Codex collaboration prompts (pingdotgg#6432)
df19f6c
@extoci
fix(web): keep turn minimap stable as composer grows (pingdotgg#6414)
5015d7c
@Bil0000
fix(web): keep pull request panel within viewport (pingdotgg#6451)
97db94c
@maria-rcks
Add bil0000 to VOUCHED contributors list (pingdotgg#6462)
9513e62
@t3-code@juliusmarminge
fix: ignore pull request actions in latency tracker (pingdotgg#6476)
2ab188f
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
@juliusmarminge
Remove rebase requirement before opening PR (pingdotgg#6479)
9e20194
@chrisdeeming
fix(mobile): extend blockquotes across wrapped lines (pingdotgg#6482)
fd51561
@Lucenx9
fix(mobile): prevent invalid HTML entities from crashing markdown (pi…
83ad26c
…ngdotgg#6495)
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
@t3-codet3-code[bot]@StiensWout
fix(web): avoid Clerk close button overlap (pingdotgg#6442)
1b16ed6
Co-authored-by: t3-code[bot] <236186684+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Wout Stiens <71498452+StiensWout@users.noreply.github.com>
@UtkarshUsername
fix(web): show unlinked icon when viewport aspect ratio is unlocked (p…
2fab18e
…ingdotgg#6509)
@Adamulek123@juliusmarminge
fix(web): scope pull request errors to their environment (pingdotgg#6490
92d4a2e
)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@paul-vd@claude
fix(mobile): show a real settings cog in the Android sidebar header (p…
bad1143
…ingdotgg#6520)
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
@t3-code@maria-rcks
fix(web): restore default stage artwork colors (pingdotgg#6535)
23d45d9
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
@WarheadTaylor
fix(web): align sidebar wordmark label (pingdotgg#6086)
5ff3a03
@RakshithBhat03
fix(web): align the snoozed thread wake icon (pingdotgg#6215)
96bfa67
@t3dotgg
feat: allow disabling auto-settle on merge (pingdotgg#5880)
db1507e
@juliusmarminge@codex@claude
Nest mobile task settings in bottom sheets (pingdotgg#6224)
85389b9
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3-code@codex
chore(mobile): bump app version to 1.0.4
5304f3e
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): simplify the desktop-managed server update banner copy (pin…
59be6f7
…gdotgg#6549)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@davidhu2000
fix(web): show background policy tooltips sooner (pingdotgg#6506)
e15f655
@chrisdeeming
feat(desktop): add favicons to the Browser panel (pingdotgg#5644)
710fd0e
@chrisdeeming
fix(preview): only show browser-ready local servers (pingdotgg#6021)
9fd788b
@tsouth89@t3-code
@UtkarshUsername@shivamhwp
perf(build): stop unpacking node_modules wholesale from the Windows a…
7e01d33
…sar (pingdotgg#5877)
Co-authored-by: tsouth89 <tsouth89@users.noreply.github.com>
Co-authored-by: t3-code[bot] <t3-code[bot]@users.noreply.github.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
@omegent-app@patroza
Merge upstream/main into fork/dev
8fb7e3c
23 upstream commits, sixteen conflicts — this batch is mostly mobile, which is
also where the fork carries the most product divergence.
Resolutions:
- Android sidebar header: upstream deleted the native header-button module
(pingdotgg#6520) so Android falls back to the shared component. The fork's list-mode
buttons already live in that shared component, so the deletions were taken
and nothing was lost.
- ThreadComposer: upstream renamed ComposerToolbarTrigger.tsx to
ComposerToolbar.tsx and the trigger to ComposerInlineControl (pingdotgg#6224). The
fork's usage-marked provider icon and quota note were ported onto the renamed
component, and upstream's queue-count line taken (the fork had none).
- HomeScreen / ThreadNavigationSidebar: upstream extracted the v2-list
preference into useThreadListV2Enabled. Both now read that hook and keep the
fork's list-mode gate on top, so the two surfaces still agree. Also picked up
upstream's autoSettleOnMerge.
- Sidebar.tsx: the fork hoists isUnread/status above this point, so upstream's
re-declaration would not compile; kept the fork's, carried upstream's note.
- Markdown tables: upstream's cell runs pass `props.skills`, which the fork's
local tableCellRuns helper dropped — skills never highlighted inside a table
cell. Took upstream's and removed the now-dead helper.
- mobile-preferences: unioned the fork's filter/grouping fields with upstream's
planModeEnabled and autoSettleOnMerge.
- build-desktop-artifact: kept the fork's extracted promote helper (it also
copies directories) and took upstream's new Windows self-containment check.
- AGENTS.md: took upstream's How it works / Where code lives / Taste / tips.
Deliberately not its verification and pull-request sections: this fork runs
an automated ship gate and has its own stricter handoff, and two
contradictory policies in one agent file is worse than either alone.
- app.config: upstream's 1.0.4 bump with the fork's OTA override kept.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
@github-actionsgithub-actionsBot
added
the 
📱 Native Change
Changes the native fingerprint; merging blocks production OTAs until a new store build ships.
label
Aug 14, 2026
@patroza
patroza
merged commit 5e63531
into
fork/devAug 14, 2026

5 checks passed

patroza added a commit
that referenced
this pull request
Aug 14, 2026
@github-actions@patroza
chore(sync): record the upstream lineage#401squashed away
be39ee3
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>

This was referenced Aug 14, 2026
 Merged

 Merged

 Merged

omegent-appBot
added a commit
that referenced
this pull request
Aug 15, 2026
@omegent-app@patroza
ci: fail when an upstream sync loses its merge parent (#403)
a19e4ec
#401 was squash-merged. That kept the code and threw the lineage away:
the 23 upstream commits stopped being ancestors, so `fork/dev` read as
**29 commits behind upstream when only 6 were genuinely outstanding**,
and the next sync would have re-merged and re-resolved all 23 — on the
same mobile files that took sixteen conflicts to land the first time.
Nobody noticed for two merges. It surfaced in a deploy alert that said
**"Commits (2)"** for a range that had carried 23.
## What this adds
A `push`-triggered check on `fork/dev` that fails when a commit which
carried a sync has fewer than two parents, and prints the `-s ours`
repair in the log.
Sync commits are identified by **the head branch of the PR they came
from**, not by their subject, because subjects vary by merge method:
```
Merge pull request #400 from patroza/sync/upstream-2026-08-12b
Merge upstream/main into fork/dev (23 commits) (#401)
merge: sync upstream through b73232b
```
A merge-button commit names the branch inline, so no API call is needed;
squash and rebase commits are resolved through the API, with the subject
line as a fallback when that is unavailable. **Ordinary fork PRs are
untouched** — they are expected to squash, and are never checked.
## Verified against the real commits
| commit | what it is | result |
|---|---|---|
| `5e63531b1` | #401, squash-merged sync | **fails**, exit 1 |
| `0bf7835cc` | #400, sync merged properly | recognised as a sync,
passes (2 parents) |
| `a76069bd9` | #402, an ordinary squashed PR | not flagged |
The third row is the one that matters most: the guard has to stay silent
on your normal workflow.
## This detects, it does not prevent
Worth being explicit, since it was the first question asked: **clicking
merge does not fail.** The check runs after the merge lands, because
GitHub has no per-PR merge-method control, and a repository-wide setting
cannot allow squash for ordinary fork PRs while requiring a merge commit
for syncs. Squash merges do fire `push` — `5e63531b1` triggered Fork CI
at 08:08 — so this turns a silent, weeks-later discovery into a red
check within a minute.
Actual prevention is `gh pr merge <n> --merge`, which is how #398, #399
and #400 all landed correctly. That is now written into the sync runbook
in `AGENTS.md`.
If you would rather it be enforced at the button, the next step is a
`sync:upstream` label workflow that merges the PR through the API once
checks pass — say the word and I will add it.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
🤖 Generated with [Claude Code](https://claude.com/claude-code) via [T3
Chat](https://t3.chat) on Discord
---------
Co-authored-by: omegent-app[bot] <306514130+omegent-app[bot]@users.noreply.github.com>
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels

📱 Native ChangeChanges the native fingerprint; merging blocks production OTAs until a new store build ships.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

16 participants

@patroza@none23@extoci@Bil0000@maria-rcks@juliusmarminge@chrisdeeming@Lucenx9@UtkarshUsername@Adamulek123@paul-vd@WarheadTaylor@RakshithBhat03@t3dotgg@davidhu2000@tsouth89

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Merge upstream/main into fork/dev (23 commits) - #401
Merged
patroza merged 24 commits into
fork/devfrom 
sync/upstream-2026-08-13
Aug 14, 2026
Merged
Merge upstream/main into fork/dev (23 commits)#401
patroza merged 24 commits into
fork/devfrom 
sync/upstream-2026-08-13
Conversation
@omegent-app
@omegent-appomegent-appBot
commented
Aug 14, 2026

Copy link


Copy Markdown

23 upstream commits. Sixteen conflicts — this batch is mostly mobile, which is exactly where the fork carries the most product divergence.
Not for merging yet. Opened for review while I investigate the mobile slowness report; some of what's in here is a candidate explanation.
Resolutions
Android sidebar header. Upstream deleted the native header-button module (#6520) so Android falls back to the shared component. The fork's list-mode buttons already live in that shared component, so the deletions were taken and nothing was lost.
ThreadComposer. Upstream renamed ComposerToolbarTrigger.tsx → ComposerToolbar.tsx, and the trigger to ComposerInlineControl (#6224). The fork's usage-marked provider icon and quota note were ported onto the renamed component; upstream's queue-count line taken (the fork had none).
HomeScreen / ThreadNavigationSidebar. Upstream extracted the v2-list preference into useThreadListV2Enabled. Both surfaces now read that hook with the fork's list-mode gate on top, so they still agree with each other. Also picked up upstream's autoSettleOnMerge.
Sidebar.tsx. The fork hoists isUnread/status above this point, so upstream's re-declaration would not have compiled. Kept the fork's, carried upstream's explanatory note.
Markdown tables. Upstream's cell runs pass props.skills; the fork's local tableCellRuns helper dropped them, so skills never highlighted inside a table cell. Took upstream's and removed the now-dead helper.
build-desktop-artifact. Kept the fork's extracted promoteDesktopBuildArtifacts (it also copies directories, and has its own test) and took upstream's new Windows self-containment check.
AGENTS.md. Took upstream's How it works / Where code lives / Taste / Additional tips. Deliberately not its verification and pull-request sections — upstream's "do not run repo-wide checks, CI owns the full suite" contradicts this fork's automated ship gate, and two contradictory policies in one agent file is worse than either alone.
Two welds the auto-merge produced
Both compiled clean in one place and broke in another, which is worth noting given how often this class recurs:
  • build-desktop-artifact.test.ts got duplicate FileSystem/Path imports — both sides added them. vpr typecheck did not flag it; only running the test did.
  • My own union in mobile-preferences.ts left sanitizePreferencesunclosed, taking down two unrelated mobile suites. Again typecheck stayed silent — the transform error only surfaced under test.
Verification
pnpm typecheck (0 errors) · pnpm test — 272 files, 0 failures · vp build in apps/web · vp check --fix.
Co-authored-by: Patrick Roza 42661+patroza@users.noreply.github.com
🤖 Generated with Claude Code via T3 Chat on Discord
none23and others
added 24 commits
August 13, 2026 10:31
@none23
fix(server): align Codex collaboration prompts (pingdotgg#6432)
df19f6c
@extoci
fix(web): keep turn minimap stable as composer grows (pingdotgg#6414)
5015d7c
@Bil0000
fix(web): keep pull request panel within viewport (pingdotgg#6451)
97db94c
@maria-rcks
Add bil0000 to VOUCHED contributors list (pingdotgg#6462)
9513e62
@t3-code@juliusmarminge
fix: ignore pull request actions in latency tracker (pingdotgg#6476)
2ab188f
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
@juliusmarminge
Remove rebase requirement before opening PR (pingdotgg#6479)
9e20194
@chrisdeeming
fix(mobile): extend blockquotes across wrapped lines (pingdotgg#6482)
fd51561
@Lucenx9
fix(mobile): prevent invalid HTML entities from crashing markdown (pi…
83ad26c
…ngdotgg#6495)
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
@t3-codet3-code[bot]@StiensWout
fix(web): avoid Clerk close button overlap (pingdotgg#6442)
1b16ed6
Co-authored-by: t3-code[bot] <236186684+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Wout Stiens <71498452+StiensWout@users.noreply.github.com>
@UtkarshUsername
fix(web): show unlinked icon when viewport aspect ratio is unlocked (p…
2fab18e
…ingdotgg#6509)
@Adamulek123@juliusmarminge
fix(web): scope pull request errors to their environment (pingdotgg#6490
92d4a2e
)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@paul-vd@claude
fix(mobile): show a real settings cog in the Android sidebar header (p…
bad1143
…ingdotgg#6520)
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
@t3-code@maria-rcks
fix(web): restore default stage artwork colors (pingdotgg#6535)
23d45d9
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
@WarheadTaylor
fix(web): align sidebar wordmark label (pingdotgg#6086)
5ff3a03
@RakshithBhat03
fix(web): align the snoozed thread wake icon (pingdotgg#6215)
96bfa67
@t3dotgg
feat: allow disabling auto-settle on merge (pingdotgg#5880)
db1507e
@juliusmarminge@codex@claude
Nest mobile task settings in bottom sheets (pingdotgg#6224)
85389b9
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3-code@codex
chore(mobile): bump app version to 1.0.4
5304f3e
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): simplify the desktop-managed server update banner copy (pin…
59be6f7
…gdotgg#6549)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@davidhu2000
fix(web): show background policy tooltips sooner (pingdotgg#6506)
e15f655
@chrisdeeming
feat(desktop): add favicons to the Browser panel (pingdotgg#5644)
710fd0e
@chrisdeeming
fix(preview): only show browser-ready local servers (pingdotgg#6021)
9fd788b
@tsouth89@t3-code
@UtkarshUsername@shivamhwp
perf(build): stop unpacking node_modules wholesale from the Windows a…
7e01d33
…sar (pingdotgg#5877)
Co-authored-by: tsouth89 <tsouth89@users.noreply.github.com>
Co-authored-by: t3-code[bot] <t3-code[bot]@users.noreply.github.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
@omegent-app@patroza
Merge upstream/main into fork/dev
8fb7e3c
23 upstream commits, sixteen conflicts — this batch is mostly mobile, which is
also where the fork carries the most product divergence.
Resolutions:
- Android sidebar header: upstream deleted the native header-button module
(pingdotgg#6520) so Android falls back to the shared component. The fork's list-mode
buttons already live in that shared component, so the deletions were taken
and nothing was lost.
- ThreadComposer: upstream renamed ComposerToolbarTrigger.tsx to
ComposerToolbar.tsx and the trigger to ComposerInlineControl (pingdotgg#6224). The
fork's usage-marked provider icon and quota note were ported onto the renamed
component, and upstream's queue-count line taken (the fork had none).
- HomeScreen / ThreadNavigationSidebar: upstream extracted the v2-list
preference into useThreadListV2Enabled. Both now read that hook and keep the
fork's list-mode gate on top, so the two surfaces still agree. Also picked up
upstream's autoSettleOnMerge.
- Sidebar.tsx: the fork hoists isUnread/status above this point, so upstream's
re-declaration would not compile; kept the fork's, carried upstream's note.
- Markdown tables: upstream's cell runs pass `props.skills`, which the fork's
local tableCellRuns helper dropped — skills never highlighted inside a table
cell. Took upstream's and removed the now-dead helper.
- mobile-preferences: unioned the fork's filter/grouping fields with upstream's
planModeEnabled and autoSettleOnMerge.
- build-desktop-artifact: kept the fork's extracted promote helper (it also
copies directories) and took upstream's new Windows self-containment check.
- AGENTS.md: took upstream's How it works / Where code lives / Taste / tips.
Deliberately not its verification and pull-request sections: this fork runs
an automated ship gate and has its own stricter handoff, and two
contradictory policies in one agent file is worse than either alone.
- app.config: upstream's 1.0.4 bump with the fork's OTA override kept.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
@github-actionsgithub-actionsBot
added
the 
📱 Native Change
Changes the native fingerprint; merging blocks production OTAs until a new store build ships.
label
Aug 14, 2026
@patroza
patroza
merged commit 5e63531
into
fork/devAug 14, 2026

5 checks passed

patroza added a commit
that referenced
this pull request
Aug 14, 2026
@github-actions@patroza
chore(sync): record the upstream lineage#401squashed away
be39ee3
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>

This was referenced Aug 14, 2026
 Merged

 Merged

 Merged

omegent-appBot
added a commit
that referenced
this pull request
Aug 15, 2026
@omegent-app@patroza
ci: fail when an upstream sync loses its merge parent (#403)
a19e4ec
#401 was squash-merged. That kept the code and threw the lineage away:
the 23 upstream commits stopped being ancestors, so `fork/dev` read as
**29 commits behind upstream when only 6 were genuinely outstanding**,
and the next sync would have re-merged and re-resolved all 23 — on the
same mobile files that took sixteen conflicts to land the first time.
Nobody noticed for two merges. It surfaced in a deploy alert that said
**"Commits (2)"** for a range that had carried 23.
## What this adds
A `push`-triggered check on `fork/dev` that fails when a commit which
carried a sync has fewer than two parents, and prints the `-s ours`
repair in the log.
Sync commits are identified by **the head branch of the PR they came
from**, not by their subject, because subjects vary by merge method:
```
Merge pull request #400 from patroza/sync/upstream-2026-08-12b
Merge upstream/main into fork/dev (23 commits) (#401)
merge: sync upstream through b73232b
```
A merge-button commit names the branch inline, so no API call is needed;
squash and rebase commits are resolved through the API, with the subject
line as a fallback when that is unavailable. **Ordinary fork PRs are
untouched** — they are expected to squash, and are never checked.
## Verified against the real commits
| commit | what it is | result |
|---|---|---|
| `5e63531b1` | #401, squash-merged sync | **fails**, exit 1 |
| `0bf7835cc` | #400, sync merged properly | recognised as a sync,
passes (2 parents) |
| `a76069bd9` | #402, an ordinary squashed PR | not flagged |
The third row is the one that matters most: the guard has to stay silent
on your normal workflow.
## This detects, it does not prevent
Worth being explicit, since it was the first question asked: **clicking
merge does not fail.** The check runs after the merge lands, because
GitHub has no per-PR merge-method control, and a repository-wide setting
cannot allow squash for ordinary fork PRs while requiring a merge commit
for syncs. Squash merges do fire `push` — `5e63531b1` triggered Fork CI
at 08:08 — so this turns a silent, weeks-later discovery into a red
check within a minute.
Actual prevention is `gh pr merge <n> --merge`, which is how #398, #399
and #400 all landed correctly. That is now written into the sync runbook
in `AGENTS.md`.
If you would rather it be enforced at the button, the next step is a
`sync:upstream` label workflow that merges the PR through the API once
checks pass — say the word and I will add it.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
🤖 Generated with [Claude Code](https://claude.com/claude-code) via [T3
Chat](https://t3.chat) on Discord
---------
Co-authored-by: omegent-app[bot] <306514130+omegent-app[bot]@users.noreply.github.com>
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels

📱 Native ChangeChanges the native fingerprint; merging blocks production OTAs until a new store build ships.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

16 participants

@patroza@none23@extoci@Bil0000@maria-rcks@juliusmarminge@chrisdeeming@Lucenx9@UtkarshUsername@Adamulek123@paul-vd@WarheadTaylor@RakshithBhat03@t3dotgg@davidhu2000@tsouth89

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Merge upstream/main into fork/dev (23 commits) - #401
Merged
patroza merged 24 commits into
fork/devfrom 
sync/upstream-2026-08-13
Aug 14, 2026
Merged
Merge upstream/main into fork/dev (23 commits)#401
patroza merged 24 commits into
fork/devfrom 
sync/upstream-2026-08-13
Conversation
@omegent-app
@omegent-appomegent-appBot
commented
Aug 14, 2026

Copy link


Copy Markdown

23 upstream commits. Sixteen conflicts — this batch is mostly mobile, which is exactly where the fork carries the most product divergence.
Not for merging yet. Opened for review while I investigate the mobile slowness report; some of what's in here is a candidate explanation.
Resolutions
Android sidebar header. Upstream deleted the native header-button module (#6520) so Android falls back to the shared component. The fork's list-mode buttons already live in that shared component, so the deletions were taken and nothing was lost.
ThreadComposer. Upstream renamed ComposerToolbarTrigger.tsx → ComposerToolbar.tsx, and the trigger to ComposerInlineControl (#6224). The fork's usage-marked provider icon and quota note were ported onto the renamed component; upstream's queue-count line taken (the fork had none).
HomeScreen / ThreadNavigationSidebar. Upstream extracted the v2-list preference into useThreadListV2Enabled. Both surfaces now read that hook with the fork's list-mode gate on top, so they still agree with each other. Also picked up upstream's autoSettleOnMerge.
Sidebar.tsx. The fork hoists isUnread/status above this point, so upstream's re-declaration would not have compiled. Kept the fork's, carried upstream's explanatory note.
Markdown tables. Upstream's cell runs pass props.skills; the fork's local tableCellRuns helper dropped them, so skills never highlighted inside a table cell. Took upstream's and removed the now-dead helper.
build-desktop-artifact. Kept the fork's extracted promoteDesktopBuildArtifacts (it also copies directories, and has its own test) and took upstream's new Windows self-containment check.
AGENTS.md. Took upstream's How it works / Where code lives / Taste / Additional tips. Deliberately not its verification and pull-request sections — upstream's "do not run repo-wide checks, CI owns the full suite" contradicts this fork's automated ship gate, and two contradictory policies in one agent file is worse than either alone.
Two welds the auto-merge produced
Both compiled clean in one place and broke in another, which is worth noting given how often this class recurs:
  • build-desktop-artifact.test.ts got duplicate FileSystem/Path imports — both sides added them. vpr typecheck did not flag it; only running the test did.
  • My own union in mobile-preferences.ts left sanitizePreferencesunclosed, taking down two unrelated mobile suites. Again typecheck stayed silent — the transform error only surfaced under test.
Verification
pnpm typecheck (0 errors) · pnpm test — 272 files, 0 failures · vp build in apps/web · vp check --fix.
Co-authored-by: Patrick Roza 42661+patroza@users.noreply.github.com
🤖 Generated with Claude Code via T3 Chat on Discord
none23and others
added 24 commits
August 13, 2026 10:31
@none23
fix(server): align Codex collaboration prompts (pingdotgg#6432)
df19f6c
@extoci
fix(web): keep turn minimap stable as composer grows (pingdotgg#6414)
5015d7c
@Bil0000
fix(web): keep pull request panel within viewport (pingdotgg#6451)
97db94c
@maria-rcks
Add bil0000 to VOUCHED contributors list (pingdotgg#6462)
9513e62
@t3-code@juliusmarminge
fix: ignore pull request actions in latency tracker (pingdotgg#6476)
2ab188f
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
@juliusmarminge
Remove rebase requirement before opening PR (pingdotgg#6479)
9e20194
@chrisdeeming
fix(mobile): extend blockquotes across wrapped lines (pingdotgg#6482)
fd51561
@Lucenx9
fix(mobile): prevent invalid HTML entities from crashing markdown (pi…
83ad26c
…ngdotgg#6495)
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
@t3-codet3-code[bot]@StiensWout
fix(web): avoid Clerk close button overlap (pingdotgg#6442)
1b16ed6
Co-authored-by: t3-code[bot] <236186684+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Wout Stiens <71498452+StiensWout@users.noreply.github.com>
@UtkarshUsername
fix(web): show unlinked icon when viewport aspect ratio is unlocked (p…
2fab18e
…ingdotgg#6509)
@Adamulek123@juliusmarminge
fix(web): scope pull request errors to their environment (pingdotgg#6490
92d4a2e
)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@paul-vd@claude
fix(mobile): show a real settings cog in the Android sidebar header (p…
bad1143
…ingdotgg#6520)
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
@t3-code@maria-rcks
fix(web): restore default stage artwork colors (pingdotgg#6535)
23d45d9
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
@WarheadTaylor
fix(web): align sidebar wordmark label (pingdotgg#6086)
5ff3a03
@RakshithBhat03
fix(web): align the snoozed thread wake icon (pingdotgg#6215)
96bfa67
@t3dotgg
feat: allow disabling auto-settle on merge (pingdotgg#5880)
db1507e
@juliusmarminge@codex@claude
Nest mobile task settings in bottom sheets (pingdotgg#6224)
85389b9
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3-code@codex
chore(mobile): bump app version to 1.0.4
5304f3e
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): simplify the desktop-managed server update banner copy (pin…
59be6f7
…gdotgg#6549)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@davidhu2000
fix(web): show background policy tooltips sooner (pingdotgg#6506)
e15f655
@chrisdeeming
feat(desktop): add favicons to the Browser panel (pingdotgg#5644)
710fd0e
@chrisdeeming
fix(preview): only show browser-ready local servers (pingdotgg#6021)
9fd788b
@tsouth89@t3-code
@UtkarshUsername@shivamhwp
perf(build): stop unpacking node_modules wholesale from the Windows a…
7e01d33
…sar (pingdotgg#5877)
Co-authored-by: tsouth89 <tsouth89@users.noreply.github.com>
Co-authored-by: t3-code[bot] <t3-code[bot]@users.noreply.github.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
@omegent-app@patroza
Merge upstream/main into fork/dev
8fb7e3c
23 upstream commits, sixteen conflicts — this batch is mostly mobile, which is
also where the fork carries the most product divergence.
Resolutions:
- Android sidebar header: upstream deleted the native header-button module
(pingdotgg#6520) so Android falls back to the shared component. The fork's list-mode
buttons already live in that shared component, so the deletions were taken
and nothing was lost.
- ThreadComposer: upstream renamed ComposerToolbarTrigger.tsx to
ComposerToolbar.tsx and the trigger to ComposerInlineControl (pingdotgg#6224). The
fork's usage-marked provider icon and quota note were ported onto the renamed
component, and upstream's queue-count line taken (the fork had none).
- HomeScreen / ThreadNavigationSidebar: upstream extracted the v2-list
preference into useThreadListV2Enabled. Both now read that hook and keep the
fork's list-mode gate on top, so the two surfaces still agree. Also picked up
upstream's autoSettleOnMerge.
- Sidebar.tsx: the fork hoists isUnread/status above this point, so upstream's
re-declaration would not compile; kept the fork's, carried upstream's note.
- Markdown tables: upstream's cell runs pass `props.skills`, which the fork's
local tableCellRuns helper dropped — skills never highlighted inside a table
cell. Took upstream's and removed the now-dead helper.
- mobile-preferences: unioned the fork's filter/grouping fields with upstream's
planModeEnabled and autoSettleOnMerge.
- build-desktop-artifact: kept the fork's extracted promote helper (it also
copies directories) and took upstream's new Windows self-containment check.
- AGENTS.md: took upstream's How it works / Where code lives / Taste / tips.
Deliberately not its verification and pull-request sections: this fork runs
an automated ship gate and has its own stricter handoff, and two
contradictory policies in one agent file is worse than either alone.
- app.config: upstream's 1.0.4 bump with the fork's OTA override kept.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
@github-actionsgithub-actionsBot
added
the 
📱 Native Change
Changes the native fingerprint; merging blocks production OTAs until a new store build ships.
label
Aug 14, 2026
@patroza
patroza
merged commit 5e63531
into
fork/devAug 14, 2026

5 checks passed

patroza added a commit
that referenced
this pull request
Aug 14, 2026
@github-actions@patroza
chore(sync): record the upstream lineage#401squashed away
be39ee3
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>

This was referenced Aug 14, 2026
 Merged

 Merged

 Merged

omegent-appBot
added a commit
that referenced
this pull request
Aug 15, 2026
@omegent-app@patroza
ci: fail when an upstream sync loses its merge parent (#403)
a19e4ec
#401 was squash-merged. That kept the code and threw the lineage away:
the 23 upstream commits stopped being ancestors, so `fork/dev` read as
**29 commits behind upstream when only 6 were genuinely outstanding**,
and the next sync would have re-merged and re-resolved all 23 — on the
same mobile files that took sixteen conflicts to land the first time.
Nobody noticed for two merges. It surfaced in a deploy alert that said
**"Commits (2)"** for a range that had carried 23.
## What this adds
A `push`-triggered check on `fork/dev` that fails when a commit which
carried a sync has fewer than two parents, and prints the `-s ours`
repair in the log.
Sync commits are identified by **the head branch of the PR they came
from**, not by their subject, because subjects vary by merge method:
```
Merge pull request #400 from patroza/sync/upstream-2026-08-12b
Merge upstream/main into fork/dev (23 commits) (#401)
merge: sync upstream through b73232b
```
A merge-button commit names the branch inline, so no API call is needed;
squash and rebase commits are resolved through the API, with the subject
line as a fallback when that is unavailable. **Ordinary fork PRs are
untouched** — they are expected to squash, and are never checked.
## Verified against the real commits
| commit | what it is | result |
|---|---|---|
| `5e63531b1` | #401, squash-merged sync | **fails**, exit 1 |
| `0bf7835cc` | #400, sync merged properly | recognised as a sync,
passes (2 parents) |
| `a76069bd9` | #402, an ordinary squashed PR | not flagged |
The third row is the one that matters most: the guard has to stay silent
on your normal workflow.
## This detects, it does not prevent
Worth being explicit, since it was the first question asked: **clicking
merge does not fail.** The check runs after the merge lands, because
GitHub has no per-PR merge-method control, and a repository-wide setting
cannot allow squash for ordinary fork PRs while requiring a merge commit
for syncs. Squash merges do fire `push` — `5e63531b1` triggered Fork CI
at 08:08 — so this turns a silent, weeks-later discovery into a red
check within a minute.
Actual prevention is `gh pr merge <n> --merge`, which is how #398, #399
and #400 all landed correctly. That is now written into the sync runbook
in `AGENTS.md`.
If you would rather it be enforced at the button, the next step is a
`sync:upstream` label workflow that merges the PR through the API once
checks pass — say the word and I will add it.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
🤖 Generated with [Claude Code](https://claude.com/claude-code) via [T3
Chat](https://t3.chat) on Discord
---------
Co-authored-by: omegent-app[bot] <306514130+omegent-app[bot]@users.noreply.github.com>
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels

📱 Native ChangeChanges the native fingerprint; merging blocks production OTAs until a new store build ships.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

16 participants

@patroza@none23@extoci@Bil0000@maria-rcks@juliusmarminge@chrisdeeming@Lucenx9@UtkarshUsername@Adamulek123@paul-vd@WarheadTaylor@RakshithBhat03@t3dotgg@davidhu2000@tsouth89

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Merge upstream/main into fork/dev (23 commits) - #401
Merged
patroza merged 24 commits into
fork/devfrom 
sync/upstream-2026-08-13
Aug 14, 2026
Merged
Merge upstream/main into fork/dev (23 commits)#401
patroza merged 24 commits into
fork/devfrom 
sync/upstream-2026-08-13
Conversation
@omegent-app
@omegent-appomegent-appBot
commented
Aug 14, 2026

Copy link


Copy Markdown

23 upstream commits. Sixteen conflicts — this batch is mostly mobile, which is exactly where the fork carries the most product divergence.
Not for merging yet. Opened for review while I investigate the mobile slowness report; some of what's in here is a candidate explanation.
Resolutions
Android sidebar header. Upstream deleted the native header-button module (#6520) so Android falls back to the shared component. The fork's list-mode buttons already live in that shared component, so the deletions were taken and nothing was lost.
ThreadComposer. Upstream renamed ComposerToolbarTrigger.tsx → ComposerToolbar.tsx, and the trigger to ComposerInlineControl (#6224). The fork's usage-marked provider icon and quota note were ported onto the renamed component; upstream's queue-count line taken (the fork had none).
HomeScreen / ThreadNavigationSidebar. Upstream extracted the v2-list preference into useThreadListV2Enabled. Both surfaces now read that hook with the fork's list-mode gate on top, so they still agree with each other. Also picked up upstream's autoSettleOnMerge.
Sidebar.tsx. The fork hoists isUnread/status above this point, so upstream's re-declaration would not have compiled. Kept the fork's, carried upstream's explanatory note.
Markdown tables. Upstream's cell runs pass props.skills; the fork's local tableCellRuns helper dropped them, so skills never highlighted inside a table cell. Took upstream's and removed the now-dead helper.
build-desktop-artifact. Kept the fork's extracted promoteDesktopBuildArtifacts (it also copies directories, and has its own test) and took upstream's new Windows self-containment check.
AGENTS.md. Took upstream's How it works / Where code lives / Taste / Additional tips. Deliberately not its verification and pull-request sections — upstream's "do not run repo-wide checks, CI owns the full suite" contradicts this fork's automated ship gate, and two contradictory policies in one agent file is worse than either alone.
Two welds the auto-merge produced
Both compiled clean in one place and broke in another, which is worth noting given how often this class recurs:
  • build-desktop-artifact.test.ts got duplicate FileSystem/Path imports — both sides added them. vpr typecheck did not flag it; only running the test did.
  • My own union in mobile-preferences.ts left sanitizePreferencesunclosed, taking down two unrelated mobile suites. Again typecheck stayed silent — the transform error only surfaced under test.
Verification
pnpm typecheck (0 errors) · pnpm test — 272 files, 0 failures · vp build in apps/web · vp check --fix.
Co-authored-by: Patrick Roza 42661+patroza@users.noreply.github.com
🤖 Generated with Claude Code via T3 Chat on Discord
none23and others
added 24 commits
August 13, 2026 10:31
@none23
fix(server): align Codex collaboration prompts (pingdotgg#6432)
df19f6c
@extoci
fix(web): keep turn minimap stable as composer grows (pingdotgg#6414)
5015d7c
@Bil0000
fix(web): keep pull request panel within viewport (pingdotgg#6451)
97db94c
@maria-rcks
Add bil0000 to VOUCHED contributors list (pingdotgg#6462)
9513e62
@t3-code@juliusmarminge
fix: ignore pull request actions in latency tracker (pingdotgg#6476)
2ab188f
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
@juliusmarminge
Remove rebase requirement before opening PR (pingdotgg#6479)
9e20194
@chrisdeeming
fix(mobile): extend blockquotes across wrapped lines (pingdotgg#6482)
fd51561
@Lucenx9
fix(mobile): prevent invalid HTML entities from crashing markdown (pi…
83ad26c
…ngdotgg#6495)
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
@t3-codet3-code[bot]@StiensWout
fix(web): avoid Clerk close button overlap (pingdotgg#6442)
1b16ed6
Co-authored-by: t3-code[bot] <236186684+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Wout Stiens <71498452+StiensWout@users.noreply.github.com>
@UtkarshUsername
fix(web): show unlinked icon when viewport aspect ratio is unlocked (p…
2fab18e
…ingdotgg#6509)
@Adamulek123@juliusmarminge
fix(web): scope pull request errors to their environment (pingdotgg#6490
92d4a2e
)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@paul-vd@claude
fix(mobile): show a real settings cog in the Android sidebar header (p…
bad1143
…ingdotgg#6520)
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
@t3-code@maria-rcks
fix(web): restore default stage artwork colors (pingdotgg#6535)
23d45d9
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
@WarheadTaylor
fix(web): align sidebar wordmark label (pingdotgg#6086)
5ff3a03
@RakshithBhat03
fix(web): align the snoozed thread wake icon (pingdotgg#6215)
96bfa67
@t3dotgg
feat: allow disabling auto-settle on merge (pingdotgg#5880)
db1507e
@juliusmarminge@codex@claude
Nest mobile task settings in bottom sheets (pingdotgg#6224)
85389b9
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3-code@codex
chore(mobile): bump app version to 1.0.4
5304f3e
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): simplify the desktop-managed server update banner copy (pin…
59be6f7
…gdotgg#6549)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@davidhu2000
fix(web): show background policy tooltips sooner (pingdotgg#6506)
e15f655
@chrisdeeming
feat(desktop): add favicons to the Browser panel (pingdotgg#5644)
710fd0e
@chrisdeeming
fix(preview): only show browser-ready local servers (pingdotgg#6021)
9fd788b
@tsouth89@t3-code
@UtkarshUsername@shivamhwp
perf(build): stop unpacking node_modules wholesale from the Windows a…
7e01d33
…sar (pingdotgg#5877)
Co-authored-by: tsouth89 <tsouth89@users.noreply.github.com>
Co-authored-by: t3-code[bot] <t3-code[bot]@users.noreply.github.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
@omegent-app@patroza
Merge upstream/main into fork/dev
8fb7e3c
23 upstream commits, sixteen conflicts — this batch is mostly mobile, which is
also where the fork carries the most product divergence.
Resolutions:
- Android sidebar header: upstream deleted the native header-button module
(pingdotgg#6520) so Android falls back to the shared component. The fork's list-mode
buttons already live in that shared component, so the deletions were taken
and nothing was lost.
- ThreadComposer: upstream renamed ComposerToolbarTrigger.tsx to
ComposerToolbar.tsx and the trigger to ComposerInlineControl (pingdotgg#6224). The
fork's usage-marked provider icon and quota note were ported onto the renamed
component, and upstream's queue-count line taken (the fork had none).
- HomeScreen / ThreadNavigationSidebar: upstream extracted the v2-list
preference into useThreadListV2Enabled. Both now read that hook and keep the
fork's list-mode gate on top, so the two surfaces still agree. Also picked up
upstream's autoSettleOnMerge.
- Sidebar.tsx: the fork hoists isUnread/status above this point, so upstream's
re-declaration would not compile; kept the fork's, carried upstream's note.
- Markdown tables: upstream's cell runs pass `props.skills`, which the fork's
local tableCellRuns helper dropped — skills never highlighted inside a table
cell. Took upstream's and removed the now-dead helper.
- mobile-preferences: unioned the fork's filter/grouping fields with upstream's
planModeEnabled and autoSettleOnMerge.
- build-desktop-artifact: kept the fork's extracted promote helper (it also
copies directories) and took upstream's new Windows self-containment check.
- AGENTS.md: took upstream's How it works / Where code lives / Taste / tips.
Deliberately not its verification and pull-request sections: this fork runs
an automated ship gate and has its own stricter handoff, and two
contradictory policies in one agent file is worse than either alone.
- app.config: upstream's 1.0.4 bump with the fork's OTA override kept.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
@github-actionsgithub-actionsBot
added
the 
📱 Native Change
Changes the native fingerprint; merging blocks production OTAs until a new store build ships.
label
Aug 14, 2026
@patroza
patroza
merged commit 5e63531
into
fork/devAug 14, 2026

5 checks passed

patroza added a commit
that referenced
this pull request
Aug 14, 2026
@github-actions@patroza
chore(sync): record the upstream lineage#401squashed away
be39ee3
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>

This was referenced Aug 14, 2026
 Merged

 Merged

 Merged

omegent-appBot
added a commit
that referenced
this pull request
Aug 15, 2026
@omegent-app@patroza
ci: fail when an upstream sync loses its merge parent (#403)
a19e4ec
#401 was squash-merged. That kept the code and threw the lineage away:
the 23 upstream commits stopped being ancestors, so `fork/dev` read as
**29 commits behind upstream when only 6 were genuinely outstanding**,
and the next sync would have re-merged and re-resolved all 23 — on the
same mobile files that took sixteen conflicts to land the first time.
Nobody noticed for two merges. It surfaced in a deploy alert that said
**"Commits (2)"** for a range that had carried 23.
## What this adds
A `push`-triggered check on `fork/dev` that fails when a commit which
carried a sync has fewer than two parents, and prints the `-s ours`
repair in the log.
Sync commits are identified by **the head branch of the PR they came
from**, not by their subject, because subjects vary by merge method:
```
Merge pull request #400 from patroza/sync/upstream-2026-08-12b
Merge upstream/main into fork/dev (23 commits) (#401)
merge: sync upstream through b73232b
```
A merge-button commit names the branch inline, so no API call is needed;
squash and rebase commits are resolved through the API, with the subject
line as a fallback when that is unavailable. **Ordinary fork PRs are
untouched** — they are expected to squash, and are never checked.
## Verified against the real commits
| commit | what it is | result |
|---|---|---|
| `5e63531b1` | #401, squash-merged sync | **fails**, exit 1 |
| `0bf7835cc` | #400, sync merged properly | recognised as a sync,
passes (2 parents) |
| `a76069bd9` | #402, an ordinary squashed PR | not flagged |
The third row is the one that matters most: the guard has to stay silent
on your normal workflow.
## This detects, it does not prevent
Worth being explicit, since it was the first question asked: **clicking
merge does not fail.** The check runs after the merge lands, because
GitHub has no per-PR merge-method control, and a repository-wide setting
cannot allow squash for ordinary fork PRs while requiring a merge commit
for syncs. Squash merges do fire `push` — `5e63531b1` triggered Fork CI
at 08:08 — so this turns a silent, weeks-later discovery into a red
check within a minute.
Actual prevention is `gh pr merge <n> --merge`, which is how #398, #399
and #400 all landed correctly. That is now written into the sync runbook
in `AGENTS.md`.
If you would rather it be enforced at the button, the next step is a
`sync:upstream` label workflow that merges the PR through the API once
checks pass — say the word and I will add it.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
🤖 Generated with [Claude Code](https://claude.com/claude-code) via [T3
Chat](https://t3.chat) on Discord
---------
Co-authored-by: omegent-app[bot] <306514130+omegent-app[bot]@users.noreply.github.com>
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels

📱 Native ChangeChanges the native fingerprint; merging blocks production OTAs until a new store build ships.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

16 participants

@patroza@none23@extoci@Bil0000@maria-rcks@juliusmarminge@chrisdeeming@Lucenx9@UtkarshUsername@Adamulek123@paul-vd@WarheadTaylor@RakshithBhat03@t3dotgg@davidhu2000@tsouth89

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Merge upstream/main into fork/dev (23 commits) - #401
Merged
patroza merged 24 commits into
fork/devfrom 
sync/upstream-2026-08-13
Aug 14, 2026
Merged
Merge upstream/main into fork/dev (23 commits)#401
patroza merged 24 commits into
fork/devfrom 
sync/upstream-2026-08-13
Conversation
@omegent-app
@omegent-appomegent-appBot
commented
Aug 14, 2026

Copy link


Copy Markdown

23 upstream commits. Sixteen conflicts — this batch is mostly mobile, which is exactly where the fork carries the most product divergence.
Not for merging yet. Opened for review while I investigate the mobile slowness report; some of what's in here is a candidate explanation.
Resolutions
Android sidebar header. Upstream deleted the native header-button module (#6520) so Android falls back to the shared component. The fork's list-mode buttons already live in that shared component, so the deletions were taken and nothing was lost.
ThreadComposer. Upstream renamed ComposerToolbarTrigger.tsx → ComposerToolbar.tsx, and the trigger to ComposerInlineControl (#6224). The fork's usage-marked provider icon and quota note were ported onto the renamed component; upstream's queue-count line taken (the fork had none).
HomeScreen / ThreadNavigationSidebar. Upstream extracted the v2-list preference into useThreadListV2Enabled. Both surfaces now read that hook with the fork's list-mode gate on top, so they still agree with each other. Also picked up upstream's autoSettleOnMerge.
Sidebar.tsx. The fork hoists isUnread/status above this point, so upstream's re-declaration would not have compiled. Kept the fork's, carried upstream's explanatory note.
Markdown tables. Upstream's cell runs pass props.skills; the fork's local tableCellRuns helper dropped them, so skills never highlighted inside a table cell. Took upstream's and removed the now-dead helper.
build-desktop-artifact. Kept the fork's extracted promoteDesktopBuildArtifacts (it also copies directories, and has its own test) and took upstream's new Windows self-containment check.
AGENTS.md. Took upstream's How it works / Where code lives / Taste / Additional tips. Deliberately not its verification and pull-request sections — upstream's "do not run repo-wide checks, CI owns the full suite" contradicts this fork's automated ship gate, and two contradictory policies in one agent file is worse than either alone.
Two welds the auto-merge produced
Both compiled clean in one place and broke in another, which is worth noting given how often this class recurs:
  • build-desktop-artifact.test.ts got duplicate FileSystem/Path imports — both sides added them. vpr typecheck did not flag it; only running the test did.
  • My own union in mobile-preferences.ts left sanitizePreferencesunclosed, taking down two unrelated mobile suites. Again typecheck stayed silent — the transform error only surfaced under test.
Verification
pnpm typecheck (0 errors) · pnpm test — 272 files, 0 failures · vp build in apps/web · vp check --fix.
Co-authored-by: Patrick Roza 42661+patroza@users.noreply.github.com
🤖 Generated with Claude Code via T3 Chat on Discord
none23and others
added 24 commits
August 13, 2026 10:31
@none23
fix(server): align Codex collaboration prompts (pingdotgg#6432)
df19f6c
@extoci
fix(web): keep turn minimap stable as composer grows (pingdotgg#6414)
5015d7c
@Bil0000
fix(web): keep pull request panel within viewport (pingdotgg#6451)
97db94c
@maria-rcks
Add bil0000 to VOUCHED contributors list (pingdotgg#6462)
9513e62
@t3-code@juliusmarminge
fix: ignore pull request actions in latency tracker (pingdotgg#6476)
2ab188f
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
@juliusmarminge
Remove rebase requirement before opening PR (pingdotgg#6479)
9e20194
@chrisdeeming
fix(mobile): extend blockquotes across wrapped lines (pingdotgg#6482)
fd51561
@Lucenx9
fix(mobile): prevent invalid HTML entities from crashing markdown (pi…
83ad26c
…ngdotgg#6495)
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
@t3-codet3-code[bot]@StiensWout
fix(web): avoid Clerk close button overlap (pingdotgg#6442)
1b16ed6
Co-authored-by: t3-code[bot] <236186684+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Wout Stiens <71498452+StiensWout@users.noreply.github.com>
@UtkarshUsername
fix(web): show unlinked icon when viewport aspect ratio is unlocked (p…
2fab18e
…ingdotgg#6509)
@Adamulek123@juliusmarminge
fix(web): scope pull request errors to their environment (pingdotgg#6490
92d4a2e
)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@paul-vd@claude
fix(mobile): show a real settings cog in the Android sidebar header (p…
bad1143
…ingdotgg#6520)
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
@t3-code@maria-rcks
fix(web): restore default stage artwork colors (pingdotgg#6535)
23d45d9
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
@WarheadTaylor
fix(web): align sidebar wordmark label (pingdotgg#6086)
5ff3a03
@RakshithBhat03
fix(web): align the snoozed thread wake icon (pingdotgg#6215)
96bfa67
@t3dotgg
feat: allow disabling auto-settle on merge (pingdotgg#5880)
db1507e
@juliusmarminge@codex@claude
Nest mobile task settings in bottom sheets (pingdotgg#6224)
85389b9
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@t3-code@codex
chore(mobile): bump app version to 1.0.4
5304f3e
Co-authored-by: codex <codex@users.noreply.github.com>
@t3dotgg@claude
fix(web): simplify the desktop-managed server update banner copy (pin…
59be6f7
…gdotgg#6549)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@davidhu2000
fix(web): show background policy tooltips sooner (pingdotgg#6506)
e15f655
@chrisdeeming
feat(desktop): add favicons to the Browser panel (pingdotgg#5644)
710fd0e
@chrisdeeming
fix(preview): only show browser-ready local servers (pingdotgg#6021)
9fd788b
@tsouth89@t3-code
@UtkarshUsername@shivamhwp
perf(build): stop unpacking node_modules wholesale from the Windows a…
7e01d33
…sar (pingdotgg#5877)
Co-authored-by: tsouth89 <tsouth89@users.noreply.github.com>
Co-authored-by: t3-code[bot] <t3-code[bot]@users.noreply.github.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
@omegent-app@patroza
Merge upstream/main into fork/dev
8fb7e3c
23 upstream commits, sixteen conflicts — this batch is mostly mobile, which is
also where the fork carries the most product divergence.
Resolutions:
- Android sidebar header: upstream deleted the native header-button module
(pingdotgg#6520) so Android falls back to the shared component. The fork's list-mode
buttons already live in that shared component, so the deletions were taken
and nothing was lost.
- ThreadComposer: upstream renamed ComposerToolbarTrigger.tsx to
ComposerToolbar.tsx and the trigger to ComposerInlineControl (pingdotgg#6224). The
fork's usage-marked provider icon and quota note were ported onto the renamed
component, and upstream's queue-count line taken (the fork had none).
- HomeScreen / ThreadNavigationSidebar: upstream extracted the v2-list
preference into useThreadListV2Enabled. Both now read that hook and keep the
fork's list-mode gate on top, so the two surfaces still agree. Also picked up
upstream's autoSettleOnMerge.
- Sidebar.tsx: the fork hoists isUnread/status above this point, so upstream's
re-declaration would not compile; kept the fork's, carried upstream's note.
- Markdown tables: upstream's cell runs pass `props.skills`, which the fork's
local tableCellRuns helper dropped — skills never highlighted inside a table
cell. Took upstream's and removed the now-dead helper.
- mobile-preferences: unioned the fork's filter/grouping fields with upstream's
planModeEnabled and autoSettleOnMerge.
- build-desktop-artifact: kept the fork's extracted promote helper (it also
copies directories) and took upstream's new Windows self-containment check.
- AGENTS.md: took upstream's How it works / Where code lives / Taste / tips.
Deliberately not its verification and pull-request sections: this fork runs
an automated ship gate and has its own stricter handoff, and two
contradictory policies in one agent file is worse than either alone.
- app.config: upstream's 1.0.4 bump with the fork's OTA override kept.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
@github-actionsgithub-actionsBot
added
the 
📱 Native Change
Changes the native fingerprint; merging blocks production OTAs until a new store build ships.
label
Aug 14, 2026
@patroza
patroza
merged commit 5e63531
into
fork/devAug 14, 2026

5 checks passed

patroza added a commit
that referenced
this pull request
Aug 14, 2026
@github-actions@patroza
chore(sync): record the upstream lineage#401squashed away
be39ee3
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>

This was referenced Aug 14, 2026
 Merged

 Merged

 Merged

omegent-appBot
added a commit
that referenced
this pull request
Aug 15, 2026
@omegent-app@patroza
ci: fail when an upstream sync loses its merge parent (#403)
a19e4ec
#401 was squash-merged. That kept the code and threw the lineage away:
the 23 upstream commits stopped being ancestors, so `fork/dev` read as
**29 commits behind upstream when only 6 were genuinely outstanding**,
and the next sync would have re-merged and re-resolved all 23 — on the
same mobile files that took sixteen conflicts to land the first time.
Nobody noticed for two merges. It surfaced in a deploy alert that said
**"Commits (2)"** for a range that had carried 23.
## What this adds
A `push`-triggered check on `fork/dev` that fails when a commit which
carried a sync has fewer than two parents, and prints the `-s ours`
repair in the log.
Sync commits are identified by **the head branch of the PR they came
from**, not by their subject, because subjects vary by merge method:
```
Merge pull request #400 from patroza/sync/upstream-2026-08-12b
Merge upstream/main into fork/dev (23 commits) (#401)
merge: sync upstream through b73232b
```
A merge-button commit names the branch inline, so no API call is needed;
squash and rebase commits are resolved through the API, with the subject
line as a fallback when that is unavailable. **Ordinary fork PRs are
untouched** — they are expected to squash, and are never checked.
## Verified against the real commits
| commit | what it is | result |
|---|---|---|
| `5e63531b1` | #401, squash-merged sync | **fails**, exit 1 |
| `0bf7835cc` | #400, sync merged properly | recognised as a sync,
passes (2 parents) |
| `a76069bd9` | #402, an ordinary squashed PR | not flagged |
The third row is the one that matters most: the guard has to stay silent
on your normal workflow.
## This detects, it does not prevent
Worth being explicit, since it was the first question asked: **clicking
merge does not fail.** The check runs after the merge lands, because
GitHub has no per-PR merge-method control, and a repository-wide setting
cannot allow squash for ordinary fork PRs while requiring a merge commit
for syncs. Squash merges do fire `push` — `5e63531b1` triggered Fork CI
at 08:08 — so this turns a silent, weeks-later discovery into a red
check within a minute.
Actual prevention is `gh pr merge <n> --merge`, which is how #398, #399
and #400 all landed correctly. That is now written into the sync runbook
in `AGENTS.md`.
If you would rather it be enforced at the button, the next step is a
`sync:upstream` label workflow that merges the PR through the API once
checks pass — say the word and I will add it.
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
🤖 Generated with [Claude Code](https://claude.com/claude-code) via [T3
Chat](https://t3.chat) on Discord
---------
Co-authored-by: omegent-app[bot] <306514130+omegent-app[bot]@users.noreply.github.com>
Co-authored-by: Patrick Roza <42661+patroza@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels

📱 Native ChangeChanges the native fingerprint; merging blocks production OTAs until a new store build ships.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

16 participants

@patroza@none23@extoci@Bil0000@maria-rcks@juliusmarminge@chrisdeeming@Lucenx9@UtkarshUsername@Adamulek123@paul-vd@WarheadTaylor@RakshithBhat03@t3dotgg@davidhu2000@tsouth89