Skip to content

Sync rocicorp/mono main (945ce61) - #35

Merged
tmm merged 9 commits into
mainfrom
sync-upstream-3
Oct 26, 2026
Merged

tmm merged 9 commits into
mainfrom
sync-upstream-3

Conversation

@tmm

@tmm tmm commented Oct 26, 2026

Copy link
Copy Markdown
Member

Merges rocicorp/mono main up to 945ce61: 7 commits, with no conflicts.

  • Client-relevant: none need a Swift port. Upstream deleted unused zero-client, zero-protocol, shared, and zero-react files (knip); nothing here imports them, and the regenerated conformance vectors are byte-identical.
  • Server only: zero-cache confines a failed push to the socket that sent it, keeps an initConnection that an updateAuth overtakes, and keys CRUD writes by primary key; otel version pinning; audit bumps (zod, body-parser, fast-uri, serialize-javascript).
  • Follow-up commit: upstream overrides zod@<4.6.6 and dropped zod 4.4.3, which incur and @modelcontextprotocol/server (zero-swift-cli) still resolved to. They now take upstream's 4.6.7 entry; 2 lines change. pnpm install --frozen-lockfile leaves the lockfile unchanged, and syncpack lint is clean.
  • Checks: zero-conformance 28/28 (vectors regenerated, unchanged), zero-swift CLI 26/26, tsc clean in both.

No changeset: nothing in the Swift package changes.

Landing: like #28, land with a merge commit so upstream stays an ancestor of main.

arv and others added 9 commits October 23, 2026 10:00
Mono-Internal-Commit: ed0aab36c4430cdeb99cfa6c5bef6ee8f17793d3
…h overtakes

Closes rocicorp#6727

Co-authored-by: Yevhenii <evgeny.kotyrlo@gmail.com>
Mono-Internal-Commit: b1fa4b7b58136a0e19d928d8f4b3cbb527109326
Mono-Internal-Commit: d92a4bef4b59bfbc2d2738b608258251e84ebdd9
Mono-Internal-Commit: 0855b68f1571f58da90ca6ac06b2aefcdd144813
Mono-Internal-Commit: 2ff922fd4c0d654f3a2eee26a4e8409168532fe6
… for audit advisories

Mono-Internal-Commit: d26bed4c1668b1eb572890781535dadc9988369f
Closes rocicorp#6724

Co-authored-by: Paul Warren <pawarren95@gmail.com>
Mono-Internal-Commit: ab1bb63ce51d7d7e79c40e17465d3d4484cb6d87
Upstream overrides zod@<4.6.6 to ^4.6.6 and dropped zod 4.4.3 from the
lockfile, which incur and @modelcontextprotocol/server (zero-swift-cli)
still resolved to. Both now take the existing 4.6.7 entry.

Amp-Thread-ID: https://ampcode.com/threads/T-c513a037-a257-45e0-b9a9-15c15edfe859
Co-authored-by: tmm <tmm@tmm.dev>
@socket-security

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff Package Supply Chain
Security
Vulnerability Quality Maintenance License
Updatedzod@​4.4.3 ⏵ 4.6.7100100 +1610095100
Addedknip@​6.42.1991009596100

View full report

@tmm
tmm merged commit 8348b50 into main Oct 26, 2026
7 checks passed
@tmm
tmm deleted the sync-upstream-3 branch October 26, 2026 03:08
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.

5 participants