chore(repo): sync develop into next

[supabase-cli-releaser]

Merging develop into next conflicts. This branch starts at the tip of develop (c690376); next is at 2441fbf.

Conflicting files:

• apps/cli-go/pkg/config/templates/Dockerfile
• apps/cli/src/commands/bootstrap/bootstrap.handler.ts
• apps/cli/src/commands/bootstrap/bootstrap.templates.integration.test.ts
• apps/cli/src/commands/db/advisors/advisors.format.ts
• apps/cli/src/commands/db/advisors/advisors.integration.test.ts
• apps/cli/src/commands/db/diff/diff.integration.test.ts
• apps/cli/src/commands/db/dump/dump.handler.ts
• apps/cli/src/commands/db/dump/dump.integration.test.ts
• apps/cli/src/commands/db/lint/lint.format.ts
• apps/cli/src/commands/db/lint/lint.integration.test.ts
• apps/cli/src/commands/db/pull/pull.integration.test.ts
• apps/cli/src/commands/db/push/push.integration.test.ts
• apps/cli/src/commands/db/query/query.format.ts
• apps/cli/src/commands/db/query/query.integration.test.ts
• apps/cli/src/commands/db/reset/reset.integration.test.ts
• apps/cli/src/commands/db/schema/declarative/generate/generate.integration.test.ts
• apps/cli/src/commands/db/schema/declarative/sync/sync.integration.test.ts
• apps/cli/src/commands/db/shared/pgdelta.seam.integration.test.ts
• apps/cli/src/commands/db/start/start.integration.test.ts
• apps/cli/src/commands/db/test/test.integration.test.ts
• apps/cli/src/commands/experimental/stack/stack-forwarding.integration.test.ts
• apps/cli/src/commands/init/init.integration.test.ts
• apps/cli/src/commands/inspect/report/report.config.ts
• apps/cli/src/commands/link/link.integration.test.ts
• apps/cli/src/commands/migration/down/down.integration.test.ts
• apps/cli/src/commands/migration/fetch/fetch.integration.test.ts
• apps/cli/src/commands/migration/list/list.integration.test.ts
• apps/cli/src/commands/migration/migration.integration.test.ts
• apps/cli/src/commands/migration/new/new.integration.test.ts
• apps/cli/src/commands/migration/repair/repair.integration.test.ts
• apps/cli/src/commands/migration/squash/squash.diff.unit.test.ts
• apps/cli/src/commands/migration/squash/squash.integration.test.ts
• apps/cli/src/commands/seed/buckets/buckets.flags.unit.test.ts
• apps/cli/src/commands/seed/buckets/buckets.integration.test.ts
• apps/cli/src/commands/services/services.integration.test.ts
• apps/cli/src/commands/start/start.gates.ts
• apps/cli/src/commands/start/start.handler.ts
• apps/cli/src/commands/start/start.integration.test.ts
• apps/cli/src/commands/start/start.string-slice-flags.integration.test.ts
• apps/cli/src/commands/status/status.command.unit.test.ts
• apps/cli/src/commands/status/status.integration.test.ts
• apps/cli/src/commands/status/status.string-slice-flags.integration.test.ts
• apps/cli/src/commands/stop/stop.integration.test.ts
• apps/cli/src/commands/test/new/new.integration.test.ts

To resolve:

git fetch origin
git switch sync/develop-into-next
git merge origin/next
# resolve the conflicts, then commit
git push origin sync/develop-into-next

Approve to fast-forward next; do not use the merge button.

[supabase-cli-releaser]

Claude resolved the merge of next

All 45 conflicted files are resolved and a grep of the whole tree finds no conflict markers; nothing has been type-checked, linted or tested yet. Source files keep next's breaking changes (env-override plumbing removed, Go-named helpers renamed, cli-go deleted) with develop's cleanups ported onto them. Test files keep next's titles, renames, new tests and deletions, written in develop's it.effect / Effect.flip style.

