Skip to content

Commit 16220da

Browse files
1056674754claude
andcommitted
chore: merge OpenCode v1.18.30-sscity
Upstream v1.18.29 (1674747, merged at 18a4845) -> v1.18.30 (3104c14), 28 commits / 105 files. Staged delta vs pre-merge fork HEAD is identical to the upstream tag-to-tag diff (105 files, +1676/-403), confirming a clean adoption. Functional changes: - feat(opencode): port Astra system prompt from v2 (anomalyco#48057) — new session/prompt/gpt-astra.txt wired through system.ts; fork's system transforms live in the openchamber plugin, no overlap. - fix: preserve Bedrock DeepSeek model ids (anomalyco#34441) — provider.ts Bedrock loader passes arn: model ids through unmodified and tightens the cross-region prefix match from "deepseek" to "deepseek.r1"; inside the custom Azure/Bedrock loader region, disjoint from the fork snapshot architecture. - fix(provider): preserve explicit OpenAI service tiers (anomalyco#47671). - fix(opencode): add GitLab reasoning variants (anomalyco#47306) — transform.ts reasoningEffort now routes gitlab gpt-family to reasoningEffort and claude-family to adaptive thinking; disjoint from the fork GLM/ZhiPu normalization block, which remains intact (+77 fork-only lines). - SDK bumps: @ai-sdk/openai 3.0.88, @ai-sdk/azure 3.0.93, gitlab-ai-provider 6.15.0 (8 packages installed via bun install). - console: oauth client metadata document (anomalyco#47737), Chatwoot enterprise form (anomalyco#47488), openai usage normalization + tier threshold (anomalyco#47342), localized refund FAQs, zen model table updates (muse spark); go.mdx client session compatibility docs incl. zh translation. Conflicts resolved: 29 package.json version bumps (rebranded 1.18.30-sscity with a version-generic pattern after the v1.18.27 incident), bun.lock (took upstream, rebranded workspace entries via bun install). Fork deltas verified intact vs v1.18.30: ProviderSnapshot architecture (+492 in provider.ts), deferred snapshot init, GLM normalization (+77 in transform.ts), config getFresh/commitFresh (+14). Tests: provider, transform, bedrock, config, v2, azure plugin, session retry/llm — 1058 pass / 0 fail across 15 files (22 new upstream tests included); typecheck clean. Co-Authored-By: Claude Sonnet 5 <[email protected]>
2 parents 18a4845 + 3104c14 commit 16220da

105 files changed

Lines changed: 1676 additions & 403 deletions

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: 61 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎infra/console.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ const bucketNew = new sst.cloudflare.Bucket("ZenDataNew")
244244
const DISCORD_INCIDENT_WEBHOOK_URL = new sst.Secret("DISCORD_INCIDENT_WEBHOOK_URL")
245245
const AWS_SES_ACCESS_KEY_ID = new sst.Secret("AWS_SES_ACCESS_KEY_ID")
246246
const AWS_SES_SECRET_ACCESS_KEY = new sst.Secret("AWS_SES_SECRET_ACCESS_KEY")
247+
const ENTERPRISE_SALES_INBOX_EMAIL = new sst.Secret("ENTERPRISE_SALES_INBOX_EMAIL")
247248

248249
const SALESFORCE_CLIENT_ID = new sst.Secret("SALESFORCE_CLIENT_ID")
249250
const SALESFORCE_CLIENT_SECRET = new sst.Secret("SALESFORCE_CLIENT_SECRET")
@@ -273,6 +274,7 @@ new sst.cloudflare.x.SolidStart("Console", {
273274
EMAILOCTOPUS_API_KEY,
274275
AWS_SES_ACCESS_KEY_ID,
275276
AWS_SES_SECRET_ACCESS_KEY,
277+
ENTERPRISE_SALES_INBOX_EMAIL,
276278
SALESFORCE_CLIENT_ID,
277279
SALESFORCE_CLIENT_SECRET,
278280
SALESFORCE_INSTANCE_URL,

‎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-2kzFIn42mD7ZDu/+6lWctqjZ/lIVZZfjZhmF/ymhF54=",
4-
"aarch64-linux": "sha256-4HlReGD3gYfyyfnY/FQ46Ov+g3ZGV3sBYQ9p1bS9YAY=",
5-
"aarch64-darwin": "sha256-dkfCoH/sW9XBPZ7XhnUoE54TY1lcfNvZ5wQQLr7gKiQ=",
6-
"x86_64-darwin": "sha256-32t1JEcibZ4OrornIgfWOGQA87FOXjrxrxlDrflh7Ss="
3+
"x86_64-linux": "sha256-tHl+UGkUbalkh+C5RDkRpZ3Q87tgvqnoF4xdih6QeOw=",
4+
"aarch64-linux": "sha256-rdnbvlOOr/88SQ9zd+PfilJ4pQZdKplFyQGfdHBuBKQ=",
5+
"aarch64-darwin": "sha256-28GpwYLMo2cN4Y9cY6/xn9R5EggFj/m1guuSxsbqisM=",
6+
"x86_64-darwin": "sha256-eO0fs/0gwWwqPA8WElg8s7EZsxKd9J4Hws15P4xqHlc="
77
}
88
}

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162
"@ai-sdk/[email protected]": "patches/@ai-sdk%[email protected]",
163163
"@ai-sdk/[email protected]": "patches/@ai-sdk%[email protected]",
164164
"@ai-sdk/[email protected]": "patches/@ai-sdk%[email protected]",
165-
"@ai-sdk/[email protected]": "patches/@ai-sdk%[email protected]"
165+
"@ai-sdk/[email protected]": "patches/@ai-sdk%[email protected]",
166+
"@ai-sdk/[email protected]": "patches/@ai-sdk%[email protected]"
166167
}
167168
}

