Skip to content

Commit f32a2f5

Browse files
committed
Merge dev into preview: v2.24.1 release
2 parents d240148 + e216617 commit f32a2f5

17 files changed

Lines changed: 98 additions & 21 deletions

‎gui/src/i18n/de.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1313,7 +1313,7 @@ export const de: Record<TKey, string> = {
13131313
"claude.autoContextDesc": "Steuert, wie weit die 1M-Markierung geht. AN: jedes Modell, dessen Fenster den Komprimierungsschwellwert fasst, erhält eine Big-Context-Zeile. AUS: nur echte 1M-Modelle.",
13141314
"claude.autoContextInert": "Inaktiv, weil in der Konfigurationsdatei ein alter Kontextgrößen-Wert (maxContextTokens) steht. Dort entfernen, um es wieder zu aktivieren.",
13151315
"claude.autoCompactWindow": "Punkt für Auto-Zusammenfassung",
1316-
"claude.autoCompactDefault": "350k (Standard)",
1316+
"claude.autoCompactDefault": "{value} (Standard)",
13171317
"claude.autoCompactWindowDesc": "Ältere Nachrichten werden an diesem Punkt zusammengefasst. Das eigene Limit jedes Modells wird nie überschritten — 200k-Modelle bleiben unberührt.",
13181318
"claude.autoCompactWindowWarn": "Eine Änderung kann GPT-Modelle stören — liegt der Wert über dem echten Modelllimit, kommt es vor der Zusammenfassung zu Fehlern.",
13191319
"claude.injectAgents": "Subagenten automatisch registrieren",

‎gui/src/i18n/en.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1808,7 +1808,7 @@ export const en = {
18081808
"claude.autoContextDesc": "Controls how far the 1M marking goes. ON: any model whose window can host the compaction threshold gets a big-context row. OFF: only true 1M models get one.",
18091809
"claude.autoContextInert": "Inactive because a legacy context-size value (maxContextTokens) exists in the config file. Remove it there to re-enable.",
18101810
"claude.autoCompactWindow": "Auto-summarize point",
1811-
"claude.autoCompactDefault": "350k (default)",
1811+
"claude.autoCompactDefault": "{value} (default)",
18121812
"claude.autoCompactWindowDesc": "Older messages are summarized when the chat reaches this point. It never exceeds each model's own limit, so 200k models are unaffected.",
18131813
"claude.autoCompactWindowWarn": "Changing this can break GPT models — set higher than a model's real limit, chats will error before the summary kicks in.",
18141814
"claude.injectAgents": "Auto-register subagents",

‎gui/src/i18n/fr.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1771,7 +1771,7 @@ export const fr: Record<TKey, string> = {
17711771
"claude.autoContextDesc": "Contrôle l’étendue du marquage 1M. ACTIVÉ : tout modèle dont la fenêtre peut accueillir le seuil de compaction obtient une ligne de grand contexte. DÉSACTIVÉ : seuls les véritables modèles 1M en obtiennent une.",
17721772
"claude.autoContextInert": "Inactif, car une ancienne valeur de taille de contexte (maxContextTokens) existe dans le fichier de configuration. Supprimez-la dans ce fichier pour réactiver l’option.",
17731773
"claude.autoCompactWindow": "Seuil de résumé automatique",
1774-
"claude.autoCompactDefault": "350k (par défaut)",
1774+
"claude.autoCompactDefault": "{value} (par défaut)",
17751775
"claude.autoCompactWindowDesc": "Les anciens messages sont résumés lorsque la conversation atteint ce seuil. Celui-ci ne dépasse jamais la limite propre à chaque modèle; les modèles 200k ne sont donc pas affectés.",
17761776
"claude.autoCompactWindowWarn": "La modification de ce paramètre peut perturber les modèles GPT — s’il dépasse la limite réelle d’un modèle, les conversations échoueront avant le déclenchement du résumé.",
17771777
"claude.injectAgents": "Enregistrer automatiquement les sous-agents",

‎gui/src/i18n/ja.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1738,7 +1738,7 @@ export const ja: Record<TKey, string> = {
17381738
"claude.autoContextDesc": "1M マーキングがどこまで及ぶかを制御します。オン: 圧縮しきい値を収められるウィンドウを持つモデルに大型コンテキスト行を付けます。オフ: 真の 1M モデルのみに付けます。",
17391739
"claude.autoContextInert": "設定ファイルにレガシーのコンテキストサイズ値(maxContextTokens)が存在するため無効です。再び有効化するにはそれを削除してください。",
17401740
"claude.autoCompactWindow": "自動要約ポイント",
1741-
"claude.autoCompactDefault": "350k(デフォルト)",
1741+
"claude.autoCompactDefault": "{value}(デフォルト)",
17421742
"claude.autoCompactWindowDesc": "チャットがこのポイントに達すると古いメッセージが要約されます。各モデル自身の上限を超えることはないので、200k モデルは影響を受けません。",
17431743
"claude.autoCompactWindowWarn": "これを変更すると GPT モデルが壊れる可能性があります — モデルの実際の上限より高く設定すると、要約が働く前にチャットがエラーになります。",
17441744
"claude.injectAgents": "サブエージェントを自動登録",

‎gui/src/i18n/ko.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1340,7 +1340,7 @@ export const ko: Record<TKey, string> = {
13401340
"claude.autoContextDesc": "1M 표기를 어디까지 붙일지 정합니다. 켜면 컴팩션 기준치를 담을 수 있는 창을 가진 모델에 큰 컨텍스트 행이 생기고, 끄면 진짜 1M 모델에만 생깁니다.",
13411341
"claude.autoContextInert": "설정 파일에 이전 방식의 컨텍스트 크기 값(maxContextTokens)이 있어 이 기능이 지금은 적용되지 않아요. 설정에서 그 값을 지우면 다시 켜집니다.",
13421342
"claude.autoCompactWindow": "자동 요약 지점",
1343-
"claude.autoCompactDefault": "350k (기본값)",
1343+
"claude.autoCompactDefault": "{value} (기본값)",
13441344
"claude.autoCompactWindowDesc": "대화가 이 지점에 다다르면 오래된 내용을 자동 요약합니다. 모델마다 자기 한도를 넘지 않는 선에서만 적용되니 200k 모델은 영향받지 않아요.",
13451345
"claude.autoCompactWindowWarn": "값을 직접 바꾸면 GPT 모델들이 제대로 동작하지 않을 수 있어요 — 모델의 실제 한도보다 크게 잡으면 요약이 되기 전에 대화가 오류로 멈춥니다.",
13461346
"claude.injectAgents": "서브에이전트 자동 등록",

‎gui/src/i18n/ru.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1789,7 +1789,7 @@ export const ru: Record<TKey, string> = {
17891789
"claude.autoContextDesc": "Определяет, как широко применяется пометка 1M. ВКЛ: строку с большим контекстом получает каждая модель, окно которой вмещает порог сжатия. ВЫКЛ: её получают только модели с настоящим контекстом 1M.",
17901790
"claude.autoContextInert": "Неактивно, поскольку в файле конфигурации задано устаревшее значение размера контекста (maxContextTokens). Удалите его там, чтобы снова включить эту настройку.",
17911791
"claude.autoCompactWindow": "Порог автосуммаризации",
1792-
"claude.autoCompactDefault": "350k (по умолчанию)",
1792+
"claude.autoCompactDefault": "{value} (по умолчанию)",
17931793
"claude.autoCompactWindowDesc": "Когда чат достигает этого порога, старые сообщения суммаризируются. Порог никогда не превышает собственный лимит модели, поэтому модели с контекстом 200k не затрагиваются.",
17941794
"claude.autoCompactWindowWarn": "Изменение этого значения может сломать модели GPT — если задать порог выше реального лимита модели, чаты будут выдавать ошибку ещё до срабатывания суммаризации.",
17951795
"claude.injectAgents": "Авторегистрация подагентов",

‎gui/src/i18n/tr.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1798,7 +1798,7 @@ export const tr: Record<TKey, string> = {
17981798
"claude.autoContextDesc": "1M işaretinin ne kadar ileri gideceğini kontrol eder. AÇIK: penceresi sıkıştırma eşiğini barındırabilen her model 1M aralığı kazanır. KAPALI: yalnızca gerçek 1M modelleri alır.",
17991799
"claude.autoContextInert": "Pasif durumdadır çünkü konfigürasyon dosyasında eski bir bağlam boyutu değeri (maxContextTokens) var. Yeniden etkinleştirmek için oradan kaldırın.",
18001800
"claude.autoCompactWindow": "Otomatik özetleme noktası",
1801-
"claude.autoCompactDefault": "350k (varsayılan)",
1801+
"claude.autoCompactDefault": "{value} (varsayılan)",
18021802
"claude.autoCompactWindowDesc": "Sohbet bu noktaya ulaştığında eski mesajlar özetlenir. Her modelin kendi sınırını asla aşmaz, bu nedenle 200k modeller etkilenmez.",
18031803
"claude.autoCompactWindowWarn": "Bunu değiştirmek GPT modellerini bozabilir — bir modelin gerçek sınırından daha yüksek ayarlanırsa, sohbetler özet devreye girmeden önce hata verecektir.",
18041804
"claude.injectAgents": "Alt ajanları otomatik kaydet",

‎gui/src/i18n/zh-TW.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1337,7 +1337,7 @@ export const zhTW: Record<TKey, string> = {
13371337
"claude.autoContextDesc": "決定 1M 標記的範圍。開:視窗能容納壓縮門檻的模型都有大上下文條目;關:僅真正的 1M 模型有。",
13381338
"claude.autoContextInert": "配置檔案中存在舊式上下文大小值(maxContextTokens),此功能暫不生效。刪除該值即可恢復。",
13391339
"claude.autoCompactWindow": "自動摘要觸發點",
1340-
"claude.autoCompactDefault": "350k(預設)",
1340+
"claude.autoCompactDefault": "{value}(預設)",
13411341
"claude.autoCompactWindowDesc": "對話達到該點時自動摘要舊內容。不會超過各模型自身上限,因此 200k 模型不受影響。",
13421342
"claude.autoCompactWindowWarn": "修改該值可能導致 GPT 模型異常——若超過模型真實上限,會在摘要觸發前報錯。",
13431343
"claude.injectAgents": "自動註冊子代理",

‎gui/src/i18n/zh.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ export const zh: Record<TKey, string> = {
13331333
"claude.autoContextDesc": "决定 1M 标记的范围。开:窗口能容纳压缩阈值的模型都有大上下文条目;关:仅真正的 1M 模型有。",
13341334
"claude.autoContextInert": "配置文件中存在旧式上下文大小值(maxContextTokens),此功能暂不生效。删除该值即可恢复。",
13351335
"claude.autoCompactWindow": "自动摘要触发点",
1336-
"claude.autoCompactDefault": "350k(默认)",
1336+
"claude.autoCompactDefault": "{value}(默认)",
13371337
"claude.autoCompactWindowDesc": "对话达到该点时自动摘要旧内容。不会超过各模型自身上限,因此 200k 模型不受影响。",
13381338
"claude.autoCompactWindowWarn": "修改该值可能导致 GPT 模型异常——若超过模型真实上限,会在摘要触发前报错。",
13391339
"claude.injectAgents": "自动注册子代理",

‎gui/src/pages/ClaudeCode.tsx‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
ClaudeCodeSettingsCard,
1616
} from "./claude-code-sections";
1717
import { serializeSidecarOverride } from "./claude-code-sidecar";
18-
import { formatCompactWindow, newClientId, type ClaudeCodeState, type MapRow } from "./claude-code-types";
18+
import { AUTO_COMPACT_WINDOW_DEFAULT, formatCompactWindow, newClientId, type ClaudeCodeState, type MapRow } from "./claude-code-types";
1919
import { SmallFastModelSetting } from "./claude-code-settings";
2020

2121
export { AutoConnectSetting, SmallFastModelSetting } from "./claude-code-settings";
@@ -104,14 +104,21 @@ export default function ClaudeCode({ apiBase, active = true }: { apiBase: string
104104
);
105105

106106
// Auto-compact window presets (devlog 020 + user request): dropdown like the model
107-
// pickers. "" = 350k default; a saved off-ladder value is surfaced as its own option.
107+
// pickers. "" means "use the runtime default"; a saved off-ladder value is surfaced as
108+
// its own option. The default itself is on the ladder so the empty choice and the
109+
// explicit one are visibly the same number.
108110
const autoCompactOptions = useMemo(() => {
109-
const ladder = [100_000, 200_000, 250_000, 300_000, 350_000, 400_000, 500_000, 600_000, 750_000, 900_000, 1_000_000];
111+
const ladder = [
112+
100_000, 200_000, 250_000, 300_000, 350_000, 400_000, 500_000, 600_000, 750_000,
113+
AUTO_COMPACT_WINDOW_DEFAULT, 900_000, 1_000_000,
114+
].sort((a, b) => a - b);
110115
// Compact SI-style units (1M / 350k) — technical number format, not prose.
111116
const current = state?.autoCompactWindow ?? null;
112117
const values = current !== null && !ladder.includes(current) ? [...ladder, current].sort((a, b) => a - b) : ladder;
113118
return [
114-
{ value: "", label: t("claude.autoCompactDefault") },
119+
// The label carries the number instead of hardcoding it in nine locale files, which
120+
// is how "350k (default)" survived a default change.
121+
{ value: "", label: t("claude.autoCompactDefault", { value: formatCompactWindow(AUTO_COMPACT_WINDOW_DEFAULT, localeTag) }) },
115122
...values.map(value => ({ value: String(value), label: formatCompactWindow(value, localeTag) })),
116123
];
117124
}, [state?.autoCompactWindow, t, localeTag]);

0 commit comments

Comments
 (0)