File	Resolution
apps/cli/src/commands/start/start.handler.ts	Uses next's resolver calls: no project env values, context.document, parseDuration, and resolveStartGates({ config, excludedKeys }). These are wrapped in develop's tryStartConfig helper, and develop's timebox check without the non-null assertion is kept.
apps/cli/src/commands/start/start.gates.ts	Took next's version, which drops the document input and asRecord. The Predicate import is removed because nothing uses it any more.
apps/cli/src/commands/bootstrap/bootstrap.handler.ts	Keeps next's writeThrough wrapper, the writeDotEnv span and seed resolution. Inside them it uses develop's Effect.as way of tracking whether .env was written and develop's yield* bootstrapRetryNotify; the unused Redacted import is removed.
apps/cli/src/commands/db/lint/lint.format.ts	Uses develop's Predicate.isObject checks with next's HTML-safe JSON encoder and next's 'invalid …: expected an object' error messages.
apps/cli/src/commands/db/advisors/advisors.format.ts	Uses develop's Predicate.isObject checks with next's HTML-safe JSON encoder and next's error messages.
apps/cli/src/commands/db/query/query.format.ts	Uses develop's Predicate.isObject narrowing with next's formatJsonValue name.
apps/cli/src/commands/inspect/report/report.config.ts	Took next's rewrite, which reads rules through CliConfigValues. Develop's changes only cleaned up code that next removed.
apps/cli/src/commands/db/dump/dump.handler.ts	Uses next's supabase-env import, and drops the DockerRunError import as develop did.
apps/cli/src/commands/start/start.integration.test.ts	Next's titles and moved tests in it.effect style; develop's duplicate copies of the moved tests are removed. Develop's Deferred-based SIGINT probe is kept because next's sleep loop would not work under the virtual clock.
apps/cli/src/commands/status/status.integration.test.ts	Next's titles, the goOutput→outputFlag rename and next's two new tests, all in develop's it.effect style.
apps/cli/src/commands/services/services.integration.test.ts	Next's outputFlag rename, titles and new parameterised invalid-config test, in it.effect style.
apps/cli/src/commands/init/init.integration.test.ts	Develop's assertion style with next's titles and error messages.
apps/cli/src/commands/seed/buckets/buckets.integration.test.ts	Next's titles, error text and new tests in it.effect style. Next's single both-backends port-validation test replaces develop's two.
apps/cli/src/commands/db/query/query.integration.test.ts	Next's titles and outputFlag rename, with develop's it.effect.
apps/cli/src/commands/db/reset/reset.integration.test.ts	Next's titles, config tweaks and new seed and remote tests, all converted to it.effect to match develop.
apps/cli/src/commands/db/push/push.integration.test.ts	Next's titles, including its reversed shell-env vs remote-block precedence, and next's new tests in it.effect style. Develop's toBeInstanceOf(DbPushApplyError) check is kept.
apps/cli/src/commands/db/dump/dump.integration.test.ts	Next's titles and its two new --password rejection tests, in it.effect style.
apps/cli/src/commands/db/start/start.integration.test.ts	Next's titles and its CliConfigValueError assertions, in it.effect style.
apps/cli/src/commands/db/advisors/advisors.integration.test.ts	Next's titles with develop's Effect.flip assertions.
apps/cli/src/commands/db/diff/diff.integration.test.ts	Next's useMigra flag and engine-conflict message, with develop's cast-free optional chaining.
apps/cli/src/commands/db/pull/pull.integration.test.ts	Next's diffEngine flag with develop's Effect.flip assertions.
apps/cli/src/commands/db/test/test.integration.test.ts	Next's title in it.effect. Keeps develop's TestDbFlags type import and drops the unused GoProxy import.
apps/cli/src/commands/migration/list/list.integration.test.ts	Develop's flip style asserting next's DbPasswordFlagsError, plus next's new --local/--password test.
apps/cli/src/commands/migration/squash/squash.integration.test.ts	Develop's flip style with next's DbPasswordFlagsError and next's new message.
apps/cli/src/commands/migration/repair/repair.integration.test.ts	Next's titles and its new --password/--local test, rewritten in develop's flip style.
apps/cli/src/commands/db/schema/declarative/generate/generate.integration.test.ts	Next's disablePgDelta gating and new password-flag test, rewritten with Effect.flip because develop removed the failError helper it used.
apps/cli/src/commands/db/schema/declarative/sync/sync.integration.test.ts	Next's takeApplyFailure and disablePgDelta logic, with develop's typed DbExecError instead of the cast.
apps/cli/src/commands/db/shared/pgdelta.seam.integration.test.ts	Import line: next's FileSystem and Path are added for its new test, and Cause is dropped as develop did.
apps/cli/src/commands/stop/stop.integration.test.ts	Next's titles and new invalid-config test, in it.effect style.
apps/cli/src/commands/seed/buckets/buckets.flags.unit.test.ts	Develop's it.effect/Effect.flip test with next's title, which drops the word 'cobra'.
apps/cli/src/commands/status/status.command.unit.test.ts	Develop's it.effect with next's titles, which drop the pflag references.
apps/cli/src/commands/experimental/stack/stack-forwarding.integration.test.ts	Develop's it.effect, plus next's two new secret-decryption tests converted to it.effect.
apps/cli/src/commands/link/link.integration.test.ts	Next's title and its added cliConfigValuesTestLayer, with develop's it.effect.
apps/cli/src/commands/migration/fetch/fetch.integration.test.ts	Next's titles with develop's it.effect.
apps/cli/src/commands/migration/new/new.integration.test.ts	Next's title with develop's it.effect and flip assertions.
apps/cli/src/commands/migration/migration.integration.test.ts	Next's title with develop's it.effect.
apps/cli/src/commands/migration/down/down.integration.test.ts	Next's title with develop's it.effect.
apps/cli/src/commands/migration/squash/squash.diff.unit.test.ts	Next's title with develop's it.effect.
apps/cli/src/commands/bootstrap/bootstrap.templates.integration.test.ts	Next's title with develop's it.effect.
apps/cli/src/commands/test/new/new.integration.test.ts	Next's title with develop's it.effect.
apps/cli/src/commands/db/lint/lint.integration.test.ts	Next's title with develop's it.effect.
apps/cli/src/commands/start/start.string-slice-flags.integration.test.ts	Next's title with develop's it.effect.
apps/cli/src/commands/status/status.string-slice-flags.integration.test.ts	Next's title with develop's it.effect.

