merge: sync upstream through f708f63fa (66 commits) - #416

Merged
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17
Aug 20, 2026
Merged

merge: sync upstream through f708f63fa (66 commits)#416
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17

Conversation

@omegent-app

Copy link
Copy Markdown

Merges 66 upstream commits (pingdotgg/t3code through f708f63fa) into fork/dev.

35 files conflicted across 55 hunks.

Weld points

chat/ChatComposer.tsx — upstream #7150
relocated the prompt editor, the length validation and the whole footer. The
fork's copies survived the merge as a second live layout, so deleting them
outright would have silently dropped three fork-only things. Each was ported
into upstream's copy first:

  • the environmentUnavailable composer placeholder
  • usageSnapshot on the provider model picker
  • the attach-images button that drives the hidden iOS file input (kept above the
    mobile branches — remounting it mid-picker discards the selection)

chat/MessagesTimeline.logic.ts — upstream's new active-turn block indexes
whatever array it iterates. The fork iterates its own
collapseConsecutiveDuplicateAssistantEntries(interleaveTimelineEntriesForSteeredTurn(...))
list, so the block was rebased onto that list; otherwise the computed indices
and the loop would refer to two differently-shaped arrays.

updates/DesktopUpdates.ts — upstream's tryStartUpdateAction reservation
and its widened "installable download" check (which now covers retrying a failed
install), kept compatible with the fork's Linux dir-style install mode.

CommandPalette.tsx / .logic.ts — dropped the open prop upstream
removed while keeping the fork's file-picker and content-search overlays, and
took upstream's newer reduceCommandPaletteUiState (it preserves mode when a
toggle closes the overlay) over the fork's relocated copy of the older one.

ProviderRegistry.test.ts — kept the fork's coverage for
mergeProviderSnapshots / selectProvidersByKind. Upstream deleted that test
but left both functions exported, and nothing else exercises them.

.github/workflows/mobile-showcase-screenshots.yml — GitHub-hosted runners,
since this fork has no Blacksmith runners, with upstream's palette-driven
timeout.

Smaller ones: App.tsx (fork's IdentityClaimGate into upstream's extracted
AppContent), ThreadComposer (upstream's surface-derived backdrop with the
fork's opacity stops), GitManager (hasFailingChecks alongside upstream's
updatedAt), DesktopLifecycle.test (upstream's shared layer factories, with
the fork's requestSingleInstanceLock / navigateToThread / navigateToProject
added).

Follow-on fixes this required

  • Upstream's new t3code/no-native-title-tooltip rule failed on seven fork-only
    components. Four had a title duplicating an existing aria-label; three
    needed the label moved off the native tooltip.
  • changeRequestStatechangeRequest (now {state, updatedAt}) at five fork
    call sites. LegacySidebar only ever had the bare state, so
    isThreadSettledForDisplay adapts at its own boundary rather than changing
    that map.
  • GitManager now always maps a PR's updatedAt, so three fork assertions that
    compared the PR object exactly needed the field.
  • browserHistoryStore.test.ts joins the isolated-test list: it mocks
    ~/state/session, and under the fork's isolate: false unit project it failed
    one full run and passed the next purely on file ordering — the same hazard as
    PreviewFaviconIcon.test.tsx last sync.

Verification

rerere was disabled for this merge. It had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.

Merged, not squashed, so fork/dev keeps upstream as a second parent.

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

Brechardand others added 30 commits August 15, 2026 16:13
)
Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: maria <maria@kuuro.net>
…#6392)
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ingdotgg#7082)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…g#7083)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…in GitHubPullRequestCli (pingdotgg#7385)
Signed-off-by: aoright <102943475+aoright@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
gsimoneand others added 27 commits August 19, 2026 00:31
…tgg#6286)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: GPT-5.6 <noreply@openai.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Merges 66 upstream commits into fork/dev. Notable weld points:
- ChatComposer: upstream pingdotgg#7150 relocated the prompt editor, length validation
and footer, leaving the fork's copies as a second live layout. Ported the
fork-only pieces into upstream's copies first — the environment-unavailable
placeholder, the model picker's usage snapshot, and the attach-images button
that drives the hidden iOS file input — then dropped the stale layout.
- MessagesTimeline: upstream's new active-turn block indexes whatever it
iterates; the fork walks its collapsed/interleaved list, so the block was
rebased onto that list to keep the indices referring to one array.
- DesktopUpdates: upstream's action reservation and widened installable check,
kept compatible with the fork's Linux dir-install mode.
- CommandPalette: dropped the `open` prop upstream removed while keeping the
fork's file-picker / content-search overlays, and took upstream's newer
reduceCommandPaletteUiState over the fork's relocated copy of the old one.
- mobile-showcase-screenshots: GitHub-hosted runners (this fork has no
Blacksmith) with upstream's palette-driven timeout.
- ProviderRegistry.test: kept the fork's coverage for mergeProviderSnapshots /
selectProvidersByKind, which upstream deleted while leaving both exported.
Upstream's new t3code/no-native-title-tooltip rule flagged seven fork-only
components; four had a title duplicating an existing aria-label, three needed
the label moved off the native tooltip.
rerere was disabled for this merge: it had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.
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 20, 2026
@omegent-app
omegent-appBot merged commit 8f3a7d0 into fork/devAug 20, 2026
5 checks passed
@omegent-app
omegent-appBot deleted the sync/upstream-2026-08-17 branch August 20, 2026 07:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@Brechard@Bil0000@eddy-naboulet@StiensWout@PollyGlot@chrisdeeming@UtkarshUsername@frarredondo@NitayRabi@juliusmarminge@lnieuwenhuis@tris203@none23@maslinedwin@aoright@gbarros-dev@Rishet11@AugusDogus@tarik02@gsimone
, '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: sync upstream through f708f63fa (66 commits) - #416

