Skip to content

chore: merge upstream/dev (60 commits, 2026-09-12) - #336

Merged
terisuke merged 61 commits into
devfrom
upstream-merge-0912
Sep 12, 2026
Merged

terisuke merged 61 commits into
devfrom
upstream-merge-0912

Conversation

@terisuke

Copy link
Copy Markdown

Upstream sync, same flow as #328 / #315. Merges upstream/dev (8dc160645c…95daf90670, 60 commits, 149 files) into fork dev. Auto-merged cleanly by the 'ort' strategy — zero manual conflict resolution.

Highlights relevant to this fork:

  • DeepSeek V4.1 Flash support: stats normalization (193de13a), Go/console model listings (28a62b7, b7ca4f9), zen/go model catalog updates
  • patches/@ai-sdk/[email protected] — new dependency patch; bun install rerun, lockfile updated
  • ACP session options + reasoning boundary fixes, Bedrock DeepSeek id preservation, github-copilot plugin updates, gpt-astra system prompt, console quota/workspace support actions

Fork-owned files (packages/guardrails/**) untouched by upstream as expected.

H5-E2E: bun install && (cd packages/opencode && bun run typecheck) && (cd packages/guardrails && bun test profile/plugins) && python3 scripts/sync-model-whitelist.py
H5-E2E-OUT: 8 packages installed [2.35s]; tsgo --noEmit (no errors); 79 pass / 0 fail across 7 files [1.96s]; ok whitelist covers the catalog snapshot in all three copies
H5-SUBTRACTION: N/A
H5-PAIR: N/A

opencode-agent Bot and others added 30 commits September 3, 2026 23:24
opencode-agent Bot and others added 23 commits September 7, 2026 16:21
@github-actions

Copy link
Copy Markdown

This PR doesn't fully meet our contributing guidelines and PR template.

What needs to be fixed:

  • PR description is missing required template sections. Please use the PR template.

Please edit this PR description to address the above within 2 hours, or it will be automatically closed.

If you believe this was flagged incorrectly, please let a maintainer know.

@github-actions

Copy link
Copy Markdown

Thanks for your contribution!

This PR doesn't have a linked issue. All PRs must reference an existing issue.

Please:

  1. Open an issue describing the bug/feature (if one doesn't exist)
  2. Add Fixes #<number> or Closes #<number> to this PR description

See CONTRIBUTING.md for details.

@terisuke
terisuke merged commit 4b31240 into dev Sep 12, 2026
12 checks passed
@terisuke
terisuke deleted the upstream-merge-0912 branch September 12, 2026 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.