Deleted: apps/cli-go/pkg/config/templates/Dockerfile.

Decisions for @supabase/cli. Confirm them, or push a change to this branch:

• Develop updated apps/cli-go/pkg/config/templates/Dockerfile, which next deleted along with the rest of cli-go. Chose: Delete it. Next's apps/cli/src/shared/services/Dockerfile has identical content, so develop's image bumps are already there.
• Develop refactored the env-override plumbing (projectEnvValues, the document passed to start gates) that next removed. Chose: Follow next and drop the env-override parameters. Develop's error-wrapping and type-safety cleanups are applied to next's resolver calls.
• Next moved several start tests and replaced two of develop's seed-buckets backend tests with one. Chose: Keep next's moved and replacement tests, converted to develop's it.effect style, and drop develop's duplicates.

Quick checks. The merged tree passes check:all and unit tests.

Approve to fast-forward next once checks pass (workflow run).

[github-actions]

🤖 AI Review

Both independent reviews reported zero findings, leaving nothing to adjudicate. The supplied pr.diff is empty, so this pass could not independently assess the PR changes. Tests were not run.

Findings

No issues found.

Stats

Claude findings: 0 · Codex findings: 0 · Confirmed: 0 · Refuted: 0 · Uncertain: 0

---

Models: claude-opus-5-5 + gpt-6.1-sol · Trigger: manual · Workflow run

This review runs once per PR. A maintainer can request another with a /ai-review comment.