Merged
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17
Aug 20, 2026
Merged

merge: sync upstream through f708f63fa (66 commits)#416
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17

Conversation

@omegent-app

Copy link
Copy Markdown

Merges 66 upstream commits (pingdotgg/t3code through f708f63fa) into fork/dev.

35 files conflicted across 55 hunks.

Weld points

chat/ChatComposer.tsx — upstream #7150
relocated the prompt editor, the length validation and the whole footer. The
fork's copies survived the merge as a second live layout, so deleting them
outright would have silently dropped three fork-only things. Each was ported
into upstream's copy first:

  • the environmentUnavailable composer placeholder
  • usageSnapshot on the provider model picker
  • the attach-images button that drives the hidden iOS file input (kept above the
    mobile branches — remounting it mid-picker discards the selection)

chat/MessagesTimeline.logic.ts — upstream's new active-turn block indexes
whatever array it iterates. The fork iterates its own
collapseConsecutiveDuplicateAssistantEntries(interleaveTimelineEntriesForSteeredTurn(...))
list, so the block was rebased onto that list; otherwise the computed indices
and the loop would refer to two differently-shaped arrays.

updates/DesktopUpdates.ts — upstream's tryStartUpdateAction reservation
and its widened "installable download" check (which now covers retrying a failed
install), kept compatible with the fork's Linux dir-style install mode.

CommandPalette.tsx / .logic.ts — dropped the open prop upstream
removed while keeping the fork's file-picker and content-search overlays, and
took upstream's newer reduceCommandPaletteUiState (it preserves mode when a
toggle closes the overlay) over the fork's relocated copy of the older one.

ProviderRegistry.test.ts — kept the fork's coverage for
mergeProviderSnapshots / selectProvidersByKind. Upstream deleted that test
but left both functions exported, and nothing else exercises them.

.github/workflows/mobile-showcase-screenshots.yml — GitHub-hosted runners,
since this fork has no Blacksmith runners, with upstream's palette-driven
timeout.

Smaller ones: App.tsx (fork's IdentityClaimGate into upstream's extracted
AppContent), ThreadComposer (upstream's surface-derived backdrop with the
fork's opacity stops), GitManager (hasFailingChecks alongside upstream's
updatedAt), DesktopLifecycle.test (upstream's shared layer factories, with
the fork's requestSingleInstanceLock / navigateToThread / navigateToProject
added).

Follow-on fixes this required

  • Upstream's new t3code/no-native-title-tooltip rule failed on seven fork-only
    components. Four had a title duplicating an existing aria-label; three
    needed the label moved off the native tooltip.
  • changeRequestStatechangeRequest (now {state, updatedAt}) at five fork
    call sites. LegacySidebar only ever had the bare state, so
    isThreadSettledForDisplay adapts at its own boundary rather than changing
    that map.
  • GitManager now always maps a PR's updatedAt, so three fork assertions that
    compared the PR object exactly needed the field.
  • browserHistoryStore.test.ts joins the isolated-test list: it mocks
    ~/state/session, and under the fork's isolate: false unit project it failed
    one full run and passed the next purely on file ordering — the same hazard as
    PreviewFaviconIcon.test.tsx last sync.

Verification

rerere was disabled for this merge. It had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.

Merged, not squashed, so fork/dev keeps upstream as a second parent.

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

Brechardand others added 30 commits August 15, 2026 16:13
)
Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: maria <maria@kuuro.net>
…#6392)
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ingdotgg#7082)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…g#7083)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…in GitHubPullRequestCli (pingdotgg#7385)
Signed-off-by: aoright <102943475+aoright@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
gsimoneand others added 27 commits August 19, 2026 00:31
…tgg#6286)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: GPT-5.6 <noreply@openai.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Merges 66 upstream commits into fork/dev. Notable weld points:
- ChatComposer: upstream pingdotgg#7150 relocated the prompt editor, length validation
and footer, leaving the fork's copies as a second live layout. Ported the
fork-only pieces into upstream's copies first — the environment-unavailable
placeholder, the model picker's usage snapshot, and the attach-images button
that drives the hidden iOS file input — then dropped the stale layout.
- MessagesTimeline: upstream's new active-turn block indexes whatever it
iterates; the fork walks its collapsed/interleaved list, so the block was
rebased onto that list to keep the indices referring to one array.
- DesktopUpdates: upstream's action reservation and widened installable check,
kept compatible with the fork's Linux dir-install mode.
- CommandPalette: dropped the `open` prop upstream removed while keeping the
fork's file-picker / content-search overlays, and took upstream's newer
reduceCommandPaletteUiState over the fork's relocated copy of the old one.
- mobile-showcase-screenshots: GitHub-hosted runners (this fork has no
Blacksmith) with upstream's palette-driven timeout.
- ProviderRegistry.test: kept the fork's coverage for mergeProviderSnapshots /
selectProvidersByKind, which upstream deleted while leaving both exported.
Upstream's new t3code/no-native-title-tooltip rule flagged seven fork-only
components; four had a title duplicating an existing aria-label, three needed
the label moved off the native tooltip.
rerere was disabled for this merge: it had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.
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 20, 2026
@omegent-app
omegent-appBot merged commit 8f3a7d0 into fork/devAug 20, 2026
5 checks passed
@omegent-app
omegent-appBot deleted the sync/upstream-2026-08-17 branch August 20, 2026 07:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@Brechard@Bil0000@eddy-naboulet@StiensWout@PollyGlot@chrisdeeming@UtkarshUsername@frarredondo@NitayRabi@juliusmarminge@lnieuwenhuis@tris203@none23@maslinedwin@aoright@gbarros-dev@Rishet11@AugusDogus@tarik02@gsimone
, '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: sync upstream through f708f63fa (66 commits) - #416

