chore(repo): sync develop into next by supabase-cli-releaser[bot] · Pull Request #7299 · supabase/cli

supabase-cli-releaser · 2026-10-23T11:46:18Z

Merging develop into next conflicts. This branch starts at the tip of develop (a7de767); next is at c3d6a6d.

Conflicting files:

apps/cli-go/pkg/config/templates/Dockerfile
apps/cli/docs/supabase/db/pull.md
apps/cli/src/commands/branches/create/create.live.test.ts
apps/cli/tests/helpers/branches-live.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.

…nmirrored images (#7290) Follow-up to #7289. Registries can report rate limiting as the OCI `toomanyrequests` error code (e.g. `toomanyrequests: Data limit exceeded`) rather than the HTTP status text, so the retry check now matches either, case-insensitively. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

This adds postgres 17.11.0.007-orioledb-r0 as a new release line. https://github.com/supabase/slim-services/releases/tag/postgres-17.11.0.007-orioledb-r0 Planned after supabase/slim-services published 17.11.0.007-r0. This branch is rewritten from develop whenever a newer relevant release arrives. Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

## TL;DR re-issues the live `branches create` once when the platform rejects it because the database restarted mid-create - `branches list` (and `branches create` on `main` / `next`) failed with `unexpected create branch status 400: … FATAL: 57P01: terminating connection due to administrator command` (also seen as `the database system is shutting down`). the platform restarts the database it is configuring while the create is in flight. the shared live helper now recognises only that rejection, removes the half-made branch if it got listed, and re-issues the create once, the same way #7041 handles the network restrictions stall. a second rejection still fails the test, and `create.live.test.ts` uses the same helper ## ref - spotted in: [branches list](https://github.com/supabase/cli/actions/runs/39221185565/job/117956603829) --- _Generated by [Claude Code](https://claude.ai/code/session_016f5jekWaBDRtATpEf65mtq)_ --------- Co-authored-by: Claude <noreply@anthropic.com>

## Summary The docs-spec generator (`apps/cli/scripts/generate-docs-spec.ts`, published into `supabase/supabase` by `publish-docs-spec.ts`) builds the public `db pull` reference from `apps/cli/docs/supabase/db/pull.md`. Parts of that overlay still describe older behavior, so the next publish would overwrite the hand-edited reference in [supabase/supabase#49889](supabase/supabase#49889) and [supabase/supabase#50220](supabase/supabase#50220) with stale text. `pull.md` overlay: - Name split plan files with the `_1` / `_2` suffixes the migration writer produces instead of the older `_schema_changes` / `_after_enum_values` unit-name scheme, and mention the `-- pg-delta: transaction=false` directive on non-transactional units. - Replace the short managed-schemas paragraph with a precise one matching the Supabase policy in pg-delta: user triggers on managed tables (function outside the managed schemas), RLS policies on any `auth` table, and the `storage` / `realtime` policy surfaces; what is not diffed; how `--schema` interacts on later pulls; and the legacy migra behavior. The `--schema auth,storage` hint for older CLIs is kept. Not touched: the engine-default, initial-pull, and debug paragraphs, and the `--db-url` direct-versus-pooler advice, which needs a CLI-team call. Text only, no behavior change. ## Linked issue Follow-up to [#6391](#6391) (docs alignment); no separate issue. - [x] The linked issue is **open** and carries the `open-for-contribution` label (or I'm a Supabase maintainer). ## Checklist - [x] The PR title follows [Conventional Commits](https://www.conventionalcommits.org/) (e.g. `fix(cli): …`). - [ ] Tests added or updated for the change. Not applicable: docs overlay only. - [ ] From the repository root, `pnpm check:all` passes; relevant package tests pass for every touched workspace, and `pnpm types:check` passes for each touched TypeScript workspace (or workspace declaring it). Left to CI. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude <noreply@anthropic.com>

This bumps storage from v1.84.19-r0 to v1.84.20-r0. https://github.com/supabase/slim-services/releases/tag/storage-v1.84.20-r0 Planned after supabase/slim-services published v1.84.20-r0. This branch is rewritten from develop whenever a newer relevant release arrives. Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

# Conflicts: # apps/cli-go/pkg/config/templates/Dockerfile # apps/cli/docs/supabase/db/pull.md # apps/cli/src/commands/branches/create/create.live.test.ts # apps/cli/tests/helpers/branches-live.ts

supabase-cli-releaser · 2026-10-23T11:49:19Z

Claude resolved the merge of `next`

All four conflicts are resolved; nothing has been type-checked or tested yet. develop's retry for branches create (when the platform database restarts mid-create) now runs with next's --remote=<ref> --yes flags, and the db pull doc combines develop's paragraph removal with next's --remote=<url> wording. The leftover Go Dockerfile is deleted because next removed apps/cli-go, and the same image list is already in apps/cli/src/shared/services/Dockerfile.

File	Resolution
`apps/cli/docs/supabase/db/pull.md`	Kept develop's removal of the shorter managed-schemas paragraph, because the longer paragraph below already covers it. Kept the direct-connection advice in next's wording, which uses `--remote=<url>` instead of `--db-url`.
`apps/cli/src/commands/branches/create/create.live.test.ts`	Kept develop's call to `runLiveBranchCreateEffect`, which carries the restart retry. The helper now passes next's `--remote` and `--yes` flags.
`apps/cli/tests/helpers/branches-live.ts`	Kept develop's `createLiveBranchEffect`, which delegates to `runLiveBranchCreateEffect`. Changed that helper's create command from `--project-ref <ref>` to next's `--remote=<ref> --output-format json --yes`.

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

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

Keep develop's edit to the Go Dockerfile, which next deleted along with the rest of apps/cli-go? Chose: Deleted it. develop's only change there (storage v1.84.20) is already in apps/cli/src/shared/services/Dockerfile, which has the same contents.

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

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

github-actions

Superseded by a newer AI review

🤖 AI Review

Both reviews identify the same confirmed defect: the imported restart-retry test expects --project-ref, but the merged helper emits --remote=, causing the test assertion to fail. Merged into one minor finding because the defect affects test correctness.

Findings

Severity	Location	Category	Sources	Claim
🟡 MINOR	`apps/cli/tests/helpers/branches-live.integration.test.ts:267`	`merge-resolution`	claude+codex	The restart-retry test searches for a cleanup command using --project-ref, while the merged helper uses --remote=. Consequently, deleteIndex remains -1 and the assertion fails.

Stats

Claude findings: 1 · Codex findings: 1 · Confirmed: 1 · 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.

supabase-cli-releaser · 2026-10-23T11:54:20Z

Claude repair round

The integration test failure was a semantic conflict. develop's new restart-retry test expected the cleanup branches delete call to use --project-ref, but the merged helper from next now passes --remote=<ref>, so I updated the test's expected command to match. The aggregate "Run unit and integration tests" check failed only because of this integration failure.

1 findings fixed, 0 declined (workflow run).

supabase-cli-releaser · 2026-10-23T11:54:22Z

The repair commit moved the head to 607523d, so the AI review runs once more; later rounds only answer its findings.

github-actions

🤖 AI Review

Both independent reviews completed with no findings. I also inspected the sync resolutions, repair commit, and surrounding checked-out code; no issues introduced by the sync were found.

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.

supabase-oss

CI is green and the AI review raised nothing the merge introduced, so this approves Claude's resolution of the sync (https://github.com/supabase/cli/actions/runs/39951232385).

avallete and others added 5 commits October 23, 2026 08:22

supabase-cli-releaser Bot added the do not merge Approve to apply; do not merge. label Oct 23, 2026

supabase-cli-releaser Bot requested review from a team and supabase-oss as code owners October 23, 2026 11:46

Merge remote-tracking branch 'origin/next' into sync/develop-into-next

4f26d50

# Conflicts: # apps/cli-go/pkg/config/templates/Dockerfile # apps/cli/docs/supabase/db/pull.md # apps/cli/src/commands/branches/create/create.live.test.ts # apps/cli/tests/helpers/branches-live.ts

github-actions Bot reviewed Oct 23, 2026

View reviewed changes

Comment thread apps/cli/tests/helpers/branches-live.integration.test.ts Outdated

chore(repo): repair the develop-into-next sync

607523d

github-actions Bot reviewed Oct 23, 2026

View reviewed changes

supabase-oss approved these changes Oct 23, 2026

View reviewed changes

supabase-cli-releaser Bot merged commit 607523d into next Oct 23, 2026
52 of 53 checks passed

supabase-cli-releaser Bot deleted the sync/develop-into-next branch October 23, 2026 12:10

Navigation Menu

Repository navigation

chore(repo): sync develop into next - #7299

chore(repo): sync develop into next#7299
supabase-cli-releaser[bot] merged 7 commits into
nextfrom
sync/develop-into-next

supabase-cli-releaser Bot commented Oct 23, 2026

Uh oh!

supabase-cli-releaser Bot commented Oct 23, 2026

Uh oh!

github-actions Bot left a comment •

edited

Loading

Uh oh!

Uh oh!

supabase-cli-releaser Bot commented Oct 23, 2026

Uh oh!

supabase-cli-releaser Bot commented Oct 23, 2026

Uh oh!

github-actions Bot left a comment

Uh oh!

supabase-oss left a comment

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

supabase-cli-releaser Bot commented Oct 23, 2026

Uh oh!

supabase-cli-releaser Bot commented Oct 23, 2026

Claude resolved the merge of next

Uh oh!

github-actions Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

🤖 AI Review

Findings

Stats

Uh oh!

Uh oh!

supabase-cli-releaser Bot commented Oct 23, 2026

Claude repair round

Uh oh!

supabase-cli-releaser Bot commented Oct 23, 2026

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

🤖 AI Review

Findings

Stats

Uh oh!

supabase-oss left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Claude resolved the merge of `next`

github-actions Bot left a comment •

edited

Loading