Skip to content

Sync upstream T3 Code 86534db4 (comment prune #19559) - #153

Merged
Nurozen merged 3 commits into
mainfrom
upstream/batch-86534db4d352-1082f9
Oct 23, 2026
Merged

Nurozen merged 3 commits into
mainfrom
upstream/batch-86534db4d352-1082f9

Conversation

@Nurozen

@Nurozen Nurozen commented Oct 23, 2026 •

Copy link
Copy Markdown
Owner

Upstream sync checkpoint (exceptional): merges T3 Code 86534db4 (pingdotgg#19559, "prune narration and history comments") into Lecturn as a true merge (parents 7cb85ff1 fork main + 86534db4). Upstream base ba358222.

What changes

  • Upstream's comment prune across 3139 files (+4.4k/−49k lines), applied to the fork's code. A token compare (comments excluded) of every changed TS/JS file against main finds only formatter commas/parens, removed JSX comment braces and the lint-rule registration.
  • New lint rule lecturn/no-low-value-comments (error, upstream's no-low-value-comments under the fork plugin prefix) with a small test; 4 fork-only section-divider comments it flagged were rewritten or removed.
  • Rewritten comments use Lecturn names (lecturn CLI, Lecturn home/window, @lecturn/*, lecturn.json); fork counterparts of upstream's T3-named files pruned by hand.
  • RESOLUTION_GUIDE.md: comment policy and the kept fork wording.

Conflicts

609 (602 content, 6 deleted-by-fork renamed files, 1 added-in-renamed-dir); 514 resolved by a hunk-level comment-only resolver, the rest by area builders (server 35, clients 28, packages 33).

Checks so far

  • Typecheck: server, web, mobile, desktop, 27 packages; marketing astro check.
  • Tests: web 7791, mobile 2777, desktop 1612 (+1 suite needing Electron download passed alone), server 7562 (15 env-only failures: tmp realpath, Playwright browser not installed; files identical to main), packages suites, oxlint plugin tests.
  • vp lint repo-wide rc 0; vp fmt --check on all 3122 changed files.

Review

  • Follow-up commit b25cfe2 (comment-only, 186 files) removes orphaned fragments and Lecturn-renamed leftovers of comment blocks upstream deleted, restores five fork-only "why" comments and finishes two cut-off sentences.
  • Independent reviews: server, web/mobile/desktop and packages on 106785e (one FAIL on orphaned fragments, then fixed), and a delta review of b25cfe2: PASS-WITH-NITS. Grok outside review: ACCEPT on 106785e, ACCEPT-WITH-NITS on b25cfe2.
  • CI green on b25cfe2. No UI evidence: the change is comment-only.

Known limits

  • 72 upstream-deleted comment lines remain in 13 files that this merge leaves identical to main (mostly apps/mobile/src/features/agent-awareness/remoteRegistration.ts); they are lint-clean and comment-only.

🤖 Generated with Claude Code

maria-rcks and others added 3 commits October 16, 2026 05:37
Exceptional checkpoint: upstream pingdotgg#19559 prunes narration and history comments
across 3139 files and adds the no-low-value-comments lint rule.

- Upstream's comment cuts and rewrites applied to the fork's code; code tokens
  match the fork except formatter-only commas/parens and the rule registration.
- Rule registered as lecturn/no-low-value-comments (error) with tests; fork-only
  comments that it flags rewritten or removed.
- Rewritten comments use Lecturn names; fork counterparts of T3-named files
  pruned by hand.
- RESOLUTION_GUIDE records the comment policy and kept fork wording.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
…ents

The mechanical prune left lines the fork had renamed from upstream comment
blocks that upstream deleted. Remove those fragments and renamed survivors,
restore five fork-only why-comments, finish two cut-off sentences and update
the resolution guide. Comment-only: code tokens unchanged.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
@Nurozen
Nurozen marked this pull request as ready for review October 23, 2026 20:38
@Nurozen
Nurozen merged commit f7ee4bb into main Oct 23, 2026
17 checks passed
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.

2 participants