Skip to content

chore(sync): merge upstream/main 6577c6b618 into custom-v2 - #63

Merged
ziyadakl merged 442 commits into
custom-v2from
sync/upstream-2026-11-06
Nov 6, 2026
Merged

ziyadakl merged 442 commits into
custom-v2from
sync/upstream-2026-11-06

Conversation

@ziyadakl

@ziyadakl ziyadakl commented Nov 6, 2026 •

Copy link
Copy Markdown
Owner

Summary

Brings 438 Upstream commits (upstream/main up to 6577c6b618) into custom-v2.

 custom-v2 (09bc157d, the build every machine runs)
+  merge upstream/main 6577c6b618          9a2bc97f4c  (10 conflict blocks in 9 files)
+  fix(sync): NodeCryptoLayer alias         fffbb41e83
+  fix(sync): MCP test mocks                559034246b
+  fix(ci): Mac CLI build on macos-15       591fdef7b0  (GitHub retired macos-14)

Conflicts kept every Fork feature in CUSTOM.md. Upstream's two new migrations: 079 adds two indexes, 080 adds scheduled_tasks.thread_mode. No Fork migration names the same table, column or index.

Evidence

  • Before: the Mac CLI build was cancelled: "The configuration 'macos-14-arm64-us-default' is not supported".
    After: run 42280872869 built cli-mac-arm64-0.0.45-custom.55903424 and cli-linux-x64-0.0.45-custom.55903424.
  • sync-upstream.sh check: "Lint, typecheck, unused-code, web build, release-link and native-file checks passed on sync/upstream-2026-11-06."
  • CI run 42280872861 on 591fdef7b0: green. PR checks: 28 pass, 5 skipped, 1 fail ("Label PR size", labelling only).
  • Opus review of the conflict fixes and both fix commits: no defects.
  • Re-pair search, 09bc157d..upstream/main: the cookie-name functions in auth/utils.ts are unchanged; signing moved to PayloadSigner.ts (same HMAC-SHA256), and the compare now decodes both sides to bytes. The service launcher path and __service-launcher argument are unchanged, so switch-machine.sh works as before.

Merge Danger

Door: one-way for the database, two-way for the code.

The first start runs migrations 079 and 080 on statev2.sqlite. The switch hand-over includes a sqlite3 .backup command; that copy is the way back to 09bc157d.

Blast Radius: every machine.

The Mac and every Work box switch to 0.0.45-custom.55903424 together.

🤖 Generated with Claude Code

b2bvic and others added 30 commits November 4, 2026 13:19
…otgg#30900)

Co-authored-by: Victor Romo <vic@Victors-MacBook-Pro.local>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Seth Dixon <333797056+seth-dixon@users.noreply.github.com>
…ord (pingdotgg#30308)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…wser limit is full (pingdotgg#24186)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#26806)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#30744)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…0085)

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

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#29044)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ders (pingdotgg#24904)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…0421)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Elliot Drel <elliotdrel@gmail.com>
…gg#28928)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#30704)

Co-authored-by: Maxime Cathala <84846651+mcathala@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…onnection in a loop (pingdotgg#23758)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
… it (pingdotgg#24946)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…7935)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…otgg#26464)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Albert Li <albertli_042@hotmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…wake (pingdotgg#28204)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…29838)

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

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…ironment disconnects (pingdotgg#31269)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 26 commits November 5, 2026 22:08
…tgg#31801)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…gg#31842)

Combine the ten runtime recovery collections into one SQLite statement, leaving the initial thread lookup separate. Preserve collection filters, ordering, decoding and ordered reconciliation after prior commits.

Extend startup/shutdown idempotency coverage and guard against full message and run history scans. Synthetic stress measurements show fewer database requests; overall desktop quit latency remains unmeasured.

Implemented with GPT 6.1 Sol through the Codex harness in T3 Code.
… tiles (pingdotgg#28223)

Co-authored-by: Priyansh4444 <105874877+Priyansh4444@users.noreply.github.com>
Co-authored-by: Tanner Polley <42780259+tannerpolley@users.noreply.github.com>
Co-authored-by: Maria <maria-rcks@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Alessio Fano <alessio.fano@swisscom.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ry (pingdotgg#31285)

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

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… bottom (pingdotgg#27691)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
A PR based on a branch other than the default saved a ~1 GB pnpm store
that only its own reruns can read, which evicted shared entries. These
PRs still restore and install; pushes, releases, and default-base PRs
save as before.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ves (pingdotgg#31942)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…1158)

Co-authored-by: Theo Browne <me@theo.li>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#31941)

Release and macOS preview bundle jobs can check out a ref from before
build:desktop:bundle existed. Those refs now install libsecret and run
build:desktop as before.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… sites (pingdotgg#31142)

Give crawlers a consistent download URL, a sitemap, and links to the official repository and app listings. Publish the monitored security contact in the site and repository policies.

Takeover by Claude Opus 5.5 in Claude Code. Follow-up by GPT-6.1 Terra [1m] in Codex.

Co-authored-by: Victor Valentine Romo <213858052+b2bvic@users.noreply.github.com>
…otgg#29284)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	.github/workflows/ci.yml
#	apps/mobile/src/features/home/HomeRouteScreen.tsx
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
#	apps/server/src/server.ts
#	apps/web/src/components/chat/MessagesTimeline.browser.test.tsx
#	apps/web/src/components/chat/MessagesTimeline.logic.ts
#	apps/web/src/components/chat/useChatTerminalActions.ts
#	apps/web/src/components/settings/IntegrationsSettings.tsx
#	packages/client-runtime/src/state/orchestration.ts
@github-actions github-actions Bot added the vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. label Nov 6, 2026
@ziyadakl
ziyadakl merged commit 591fdef into custom-v2 Nov 6, 2026
35 of 37 checks passed
@ziyadakl
ziyadakl deleted the sync/upstream-2026-11-06 branch November 6, 2026 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.