Skip to content

chore: merge production into dev - #57330

Open
thdxr wants to merge 4 commits into
devfrom
sync-production
Open

thdxr wants to merge 4 commits into
devfrom
sync-production

Conversation

@thdxr

@thdxr thdxr commented Oct 20, 2026

Copy link
Copy Markdown
Member

Issue for this PR

Closes #

Type of change

  • Bug fix
  • New feature
  • Refactor / code improvement
  • Documentation

What does this PR do?

Merges production into dev so production becomes an ancestor of dev and can be fast-forwarded (needed to ship #57328 / #56939 as incident containment). Brings over the two production-only fixes:

The merge had no conflicts. Merge with a merge commit, not a squash. A squash would break the ancestry.

How did you verify your code works?

packages/console/app typecheck passes, and test/inferenceIp.test.ts passes.

Checklist

  • I have tested my changes locally
  • I have not included unrelated changes in this PR

@opencode-agent opencode-agent 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.

The merge looks sound. Its first parent is the dev merge-base and its second is production's tip, so production will become an ancestor of dev as intended. The diff against dev is exactly #56427 and #56430. The cherry-picked docs commit adds nothing because dev already has it, and the merge still applies cleanly to the current dev tip.

In packages/console/app, inferenceIp.test.ts passes (7/7) and typecheck passes. The worker and infra behaviour (the LegacyIngress binding and the Cloudflare provider pin) can't be run outside Cloudflare, so I haven't verified it at runtime.

Public API impact: none. This only touches the console worker and deployment infra.

No concerns. As you noted, this needs a merge commit, not a squash.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant