Rebase onto upstream/master (2026-08-15): 323 commits (d5b9f6c8..484b1f62) + CI fixes - #330

Draft

stubbi wants to merge 23 commits into

mainfrom

claude/brave-tesla-3uvgxq

Commits on Aug 15, 2026

Rebase onto upstream/master (2026-08-15): 323 commits (d5b9f6c8..484b1f62)
claude
committed
5c9d18d
fix(ci): remove pnpm-lock.yaml from rebase commit
claude
committed
6f38b86
fix(ui): re-apply fork-specific patches to SidebarAccountMenu, SummarySlotCard, IssueDetail
claude
committed
6cc8bef
fix(shared): restore fork-specific enableCloudSync to InstanceExperimentalSettings
claude
committed
405573e
fix(adapter-utils): restore brace balance in acpx-engine execute.ts
claude
committed
1ed954d
fix(codex-local): remove duplicate firstMeaningfulStderrLine export
claude
committed
e7d896b
fix: resolve remaining TypeScript errors from upstream rebase
claude
committed
a16a546
fix: restore fork-specific cloud-upstream files and enableCloudSync defaults
claude
committed
8289794
fix(plugin-sdk): add bypassSession to PluginEnvironmentExecuteParams
claude
committed
6616f85
fix(test): remove duplicate vi.doMock for adapter-plugin-store
claude
committed
c158eae
fix(test): convert adapter-plugin-store mock to top-level vi.mock
claude
committed
57ba17c
fix(test): restore health.test.ts createApp signature from merge artifact
claude
committed
097ddab
fix(ui): restore userSecretDefinitions query body in AgentConfigForm
claude
committed
f75f148
fix(ui): remove stray duplicate query body in AgentConfigForm
claude
committed
db20f77
fix(test): replace health.test.ts with upstream version
claude
committed
48189de
fix(ui): resolve remaining TypeScript errors from upstream rebase
claude
committed
19e1e76
fix(test): allowlist upstream files in features-migration-guard
claude
committed
8b3decd
fix(db): update migration numbers in DB tests (+3 offset)
claude
committed
34b2c0b

Navigation Menu

Uh oh!

Rebase onto upstream/master (2026-08-15): 323 commits (d5b9f6c8..484b1f62) + CI fixes - #330

Rebase onto upstream/master (2026-08-15): 323 commits (d5b9f6c8..484b1f62) + CI fixes#330
stubbi wants to merge 23 commits into
mainfrom
claude/brave-tesla-3uvgxq

Commits on Aug 15, 2026

Rebase onto upstream/master (2026-08-15): 323 commits (d5b9f6c8..484b1f62)

fix(ci): remove pnpm-lock.yaml from rebase commit

fix(ui): re-apply fork-specific patches to SidebarAccountMenu, SummarySlotCard, IssueDetail

fix(shared): restore fork-specific enableCloudSync to InstanceExperimentalSettings

fix(adapter-utils): restore brace balance in acpx-engine execute.ts

fix(codex-local): remove duplicate firstMeaningfulStderrLine export

fix: resolve remaining TypeScript errors from upstream rebase

fix: restore fork-specific cloud-upstream files and enableCloudSync defaults

fix(plugin-sdk): add bypassSession to PluginEnvironmentExecuteParams

fix(test): remove duplicate vi.doMock for adapter-plugin-store

fix(test): convert adapter-plugin-store mock to top-level vi.mock

fix(test): restore health.test.ts createApp signature from merge artifact

fix(ui): restore userSecretDefinitions query body in AgentConfigForm

fix(ui): remove stray duplicate query body in AgentConfigForm

fix(test): replace health.test.ts with upstream version

fix(ui): resolve remaining TypeScript errors from upstream rebase

fix(test): allowlist upstream files in features-migration-guard

fix(db): update migration numbers in DB tests (+3 offset)

Commits on Aug 16, 2026

fix: resolve 9 CI failures from upstream rebase (d5b9f6c8..484b1f62)

fix(ci): remove pnpm-lock.yaml from PR — CI owns lockfile updates

fix: resolve remaining CI failures from second run

fix: resolve third round CI failures

fix: update hosted-credentials tests for upstream credential advice restructure