Skip to content

chore(fork): merge upstream main f7f9e21785 (2026-10-20) - #21

Merged
orbitingflea merged 1444 commits into
mainfrom
sync/upstream-f7f9e21785
Oct 20, 2026
Merged

orbitingflea merged 1444 commits into
mainfrom
sync/upstream-f7f9e21785

Conversation

@orbitingflea

Copy link
Copy Markdown
Owner

Brings 1442 upstream commits (2026-10-15 → 2026-10-20) into the fork.

Upstream now renders LaTeX on web and mobile (pingdotgg#18735), so the fork's own KaTeX math (9744f9d, 49be4ef) is dropped and every math file follows upstream. Upstream's math is behind Settings → Appearance → Render math, off by default and saved per device.

Conflicts and how they were resolved:

  • apps/web/package.json, ChatMarkdown.tsx, third-party-licenses.config.json: upstream's version (the fork's diff there was only math).
  • packages/shared/src/markdownPipeline.ts, packages/shared/package.json, pnpm-workspace.yaml: upstream's version plus remark-cjk-friendly (the CJK bold fix, bdf68e1). The fork's micromark-extension-llm-math override and remark-math catalog entry are removed.
  • ChatMarkdown.test.tsx (deleted upstream): the CJK bold test moves to ChatMarkdown.browser.test.tsx; the math tests go away with the fork math.
  • pnpm-lock.yaml: upstream's, then pnpm install --lockfile-only.

After the merge, the fork's diff against upstream is 7 files: the routine-update skill, the CJK plugin, its test, and the lockfile.

Checks: ChatMarkdown.browser.test.tsx 107/107 passed (the CJK test fails without the plugin), shared markdownMath/markdownPipeline/threadFindText tests 70/70 passed, and tsc-rs --noEmit for packages/shared and apps/web reported no errors.

Opus 5.5 in Claude Code

🤖 Generated with Claude Code

g-h-miles and others added 30 commits October 19, 2026 21:16
…pingdotgg#19177)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#20086)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…, not 10 (pingdotgg#19467)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#21263)

Co-authored-by: Yaacov <corcos.yaacov@mail.huji.ac.il>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#21197)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ry selection (pingdotgg#18860)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#19526)

Co-authored-by: Cody Stevens <cody.rageentertainment@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#19887)

Co-authored-by: Anton Georgiev <a.georgiev.extern@rewe-group.at>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#20272)

Co-authored-by: hiimchinh <chinhhm@proton.me>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…18851)

Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
… spawn error (pingdotgg#14942)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… bottom (pingdotgg#15678)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pinch (pingdotgg#19241)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rent thread (pingdotgg#20747)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Dean Whittaker <10110324+deanhtid@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
)

Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#20533)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…pingdotgg#18152)

Co-authored-by: macodev00 <macodev00@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#21618)

Co-authored-by: Wout Stiens <71498452+StiensWout@users.noreply.github.com>
…mering it (pingdotgg#22108)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e thread (pingdotgg#19367)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#18087)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
t3dotgg and others added 22 commits October 20, 2026 09:48
… with no toasts and the right favicon (pingdotgg#22254)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…thout the hover wait (pingdotgg#22255)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#22253)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t fields (pingdotgg#22203)

Co-authored-by: Claude Code <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…22390)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…vent in act (pingdotgg#22424)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Upstream now renders LaTeX itself (pingdotgg#18735), so the fork's KaTeX math
(9744f9d, 49be4ef) is dropped: apps/web/package.json,
ChatMarkdown.tsx, the math parts of markdownPipeline.ts, the
micromark-extension-llm-math override, and the remark-math/rehype-katex
license entries all follow upstream. Upstream gates math behind
Settings → Appearance → Render math (off by default).

The CJK bold fix (bdf68e1) stays: remark-cjk-friendly is added back
to upstream's markdownPipeline.ts plugin lists, and its test moves from
the deleted ChatMarkdown.test.tsx to ChatMarkdown.browser.test.tsx.
pnpm-lock.yaml is upstream's plus `pnpm install --lockfile-only`.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Copilot AI balanced review requested due to automatic review settings October 20, 2026 18:29

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL labels Oct 20, 2026
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@orbitingflea
orbitingflea merged commit cb36e94 into main Oct 20, 2026
7 of 8 checks passed
@orbitingflea
orbitingflea deleted the sync/upstream-f7f9e21785 branch October 20, 2026 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.