Skip to content

Commit f725ecc

Browse files
committed
Merge branch 'ls-dev' into 'master'
fix(compress): manual compress done message success-only See merge request ai_native/DeepVCode/DeepVcodeClient!481
2 parents ffb76c1 + 06c8f86 commit f725ecc

3 files changed

Lines changed: 4 additions & 21 deletions

File tree

packages/vscode-ui-plugin/webview/src/components/MultiSessionApp.tsx

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -939,8 +939,6 @@ export const MultiSessionApp: React.FC = () => {
939939
const statusId: string = payload?.statusId || `compress-${Date.now()}`;
940940
const notificationId = `notif-${statusId}`;
941941

942-
const fmt = (n: any) => (typeof n === 'number' ? n.toLocaleString() : String(n));
943-
944942
if (payload?.phase === 'start') {
945943
// 底部进度条
946944
setIsCompressing(true);
@@ -968,28 +966,13 @@ export const MultiSessionApp: React.FC = () => {
968966
setIsCompressing(false);
969967

970968
if (payload?.phase === 'done') {
971-
const original = Number(payload?.originalTokenCount);
972-
const compressed = Number(payload?.newTokenCount);
973-
const saved =
974-
Number.isFinite(original) && Number.isFinite(compressed)
975-
? Math.max(0, original - compressed)
976-
: undefined;
977-
const percent =
978-
Number.isFinite(original) && original > 0 && saved !== undefined
979-
? `-${Math.round((saved / original) * 100)}%`
980-
: '';
981969
updateMessage(targetSessionId, notificationId, {
982970
notificationInProgress: false,
983971
notificationTitle: t('compression.manualDone', {}, 'Context compressed'),
984972
notificationDescription: t(
985973
'compression.manualDoneDesc',
986-
{
987-
original: fmt(original),
988-
compressed: fmt(compressed),
989-
saved: fmt(saved),
990-
percent,
991-
},
992-
`Reduced from ${fmt(original)} to ${fmt(compressed)} tokens.`
974+
{},
975+
'Conversation history compressed successfully.'
993976
),
994977
severity: 'info',
995978
} as any);

packages/vscode-ui-plugin/webview/src/i18n/locales/en-US.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ export const enUS: Translations = {
364364
manualInProgress: 'Compressing conversation history…',
365365
manualInProgressDesc: 'Summarizing older messages while preserving recent context. This may take a moment.',
366366
manualDone: 'Context compressed',
367-
manualDoneDesc: 'Reduced from {{original}} to {{compressed}} tokens (saved {{saved}}, {{percent}}).',
367+
manualDoneDesc: 'Conversation history compressed successfully.',
368368
manualSkipped: 'Compression skipped',
369369
manualSkippedDesc: 'The conversation history is already small enough — nothing to compress.',
370370
manualFailed: 'Compression failed',

packages/vscode-ui-plugin/webview/src/i18n/locales/zh-CN.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ export const zhCN: Translations = {
364364
manualInProgress: '正在压缩对话历史…',
365365
manualInProgressDesc: '正在总结较早的消息,同时保留最近的上下文。请稍候片刻。',
366366
manualDone: '上下文已压缩',
367-
manualDoneDesc: '已从 {{original}} tokens 压缩到 {{compressed}} tokens(节省 {{saved}},{{percent}})。',
367+
manualDoneDesc: '对话历史已成功压缩。',
368368
manualSkipped: '已跳过压缩',
369369
manualSkippedDesc: '对话历史已经足够精简,无需压缩。',
370370
manualFailed: '压缩失败',

0 commit comments

Comments
 (0)