Merged
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17
Aug 20, 2026
Merged

merge: sync upstream through f708f63fa (66 commits)#416
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17

Conversation

@omegent-app

Copy link
Copy Markdown

Merges 66 upstream commits (pingdotgg/t3code through f708f63fa) into fork/dev.

35 files conflicted across 55 hunks.

Weld points

chat/ChatComposer.tsx — upstream #7150
relocated the prompt editor, the length validation and the whole footer. The
fork's copies survived the merge as a second live layout, so deleting them
outright would have silently dropped three fork-only things. Each was ported
into upstream's copy first:

  • the environmentUnavailable composer placeholder
  • usageSnapshot on the provider model picker
  • the attach-images button that drives the hidden iOS file input (kept above the
    mobile branches — remounting it mid-picker discards the selection)

chat/MessagesTimeline.logic.ts — upstream's new active-turn block indexes
whatever array it iterates. The fork iterates its own
collapseConsecutiveDuplicateAssistantEntries(interleaveTimelineEntriesForSteeredTurn(...))
list, so the block was rebased onto that list; otherwise the computed indices
and the loop would refer to two differently-shaped arrays.

updates/DesktopUpdates.ts — upstream's tryStartUpdateAction reservation
and its widened "installable download" check (which now covers retrying a failed
install), kept compatible with the fork's Linux dir-style install mode.

CommandPalette.tsx / .logic.ts — dropped the open prop upstream
removed while keeping the fork's file-picker and content-search overlays, and
took upstream's newer reduceCommandPaletteUiState (it preserves mode when a
toggle closes the overlay) over the fork's relocated copy of the older one.

ProviderRegistry.test.ts — kept the fork's coverage for
mergeProviderSnapshots / selectProvidersByKind. Upstream deleted that test
but left both functions exported, and nothing else exercises them.

.github/workflows/mobile-showcase-screenshots.yml — GitHub-hosted runners,
since this fork has no Blacksmith runners, with upstream's palette-driven
timeout.

Smaller ones: App.tsx (fork's IdentityClaimGate into upstream's extracted
AppContent), ThreadComposer (upstream's surface-derived backdrop with the
fork's opacity stops), GitManager (hasFailingChecks alongside upstream's
updatedAt), DesktopLifecycle.test (upstream's shared layer factories, with
the fork's requestSingleInstanceLock / navigateToThread / navigateToProject
added).

Follow-on fixes this required

  • Upstream's new t3code/no-native-title-tooltip rule failed on seven fork-only
    components. Four had a title duplicating an existing aria-label; three
    needed the label moved off the native tooltip.
  • changeRequestStatechangeRequest (now {state, updatedAt}) at five fork
    call sites. LegacySidebar only ever had the bare state, so
    isThreadSettledForDisplay adapts at its own boundary rather than changing
    that map.
  • GitManager now always maps a PR's updatedAt, so three fork assertions that
    compared the PR object exactly needed the field.
  • browserHistoryStore.test.ts joins the isolated-test list: it mocks
    ~/state/session, and under the fork's isolate: false unit project it failed
    one full run and passed the next purely on file ordering — the same hazard as
    PreviewFaviconIcon.test.tsx last sync.

Verification

rerere was disabled for this merge. It had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.

Merged, not squashed, so fork/dev keeps upstream as a second parent.

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

Brechardand others added 30 commits August 15, 2026 16:13
)
Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: maria <maria@kuuro.net>
…#6392)
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ingdotgg#7082)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…g#7083)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…in GitHubPullRequestCli (pingdotgg#7385)
Signed-off-by: aoright <102943475+aoright@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
gsimoneand others added 27 commits August 19, 2026 00:31
…tgg#6286)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: GPT-5.6 <noreply@openai.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Merges 66 upstream commits into fork/dev. Notable weld points:
- ChatComposer: upstream pingdotgg#7150 relocated the prompt editor, length validation
and footer, leaving the fork's copies as a second live layout. Ported the
fork-only pieces into upstream's copies first — the environment-unavailable
placeholder, the model picker's usage snapshot, and the attach-images button
that drives the hidden iOS file input — then dropped the stale layout.
- MessagesTimeline: upstream's new active-turn block indexes whatever it
iterates; the fork walks its collapsed/interleaved list, so the block was
rebased onto that list to keep the indices referring to one array.
- DesktopUpdates: upstream's action reservation and widened installable check,
kept compatible with the fork's Linux dir-install mode.
- CommandPalette: dropped the `open` prop upstream removed while keeping the
fork's file-picker / content-search overlays, and took upstream's newer
reduceCommandPaletteUiState over the fork's relocated copy of the old one.
- mobile-showcase-screenshots: GitHub-hosted runners (this fork has no
Blacksmith) with upstream's palette-driven timeout.
- ProviderRegistry.test: kept the fork's coverage for mergeProviderSnapshots /
selectProvidersByKind, which upstream deleted while leaving both exported.
Upstream's new t3code/no-native-title-tooltip rule flagged seven fork-only
components; four had a title duplicating an existing aria-label, three needed
the label moved off the native tooltip.
rerere was disabled for this merge: it had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.
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 20, 2026
@omegent-app
omegent-appBot merged commit 8f3a7d0 into fork/devAug 20, 2026
5 checks passed
@omegent-app
omegent-appBot deleted the sync/upstream-2026-08-17 branch August 20, 2026 07:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@Brechard@Bil0000@eddy-naboulet@StiensWout@PollyGlot@chrisdeeming@UtkarshUsername@frarredondo@NitayRabi@juliusmarminge@lnieuwenhuis@tris203@none23@maslinedwin@aoright@gbarros-dev@Rishet11@AugusDogus@tarik02@gsimone
, '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: sync upstream through f708f63fa (66 commits) - #416