‎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.29-sscity",
3+
"version": "1.18.30-sscity",
44
"description": "",
55
"type": "module",
66
"exports": {

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

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export const dict = {
5858
"common.cancel": "إلغاء",
5959
"common.creating": "جارٍ الإنشاء...",
6060
"common.create": "إنشاء",
61+
"common.contactUs": "اتصل بنا",
6162

6263
"common.videoUnsupported": "متصفحك لا يدعم وسم الفيديو.",
6364
"common.figure": "شكل {{n}}.",
@@ -224,6 +225,9 @@ export const dict = {
224225
"zen.faq.q8": "هل يمكنني استخدام Zen مع وكلاء برمجة آخرين؟",
225226
"zen.faq.a8":
226227
"بينما يعمل Zen بشكل رائع مع OpenCode، يمكنك استخدام Zen مع أي وكيل. اتبع تعليمات الإعداد في وكيل البرمجة المفضل لديك.",
228+
"zen.faq.q9": "هل يمكنني استرداد أموالي؟",
229+
"zen.faq.a9":
230+
"قد تكون مؤهلًا لاسترداد أموالك إذا تم الخصم خلال آخر 14 يومًا ولم تستخدم الرصيد الناتج عن عملية الشراء هذه. {{contact}} لطلب استرداد الأموال.",
227231

228232
"zen.cta.start": "ابدأ مع Zen",
229233
"zen.pricing.title": "أضف رصيد 20 دولار (دفع حسب الاستخدام)",
@@ -363,6 +367,9 @@ export const dict = {
363367
"go.faq.q9": "ما الفرق بين النماذج المجانية وGo؟",
364368
"go.faq.a9":
365369
"تشمل النماذج المجانية Big Pickle بالإضافة إلى النماذج الترويجية المتاحة في ذلك الوقت، مع حصة قدرها 200 طلب/يوم. يقدّم Go مجموعة منسقة من النماذج مع حصص طلبات أعلى مطبقة عبر نوافذ متجددة (5 ساعات، وأسبوعية، وشهرية)، تعادل الحصص الأساسية فيها تقريبًا $12 لكل 5 ساعات و$30 في الأسبوع و$60 في الشهر؛ وقد تختلف الحصص حسب النموذج (تختلف أعداد الطلبات الفعلية حسب النموذج والاستخدام).",
370+
"go.faq.q10": "هل يمكنني استرداد أموالي؟",
371+
"go.faq.a10":
372+
"قد تكون مؤهلًا لاسترداد أموالك إذا تم الخصم خلال آخر 14 يومًا ولم تستخدم مخصصات Go خلال فترة الفوترة تلك. {{contact}} لطلب استرداد الأموال.",
366373

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

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export const dict = {
5858
"common.cancel": "Cancelar",
5959
"common.creating": "Criando...",
6060
"common.create": "Criar",
61+
"common.contactUs": "Contate-nos",
6162

6263
"common.videoUnsupported": "Seu navegador não suporta a tag de vídeo.",
6364
"common.figure": "Fig {{n}}.",
@@ -228,6 +229,9 @@ export const dict = {
228229
"zen.faq.q8": "Posso usar o Zen com outros agentes de codificação?",
229230
"zen.faq.a8":
230231
"Embora o Zen funcione muito bem com o OpenCode, você pode usar o Zen com qualquer agente. Siga as instruções de configuração no seu agente de codificação preferido.",
232+
"zen.faq.q9": "Posso receber um reembolso?",
233+
"zen.faq.a9":
234+
"Você pode ter direito a um reembolso se a cobrança foi feita nos últimos 14 dias e você não usou os créditos dessa compra. {{contact}} para solicitar um reembolso.",
231235

232236
"zen.cta.start": "Comece com o Zen",
233237
"zen.pricing.title": "Adicionar $20 de saldo pré-pago",
@@ -373,6 +377,9 @@ export const dict = {
373377
"go.faq.q9": "Qual a diferença entre os modelos gratuitos e o Go?",
374378
"go.faq.a9":
375379
"Os modelos gratuitos incluem Big Pickle e modelos promocionais disponíveis no momento, com uma cota de 200 requisições/dia. O Go oferece uma seleção de modelos com cotas de requisição mais altas aplicadas em janelas móveis (5 horas, semanal e mensal), aproximadamente equivalentes a cotas básicas de $12 por 5 horas, $30 por semana e $60 por mês; as cotas específicas podem variar por modelo (as contagens reais de requisições variam de acordo com o modelo e o uso).",
380+
"go.faq.q10": "Posso receber um reembolso?",
381+
"go.faq.a10":
382+
"Você pode ter direito a um reembolso se a cobrança foi feita nos últimos 14 dias e você não usou sua cota do Go durante esse período de faturamento. {{contact}} para solicitar um reembolso.",
376383

377384
"zen.api.error.rateLimitExceeded": "Limite de taxa excedido. Por favor, tente novamente mais tarde.",
378385
"zen.api.error.modelNotSupported": "Modelo {{model}} não suportado",

0 commit comments

Comments
 (0)