Skip to content

chore: sync upstream pingdotgg/t3code (conflicts) - #160

Merged
LadyBluenotes merged 366 commits into
mainfrom
sync/upstream
Oct 18, 2026
Merged

LadyBluenotes merged 366 commits into
mainfrom
sync/upstream

Conversation

@LadyBluenotes

@LadyBluenotes LadyBluenotes commented Oct 17, 2026 •

Copy link
Copy Markdown
Owner

Nightly sync of pingdotgg/t3code at 9ba614301c10d77cb5e51189a537029688c6baf0 did not merge automatically.

Conflicting files:

  • apps/web/src/components/CommandPalette.tsx
  • apps/web/src/components/chat/ChatComposer.tsx
  • apps/web/src/components/settings/AddProviderInstanceDialog.tsx
  • apps/web/src/components/sidebar/SidebarChrome.tsx
  • packages/client-runtime/package.json

Resolve the conflicts on this pull request, or merge sync/upstream into main locally and push. The next nightly run closes this once main contains upstream.

maria-rcks and others added 30 commits October 17, 2026 02:11
juliusmarminge and others added 21 commits October 16, 2026 23:45
Co-authored-by: Pixel Perfect <[email protected]>
Co-authored-by: Claude Fable 5.1 <[email protected]>
…e keyboard (pingdotgg#20803)

Co-authored-by: Pixel Perfect <[email protected]>
Co-authored-by: Claude Fable 5.1 <[email protected]>
@LadyBluenotes

Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts on this pull request by merging main into sync/upstream and pushing the result to this branch.

Rules:

  • Keep every line listed in docs/fork.md under "Upstream seams"; those lines are this fork's.
  • Everywhere else take upstream's side.
  • Regenerate apps/web/src/routeTree.gen.ts by running the web build instead of editing it.
  • Typecheck apps/server, packages/contracts and apps/web before you finish.

Conflicting files:

  • apps/web/src/components/CommandPalette.tsx
  • apps/web/src/components/chat/ChatComposer.tsx
  • apps/web/src/components/settings/AddProviderInstanceDialog.tsx
  • apps/web/src/components/sidebar/SidebarChrome.tsx
  • packages/client-runtime/package.json

Copilot AI commented Oct 17, 2026

Copy link
Copy Markdown

@copilot resolve the merge conflicts on this pull request by merging main into sync/upstream and pushing the result to this branch.

Rules:...

Merged main into sync/upstream and pushed the two-parent merge commit 02c29494c2. Preserved the documented upstream seams, regenerated the route tree via the web build, and all three requested typechecks passed.

LadyBluenotes and others added 2 commits October 18, 2026 04:53
Upstream rewrote ChatComposer without "use memo", so the resolution took
its version whole and lost the three saved-prompts seams docs/fork.md
lists: the menu items run through useSavedPromptMenuItems, the
saved-prompt branch when an item is picked, and the use count after a
send. They are back on the rewritten file, with the seam row reworded
for the builder that replaced the useMemo. The Copilot default slot is
reserved again in AddProviderInstanceDialog, which now has a seam row.

Co-Authored-By: Claude Fable 5.1 <[email protected]>
@LadyBluenotes
LadyBluenotes merged commit 1a46d36 into main Oct 18, 2026
6 of 8 checks passed
@LadyBluenotes
LadyBluenotes deleted the sync/upstream branch October 18, 2026 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants