Skip to content

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

Merged
supabase-cli-releaser[bot] merged 2 commits into
nextfrom
sync/develop-into-next
Nov 19, 2026
Merged

supabase-cli-releaser[bot] merged 2 commits into
nextfrom
sync/develop-into-next

Conversation

@supabase-cli-releaser

Copy link
Copy Markdown
Contributor

Merging develop into next conflicts. This branch starts at the tip of develop (1c49238); next is at ccfe735.

Conflicting files:

  • apps/cli/src/commands/functions/deploy/SIDE_EFFECTS.md
  • apps/cli/src/commands/functions/serve/SIDE_EFFECTS.md
  • apps/cli/src/commands/start/SIDE_EFFECTS.md

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.

Removes the per-command `SIDE_EFFECTS.md` files and
`apps/cli/src/SIDE_EFFECTS_TEMPLATE.md`. They duplicated what the
handlers, tests and user docs already state, and they drifted out of
date.

- Rationale that existed only in those files now lives next to the code
as short comments, or in the existing guides
(`apps/cli/docs/compute-commands.md`, `stack-commands.md`,
`command-target.md`).
- `apps/cli/AGENTS.md` names tests, the error-tag fixture, the telemetry
event catalog and shipped behavior as the source of truth.
- The automated review prompts judge breaking changes against what the
stable release ships and what the tests at the merge base assert,
instead of the old `SIDE_EFFECTS.md`.
- ADRs are left unchanged as historical records.
@supabase-cli-releaser supabase-cli-releaser Bot added the do not merge Approve to apply; do not merge. label Nov 19, 2026
@supabase-cli-releaser
supabase-cli-releaser Bot requested a review from a team as a code owner November 19, 2026 21:22
# Conflicts:
#	apps/cli/src/commands/functions/deploy/SIDE_EFFECTS.md
#	apps/cli/src/commands/functions/serve/SIDE_EFFECTS.md
#	apps/cli/src/commands/start/SIDE_EFFECTS.md
@supabase-cli-releaser

Copy link
Copy Markdown
Contributor Author

Claude resolved the merge of next

develop removed every per-command SIDE_EFFECTS.md file in #7727. next had only updated the contents of three of them, so I deleted those three to match develop. No other SIDE_EFFECTS.md files are left in the tree. The only remaining mentions are in historical ADRs, which develop also left alone.

Deleted: apps/cli/src/commands/functions/deploy/SIDE_EFFECTS.md, apps/cli/src/commands/functions/serve/SIDE_EFFECTS.md, apps/cli/src/commands/start/SIDE_EFFECTS.md.

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

  • develop deleted the per-command SIDE_EFFECTS.md files while next was still editing three of them. Keep next's edits or drop the files? Chose: Drop them, following develop's deliberate removal of all SIDE_EFFECTS.md files (chore(cli): remove per-command SIDE_EFFECTS.md files #7727). next's edits only documented side effects that the merged code and tests still carry, so no behavior is lost.

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

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

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 AI Review

CLI reference prose guidance: snapshot supabase/supabase@0fdee0e supplied to reviewers (advisory, not a style pass).

Both independent reviews completed with zero findings. The sync resolves three modify/delete conflicts by removing the side-effect inventories for functions deploy, functions serve, and start. The merged checkout contains no references to those three files, and the resolution changes no command behavior or CLI reference prose.

Findings

No issues found.

Stats

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


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

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

@supabase-oss supabase-oss left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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/44619551169).

@supabase-cli-releaser
supabase-cli-releaser Bot merged commit 0ec39a7 into next Nov 19, 2026
47 of 48 checks passed
@supabase-cli-releaser
supabase-cli-releaser Bot deleted the sync/develop-into-next branch November 19, 2026 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do not merge Approve to apply; do not merge.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants