Skip to content

Sync upstream 2026-11-19 (1090 commits) - #28

Merged
hjescalona merged 1091 commits into
smgfrom
sync/upstream-20261119-1553
Nov 19, 2026
Merged

hjescalona merged 1091 commits into
smgfrom
sync/upstream-20261119-1553

Conversation

@hjescalona

Copy link
Copy Markdown

Merges 1090 upstream commits from CapSoftware/Cap:main into smg. Closes #27.

Conflicts

Two files conflicted, both from feat/share-unfurl-ai-summary (#11). Both sides only add fields, so the resolution keeps both:

  • apps/web/lib/share-video-metadata.ts: our description input stays next to upstream's new thumbnailVersion input and buildVideoOgImageUrl.
  • apps/web/app/s/[videoId]/page.tsx: keeps our Effect.flatMap that loads the AI summary, and passes upstream's thumbnailVersion to buildShareVideoMetadata.

Database migrations

This sync adds a migration. It runs when Cap Web starts, and rolling back the image does not roll back the schema, so it does not auto-merge.

  • packages/database/migrations/0062_dashboard_library_tools.sql
  • packages/database/migrations/meta/0062_snapshot.json
  • packages/database/migrations/meta/_journal.json

0062_dashboard_library_tools adds two nullable columns (space_videos.position, videos.archivedAt) and one index on videos. Take a MySQL backup before merging, then add migrations-approved and merge by hand.

Verified locally

  • Biome on the resolved files, web typecheck: clean.
  • Web unit tests (CI selection): 688 of 689 files pass. share-stage-identity.test.ts fails only on Node 26 locally (window.localStorage is Node's native one); it passes with --no-experimental-webstorage and the file is unchanged from upstream.

Upstream merges (first parent)

…re-fps

fix(export): default the frame rate from the rate a screen was captured at
…ck ends

Rolling back an interrupted cleanup now syncs the folders the media moved
back into before restoring the project files and removing the journal, so
a power loss right after cannot keep the old metadata without the media.
Decoded samples are filed under the nearest grid index, but a request
time is floored to its grid index. When a trim or stream offset puts
request times past the middle of a cell, a sample captured in the second
half of the cell is filed under the next index and is passed over even
though it is already on screen, so the screen lags the cursor by one
source frame.

Decoded frames now carry their presentation time. A request past the
middle of its cell also asks for the next grid index and uses that
sample when it was presented at or before the request time. Samples on
the grid can never pass that check, so their answers are unchanged.
The decoder model's expected answers now include the next-index check,
count reads up to the index the handle reaches, and a new test reads
samples between grid lines with off-grid requests. Seek and sequential
reads now agree for most former grid-rounding cases; the remaining ones
follow a hold of two cells or more.
…-above-menu-bar

fix(desktop-gpui): let the area picker cover the macOS menu bar
richiemcilroy and others added 25 commits November 19, 2026 06:16
…erve-source

feat: keep 4:4:4 video sharp when importing
…a-switch-in-place

Keep Studio recording through a camera switch
…put-dropped-lock

Accept a camera selection right after a recording drops its camera lock
…-copy-before-writer

fix(recording): stop macOS Studio camera recordings from freezing the screen
…-input-size

fix(render-farm): limit cloud export inputs to 40M pixels
# Conflicts:
#	apps/web/app/s/[videoId]/page.tsx
#	apps/web/lib/share-video-metadata.ts
@hjescalona hjescalona added has-migrations migrations-approved A human reviewed the migrations and took a MySQL backup labels Nov 19, 2026
@hjescalona

Copy link
Copy Markdown
Author

Migration 0062_dashboard_library_tools reviewed (two nullable columns and one index). MySQL backup taken before merge: cap-mysql-full-pre-sync-0062-20261119T1659Z.sql.gz.

@hjescalona
hjescalona merged commit dd13709 into smg Nov 19, 2026
11 of 19 checks passed
@hjescalona
hjescalona deleted the sync/upstream-20261119-1553 branch November 19, 2026 17:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

has-migrations migrations-approved A human reviewed the migrations and took a MySQL backup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Upstream sync conflict (2026-11-19)

2 participants