Merged
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17
Aug 20, 2026
Merged

merge: sync upstream through f708f63fa (66 commits)#416
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17

Conversation

@omegent-app

Copy link
Copy Markdown

Merges 66 upstream commits (pingdotgg/t3code through f708f63fa) into fork/dev.

35 files conflicted across 55 hunks.

Weld points

chat/ChatComposer.tsx — upstream #7150
relocated the prompt editor, the length validation and the whole footer. The
fork's copies survived the merge as a second live layout, so deleting them
outright would have silently dropped three fork-only things. Each was ported
into upstream's copy first:

  • the environmentUnavailable composer placeholder
  • usageSnapshot on the provider model picker
  • the attach-images button that drives the hidden iOS file input (kept above the
    mobile branches — remounting it mid-picker discards the selection)

chat/MessagesTimeline.logic.ts — upstream's new active-turn block indexes
whatever array it iterates. The fork iterates its own
collapseConsecutiveDuplicateAssistantEntries(interleaveTimelineEntriesForSteeredTurn(...))
list, so the block was rebased onto that list; otherwise the computed indices
and the loop would refer to two differently-shaped arrays.

updates/DesktopUpdates.ts — upstream's tryStartUpdateAction reservation
and its widened "installable download" check (which now covers retrying a failed
install), kept compatible with the fork's Linux dir-style install mode.

CommandPalette.tsx / .logic.ts — dropped the open prop upstream
removed while keeping the fork's file-picker and content-search overlays, and
took upstream's newer reduceCommandPaletteUiState (it preserves mode when a
toggle closes the overlay) over the fork's relocated copy of the older one.

ProviderRegistry.test.ts — kept the fork's coverage for
mergeProviderSnapshots / selectProvidersByKind. Upstream deleted that test
but left both functions exported, and nothing else exercises them.

.github/workflows/mobile-showcase-screenshots.yml — GitHub-hosted runners,
since this fork has no Blacksmith runners, with upstream's palette-driven
timeout.

Smaller ones: App.tsx (fork's IdentityClaimGate into upstream's extracted
AppContent), ThreadComposer (upstream's surface-derived backdrop with the
fork's opacity stops), GitManager (hasFailingChecks alongside upstream's
updatedAt), DesktopLifecycle.test (upstream's shared layer factories, with
the fork's requestSingleInstanceLock / navigateToThread / navigateToProject
added).

Follow-on fixes this required

  • Upstream's new t3code/no-native-title-tooltip rule failed on seven fork-only
    components. Four had a title duplicating an existing aria-label; three
    needed the label moved off the native tooltip.
  • changeRequestStatechangeRequest (now {state, updatedAt}) at five fork
    call sites. LegacySidebar only ever had the bare state, so
    isThreadSettledForDisplay adapts at its own boundary rather than changing
    that map.
  • GitManager now always maps a PR's updatedAt, so three fork assertions that
    compared the PR object exactly needed the field.
  • browserHistoryStore.test.ts joins the isolated-test list: it mocks
    ~/state/session, and under the fork's isolate: false unit project it failed
    one full run and passed the next purely on file ordering — the same hazard as
    PreviewFaviconIcon.test.tsx last sync.

Verification

rerere was disabled for this merge. It had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.

Merged, not squashed, so fork/dev keeps upstream as a second parent.

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

Brechardand others added 30 commits August 15, 2026 16:13
)
Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: maria <maria@kuuro.net>
…#6392)
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ingdotgg#7082)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…g#7083)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…in GitHubPullRequestCli (pingdotgg#7385)
Signed-off-by: aoright <102943475+aoright@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
gsimoneand others added 27 commits August 19, 2026 00:31
…tgg#6286)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: GPT-5.6 <noreply@openai.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Merges 66 upstream commits into fork/dev. Notable weld points:
- ChatComposer: upstream pingdotgg#7150 relocated the prompt editor, length validation
and footer, leaving the fork's copies as a second live layout. Ported the
fork-only pieces into upstream's copies first — the environment-unavailable
placeholder, the model picker's usage snapshot, and the attach-images button
that drives the hidden iOS file input — then dropped the stale layout.
- MessagesTimeline: upstream's new active-turn block indexes whatever it
iterates; the fork walks its collapsed/interleaved list, so the block was
rebased onto that list to keep the indices referring to one array.
- DesktopUpdates: upstream's action reservation and widened installable check,
kept compatible with the fork's Linux dir-install mode.
- CommandPalette: dropped the `open` prop upstream removed while keeping the
fork's file-picker / content-search overlays, and took upstream's newer
reduceCommandPaletteUiState over the fork's relocated copy of the old one.
- mobile-showcase-screenshots: GitHub-hosted runners (this fork has no
Blacksmith) with upstream's palette-driven timeout.
- ProviderRegistry.test: kept the fork's coverage for mergeProviderSnapshots /
selectProvidersByKind, which upstream deleted while leaving both exported.
Upstream's new t3code/no-native-title-tooltip rule flagged seven fork-only
components; four had a title duplicating an existing aria-label, three needed
the label moved off the native tooltip.
rerere was disabled for this merge: it had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.
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 20, 2026
@omegent-app
omegent-appBot merged commit 8f3a7d0 into fork/devAug 20, 2026
5 checks passed
@omegent-app
omegent-appBot deleted the sync/upstream-2026-08-17 branch August 20, 2026 07:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@Brechard@Bil0000@eddy-naboulet@StiensWout@PollyGlot@chrisdeeming@UtkarshUsername@frarredondo@NitayRabi@juliusmarminge@lnieuwenhuis@tris203@none23@maslinedwin@aoright@gbarros-dev@Rishet11@AugusDogus@tarik02@gsimone
, '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: sync upstream through f708f63fa (66 commits) - #416

