Skip to content

Commit 18a4845

Browse files
1056674754claude
1056674754
and
claude
committed
chore: merge OpenCode v1.18.29-sscity
Upstream v1.18.27 (4b7e19e, merged at 26dff3f) -> v1.18.29 (1674747), 29 commits / 116 files. Merge base is b046973 (default header timeout to five minutes). Staged delta vs pre-merge fork HEAD is identical to the upstream tag-to-tag diff, confirming a clean adoption. Functional changes: - fix(opencode): compare Codex GPT versions by major and minor (anomalyco#47385) and allow integer GPT versions in the Codex model filter (anomalyco#47384) — codex.ts; disjoint from fork snapshot architecture, auto-merged. - feat(copilot): send X-Interaction-Id header with session id (anomalyco#47215) — github-copilot/copilot.ts, 1 line. - chore: bump gitlab-ai-provider to 6.13.0 (anomalyco#46914). - test(core): disable npm audits in the test preload (anomalyco#47222). - console: limits graph, i18n for ar/br/da/de/es/fr/it/ja + others; app: dialog-connect-provider and open-in-app-v2 fixes; go.mdx crawl rules gain the x-opencode-session header bullet (took upstream whole). Conflicts resolved: 29 package.json version bumps (rebranded 1.18.29-sscity; HEAD had moved to the local v1.18.27 merge meanwhile), bun.lock (took upstream, rebranded workspace entries via bun install), go.mdx (took upstream — trivial <br/> placement in the crawl-rules list). Fork deltas verified intact vs v1.18.29: provider ProviderSnapshot architecture, deferred snapshot init, GLM/ZhiPu normalization in transform.ts (+77 lines fork-only), config getFresh/commitFresh. Tests: provider, transform, config, v2, azure plugin, session retry/llm — 1036 pass / 0 fail across 14 files; typecheck clean. Co-Authored-By: Claude Fable 5 <[email protected]>
2 parents 26dff3f + 1674747 commit 18a4845

116 files changed

Lines changed: 3930 additions & 555 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: 31 additions & 31 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-SVvFPO+KuS67+6XGPhaB3cIuc3XUyM0XVccy5v8afS4=",
4-
"aarch64-linux": "sha256-HJRrSu5u0TEg214d2RAbM1C+nmrxvIR/d7JlSBOGb9I=",
5-
"aarch64-darwin": "sha256-ytmHSdC0PVGAJSbpt/+YwL5ySF3w6r/9uZpZACPppkI=",
6-
"x86_64-darwin": "sha256-ma7K4K+xn7Jz3+YPA/n8ly1o308UNoM/DO9Z8yZSAKE="
3+
"x86_64-linux": "sha256-2kzFIn42mD7ZDu/+6lWctqjZ/lIVZZfjZhmF/ymhF54=",
4+
"aarch64-linux": "sha256-4HlReGD3gYfyyfnY/FQ46Ov+g3ZGV3sBYQ9p1bS9YAY=",
5+
"aarch64-darwin": "sha256-dkfCoH/sW9XBPZ7XhnUoE54TY1lcfNvZ5wQQLr7gKiQ=",
6+
"x86_64-darwin": "sha256-32t1JEcibZ4OrornIgfWOGQA87FOXjrxrxlDrflh7Ss="
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.27-sscity",
3+
"version": "1.18.29-sscity",
44
"description": "",
55
"type": "module",
66
"exports": {

‎packages/app/src/components/dialog-connect-provider.tsx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import { ExternalLink } from "@/components/external-link"
3333
import { useServerSDK } from "@/context/server-sdk"
3434
import { useServerSync } from "@/context/server-sync"
3535
import { useLanguage } from "@/context/language"
36+
import { usePlatform } from "@/context/platform"
3637
import { useSettings } from "@/context/settings"
3738
import { popularProviders, useProviders } from "@/hooks/use-providers"
3839
import { CustomProviderForm } from "./dialog-custom-provider"
@@ -386,6 +387,7 @@ function ProviderConnection(props: {
386387
const serverSDK = useServerSDK()
387388
const params = useParams()
388389
const language = useLanguage()
390+
const platform = usePlatform()
389391
const settings = useSettings()
390392
const newLayout = settings.general.newLayoutDesigns
391393
const providers = useProviders(() => props.directory?.())
@@ -560,6 +562,11 @@ function ProviderConnection(props: {
560562
})
561563
.then((x) => {
562564
if (!alive.value) return
565+
if (props.provider === "opencode" && platform.platform === "desktop") {
566+
const url = new URL(x.data.url)
567+
url.searchParams.set("client_id", "opencode-desktop")
568+
x.data.url = url.href
569+
}
563570
dispatch({ type: "auth.complete", authorization: x.data })
564571
})
565572
.catch((e) => {

‎packages/app/src/components/session/open-in-app-v2.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ export function OpenInAppV2(props: { directory: () => string }) {
3131
disabled={state.opening()}
3232
aria-label={language.t("session.header.open.ariaLabel", { app: state.current().label })}
3333
>
34-
<Show when={state.opening()} fallback={<AppIcon id={state.current().icon} class="size-[18px]" />}>
34+
<Show
35+
when={state.opening()}
36+
fallback={<AppIcon id={state.current().icon} style={{ width: "20px", height: "20px" }} />}
37+
>
3538
<Spinner class="size-3.5" />
3639
</Show>
3740
</SplitButtonV2Action>

‎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.27-sscity",
4+
"version": "1.18.29-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.27-sscity",
4+
"version": "1.18.29-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.27-sscity",
3+
"version": "1.18.29-sscity",
44
"type": "module",
55
"license": "MIT",
66
"scripts": {

‎packages/console/app/src/component/limits-graph.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ export function LimitsGraph(props: { href: string }) {
5353
{ id: "qwen3.8-flash", name: "Qwen3.8 Flash", req: 5400 },
5454
{ id: "deepseek-v4-flash", name: "DeepSeek V4 Flash", req: 7600 },
5555
{ id: "longcat-2.0", name: "LongCat-2.0", req: 11400 },
56+
{ id: "omen-alpha", name: "Omen Alpha", req: 11600 },
5657
{ id: "mimo-v2.5", name: "MiMo-V2.5", req: 30100 },
5758
{ id: "muse-spark-1.3-contributor", name: "Muse Spark 1.3 Contributor", req: 45300, edge: true },
5859
].map((model, index) => ({ ...model, d: `${50 + index * 25}ms` }))

‎packages/console/app/src/i18n/ar.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ export const dict = {
349349
"go.faq.a5.museRetention":
350350
"أسعار توكنات مخفّضة للغاية مقابل منح الإذن باستخدام مطالباتك وإكمالات النموذج لتدريب نماذج Meta المستقبلية.",
351351
"go.faq.a5.learnMore": "اعرف المزيد",
352-
"go.faq.a5.deepseekRetention": "تُجدَّد اتفاقية ZDR شهريًا. الاتفاقية الحالية سارية حتى 31 أغسطس 2026.",
352+
"go.faq.a5.deepseekRetention": "تُجدَّد اتفاقية ZDR شهريًا. الاتفاقية الحالية سارية حتى 30 سبتمبر 2026.",
353353
"go.faq.a5.beforeExceptions":
354354
"تتم استضافة نماذج Go في الولايات المتحدة. يتبع المزودون سياسة عدم الاحتفاظ بالبيانات ولا يستخدمون بياناتك لتدريب النماذج، مع",
355355
"go.faq.a5.exceptionsLink": "الاستثناءات التالية",
@@ -362,7 +362,7 @@ export const dict = {
362362

363363
"go.faq.q9": "ما الفرق بين النماذج المجانية وGo؟",
364364
"go.faq.a9":
365-
"تشمل النماذج المجانية Big Pickle بالإضافة إلى النماذج الترويجية المتاحة في ذلك الوقت، مع حصة قدرها 200 طلب/يوم. يقدّم Go مجموعة منسقة من النماذج مع حصص طلبات أعلى مطبقة عبر نوافذ متجددة (5 ساعات، وأسبوعية، وشهرية)، تعادل تقريبًا $12 لكل 5 ساعات، و$30 في الأسبوع، و$60 في الشهر (تختلف أعداد الطلبات الفعلية حسب النموذج والاستخدام).",
365+
"تشمل النماذج المجانية Big Pickle بالإضافة إلى النماذج الترويجية المتاحة في ذلك الوقت، مع حصة قدرها 200 طلب/يوم. يقدّم Go مجموعة منسقة من النماذج مع حصص طلبات أعلى مطبقة عبر نوافذ متجددة (5 ساعات، وأسبوعية، وشهرية)، تعادل الحصص الأساسية فيها تقريبًا $12 لكل 5 ساعات و$30 في الأسبوع و$60 في الشهر؛ وقد تختلف الحصص حسب النموذج (تختلف أعداد الطلبات الفعلية حسب النموذج والاستخدام).",
366366

367367
"zen.api.error.rateLimitExceeded": "تم تجاوز حد الطلبات. يرجى المحاولة مرة أخرى لاحقًا.",
368368
"zen.api.error.modelNotSupported": "النموذج {{model}} غير مدعوم",

0 commit comments

Comments
 (0)