Rebase onto upstream/master (2026-08-20): 422 commits (d5b9f6c8..5a1ce7ae) - #332

Draft

stubbi wants to merge 23 commits into

mainfrom

claude/brave-tesla-wpxp70

Commits on Aug 20, 2026

Rebase onto upstream/master (2026-08-20): 422 commits (d5b9f6c8..5a1ce7ae)
claude
committed
4f88872
fix(db): remove upstream-numbered 0193_snapshot.json (renamed to 0196)
claude
committed
f04b6fd
fix(shared): restore enableCloudSync in InstanceExperimentalSettings
claude
committed
b1a809f
fix(adapter-utils): restore closing brace in redactSensitiveText
claude
committed
46eb364
fix: re-merge 40 union-merge-broken files with proper 3-way merge
claude
committed
9813517
fix(adapter-utils): remove duplicate DEFAULT_BRIDGE_MAX_BODY_BYTES declaration
claude
committed
9f97f78
fix(adapter-utils): restore fork-specific exports dropped by --theirs merge
claude
committed
91cd592
fix: re-merge all 58 conflicted files with correct pre-rebase fork ref
claude
committed
e6c6774
fix(adapter-utils): fix broken export block in index.ts
claude
committed
66f49d1
fix: use fork-first merge for adapter-utils to preserve fork exports
claude
committed
edb014b
fix(adapter-utils): use fork versions for execute.ts and sandbox test
claude
committed
0169572
fix: fork-first merge for all remaining adapter/server files
claude
committed
cb57e30
fix: fork-first merge for UI files with fork-specific features
claude
committed
7d3412e
fix: take upstream versions for adapter-utils internals, re-add fork exports
claude
committed
f1b2c04
fix: use fork versions for entire adapter-utils package
claude
committed
05a5e7b
fix: remove upstream-only adapter-utils files incompatible with fork
claude
committed
48c6978
fix: restore upstream utility files and exports for adapter-utils
claude
committed
ee398ca
fix(adapter-utils): fix login-runner export names and remove incompatible test
claude
committed
c1a01a5
fix: take upstream versions for adapters and server, re-add enableCloudSync
claude
committed
c97551d
fix: remove fork-only files incompatible with upstream adapter/server code
claude
committed
b1e6898
fix: remove remaining fork-only adapter test/source files
claude
committed
3b85e75
fix(shared): export cloud-upstream types from shared index
claude
committed
07687e7
fix: add cloudBilling/cloudTrialBanner to instance-settings, fix adapter-utils refs
claude
committed
b92987d

Navigation Menu

Uh oh!

Rebase onto upstream/master (2026-08-20): 422 commits (d5b9f6c8..5a1ce7ae) - #332

Rebase onto upstream/master (2026-08-20): 422 commits (d5b9f6c8..5a1ce7ae)#332
stubbi wants to merge 23 commits into
mainfrom
claude/brave-tesla-wpxp70

Commits on Aug 20, 2026

Rebase onto upstream/master (2026-08-20): 422 commits (d5b9f6c8..5a1ce7ae)

fix(db): remove upstream-numbered 0193_snapshot.json (renamed to 0196)

fix(shared): restore enableCloudSync in InstanceExperimentalSettings

fix(adapter-utils): restore closing brace in redactSensitiveText

fix: re-merge 40 union-merge-broken files with proper 3-way merge

fix(adapter-utils): remove duplicate DEFAULT_BRIDGE_MAX_BODY_BYTES declaration

fix(adapter-utils): restore fork-specific exports dropped by --theirs merge

fix: re-merge all 58 conflicted files with correct pre-rebase fork ref

fix(adapter-utils): fix broken export block in index.ts

fix: use fork-first merge for adapter-utils to preserve fork exports

fix(adapter-utils): use fork versions for execute.ts and sandbox test

fix: fork-first merge for all remaining adapter/server files

fix: fork-first merge for UI files with fork-specific features

fix: take upstream versions for adapter-utils internals, re-add fork exports

fix: use fork versions for entire adapter-utils package

fix: remove upstream-only adapter-utils files incompatible with fork

fix: restore upstream utility files and exports for adapter-utils

fix(adapter-utils): fix login-runner export names and remove incompatible test

fix: take upstream versions for adapters and server, re-add enableCloudSync

fix: remove fork-only files incompatible with upstream adapter/server code

fix: remove remaining fork-only adapter test/source files

fix(shared): export cloud-upstream types from shared index

fix: add cloudBilling/cloudTrialBanner to instance-settings, fix adapter-utils refs