Merged
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17
Aug 20, 2026
Merged

merge: sync upstream through f708f63fa (66 commits)#416
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17

Conversation

@omegent-app

Copy link
Copy Markdown

Merges 66 upstream commits (pingdotgg/t3code through f708f63fa) into fork/dev.

35 files conflicted across 55 hunks.

Weld points

chat/ChatComposer.tsx — upstream #7150
relocated the prompt editor, the length validation and the whole footer. The
fork's copies survived the merge as a second live layout, so deleting them
outright would have silently dropped three fork-only things. Each was ported
into upstream's copy first:

  • the environmentUnavailable composer placeholder
  • usageSnapshot on the provider model picker
  • the attach-images button that drives the hidden iOS file input (kept above the
    mobile branches — remounting it mid-picker discards the selection)

chat/MessagesTimeline.logic.ts — upstream's new active-turn block indexes
whatever array it iterates. The fork iterates its own
collapseConsecutiveDuplicateAssistantEntries(interleaveTimelineEntriesForSteeredTurn(...))
list, so the block was rebased onto that list; otherwise the computed indices
and the loop would refer to two differently-shaped arrays.

updates/DesktopUpdates.ts — upstream's tryStartUpdateAction reservation
and its widened "installable download" check (which now covers retrying a failed
install), kept compatible with the fork's Linux dir-style install mode.

CommandPalette.tsx / .logic.ts — dropped the open prop upstream
removed while keeping the fork's file-picker and content-search overlays, and
took upstream's newer reduceCommandPaletteUiState (it preserves mode when a
toggle closes the overlay) over the fork's relocated copy of the older one.

ProviderRegistry.test.ts — kept the fork's coverage for
mergeProviderSnapshots / selectProvidersByKind. Upstream deleted that test
but left both functions exported, and nothing else exercises them.

.github/workflows/mobile-showcase-screenshots.yml — GitHub-hosted runners,
since this fork has no Blacksmith runners, with upstream's palette-driven
timeout.

Smaller ones: App.tsx (fork's IdentityClaimGate into upstream's extracted
AppContent), ThreadComposer (upstream's surface-derived backdrop with the
fork's opacity stops), GitManager (hasFailingChecks alongside upstream's
updatedAt), DesktopLifecycle.test (upstream's shared layer factories, with
the fork's requestSingleInstanceLock / navigateToThread / navigateToProject
added).

Follow-on fixes this required

  • Upstream's new t3code/no-native-title-tooltip rule failed on seven fork-only
    components. Four had a title duplicating an existing aria-label; three
    needed the label moved off the native tooltip.
  • changeRequestStatechangeRequest (now {state, updatedAt}) at five fork
    call sites. LegacySidebar only ever had the bare state, so
    isThreadSettledForDisplay adapts at its own boundary rather than changing
    that map.
  • GitManager now always maps a PR's updatedAt, so three fork assertions that
    compared the PR object exactly needed the field.
  • browserHistoryStore.test.ts joins the isolated-test list: it mocks
    ~/state/session, and under the fork's isolate: false unit project it failed
    one full run and passed the next purely on file ordering — the same hazard as
    PreviewFaviconIcon.test.tsx last sync.

Verification

rerere was disabled for this merge. It had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.

Merged, not squashed, so fork/dev keeps upstream as a second parent.

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

Brechardand others added 30 commits August 15, 2026 16:13
)
Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: maria <maria@kuuro.net>
…#6392)
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ingdotgg#7082)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…g#7083)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…in GitHubPullRequestCli (pingdotgg#7385)
Signed-off-by: aoright <102943475+aoright@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
gsimoneand others added 27 commits August 19, 2026 00:31
…tgg#6286)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: GPT-5.6 <noreply@openai.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Merges 66 upstream commits into fork/dev. Notable weld points:
- ChatComposer: upstream pingdotgg#7150 relocated the prompt editor, length validation
and footer, leaving the fork's copies as a second live layout. Ported the
fork-only pieces into upstream's copies first — the environment-unavailable
placeholder, the model picker's usage snapshot, and the attach-images button
that drives the hidden iOS file input — then dropped the stale layout.
- MessagesTimeline: upstream's new active-turn block indexes whatever it
iterates; the fork walks its collapsed/interleaved list, so the block was
rebased onto that list to keep the indices referring to one array.
- DesktopUpdates: upstream's action reservation and widened installable check,
kept compatible with the fork's Linux dir-install mode.
- CommandPalette: dropped the `open` prop upstream removed while keeping the
fork's file-picker / content-search overlays, and took upstream's newer
reduceCommandPaletteUiState over the fork's relocated copy of the old one.
- mobile-showcase-screenshots: GitHub-hosted runners (this fork has no
Blacksmith) with upstream's palette-driven timeout.
- ProviderRegistry.test: kept the fork's coverage for mergeProviderSnapshots /
selectProvidersByKind, which upstream deleted while leaving both exported.
Upstream's new t3code/no-native-title-tooltip rule flagged seven fork-only
components; four had a title duplicating an existing aria-label, three needed
the label moved off the native tooltip.
rerere was disabled for this merge: it had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.
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 20, 2026
@omegent-app
omegent-appBot merged commit 8f3a7d0 into fork/devAug 20, 2026
5 checks passed
@omegent-app
omegent-appBot deleted the sync/upstream-2026-08-17 branch August 20, 2026 07:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@Brechard@Bil0000@eddy-naboulet@StiensWout@PollyGlot@chrisdeeming@UtkarshUsername@frarredondo@NitayRabi@juliusmarminge@lnieuwenhuis@tris203@none23@maslinedwin@aoright@gbarros-dev@Rishet11@AugusDogus@tarik02@gsimone
, '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: sync upstream through f708f63fa (66 commits) - #416

Merged
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17
Aug 20, 2026
Merged

