Skip to content

Commit 2686e4c

Browse files
committed
chore: merge OpenCode v1.18.22-sscity
Upstream v1.18.21 (826d9ad, merged at ab828ce) -> v1.18.22 (47b6b6f), 40 commits / 197 files. Upstream superseded the v1.18.21 release commit with ad0bb6d6 (sync release versions for v1.18.21) in the v1.18.22 lineage; merge base is 57fa34f (fix anomalyco#43892), effective input identical to the audited 40-commit range. Functional changes: - fix(opencode): normalize upgrade endpoint (anomalyco#44686) — target is now a required semver field, raw-body upgrade handler dropped; groups/handlers global httpapi + generated SDK (sdk.gen description, types.gen required target, openapi required:["target"]) adopted whole; fork had no global httpapi deltas. - fix: resolve console device URLs (anomalyco#44029) — origin-rooted verification_uri_complete resolved via URL() with HTTP(S) protocol validation in account.ts and core plugin/provider/opencode.ts, with upstream tests for both. - fix(provider): guard textVerbosity injection for @ai-sdk/openai-compatible providers (anomalyco#43915) — adopted onto fork transform.ts; hunks disjoint from GLM/ZhiPu normalization, auto-merged. - fix: bump Amazon Bedrock provider (anomalyco#43909) — 4.0.112 -> 4.0.158. - test(opencode): align unknown finish coverage (anomalyco#43895). - console zen streaming/memory + unblock workspace, stats model normalization + tooltip truncation, app model provider headers, go pricing changes, docs + i18n updates. Conflicts resolved: 30 package.json version bumps (rebranded 1.18.22-sscity), bun.lock (took upstream, rebranded workspace entries via bun install). run-process.test.ts reconciled by hand: the shared "unknown stream finish preserves partial output and continues" test keeps the fork streamError + auto-ok form; upstream's json variant adopted under its upstream name with the middle-step expectation adapted to the fork's stronger semantics — output-less errored streams are retried transparently (adjacent step-starts, no step-finish part), while the with-output unknown-finish path (step-finish reason "unknown" then loop continues) stays covered by the fork json test. Fork retry caps (content-policy maxAttempts) and GLM/ZhiPu transform normalization preserved; fork small_model_fallback generated SDK/OpenAPI surfaces kept, merge-consistent with upstream's upgrade regen. Tests from both sides kept: transform 437, retry 68, account 15, httpapi-global 4, run-process 15, prompt 62, empty-stream 6, core provider-opencode 12, stats inference 11, llm package 328 all pass; typecheck 30/30.
2 parents ab828ce + 47b6b6f commit 2686e4c

197 files changed

Lines changed: 1341 additions & 687 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

bun.lock

Lines changed: 37 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/hashes.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"nodeModules": {
3-
"x86_64-linux": "sha256-yQ8EIxxYkzlEWIMY/UiIR+7lbGBuizsoehMPZzFA65Y=",
4-
"aarch64-linux": "sha256-JF9VVgnl5QUZ430fqb5Qu8y0kchYJ00LO3FbYcd0lBM=",
5-
"aarch64-darwin": "sha256-f3Tu6eu463NWcHgr7dupfD/zUTh26bJ6N2vVXuEyi6c=",
6-
"x86_64-darwin": "sha256-miv9Sv4KdhD0UIi2O5LVS1wQOfq29IV+9S+BvIzAvgo="
3+
"x86_64-linux": "sha256-Be1I6OG6UitofhcGu2BeNzevmoQXc4Or5r/NPzwtft4=",
4+
"aarch64-linux": "sha256-O+d+26CQIjZ08Rn8Qm3IytdDqIMbPdhzaGOZeUKAvIU=",
5+
"aarch64-darwin": "sha256-ObS50y/oy6fM9wSGUL/wx6O0+fTWHC04mXJNd7w/2Z0=",
6+
"x86_64-darwin": "sha256-eoR7ZSyH62Fq2ZaW2b2QqU2FC97rYxTMeEe+djT0nto="
77
}
88
}

packages/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencode-ai/app",
3-
"version": "1.18.21-sscity",
3+
"version": "1.18.22-sscity",
44
"description": "",
55
"type": "module",
66
"exports": {

packages/app/src/components/dialog-select-model.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ function ModelSelectorPopoverV2View(props: {
450450
<For each={groups()}>
451451
{(group) => (
452452
<MenuV2.Group>
453-
<MenuV2.GroupLabel class="gap-2 px-3">
453+
<MenuV2.GroupLabel class="sticky top-0 z-10 gap-2 bg-v2-background-bg-layer-01 px-3">
454454
<span class="min-w-0 truncate">{group.items[0].provider.name}</span>
455455
</MenuV2.GroupLabel>
456456
<MenuV2.RadioGroup value={props.current()}>

packages/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://json.schemastore.org/package.json",
33
"name": "@opencode-ai/cli",
4-
"version": "1.18.21-sscity",
4+
"version": "1.18.22-sscity",
55
"type": "module",
66
"license": "MIT",
77
"bin": {

packages/codemode/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://json.schemastore.org/package.json",
33
"name": "@opencode-ai/codemode",
4-
"version": "1.18.21-sscity",
4+
"version": "1.18.22-sscity",
55
"description": "Effect-native confined code execution over schema-described tools",
66
"private": true,
77
"type": "module",

packages/console/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opencode-ai/console-app",
3-
"version": "1.18.21-sscity",
3+
"version": "1.18.22-sscity",
44
"type": "module",
55
"license": "MIT",
66
"scripts": {

0 commit comments

Comments
 (0)