diff --git a/src/components/Settings/Status.tsx b/src/components/Settings/Status.tsx index 95c62964..81c3cdd1 100644 --- a/src/components/Settings/Status.tsx +++ b/src/components/Settings/Status.tsx @@ -22,7 +22,7 @@ function buildPrimarySection(): Property[] { const nameValue = customTitle ?? /rename to add a name; return [{ label: 'Version', - value: MACRO.VERSION + value: MACRO.DISPLAY_VERSION ?? MACRO.VERSION }, { label: 'Session name', value: nameValue @@ -238,4 +238,4 @@ function Diagnostics(t0) { function _temp5(diagnostic, i) { return {figures.warning}{typeof diagnostic === "string" ? {diagnostic} : diagnostic}; } -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["figures","React","Suspense","use","getSessionId","LocalJSXCommandContext","useIsInsideModal","Box","Text","useTheme","AppState","useAppState","getCwd","getCurrentSessionTitle","buildAccountProperties","buildAPIProviderProperties","buildIDEProperties","buildInstallationDiagnostics","buildInstallationHealthDiagnostics","buildMcpProperties","buildMemoryDiagnostics","buildSandboxProperties","buildSettingSourcesProperties","Diagnostic","getModelDisplayLabel","Property","ThemeName","ConfigurableShortcutHint","Props","context","diagnosticsPromise","Promise","buildPrimarySection","sessionId","customTitle","nameValue","label","value","MACRO","VERSION","buildSecondarySection","mainLoopModel","mcp","theme","modelLabel","clients","options","ideInstallationStatus","buildDiagnostics","PropertyValue","t0","$","_c","Array","isArray","t1","t2","length","item","i","map","Status","_temp","_temp2","Symbol","for","t3","sections","grow","undefined","t4","_temp4","t5","t6","t7","t8","properties","_temp3","j","s_0","s","Diagnostics","promise","diagnostics","_temp5","diagnostic","warning"],"sources":["Status.tsx"],"sourcesContent":["import figures from 'figures'\nimport * as React from 'react'\nimport { Suspense, use } from 'react'\nimport { getSessionId } from '../../bootstrap/state.js'\nimport type { LocalJSXCommandContext } from '../../commands.js'\nimport { useIsInsideModal } from '../../context/modalContext.js'\nimport { Box, Text, useTheme } from '../../ink.js'\nimport { type AppState, useAppState } from '../../state/AppState.js'\nimport { getCwd } from '../../utils/cwd.js'\nimport { getCurrentSessionTitle } from '../../utils/sessionStorage.js'\nimport {\n  buildAccountProperties,\n  buildAPIProviderProperties,\n  buildIDEProperties,\n  buildInstallationDiagnostics,\n  buildInstallationHealthDiagnostics,\n  buildMcpProperties,\n  buildMemoryDiagnostics,\n  buildSandboxProperties,\n  buildSettingSourcesProperties,\n  type Diagnostic,\n  getModelDisplayLabel,\n  type Property,\n} from '../../utils/status.js'\nimport type { ThemeName } from '../../utils/theme.js'\nimport { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'\n\ntype Props = {\n  context: LocalJSXCommandContext\n  diagnosticsPromise: Promise<Diagnostic[]>\n}\n\nfunction buildPrimarySection(): Property[] {\n  const sessionId = getSessionId()\n  const customTitle = getCurrentSessionTitle(sessionId)\n  const nameValue = customTitle ?? <Text dimColor>/rename to add a name</Text>\n\n  return [\n    { label: 'Version', value: MACRO.VERSION },\n    { label: 'Session name', value: nameValue },\n    { label: 'Session ID', value: sessionId },\n    { label: 'cwd', value: getCwd() },\n    ...buildAccountProperties(),\n    ...buildAPIProviderProperties(),\n  ]\n}\n\nfunction buildSecondarySection({\n  mainLoopModel,\n  mcp,\n  theme,\n  context,\n}: {\n  mainLoopModel: AppState['mainLoopModel']\n  mcp: AppState['mcp']\n  theme: ThemeName\n  context: LocalJSXCommandContext\n}): Property[] {\n  const modelLabel = getModelDisplayLabel(mainLoopModel)\n\n  return [\n    { label: 'Model', value: modelLabel },\n    ...buildIDEProperties(\n      mcp.clients,\n      context.options.ideInstallationStatus,\n      theme,\n    ),\n    ...buildMcpProperties(mcp.clients, theme),\n    ...buildSandboxProperties(),\n    ...buildSettingSourcesProperties(),\n  ]\n}\n\nexport async function buildDiagnostics(): Promise<Diagnostic[]> {\n  return [\n    ...(await buildInstallationDiagnostics()),\n    ...(await buildInstallationHealthDiagnostics()),\n    ...(await buildMemoryDiagnostics()),\n  ]\n}\n\nfunction PropertyValue({\n  value,\n}: {\n  value: Property['value']\n}): React.ReactNode {\n  if (Array.isArray(value)) {\n    return (\n      <Box flexWrap=\"wrap\" columnGap={1} flexShrink={99}>\n        {value.map((item, i) => {\n          return (\n            <Text key={i}>\n              {item}\n              {i < value.length - 1 ? ',' : ''}\n            </Text>\n          )\n        })}\n      </Box>\n    )\n  }\n\n  if (typeof value === 'string') {\n    return <Text>{value}</Text>\n  }\n\n  return value\n}\n\nexport function Status({\n  context,\n  diagnosticsPromise,\n}: Props): React.ReactNode {\n  const mainLoopModel = useAppState(s => s.mainLoopModel)\n  const mcp = useAppState(s => s.mcp)\n  const [theme] = useTheme()\n\n  // Sections are synchronous — compute in render so they're never empty.\n  // diagnosticsPromise is created once in Settings.tsx so it resolves once\n  // per pane invocation instead of re-fetching on every tab switch (Tab\n  // unmounts children when not selected, which was causing the flash).\n  const sections = React.useMemo(\n    () => [\n      buildPrimarySection(),\n      buildSecondarySection({ mainLoopModel, mcp, theme, context }),\n    ],\n    [mainLoopModel, mcp, theme, context],\n  )\n\n  // flexGrow so the \"Esc to cancel\" footer pins to the bottom of the\n  // Modal's inner ScrollBox when content is short. The ScrollBox content\n  // wrapper has flexGrow:1 (fills at least the viewport), so this stretches\n  // to match. Without it, short Status content floats at the top and the\n  // footer sits mid-modal with 2-3 trailing blank rows below. Outside a\n  // Modal (non-fullscreen), leave layout alone — no ScrollBox to fill.\n  const grow = useIsInsideModal() ? 1 : undefined\n\n  return (\n    <Box flexDirection=\"column\" flexGrow={grow}>\n      <Box flexDirection=\"column\" gap={1} flexGrow={grow}>\n        {sections.map(\n          (properties, i) =>\n            properties.length > 0 && (\n              <Box key={i} flexDirection=\"column\">\n                {properties.map(({ label, value }, j) => (\n                  <Box key={j} flexDirection=\"row\" gap={1} flexShrink={0}>\n                    {label !== undefined && <Text bold>{label}:</Text>}\n                    <PropertyValue value={value} />\n                  </Box>\n                ))}\n              </Box>\n            ),\n        )}\n\n        <Suspense fallback={null}>\n          <Diagnostics promise={diagnosticsPromise} />\n        </Suspense>\n      </Box>\n      <Text dimColor>\n        <ConfigurableShortcutHint\n          action=\"confirm:no\"\n          context=\"Settings\"\n          fallback=\"Esc\"\n          description=\"cancel\"\n        />\n      </Text>\n    </Box>\n  )\n}\n\nfunction Diagnostics({\n  promise,\n}: {\n  promise: Promise<Diagnostic[]>\n}): React.ReactNode {\n  const diagnostics = use(promise)\n  if (diagnostics.length === 0) return null\n  return (\n    <Box flexDirection=\"column\" paddingBottom={1}>\n      <Text bold>System Diagnostics</Text>\n      {diagnostics.map((diagnostic, i) => (\n        <Box key={i} flexDirection=\"row\" gap={1} paddingX={1}>\n          <Text color=\"error\">{figures.warning}</Text>\n          {typeof diagnostic === 'string' ? (\n            <Text wrap=\"wrap\">{diagnostic}</Text>\n          ) : (\n            diagnostic\n          )}\n        </Box>\n      ))}\n    </Box>\n  )\n}\n"],"mappings":"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","ignoreList":[]} \ No newline at end of file +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["figures","React","Suspense","use","getSessionId","LocalJSXCommandContext","useIsInsideModal","Box","Text","useTheme","AppState","useAppState","getCwd","getCurrentSessionTitle","buildAccountProperties","buildAPIProviderProperties","buildIDEProperties","buildInstallationDiagnostics","buildInstallationHealthDiagnostics","buildMcpProperties","buildMemoryDiagnostics","buildSandboxProperties","buildSettingSourcesProperties","Diagnostic","getModelDisplayLabel","Property","ThemeName","ConfigurableShortcutHint","Props","context","diagnosticsPromise","Promise","buildPrimarySection","sessionId","customTitle","nameValue","label","value","MACRO","VERSION","buildSecondarySection","mainLoopModel","mcp","theme","modelLabel","clients","options","ideInstallationStatus","buildDiagnostics","PropertyValue","t0","$","_c","Array","isArray","t1","t2","length","item","i","map","Status","_temp","_temp2","Symbol","for","t3","sections","grow","undefined","t4","_temp4","t5","t6","t7","t8","properties","_temp3","j","s_0","s","Diagnostics","promise","diagnostics","_temp5","diagnostic","warning"],"sources":["Status.tsx"],"sourcesContent":["import figures from 'figures'\nimport * as React from 'react'\nimport { Suspense, use } from 'react'\nimport { getSessionId } from '../../bootstrap/state.js'\nimport type { LocalJSXCommandContext } from '../../commands.js'\nimport { useIsInsideModal } from '../../context/modalContext.js'\nimport { Box, Text, useTheme } from '../../ink.js'\nimport { type AppState, useAppState } from '../../state/AppState.js'\nimport { getCwd } from '../../utils/cwd.js'\nimport { getCurrentSessionTitle } from '../../utils/sessionStorage.js'\nimport {\n  buildAccountProperties,\n  buildAPIProviderProperties,\n  buildIDEProperties,\n  buildInstallationDiagnostics,\n  buildInstallationHealthDiagnostics,\n  buildMcpProperties,\n  buildMemoryDiagnostics,\n  buildSandboxProperties,\n  buildSettingSourcesProperties,\n  type Diagnostic,\n  getModelDisplayLabel,\n  type Property,\n} from '../../utils/status.js'\nimport type { ThemeName } from '../../utils/theme.js'\nimport { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'\n\ntype Props = {\n  context: LocalJSXCommandContext\n  diagnosticsPromise: Promise<Diagnostic[]>\n}\n\nfunction buildPrimarySection(): Property[] {\n  const sessionId = getSessionId()\n  const customTitle = getCurrentSessionTitle(sessionId)\n  const nameValue = customTitle ?? <Text dimColor>/rename to add a name</Text>\n\n  return [\n    { label: 'Version', value: MACRO.VERSION },\n    { label: 'Session name', value: nameValue },\n    { label: 'Session ID', value: sessionId },\n    { label: 'cwd', value: getCwd() },\n    ...buildAccountProperties(),\n    ...buildAPIProviderProperties(),\n  ]\n}\n\nfunction buildSecondarySection({\n  mainLoopModel,\n  mcp,\n  theme,\n  context,\n}: {\n  mainLoopModel: AppState['mainLoopModel']\n  mcp: AppState['mcp']\n  theme: ThemeName\n  context: LocalJSXCommandContext\n}): Property[] {\n  const modelLabel = getModelDisplayLabel(mainLoopModel)\n\n  return [\n    { label: 'Model', value: modelLabel },\n    ...buildIDEProperties(\n      mcp.clients,\n      context.options.ideInstallationStatus,\n      theme,\n    ),\n    ...buildMcpProperties(mcp.clients, theme),\n    ...buildSandboxProperties(),\n    ...buildSettingSourcesProperties(),\n  ]\n}\n\nexport async function buildDiagnostics(): Promise<Diagnostic[]> {\n  return [\n    ...(await buildInstallationDiagnostics()),\n    ...(await buildInstallationHealthDiagnostics()),\n    ...(await buildMemoryDiagnostics()),\n  ]\n}\n\nfunction PropertyValue({\n  value,\n}: {\n  value: Property['value']\n}): React.ReactNode {\n  if (Array.isArray(value)) {\n    return (\n      <Box flexWrap=\"wrap\" columnGap={1} flexShrink={99}>\n        {value.map((item, i) => {\n          return (\n            <Text key={i}>\n              {item}\n              {i < value.length - 1 ? ',' : ''}\n            </Text>\n          )\n        })}\n      </Box>\n    )\n  }\n\n  if (typeof value === 'string') {\n    return <Text>{value}</Text>\n  }\n\n  return value\n}\n\nexport function Status({\n  context,\n  diagnosticsPromise,\n}: Props): React.ReactNode {\n  const mainLoopModel = useAppState(s => s.mainLoopModel)\n  const mcp = useAppState(s => s.mcp)\n  const [theme] = useTheme()\n\n  // Sections are synchronous — compute in render so they're never empty.\n  // diagnosticsPromise is created once in Settings.tsx so it resolves once\n  // per pane invocation instead of re-fetching on every tab switch (Tab\n  // unmounts children when not selected, which was causing the flash).\n  const sections = React.useMemo(\n    () => [\n      buildPrimarySection(),\n      buildSecondarySection({ mainLoopModel, mcp, theme, context }),\n    ],\n    [mainLoopModel, mcp, theme, context],\n  )\n\n  // flexGrow so the \"Esc to cancel\" footer pins to the bottom of the\n  // Modal's inner ScrollBox when content is short. The ScrollBox content\n  // wrapper has flexGrow:1 (fills at least the viewport), so this stretches\n  // to match. Without it, short Status content floats at the top and the\n  // footer sits mid-modal with 2-3 trailing blank rows below. Outside a\n  // Modal (non-fullscreen), leave layout alone — no ScrollBox to fill.\n  const grow = useIsInsideModal() ? 1 : undefined\n\n  return (\n    <Box flexDirection=\"column\" flexGrow={grow}>\n      <Box flexDirection=\"column\" gap={1} flexGrow={grow}>\n        {sections.map(\n          (properties, i) =>\n            properties.length > 0 && (\n              <Box key={i} flexDirection=\"column\">\n                {properties.map(({ label, value }, j) => (\n                  <Box key={j} flexDirection=\"row\" gap={1} flexShrink={0}>\n                    {label !== undefined && <Text bold>{label}:</Text>}\n                    <PropertyValue value={value} />\n                  </Box>\n                ))}\n              </Box>\n            ),\n        )}\n\n        <Suspense fallback={null}>\n          <Diagnostics promise={diagnosticsPromise} />\n        </Suspense>\n      </Box>\n      <Text dimColor>\n        <ConfigurableShortcutHint\n          action=\"confirm:no\"\n          context=\"Settings\"\n          fallback=\"Esc\"\n          description=\"cancel\"\n        />\n      </Text>\n    </Box>\n  )\n}\n\nfunction Diagnostics({\n  promise,\n}: {\n  promise: Promise<Diagnostic[]>\n}): React.ReactNode {\n  const diagnostics = use(promise)\n  if (diagnostics.length === 0) return null\n  return (\n    <Box flexDirection=\"column\" paddingBottom={1}>\n      <Text bold>System Diagnostics</Text>\n      {diagnostics.map((diagnostic, i) => (\n        <Box key={i} flexDirection=\"row\" gap={1} paddingX={1}>\n          <Text color=\"error\">{figures.warning}</Text>\n          {typeof diagnostic === 'string' ? (\n            <Text wrap=\"wrap\">{diagnostic}</Text>\n          ) : (\n            diagnostic\n          )}\n        </Box>\n      ))}\n    </Box>\n  )\n}\n"],"mappings":"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","ignoreList":[]} diff --git a/src/services/api/client.test.ts b/src/services/api/client.test.ts new file mode 100644 index 00000000..6d92be7b --- /dev/null +++ b/src/services/api/client.test.ts @@ -0,0 +1,121 @@ +import { afterEach, beforeEach, expect, test } from 'bun:test' +import { getAnthropicClient } from './client.js' + +type FetchType = typeof globalThis.fetch + +type ShimClient = { + beta: { + messages: { + create: (params: Record) => Promise + } + } +} + +const originalFetch = globalThis.fetch +const originalMacro = (globalThis as Record).MACRO +const originalEnv = { + CLAUDE_CODE_USE_GEMINI: process.env.CLAUDE_CODE_USE_GEMINI, + GEMINI_API_KEY: process.env.GEMINI_API_KEY, + GEMINI_MODEL: process.env.GEMINI_MODEL, + GEMINI_BASE_URL: process.env.GEMINI_BASE_URL, + GOOGLE_API_KEY: process.env.GOOGLE_API_KEY, + OPENAI_API_KEY: process.env.OPENAI_API_KEY, + OPENAI_BASE_URL: process.env.OPENAI_BASE_URL, + OPENAI_MODEL: process.env.OPENAI_MODEL, + ANTHROPIC_API_KEY: process.env.ANTHROPIC_API_KEY, + ANTHROPIC_AUTH_TOKEN: process.env.ANTHROPIC_AUTH_TOKEN, +} + +beforeEach(() => { + ;(globalThis as Record).MACRO = { VERSION: 'test-version' } + process.env.CLAUDE_CODE_USE_GEMINI = '1' + process.env.GEMINI_API_KEY = 'gemini-test-key' + process.env.GEMINI_MODEL = 'gemini-2.0-flash' + process.env.GEMINI_BASE_URL = 'https://gemini.example/v1beta/openai' + + delete process.env.GOOGLE_API_KEY + delete process.env.OPENAI_API_KEY + delete process.env.OPENAI_BASE_URL + delete process.env.OPENAI_MODEL + delete process.env.ANTHROPIC_API_KEY + delete process.env.ANTHROPIC_AUTH_TOKEN +}) + +afterEach(() => { + ;(globalThis as Record).MACRO = originalMacro + process.env.CLAUDE_CODE_USE_GEMINI = originalEnv.CLAUDE_CODE_USE_GEMINI + process.env.GEMINI_API_KEY = originalEnv.GEMINI_API_KEY + process.env.GEMINI_MODEL = originalEnv.GEMINI_MODEL + process.env.GEMINI_BASE_URL = originalEnv.GEMINI_BASE_URL + process.env.GOOGLE_API_KEY = originalEnv.GOOGLE_API_KEY + process.env.OPENAI_API_KEY = originalEnv.OPENAI_API_KEY + process.env.OPENAI_BASE_URL = originalEnv.OPENAI_BASE_URL + process.env.OPENAI_MODEL = originalEnv.OPENAI_MODEL + process.env.ANTHROPIC_API_KEY = originalEnv.ANTHROPIC_API_KEY + process.env.ANTHROPIC_AUTH_TOKEN = originalEnv.ANTHROPIC_AUTH_TOKEN + globalThis.fetch = originalFetch +}) + +test('routes Gemini provider requests through the OpenAI-compatible shim', async () => { + let capturedUrl: string | undefined + let capturedHeaders: Headers | undefined + let capturedBody: Record | undefined + + globalThis.fetch = (async (input, init) => { + capturedUrl = + typeof input === 'string' + ? input + : input instanceof URL + ? input.toString() + : input.url + capturedHeaders = new Headers(init?.headers) + capturedBody = JSON.parse(String(init?.body)) as Record + + return new Response( + JSON.stringify({ + id: 'chatcmpl-gemini', + model: 'gemini-2.0-flash', + choices: [ + { + message: { + role: 'assistant', + content: 'gemini ok', + }, + finish_reason: 'stop', + }, + ], + usage: { + prompt_tokens: 8, + completion_tokens: 3, + total_tokens: 11, + }, + }), + { + headers: { + 'Content-Type': 'application/json', + }, + }, + ) + }) as FetchType + + const client = (await getAnthropicClient({ + maxRetries: 0, + model: 'gemini-2.0-flash', + })) as unknown as ShimClient + + const response = await client.beta.messages.create({ + model: 'gemini-2.0-flash', + system: 'test system', + messages: [{ role: 'user', content: 'hello' }], + max_tokens: 64, + stream: false, + }) + + expect(capturedUrl).toBe('https://gemini.example/v1beta/openai/chat/completions') + expect(capturedHeaders?.get('authorization')).toBe('Bearer gemini-test-key') + expect(capturedBody?.model).toBe('gemini-2.0-flash') + expect(response).toMatchObject({ + role: 'assistant', + model: 'gemini-2.0-flash', + }) +}) diff --git a/src/services/api/client.ts b/src/services/api/client.ts index ee50e35c..a32e0779 100644 --- a/src/services/api/client.ts +++ b/src/services/api/client.ts @@ -156,7 +156,8 @@ export async function getAnthropicClient({ } if ( isEnvTruthy(process.env.CLAUDE_CODE_USE_OPENAI) || - isEnvTruthy(process.env.CLAUDE_CODE_USE_GITHUB) + isEnvTruthy(process.env.CLAUDE_CODE_USE_GITHUB) || + isEnvTruthy(process.env.CLAUDE_CODE_USE_GEMINI) ) { const { createOpenAIShimClient } = await import('./openaiShim.js') return createOpenAIShimClient({ diff --git a/src/services/api/codexShim.ts b/src/services/api/codexShim.ts index 26ae237e..6cc51f5b 100644 --- a/src/services/api/codexShim.ts +++ b/src/services/api/codexShim.ts @@ -85,7 +85,7 @@ function makeUsage(usage?: { } function makeMessageId(): string { - return `msg_${Math.random().toString(36).slice(2)}${Date.now().toString(36)}` + return `msg_${crypto.randomUUID().replace(/-/g, '')}` } function normalizeToolUseId(toolUseId: string | undefined): { diff --git a/src/services/api/openaiShim.ts b/src/services/api/openaiShim.ts index fb724513..68cb31e9 100644 --- a/src/services/api/openaiShim.ts +++ b/src/services/api/openaiShim.ts @@ -231,7 +231,7 @@ function convertMessages( input?: unknown extra_content?: Record }) => ({ - id: tu.id ?? `call_${Math.random().toString(36).slice(2)}`, + id: tu.id ?? `call_${crypto.randomUUID().replace(/-/g, '')}`, type: 'function' as const, function: { name: tu.name ?? 'unknown', @@ -389,7 +389,7 @@ interface OpenAIStreamChunk { } function makeMessageId(): string { - return `msg_${Math.random().toString(36).slice(2)}${Date.now().toString(36)}` + return `msg_${crypto.randomUUID().replace(/-/g, '')}` } function convertChunkUsage( @@ -610,6 +610,23 @@ async function* openaiStreamToAnthropic( : choice.finish_reason === 'length' ? 'max_tokens' : 'end_turn' + if (choice.finish_reason === 'content_filter' || choice.finish_reason === 'safety') { + // Gemini/Azure content safety filter blocked the response. + // Emit a visible text block so the user knows why output was truncated. + if (!hasEmittedContentStart) { + yield { + type: 'content_block_start', + index: contentBlockIndex, + content_block: { type: 'text', text: '' }, + } + hasEmittedContentStart = true + } + yield { + type: 'content_block_delta', + index: contentBlockIndex, + delta: { type: 'text_delta', text: '\n\n[Content blocked by provider safety filter]' }, + } + } lastStopReason = stopReason yield { @@ -841,7 +858,14 @@ class OpenAIShimMessages { } const apiKey = process.env.OPENAI_API_KEY ?? '' - const isAzure = /cognitiveservices\.azure\.com|openai\.azure\.com/.test(request.baseUrl) + // Detect Azure endpoints by hostname (not raw URL) to prevent bypass via + // path segments like https://evil.com/cognitiveservices.azure.com/ + let isAzure = false + try { + const { hostname } = new URL(request.baseUrl) + isAzure = hostname.endsWith('.azure.com') && + (hostname.includes('cognitiveservices') || hostname.includes('openai') || hostname.includes('services.ai')) + } catch { /* malformed URL — not Azure */ } if (apiKey) { if (isAzure) { @@ -1003,6 +1027,13 @@ class OpenAIShimMessages { ? 'max_tokens' : 'end_turn' + if (choice?.finish_reason === 'content_filter' || choice?.finish_reason === 'safety') { + content.push({ + type: 'text', + text: '\n\n[Content blocked by provider safety filter]', + }) + } + return { id: data.id ?? makeMessageId(), type: 'message', diff --git a/src/utils/model/openaiContextWindows.ts b/src/utils/model/openaiContextWindows.ts index 6cb12c37..66db3d35 100644 --- a/src/utils/model/openaiContextWindows.ts +++ b/src/utils/model/openaiContextWindows.ts @@ -50,9 +50,11 @@ const OPENAI_CONTEXT_WINDOWS: Record = { 'gemini-2.5-flash': 1_048_576, // Ollama local models - 'llama3.3:70b': 8_192, - 'llama3.1:8b': 8_192, - 'llama3.2:3b': 8_192, + // Llama 3.1+ models support 128k context natively (Meta official specs). + // Ollama defaults to num_ctx=8192 but users can configure higher values. + 'llama3.3:70b': 128_000, + 'llama3.1:8b': 128_000, + 'llama3.2:3b': 128_000, 'qwen2.5-coder:32b': 32_768, 'qwen2.5-coder:7b': 32_768, 'deepseek-coder-v2:16b': 163_840, @@ -122,7 +124,11 @@ const OPENAI_MAX_OUTPUT_TOKENS: Record = { function lookupByModel(table: Record, model: string): T | undefined { if (table[model] !== undefined) return table[model] - for (const key of Object.keys(table)) { + // Sort keys by length descending so the most specific prefix wins. + // Without this, 'gpt-4-turbo-preview' could match 'gpt-4' (8k) instead + // of 'gpt-4-turbo' (128k) depending on V8's key iteration order. + const sortedKeys = Object.keys(table).sort((a, b) => b.length - a.length) + for (const key of sortedKeys) { if (model.startsWith(key)) return table[key] } return undefined