merge: sync upstream through f708f63fa (66 commits)#416
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17

Conversation

@omegent-app

Copy link
Copy Markdown

Merges 66 upstream commits (pingdotgg/t3code through f708f63fa) into fork/dev.

35 files conflicted across 55 hunks.

Weld points

chat/ChatComposer.tsx — upstream #7150
relocated the prompt editor, the length validation and the whole footer. The
fork's copies survived the merge as a second live layout, so deleting them
outright would have silently dropped three fork-only things. Each was ported
into upstream's copy first:

  • the environmentUnavailable composer placeholder
  • usageSnapshot on the provider model picker
  • the attach-images button that drives the hidden iOS file input (kept above the
    mobile branches — remounting it mid-picker discards the selection)

chat/MessagesTimeline.logic.ts — upstream's new active-turn block indexes
whatever array it iterates. The fork iterates its own
collapseConsecutiveDuplicateAssistantEntries(interleaveTimelineEntriesForSteeredTurn(...))
list, so the block was rebased onto that list; otherwise the computed indices
and the loop would refer to two differently-shaped arrays.

updates/DesktopUpdates.ts — upstream's tryStartUpdateAction reservation
and its widened "installable download" check (which now covers retrying a failed
install), kept compatible with the fork's Linux dir-style install mode.

CommandPalette.tsx / .logic.ts — dropped the open prop upstream
removed while keeping the fork's file-picker and content-search overlays, and
took upstream's newer reduceCommandPaletteUiState (it preserves mode when a
toggle closes the overlay) over the fork's relocated copy of the older one.

ProviderRegistry.test.ts — kept the fork's coverage for
mergeProviderSnapshots / selectProvidersByKind. Upstream deleted that test
but left both functions exported, and nothing else exercises them.

.github/workflows/mobile-showcase-screenshots.yml — GitHub-hosted runners,
since this fork has no Blacksmith runners, with upstream's palette-driven
timeout.

Smaller ones: App.tsx (fork's IdentityClaimGate into upstream's extracted
AppContent), ThreadComposer (upstream's surface-derived backdrop with the
fork's opacity stops), GitManager (hasFailingChecks alongside upstream's
updatedAt), DesktopLifecycle.test (upstream's shared layer factories, with
the fork's requestSingleInstanceLock / navigateToThread / navigateToProject
added).

Follow-on fixes this required

  • Upstream's new t3code/no-native-title-tooltip rule failed on seven fork-only
    components. Four had a title duplicating an existing aria-label; three
    needed the label moved off the native tooltip.
  • changeRequestStatechangeRequest (now {state, updatedAt}) at five fork
    call sites. LegacySidebar only ever had the bare state, so
    isThreadSettledForDisplay adapts at its own boundary rather than changing
    that map.
  • GitManager now always maps a PR's updatedAt, so three fork assertions that
    compared the PR object exactly needed the field.
  • browserHistoryStore.test.ts joins the isolated-test list: it mocks
    ~/state/session, and under the fork's isolate: false unit project it failed
    one full run and passed the next purely on file ordering — the same hazard as
    PreviewFaviconIcon.test.tsx last sync.

Verification

rerere was disabled for this merge. It had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.

Merged, not squashed, so fork/dev keeps upstream as a second parent.

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

Brechardand others added 30 commits August 15, 2026 16:13
)
Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: maria <maria@kuuro.net>
…#6392)
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ingdotgg#7082)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…g#7083)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…in GitHubPullRequestCli (pingdotgg#7385)
Signed-off-by: aoright <102943475+aoright@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
gsimoneand others added 27 commits August 19, 2026 00:31
…tgg#6286)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: GPT-5.6 <noreply@openai.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Merges 66 upstream commits into fork/dev. Notable weld points:
- ChatComposer: upstream pingdotgg#7150 relocated the prompt editor, length validation
and footer, leaving the fork's copies as a second live layout. Ported the
fork-only pieces into upstream's copies first — the environment-unavailable
placeholder, the model picker's usage snapshot, and the attach-images button
that drives the hidden iOS file input — then dropped the stale layout.
- MessagesTimeline: upstream's new active-turn block indexes whatever it
iterates; the fork walks its collapsed/interleaved list, so the block was
rebased onto that list to keep the indices referring to one array.
- DesktopUpdates: upstream's action reservation and widened installable check,
kept compatible with the fork's Linux dir-install mode.
- CommandPalette: dropped the `open` prop upstream removed while keeping the
fork's file-picker / content-search overlays, and took upstream's newer
reduceCommandPaletteUiState over the fork's relocated copy of the old one.
- mobile-showcase-screenshots: GitHub-hosted runners (this fork has no
Blacksmith) with upstream's palette-driven timeout.
- ProviderRegistry.test: kept the fork's coverage for mergeProviderSnapshots /
selectProvidersByKind, which upstream deleted while leaving both exported.
Upstream's new t3code/no-native-title-tooltip rule flagged seven fork-only
components; four had a title duplicating an existing aria-label, three needed
the label moved off the native tooltip.
rerere was disabled for this merge: it had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.
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 20, 2026
@omegent-app
omegent-appBot merged commit 8f3a7d0 into fork/devAug 20, 2026
5 checks passed
@omegent-app
omegent-appBot deleted the sync/upstream-2026-08-17 branch August 20, 2026 07:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@Brechard@Bil0000@eddy-naboulet@StiensWout@PollyGlot@chrisdeeming@UtkarshUsername@frarredondo@NitayRabi@juliusmarminge@lnieuwenhuis@tris203@none23@maslinedwin@aoright@gbarros-dev@Rishet11@AugusDogus@tarik02@gsimone
, '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: sync upstream through f708f63fa (66 commits) - #416

Merged
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17
Aug 20, 2026
Merged

