Skip to content

chore: sync upstream cella v0.10.2 (55af2fac) - #139

Merged
flipvh merged 1 commit into
mainfrom
cella/sync/20260909-1912
Sep 9, 2026
Merged

chore: sync upstream cella v0.10.2 (55af2fac)#139
flipvh merged 1 commit into
mainfrom
cella/sync/20260909-1912

Conversation

@flipvh

@flipvh flipvh commented Sep 9, 2026

Copy link
Copy Markdown
Member

Syncs upstream cellajs/cella to 55af2fa (v0.10.2).

7 upstream commits since last sync (compare):

Conflicts

One: backend/tests/attachment-notifications.test.ts. Upstream #1150 adopted raak's most-privileged-role fixture, so ours = theirs + fork marker. Took theirs, marker retired. No fork markers remain in cella-owned code except the new bench seed below.

Migrations marked (3)

  • 20260907T0619-route-tree-generation-script: gen:routes / generate:routes scripts and @tanstack/router-generator arrived through package sync; vite.config.ts now uses vite/router-options.ts. Verified: pnpm generate:routes leaves routeTree.gen.ts unchanged.
  • 20260907T0711-description-seed-preview-hooks: 15-tasks.seed.ts builds paragraphs with paragraphBlock/text from description-document.ts (checklist loop kept, explicit props in BlockNote key order); use-task-description-update.ts composes patchCollaborativeDescription + persistStandaloneDescription (derived props computed once, triggerTaskGlow kept after the collaborative patch). The task editor already renders a faded static preview as waitingFallback. 20-attachment.seed.ts still goes through the pinned placement seam.
  • 20260909T0740-yjs-update-log: pnpm generate emitted 20260909171506_calm_scarlet_witch (yjs_updates table, RLS enabled, last_edited_by dropped) + 20260909171507_side_effects (RLS set now 5 tables). No fork code imports the yjs storage API. y-websocket dev dep installed.

Pinned files

Upstream touched two pinned files with comment/copy-only deltas: routes-config.tsx (notificationSearch doc comment, hand-adopted) and locales/en/about.json (sync_diagram.part_3.text, key not present in raak's about.json, nothing to adopt).

Tests

pnpm check clean. pnpm test (full, docker test db): 2721 passed, two failures triaged:

  • bench/src/tests/all-scenarios.test.ts: pre-existing since 2026-09-02, not sync damage (fails identically on main). Two causes, both fixed here: raak's attachments.project_id FK (Feat/cella drift convergence #131) while the bench attachment seed never assigned a project, and tasks.mentions (v0.9.8 sync) not declared as a native pg array. Fix: fork-marked projectId + order: 115 in bench/src/seeds/attachment.bench.ts, 'mentions' added to pgArrayColumns in fork-owned task.bench.ts. Passes now.
  • yjs/src/tests/integration/concurrency.test.ts "burst of keystrokes" e2e: upstream flake, ~1 in 5 runs on an idle machine, readLog(...).length === 3 never met within 3 s. raak's yjs/ is byte-identical to upstream. Likely the relay's server-side Step1 pull racing the burst (a 4th log row, or compaction consuming the log before the poll sees 3). To report upstream.

Drift (pnpm cella analyze)

before: diverged 1, pinned 2, drifted 0, behind 107 → after: diverged 0, pinned 0, drifted 1, behind 5.

  • drifted 1: bench/src/seeds/attachment.bench.ts, fork-marked (project-homed attachment axis). Candidate extension point: a bench placement hook next to the backend attachment-placement.ts seam would let the fork drop the marker.
  • behind 5: cella #1156 (infra VM IAM reconcile) landed on upstream main during this sync; next sync picks it up.

@flipvh
flipvh merged commit d514c3c into main Sep 9, 2026
7 checks passed
@flipvh
flipvh deleted the cella/sync/20260909-1912 branch September 9, 2026 17:36
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.

1 participant