)
diff --git a/src/services/apis/openai-compatible-core.mjs b/src/services/apis/openai-compatible-core.mjs
index d45e6e73a..a56a2da53 100644
--- a/src/services/apis/openai-compatible-core.mjs
+++ b/src/services/apis/openai-compatible-core.mjs
@@ -219,6 +219,7 @@ export async function generateAnswersWithOpenAICompatible({
const stoppedGenerationId = getStopGenerationId()
port.postMessage({
session,
+ done: true,
...(stoppedGenerationId === undefined ? {} : { stoppedGenerationId }),
})
} catch (e) {
diff --git a/tests/unit/services/apis/usage-abort-metadata.test.mjs b/tests/unit/services/apis/usage-abort-metadata.test.mjs
new file mode 100644
index 000000000..961c23eee
--- /dev/null
+++ b/tests/unit/services/apis/usage-abort-metadata.test.mjs
@@ -0,0 +1,97 @@
+import assert from 'node:assert/strict'
+import { test } from 'node:test'
+import { generateAnswersWithOpenAICompatible } from '../../../../src/services/apis/openai-compatible-core.mjs'
+import { createFakePort } from '../../helpers/port.mjs'
+
+const baseConfig = {
+ maxConversationContextLength: 3,
+ maxResponseTokenLength: 256,
+}
+
+function sseData(data) {
+ return `data: ${JSON.stringify(data)}\n\n`
+}
+
+test('aborted OpenAI-compatible stream reposts retained metadata with terminal session', async (t) => {
+ t.mock.method(console, 'debug', () => {})
+ const session = {
+ aiName: 'Custom provider',
+ conversationRecords: [],
+ isRetry: false,
+ }
+ const port = createFakePort()
+ const encoder = new TextEncoder()
+
+ t.mock.method(globalThis, 'fetch', async () => {
+ let readCount = 0
+ return {
+ ok: true,
+ status: 200,
+ statusText: 'OK',
+ body: {
+ getReader() {
+ return {
+ async read() {
+ readCount += 1
+ if (readCount === 1) {
+ return {
+ done: false,
+ value: encoder.encode(
+ sseData({
+ model: 'reported-model',
+ choices: [{ delta: { content: 'Partial' } }],
+ usage: {
+ prompt_tokens: 10,
+ completion_tokens: 2,
+ total_tokens: 12,
+ },
+ }),
+ ),
+ }
+ }
+
+ port.emitMessage({ stop: true })
+ const error = new Error('aborted')
+ error.name = 'AbortError'
+ throw error
+ },
+ }
+ },
+ },
+ }
+ })
+
+ await generateAnswersWithOpenAICompatible({
+ port,
+ question: 'Hi',
+ session,
+ endpointType: 'chat',
+ requestUrl: 'https://proxy.example/v1/chat/completions',
+ model: 'selected-model',
+ apiKey: 'test-key',
+ config: baseConfig,
+ provider: 'compat',
+ })
+
+ assert.deepEqual(session.conversationRecords, [
+ {
+ question: 'Hi',
+ answer: 'Partial',
+ meta: {
+ selectedModel: 'selected-model',
+ reportedModel: 'reported-model',
+ usage: {
+ inputTokens: 10,
+ outputTokens: 2,
+ totalTokens: 12,
+ },
+ },
+ },
+ ])
+
+ const terminalMessages = port.postedMessages.filter((message) => message.done === true)
+ assert.equal(terminalMessages.length, 2)
+ assert.equal(terminalMessages[0].session, undefined)
+ assert.equal(terminalMessages[1].session, session)
+ assert.deepEqual(port.listenerCounts(), { onMessage: 0, onDisconnect: 0 })
+})
From 16bd4a0f28fffff842134f5a53eab38d53c4c334 Mon Sep 17 00:00:00 2001
From: Peter Dave Hello <3691490+PeterDaveHello@users.noreply.github.com>
Date: Mon, 31 Aug 2026 04:32:49 +0800
Subject: [PATCH 4/4] Address metadata review feedback
---
src/components/ConversationItem/index.jsx | 18 ++-
.../ConversationUsageSummary/index.jsx | 67 ++++++---
src/services/apis/claude-api.mjs | 27 +++-
src/services/apis/openai-compatible-core.mjs | 2 +-
src/utils/usage-metadata.mjs | 2 +-
.../apis/usage-abort-metadata.test.mjs | 127 +++++++++++++++++-
tests/unit/utils/usage-metadata.test.mjs | 17 ++-
7 files changed, 220 insertions(+), 40 deletions(-)
diff --git a/src/components/ConversationItem/index.jsx b/src/components/ConversationItem/index.jsx
index fdbc43462..e44c57cd4 100644
--- a/src/components/ConversationItem/index.jsx
+++ b/src/components/ConversationItem/index.jsx
@@ -5,6 +5,7 @@ import ReadButton from '../ReadButton'
import PropTypes from 'prop-types'
import MarkdownRender from '../MarkdownRender/markdown.jsx'
import { useTranslation } from 'react-i18next'
+import { modelNameToDesc } from '../../utils/model-name-convert.mjs'
import { formatTokenCount, getRecordModel } from '../../utils/usage-metadata.mjs'
function getUsageText(meta, t) {
@@ -28,14 +29,21 @@ function getUsageText(meta, t) {
function AnswerTitle({ descName, meta }) {
const { t } = useTranslation()
- const model = getRecordModel(meta, descName)
+ const model = modelNameToDesc(getRecordModel(meta, descName), t)
const usageText = getUsageText(meta, t)
const selectedModel = meta?.selectedModel
+ ? modelNameToDesc(meta.selectedModel, t)
+ : ''
const reportedModel = meta?.reportedModel
- const modelTitle =
- selectedModel && reportedModel && selectedModel !== reportedModel
- ? `${t('Selected model')}: ${selectedModel}\n${t('Reported model')}: ${reportedModel}`
- : model
+ ? modelNameToDesc(meta.reportedModel, t)
+ : ''
+ const hasDifferentReportedModel =
+ meta?.selectedModel &&
+ meta?.reportedModel &&
+ meta.selectedModel !== meta.reportedModel
+ const modelTitle = hasDifferentReportedModel
+ ? `${t('Selected model')}: ${selectedModel}\n${t('Reported model')}: ${reportedModel}`
+ : model
return (
diff --git a/src/components/ConversationUsageSummary/index.jsx b/src/components/ConversationUsageSummary/index.jsx
index 978829a1d..6785221a1 100644
--- a/src/components/ConversationUsageSummary/index.jsx
+++ b/src/components/ConversationUsageSummary/index.jsx
@@ -1,5 +1,6 @@
import PropTypes from 'prop-types'
import { useTranslation } from 'react-i18next'
+import { modelNameToDesc } from '../../utils/model-name-convert.mjs'
import {
formatTokenCount,
summarizeConversationUsage,
@@ -19,56 +20,83 @@ function ConversationUsageSummary({ records }) {
const summary = summarizeConversationUsage(records)
if (summary.models.length === 0 && summary.reportedTurns === 0) return null
- const hasModels = summary.models.length > 0
+ const models = summary.models.map(({ name, turns }) => ({
+ name: modelNameToDesc(name, t),
+ turns,
+ }))
+ const hasModels = models.length > 0
+ const modelReportedTurns = models.reduce((total, { turns }) => total + turns, 0)
+ const modelCoverage =
+ modelReportedTurns === summary.totalTurns
+ ? ''
+ : ` (${t('Turns')}: ${modelReportedTurns}/${summary.totalTurns})`
const modelText = !hasModels
? ''
- : summary.models.length === 1
- ? `${t('Model')}: ${summary.models[0].name}`
- : `${t('Models')}: ${summary.models.length}`
- const modelTitle = summary.models
+ : models.length === 1
+ ? `${t('Model')}: ${models[0].name}${modelCoverage}`
+ : `${t('Models')}: ${models.length}${modelCoverage}`
+ const modelTitle = models
.map(({ name, turns }) => `${name} · ${t('Turns')}: ${turns}`)
.join('\n')
- const usageParts = []
- if (summary.reportedTurns > 0) {
- usageParts.push(`${t('Reported usage')}: ${summary.reportedTurns}/${summary.totalTurns}`)
- usageParts.push(
- getMetricText(
+ const usageParts = [
+ {
+ key: 'reported-usage',
+ text:
+ summary.reportedTurns > 0
+ ? `${t('Reported usage')}: ${summary.reportedTurns}/${summary.totalTurns}`
+ : null,
+ },
+ {
+ key: 'input-tokens',
+ text: getMetricText(
t('Input tokens'),
summary.inputTokens,
summary.inputReportedTurns,
summary.reportedTurns,
t,
),
- getMetricText(
+ },
+ {
+ key: 'output-tokens',
+ text: getMetricText(
t('Output tokens'),
summary.outputTokens,
summary.outputReportedTurns,
summary.reportedTurns,
t,
),
- getMetricText(
+ },
+ {
+ key: 'total-tokens',
+ text: getMetricText(
t('Total tokens'),
summary.totalTokens,
summary.totalReportedTurns,
summary.reportedTurns,
t,
),
- getMetricText(
+ },
+ {
+ key: 'cache-read-tokens',
+ text: getMetricText(
t('Cached input tokens'),
summary.cacheReadInputTokens,
summary.cacheReadReportedTurns,
summary.reportedTurns,
t,
),
- getMetricText(
+ },
+ {
+ key: 'cache-write-tokens',
+ text: getMetricText(
t('Cache write tokens'),
summary.cacheWriteInputTokens,
summary.cacheWriteReportedTurns,
summary.reportedTurns,
t,
),
- )
- }
+ },
+ ]
return (
{hasModels && {modelText}}
- {usageParts.filter(Boolean).map((part, index) => (
- {part}
- ))}
+ {usageParts.map(({ key, text }) => {
+ if (!text) return null
+ return {text}
+ })}
)
}
diff --git a/src/services/apis/claude-api.mjs b/src/services/apis/claude-api.mjs
index 4a0fc723d..f018782c6 100644
--- a/src/services/apis/claude-api.mjs
+++ b/src/services/apis/claude-api.mjs
@@ -17,7 +17,13 @@ function shouldDisableDefaultThinking(model) {
* @param {Session} session
*/
export async function generateAnswersWithClaudeApi(port, question, session) {
- const { controller, messageListener, disconnectListener } = setAbortController(port)
+ const {
+ controller,
+ messageListener,
+ disconnectListener,
+ getStopGenerationId,
+ isCurrentSessionRequest,
+ } = setAbortController(port)
const config = await getUserConfig()
const apiUrl = config.customAnthropicApiUrl
const model = getModelValue(session)
@@ -128,7 +134,24 @@ export async function generateAnswersWithClaudeApi(port, question, session) {
throw new Error(!isEmpty(error) ? JSON.stringify(error) : `${resp.status} ${resp.statusText}`)
},
}).catch((error) => error)
- if (wasAborted) return
+ if (wasAborted) {
+ const shouldPostSession = Boolean(answer) || session.isRetry
+ if (shouldPostSession && isCurrentSessionRequest()) {
+ if (answer) pushRecord(session, question, answer, responseMetadata)
+ session.isRetry = false
+ try {
+ const stoppedGenerationId = getStopGenerationId()
+ port.postMessage({
+ session,
+ ...(answer && responseMetadata ? { done: true } : {}),
+ ...(stoppedGenerationId === undefined ? {} : { stoppedGenerationId }),
+ })
+ } catch (error) {
+ console.warn('[claude-api] Failed to post session on abort:', error)
+ }
+ }
+ return
+ }
if (completionError) throw completionError
if (
streamError &&
diff --git a/src/services/apis/openai-compatible-core.mjs b/src/services/apis/openai-compatible-core.mjs
index a56a2da53..df5c9c96a 100644
--- a/src/services/apis/openai-compatible-core.mjs
+++ b/src/services/apis/openai-compatible-core.mjs
@@ -219,7 +219,7 @@ export async function generateAnswersWithOpenAICompatible({
const stoppedGenerationId = getStopGenerationId()
port.postMessage({
session,
- done: true,
+ ...(answer && responseMetadata ? { done: true } : {}),
...(stoppedGenerationId === undefined ? {} : { stoppedGenerationId }),
})
} catch (e) {
diff --git a/src/utils/usage-metadata.mjs b/src/utils/usage-metadata.mjs
index 417bffe5a..f3b0bd8a7 100644
--- a/src/utils/usage-metadata.mjs
+++ b/src/utils/usage-metadata.mjs
@@ -143,7 +143,7 @@ export function mergeClaudeResponseMetadata(currentMetadata, data, selectedModel
export function createRecordMetadata(session, metadata) {
return mergeResponseMetadata(metadata, {
- selectedModel: metadata?.selectedModel || session?.aiName,
+ selectedModel: metadata?.selectedModel || session?.modelName,
})
}
diff --git a/tests/unit/services/apis/usage-abort-metadata.test.mjs b/tests/unit/services/apis/usage-abort-metadata.test.mjs
index 961c23eee..c5b6e3952 100644
--- a/tests/unit/services/apis/usage-abort-metadata.test.mjs
+++ b/tests/unit/services/apis/usage-abort-metadata.test.mjs
@@ -1,6 +1,9 @@
import assert from 'node:assert/strict'
-import { test } from 'node:test'
-import { generateAnswersWithOpenAICompatible } from '../../../../src/services/apis/openai-compatible-core.mjs'
+import { beforeEach, test } from 'node:test'
+import { generateAnswersWithClaudeApi } from '../../../../src/services/apis/claude-api.mjs'
+import {
+ generateAnswersWithOpenAICompatible,
+} from '../../../../src/services/apis/openai-compatible-core.mjs'
import { createFakePort } from '../../helpers/port.mjs'
const baseConfig = {
@@ -12,7 +15,35 @@ function sseData(data) {
return `data: ${JSON.stringify(data)}\n\n`
}
-test('aborted OpenAI-compatible stream reposts retained metadata with terminal session', async (t) => {
+function assertMetadataSessionFollowsStopAcknowledgement(port, session) {
+ const acknowledgementIndex = port.postedMessages.findIndex(
+ (message) => message.done === true && message.session === undefined,
+ )
+ const sessionIndex = port.postedMessages.findIndex((message) => message.session === session)
+
+ assert.notEqual(acknowledgementIndex, -1)
+ assert.notEqual(sessionIndex, -1)
+ assert.equal(port.postedMessages[sessionIndex].done, true)
+ assert.equal(acknowledgementIndex < sessionIndex, true)
+}
+
+if (!globalThis.__TEST_BROWSER_SHIM__) {
+ globalThis.__TEST_BROWSER_SHIM__ = {
+ storage: {},
+ clearStorage() {
+ this.storage = {}
+ },
+ replaceStorage(values) {
+ this.storage = { ...values }
+ },
+ }
+}
+
+beforeEach(() => {
+ globalThis.__TEST_BROWSER_SHIM__.clearStorage()
+})
+
+test('OpenAI-compatible abort reposts retained metadata in a terminal session', async (t) => {
t.mock.method(console, 'debug', () => {})
const session = {
aiName: 'Custom provider',
@@ -88,10 +119,92 @@ test('aborted OpenAI-compatible stream reposts retained metadata with terminal s
},
},
])
+ assertMetadataSessionFollowsStopAcknowledgement(port, session)
+ assert.deepEqual(port.listenerCounts(), { onMessage: 0, onDisconnect: 0 })
+})
+
+test('aborted Claude stream reposts retained metadata with terminal session', async (t) => {
+ t.mock.method(console, 'debug', () => {})
+ globalThis.__TEST_BROWSER_SHIM__.replaceStorage({
+ customAnthropicApiUrl: 'https://api.anthropic.com',
+ anthropicApiKey: 'sk-ant-test',
+ maxConversationContextLength: 3,
+ maxResponseTokenLength: 256,
+ })
+ const session = {
+ aiName: 'Anthropic (Claude Sonnet 5)',
+ modelName: 'claudeSonnet5Api',
+ conversationRecords: [],
+ isRetry: false,
+ }
+ const port = createFakePort()
+ const encoder = new TextEncoder()
- const terminalMessages = port.postedMessages.filter((message) => message.done === true)
- assert.equal(terminalMessages.length, 2)
- assert.equal(terminalMessages[0].session, undefined)
- assert.equal(terminalMessages[1].session, session)
+ t.mock.method(globalThis, 'fetch', async () => {
+ let readCount = 0
+ return {
+ ok: true,
+ status: 200,
+ statusText: 'OK',
+ body: {
+ getReader() {
+ return {
+ async read() {
+ readCount += 1
+ if (readCount === 1) {
+ return {
+ done: false,
+ value: encoder.encode(
+ sseData({
+ type: 'message_start',
+ message: {
+ model: 'claude-sonnet-5-20260801',
+ usage: {
+ input_tokens: 10,
+ cache_read_input_tokens: 20,
+ cache_creation_input_tokens: 30,
+ output_tokens: 1,
+ },
+ },
+ }) +
+ sseData({
+ type: 'content_block_delta',
+ delta: { type: 'text_delta', text: 'Partial' },
+ }),
+ ),
+ }
+ }
+
+ port.emitMessage({ stop: true })
+ const error = new Error('aborted')
+ error.name = 'AbortError'
+ throw error
+ },
+ }
+ },
+ },
+ }
+ })
+
+ await generateAnswersWithClaudeApi(port, 'Hello', session)
+
+ assert.deepEqual(session.conversationRecords, [
+ {
+ question: 'Hello',
+ answer: 'Partial',
+ meta: {
+ selectedModel: 'claude-sonnet-5',
+ reportedModel: 'claude-sonnet-5-20260801',
+ usage: {
+ inputTokens: 60,
+ outputTokens: 1,
+ totalTokens: 61,
+ cacheReadInputTokens: 20,
+ cacheWriteInputTokens: 30,
+ },
+ },
+ },
+ ])
+ assertMetadataSessionFollowsStopAcknowledgement(port, session)
assert.deepEqual(port.listenerCounts(), { onMessage: 0, onDisconnect: 0 })
})
diff --git a/tests/unit/utils/usage-metadata.test.mjs b/tests/unit/utils/usage-metadata.test.mjs
index e3c6df7be..ab0703f9c 100644
--- a/tests/unit/utils/usage-metadata.test.mjs
+++ b/tests/unit/utils/usage-metadata.test.mjs
@@ -117,11 +117,18 @@ test('Claude metadata treats cache reads and writes as parts of the full input',
})
})
-test('record metadata falls back to the session model label', () => {
- assert.deepEqual(createRecordMetadata({ aiName: 'OpenAI (GPT-5.6)' }, null), {
- selectedModel: 'OpenAI (GPT-5.6)',
- })
- assert.equal(createRecordMetadata({}, null), null)
+test('record metadata falls back to the stable session model identifier', () => {
+ assert.deepEqual(
+ createRecordMetadata(
+ {
+ modelName: 'chatgptApi5_6',
+ aiName: 'OpenAI (GPT-5.6)',
+ },
+ null,
+ ),
+ { selectedModel: 'chatgptApi5_6' },
+ )
+ assert.equal(createRecordMetadata({ aiName: 'OpenAI (GPT-5.6)' }, null), null)
})
test('conversation summary totals only complete reported usage and preserves model history', () => {