merge: sync upstream through f708f63fa (66 commits)#416
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17

Conversation

@omegent-app

Copy link
Copy Markdown

Merges 66 upstream commits (pingdotgg/t3code through f708f63fa) into fork/dev.

35 files conflicted across 55 hunks.

Weld points

chat/ChatComposer.tsx — upstream #7150
relocated the prompt editor, the length validation and the whole footer. The
fork's copies survived the merge as a second live layout, so deleting them
outright would have silently dropped three fork-only things. Each was ported
into upstream's copy first:

  • the environmentUnavailable composer placeholder
  • usageSnapshot on the provider model picker
  • the attach-images button that drives the hidden iOS file input (kept above the
    mobile branches — remounting it mid-picker discards the selection)

chat/MessagesTimeline.logic.ts — upstream's new active-turn block indexes
whatever array it iterates. The fork iterates its own
collapseConsecutiveDuplicateAssistantEntries(interleaveTimelineEntriesForSteeredTurn(...))
list, so the block was rebased onto that list; otherwise the computed indices
and the loop would refer to two differently-shaped arrays.

updates/DesktopUpdates.ts — upstream's tryStartUpdateAction reservation
and its widened "installable download" check (which now covers retrying a failed
install), kept compatible with the fork's Linux dir-style install mode.

CommandPalette.tsx / .logic.ts — dropped the open prop upstream
removed while keeping the fork's file-picker and content-search overlays, and
took upstream's newer reduceCommandPaletteUiState (it preserves mode when a
toggle closes the overlay) over the fork's relocated copy of the older one.

ProviderRegistry.test.ts — kept the fork's coverage for
mergeProviderSnapshots / selectProvidersByKind. Upstream deleted that test
but left both functions exported, and nothing else exercises them.

.github/workflows/mobile-showcase-screenshots.yml — GitHub-hosted runners,
since this fork has no Blacksmith runners, with upstream's palette-driven
timeout.

Smaller ones: App.tsx (fork's IdentityClaimGate into upstream's extracted
AppContent), ThreadComposer (upstream's surface-derived backdrop with the
fork's opacity stops), GitManager (hasFailingChecks alongside upstream's
updatedAt), DesktopLifecycle.test (upstream's shared layer factories, with
the fork's requestSingleInstanceLock / navigateToThread / navigateToProject
added).

Follow-on fixes this required

  • Upstream's new t3code/no-native-title-tooltip rule failed on seven fork-only
    components. Four had a title duplicating an existing aria-label; three
    needed the label moved off the native tooltip.
  • changeRequestStatechangeRequest (now {state, updatedAt}) at five fork
    call sites. LegacySidebar only ever had the bare state, so
    isThreadSettledForDisplay adapts at its own boundary rather than changing
    that map.
  • GitManager now always maps a PR's updatedAt, so three fork assertions that
    compared the PR object exactly needed the field.
  • browserHistoryStore.test.ts joins the isolated-test list: it mocks
    ~/state/session, and under the fork's isolate: false unit project it failed
    one full run and passed the next purely on file ordering — the same hazard as
    PreviewFaviconIcon.test.tsx last sync.

Verification

rerere was disabled for this merge. It had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.

Merged, not squashed, so fork/dev keeps upstream as a second parent.

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

Brechardand others added 30 commits August 15, 2026 16:13
)
Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: maria <maria@kuuro.net>
…#6392)
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ingdotgg#7082)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…g#7083)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…in GitHubPullRequestCli (pingdotgg#7385)
Signed-off-by: aoright <102943475+aoright@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
gsimoneand others added 27 commits August 19, 2026 00:31
…tgg#6286)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: GPT-5.6 <noreply@openai.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Merges 66 upstream commits into fork/dev. Notable weld points:
- ChatComposer: upstream pingdotgg#7150 relocated the prompt editor, length validation
and footer, leaving the fork's copies as a second live layout. Ported the
fork-only pieces into upstream's copies first — the environment-unavailable
placeholder, the model picker's usage snapshot, and the attach-images button
that drives the hidden iOS file input — then dropped the stale layout.
- MessagesTimeline: upstream's new active-turn block indexes whatever it
iterates; the fork walks its collapsed/interleaved list, so the block was
rebased onto that list to keep the indices referring to one array.
- DesktopUpdates: upstream's action reservation and widened installable check,
kept compatible with the fork's Linux dir-install mode.
- CommandPalette: dropped the `open` prop upstream removed while keeping the
fork's file-picker / content-search overlays, and took upstream's newer
reduceCommandPaletteUiState over the fork's relocated copy of the old one.
- mobile-showcase-screenshots: GitHub-hosted runners (this fork has no
Blacksmith) with upstream's palette-driven timeout.
- ProviderRegistry.test: kept the fork's coverage for mergeProviderSnapshots /
selectProvidersByKind, which upstream deleted while leaving both exported.
Upstream's new t3code/no-native-title-tooltip rule flagged seven fork-only
components; four had a title duplicating an existing aria-label, three needed
the label moved off the native tooltip.
rerere was disabled for this merge: it had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.
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 20, 2026
@omegent-app
omegent-appBot merged commit 8f3a7d0 into fork/devAug 20, 2026
5 checks passed
@omegent-app
omegent-appBot deleted the sync/upstream-2026-08-17 branch August 20, 2026 07:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@Brechard@Bil0000@eddy-naboulet@StiensWout@PollyGlot@chrisdeeming@UtkarshUsername@frarredondo@NitayRabi@juliusmarminge@lnieuwenhuis@tris203@none23@maslinedwin@aoright@gbarros-dev@Rishet11@AugusDogus@tarik02@gsimone
, '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: sync upstream through f708f63fa (66 commits) - #416

Merged
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17
Aug 20, 2026
Merged

merge: sync upstream through f708f63fa (66 commits)#416
omegent-app[bot] merged 67 commits into
fork/devfrom
sync/upstream-2026-08-17

Conversation

@omegent-app

Copy link
Copy Markdown

Merges 66 upstream commits (pingdotgg/t3code through f708f63fa) into fork/dev.

35 files conflicted across 55 hunks.

Weld points

chat/ChatComposer.tsx — upstream #7150
relocated the prompt editor, the length validation and the whole footer. The
fork's copies survived the merge as a second live layout, so deleting them
outright would have silently dropped three fork-only things. Each was ported
into upstream's copy first:

  • the environmentUnavailable composer placeholder
  • usageSnapshot on the provider model picker
  • the attach-images button that drives the hidden iOS file input (kept above the
    mobile branches — remounting it mid-picker discards the selection)

chat/MessagesTimeline.logic.ts — upstream's new active-turn block indexes
whatever array it iterates. The fork iterates its own
collapseConsecutiveDuplicateAssistantEntries(interleaveTimelineEntriesForSteeredTurn(...))
list, so the block was rebased onto that list; otherwise the computed indices
and the loop would refer to two differently-shaped arrays.

updates/DesktopUpdates.ts — upstream's tryStartUpdateAction reservation
and its widened "installable download" check (which now covers retrying a failed
install), kept compatible with the fork's Linux dir-style install mode.

CommandPalette.tsx / .logic.ts — dropped the open prop upstream
removed while keeping the fork's file-picker and content-search overlays, and
took upstream's newer reduceCommandPaletteUiState (it preserves mode when a
toggle closes the overlay) over the fork's relocated copy of the older one.

ProviderRegistry.test.ts — kept the fork's coverage for
mergeProviderSnapshots / selectProvidersByKind. Upstream deleted that test
but left both functions exported, and nothing else exercises them.

.github/workflows/mobile-showcase-screenshots.yml — GitHub-hosted runners,
since this fork has no Blacksmith runners, with upstream's palette-driven
timeout.

Smaller ones: App.tsx (fork's IdentityClaimGate into upstream's extracted
AppContent), ThreadComposer (upstream's surface-derived backdrop with the
fork's opacity stops), GitManager (hasFailingChecks alongside upstream's
updatedAt), DesktopLifecycle.test (upstream's shared layer factories, with
the fork's requestSingleInstanceLock / navigateToThread / navigateToProject
added).

Follow-on fixes this required

  • Upstream's new t3code/no-native-title-tooltip rule failed on seven fork-only
    components. Four had a title duplicating an existing aria-label; three
    needed the label moved off the native tooltip.
  • changeRequestStatechangeRequest (now {state, updatedAt}) at five fork
    call sites. LegacySidebar only ever had the bare state, so
    isThreadSettledForDisplay adapts at its own boundary rather than changing
    that map.
  • GitManager now always maps a PR's updatedAt, so three fork assertions that
    compared the PR object exactly needed the field.
  • browserHistoryStore.test.ts joins the isolated-test list: it mocks
    ~/state/session, and under the fork's isolate: false unit project it failed
    one full run and passed the next purely on file ordering — the same hazard as
    PreviewFaviconIcon.test.tsx last sync.

Verification

rerere was disabled for this merge. It had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.

Merged, not squashed, so fork/dev keeps upstream as a second parent.

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

Brechardand others added 30 commits August 15, 2026 16:13
)
Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: maria <maria@kuuro.net>
…#6392)
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ingdotgg#7082)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…g#7083)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…in GitHubPullRequestCli (pingdotgg#7385)
Signed-off-by: aoright <102943475+aoright@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
gsimoneand others added 27 commits August 19, 2026 00:31
…tgg#6286)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: GPT-5.6 <noreply@openai.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Merges 66 upstream commits into fork/dev. Notable weld points:
- ChatComposer: upstream pingdotgg#7150 relocated the prompt editor, length validation
and footer, leaving the fork's copies as a second live layout. Ported the
fork-only pieces into upstream's copies first — the environment-unavailable
placeholder, the model picker's usage snapshot, and the attach-images button
that drives the hidden iOS file input — then dropped the stale layout.
- MessagesTimeline: upstream's new active-turn block indexes whatever it
iterates; the fork walks its collapsed/interleaved list, so the block was
rebased onto that list to keep the indices referring to one array.
- DesktopUpdates: upstream's action reservation and widened installable check,
kept compatible with the fork's Linux dir-install mode.
- CommandPalette: dropped the `open` prop upstream removed while keeping the
fork's file-picker / content-search overlays, and took upstream's newer
reduceCommandPaletteUiState over the fork's relocated copy of the old one.
- mobile-showcase-screenshots: GitHub-hosted runners (this fork has no
Blacksmith) with upstream's palette-driven timeout.
- ProviderRegistry.test: kept the fork's coverage for mergeProviderSnapshots /
selectProvidersByKind, which upstream deleted while leaving both exported.
Upstream's new t3code/no-native-title-tooltip rule flagged seven fork-only
components; four had a title duplicating an existing aria-label, three needed
the label moved off the native tooltip.
rerere was disabled for this merge: it had replayed earlier resolutions onto
new upstream content, which is exactly how a weld goes silently wrong.
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 20, 2026
@omegent-app
omegent-appBot merged commit 8f3a7d0 into fork/devAug 20, 2026
5 checks passed
@omegent-app
omegent-appBot deleted the sync/upstream-2026-08-17 branch August 20, 2026 07:22
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@Brechard@Bil0000@eddy-naboulet@StiensWout@PollyGlot@chrisdeeming@UtkarshUsername@frarredondo@NitayRabi@juliusmarminge@lnieuwenhuis@tris203@none23@maslinedwin@aoright@gbarros-dev@Rishet11@AugusDogus@tarik02@gsimone