Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

feat(context): 统一上下文圆环与模型压缩设置

Dash74ea89570e20
diff --git a/apps/desktop/scripts/fixtures/context-capacity/context-capacity-fixture.tsx b/apps/desktop/scripts/fixtures/context-capacity/context-capacity-fixture.tsx
new file mode 100644
index 0000000000..2f40516033
--- /dev/null
+++ b/apps/desktop/scripts/fixtures/context-capacity/context-capacity-fixture.tsx
@@ -0,0 +1,72 @@
+import { mountPage, subscription, forbid } from '../../ui-page/harness';
+import { ContextCapacityRing } from '../../../src/renderer/components/status/ContextCapacityRing';
+
+mountPage({
+ route: '/cc-agent/fixture-session',
+ host: (ctx) => ({
+ maker: {
+ getSessionContextWindowBounds: async () =>
+ ctx.data.unknown
+ ? null
+ : {
+ providerId: 'xd',
+ defaultWindow: 272_000,
+ maxWindow: 1_050_000,
+ modelLimit: null,
+ budget: null,
+ budgetCustomized: false,
+ defaultEffectiveWindow: 272_000,
+ maxEffectiveWindow: 1_050_000,
+ },
+ getModelContextLimit: async () => ({
+ limit: null,
+ isCustomized: false,
+ codexContext: {
+ contextWindow: 272_000,
+ usableContextWindow: 258_400,
+ autoCompactTokenLimit: 244_800,
+ pendingApply: false,
+ },
+ }),
+ onProvidersChanged: subscription('providersChanged'),
+ usage: {
+ getModelPricing: async () => ({
+ xd: {
+ 'fixture-model': {
+ providerId: 'xd',
+ modelId: 'fixture-model',
+ currency: 'USD',
+ source: 'gateway',
+ approximate: false,
+ inputPerMtok: 10,
+ outputPerMtok: 30,
+ inputTokenPriceBands: [
+ { minInputTokens: 0, maxInputTokens: 512_000, inputPerMtok: 10 },
+ { minInputTokens: 512_000, inputPerMtok: 20 },
+ ],
+ },
+ },
+ }),
+ getReferenceModelPricing: async () => null,
+ onModelPricingChanged: subscription('pricingChanged'),
+ onReferenceModelPricingChanged: subscription('referencePricingChanged'),
+ },
+ },
+ }),
+ render: (ctx) => (
+ <div className="flex h-screen items-end justify-end bg-content-area p-6">
+ <div className="flex items-center gap-3" data-testid="context-footer">
+ <ContextCapacityRing
+ sessionId="fixture-session"
+ providerId="xd"
+ model={ctx.data.unknown ? 'unknown' : 'fixture-model'}
+ vendorKey={ctx.data.codex ? 'codex' : 'cc'}
+ contextTokens={ctx.data.high ? 250_240 : 32_640}
+ sdkContextWindow={272_000}
+ disabled={ctx.data.readOnly === true}
+ onCompact={!ctx.data.codex && !ctx.data.readOnly ? forbid('compact') : undefined}
+ />
+ </div>
+ </div>
+ ),
+});
diff --git a/apps/desktop/scripts/fixtures/context-capacity/ui-page.mjs b/apps/desktop/scripts/fixtures/context-capacity/ui-page.mjs
new file mode 100644
index 0000000000..b0fc2a97b8
--- /dev/null
+++ b/apps/desktop/scripts/fixtures/context-capacity/ui-page.mjs
@@ -0,0 +1,72 @@
+import assert from 'node:assert/strict';
+
+export default {
+ name: 'context-capacity',
+ entry: './context-capacity-fixture.tsx',
+ viewport: { width: 560, height: 650 },
+ real: 'ContextCapacityRing, ContextWindowBudgetChip, real Popover and context/pricing hooks',
+ notCovered: 'Real model settings, remote writes and compaction. Uses fixture host data.',
+ stubs: {
+ 'src/renderer/lib/modelDefinitions': 'export const getModelsForVendor = () => [];',
+ },
+ cases: {
+ default: { about: 'One ring opens usage, manual compaction and window choices' },
+ high: { about: 'Context nearly full', data: { high: true } },
+ codex: { about: 'Native Codex details above window choices', data: { codex: true } },
+ narrow: {
+ about: 'Read-only task at 320px',
+ data: { readOnly: true },
+ viewport: { width: 320, height: 650 },
+ },
+ 'narrow-editable': {
+ about: 'Window controls and model settings at 320px',
+ viewport: { width: 320, height: 650 },
+ },
+ unknown: {
+ about: 'Missing route data keeps the ring and usage details',
+ data: { unknown: true },
+ },
+ },
+ async ready(page) {
+ await page.locator('[data-context-window-budget-chip]').waitFor();
+ },
+ async check(page, ui) {
+ const ring = page.locator('[data-context-window-budget-chip]');
+ assert.equal(await ring.textContent(), ui.data.high ? '92%' : '12%');
+ assert.equal(await page.getByRole('radiogroup').count(), 0);
+ await ui.capture('entry', { locator: page.locator('[data-testid="context-footer"]') });
+ // Hover must allow moving into the same card to reach its options.
+ await ring.hover();
+ const card = page.getByRole('dialog');
+ await card.waitFor();
+ await card.hover();
+ await ui.capture('details', { locator: card });
+ if (ui.case === 'codex') {
+ const technical = card.locator('details:not([data-context-window-options]) > summary');
+ await technical.click();
+ await ui.capture('native-details', { locator: card });
+ await technical.click();
+ }
+ if (ui.case === 'unknown') {
+ assert.equal(await page.getByRole('radiogroup').count(), 0);
+ } else {
+ await page.locator('[data-context-window-options] > summary').click();
+ const rows = page.getByRole('radio');
+ assert.equal(await rows.count(), 3);
+ if (ui.case === 'narrow') assert.equal(await rows.first().isDisabled(), true);
+ }
+ await ui.capture('expanded', { locator: card });
+ const box = await card.boundingBox();
+ const height = await page.evaluate(() => window.innerHeight);
+ assert.ok(box && box.y >= -1 && box.y + box.height <= height + 1,
+ `Expanded controls stay within the viewport: ${JSON.stringify(box)} / ${height}`);
+ // Keyboard entry and dismissal work without triggering compaction or a budget write.
+ await page.keyboard.press('Escape');
+ await card.waitFor({ state: 'hidden' });
+ await ring.focus();
+ await page.keyboard.press('Enter');
+ await card.waitFor();
+ await page.keyboard.press('Escape');
+ await card.waitFor({ state: 'hidden' });
+ },
+};
diff --git a/apps/desktop/scripts/fixtures/model-advanced/model-advanced-fixture.tsx b/apps/desktop/scripts/fixtures/model-advanced/model-advanced-fixture.tsx
index 7e4d2cc821..8bc2c3615f 100644
--- a/apps/desktop/scripts/fixtures/model-advanced/model-advanced-fixture.tsx
+++ b/apps/desktop/scripts/fixtures/model-advanced/model-advanced-fixture.tsx
@@ -3,12 +3,21 @@ import { ModelAdvancedDrawer } from '../../../src/renderer/components/settings/M
import { buildUnionRows } from '../../../src/renderer/components/settings/UnifiedModelList';
import { BUNDLED_CATALOG, resolveModelMetadata, type CatalogModel, type ProviderView } from '@cindy/model-providers';
+let compactionPct: number | null = null;
+const contextView = () => ({ limit: 272000, isCustomized: false,
+ compaction: { pct: compactionPct ?? 90, isCustomized: compactionPct !== null },
+ codexContext: { contextWindow: 272000, usableContextWindow: 258400,
+ autoCompactTokenLimit: Math.floor(272000 * (compactionPct ?? 90) / 100),
+ modelMaxContextWindow: 1050000, source: 'config', fallbackModel: false },
+});
+
void mountPage({
host: { maker: {
- getModelContextLimit: async () => ({ limit:272000, isCustomized:false,
- codexContext:{contextWindow:272000, usableContextWindow:258400,
- autoCompactTokenLimit:244800, modelMaxContextWindow:1050000,
- source:'config', fallbackModel:false} }),
+ getModelContextLimit: async () => contextView(),
+ setModelCompaction: async (_target: unknown, pct: number | null) => {
+ compactionPct = pct;
+ return contextView();
+ },
onProvidersChanged: subscription('providersChanged'),
} },
render: ctx => {
diff --git a/apps/desktop/scripts/fixtures/model-advanced/ui-page.mjs b/apps/desktop/scripts/fixtures/model-advanced/ui-page.mjs
index 25bbece3c5..7c94fd6d5e 100644
--- a/apps/desktop/scripts/fixtures/model-advanced/ui-page.mjs
+++ b/apps/desktop/scripts/fixtures/model-advanced/ui-page.mjs
@@ -5,6 +5,7 @@ export default {
notCovered:'Account entitlement and live model calls; host context result and speed availability are fixture inputs',
cases:{
default:{about:'GPT-6 Astra with Codex Ultrafast entitlement'},
+ narrow:{about:'Model compaction at phone width', viewport:{width:320,height:800}},
sol:{about:'GPT-6.1 Sol with Codex Ultrafast entitlement'},
'legacy-sol':{about:'GPT-6 Sol reasoning metadata'},
unavailable:{about:'Account has not enabled Ultrafast'},
@@ -28,5 +29,21 @@ export default {
throw Error('Ultrafast capability does not match the account');
}
await ui.capture('ultra-selected');
+ const compaction = page.locator('[data-model-compaction]');
+ await compaction.locator('summary').click();
+ const trigger = compaction.getByRole('button');
+ await trigger.click();
+ await ui.capture('compaction-options');
+ await page.getByRole('menuitemradio', { name: '80%', exact: true }).click();
+ await page.waitForFunction(() => document.querySelector('[data-model-compaction] button')?.textContent?.includes('80%'));
+ await compaction.scrollIntoViewIfNeeded();
+ await ui.capture('model-compaction');
+ await ui.capture('model-compaction-closeup', { locator: compaction });
+ await trigger.click();
+ await page.getByRole('menuitemradio', { name: await ui.t('settings.providers.models.advanced.restoreDefault'), exact: true }).click();
+ await page.waitForFunction(() => document.querySelector('[data-model-compaction] button')?.textContent?.includes('90%'));
+ await compaction.scrollIntoViewIfNeeded();
+ await ui.capture('default-compaction');
+ await ui.capture('default-compaction-closeup', { locator: compaction });
},
};
diff --git a/apps/desktop/src/main/maker-host/__tests__/codexContextSwitch.native.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexContextSwitch.native.test.ts
index f0c95b30ea..f386e0bdd8 100644
--- a/apps/desktop/src/main/maker-host/__tests__/codexContextSwitch.native.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/codexContextSwitch.native.test.ts
@@ -18,13 +18,14 @@ const logger: Logger = { trace() {}, debug() {}, info() {}, warn() {}, error() {
// Different-provider catalogs cannot assume the old model is available. SSH uses
// thread config instead of a local catalog. Neither removes native pre-turn
// compaction with the target model; verify the real requests, not only RPC config.
-it.skipIf(!binary).each(['same-provider', 'different-provider', 'thread-budget'] as const)(
+it.skipIf(!binary).each(['same-provider', 'different-provider', 'thread-budget', 'custom-compaction'] as const)(
'cold-resumes and natively compacts before continuing (%s)', async mode => {
const root = await fs.mkdtemp(path.join(os.tmpdir(), 'cindy-context-switch-native-'));
const home = path.join(root, 'home');
const work = path.join(root, 'work');
const oldModel = mode === 'thread-budget' ? 'fixture-wide' : 'codex/fixture-wide';
- const windows: Record<string, number> = { [oldModel]: 500_000, 'fixture-small': 272_000 };
+ const windows: Record<string, number> = { [oldModel]: 500_000, 'fixture-small': mode === 'custom-compaction' ? 500_000 : 272_000 };
+ const compactionPct = (model: string) => mode === 'custom-compaction' && model === 'fixture-small' ? 50 : null;
const requests: Array<{ model: string; input: unknown[] }> = [];
const server = createServer(async (req, res) => {
if (req.method !== 'POST') { res.end('{"models":[]}'); return; }
@@ -63,6 +64,7 @@ it.skipIf(!binary).each(['same-provider', 'different-provider', 'thread-budget']
].join('\n'));
const makeAgent = () => new CodexAgent({
binaryPath: binary!, logger, runtimeConfig: {}, resolveCodexLocalAuthPolicy: () => 'isolated',
+ resolveModelCompactionPct: (_provider, model) => compactionPct(model),
resolveCodexThreadContextWindow: mode === 'thread-budget' ? undefined : (_provider, model) => windows[model] ?? null,
resolveModelContextLimit: mode === 'thread-budget' ? (_provider, model) => windows[model] ?? null : undefined,
prepareCodexExtraSpawnConfig: async (_providers, ctx) => {
@@ -74,6 +76,7 @@ it.skipIf(!binary).each(['same-provider', 'different-provider', 'thread-budget']
const catalog = await prepareCodexCustomContextCatalog({ binaryPath: binary!, codexHome: home,
modelId: ctx.customContextModel!, contextWindow: ctx.customContextWindow!,
modelIds: targetProvider ? ['fixture-small'] : Object.keys(windows),
+ resolveCompactionPct: compactionPct,
resolveContextWindow: model => targetProvider ? null : windows[model] ?? null });
return { extraArgs: catalog.extraArgs, extraEnv: {}, codexProxyActive: true };
},
@@ -117,7 +120,7 @@ it.skipIf(!binary).each(['same-provider', 'different-provider', 'thread-budget']
expect(JSON.stringify(requests[1]!.input)).toContain('FIRST_REPLY');
expect(JSON.stringify(requests[2]!.input)).toContain('NATIVE_SUMMARY');
expect(JSON.stringify(requests[2]!.input)).toContain('CONTINUE_MARKER');
- expect(handle.getUsageSnapshot().contextWindow).toBe(258_400);
+ expect(handle.getUsageSnapshot().contextWindow).toBe(mode === 'custom-compaction' ? 475_000 : 258_400);
await handle.close();
} finally {
await agent?.dispose();
diff --git a/apps/desktop/src/main/maker-host/__tests__/codexContextWindow.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexContextWindow.test.ts
index 19d986ff45..d2f6a16e4e 100644
--- a/apps/desktop/src/main/maker-host/__tests__/codexContextWindow.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/codexContextWindow.test.ts
@@ -1,35 +1,94 @@
import { describe, expect, it } from 'vitest';
-import { resolveCodexContextWindowInfo } from '../codex-context-window';
-const sol = { context_window: 272_000, max_context_window: 872_000, effective_context_window_percent: 95 };
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { readCodexContextWindowInfo, resolveCodexContextWindowInfo } from '../codex-context-window';
+const sol = {
+ context_window: 272_000,
+ max_context_window: 872_000,
+ effective_context_window_percent: 95,
+};
describe('native Codex context facts', () => {
+ // Unit: changing only the percentage must update the settings preview, not a running turn.
+ // Previous coverage exercised window overrides only; use an isolated native catalog file.
+ it('previews a model percentage without requiring a window override and preserves live facts', async () => {
+ const home = await fs.mkdtemp(path.join(os.tmpdir(), 'codex-policy-preview-'));
+ try {
+ await fs.writeFile(
+ path.join(home, 'models_cache.json'),
+ JSON.stringify({ models: [{ ...sol, slug: 'fixture' }] }),
+ );
+ await expect(
+ readCodexContextWindowInfo({
+ codexHome: home,
+ modelId: 'fixture',
+ config: {},
+ compactionPctOverride: 70,
+ }),
+ ).resolves.toMatchObject({ contextWindow: 272_000, autoCompactTokenLimit: 190_400 });
+ await expect(
+ readCodexContextWindowInfo({
+ codexHome: home,
+ modelId: 'fixture',
+ config: {},
+ compactionPctOverride: 70,
+ reportedUsableWindow: 258_400,
+ }),
+ ).resolves.toMatchObject({ autoCompactTokenLimit: 244_800, source: 'runtime' });
+ } finally {
+ await fs.rm(home, { recursive: true, force: true });
+ }
+ });
it('keeps total, usable capacity and compaction distinct', () => {
expect(resolveCodexContextWindowInfo(sol, {}, 258_400)).toEqual({
- contextWindow: 272_000, usableContextWindow: 258_400, autoCompactTokenLimit: 244_800,
- modelMaxContextWindow: 872_000, source: 'runtime', fallbackModel: false,
+ contextWindow: 272_000,
+ usableContextWindow: 258_400,
+ autoCompactTokenLimit: 244_800,
+ modelMaxContextWindow: 872_000,
+ source: 'runtime',
+ fallbackModel: false,
});
});
it('clips CLI overrides to the native maximum and supports earlier compaction', () => {
- expect(resolveCodexContextWindowInfo(sol, { model_context_window: 1_000_000, model_auto_compact_token_limit: 400_000 }))
- .toMatchObject({ contextWindow: 872_000, usableContextWindow: 828_400, autoCompactTokenLimit: 400_000 });
+ expect(
+ resolveCodexContextWindowInfo(sol, {
+ model_context_window: 1_000_000,
+ model_auto_compact_token_limit: 400_000,
+ }),
+ ).toMatchObject({
+ contextWindow: 872_000,
+ usableContextWindow: 828_400,
+ autoCompactTokenLimit: 400_000,
+ });
});
it('preserves the running thread when defaults change', () => {
- expect(resolveCodexContextWindowInfo(sol, { model_context_window: 500_000 }, 258_400))
- .toMatchObject({ contextWindow: 272_000, usableContextWindow: 258_400 });
+ expect(
+ resolveCodexContextWindowInfo(sol, { model_context_window: 500_000 }, 258_400),
+ ).toMatchObject({ contextWindow: 272_000, usableContextWindow: 258_400 });
});
it('uses the model headroom instead of always dividing by 95%', () => {
- expect(resolveCodexContextWindowInfo({ ...sol, context_window: 128_000, effective_context_window_percent: 100 }, {}, 128_000))
- .toMatchObject({ contextWindow: 128_000, usableContextWindow: 128_000 });
+ expect(
+ resolveCodexContextWindowInfo(
+ { ...sol, context_window: 128_000, effective_context_window_percent: 100 },
+ {},
+ 128_000,
+ ),
+ ).toMatchObject({ contextWindow: 128_000, usableContextWindow: 128_000 });
});
it('does not treat GLM configured 500K as native support', () => {
- expect(resolveCodexContextWindowInfo(undefined, { model_context_window: 500_000 }))
- .toMatchObject({ contextWindow: 272_000, fallbackModel: true });
+ expect(
+ resolveCodexContextWindowInfo(undefined, { model_context_window: 500_000 }),
+ ).toMatchObject({ contextWindow: 272_000, fallbackModel: true });
});
it('honors an installed native catalog for a third-party model', () => {
- expect(resolveCodexContextWindowInfo({ context_window: 500_000, max_context_window: 500_000 }, {}))
- .toMatchObject({ contextWindow: 500_000, usableContextWindow: 475_000, fallbackModel: false });
+ expect(
+ resolveCodexContextWindowInfo({ context_window: 500_000, max_context_window: 500_000 }, {}),
+ ).toMatchObject({ contextWindow: 500_000, usableContextWindow: 475_000, fallbackModel: false });
});
it('does not invent capacity from invalid native metadata', () => {
expect(resolveCodexContextWindowInfo({ context_window: 0 }, {})).toBeNull();
- expect(resolveCodexContextWindowInfo({ ...sol, effective_context_window_percent: 0 }, {}, 258_400)).toBeNull();
+ expect(
+ resolveCodexContextWindowInfo({ ...sol, effective_context_window_percent: 0 }, {}, 258_400),
+ ).toBeNull();
});
});
diff --git a/apps/desktop/src/main/maker-host/__tests__/codexCustomContextCatalog.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexCustomContextCatalog.test.ts
index c798044591..7d2c8df6ec 100644
--- a/apps/desktop/src/main/maker-host/__tests__/codexCustomContextCatalog.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/codexCustomContextCatalog.test.ts
@@ -39,6 +39,21 @@ async function createFixtureBinary(
}
describe('Codex custom context model catalog', () => {
+ it('writes separate compaction thresholds per model and keeps the legacy ratio for unedited models', async () => {
+ const { root, binaryPath } = await createFixtureBinary({ models: [
+ { slug: 'gpt-a', context_window: 400_000, max_context_window: 1_000_000 },
+ { slug: 'gpt-b', context_window: 200_000, max_context_window: 1_000_000 },
+ ] });
+ const result = await prepareCodexCustomContextCatalog({ binaryPath, codexHome: root,
+ modelId: 'gpt-a', contextWindow: 400_000,
+ resolveContextWindow: () => 200_000,
+ resolveCompactionPct: id => id === 'gpt-a' ? 75 : null,
+ });
+ expect(JSON.parse(await fs.readFile(result.catalogPath, 'utf8')).models).toMatchObject([
+ { slug: 'gpt-a', context_window: 400_000, auto_compact_token_limit: 300_000 },
+ { slug: 'gpt-b', context_window: 200_000, auto_compact_token_limit: 180_000 },
+ ]);
+ });
// Unit: a guest's native Codex children used the unfiltered binary catalog.
// One granted model must keep native metadata while the ungranted sibling
// disappears from the actual model_catalog_json passed to app-server.
diff --git a/apps/desktop/src/main/maker-host/__tests__/model-context-limit-store.test.ts b/apps/desktop/src/main/maker-host/__tests__/model-context-limit-store.test.ts
index 2084389e2f..6530e552c9 100644
--- a/apps/desktop/src/main/maker-host/__tests__/model-context-limit-store.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/model-context-limit-store.test.ts
@@ -3,6 +3,7 @@ import os from 'node:os';
import path from 'node:path';
import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest';
+import { BUNDLED_CATALOG } from '@cindy/model-providers';
const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'cindy-model-context-limit-'));
let ownerId = 'test-owner';
@@ -35,6 +36,9 @@ import {
writeModelContextLimit,
writeModelContextLimits,
writeModelContextLimitsWithRefresh,
+ readModelCompactionPct,
+ resolveModelCompactionPct,
+ writeModelCompactionWithRefresh,
} from '../model-context-limit-store';
import { clearSessionProvider } from '../session-provider-store.js';
@@ -47,6 +51,34 @@ function writeRawPrefs(value: unknown): void {
}
describe('model context limit store', () => {
+ // Unit: one model edit must reach every engine, including a later-enabled bridge alias;
+ // the old test only checked an explicit batch of per-harness writes.
+ it('shares one supplier/model policy across harnesses and resets to 90 without reviving old globals', async () => {
+ const targets = [{ providerId: 'openai', modelId: 'gpt' }];
+ const routes = [
+ ['codex', 'gpt'], ['pi', 'gpt'], ['claude-code', 'chatgpt/gpt'],
+ ] as const;
+ fs.writeFileSync(path.join(path.dirname(PREFS), 'compaction-settings.json'), JSON.stringify({ claudeCodeAutoCompactPct: 75 }));
+ fs.writeFileSync(path.join(path.dirname(PREFS), 'pi-compaction-settings.json'), JSON.stringify({ piAutoCompactPct: 85 }));
+ writeRawPrefs({ limits: { 'codex:openai:gpt': 272_000 } });
+ for (const [agent, model] of routes)
+ expect(resolveModelCompactionPct(BUNDLED_CATALOG, agent, 'openai', model)).toBe(90);
+ expect(readModelCompactionPct('openai', 'gpt')).toBeNull();
+ await writeModelCompactionWithRefresh(targets, 80, async () => {}, async () => {});
+ __testing.invalidate();
+ for (const [agent, model] of routes)
+ expect(resolveModelCompactionPct(BUNDLED_CATALOG, agent, 'openai', model)).toBe(80);
+ expect(JSON.parse(fs.readFileSync(PREFS, 'utf8')).compactionPcts).toEqual({ '["openai","gpt"]': 80 });
+ expect(readModelCompactionPct('xd', 'gpt')).toBeNull();
+ expect(readModelCompactionPct('openai', 'other')).toBeNull();
+ await expect(writeModelCompactionWithRefresh(targets, 60, async () => { throw new Error('refresh failed'); }, async () => {})).rejects.toThrow('refresh failed');
+ expect(readModelCompactionPct('openai', 'gpt')).toBe(80);
+ await writeModelCompactionWithRefresh(targets, null, async () => {}, async () => {});
+ for (const [agent, model] of routes)
+ expect(resolveModelCompactionPct(BUNDLED_CATALOG, agent, 'openai', model)).toBe(90);
+ expect(readModelCompactionPct('openai', 'gpt')).toBeNull();
+ expect(readModelContextLimit('codex', 'openai', 'gpt')).toBe(272_000);
+ });
beforeEach(() => {
ownerId = 'test-owner';
fs.mkdirSync(path.dirname(PREFS), { recursive: true });
diff --git a/apps/desktop/src/main/maker-host/codex-context-window.ts b/apps/desktop/src/main/maker-host/codex-context-window.ts
index a8b1c9f2ff..75797f9e37 100644
--- a/apps/desktop/src/main/maker-host/codex-context-window.ts
+++ b/apps/desktop/src/main/maker-host/codex-context-window.ts
@@ -2,13 +2,20 @@ import fs from 'node:fs/promises';
import path from 'node:path';
import { parse as parseToml } from 'smol-toml';
import type { CodexContextWindowInfo } from '@cindy/maker-core';
-import { extractBundledCodexModelCatalog, findCodexCatalogModel, patchCodexModelMaxContextWindow, type CodexModelCatalog } from './codex-custom-context-catalog.js';
+import {
+ extractBundledCodexModelCatalog,
+ findCodexCatalogModel,
+ patchCodexModelMaxContextWindow,
+ type CodexModelCatalog,
+} from './codex-custom-context-catalog.js';
type RecordValue = Record<string, unknown>;
const positive = (value: unknown): value is number =>
typeof value === 'number' && Number.isSafeInteger(value) && value > 0;
const record = (value: unknown): RecordValue =>
- value !== null && typeof value === 'object' && !Array.isArray(value) ? value as RecordValue : {};
+ value !== null && typeof value === 'object' && !Array.isArray(value)
+ ? (value as RecordValue)
+ : {};
/** Native Codex metadata only: never consult Cindy's provider/model catalog. */
export function resolveCodexContextWindowInfo(
@@ -17,7 +24,11 @@ export function resolveCodexContextWindowInfo(
reportedUsableWindow?: number | null,
): CodexContextWindowInfo | null {
// Codex 0.153's model_info_from_slug uses these values for unknown model ids.
- const native = model ?? { context_window: 272_000, max_context_window: 272_000, effective_context_window_percent: 95 };
+ const native = model ?? {
+ context_window: 272_000,
+ max_context_window: 272_000,
+ effective_context_window_percent: 95,
+ };
const percentage = native.effective_context_window_percent ?? 95;
if (!positive(percentage) || percentage > 100) return null;
const maximum = positive(native.max_context_window) ? native.max_context_window : null;
@@ -29,17 +40,20 @@ export function resolveCodexContextWindowInfo(
// A running thread may have applied different config from the current defaults.
// Reconstruct its total using the native model's headroom, never a fixed UI /0.95.
const contextWindow = positive(reportedUsableWindow)
- ? Math.floor(configuredWindow * percentage / 100) === reportedUsableWindow
+ ? Math.floor((configuredWindow * percentage) / 100) === reportedUsableWindow
? configuredWindow
- : Math.round(reportedUsableWindow * 100 / percentage)
+ : Math.round((reportedUsableWindow * 100) / percentage)
: configuredWindow;
const configuredCompact = positive(config.model_auto_compact_token_limit)
? config.model_auto_compact_token_limit
- : positive(native.auto_compact_token_limit) ? native.auto_compact_token_limit : null;
+ : positive(native.auto_compact_token_limit)
+ ? native.auto_compact_token_limit
+ : null;
return {
contextWindow,
usableContextWindow: positive(reportedUsableWindow)
- ? reportedUsableWindow : Math.floor(contextWindow * percentage / 100),
+ ? reportedUsableWindow
+ : Math.floor((contextWindow * percentage) / 100),
autoCompactTokenLimit: Math.min(configuredCompact ?? Infinity, Math.floor(contextWindow * 0.9)),
modelMaxContextWindow: maximum,
source: positive(reportedUsableWindow) ? 'runtime' : 'config',
@@ -56,29 +70,44 @@ export async function readCodexContextWindowInfo(options: {
config?: RecordValue;
reportedUsableWindow?: number | null;
contextWindowOverride?: number | null;
+ compactionPctOverride?: number | null;
}): Promise<CodexContextWindowInfo | null> {
try {
let config = options.config;
if (!config) {
let text: string;
- try { text = await fs.readFile(path.join(options.codexHome, 'config.toml'), 'utf8'); }
- catch (error) {
+ try {
+ text = await fs.readFile(path.join(options.codexHome, 'config.toml'), 'utf8');
+ } catch (error) {
if ((error as NodeJS.ErrnoException).code !== 'ENOENT') throw error;
text = '';
}
config = record(parseToml(text));
if (typeof config.profile === 'string') {
- config = { ...config, ...record(parseToml(await fs.readFile(path.join(options.codexHome, `${config.profile}.config.toml`), 'utf8'))) };
+ config = {
+ ...config,
+ ...record(
+ parseToml(
+ await fs.readFile(
+ path.join(options.codexHome, `${config.profile}.config.toml`),
+ 'utf8',
+ ),
+ ),
+ ),
+ };
}
}
let catalog: RecordValue;
if (typeof config.model_catalog_json === 'string') {
const catalogPath = path.isAbsolute(config.model_catalog_json)
- ? config.model_catalog_json : path.resolve(options.codexHome, config.model_catalog_json);
+ ? config.model_catalog_json
+ : path.resolve(options.codexHome, config.model_catalog_json);
catalog = record(JSON.parse(await fs.readFile(catalogPath, 'utf8')));
} else {
try {
- catalog = record(JSON.parse(await fs.readFile(path.join(options.codexHome, 'models_cache.json'), 'utf8')));
+ catalog = record(
+ JSON.parse(await fs.readFile(path.join(options.codexHome, 'models_cache.json'), 'utf8')),
+ );
} catch {
if (!options.binaryPath) return null;
const stat = await fs.stat(options.binaryPath);
@@ -94,11 +123,32 @@ export async function readCodexContextWindowInfo(options: {
}
if (!Array.isArray(catalog.models)) return null;
if (positive(options.contextWindowOverride)) {
- catalog = patchCodexModelMaxContextWindow(catalog as CodexModelCatalog, options.modelId, options.contextWindowOverride);
- config = { ...config, model_context_window: options.contextWindowOverride,
- model_auto_compact_token_limit: Math.floor(options.contextWindowOverride * 0.9) };
+ catalog = patchCodexModelMaxContextWindow(
+ catalog as CodexModelCatalog,
+ options.modelId,
+ options.contextWindowOverride,
+ );
+ config = {
+ ...config,
+ model_context_window: options.contextWindowOverride,
+ model_auto_compact_token_limit: Math.floor(
+ options.contextWindowOverride * ((options.compactionPctOverride ?? 90) / 100),
+ ),
+ };
}
const model = findCodexCatalogModel(catalog as CodexModelCatalog, options.modelId);
+ // A percentage edit also applies when the user has not overridden the window.
+ // Only preview future settings here; a live thread keeps its captured native facts.
+ if (positive(options.compactionPctOverride) && !positive(options.reportedUsableWindow)) {
+ const preview = resolveCodexContextWindowInfo(model, config);
+ if (preview)
+ config = {
+ ...config,
+ model_auto_compact_token_limit: Math.floor(
+ (preview.contextWindow * options.compactionPctOverride) / 100,
+ ),
+ };
+ }
return resolveCodexContextWindowInfo(model, config, options.reportedUsableWindow);
} catch {
// No fabricated value when a configured native catalog cannot be read.
diff --git a/apps/desktop/src/main/maker-host/codex-custom-context-catalog.ts b/apps/desktop/src/main/maker-host/codex-custom-context-catalog.ts
index 862b206d4a..b44b2ea9cb 100644
--- a/apps/desktop/src/main/maker-host/codex-custom-context-catalog.ts
+++ b/apps/desktop/src/main/maker-host/codex-custom-context-catalog.ts
@@ -356,6 +356,7 @@ export async function prepareCodexCustomContextCatalog(params: {
modelIds?: readonly string[];
/** Same-provider budgets for native previous-model compaction after cold resume. */
resolveContextWindow?: (modelId: string) => number | null;
+ resolveCompactionPct?: (modelId: string) => number | null;
/** In-memory smart Subagent catalog to preserve in the one-session custom-context Host. */
baseCatalog?: unknown;
}): Promise<{ catalogPath: string; extraArgs: string[] }> {
@@ -378,7 +379,7 @@ export async function prepareCodexCustomContextCatalog(params: {
if (typeof window !== 'number' || !Number.isSafeInteger(window) || window <= 0) return model;
return { ...model, context_window: window,
max_context_window: Math.max(Number(model.max_context_window) || 0, window),
- auto_compact_token_limit: Math.max(1, Math.floor(window * 0.9)) };
+ auto_compact_token_limit: Math.max(1, Math.floor(window * ((params.resolveCompactionPct?.(model.slug) ?? 90) / 100))) };
});
const content = `${JSON.stringify(patched)}\n`;
const catalogPath = await persistCatalog(params.codexHome, content);
diff --git a/apps/desktop/src/main/maker-host/index.ts b/apps/desktop/src/main/maker-host/index.ts
index 1c76c72f62..3b56806205 100644
--- a/apps/desktop/src/main/maker-host/index.ts
+++ b/apps/desktop/src/main/maker-host/index.ts
@@ -205,7 +205,7 @@ import {
resolveVerifiedContextWindow,
resolveModelDefaultContextWindow,
} from './catalog-to-descriptors.js';
-import { readModelContextLimit } from './model-context-limit-store.js';
+import { readModelContextLimit, resolveModelCompactionPct } from './model-context-limit-store.js';
import { resolveDesktopModelContextProviderId, resolveDesktopModelEfforts, readStoredSessionContextWindowBudget, resolveConfiguredContextWindow, applySessionContextWindowBudgetToCreateOpts } from './model-context-settings.js';
import {
prepareCodexCustomContextCatalog,
@@ -1453,6 +1453,10 @@ export function getMaker(): Maker {
return source ? readModelContextLimit('claude-code', source, modelId)
?? resolveModelDefaultContextWindow(catalog, 'claude-code', source, modelId) : null;
},
+ resolveModelCompactionPct: (providerId, modelId) => {
+ const source = resolveDesktopModelContextProviderId(getDesktopSelectableCatalog(), 'claude-code', providerId, modelId);
+ return resolveModelCompactionPct(getDesktopSelectableCatalog(), 'claude-code', source, modelId);
+ },
resolveVerifiedContextWindow: (providerId, modelId) =>
resolveVerifiedContextWindow(getDesktopSelectableCatalog(), 'claude-code',
resolveDesktopModelContextProviderId(getDesktopSelectableCatalog(), 'claude-code', providerId, modelId), modelId),
@@ -1798,6 +1802,10 @@ export function getMaker(): Maker {
const source = resolveDesktopModelContextProviderId(getDesktopSelectableCatalog(), 'codex', providerId, modelId);
return source ? readModelContextLimit('codex', source, modelId) : null;
},
+ resolveModelCompactionPct: (providerId, modelId) => {
+ const source = resolveDesktopModelContextProviderId(getDesktopSelectableCatalog(), 'codex', providerId, modelId);
+ return resolveModelCompactionPct(getDesktopSelectableCatalog(), 'codex', source, modelId);
+ },
resolveVerifiedContextWindow: (providerId, modelId) =>
resolveVerifiedContextWindow(getDesktopSelectableCatalog(), 'codex',
resolveDesktopModelContextProviderId(getDesktopSelectableCatalog(), 'codex', providerId, modelId), modelId),
@@ -2111,6 +2119,7 @@ export function getMaker(): Maker {
modelId,
contextWindow,
modelIds: catalog.providers.find(provider => provider.id === source)?.models.codex?.map(model => model.id),
+ resolveCompactionPct: (id) => resolveModelCompactionPct(getDesktopSelectableCatalog(), 'codex', source, id),
resolveContextWindow: (nativeModelId) => {
return (source ? readModelContextLimit('codex', source, nativeModelId) : null)
?? resolveModelDefaultContextWindow(catalog, 'codex', source, nativeModelId);
diff --git a/apps/desktop/src/main/maker-host/model-context-limit-store.ts b/apps/desktop/src/main/maker-host/model-context-limit-store.ts
index 7897be3628..1f736437a3 100644
--- a/apps/desktop/src/main/maker-host/model-context-limit-store.ts
+++ b/apps/desktop/src/main/maker-host/model-context-limit-store.ts
@@ -6,13 +6,9 @@
*
* ## 这个设置解决什么
*
- * 自动压缩的触发是「已用 token / 上下文窗口 ≥ 阈值百分比」。阈值百分比用户能调
- * (设置 → 个性化,compaction-settings-store,默认 90),但**分母**是模型窗口,由路由钉死:
- * Claude 给 1M、GPT 给 272K,用户想「这个模型我只想用到 500K 就开始压缩」无从下手 ——
- * 调百分比会同时影响所有模型,且换算成 token 数还得自己算。
- *
- * 所以这里存的是**分母的用户上限**:运行时按显式值配置窗口与原生压缩预算。
- * 缺席时保持原有路由判定;不会把路由默认快照进本地偏好。
+ * 窗口上限与压缩比例在模型详情中设置:前者约束工作窗口,后者决定何时整理上下文。
+ * 压缩比例按供应商连接+规范模型 ID 保存,所有 Harness 共用;缺席时统一为 90%。
+ * 窗口缺席时保持原有路由判定,不把默认值快照进本地偏好。
*
* ## 为什么在 main 而不是 renderer localStorage
*
@@ -35,7 +31,11 @@
* 上限只挡明显荒谬的量级(MAX_LIMIT_TOKENS),避免写进一个天文数字让比例判定失效。
*/
-import type { AgentKind } from '@cindy/model-providers';
+import type { AgentKind, Catalog } from '@cindy/model-providers';
+import {
+ DEFAULT_MODEL_COMPACTION_PCT,
+ modelCompactionTarget,
+} from '../../shared/modelContextLimit.js';
import { desktopMakerLogger } from './logger-adapter.js';
import { createOverrideSettingsFile } from './override-settings-file.js';
@@ -59,6 +59,8 @@ const MAX_ENTRIES = 4096;
export interface ModelContextLimitPrefs {
limits: Record<string, number>;
+ /** JSON [providerId, canonicalModelId] keys; absent overrides use the shared 90% default. */
+ compactionPcts?: Record<string, number>;
}
const DEFAULTS: ModelContextLimitPrefs = { limits: {} };
@@ -105,18 +107,28 @@ function sanitizeLimits(raw: unknown): Record<string, number> {
function normalize(raw: unknown): ModelContextLimitPrefs {
if (!raw || typeof raw !== 'object') return { limits: {} };
- return { limits: sanitizeLimits((raw as { limits?: unknown }).limits) };
+ const input = raw as ModelContextLimitPrefs;
+ const compactionPcts = Object.fromEntries(
+ Object.entries(input.compactionPcts ?? {})
+ .filter(([key, value]) => key && Number.isInteger(value) && value >= 50 && value <= 90)
+ .slice(0, MAX_ENTRIES),
+ );
+ return {
+ limits: sanitizeLimits(input.limits),
+ ...(Object.keys(compactionPcts).length ? { compactionPcts } : {}),
+ };
}
-const createStore = (filePath: () => string) => createOverrideSettingsFile<ModelContextLimitPrefs>({
- filePath,
- defaults: DEFAULTS,
- normalize,
- log,
- label: 'model-context-limit',
- maxBytes: 1_048_576,
- preserveUnreadableFile: true,
-});
+const createStore = (filePath: () => string) =>
+ createOverrideSettingsFile<ModelContextLimitPrefs>({
+ filePath,
+ defaults: DEFAULTS,
+ normalize,
+ log,
+ label: 'model-context-limit',
+ maxBytes: 1_048_576,
+ preserveUnreadableFile: true,
+ });
let store = createStore(() => ownerScopedUserDataPath('model-context-limit-prefs.json'));
@@ -131,6 +143,70 @@ export function readModelContextLimits(): Record<string, number> {
return readPrefs().limits;
}
+export function readModelCompactionPct(providerId: string, modelId: string): number | null {
+ return readPrefs().compactionPcts?.[JSON.stringify([providerId, modelId])] ?? null;
+}
+
+/** All desktop harnesses use the same supplier/model policy, never the retired global sliders. */
+export function resolveModelCompactionPct(
+ catalog: Pick<Catalog, 'providers'>,
+ agent: AgentKind,
+ providerId: string | null | undefined,
+ modelId: string,
+): number {
+ const provider = catalog.providers.find((entry) => entry.id === providerId);
+ const target = provider ? modelCompactionTarget(provider, agent, modelId) : null;
+ return (
+ (target ? readModelCompactionPct(target.providerId, target.modelId) : null) ??
+ DEFAULT_MODEL_COMPACTION_PCT
+ );
+}
+
+/** Same owner-scoped file and existing provider mutation queue as window settings. */
+export async function writeModelCompactionWithRefresh(
+ targets: readonly { providerId: string; modelId: string }[],
+ pct: number | null,
+ refresh: () => Promise<void>,
+ refreshAfterRollback: () => Promise<void>,
+): Promise<void> {
+ if (pct !== null && (!Number.isInteger(pct) || pct < 50 || pct > 90))
+ throw new Error('invalid compaction percentage');
+ const filePath = ownerScopedUserDataPath('model-context-limit-prefs.json');
+ const previous = { ...readPrefs().compactionPcts };
+ const next = { ...previous };
+ for (const target of targets) {
+ if (!target.providerId || !target.modelId) throw new Error('invalid compaction target');
+ const key = JSON.stringify([target.providerId, target.modelId]);
+ if (pct === null) delete next[key];
+ else next[key] = pct;
+ }
+ if (Object.keys(next).length > MAX_ENTRIES)
+ throw new Error('compaction preference capacity exceeded');
+ store.writePatch({ compactionPcts: next });
+ try {
+ await refresh();
+ } catch (error) {
+ const originalStore = createStore(() => filePath);
+ const restored = { ...originalStore.read().compactionPcts };
+ for (const target of targets) {
+ const key = JSON.stringify([target.providerId, target.modelId]);
+ if ((restored[key] ?? null) !== pct) continue;
+ if (previous[key] === undefined) delete restored[key];
+ else restored[key] = previous[key];
+ }
+ originalStore.writePatch({ compactionPcts: restored });
+ store = createStore(() => ownerScopedUserDataPath('model-context-limit-prefs.json'));
+ if (ownerScopedUserDataPath('model-context-limit-prefs.json') === filePath) {
+ try {
+ await refreshAfterRollback();
+ } catch {
+ /* The saved policy is restored; surface the original failure. */
+ }
+ }
+ throw error;
+ }
+}
+
/** 某个 (引擎, 供应商, 模型) 的用户上限;未设过返回 null。 */
export function readModelContextLimit(
agent: AgentKind,
@@ -215,7 +291,10 @@ export async function writeModelContextLimitsWithRefresh(
}
// Earlier queue wakes may already have resumed handles with the rejected
// budget. Reconcile them only after restoring this owner's preferences.
- if (refreshAfterRollback && ownerScopedUserDataPath('model-context-limit-prefs.json') === filePath) {
+ if (
+ refreshAfterRollback &&
+ ownerScopedUserDataPath('model-context-limit-prefs.json') === filePath
+ ) {
try {
await refreshAfterRollback();
} catch (refreshError) {
@@ -230,7 +309,8 @@ export async function writeModelContextLimitsWithRefresh(
/** 清空全部上限 override(供应商级 / 整体「恢复默认」用)。 */
export function resetModelContextLimits(): void {
- store.reset();
+ store.invalidateIfChanged();
+ store.writePatch({ limits: {} });
}
export const __testing = {
diff --git a/apps/desktop/src/main/maker-host/pi-host.ts b/apps/desktop/src/main/maker-host/pi-host.ts
index 4873e53761..e7fdc91f86 100644
--- a/apps/desktop/src/main/maker-host/pi-host.ts
+++ b/apps/desktop/src/main/maker-host/pi-host.ts
@@ -34,7 +34,7 @@ import os from 'node:os';
import path from 'node:path';
import { app } from 'electron';
-import { readModelContextLimit } from './model-context-limit-store.js';
+import { readModelContextLimit, resolveModelCompactionPct } from './model-context-limit-store.js';
import { toolchainThreadCapEnv } from './toolchain-thread-cap.js';
import { inputHandoffTaskShellEnv } from '../input-handoff/askpass/index.js';
@@ -104,7 +104,7 @@ import businessOwnershipPrompt from './business-ownership-prompt.md?raw';
import piSystemPrompt from './pi-system-prompt.md?raw';
import { createLogger } from '../logger.js';
import { readMemorySettings } from './memory-settings-store.js';
-import { readPiCompactionPct } from './compaction-settings-store.js';
+import { DEFAULT_MODEL_COMPACTION_PCT } from '../../shared/modelContextLimit.js';
import { registerPiProxySession } from './pi-proxy-session-auth.js';
import { derivePiProxySessionToken } from './pi-proxy-session-token.js';
import {
@@ -876,7 +876,7 @@ function buildDesktopPiRuntimeConfig(): AgentRuntimeConfig {
userDataPath: app.getPath('userData'),
};
Object.defineProperty(config, 'piAutoCompactThresholdPct', {
- get: () => readPiCompactionPct(),
+ get: () => DEFAULT_MODEL_COMPACTION_PCT,
enumerable: true,
configurable: false,
});
@@ -1962,6 +1962,10 @@ export function buildPiAgent(opts: BuildPiAgentOpts): PiAgent | null {
return source ? readModelContextLimit('pi', source, modelId)
?? resolveModelDefaultContextWindow(catalog, 'pi', source, modelId) : null;
},
+ resolveModelCompactionPct: (providerId, modelId) => {
+ const source = resolveModelContextProviderId(getActiveCatalog(), 'pi', providerId, modelId);
+ return resolveModelCompactionPct(getActiveCatalog(), 'pi', source, modelId);
+ },
auth: desktopPiAuthAdapter,
runtimeConfig: buildDesktopPiRuntimeConfig(),
get binaryPath() { return resolvePiBinaryPath() ?? binaryPath; },
diff --git a/apps/desktop/src/main/maker-host/runtime-configs.ts b/apps/desktop/src/main/maker-host/runtime-configs.ts
index 0571037be4..00461aa2a0 100644
--- a/apps/desktop/src/main/maker-host/runtime-configs.ts
+++ b/apps/desktop/src/main/maker-host/runtime-configs.ts
@@ -28,7 +28,7 @@ import codexSystemPrompt from './codex-system-prompt.md?raw';
import hostSystemPrompt from './host-system-prompt.md?raw';
import businessOwnershipPrompt from './business-ownership-prompt.md?raw';
import skillSourcePrecedencePrompt from './skill-source-precedence-prompt.md?raw';
-import { readCompactionPct } from './compaction-settings-store.js';
+import { DEFAULT_MODEL_COMPACTION_PCT } from '../../shared/modelContextLimit.js';
import { readMemorySettings } from './memory-settings-store.js';
import { readSubagentModelSettings } from './subagent-model-settings-store.js';
import { shouldKeepSubagentOverrideForParent } from './subagent-override-route.js';
@@ -215,7 +215,7 @@ export function buildDesktopClaudeRuntimeConfig(endpointFn: () => string): Agent
configurable: false,
});
Object.defineProperty(config, 'autoCompactThresholdPct', {
- get: () => readCompactionPct(),
+ get: () => DEFAULT_MODEL_COMPACTION_PCT,
enumerable: true,
configurable: false,
});
@@ -225,7 +225,7 @@ export function buildDesktopClaudeRuntimeConfig(endpointFn: () => string): Agent
assessModelSwitchContext({
contextTokens,
targetContextWindow: contextWindow,
- autoCompactThresholdPct: readCompactionPct(),
+ autoCompactThresholdPct: DEFAULT_MODEL_COMPACTION_PCT,
}),
),
enumerable: true,
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.ts
index da58dc1863..ad1a7e34c1 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.ts
@@ -4594,6 +4594,29 @@ describe('model context limit IPC', () => {
const related = { providerId: 'openai', agent: 'claude-code' as const, modelId: 'chatgpt/gpt-6' };
const stamp = { dataOwnerId: 'owner-a', ownerGeneration: 1 };
+ it('saves model compaction for all aliases with owner and range validation', async () => {
+ const harness = new IpcHarness();
+ const writeModelCompaction = vi.fn(async () => {});
+ registerProviderHandlers(harness, makeDeps({
+ currentOwnerSession: () => ({ dataOwnerId: 'owner-a', generation: 1 }),
+ listProviders: async () => [catalogView('openai', { codex: ['gpt-6'], 'claude-code': ['chatgpt/gpt-6'] })],
+ readModelContextLimit: () => ({ limit: null, isCustomized: false }),
+ writeModelContextLimit: vi.fn(), writeModelCompaction,
+ readModelCompaction: () => ({ pct: 90, isCustomized: false }),
+ }));
+ const target = { ...primary, relatedTargets: [related] };
+ await expect(harness.invoke(MAKER_INVOKE.MODEL_CONTEXT_LIMIT_GET, target)).resolves.toMatchObject({
+ compaction: { pct: 90, isCustomized: false },
+ });
+ await harness.invoke(MAKER_INVOKE.MODEL_COMPACTION_SET, target, 80, stamp);
+ expect(writeModelCompaction).toHaveBeenCalledExactlyOnceWith([primary, related], 80);
+ for (const invalid of [49, 91, 80.5, '80', NaN]) {
+ await expect(harness.invoke(MAKER_INVOKE.MODEL_COMPACTION_SET, target, invalid, stamp)).rejects.toThrow();
+ }
+ await expect(harness.invoke(MAKER_INVOKE.MODEL_COMPACTION_SET, target, 70, { ...stamp, ownerGeneration: 0 })).rejects.toThrow();
+ expect(writeModelCompaction).toHaveBeenCalledTimes(1);
+ });
+
it('returns native facts separately from model preferences without writing or launching a task', async () => {
const harness = new IpcHarness();
const native = { contextWindow: 272_000, usableContextWindow: 258_400, autoCompactTokenLimit: 244_800,
diff --git a/apps/desktop/src/main/maker-ipc/channels.ts b/apps/desktop/src/main/maker-ipc/channels.ts
index bce1a1b7cf..d02d95f874 100644
--- a/apps/desktop/src/main/maker-ipc/channels.ts
+++ b/apps/desktop/src/main/maker-ipc/channels.ts
@@ -309,6 +309,7 @@ export const MAKER_INVOKE = {
* (远程改被控端全局设置越权)。
*/
MODEL_CONTEXT_LIMIT_GET: 'maker:model-context-limit:get',
+ MODEL_COMPACTION_SET: 'maker:model-compaction:set',
MODEL_CONTEXT_LIMIT_SET: 'maker:model-context-limit:set',
MODEL_CONTEXT_LIMIT_RESET: 'maker:model-context-limit:reset',
// 附加只读引用目录 — 走 closure 推送; DB 持久化由 renderer 同步调
diff --git a/apps/desktop/src/main/maker-ipc/providerHandlers.ts b/apps/desktop/src/main/maker-ipc/providerHandlers.ts
index a80e0ea839..a3ba08d246 100644
--- a/apps/desktop/src/main/maker-ipc/providerHandlers.ts
+++ b/apps/desktop/src/main/maker-ipc/providerHandlers.ts
@@ -483,10 +483,13 @@ export interface ProviderHandlerDeps {
readModelContextLimit?(target: ModelPriceOverrideTarget): ModelContextLimitView;
validateModelContextLimit?(targets: readonly ModelPriceOverrideTarget[], limit: number): Promise<void>;
writeModelContextLimit?(targets: readonly ModelPriceOverrideTarget[], limit: number | null): void | Promise<void>;
+ readModelCompaction?(target: ModelPriceOverrideTarget): { pct: number; isCustomized: boolean };
+ writeModelCompaction?(targets: readonly ModelPriceOverrideTarget[], pct: number | null): Promise<void>;
}
/** 上下文上限的读回视图(与写入返回同形,UI 一次拿齐当前值与是否自定义)。 */
export interface ModelContextLimitView {
+ compaction?: import('../../shared/modelContextLimit').ModelContextLimitView['compaction'];
mixed?: boolean;
limit: number | null;
isCustomized: boolean;
@@ -1890,7 +1893,9 @@ export function registerProviderHandlers(
const readContextTargets = (targets: ModelPriceOverrideTarget[]): ModelContextLimitView => {
const { read } = requireContextLimitDeps();
const views = targets.map(read);
+ const policy = deps.readModelCompaction?.(targets[0]!);
return {
+ ...(policy ? { compaction: policy } : {}),
limit: views.find((v) => v.limit !== null)?.limit ?? null,
isCustomized: views.some((v) => v.isCustomized),
mixed: views.some((v) => v.limit !== views[0]!.limit),
@@ -1921,6 +1926,28 @@ export function registerProviderHandlers(
return view;
});
+ registry.handle(
+ MAKER_INVOKE.MODEL_COMPACTION_SET,
+ async (event, input: unknown, pctInput: unknown, ownerInput: unknown) => {
+ assertTrustedProviderMutationSender(event);
+ assertContextOwner(ownerInput);
+ const targets = parseContextTargets(input);
+ if (pctInput !== null && (typeof pctInput !== 'number' || !Number.isInteger(pctInput) || pctInput < 50 || pctInput > 90)) {
+ throwIpcError('INVALID_PARAMS', 'compaction percentage must be 50–90 or null');
+ }
+ if (!deps.writeModelCompaction) throwIpcError('INTERNAL', 'model compaction settings unavailable');
+ const ownerAtIngress = captureProviderOwnerSession();
+ return withProviderConfigMutation(targets[0]!.providerId, () => enqueuePriceMutation(async () => {
+ if (pctInput !== null) for (const target of targets) await requirePriceTargetModel(target);
+ assertProviderMutationOwner(ownerAtIngress, 'active account changed before setting compaction');
+ await deps.writeModelCompaction!(targets, pctInput as number | null);
+ assertProviderMutationOwner(ownerAtIngress, 'active account changed after setting compaction');
+ deps.broadcastChanged();
+ return readContextTargets(targets);
+ }));
+ },
+ );
+
registry.handle(
MAKER_INVOKE.MODEL_CONTEXT_LIMIT_SET,
async (event, targetInput: unknown, limitInput: unknown, ownerInput: unknown) => {
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index 75d4a1112b..7ac24e6a13 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -1199,11 +1199,14 @@ import {
} from '../maker-host/session-provider-store.js';
import { getActiveCatalog, setDiscoveredProviderModels } from '../maker-host/active-catalog.js';
import { createSubscriptionFastPolicy } from '../maker-host/subscription-fast-policy.js';
-import { readCompactionPct } from '../maker-host/compaction-settings-store.js';
+import { DEFAULT_MODEL_COMPACTION_PCT, modelCompactionTarget } from '../../shared/modelContextLimit.js';
import { resolveVerifiedContextWindow, resolveModelDefaultContextWindow } from '../maker-host/catalog-to-descriptors.js';
import {
isModelContextLimitCustomized,
readModelContextLimit,
+ readModelCompactionPct,
+ resolveModelCompactionPct,
+ writeModelCompactionWithRefresh,
writeModelContextLimitsWithRefresh,
} from '../maker-host/model-context-limit-store.js';
import { refreshAnthropicModelsFromProbe } from '../maker-host/model-discovery/anthropic.js';
@@ -7631,6 +7634,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
codexHome: getCodexHome(),
binaryPath: getCachedBinaryStatus('codex').binaryPath,
modelId: target.modelId,
+ compactionPctOverride: resolveModelCompactionPct(getActiveCatalog(), 'codex', target.providerId, target.modelId),
contextWindowOverride: readModelContextLimit('codex', target.providerId, target.modelId)
?? resolveModelDefaultContextWindow(getDesktopSelectableCatalog(), 'codex', target.providerId, target.modelId),
});
@@ -7646,6 +7650,35 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
target.modelId,
),
}),
+ readModelCompaction: (target) => {
+ const provider = getActiveCatalog().providers.find((entry) => entry.id === target.providerId);
+ const identity = provider ? modelCompactionTarget(provider, target.agent, target.modelId) : target;
+ const pct = readModelCompactionPct(identity.providerId, identity.modelId);
+ return { pct: pct ?? DEFAULT_MODEL_COMPACTION_PCT, isCustomized: pct !== null };
+ },
+ writeModelCompaction: (targets, pct) => {
+ const catalog = getActiveCatalog();
+ const identities = targets.map((target) => {
+ const provider = catalog.providers.find((entry) => entry.id === target.providerId);
+ return provider ? modelCompactionTarget(provider, target.agent, target.modelId) : target;
+ });
+ // Even an edit sent through one harness changes every alias of this model.
+ // Pass explicit targets so unchanged window sizes still reload the new percentage.
+ const affectedTargets = [...targets];
+ for (const provider of catalog.providers) {
+ for (const agent of ['claude-code', 'codex', 'pi'] as const) {
+ for (const model of provider.models[agent] ?? []) {
+ const identity = modelCompactionTarget(provider, agent, model.id);
+ if (identities.some((entry) => entry.providerId === identity.providerId && entry.modelId === identity.modelId)) {
+ affectedTargets.push({ agent, providerId: provider.id, modelId: model.id });
+ }
+ }
+ }
+ }
+ return writeModelCompactionWithRefresh(
+ identities, pct, () => refreshContextSettings(affectedTargets), () => refreshContextSettings(affectedTargets),
+ );
+ },
validateModelContextLimit: async (targets, limit) => {
const localTargets = targets.filter((target) => target.providerId === MANAGED_LLAMACPP_PROVIDER_ID);
if (localTargets.length) {
@@ -18480,7 +18513,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
}
return result;
},
- getAutoCompactThresholdPct: () => readCompactionPct(),
+ getAutoCompactThresholdPct: () => DEFAULT_MODEL_COMPACTION_PCT,
resolveVerifiedWindow: (agentKind, modelId, providerId) => {
const catalog = getActiveCatalog();
const makerAgentKind = dbToMakerAgentKind(agentKind);
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index 4c67aa02ea..3d484367c2 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -6793,6 +6793,12 @@ contextBridge.exposeInMainWorld('electronAPI', {
target: import('../shared/modelContextLimit').ModelContextLimitTarget,
): Promise<import('../shared/modelContextLimit').ModelContextLimitView> =>
ipcRenderer.invoke('maker:model-context-limit:get', target),
+ setModelCompaction: (
+ target: import('../shared/modelContextLimit').ModelContextLimitTarget,
+ pct: number | null,
+ owner: import('../shared/modelContextLimit').ModelContextLimitOwner,
+ ): Promise<import('../shared/modelContextLimit').ModelContextLimitView> =>
+ ipcRenderer.invoke('maker:model-compaction:set', target, pct, owner),
/**
* 任务窗口档位表的**权威边界**(路由默认 / 路由物理上限 / 该路由模型级上限)。
* 与运行期收敛同源、与 device-link 的 maker:get-context-window-bounds 同一 handler:
diff --git a/apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx b/apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx
index b2ec6ae104..68ac7664a2 100644
--- a/apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx
+++ b/apps/desktop/src/renderer/components/settings/ModelAdvancedDrawer.tsx
@@ -39,6 +39,7 @@ import { ClaudeMark } from '@/components/icons/ClaudeMark';
import { CodexMark } from '@/components/icons/CodexMark';
import { PiMark } from '@/components/icons/PiMark';
import { useModelContextLimit } from '@/hooks/useModelContextLimit';
+import { ModelCompactionSettings } from './ModelCompactionSettings';
import { modelPriceDetailRows, type ModelPricePresentation } from '@/lib/modelPriceFormat';
import {
isModelEnabled,
@@ -866,6 +867,11 @@ export function ModelAdvancedDrawer({
)}
</>
)}
+ {ctx.compaction && (
+ <ModelCompactionSettings policy={ctx.compaction}
+ disabled={paymentRequired || ctx.loading || localConfigurationBlocked}
+ onChange={ctx.setCompaction} />
+ )}
</Section>
)}
diff --git a/apps/desktop/src/renderer/components/settings/ModelCompactionSettings.tsx b/apps/desktop/src/renderer/components/settings/ModelCompactionSettings.tsx
new file mode 100644
index 0000000000..49c5f3e51d
--- /dev/null
+++ b/apps/desktop/src/renderer/components/settings/ModelCompactionSettings.tsx
@@ -0,0 +1,70 @@
+import { useTranslation } from 'react-i18next';
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+ DropdownMenuContent,
+ DropdownMenuRadioGroup,
+ DropdownMenuRadioItem,
+} from '@/components/ui/dropdown-menu';
+import type { ModelContextLimitView } from '../../../shared/modelContextLimit';
+
+/** One supplier/model preference shared by every harness. */
+export function ModelCompactionSettings({
+ policy,
+ disabled,
+ onChange,
+}: {
+ policy: NonNullable<ModelContextLimitView['compaction']>;
+ disabled: boolean;
+ onChange: (pct: number | null) => Promise<void>;
+}) {
+ const { t } = useTranslation();
+ const key = 'settings.providers.models.advanced.compaction';
+ const value = policy.isCustomized ? String(policy.pct) : 'default';
+ const values = [...new Set([50, 60, 70, 80, 85, 90, policy.pct])].sort((a, b) => a - b);
+ return (
+ <details
+ className="mt-3 border-t border-[var(--settings-theme-card-border)] pt-3"
+ data-model-compaction
+ >
+ <summary className="cursor-pointer text-12 font-medium text-[var(--text-secondary)]">
+ {t(`${key}.title`)}
+ </summary>
+ <p className="mt-2 text-12 leading-relaxed text-[var(--text-secondary)]">
+ {t(`${key}.hint`)}
+ </p>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <button
+ type="button"
+ disabled={disabled}
+ className="mt-2 inline-flex min-h-7 items-center gap-2 rounded-full border border-[var(--settings-theme-card-border)] px-3 text-12 disabled:opacity-50"
+ >
+ {policy.isCustomized ? `${policy.pct}%` : t(`${key}.default`, { pct: policy.pct })}
+ <span aria-hidden="true">⌄</span>
+ </button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent className="z-[10003]" align="start">
+ <DropdownMenuRadioGroup
+ value={value}
+ onValueChange={(next) => {
+ void onChange(next === 'default' ? null : Number(next));
+ }}
+ >
+ <DropdownMenuRadioItem value="default">
+ {t('settings.providers.models.advanced.restoreDefault')}
+ </DropdownMenuRadioItem>
+ {values.map((pct) => (
+ <DropdownMenuRadioItem key={pct} value={String(pct)}>
+ {pct}%
+ </DropdownMenuRadioItem>
+ ))}
+ </DropdownMenuRadioGroup>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ <p className="mt-2 text-11 leading-relaxed text-[var(--text-secondary)]">
+ {t(`${key}.timing`)}
+ </p>
+ </details>
+ );
+}
diff --git a/apps/desktop/src/renderer/components/settings/PersonalizationDetails.settings-search.ts b/apps/desktop/src/renderer/components/settings/PersonalizationDetails.settings-search.ts
index 8289b9872c..a33d7046c9 100644
--- a/apps/desktop/src/renderer/components/settings/PersonalizationDetails.settings-search.ts
+++ b/apps/desktop/src/renderer/components/settings/PersonalizationDetails.settings-search.ts
@@ -14,9 +14,6 @@ export default {
{ id: 'settings.auxiliaryModels.preferred.label', fallbackTargetId: 'settings-search-target-personalization-auxiliary-models', tab: 'personalization', targetId: 'settings-search-target-personalization-auxiliary-models', titleKey: 'settings.auxiliaryModels.preferred.label', sectionKey: 'settings.sections.auxiliaryModels' },
{ id: 'settings.auxiliaryModels.fallback1.label', fallbackTargetId: 'settings-search-target-personalization-auxiliary-models', tab: 'personalization', targetId: 'settings-search-target-personalization-auxiliary-models', titleKey: 'settings.auxiliaryModels.fallback1.label', sectionKey: 'settings.sections.auxiliaryModels' },
{ id: 'settings.auxiliaryModels.fallback2.label', fallbackTargetId: 'settings-search-target-personalization-auxiliary-models', tab: 'personalization', targetId: 'settings-search-target-personalization-auxiliary-models', titleKey: 'settings.auxiliaryModels.fallback2.label', sectionKey: 'settings.sections.auxiliaryModels' },
- { id: 'settings.compaction.title', fallbackTargetId: 'settings-search-target-personalization-compaction', tab: 'personalization', targetId: 'settings-search-target-personalization-compaction', titleKey: 'settings.compaction.title', sectionKey: 'settings.sections.compaction', aliases: ['compaction', '上下文压缩'] },
- { id: 'settings.compaction.card', fallbackTargetId: 'settings-search-target-personalization-compaction', tab: 'personalization', targetId: 'settings-search-target-personalization-compaction', titleKey: 'settings.compaction.card', sectionKey: 'settings.sections.compaction' },
- { id: 'settings.compaction.piCard', fallbackTargetId: 'settings-search-target-personalization-compaction', tab: 'personalization', targetId: 'settings-search-target-personalization-compaction', titleKey: 'settings.compaction.piCard', sectionKey: 'settings.sections.compaction' },
{ id: 'settings.terminalShell.card.label', fallbackTargetId: 'settings-search-target-personalization-terminal-shell', tab: 'personalization', targetId: 'settings-search-target-personalization-terminal-shell', titleKey: 'settings.terminalShell.card.label', sectionKey: 'settings.sections.terminalShell', aliases: ['terminal', 'shell', '终端'] },
{ id: 'settings.linkOpen.web.label', fallbackTargetId: 'settings-search-target-personalization-link-open', tab: 'personalization', targetId: 'settings-search-target-personalization-link-open', titleKey: 'settings.linkOpen.web.label', sectionKey: 'settings.sections.linkOpen', aliases: ['open in sidebar', '内置侧栏'] },
{ id: 'settings.linkOpen.local.label', fallbackTargetId: 'settings-search-target-personalization-link-open', tab: 'personalization', targetId: 'settings-search-target-personalization-link-open', titleKey: 'settings.linkOpen.local.label', sectionKey: 'settings.sections.linkOpen', aliases: ['open externally', '系统浏览器'] },
diff --git a/apps/desktop/src/renderer/components/settings/PersonalizationSettings.settings-search.ts b/apps/desktop/src/renderer/components/settings/PersonalizationSettings.settings-search.ts
index 70509a7941..2837b29fec 100644
--- a/apps/desktop/src/renderer/components/settings/PersonalizationSettings.settings-search.ts
+++ b/apps/desktop/src/renderer/components/settings/PersonalizationSettings.settings-search.ts
@@ -12,7 +12,6 @@ export default {
{ id: 'personalization.auxiliaryModels', tab: 'personalization', targetId: 'settings-search-target-personalization-auxiliary-models', titleKey: 'settings.sections.auxiliaryModels', sectionKey: 'settings.sections.auxiliaryModels' },
{ id: 'personalization.visionBridge', tab: 'personalization', targetId: 'settings-search-target-personalization-vision-bridge', titleKey: 'settings.sections.visionBridge', sectionKey: 'settings.sections.visionBridge' },
{ id: 'personalization.contacts', tab: 'personalization', targetId: 'settings-contacts', titleKey: 'settings.contacts.title', sectionKey: 'settings.contacts.title' },
- { id: 'personalization.compaction', tab: 'personalization', targetId: 'settings-search-target-personalization-compaction', titleKey: 'settings.sections.compaction', sectionKey: 'settings.sections.compaction' },
{ id: 'personalization.terminalShell', tab: 'personalization', targetId: 'settings-search-target-personalization-terminal-shell', titleKey: 'settings.sections.terminalShell', sectionKey: 'settings.sections.terminalShell', aliases: ['terminal', 'shell', '终端'] },
{ id: 'personalization.linkOpen', tab: 'personalization', targetId: 'settings-search-target-personalization-link-open', titleKey: 'settings.sections.linkOpen', sectionKey: 'settings.sections.linkOpen' },
{ id: 'personalization.tips', tab: 'personalization', targetId: 'settings-search-target-personalization-tips', titleKey: 'settings.sections.compatMode', sectionKey: 'settings.sections.compatMode' },
diff --git a/apps/desktop/src/renderer/components/settings/ProvidersSection.settings-search.ts b/apps/desktop/src/renderer/components/settings/ProvidersSection.settings-search.ts
index 9fc00c7094..32fef4fd8f 100644
--- a/apps/desktop/src/renderer/components/settings/ProvidersSection.settings-search.ts
+++ b/apps/desktop/src/renderer/components/settings/ProvidersSection.settings-search.ts
@@ -5,6 +5,7 @@ export default {
id: 'providers',
order: 5,
entries: [
+ { id: 'model-compaction', tab: 'providers', targetId: 'settings-panel-providers', titleKey: 'settings.providers.models.advanced.compaction.title', sectionKey: 'settings.tabs.providers', aliases: ['compaction', '上下文压缩', '压缩比例'] },
{ id: 'providers', tab: 'providers', targetId: 'settings-panel-providers', titleKey: 'settings.tabs.providers', sectionKey: 'settings.sections.providers' },
{ id: 'settings.providers.addProvider', fallbackTargetId: 'settings-panel-providers', tab: 'providers', targetId: 'settings-search-settings-providers-addProvider', titleKey: 'settings.providers.addProvider', sectionKey: 'settings.tabs.providers' },
],
diff --git a/apps/desktop/src/renderer/components/settings/SettingsView.tsx b/apps/desktop/src/renderer/components/settings/SettingsView.tsx
index 69b73d18f8..3d4f43398f 100644
--- a/apps/desktop/src/renderer/components/settings/SettingsView.tsx
+++ b/apps/desktop/src/renderer/components/settings/SettingsView.tsx
@@ -45,7 +45,6 @@ import { WorktreeRecycleCard } from './WorktreeRecycleCard';
import { StorageManagementCard } from './StorageManagementCard';
import { UserPromptSection } from './UserPromptSection';
import { MemorySection } from './MemorySection';
-import { CompactionSection } from './CompactionSection';
import { TerminalShellSection } from './TerminalShellSection';
import { LinkOpenSection } from './LinkOpenSection';
import { StreamFadeSection } from './StreamFadeSection';
@@ -539,9 +538,6 @@ export function SettingsView() {
>
<ContactsSection key={`contacts:${dataOwnerId ?? 'none'}`} />
</section>
- <section id="settings-search-target-personalization-compaction" className="pb-[18px]" aria-label={t('settings.sections.compaction')}>
- <CompactionSection key={`compaction:${mode}:${dataOwnerId ?? 'none'}`} />
- </section>
{/* RSB 默认终端 shell —— 改默认只影响新建 tab,已有 tab 不动 */}
<section id="settings-search-target-personalization-terminal-shell" className="pb-[18px]" aria-label={t('settings.sections.terminalShell')}>
<TerminalShellSection />
diff --git a/apps/desktop/src/renderer/components/settings/UnifiedModelList.tsx b/apps/desktop/src/renderer/components/settings/UnifiedModelList.tsx
index 27fc38e5ad..8516e4783d 100644
--- a/apps/desktop/src/renderer/components/settings/UnifiedModelList.tsx
+++ b/apps/desktop/src/renderer/components/settings/UnifiedModelList.tsx
@@ -88,6 +88,7 @@ import {
resolveModelIconKind,
} from '@cindy/model-providers';
import type { AgentKind, CatalogModel, ProviderView } from '@cindy/model-providers';
+import { modelCompactionTarget } from '../../../shared/modelContextLimit';
const AGENT_LABEL: Record<AgentKind, string> = {
'claude-code': 'Claude Code',
@@ -175,10 +176,7 @@ export interface UnionModelRow {
* 否则并集出现两行、各自被误标单端。
*/
function canonicalModelKey(provider: ProviderView, agent: AgentKind, id: string): string {
- for (const prefix of provider.routing[agent]?.modelPrefixes ?? []) {
- if (id.startsWith(prefix)) return id.slice(prefix.length);
- }
- return id;
+ return modelCompactionTarget(provider, agent, id).modelId;
}
/** 构建并集(导出供单测):行序 = 第一个 agent 的目录序,后续 agent 独占模型追加其后;
diff --git a/apps/desktop/src/renderer/components/status/ContextCapacityRing.tsx b/apps/desktop/src/renderer/components/status/ContextCapacityRing.tsx
new file mode 100644
index 0000000000..a6b34d5543
--- /dev/null
+++ b/apps/desktop/src/renderer/components/status/ContextCapacityRing.tsx
@@ -0,0 +1,278 @@
+import { useState, type ComponentProps } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Tip } from '@/components/ui/tooltip';
+import { useCodexContextWindow } from '@/hooks/useCodexContextWindow';
+import { getModelsForVendor } from '@/lib/modelDefinitions';
+import { resolveDisplayContextWindow } from '@/lib/contextWindow';
+import { ContextWindowBudgetChip } from './ContextWindowBudgetChip';
+
+/** Format a token count with K/M suffix: 200000 → "200K", 1000000 → "1M". */
+export function formatTokenCount(n: number): string {
+ if (n >= 1_000_000) {
+ const m = n / 1_000_000;
+ return `${Number.isInteger(m) ? m : m.toFixed(1)}M`;
+ }
+ if (n >= 1_000) {
+ const k = n / 1_000;
+ return `${Number.isInteger(k) ? k : k.toFixed(1)}K`;
+ }
+ return n.toString();
+}
+
+/**
+ * 从 maker capabilities cache 查模型 contextWindow。
+ * 拿不到时返回 undefined,由 display resolver 兜底到 200K。
+ */
+export function getModelContextWindow(
+ model: string,
+ vendorKey: 'cc' | 'codex' | 'pi',
+ deviceId?: string,
+): number | undefined {
+ const found = getModelsForVendor(vendorKey, deviceId).find((m) => m.id === model);
+ return found?.contextWindow;
+}
+
+export function ContextCapacityRing({
+ isRunning,
+ sessionId,
+ providerId,
+ contextTokens,
+ model,
+ vendorKey,
+ sdkContextWindow,
+ verifiedContextWindow,
+ deviceId,
+ onCompact,
+ providers,
+ disabled,
+}: {
+ isRunning?: boolean;
+ sessionId?: string;
+ providerId?: string | null;
+ contextTokens: number;
+ model: string;
+ vendorKey: 'cc' | 'codex' | 'pi';
+ /** SDK-reported context window; 0 = not yet known → use hardcoded fallback. */
+ sdkContextWindow: number;
+ verifiedContextWindow?: number | null;
+ /** device-link 远程会话所属被控端 id;按被控端能力查 contextWindow(本机会话 undefined,行为不变)。 */
+ deviceId?: string;
+ /** 提供时在圆环浮层里显示手动压缩操作,沿用已有确认流程。 */
+ onCompact?: () => void;
+ providers?: ComponentProps<typeof ContextWindowBudgetChip>['providers'];
+ disabled?: boolean;
+}) {
+ const { t } = useTranslation();
+ const [contextInspection, setContextInspection] = useState(0);
+ const codexContext = useCodexContextWindow({
+ enabled: vendorKey === 'codex' && !deviceId && Boolean(sessionId),
+ providerId,
+ modelId: model,
+ sessionId,
+ reportedWindow: sdkContextWindow,
+ refreshKey: `${isRunning}:${contextInspection}`,
+ });
+ const contextWindow = resolveDisplayContextWindow({
+ sdkContextWindow,
+ verifiedContextWindow,
+ runtimeWindowAuthoritative: vendorKey === 'codex',
+ nativeContextWindow: codexContext?.contextWindow,
+ nativeContextPending: codexContext?.pendingApply,
+ modelContextWindow: getModelContextWindow(model, vendorKey, deviceId),
+ });
+ const pct =
+ contextWindow > 0
+ ? Math.min(Math.max(Math.round((contextTokens / contextWindow) * 100), 0), 100)
+ : 0;
+
+ // Ring geometry: outer diameter 20px, strokeWidth 2.5
+ const size = 20;
+ const strokeWidth = 2.5;
+ const radius = (size - strokeWidth) / 2; // 8.75
+ const circumference = 2 * Math.PI * radius;
+ const dashOffset = circumference - (circumference * pct) / 100;
+
+ // Color thresholds per spec
+ const fillColor =
+ pct > 90
+ ? 'var(--error-flat)'
+ : pct > 70
+ ? 'var(--warning-fg)'
+ : 'var(--msg-tool-card-chevron)';
+
+ const usedTokens = Math.max(0, contextTokens);
+ const tooltipText =
+ contextWindow > 0
+ ? `Context — ${formatTokenCount(usedTokens)} / ${formatTokenCount(contextWindow)} (${pct}%)`
+ : 'No context data yet';
+
+ const ringContent = (
+ <>
+ <svg
+ width={size}
+ height={size}
+ viewBox={`0 0 ${size} ${size}`}
+ className="shrink-0"
+ aria-hidden="true"
+ focusable="false"
+ >
+ {/* Track (background circle) */}
+ <circle
+ cx={size / 2}
+ cy={size / 2}
+ r={radius}
+ fill="none"
+ stroke="var(--msg-tool-card-border)"
+ strokeWidth={strokeWidth}
+ />
+ {/* Fill arc — starts at 12 o'clock, sweeps clockwise */}
+ <circle
+ cx={size / 2}
+ cy={size / 2}
+ r={radius}
+ fill="none"
+ stroke={fillColor}
+ strokeWidth={strokeWidth}
+ strokeDasharray={circumference}
+ strokeDashoffset={dashOffset}
+ strokeLinecap="round"
+ transform={`rotate(-90 ${size / 2} ${size / 2})`}
+ />
+ </svg>
+ <span className="text-12 font-medium leading-none" style={{ color: fillColor }}>
+ {contextWindow > 0 ? `${pct}%` : '—'}
+ </span>
+ </>
+ );
+
+ const statusKey =
+ contextWindow <= 0 ? 'unknown' : pct > 90 ? 'nearLimit' : pct > 70 ? 'elevated' : 'available';
+ const details = (
+ <div className="space-y-4">
+ <div>
+ <p className="text-11 font-medium tracking-widest text-[var(--text-tertiary)]">CONTEXT</p>
+ <h3 className="mt-1 text-16 font-medium text-[var(--text-primary)]">
+ {t('ccAgent.contextRingPanel.title')}
+ </h3>
+ <p className="mt-1.5 text-12 leading-relaxed text-[var(--text-secondary)]">
+ {t('ccAgent.contextRingPanel.meaning')}
+ </p>
+ </div>
+ <div>
+ <div className="flex items-end justify-between gap-3">
+ <div className="flex items-baseline gap-1 tabular-nums text-[var(--text-primary)]">
+ <span className="text-28 font-medium leading-none tracking-tight">
+ {contextWindow > 0 ? pct : '—'}
+ </span>
+ {contextWindow > 0 && <span className="text-16">%</span>}
+ <span className="ml-1 text-12 text-[var(--text-secondary)]">
+ {t('ccAgent.contextRingPanel.used')}
+ </span>
+ </div>
+ <span className="text-12 font-medium" style={{ color: fillColor }}>
+ {t(`ccAgent.contextRingPanel.${statusKey}`)}
+ </span>
+ </div>
+ {contextWindow > 0 && (
+ <>
+ <div
+ role="progressbar"
+ aria-label={t('ccAgent.contextRingPanel.used')}
+ aria-valuemin={0}
+ aria-valuemax={100}
+ aria-valuenow={pct}
+ className="mt-3 h-1.5 overflow-hidden rounded-full bg-[var(--msg-tool-card-border)]"
+ >
+ <div
+ className="h-full rounded-full"
+ style={{ width: `${pct}%`, backgroundColor: fillColor }}
+ />
+ </div>
+ <p className="mt-2 text-11 tabular-nums text-[var(--text-secondary)]">
+ {t('ccAgent.contextRingPanel.tokens', {
+ used: formatTokenCount(usedTokens),
+ total: formatTokenCount(contextWindow),
+ })}
+ </p>
+ </>
+ )}
+ {(contextWindow <= 0 || pct <= 70) && (
+ <p className="mt-2 text-12 leading-relaxed text-[var(--text-secondary)]">
+ {t(`ccAgent.contextRingPanel.${contextWindow <= 0 ? 'unknownHint' : 'continueHint'}`)}
+ </p>
+ )}
+ </div>
+ {vendorKey === 'codex' && (
+ <div className="border-t border-[var(--border-default)] pt-3">
+ <p className="text-12 font-medium text-[var(--text-primary)]">
+ {t('ccAgent.contextRingPanel.auto')}
+ </p>
+ <p className="mt-1 text-12 leading-relaxed text-[var(--text-secondary)]">
+ {t('ccAgent.contextRingPanel.autoHelp')}
+ </p>
+ {codexContext?.pendingApply && (
+ <p className="mt-1 text-12 text-[var(--warning-fg)]">
+ {t('ccAgent.layout.contextRing.codexPendingHint')}
+ </p>
+ )}
+ <details className="mt-2 text-11 text-[var(--text-secondary)]">
+ <summary className="cursor-pointer">{t('ccAgent.contextRingPanel.technical')}</summary>
+ <p className="mt-1 leading-relaxed">
+ {codexContext
+ ? t('settings.providers.models.advanced.codexContextValues', {
+ total: codexContext.contextWindow.toLocaleString(),
+ usable: codexContext.usableContextWindow.toLocaleString(),
+ compact: codexContext.autoCompactTokenLimit.toLocaleString(),
+ })
+ : t('settings.providers.models.advanced.codexContextUnknown')}
+ </p>
+ </details>
+ </div>
+ )}
+ </div>
+ );
+
+ if (sessionId) {
+ return (
+ <ContextWindowBudgetChip
+ sessionId={sessionId}
+ contextTokens={contextTokens}
+ model={model}
+ providerId={providerId}
+ agentKind={vendorKey}
+ providers={providers}
+ deviceId={deviceId}
+ disabled={disabled}
+ details={details}
+ onInspect={vendorKey === 'codex' ? () => setContextInspection((n) => n + 1) : undefined}
+ onCompact={onCompact}
+ >
+ {ringContent}
+ </ContextWindowBudgetChip>
+ );
+ }
+
+ return (
+ <Tip text={tooltipText}>
+ {onCompact ? (
+ <button
+ type="button"
+ onClick={onCompact}
+ aria-label={t('ccAgent.layout.contextRing.compactHint')}
+ className="flex shrink-0 cursor-pointer items-center gap-1 transition-opacity hover:opacity-75 active:opacity-60"
+ >
+ {ringContent}
+ </button>
+ ) : (
+ <div
+ className="flex shrink-0 items-center gap-1"
+ onMouseEnter={() => {
+ if (vendorKey === 'codex') setContextInspection((n) => n + 1);
+ }}
+ >
+ {ringContent}
+ </div>
+ )}
+ </Tip>
+ );
+}
diff --git a/apps/desktop/src/renderer/components/status/ContextWindowBudgetChip.tsx b/apps/desktop/src/renderer/components/status/ContextWindowBudgetChip.tsx
index 96ac85f9d6..6e25bab5f2 100644
--- a/apps/desktop/src/renderer/components/status/ContextWindowBudgetChip.tsx
+++ b/apps/desktop/src/renderer/components/status/ContextWindowBudgetChip.tsx
@@ -1,8 +1,8 @@
/**
- * ContextWindowBudgetChip — 任务级工作上下文窗口档位选择。
+ * ContextWindowBudgetChip — 上下文圆环的详情与任务窗口档位浮层。
*
* 语义(与 main 侧 `model-context-settings.ts` 同一口径):
- * - 档位决定**本任务**的工作窗口(分母);全局的自动压缩阈值百分比不动。
+ * - 档位决定**本任务**的工作窗口(分母);模型的自动压缩阈值百分比不动。
* - 「跟随模型默认」= 上报 null,不把当前默认值快照进任务。
* - 有效窗口还受用户在同一路由上设过的模型级上限与目录物理上限约束(由 main 收敛),
* 所以这里展示的是**选择**,运行时真值仍以圆环的窗口读数为准。
@@ -14,6 +14,7 @@
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import type * as React from 'react';
import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
@@ -49,22 +50,12 @@ import { getModelPriceQuote } from '../../../shared/modelPriceQuote';
import type { Catalog } from '@cindy/model-providers';
import type { ModelPriceQuote } from '../../../shared/regionalMoney';
-/**
- * 触发器上的标记:一枚「上下双向箭头」符号 + 当前档位百分比(用户拍板)—— 底栏不挂文字标签,
- * 但百分比要看得见(它是「这个任务用多大窗口」的相对口径)。用 ↕ 而不是方括号:方括号语义不明确
- * (读不出"窗口大小"),↕ 至少表达"可上可下 / 可调"。
- * 当前档位的绝对值仍进 `aria-label`(`triggerLabel`)与卡片行(`aria-checked` 命中的那一行)。
- *
- * 它是普通文本(不是图标、也不是括号),与 `¥`、圆环 `1%` 同基线、同字重、同颜色层
- * (`opacity-60`,与货币符号完全一致)。
- *
- * 字号用 `text-11`(用户拍板,`text-10` 略小):箭头字形天生比数字高 —— 12px 下 `↕` 墨迹 12px
- * (上缘 11 / 下缘 1),而 `¥` 是 9/0、圆环 `1%` 是 9/1;11px 下墨迹 ≈11px(10.1/0.9),
- * 与两个邻居同一基线、同一中心线,观感上也和它们的**字面**大小相当。换字形/字号只需改这两行。
- */
-const CONTEXT_WINDOW_MARKER = '↕';
-
export interface ContextWindowBudgetChipProps {
+ /** 复用上下文用量圆环;窗口档位只在它的浮层里显示。 */
+ children: React.ReactNode;
+ details?: React.ReactNode;
+ onInspect?: () => void;
+ onCompact?: () => void;
sessionId: string;
/** 运行期上下文占用,用于「换小档位会立刻触发压缩」的提示。 */
contextTokens: number;
@@ -99,6 +90,10 @@ function inputPriceAtTokens(quote: ModelPriceQuote | undefined, tokens: number):
}
export function ContextWindowBudgetChip({
+ children,
+ details,
+ onInspect,
+ onCompact,
sessionId,
contextTokens,
model,
@@ -109,6 +104,7 @@ export function ContextWindowBudgetChip({
disabled = false,
}: ContextWindowBudgetChipProps) {
const { t } = useTranslation();
+ const navigate = useNavigate();
const [committing, setCommitting] = useState(false);
// 被控端不支持预算通道(老版本):卡转只读直到会话换设备。
const [remoteUnsupported, setRemoteUnsupported] = useState(false);
@@ -161,11 +157,12 @@ export function ContextWindowBudgetChip({
// 过期缓存刷新:悬浮与点击都走这里(键盘路径在 onOpenChange 里已有)。
// 刷新函数声明在本组件后部(hook 返回值),经 ref 中转避免 TDZ。
refreshIfStaleRef.current?.();
+ onInspect?.();
// 两卡互斥:自己展开时,用量卡立刻收起(用户要求"该窗体为唯一窗体");
// 分屏下同种类的另一张 chip 也在这条路径上被关掉。
cardHandleRef.current?.request();
setCardOpen(true);
- }, [clearCardTimers]);
+ }, [clearCardTimers, onInspect]);
const closeCard = useCallback(() => {
clearCardTimers();
cardHandleRef.current?.release();
@@ -402,7 +399,8 @@ export function ContextWindowBudgetChip({
if (checkedIndex >= 0) setTierTabStopIndex(checkedIndex);
}, [options, selectedTokens]);
- if (effectiveDefaultWindow === null || options.length === 0 || selectedTokens === null) return null;
+ // 目录尚未就绪时仍保留圆环和运行期详情,只隐藏没有可靠边界的档位。
+ const hasOptions = effectiveDefaultWindow !== null && options.length > 0 && selectedTokens !== null;
const agent = agentKind === 'cc' ? 'claude-code' : agentKind;
// 远程任务不显示价带:两份报价(gateway 服务端报价 + 本地参考价/用户覆盖)都来自
@@ -413,14 +411,12 @@ export function ContextWindowBudgetChip({
: getModelPriceQuote(gatewayPricing, providerId, model, agent)
?? getModelPriceQuote(referencePricing, providerId, model, agent);
- // 当前档位占基准的百分比:与卡片行同一口径(默认档 = 100%)。
- const selectedPercent = contextWindowBudgetTierPercent(selectedTokens, tierBase);
/**
* 方向键在单选组内移动**焦点**(不提交):`role="radio"` 语义下方向键必须能动,
* 而每次提交都会落库并可能触发活实例重建 —— 扫过一遍档位不该连写好几次库。
* 选中仍由 Enter / Space / 点击完成(与之前 Radix 菜单的键盘行为一致)。
- * 焦点可能落在行上(键盘打开 + Tab)或浮层容器上(Radix 默认聚焦内容):
- * 两种情况都按“当前行 → 选中行 → 停靠点”的顺序推出起点。
+ * 只在单选组里处理方向键,避免从压缩按钮跳进档位。
+ * 起点按“当前行 → 选中行 → 停靠点”取值。
*/
const handleTierKeyDown = (event: React.KeyboardEvent<HTMLDivElement>): void => {
const rows = tierRowRefs.current.filter((row): row is HTMLButtonElement => row !== null);
@@ -439,7 +435,7 @@ export function ContextWindowBudgetChip({
setTierTabStopIndex(wrapped);
rows[wrapped].focus();
};
- const shrinkWarning = selectedTokens < contextTokens && contextTokens > 0;
+ const shrinkWarning = selectedTokens !== null && selectedTokens < contextTokens && contextTokens > 0;
const commit = async (tokens: number): Promise<void> => {
// 选中「有效默认档」上报 null(跟随默认,不快照当前值)。
@@ -514,6 +510,7 @@ export function ContextWindowBudgetChip({
// 键盘/点击打开(指针不在触发器上)与悬浮打开走同一个开卡入口。
if (!cardPointerInsideRef.current) cardOpenSourceRef.current = 'focus';
refreshBoundsIfStale();
+ onInspect?.();
cardHandleRef.current?.request();
setCardOpen(true);
return;
@@ -548,32 +545,20 @@ export function ContextWindowBudgetChip({
cardPointerInsideRef.current = false;
scheduleCardClose();
}}
- // 视觉上没有数值,当前值必须进可访问名,否则读屏无从得知现在是多少。
+ // 底栏只显示上下文占用,当前窗口容量仍放在可访问名里。
aria-label={t('ccAgent.contextWindowBudget.triggerLabel', {
- window: formatTokenCount(selectedTokens),
+ window: selectedTokens === null ? '—' : formatTokenCount(selectedTokens),
})}
className={cn(
- // 与右下角用量 chip(`TodaySpendChip`:货币符号 + 金额)同一套视觉:同高 `h-5`、
- // 同字号字重 `text-12 font-medium leading-none`、同颜色 `--msg-tool-card-chevron`
- // (hover 提亮到 `foreground`)、同 `tabular-nums`;符号与数值同色,不做双色拼贴。
- 'inline-flex h-5 shrink-0 items-center rounded-full text-12 font-medium leading-none tabular-nums',
+ // 保留用量圆环的外观,24px 热区与键盘焦点包住圆环和占用百分比。
+ 'inline-flex h-6 shrink-0 items-center gap-1 rounded-full text-12 font-medium leading-none tabular-nums',
'text-[var(--msg-tool-card-chevron)] transition-colors hover:text-foreground',
'focus:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]',
// 只读/提交中仍然可聚焦可展开,但把“不可改”表现在外观上。
isDisabled && 'cursor-default opacity-50',
)}
>
- {/* `opacity-60` 与货币 chip 的符号完全一致(`TodaySpendChip`:`<span className="tabular-nums
- opacity-60">{symbol}</span>`)—— 同一个色值再压 40%,两枚符号在底栏里才是同一种灰。
- 百分比不压暗:它就是这一档的"值",与货币 chip 里金额的位置对应。 */}
- <span className="shrink-0 text-11 leading-none opacity-60" aria-hidden="true">
- {CONTEXT_WINDOW_MARKER}
- </span>
- {selectedPercent !== null && (
- <span className="shrink-0">{t('ccAgent.contextWindowBudget.optionPercent', {
- percent: selectedPercent,
- })}</span>
- )}
+ {children}
</button>
</PopoverTrigger>
{/* 浮层挂到触发器**紧跟其后**的宿主:portal 到 body 时卡片在文档最末,焦点一旦
@@ -584,7 +569,7 @@ export function ContextWindowBudgetChip({
side="top"
sideOffset={8}
portalContainer={cardPortalHost}
- className="min-w-[220px] p-1.5"
+ className="max-h-[var(--radix-popover-content-available-height)] w-[340px] max-w-[calc(100vw-24px)] overflow-y-auto p-4"
// Radix 给 FocusScope 写死 `loop: true`:Tab 在卡内永远环回,键盘用户一辈子出不了卡。
// 把两个 Tab 边缘接过来(capture 先于 Radix 的 bubble handler):在最后一个/第一个
// 可 Tab 元素上把焦点交出卡外,其余卡内 Tab 行为不变。
@@ -617,90 +602,146 @@ export function ContextWindowBudgetChip({
cardPointerInsideRef.current = false;
scheduleCardClose();
}}
- // 键盘导航挂在浮层上(而不是只挂在单选组上):Radix 打开时把焦点给浮层容器,
- // 按键会落在容器而不是行上,挂在组上会收不到。
- onKeyDown={handleTierKeyDown}
>
- <div className="px-2 pb-1.5 pt-1">
- <p className="text-12 font-medium text-[var(--text-primary)]">
- {t('ccAgent.contextWindowBudget.menuTitle')}
- </p>
- {/* 说明与注解统一用 `--text-secondary`:即「用量明细」卡(货币符号那个界面)里
- 说明文字的同一档灰(实测 rgb(111,111,111)),面板里只有一种「次要灰」。 */}
- {/* 字号/字重与「用量明细」卡(货币符号那个界面)同一套:标题 12/500、说明 12/400、
- 档位行 13/500、注解 12/400 —— 面板与卡片读起来才是同一个系统。 */}
- <p className="mt-0.5 text-12 font-normal leading-[1.5] text-[var(--text-secondary)]">
- {t('ccAgent.contextWindowBudget.menuHint')}
- </p>
- {deviceId && !authoritativeBounds && (
- // 没能从被控端拿到该路由的边界(老版本 / 拉取失败):这里只能给出不超过
- // 本地已知默认值的档位,文案必须如实说明,不能留给用户“能调大”的预期。
- <p className="mt-0.5 text-12 font-normal leading-[1.5] text-[var(--text-secondary)]">
- {t('ccAgent.contextWindowBudget.remoteTightenOnly')}
- </p>
- )}
- {disabled && (
- // 只读任务:卡片照常可展开(能看当前档位与价带),但档位行不可选 —— 给出原因,
- // 而不是把所有行默默变灰。
- <p className="mt-0.5 text-12 font-normal leading-[1.5] text-[var(--text-secondary)]">
- {t('ccAgent.contextWindowBudget.readOnlyHint')}
- </p>
- )}
- {remoteUnsupported && (
- // 被控端不支持预算通道:整卡只读并说明原因,避免反复提交必然失败的修改。
- <p className="mt-0.5 text-12 font-normal leading-[1.5] text-[var(--text-secondary)]">
- {t('ccAgent.contextWindowBudget.remoteUnsupported')}
- </p>
- )}
- </div>
- <div role="radiogroup" aria-label={t('ccAgent.contextWindowBudget.menuTitle')}>
- {options.map((option, index) => {
- const price = inputPriceAtTokens(quote, option.tokens);
- return (
- <TierRow
- key={`${option.kind}-${option.tokens}`}
- tokens={option.tokens}
- checked={option.tokens === selectedTokens}
- disabled={isDisabled}
- onSelect={() => void commit(option.tokens)}
- // roving tabindex:单选组只占一个 Tab 位,其余行用方向键抵达。
- tabIndex={index === tierTabStopIndex ? 0 : -1}
- buttonRef={(node) => {
- tierRowRefs.current[index] = node;
- }}
- onFocus={() => setTierTabStopIndex(index)}
- >
- {(() => {
- // 形态统一:`百分比 · 绝对值`(默认档 = 100% · 模型默认窗口);百分比与绝对值
- // 同色(继承行色),不再出现「灰百分比 + 白绝对值」的两色拼贴。基准未知时只显绝对值。
- const percent = contextWindowBudgetTierPercent(option.tokens, tierBase);
- const absolute = formatTokenCount(option.tokens);
- return (
- <span className="tabular-nums">
- {percent === null ? absolute : `${t('ccAgent.contextWindowBudget.optionPercent', { percent })} · ${absolute}`}
- </span>
- );
- })()}
- {option.kind === 'default' && (
- <span className="ml-1.5 text-12 font-normal text-[var(--text-secondary)]">
- {t('ccAgent.contextWindowBudget.optionDefault')}
- </span>
- )}
- {price && (
- <span className="ml-auto pl-3 text-12 font-normal tabular-nums text-[var(--text-secondary)]">
- {t('ccAgent.contextWindowBudget.inputPrice', { price })}
- </span>
+ {details && (
+ <div className="text-12 leading-[1.5] text-[var(--text-secondary)]">
+ {details}
+ </div>
+ )}
+ {onCompact && (
+ <div className="mt-4 border-t border-[var(--border-default)] pt-3">
+ <button
+ type="button"
+ className="rounded-full border border-[var(--border-default)] px-3 py-1.5 text-12 font-medium text-[var(--text-primary)] hover:bg-sidebar-item-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]"
+ onClick={() => { closeCard(); onCompact(); }}
+ >
+ {t('ccAgent.contextRingPanel.compact')}
+ </button>
+ <p className="mt-2 text-12 leading-relaxed text-[var(--text-secondary)]">{t('ccAgent.contextRingPanel.compactHelp')}</p>
+ </div>
+ )}
+ {hasOptions && (
+ <details className="group mt-4 border-t border-[var(--border-default)] pt-3" data-context-window-options>
+ <summary className="flex cursor-pointer list-none items-center justify-between gap-2 rounded-lg py-1 text-12 font-medium text-[var(--text-secondary)] outline-none hover:text-[var(--text-primary)] focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)] [&::-webkit-details-marker]:hidden">
+ <span>{t('ccAgent.contextRingPanel.adjust')}</span>
+ <span className="flex items-center gap-2 tabular-nums">
+ {formatTokenCount(selectedTokens!)}
+ <span aria-hidden="true" className="transition-transform group-open:rotate-90">›</span>
+ </span>
+ </summary>
+ <div className="pb-2 pt-2">
+ <p className="text-12 font-medium text-[var(--text-primary)]">{t('ccAgent.contextRingPanel.taskScope')}</p>
+ {/* 说明与注解统一用 `--text-secondary`:即「用量明细」卡(货币符号那个界面)里
+ 说明文字的同一档灰(实测 rgb(111,111,111)),面板里只有一种「次要灰」。 */}
+ {/* 字号/字重与「用量明细」卡(货币符号那个界面)同一套:标题 12/500、说明 12/400、
+ 档位行 13/500、注解 12/400 —— 面板与卡片读起来才是同一个系统。 */}
+ <p className="mt-0.5 text-12 font-normal leading-[1.5] text-[var(--text-secondary)]">
+ {t('ccAgent.contextWindowBudget.menuHint')}
+ </p>
+ <p className="mt-1 text-12 leading-relaxed text-[var(--text-secondary)]">{t('ccAgent.contextRingPanel.costHint')}</p>
+ {deviceId && !authoritativeBounds && (
+ // 没能从被控端拿到该路由的边界(老版本 / 拉取失败):这里只能给出不超过
+ // 本地已知默认值的档位,文案必须如实说明,不能留给用户“能调大”的预期。
+ <p className="mt-0.5 text-12 font-normal leading-[1.5] text-[var(--text-secondary)]">
+ {t('ccAgent.contextWindowBudget.remoteTightenOnly')}
+ </p>
+ )}
+ {disabled && (
+ // 只读任务:卡片照常可展开(能看当前档位与价带),但档位行不可选 —— 给出原因,
+ // 而不是把所有行默默变灰。
+ <p className="mt-0.5 text-12 font-normal leading-[1.5] text-[var(--text-secondary)]">
+ {t('ccAgent.contextWindowBudget.readOnlyHint')}
+ </p>
+ )}
+ {remoteUnsupported && (
+ // 被控端不支持预算通道:整卡只读并说明原因,避免反复提交必然失败的修改。
+ <p className="mt-0.5 text-12 font-normal leading-[1.5] text-[var(--text-secondary)]">
+ {t('ccAgent.contextWindowBudget.remoteUnsupported')}
+ </p>
+ )}
+ </div>
+ <div role="radiogroup" aria-label={t('ccAgent.contextWindowBudget.menuTitle')} onKeyDown={handleTierKeyDown}>
+ {options.map((option, index) => {
+ const price = inputPriceAtTokens(quote, option.tokens);
+ return (
+ <TierRow
+ key={`${option.kind}-${option.tokens}`}
+ tokens={option.tokens}
+ checked={option.tokens === selectedTokens}
+ disabled={isDisabled}
+ onSelect={() => void commit(option.tokens)}
+ // roving tabindex:单选组只占一个 Tab 位,其余行用方向键抵达。
+ tabIndex={index === tierTabStopIndex ? 0 : -1}
+ buttonRef={(node) => {
+ tierRowRefs.current[index] = node;
+ }}
+ onFocus={() => setTierTabStopIndex(index)}
+ >
+ {(() => {
+ // 形态统一:`百分比 · 绝对值`(默认档 = 100% · 模型默认窗口);百分比与绝对值
+ // 同色(继承行色),不再出现「灰百分比 + 白绝对值」的两色拼贴。基准未知时只显绝对值。
+ const percent = contextWindowBudgetTierPercent(option.tokens, tierBase);
+ const absolute = formatTokenCount(option.tokens);
+ return (
+ <span className="tabular-nums">
+ {percent === null ? absolute : `${t('ccAgent.contextWindowBudget.optionPercent', { percent })} · ${absolute}`}
+ </span>
+ );
+ })()}
+ {option.kind === 'default' && (
+ <span className="ml-1.5 text-12 font-normal text-[var(--text-secondary)]">
+ {t('ccAgent.contextWindowBudget.optionDefault')}
+ </span>
+ )}
+ {price && (
+ <span className="ml-auto pl-3 text-12 font-normal tabular-nums text-[var(--text-secondary)]">
+ {t('ccAgent.contextWindowBudget.inputPrice', { price })}
+ </span>
+ )}
+ </TierRow>
+ );
+ })}
+ </div>
+ {shrinkWarning && (
+ <p className="mx-2 mt-1.5 border-t border-[var(--border-default)] pt-1.5 text-11 leading-[1.5] text-[var(--warning-fg)]">
+ {t('ccAgent.contextWindowBudget.shrinkWarning', {
+ used: formatTokenCount(contextTokens),
+ })}
+ </p>
+ )}
+ {!disabled && limitProviderId && (
+ <div className="mt-3 border-t border-[var(--border-default)] pt-3">
+ {deviceId ? (
+ <p className="text-12 leading-relaxed text-[var(--text-secondary)]">
+ {t('ccAgent.contextRingPanel.remoteModelSettings')}
+ </p>
+ ) : (
+ <>
+ <button
+ type="button"
+ onClick={() => {
+ const params = new URLSearchParams({
+ tab: 'providers',
+ connect: limitProviderId,
+ model,
+ agent: makerAgent,
+ });
+ closeCard();
+ navigate(`/settings?${params.toString()}`);
+ }}
+ className="inline-flex min-h-6 items-center gap-1 rounded-full text-12 font-medium text-[var(--text-secondary)] outline-none hover:text-[var(--text-primary)] focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]"
+ >
+ {t('ccAgent.contextRingPanel.modelSettings')}
+ <span aria-hidden="true">↗</span>
+ </button>
+ <p className="mt-1 text-12 leading-relaxed text-[var(--text-secondary)]">
+ {t('ccAgent.contextRingPanel.modelSettingsHint')}
+ </p>
+ </>
)}
- </TierRow>
- );
- })}
- </div>
- {shrinkWarning && (
- <p className="mx-2 mt-1.5 border-t border-[var(--border-default)] pt-1.5 text-11 leading-[1.5] text-[var(--warning-fg)]">
- {t('ccAgent.contextWindowBudget.shrinkWarning', {
- used: formatTokenCount(contextTokens),
- })}
- </p>
+ </div>
+ )}
+ </details>
)}
</PopoverContent>
</Popover>
diff --git a/apps/desktop/src/renderer/components/status/__tests__/contextWindowBudgetChip.test.tsx b/apps/desktop/src/renderer/components/status/__tests__/contextWindowBudgetChip.test.tsx
index 3103115c89..f18247b21a 100644
--- a/apps/desktop/src/renderer/components/status/__tests__/contextWindowBudgetChip.test.tsx
+++ b/apps/desktop/src/renderer/components/status/__tests__/contextWindowBudgetChip.test.tsx
@@ -11,6 +11,9 @@ const mockToastError = vi.fn();
const mockGatewayPricing = vi.fn();
const mockModelContextLimit = vi.fn();
const mockModelContextLimitTarget = vi.fn();
+const mockNavigate = vi.fn();
+
+vi.mock('react-router-dom', () => ({ useNavigate: () => mockNavigate }));
vi.mock('@/lib/sessionService', () => ({
update: (...args: unknown[]) => mockUpdate(...args),
@@ -86,6 +89,7 @@ vi.mock('@/components/ui/dropdown-menu', async () => {
});
import { ContextWindowBudgetChip, isBoundsCacheEntryStale, resetRemoteContextWindowBoundsCache, __clearAllBoundsCachesForTest, __expireAllBoundsCachesForTest } from '../ContextWindowBudgetChip';
+import { ContextCapacityRing } from '../ContextCapacityRing';
const SESSION_ID = 'session-1';
@@ -138,10 +142,17 @@ async function openTierCard(): Promise<HTMLElement[]> {
const trigger = document.querySelector('[data-context-window-budget-chip]');
if (!trigger) throw new Error('context window chip trigger is missing');
fireEvent.click(trigger);
+ expandWindowOptions();
await waitFor(() => { expect(rows().length).toBeGreaterThan(0); });
return rows();
}
+function expandWindowOptions() {
+ document.querySelectorAll<HTMLDetailsElement>('[data-context-window-options]').forEach((details) => {
+ if (!details.open) fireEvent.click(details.querySelector('summary')!);
+ });
+}
+
/** 触发器不再显示数值:当前档位的可读出处是 aria-label(`triggerLabel`)。 */
function triggerLabel(chip: Element | null): string {
return chip?.getAttribute('aria-label') ?? '';
@@ -217,7 +228,7 @@ function renderChip(
});
}
return render(
- <ContextWindowBudgetChip
+ <ContextWindowBudgetChip children={<span>12%</span>}
sessionId={SESSION_ID}
contextTokens={0}
model="grok-4.6"
@@ -230,6 +241,7 @@ function renderChip(
}
beforeEach(() => {
+ mockNavigate.mockReset();
mockUpdate.mockReset();
mockUpdate.mockResolvedValue({ id: SESSION_ID });
mockGetModelsForVendor.mockReset();
@@ -253,6 +265,27 @@ afterEach(() => {
});
describe('ContextWindowBudgetChip', () => {
+ it('opens the current model settings from the expanded window controls without changing the task budget', async () => {
+ // The settings link must preserve the source/model/engine and must not submit a tier.
+ renderChip({ providerId: 'xd', agentKind: 'cc' });
+ await openTierCard();
+ const settings = screen.getByRole('button', { name: 'ccAgent.contextRingPanel.modelSettings' });
+ expect(settings.closest('[data-context-window-options]')).not.toBeNull();
+ fireEvent.click(settings);
+ expect(mockNavigate).toHaveBeenCalledWith('/settings?tab=providers&connect=xd&model=grok-4.6&agent=claude-code');
+ expect(mockUpdate).not.toHaveBeenCalled();
+ await waitFor(() => expect(screen.queryByRole('radiogroup')).toBeNull());
+ });
+
+ it('does not open local model settings for a remote task', async () => {
+ vi.mocked(window.electronAPI.deviceLink.invoke).mockResolvedValue(boundsView());
+ renderChip({ providerId: 'xd', deviceId: 'remote-device' });
+ await openTierCard();
+ expect(await screen.findByText('ccAgent.contextRingPanel.remoteModelSettings')).toBeTruthy();
+ expect(screen.queryByRole('button', { name: 'ccAgent.contextRingPanel.modelSettings' })).toBeNull();
+ expect(mockNavigate).not.toHaveBeenCalled();
+ });
+
it('renders the catalog default window when no budget is saved', () => {
renderChip();
const chip = document.querySelector('[data-context-window-budget-chip]');
@@ -276,24 +309,32 @@ describe('ContextWindowBudgetChip', () => {
});
});
- it('marks the trigger with a text bracket pair plus the current percentage', () => {
- // 用户拍板:底栏不挂文字标签,但要「窗口框 + 百分比」;百分比与卡片行同口径(默认档 = 100%)。
- renderChip();
- const chip = document.querySelector('[data-context-window-budget-chip]');
- // 文本标记(↕,与 `¥` / `1%` 同字号同基线),不是图标、不是括号。
- expect(chip?.textContent).toContain('↕');
- expect(chip?.textContent).toContain('optionPercent#{"percent":100}');
- expect(chip?.textContent).not.toContain('menuTitle');
- expect(chip?.querySelector('svg')).toBeNull();
- // 当前值进可访问名:读屏要能听到绝对窗口。
- expect(chip?.getAttribute('aria-label')).toBe(
- 'ccAgent.contextWindowBudget.triggerLabel#{"window":"1M"}',
- );
- const cls = String(chip?.className);
- expect(cls).toContain('text-12');
- expect(cls).toContain('font-medium');
- expect(cls).toContain('text-[var(--msg-tool-card-chevron)]');
- expect(cls).not.toContain('text-[var(--text-tertiary)]');
+ it('keeps budget choices inside the ring details and compacts only on explicit action', async () => {
+ // User decision 2026-10-27: one ring entry, with budget controls inside its details.
+ // Existing tests only covered the standalone chip; this exercises the merged surface.
+ const compact = vi.fn();
+ render(<ContextCapacityRing
+ sessionId={SESSION_ID}
+ contextTokens={120_000}
+ sdkContextWindow={1_000_000}
+ model="grok-4.6"
+ providerId="xd"
+ vendorKey="cc"
+ providers={routeCatalog}
+ onCompact={compact}
+ />);
+ const trigger = document.querySelector('[data-context-window-budget-chip]')!;
+ expect(trigger.textContent).toBe('12%');
+ expect(screen.queryByRole('radiogroup')).toBeNull();
+ fireEvent.click(trigger);
+ expect((await screen.findByRole('progressbar')).getAttribute('aria-valuenow')).toBe('12');
+ expect(document.querySelector<HTMLDetailsElement>('[data-context-window-options]')?.open).toBe(false);
+ expandWindowOptions();
+ expect(screen.getByRole('radiogroup')).toBeTruthy();
+ expect(compact).not.toHaveBeenCalled();
+ fireEvent.click(screen.getByRole('button', { name: 'ccAgent.contextRingPanel.compact' }));
+ expect(compact).toHaveBeenCalledOnce();
+ await waitFor(() => expect(screen.queryByRole('radiogroup')).toBeNull());
});
it('keeps the card open when the trigger is clicked after hover opened it', async () => {
@@ -305,12 +346,14 @@ describe('ContextWindowBudgetChip', () => {
// 悬浮路径:打开延迟 300ms(waitFor 轮询等待,不使用真实定时器睡眠)。
fireEvent.pointerEnter(trigger);
await waitFor(() => {
+ expandWindowOptions();
expect(screen.queryAllByRole('radio').length).toBeGreaterThan(0);
}, { timeout: 1500 });
// 悬浮已展开后点击触发器:卡片必须仍然在(Radix 的 toggle 被 preventDefault 拦住)。
// 点击若重新排入关闭定时器,宽限 200ms 后卡片消失 —— 用 waitFor 确认「稳定不关」。
fireEvent.click(trigger);
await waitFor(() => {
+ expandWindowOptions();
expect(screen.queryAllByRole('radio').length).toBeGreaterThan(0);
}, { timeout: 400 });
});
@@ -330,6 +373,7 @@ describe('ContextWindowBudgetChip', () => {
expect(trigger!.getAttribute('aria-disabled')).toBe('true');
// 仍可展开;档位行全部不可选,且有「只读」说明。
fireEvent.click(trigger!);
+ expandWindowOptions();
const rows = screen.queryAllByRole('radio') as HTMLButtonElement[];
await waitFor(() => { expect(rows.length).toBeGreaterThan(0); });
for (const row of rows) expect(row.disabled).toBe(true);
@@ -354,22 +398,22 @@ describe('ContextWindowBudgetChip', () => {
).toBeTruthy();
});
- it('shows the saved tier percentage next to the marker', async () => {
- // 存了 25% 档 → 触发器读 `↕ 25%`(绝对值在 aria-label / 卡片里)。
+ it('shows the saved tier percentage inside the ring details', async () => {
+ // 存了 25% 档 → 展开后选中的档位显示 25%,不占用底栏。
// 档位来自权威边界查询(偏好文件里的条目),所以这里要等那次查询回来。
renderChip({ budget: 250_000 });
- const chip = document.querySelector('[data-context-window-budget-chip]');
+ await openTierCard();
await waitFor(() => {
- expect(chip?.textContent).toContain('optionPercent#{"percent":25}');
+ expect(chipText()).toContain('optionPercent#{"percent":25}');
});
});
// 乐观记账的作用域与收口(Greptile 复审 P1):预算是「按会话」存的偏好条目、与路由无关,
// 所以切模型不该丢掉刚写的值;但同一张卡换到别的会话/设备时必须失效,而且只有**提交之后**
// 回来的权威回答才有资格把它收口(保存后的那次 refresh 会丢弃之前 in-flight 的结果)。
-/** 触发器文本(`↕ 25%`):百分比在文本里,绝对值在 aria-label(triggerLabel)里。 */
+/** 当前选择只显示在展开后的档位行里,底栏保留用量圆环。 */
function chipText(): string {
- return document.querySelector('[data-context-window-budget-chip]')?.textContent ?? '';
+ return document.querySelector('[role="radio"][aria-checked="true"]')?.textContent ?? '';
}
it('keeps the saved tier while the post-save authoritative answer is still in flight', async () => {
@@ -528,7 +572,7 @@ function chipText(): string {
// 同一张卡换到另一个会话(新会话未存过档位):乐观值必须失效,显示回默认档。
view.rerender(
- <ContextWindowBudgetChip
+ <ContextWindowBudgetChip children={<span>12%</span>}
sessionId="another-session"
contextTokens={0}
model="grok-4.6"
@@ -690,11 +734,13 @@ function chipText(): string {
expect(triggerLabel(chip)).toContain('1M');
});
- it('does not render when the route window is unknown', () => {
+ it('keeps context details available without inventing tiers when the route window is unknown', async () => {
// 路由目录与扁平表都给不出默认窗口 → 没有档位可给,不渲染兜底控件。
mockGetModelsForVendor.mockReturnValue([]);
- renderChip({ providers: null, model: 'other-model' });
- expect(document.querySelector('[data-context-window-budget-chip]')).toBeNull();
+ renderChip({ providers: null, model: 'other-model', details: 'Context usage' });
+ fireEvent.click(document.querySelector('[data-context-window-budget-chip]')!);
+ expect(await screen.findByText('Context usage')).toBeTruthy();
+ expect(screen.queryByRole('radiogroup')).toBeNull();
});
it('offers the route max tier so a session can raise the window again', async () => {
@@ -998,7 +1044,7 @@ function chipText(): string {
// 模型选择器已切到目标模型(会话行还没落库):chip 必须跟着换档位表与显示值。
view.rerender(
- <ContextWindowBudgetChip
+ <ContextWindowBudgetChip children={<span>12%</span>}
sessionId={SESSION_ID}
contextTokens={0}
model="deepseek/deepseek-v4.1-flash"
@@ -1082,7 +1128,7 @@ function chipText(): string {
});
view.rerender(
- <ContextWindowBudgetChip
+ <ContextWindowBudgetChip children={<span>12%</span>}
sessionId={SESSION_ID}
contextTokens={0}
model="grok-4.6"
@@ -1142,13 +1188,14 @@ describe('ContextWindowBudgetChip — Greptile 2026-10-17 三条 P2', () => {
.mockImplementationOnce(() => oldPending) // 旧实例的查询挂起
.mockResolvedValue(boundsView({ budget: 500_000, budgetCustomized: true }))); // 新实例立刻回
// 实例 A(挂起中)
- const a = render(<ContextWindowBudgetChip sessionId={SESSION_ID} contextTokens={0}
+ const a = render(<ContextWindowBudgetChip children={<span>12%</span>} sessionId={SESSION_ID} contextTokens={0}
model="grok-4.6" providerId="xd" agentKind="cc" providers={null} />);
// 实例 B(同 key):拿到新答案
- const shellB = render(<ContextWindowBudgetChip sessionId={SESSION_ID} contextTokens={0}
+ const shellB = render(<ContextWindowBudgetChip children={<span>12%</span>} sessionId={SESSION_ID} contextTokens={0}
model="grok-4.6" providerId="xd" agentKind="cc" providers={null} />);
const triggerB = shellB.container.querySelector('[data-context-window-budget-chip]')!;
fireEvent.click(triggerB);
+ expandWindowOptions();
await waitFor(() => {
const tokens = [...shellB.container.querySelectorAll('[role=radio]')]
.map((el) => el.getAttribute('data-token'));
@@ -1160,10 +1207,11 @@ describe('ContextWindowBudgetChip — Greptile 2026-10-17 三条 P2', () => {
await act(async () => { await Promise.resolve(); });
// 新挂载的实例必须拿到**新**答案:500K 档在 1M 窗口下本来就在,**选中态**
// 才能区分 —— budget=500K 时选中 500K;被旧响应覆盖回 null 时选中 1M 默认。
- const shellC = render(<ContextWindowBudgetChip sessionId={SESSION_ID} contextTokens={0}
+ const shellC = render(<ContextWindowBudgetChip children={<span>12%</span>} sessionId={SESSION_ID} contextTokens={0}
model="grok-4.6" providerId="xd" agentKind="cc" providers={null} />);
const triggerC = shellC.container.querySelector('[data-context-window-budget-chip]')!;
fireEvent.click(triggerC);
+ expandWindowOptions();
await waitFor(() => {
expect(checkedOf(shellC.container, '500000')).toBe(true);
});
@@ -1176,14 +1224,15 @@ describe('ContextWindowBudgetChip — Greptile 2026-10-17 三条 P2', () => {
let answer = boundsView({ budget: null, defaultEffectiveWindow: 1_000_000 });
installElectronApi(vi.fn(async () => { const v = answer; return v; }));
// 两实例先后渲染;注意两卡有互斥协调器("唯一窗体")—— 同屏只检查当前打开的那张。
- const shellA = render(<ContextWindowBudgetChip sessionId={SESSION_ID} contextTokens={0}
+ const shellA = render(<ContextWindowBudgetChip children={<span>12%</span>} sessionId={SESSION_ID} contextTokens={0}
model="grok-4.6" providerId="xd" agentKind="cc" providers={null} />);
- const shellB = render(<ContextWindowBudgetChip sessionId={SESSION_ID} contextTokens={0}
+ const shellB = render(<ContextWindowBudgetChip children={<span>12%</span>} sessionId={SESSION_ID} contextTokens={0}
model="grok-4.6" providerId="xd" agentKind="cc" providers={null} />);
// ① 打开 A:500K 档在 1M 窗口下本来就在(50%),选中态是「1M 默认」。
const triggerA = shellA.container.querySelector('[data-context-window-budget-chip]')!;
fireEvent.click(triggerA);
+ expandWindowOptions();
await waitFor(() => {
expect(shellA.container.querySelectorAll('[role=radio]').length).toBeGreaterThan(0);
});
@@ -1201,6 +1250,7 @@ describe('ContextWindowBudgetChip — Greptile 2026-10-17 三条 P2', () => {
// 只断言「行存在」不足以证明同步(500K 行本来就存在);1M 默认行不得同时选中。
const triggerB = shellB.container.querySelector('[data-context-window-budget-chip]')!;
fireEvent.click(triggerB);
+ expandWindowOptions();
await waitFor(() => {
expect(checkedOf(shellB.container, '500000')).toBe(true);
});
@@ -1324,7 +1374,7 @@ describe('ContextWindowBudgetChip — Greptile 2026-10-24 三条 P2', () => {
// 用户切到本地任务(同一组件实例,deviceId 消失)后才收到旧设备的拒绝。
view.rerender(
- <ContextWindowBudgetChip
+ <ContextWindowBudgetChip children={<span>12%</span>}
sessionId={SESSION_ID}
contextTokens={0}
model="grok-4.6"
diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
index 816247fcf8..c32104f6f6 100644
--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
@@ -25,7 +25,6 @@ import { canContinueFailedTurn } from '@cindy/maker-shared/synthetic-trigger';
* F-FP-5: workingDir read-only display
*/
-import { useCodexContextWindow } from '@/hooks/useCodexContextWindow';
import {
Profiler,
useCallback,
@@ -167,7 +166,7 @@ import { useAnimatedNumber } from '@/hooks/useAnimatedNumber';
import { useConfirmDialog } from '@/components/ui/confirm-dialog-provider';
import { useSilentEncryptedRetry } from '@/hooks/useSilentEncryptedRetry';
import { TodaySpendChip } from '@/components/status/TodaySpendChip';
-import { ContextWindowBudgetChip } from '@/components/status/ContextWindowBudgetChip';
+import { ContextCapacityRing, formatTokenCount, getModelContextWindow } from '@/components/status/ContextCapacityRing';
import { TopRightChipStack, TopRightChipStackProvider } from '@/components/chat/TopRightChipStack';
import { ChatDisplaySnapshotProvider } from '@/components/chat/ChatDisplaySnapshotContext';
import { useCCAgentChat } from '@/hooks/useCCAgentChat';
@@ -307,7 +306,7 @@ import {
} from '@/lib/workLouderCodexTaskActions';
import { useSessionHardwareTaskActions } from './lib/sessionHardwareTaskActions';
import { isRemoteSessionWriteBlocked } from './lib/remoteSessionWriteGuard';
-import { getModelById, getDefaultModelForVendor, getModelsForVendor } from '@/lib/modelDefinitions';
+import { getModelById, getDefaultModelForVendor } from '@/lib/modelDefinitions';
import { resolveDisplayContextWindow } from '@/lib/contextWindow';
import { resolveSessionContextWindow } from '../../../shared/sessionContextWindow';
import {
@@ -6353,29 +6352,12 @@ function CCAgentSessionContent({
deviceLinkDeviceId={remoteDeviceId ?? null}
usageAccount={usageAccount}
/>
- {/* device-link 远程任务的档位走 maker:set-context-window-budget 隧道命令,
- 在偏好文件落盘并应用到活实例;老被控端不支持时由 chip 提示版本不支持。
- 当前档位与可选档位一起来自权威边界查询(本地 main / 远程被控端)。 */}
- {sessionId && (
- <ContextWindowBudgetChip
- sessionId={sessionId}
- contextTokens={agentStatus.contextTokens}
- model={agentSwitchIntent?.model ?? session?.model ?? ''}
- providerId={
- agentSwitchIntent
- ? agentSwitchIntent.providerId
- : (session?.providerId ?? null)
- }
- agentKind={normalizeDbAgentKind(displayAgentKind)}
- providers={{ providers }}
- deviceId={remoteDeviceId}
- disabled={readOnly || !session}
- />
- )}
<ContextCapacityRing
isRunning={agentStatus.isRunning}
sessionId={sessionId}
- providerId={session?.providerId}
+ providerId={agentSwitchIntent ? agentSwitchIntent.providerId : session?.providerId}
+ providers={{ providers }}
+ disabled={readOnly || !session}
contextTokens={agentStatus.contextTokens}
model={agentSwitchIntent?.model ?? session?.model ?? ''}
vendorKey={normalizeDbAgentKind(displayAgentKind)}
@@ -6955,197 +6937,4 @@ function RunningStatusBar({
);
}
-// ---------------------------------------------------------------------------
-// ContextCapacityRing — circular token usage indicator
-// ---------------------------------------------------------------------------
-
-/** Format a token count with K/M suffix: 200000 → "200K", 1000000 → "1M". */
-function formatTokenCount(n: number): string {
- if (n >= 1_000_000) {
- const m = n / 1_000_000;
- return `${Number.isInteger(m) ? m : m.toFixed(1)}M`;
- }
- if (n >= 1_000) {
- const k = n / 1_000;
- return `${Number.isInteger(k) ? k : k.toFixed(1)}K`;
- }
- return n.toString();
-}
-
-/**
- * 从 maker capabilities cache 查模型 contextWindow。
- * 拿不到时返回 undefined,由 display resolver 兜底到 200K。
- */
-function getModelContextWindow(
- model: string,
- vendorKey: 'cc' | 'codex' | 'pi',
- deviceId?: string,
-): number | undefined {
- const found = getModelsForVendor(vendorKey, deviceId).find((m) => m.id === model);
- return found?.contextWindow;
-}
-
-function ContextCapacityRing({
- isRunning,
- sessionId,
- providerId,
- contextTokens,
- model,
- vendorKey,
- sdkContextWindow,
- verifiedContextWindow,
- deviceId,
- onCompact,
-}: {
- isRunning?: boolean;
- sessionId?: string;
- providerId?: string | null;
- contextTokens: number;
- model: string;
- vendorKey: 'cc' | 'codex' | 'pi';
- /** SDK-reported context window; 0 = not yet known → use hardcoded fallback. */
- sdkContextWindow: number;
- verifiedContextWindow?: number | null;
- /** device-link 远程会话所属被控端 id;按被控端能力查 contextWindow(本机会话 undefined,行为不变)。 */
- deviceId?: string;
- /** 提供时圆环可点击 — 点击后(经用户确认)向 agent 发送 /compact 压缩上下文。 */
- onCompact?: () => void;
-}) {
- const { t } = useTranslation();
- const [contextInspection, setContextInspection] = useState(0);
- const codexContext = useCodexContextWindow({
- enabled: vendorKey === 'codex' && !deviceId && Boolean(sessionId),
- providerId,
- modelId: model,
- sessionId,
- reportedWindow: sdkContextWindow,
- refreshKey: `${isRunning}:${contextInspection}`,
- });
- const contextWindow = resolveDisplayContextWindow({
- sdkContextWindow,
- verifiedContextWindow,
- runtimeWindowAuthoritative: vendorKey === 'codex',
- nativeContextWindow: codexContext?.contextWindow,
- nativeContextPending: codexContext?.pendingApply,
- modelContextWindow: getModelContextWindow(model, vendorKey, deviceId),
- });
- const pct =
- contextWindow > 0
- ? Math.min(Math.max(Math.round((contextTokens / contextWindow) * 100), 0), 100)
- : 0;
-
- // Ring geometry: outer diameter 20px, strokeWidth 2.5
- const size = 20;
- const strokeWidth = 2.5;
- const radius = (size - strokeWidth) / 2; // 8.75
- const circumference = 2 * Math.PI * radius;
- const dashOffset = circumference - (circumference * pct) / 100;
-
- // Color thresholds per spec
- const fillColor =
- pct > 90
- ? 'var(--error-flat)'
- : pct > 70
- ? 'var(--warning-fg)'
- : 'var(--msg-tool-card-chevron)';
-
- const usedTokens = Math.max(0, contextTokens);
- const tooltipText =
- contextWindow > 0
- ? `Context — ${formatTokenCount(usedTokens)} / ${formatTokenCount(contextWindow)} (${pct}%)`
- : 'No context data yet';
-
- const ringContent = (
- <>
- <svg
- width={size}
- height={size}
- viewBox={`0 0 ${size} ${size}`}
- className="shrink-0"
- aria-hidden="true"
- focusable="false"
- >
- {/* Track (background circle) */}
- <circle
- cx={size / 2}
- cy={size / 2}
- r={radius}
- fill="none"
- stroke="var(--msg-tool-card-border)"
- strokeWidth={strokeWidth}
- />
- {/* Fill arc — starts at 12 o'clock, sweeps clockwise */}
- <circle
- cx={size / 2}
- cy={size / 2}
- r={radius}
- fill="none"
- stroke={fillColor}
- strokeWidth={strokeWidth}
- strokeDasharray={circumference}
- strokeDashoffset={dashOffset}
- strokeLinecap="round"
- transform={`rotate(-90 ${size / 2} ${size / 2})`}
- />
- </svg>
- <span className="text-12 font-medium leading-none" style={{ color: fillColor }}>
- {contextWindow > 0 ? `${pct}%` : '—'}
- </span>
- </>
- );
-
- return (
- <Tip
- text={
- onCompact ? (
- <>
- <div>{tooltipText}</div>
- <div>{t('ccAgent.layout.contextRing.compactHint')}</div>
- </>
- ) : vendorKey === 'codex' ? (
- // Native Codex manages compaction; this control only reads its capacity.
- <>
- <div>
- {codexContext?.pendingApply
- ? t('ccAgent.layout.contextRing.codexPendingHint')
- : tooltipText}
- </div>
- <div>
- {codexContext
- ? t('settings.providers.models.advanced.codexContextValues', {
- total: codexContext.contextWindow.toLocaleString(),
- usable: codexContext.usableContextWindow.toLocaleString(),
- compact: codexContext.autoCompactTokenLimit.toLocaleString(),
- })
- : t('settings.providers.models.advanced.codexContextUnknown')}
- </div>
- <div>{t('ccAgent.layout.contextRing.codexAutoHint')}</div>
- </>
- ) : (
- tooltipText
- )
- }
- >
- {onCompact ? (
- <button
- type="button"
- onClick={onCompact}
- aria-label={t('ccAgent.layout.contextRing.compactHint')}
- className="flex shrink-0 cursor-pointer items-center gap-1 transition-opacity hover:opacity-75 active:opacity-60"
- >
- {ringContent}
- </button>
- ) : (
- <div
- className="flex shrink-0 items-center gap-1"
- onMouseEnter={() => {
- if (vendorKey === 'codex') setContextInspection((n) => n + 1);
- }}
- >
- {ringContent}
- </div>
- )}
- </Tip>
- );
-}
import { isSharedTaskPeer } from '@cindy/device-link';
diff --git a/apps/desktop/src/renderer/hooks/__tests__/useModelContextLimit.test.ts b/apps/desktop/src/renderer/hooks/__tests__/useModelContextLimit.test.ts
index 75894dd53b..021a09193a 100644
--- a/apps/desktop/src/renderer/hooks/__tests__/useModelContextLimit.test.ts
+++ b/apps/desktop/src/renderer/hooks/__tests__/useModelContextLimit.test.ts
@@ -15,14 +15,26 @@ const target = { agent: 'codex' as const, providerId: 'openai', modelId: 'gpt-te
const view = (limit: number | null) => ({ limit, isCustomized: limit !== null });
const get = vi.fn();
const set = vi.fn();
+const setCompaction = vi.fn();
beforeEach(() => {
vi.clearAllMocks();
setDataOwnerGeneration('owner-a', 1);
Object.assign(window, {
- electronAPI: { maker: { getModelContextLimit: get, setModelContextLimit: set } },
+ electronAPI: { maker: { getModelContextLimit: get, setModelContextLimit: set, setModelCompaction: setCompaction } },
});
});
describe('context editor request ownership', () => {
+ it('writes compaction separately from the window with the same owner stamp and reads native facts back', async () => {
+ get.mockResolvedValue(view(272_000));
+ setCompaction.mockResolvedValue(view(272_000));
+ const hook = renderHook(() => useModelContextLimit(target));
+ await act(async () => {});
+ await act(async () => { await hook.result.current.setCompaction(80); });
+ expect(setCompaction).toHaveBeenCalledWith(target, 80, { dataOwnerId: 'owner-a', ownerGeneration: 1 });
+ expect(set).not.toHaveBeenCalled();
+ expect(get).toHaveBeenCalledTimes(2);
+ hook.unmount();
+ });
it('does not let an old model read overwrite the current model', async () => {
const old = deferred<ReturnType<typeof view>>();
get.mockReturnValueOnce(old.promise).mockResolvedValueOnce(view(200_000));
diff --git a/apps/desktop/src/renderer/hooks/useModelContextLimit.ts b/apps/desktop/src/renderer/hooks/useModelContextLimit.ts
index 4fe0fc1c0e..0e47dcbdf6 100644
--- a/apps/desktop/src/renderer/hooks/useModelContextLimit.ts
+++ b/apps/desktop/src/renderer/hooks/useModelContextLimit.ts
@@ -21,7 +21,7 @@ export function useModelContextLimit(target: ModelContextLimitTarget | null) {
const generation = useRef(0);
const run = useCallback(
- async (write?: { limit: number | null }) => {
+ async (write?: { limit: number | null } | { compactionPct: number | null }) => {
const request = ++generation.current;
if (!stableTarget) {
setState({ ...EMPTY, key, loading: false, error: false });
@@ -33,7 +33,9 @@ export function useModelContextLimit(target: ModelContextLimitTarget | null) {
setState((prev) => ({ ...prev, loading: true, error: false }));
try {
let view = write
- ? await window.electronAPI.maker.setModelContextLimit(stableTarget, write.limit, stamp)
+ ? 'compactionPct' in write
+ ? await window.electronAPI.maker.setModelCompaction(stableTarget, write.compactionPct, stamp)
+ : await window.electronAPI.maker.setModelContextLimit(stableTarget, write.limit, stamp)
: await window.electronAPI.maker.getModelContextLimit(stableTarget);
if (write && stableTarget.agent === 'codex' && current()) {
view = await window.electronAPI.maker.getModelContextLimit(stableTarget);
@@ -70,5 +72,6 @@ export function useModelContextLimit(target: ModelContextLimitTarget | null) {
const setLimit = useCallback((limit: number | null) => run({ limit }), [run]);
const reset = useCallback(() => run({ limit: null }), [run]);
- return { ...(state.key === key ? state : { ...EMPTY, loading: true, error: false }), setLimit, reset };
+ const setCompaction = useCallback((compactionPct: number | null) => run({ compactionPct }), [run]);
+ return { ...(state.key === key ? state : { ...EMPTY, loading: true, error: false }), setLimit, reset, setCompaction };
}
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 46e29467ea..b809539e26 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -3604,6 +3604,12 @@
"contextLimitHint": "Applies to all available engines for this model. Edit in whole K (1 K = 1,000 tokens); untouched values retain their precision. Saved changes apply to subsequent runs without interrupting a response. Actual capacity remains subject to the model service’s limits.",
"contextLimitLocalMillionHint": "Native 256K (262,144 tokens), with optional expansion to 1M (1,000,000). If the service is running, restart it under Manage Service to apply changes; if stopped, they apply on next use. Longer inputs need more memory and take longer to process.",
"contextLimitAria": "Context limit (thousands of tokens)",
+ "compaction": {
+ "title": "Automatic Compaction",
+ "hint": "Compact context at the selected usage percentage. Lower values compact earlier; engine limits still apply.",
+ "default": "{{pct}}% (Default)",
+ "timing": "Applies to all available engines for this model and source on subsequent runs, without interrupting a response."
+ },
"contextLimitRoute": "Current {{tokens}} tokens · 1 K = 1,000 tokens",
"contextLimitOverWindow": "Above the provider’s declared window; requests may fail.",
"restoreDefault": "Restore default",
@@ -12794,6 +12800,29 @@
},
"ccAgent": {
"sessionEntry": {"missing":"This session could not be found. It may have been deleted.","denied":"This account or computer cannot access this session.","failed":"Could not load this session.","back":"Back to Sessions","retry":"Reload Session"},
+ "contextRingPanel": {
+ "title": "Context",
+ "meaning": "What AI can refer to this turn: conversation, instructions and tool results.",
+ "used": "Used",
+ "available": "Plenty of room",
+ "elevated": "Filling up",
+ "nearLimit": "Near the limit",
+ "unknown": "No data yet",
+ "continueHint": "Keep going. No adjustment needed yet.",
+ "unknownHint": "Current usage appears when the model reports it.",
+ "tokens": "{{used}} / {{total}} tokens",
+ "compact": "Compact context",
+ "compactHelp": "Summarize earlier content to free space. Some details may be omitted.",
+ "adjust": "Adjust window",
+ "taskScope": "This Session",
+ "modelSettings": "Model Defaults",
+ "modelSettingsHint": "Change this model’s default window and limit. This also affects other sessions.",
+ "remoteModelSettings": "For lasting changes, edit model settings on the computer running this session.",
+ "costHint": "A larger window holds more content and may cost more.",
+ "technical": "Technical details",
+ "auto": "Automatic compaction",
+ "autoHelp": "Codex automatically compacts context near its compaction threshold."
+ },
"contextWindowBudget": {
"menuTitle": "Task context window",
"triggerLabel": "Task context window, currently {{window}}",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 33a1a4a002..11cfdc47fc 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -3574,6 +3574,12 @@
"contextLimitHint": "このモデルのすべての利用可能なエンジンに適用されます。整数 K(1 K = 1,000 tokens)で編集します。未編集の値は精度を保持します。保存した変更は以降の実行に適用され、生成中の応答を中断しません。実際に利用できる長さはモデルサービスの制限に従います。",
"contextLimitLocalMillionHint": "標準は 256K(262,144 tokens)で、1M(1,000,000)への拡張を選べます。サービスの実行中は「サービスを管理」で再起動すると変更が反映されます。停止中なら次回の使用時に反映されます。長い入力ほどメモリと処理時間が必要です。",
"contextLimitAria": "コンテキスト上限(千 tokens)",
+ "compaction": {
+ "title": "自動圧縮",
+ "hint": "使用量が選択した割合に達するとコンテキストを整理します。低い値ほど早く圧縮します。実際のタイミングはエンジンの制限に従います。",
+ "default": "{{pct}}%(既定)",
+ "timing": "この提供元のモデルで利用可能なすべてのエンジンに適用します。以降の実行で有効になり、生成中の応答は中断しません。"
+ },
"contextLimitRoute": "現在 {{tokens}} tokens · 1 K = 1,000 tokens",
"contextLimitOverWindow": "プロバイダーが宣言した上限を超えています。リクエストが失敗する可能性があります。",
"restoreDefault": "既定に戻す",
@@ -12740,6 +12746,29 @@
},
"ccAgent": {
"sessionEntry": {"missing":"このセッションが見つかりません。削除された可能性があります。","denied":"このアカウントまたはコンピューターでは、このセッションにアクセスできません。","failed":"このセッションを読み込めませんでした。","back":"セッション一覧に戻る","retry":"セッションを再読み込み"},
+ "contextRingPanel": {
+ "title": "コンテキスト",
+ "meaning": "今回 AI が参照できる会話、指示、ツールの結果です。",
+ "used": "使用済み",
+ "available": "余裕があります",
+ "elevated": "使用量が増加",
+ "nearLimit": "上限に近づいています",
+ "unknown": "データ待ち",
+ "continueHint": "そのまま会話を続けられます。調整はまだ不要です。",
+ "unknownHint": "モデルから用量が届くと、現在の使用量が表示されます。",
+ "tokens": "{{used}} / {{total}} tokens",
+ "compact": "コンテキストを圧縮",
+ "compactHelp": "過去の内容を要約して空きを増やします。一部の詳細は省略される場合があります。",
+ "adjust": "ウィンドウを調整",
+ "taskScope": "このタスク",
+ "modelSettings": "モデルの既定設定",
+ "modelSettingsHint": "このモデルの既定のウィンドウと上限を変更します。他のタスクにも影響します。",
+ "remoteModelSettings": "継続的な変更は、このタスクを実行しているパソコンのモデル設定で行ってください。",
+ "costHint": "大きなウィンドウはより多くの内容を保持できますが、費用が増える場合があります。",
+ "technical": "技術情報",
+ "auto": "自動圧縮",
+ "autoHelp": "Codex は圧縮のしきい値に近づくとコンテキストを自動で整理します。"
+ },
"contextWindowBudget": {
"menuTitle": "このタスクのコンテキストウィンドウ",
"triggerLabel": "タスクのコンテキストウィンドウ、現在 {{window}}",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index d79b3ed3d2..f9bccb8f4a 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -3574,6 +3574,12 @@
"contextLimitHint": "이 모델의 모든 사용 가능한 엔진에 적용됩니다. 정수 K 단위로 편집합니다(1 K = 1,000 tokens). 수정하지 않은 값은 정밀도를 유지합니다. 저장한 변경 사항은 이후 실행에 적용되며 생성 중인 응답을 중단하지 않습니다. 실제로 사용할 수 있는 길이는 모델 서비스의 제한을 따릅니다.",
"contextLimitLocalMillionHint": "기본 256K(262,144 tokens)에서 1M(1,000,000) 확장을 선택할 수 있습니다. 서비스가 실행 중이면 ‘서비스 관리’에서 다시 시작해야 변경 사항이 적용되며, 중지된 상태라면 다음 사용 시 적용됩니다. 긴 입력은 더 많은 메모리와 처리 시간이 필요합니다.",
"contextLimitAria": "컨텍스트 상한(천 tokens)",
+ "compaction": {
+ "title": "자동 압축",
+ "hint": "사용량이 선택한 비율에 도달하면 컨텍스트를 정리합니다. 값이 낮을수록 더 일찍 압축하며 엔진 제한이 적용됩니다.",
+ "default": "{{pct}}% (기본값)",
+ "timing": "이 공급 경로의 모델에서 사용 가능한 모든 엔진에 적용됩니다. 이후 실행부터 반영되며 생성 중인 응답은 중단하지 않습니다."
+ },
"contextLimitRoute": "현재 {{tokens}} tokens · 1 K = 1,000 tokens",
"contextLimitOverWindow": "공급업체가 명시한 한도를 초과하여 요청이 실패할 수 있습니다.",
"restoreDefault": "기본값 복원",
@@ -12740,6 +12746,29 @@
},
"ccAgent": {
"sessionEntry": {"missing":"이 세션을 찾을 수 없습니다. 삭제되었을 수 있습니다.","denied":"현재 계정 또는 컴퓨터에서 이 세션에 접근할 수 없습니다.","failed":"이 세션을 불러오지 못했습니다.","back":"세션 목록으로 돌아가기","retry":"세션 다시 불러오기"},
+ "contextRingPanel": {
+ "title": "컨텍스트",
+ "meaning": "이번 턴에 AI가 참고할 수 있는 대화, 지시 및 도구 결과입니다.",
+ "used": "사용됨",
+ "available": "공간 충분",
+ "elevated": "사용량 높음",
+ "nearLimit": "한도에 근접",
+ "unknown": "데이터 없음",
+ "continueHint": "계속 대화하세요. 아직 조정할 필요가 없습니다.",
+ "unknownHint": "모델이 사용량을 보고하면 현재 사용량이 표시됩니다.",
+ "tokens": "{{used}} / {{total}} tokens",
+ "compact": "컨텍스트 압축",
+ "compactHelp": "이전 내용을 요약해 공간을 확보합니다. 일부 세부 내용은 생략될 수 있습니다.",
+ "adjust": "창 조정",
+ "taskScope": "이 작업",
+ "modelSettings": "모델 기본 설정",
+ "modelSettingsHint": "이 모델의 기본 창과 한도를 변경합니다. 다른 작업에도 영향을 줍니다.",
+ "remoteModelSettings": "계속 적용하려면 이 작업을 실행하는 컴퓨터에서 모델 설정을 변경하세요.",
+ "costHint": "큰 창은 더 많은 내용을 담지만 비용이 늘어날 수 있습니다.",
+ "technical": "상세 정보",
+ "auto": "자동 압축",
+ "autoHelp": "Codex는 압축 임계값에 가까워지면 컨텍스트를 자동으로 정리합니다."
+ },
"contextWindowBudget": {
"menuTitle": "이 작업의 컨텍스트 창",
"triggerLabel": "작업 컨텍스트 창, 현재 {{window}}",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index 88fd2309e8..dcd4166474 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -3574,6 +3574,12 @@
"contextLimitHint": "用于此模型的所有可用引擎。以整数 K 编辑(1 K = 1,000 tokens);未编辑时保留精确值。保存后用于后续运行,正在生成的内容不受影响。实际可用长度仍受模型服务限制。",
"contextLimitLocalMillionHint": "原生 256K(262,144 tokens),可选扩展至 1M(1,000,000)。服务运行时需在「管理服务」中重启以应用更改;已停止时,下次使用自动生效。长输入会增加内存占用和等待时间。",
"contextLimitAria": "上下文上限(千 tokens)",
+ "compaction": {
+ "title": "自动压缩",
+ "hint": "占用达到所选比例时整理上下文。比例越低,越早压缩;实际时机仍受引擎限制。",
+ "default": "{{pct}}%(默认)",
+ "timing": "用于此来源下该模型的所有可用引擎。后续运行生效,不中断正在生成的内容。"
+ },
"contextLimitRoute": "当前 {{tokens}} tokens · 1 K = 1,000 tokens",
"contextLimitOverWindow": "已超过上游声明的长度,可能导致请求失败。",
"restoreDefault": "恢复默认",
@@ -12740,6 +12746,29 @@
},
"ccAgent": {
"sessionEntry": {"missing":"找不到这条任务,它可能已被删除。","denied":"当前账号或电脑无法访问这条任务。","failed":"未能加载这条任务。","back":"返回任务列表","retry":"重新加载任务"},
+ "contextRingPanel": {
+ "title": "上下文",
+ "meaning": "AI 本轮能参考的内容,包括对话、指令和工具结果。",
+ "used": "已使用",
+ "available": "空间充足",
+ "elevated": "占用较高",
+ "nearLimit": "接近上限",
+ "unknown": "尚无数据",
+ "continueHint": "可以继续对话,暂时无需调整。",
+ "unknownHint": "收到模型的用量数据后,这里会显示当前占用。",
+ "tokens": "{{used}} / {{total}} tokens",
+ "compact": "压缩上下文",
+ "compactHelp": "概括较早内容,腾出空间。部分细节可能省略。",
+ "adjust": "调整窗口",
+ "taskScope": "本任务",
+ "modelSettings": "模型默认设置",
+ "modelSettingsHint": "修改此模型的默认窗口及上限,也会影响其他任务。",
+ "remoteModelSettings": "长期调整需前往运行此任务的电脑,修改模型设置。",
+ "costHint": "更大的窗口能容纳更多内容,也可能增加费用。",
+ "technical": "技术详情",
+ "auto": "自动压缩",
+ "autoHelp": "Codex 会在接近压缩阈值时自动整理上下文。"
+ },
"contextWindowBudget": {
"menuTitle": "任务上下文窗口",
"triggerLabel": "任务上下文窗口,当前 {{window}}",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 2d119bbbea..946a37ea32 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -3574,6 +3574,12 @@
"contextLimitHint": "套用至此模型所有可用引擎。以整數 K 編輯(1 K = 1,000 tokens);未編輯時保留精確值。儲存後用於後續執行,不影響正在產生的內容。實際可用長度仍受模型服務限制。",
"contextLimitLocalMillionHint": "原生 256K(262,144 tokens),可選擴展至 1M(1,000,000)。服務執行時需在「管理服務」中重新啟動以套用變更;已停止時,下次使用自動生效。長輸入會增加記憶體用量和等待時間。",
"contextLimitAria": "上下文上限(千 tokens)",
+ "compaction": {
+ "title": "自動壓縮",
+ "hint": "占用達到所選比例時整理上下文。比例越低,越早壓縮;實際時機仍受引擎限制。",
+ "default": "{{pct}}%(預設)",
+ "timing": "套用至此來源下該模型的所有可用引擎。後續執行生效,不中斷正在產生的內容。"
+ },
"contextLimitRoute": "目前 {{tokens}} tokens · 1 K = 1,000 tokens",
"contextLimitOverWindow": "已超過上游宣告的長度,可能導致請求失敗。",
"restoreDefault": "恢復預設",
@@ -12740,6 +12746,29 @@
},
"ccAgent": {
"sessionEntry": {"missing":"找不到這條任務,它可能已被刪除。","denied":"目前帳號或電腦無法存取這條任務。","failed":"未能載入這條任務。","back":"返回任務列表","retry":"重新載入任務"},
+ "contextRingPanel": {
+ "title": "上下文",
+ "meaning": "AI 本輪可參考的內容,包括對話、指令與工具結果。",
+ "used": "已使用",
+ "available": "空間充足",
+ "elevated": "占用較高",
+ "nearLimit": "接近上限",
+ "unknown": "尚無資料",
+ "continueHint": "可以繼續對話,暫時無需調整。",
+ "unknownHint": "收到模型的用量資料後,這裡會顯示目前占用。",
+ "tokens": "{{used}} / {{total}} tokens",
+ "compact": "壓縮上下文",
+ "compactHelp": "概括較早內容,騰出空間。部分細節可能省略。",
+ "adjust": "調整視窗",
+ "taskScope": "本任務",
+ "modelSettings": "模型預設設定",
+ "modelSettingsHint": "修改此模型的預設視窗及上限,也會影響其他任務。",
+ "remoteModelSettings": "長期調整需前往執行此任務的電腦,修改模型設定。",
+ "costHint": "較大的視窗可容納更多內容,也可能增加費用。",
+ "technical": "技術詳情",
+ "auto": "自動壓縮",
+ "autoHelp": "Codex 會在接近壓縮門檻時自動整理上下文。"
+ },
"contextWindowBudget": {
"menuTitle": "任務上下文視窗",
"triggerLabel": "任務上下文視窗,目前 {{window}}",
diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.ts
index 9bec4d5531..05d6a5a93a 100644
--- a/apps/desktop/src/renderer/vite-env.d.ts
+++ b/apps/desktop/src/renderer/vite-env.d.ts
@@ -5966,6 +5966,11 @@ interface ElectronAPI {
getModelContextLimit: (
target: import('../shared/modelContextLimit').ModelContextLimitTarget,
) => Promise<import('../shared/modelContextLimit').ModelContextLimitView>;
+ setModelCompaction: (
+ target: import('../shared/modelContextLimit').ModelContextLimitTarget,
+ pct: number | null,
+ owner: import('../shared/modelContextLimit').ModelContextLimitOwner,
+ ) => Promise<import('../shared/modelContextLimit').ModelContextLimitView>;
/** 任务窗口档位表的权威边界(与 device-link 的 maker:get-context-window-bounds 同一 handler)。 */
getSessionContextWindowBounds: (
sessionId: string,
diff --git a/apps/desktop/src/shared/modelContextLimit.ts b/apps/desktop/src/shared/modelContextLimit.ts
index 45e2e9fdda..61e67681d5 100644
--- a/apps/desktop/src/shared/modelContextLimit.ts
+++ b/apps/desktop/src/shared/modelContextLimit.ts
@@ -1,5 +1,18 @@
import type { CodexContextWindowInfo } from '@cindy/maker-core';
import type { ModelPriceOverrideTarget } from './modelPriceOverride';
+import type { AgentKind, ProviderView } from '@cindy/model-providers';
+
+export const DEFAULT_MODEL_COMPACTION_PCT = 90;
+
+/** Match the model row identity, removing only the provider's declared bridge prefix. */
+export function modelCompactionTarget(
+ provider: Pick<ProviderView, 'id' | 'routing'>,
+ agent: AgentKind,
+ modelId: string,
+): { providerId: string; modelId: string } {
+ const prefix = provider.routing[agent]?.modelPrefixes?.find((value) => modelId.startsWith(value));
+ return { providerId: provider.id, modelId: prefix ? modelId.slice(prefix.length) : modelId };
+}
/** One model row can use different wire ids in different harnesses. */
export interface ModelContextLimitTarget extends ModelPriceOverrideTarget {
@@ -12,6 +25,10 @@ export interface ModelContextLimitOwner {
ownerGeneration: number;
}
export interface ModelContextLimitView {
+ compaction?: {
+ pct: number;
+ isCustomized: boolean;
+ };
codexContext?: CodexContextWindowInfo | null;
limit: number | null;
isCustomized: boolean;
diff --git a/docs/dev-rules/configuration-and-overrides.md b/docs/dev-rules/configuration-and-overrides.md
index 231ef3fd9a..c567d34e0a 100644
--- a/docs/dev-rules/configuration-and-overrides.md
+++ b/docs/dev-rules/configuration-and-overrides.md
@@ -80,6 +80,19 @@ override 仍然优先。供应商/模型停用、退役、付费准入和凭
## 3. 默认值演进与迁移
+### 模型上下文与压缩(2026-10-27)
+
+上下文圆环集中展示状态;任务窗口档位及模型设置入口只放在「调整窗口」展开区。
+任务档位会随任务保存,不称作一次性「临时设置」。模型窗口仍同时约束任务上限,本次不放宽。
+自动压缩设置归入供应商的模型详情高级区域,不再在个性化按 Harness 陈列。
+压缩比例按供应商连接与模型保存,桥接前缀按供应商路由声明归一,同一模型的所有 Harness 共用。
+默认统一为 90%;仅保存显式覆盖,恢复默认删除覆盖。用户于本次方案复核后明确选择统一策略,
+旧 Claude Code/Pi 全局比例退出运行时生效链路,原文件保留但不迁移成模型覆盖。
+不再显示「沿用原有策略」或按 Harness 分列的比例。已有窗口上限和任务预算语义不变。
+统一自定义范围为 50–90%,由各引擎适配;Codex 使用原生 token 阈值和逐模型目录,
+Pi 使用逐模型 reserveTokens,Claude Code 同步原生环境与 host 判断。
+运行中的生成不被中断,复用已有模型设置刷新/回合边界处理;界面不得将新偏好冒充在途实际值。
+
- 默认值变化时,分别说明新用户、未自定义老用户、已自定义老用户的行为。
- 迁移必须基于「是否自定义」的状态判断,**不得通过旧值猜测用户意图**;只有历史数据缺少
自定义状态时才允许一次性兼容迁移,并在代码或 PR 中说明判断依据与风险。
diff --git a/docs/dev-rules/maker-core-and-agent-behavior.md b/docs/dev-rules/maker-core-and-agent-behavior.md
index 148a5f9f4e..9b5dd08946 100644
--- a/docs/dev-rules/maker-core-and-agent-behavior.md
+++ b/docs/dev-rules/maker-core-and-agent-behavior.md
@@ -104,7 +104,8 @@ Claude Code 的 `upstream-idle-watchdog.test.ts` 与 desktop 的 `tool-loop-revi
## 上下文已满时的引擎边界
Claude Code 在同一模型上达到设置页自动压缩阈值且尚未满窗时,由 host 注入 `/compact`;
-Pi 读取独立的设置页百分比,在每次启动或恢复任务时冻结并写成原生 `compaction.reserveTokens`,由 Pi 按
+Desktop 的压缩比例按供应商与模型统一(默认 90%),所有 Harness 共用,旧全局偏好不再生效。
+Pi 在启动或恢复时将模型比例写成原生 `compaction.reserveTokens` / `modelOverrides`,由 Pi 按
`contextWindow - reserveTokens` 处理 threshold 压缩,并在 provider 报 context overflow 时按原生
`Agent.continue()` 语义压缩续接。Cindy 只消费 Pi 的 `compaction_start`/`compaction_end` 事件做
UI、usage 与 digest 投影,不再向 Pi 注入 host 自动 compact RPC。
diff --git a/docs/dev-rules/pi-harness.md b/docs/dev-rules/pi-harness.md
index d6d5d86944..8009599b97 100644
--- a/docs/dev-rules/pi-harness.md
+++ b/docs/dev-rules/pi-harness.md
@@ -126,15 +126,16 @@ Cindy 显式设置:models.json、`settings.json` 的 `transport:sse` 与 `retry.
目前只在会话启动钩子接入)。
Pi 原生负责 threshold 与 overflow 压缩;
Cindy 消费 compaction 事件做 UI、usage、digest 投影,并只在本机原生自动压缩确定性失败后锁存
-下一次发送前换窗。设置页的 Pi 百分比默认 90%(已有显式 override 保留),在每次启动或恢复
-Pi 任务时冻结,并写入该任务 `settings.json` 的 `compaction.reserveTokens`
-(`capacity - budget * pct/100`);切模只按这份百分比快照重算,不回读最新全局值。
+下一次发送前换窗。Desktop 按供应商与模型提供统一压缩比例(默认 90%,所有 Harness 共用),
+在每次启动或恢复 Pi 任务时写入原生设置(`capacity - budget * pct/100`),
+模型覆盖写进 `compaction.modelOverrides`;旧 Pi 全局偏好不再参与 Desktop 运行时计算。
模型容量用于 Pi 原生请求长度裁剪,不能随小预算缩到 1K;工作预算只调整原生压缩阈值,
并作为已应用预算进入 Cindy 的用量快照。
大窗切小窗先由 Desktop 的统一目标窗口事务按目标窗口 90% 固定压力线评估(独立于 Pi
日常自动压缩百分比),命中时复用既有上下文接续事务;未命中时,已加载的 Pi 1.0 模型使用启动时写入的
`compaction.modelOverrides["provider/modelId"].reserveTokens`,再用原生 `set_model` 与
-`get_state` 确认 provider/model/contextWindow。百分比沿用任务启动快照;工作预算按来源和模型解析。
+`get_state` 确认 provider/model/contextWindow。压缩比例与工作预算均按来源和模型解析,
+与运行时快照不同则按既有预览结果重建,不把偏好更新冒充原生内存已更新。
如果新目录或工作预算要求的保留量与运行中 Pi 实际配置不同,预览返回既有 `rebuild`,
由宿主恢复流程加载配置;不得谎称文件改写已更新 Pi 内存。旧 Pi 不支持按模型配置时,
同保留量的选择仍可热切,需变化时走同一预览分支。
@@ -142,7 +143,7 @@ Pi 任务时冻结,并写入该任务 `settings.json` 的 `compaction.reserveT
不能当成无损配置刷新。忙时选择必须在回合结束后走同一切换与容量事务,不能由延后服务
直接关闭 Pi。原生校验完成前,子代理 route 保持 pending;确认并持久化目标路由后才放行
排队消息。
-Claude Code 仍用独立百分比。env:`CINDY_PI_API_KEY`、
+Claude Code、Codex 共用同一模型比例,各自适配原生参数。env:`CINDY_PI_API_KEY`、
`CINDY_PI_SESSION_ID`、`PI_CODING_AGENT_DIR`、`CINDY_PI_PERMISSION_FILE`、`CINDY_PI_MCP_BRIDGE`、
外部 MCP 专用动态 env、`PI_OFFLINE=1`(关启动期联网)、`NO_PROXY` 兜底 loopback(防全局代理
打穿本地 proxy 与 MCP bridge)。
@@ -165,8 +166,8 @@ SSH 不套用本机限核值。沿用现有默认值与 override 存储,不新
放任 pi 默认(未写 settings.json):`httpIdleTimeoutMs=300000`、`websocketConnectTimeoutMs`、
`compaction.keepRecentTokens`、`defaultProjectTrust`。Cindy 会在每次 startSession 覆写
`transport`、`retry.maxRetries=6`(provider 级保持 0)与 `compaction.reserveTokens`;
-未配置 Pi 百分比且未缩小工作预算时不写 `reserveTokens`,沿用 Pi 默认 16384;
-显式小预算仍以默认 90% 计算触发阈值。
+非 Desktop 宿主未提供百分比且未缩小工作预算时不写 `reserveTokens`,沿用 Pi 默认 16384;
+Desktop 始终提供模型比例,未自定义为 90%。
### 运行中的模型目录与凭据更新
diff --git a/packages/maker-core/src/agents/base-agent.ts b/packages/maker-core/src/agents/base-agent.ts
index 0be4175e8a..d3fc5b0e65 100644
--- a/packages/maker-core/src/agents/base-agent.ts
+++ b/packages/maker-core/src/agents/base-agent.ts
@@ -986,6 +986,12 @@ export interface AgentDeps {
modelId: string,
) => number | null;
+ /** Host-resolved model percentage. Hosts without a policy retain their runtime defaults. */
+ resolveModelCompactionPct?: (
+ providerId: string | null | undefined,
+ modelId: string,
+ ) => number | null;
+
/** Resolve native metadata using the exact app-server config and usage report. */
resolveCodexContextWindowInfo?: (
modelId: string,
diff --git a/packages/maker-core/src/agents/claude-code/__tests__/rewind-runtime-settings.test.ts b/packages/maker-core/src/agents/claude-code/__tests__/rewind-runtime-settings.test.ts
index 78e39b950f..0c05f42cc9 100644
--- a/packages/maker-core/src/agents/claude-code/__tests__/rewind-runtime-settings.test.ts
+++ b/packages/maker-core/src/agents/claude-code/__tests__/rewind-runtime-settings.test.ts
@@ -212,6 +212,7 @@ async function startRewindableSession(
effort?: Effort;
availableModels?: ModelDescriptor[];
resolveModelContextLimit?: AgentDeps['resolveModelContextLimit'];
+ resolveModelCompactionPct?: AgentDeps['resolveModelCompactionPct'];
resolveModelEfforts?: AgentDeps['resolveModelEfforts'];
shouldHandoffAfterContextAssessment?: (tokens: number, window: number) => boolean;
} = {},
@@ -245,6 +246,7 @@ async function startRewindableSession(
),
capabilityAdditions: { availableModels: options.availableModels ?? TEST_MODELS },
resolveModelContextLimit: options.resolveModelContextLimit,
+ resolveModelCompactionPct: options.resolveModelCompactionPct,
...(options.resolveModelEfforts ? { resolveModelEfforts: options.resolveModelEfforts } : {}),
...(remoteCcQueryFactory ? { remoteCcQueryFactory } : {}),
});
@@ -333,6 +335,19 @@ describe('ClaudeCodeAgent runtime settings during rewind window', () => {
} finally { await handle.close(); }
});
+ it('uses the model compaction policy in the native environment and preserves the legacy fallback', async () => {
+ for (const pct of [75, null]) {
+ sdkMock.query.mockClear();
+ const { handle } = await startRewindableSession({
+ autoCompactThresholdPct: 85,
+ resolveModelCompactionPct: () => pct,
+ });
+ try {
+ expect(sdkMock.query.mock.calls[0]?.[0]?.options?.env.CLAUDE_AUTOCOMPACT_PCT_OVERRIDE).toBe(String(pct ?? 85));
+ } finally { await handle.close(); }
+ }
+ });
+
it('passes the selected custom-provider window and compact threshold to spawned Claude Code', async () => {
const originalMaxContextTokens = process.env.CLAUDE_CODE_MAX_CONTEXT_TOKENS;
const originalCompactPctOverride = process.env.CLAUDE_AUTOCOMPACT_PCT_OVERRIDE;
diff --git a/packages/maker-core/src/agents/claude-code/index.ts b/packages/maker-core/src/agents/claude-code/index.ts
index b6cc040349..2243888efa 100644
--- a/packages/maker-core/src/agents/claude-code/index.ts
+++ b/packages/maker-core/src/agents/claude-code/index.ts
@@ -1766,8 +1766,11 @@ export class ClaudeCodeAgent extends BaseAgent {
let makerMemoryRules = '';
let makerMemoryIndex = '';
let memoryFlushController: MemoryFlushController | null = null;
+ let mutableModel = opts.model;
+ let mutableProviderId = opts.providerId ?? null;
const getAutoCompactThresholdPct = (): number | undefined =>
- this.deps.runtimeConfig.autoCompactThresholdPct;
+ this.deps.resolveModelCompactionPct?.(mutableProviderId, mutableModel)
+ ?? this.deps.runtimeConfig.autoCompactThresholdPct;
const autoCompactController =
getAutoCompactThresholdPct() === undefined
? null
@@ -2980,8 +2983,6 @@ export class ClaudeCodeAgent extends BaseAgent {
// model / effort / permissionMode 在 setX 后会变, handle 通过 getter 读 mutable 引用;
// translator ctx 也通过 getter 读, 让 turn start/end 日志反映"当前真实值"而不是创建时的值。
// 必须在 buildQuery / forward loop 之前声明, 否则 ctx getter 会捕获到 TDZ。
- let mutableModel = opts.model;
- let mutableProviderId = opts.providerId ?? null;
let mutableAutoReviewCredentialMode = effectiveCredentialMode;
let nativeAutoReviewUnavailable = false;
let currentAutoReviewIntent: AutoReviewUserIntent = '';
@@ -3715,8 +3716,8 @@ export class ClaudeCodeAgent extends BaseAgent {
const currentSdkModel = sdkModelFor(mutableModel);
const workingWindow = resolveModelContextWindow(mutableModel);
appliedContextWindow = workingWindow;
- applyClaudeContextWindow(env, workingWindow, this.deps.runtimeConfig.autoCompactThresholdPct);
- if (remoteEnv) applyClaudeContextWindow(remoteEnv, workingWindow, this.deps.runtimeConfig.autoCompactThresholdPct);
+ applyClaudeContextWindow(env, workingWindow, getAutoCompactThresholdPct());
+ if (remoteEnv) applyClaudeContextWindow(remoteEnv, workingWindow, getAutoCompactThresholdPct());
const currentSdkEffort = getSdkEffortForModel(mutableModel, mutableEffort, mutableProviderId);
const baseResumeAt = vo.resumeSessionAt as string | undefined;
const baseFork = vo.forkSession as boolean | undefined;
diff --git a/packages/maker-core/src/agents/codex/index.test.ts b/packages/maker-core/src/agents/codex/index.test.ts
index 642b285d3c..32787a853c 100644
--- a/packages/maker-core/src/agents/codex/index.test.ts
+++ b/packages/maker-core/src/agents/codex/index.test.ts
@@ -32979,6 +32979,27 @@ describe('CodexAgent context window reporting', () => {
await handle.close();
});
+ it('keeps per-model catalog settings free of global window overrides and preserves in-flight compaction facts', async () => {
+ let pct: number | null = 75;
+ const resolveCodexContextWindowInfo = vi.fn(async () => null);
+ const agent = new CodexAgent(createDeps({}, {
+ resolveModelCompactionPct: () => pct,
+ resolveCodexThreadContextWindow: () => 400_000,
+ resolveCodexContextWindowInfo,
+ }));
+ const host = installFakeHost(agent, method => method === Method.ConfigRead ? { config: {} } : undefined);
+ const handle = await agent.startSession({ sessionId: 'model-compaction-policy', model: GATEWAY_MODEL, workingDir: '/repo' });
+ try {
+ const start = host.request.mock.calls.find(([method]) => method === Method.ThreadStart)?.[1] as { config?: Record<string, unknown> };
+ expect(start.config?.model_context_window).toBeUndefined();
+ expect(start.config?.model_auto_compact_token_limit).toBeUndefined();
+ pct = 60;
+ await handle.getCodexContextWindowInfo?.();
+ expect(resolveCodexContextWindowInfo).toHaveBeenLastCalledWith(GATEWAY_MODEL,
+ expect.objectContaining({ model_auto_compact_token_limit: 300_000 }), null);
+ } finally { await handle.close(); }
+ });
+
it('reads the bound CLI configuration without changing it or using the provider catalog', async () => {
const nativeInfo = { contextWindow: 272_000, usableContextWindow: 258_400, autoCompactTokenLimit: 244_800,
modelMaxContextWindow: 872_000, source: 'runtime' as const, fallbackModel: false };
diff --git a/packages/maker-core/src/agents/codex/index.ts b/packages/maker-core/src/agents/codex/index.ts
index f879abf74e..6f6cd30bff 100644
--- a/packages/maker-core/src/agents/codex/index.ts
+++ b/packages/maker-core/src/agents/codex/index.ts
@@ -3815,6 +3815,7 @@ assertRouteCurrent();
*/
let activeTurnModel: string | undefined = opts.model;
let activeTurnContextLimit = this.deps.resolveModelContextLimit?.(opts.providerId, opts.model) ?? null;
+ let activeTurnCompactionPct = this.deps.resolveModelCompactionPct?.(opts.providerId, opts.model) ?? 90;
/**
* 任务级工作上下文预算(tokens):host 已按目录上限与模型级上限收敛。
* 优先于模型级上限/目录默认;host 在预算变化时直接触发重建,不走热切。
@@ -6569,6 +6570,9 @@ assertRouteCurrent();
}
let customProviderThreadConfig: Record<string, unknown> = {};
+ const currentCompactionPct = () => this.deps.resolveModelCompactionPct?.(
+ mutableProviderId, mutableCatalogModel ?? mutableModel,
+ ) ?? null;
const currentContextLimit = (): number | null => {
// 任务级预算优先:本任务的工作窗口由用户显式选定,host 已收敛到目录上限内。
if (mutableContextWindowBudget !== null) return mutableContextWindowBudget;
@@ -6587,6 +6591,7 @@ assertRouteCurrent();
};
let appliedContextLimit = currentContextLimit();
activeTurnContextLimit = effectiveThreadContextWindow(appliedContextLimit);
+ activeTurnCompactionPct = currentCompactionPct() ?? 90;
/** 设备托管:线程与每轮都选中任务所在电脑上的 exec-server 环境(工作目录与根都是那台电脑的路径)。 */
function hostedEnvironmentParams(): { environments?: Array<Record<string, unknown>> } {
@@ -6766,7 +6771,7 @@ assertRouteCurrent();
model_context_window: Math.floor(threadContextWindow),
model_auto_compact_token_limit: Math.max(
1,
- Math.floor(threadContextWindow * 0.9),
+ Math.floor(threadContextWindow * ((currentCompactionPct() ?? 90) / 100)),
),
}
: {}),
@@ -13639,6 +13644,7 @@ assertRouteCurrent();
// 立即改这两个值也不会串到还在产出的本 turn (见 activeTurnModel / capContextWindow)。
activeTurnModel = mutableCatalogModel;
activeTurnContextLimit = effectiveThreadContextWindow(appliedContextLimit);
+ activeTurnCompactionPct = currentCompactionPct() ?? 90;
activeTurnProviderId = mutableProviderId;
const markTurnConfigAccepted = (): void => {
threadMayHaveRollout = true;
@@ -14070,6 +14076,7 @@ assertRouteCurrent();
// 窗口归属必须跟着改写走, 否则查不到目录条目、沿用 app-server 的基础模型窗口。
activeTurnModel = mutableCatalogModel;
activeTurnContextLimit = effectiveThreadContextWindow(appliedContextLimit);
+ activeTurnCompactionPct = currentCompactionPct() ?? 90;
activeTurnProviderId = mutableProviderId;
if (serviceTierState.value !== undefined) {
turnParams.serviceTier = serviceTierState.value ?? null;
@@ -14546,7 +14553,7 @@ assertRouteCurrent();
const model = activeTurnModel ?? mutableModel;
const reportedWindow = lastNativeContextWindow;
const contextLimit = activeTurnContextLimit;
- const compactRatio = 0.9;
+ const compactRatio = activeTurnCompactionPct / 100;
try {
const response = await host.request<{ config?: Record<string, unknown> }>(
Method.ConfigRead, { includeLayers: false, cwd: opts.workingDir }, { timeoutMs: 5_000 },
diff --git a/packages/maker-core/src/agents/pi/__tests__/pi-agent.integration.test.ts b/packages/maker-core/src/agents/pi/__tests__/pi-agent.integration.test.ts
index ac55ed0a01..db312c4649 100644
--- a/packages/maker-core/src/agents/pi/__tests__/pi-agent.integration.test.ts
+++ b/packages/maker-core/src/agents/pi/__tests__/pi-agent.integration.test.ts
@@ -528,6 +528,27 @@ describe.skipIf(!piAvailable)('PiAgent integration (real pi binary + fake gatewa
}
});
+ it('applies a model compaction policy in native Pi and detects a later policy change', { timeout: 30_000 }, async () => {
+ let pct: number | null = 75;
+ const deps = buildDeps();
+ deps.runtimeConfig.piAutoCompactThresholdPct = 85;
+ deps.resolveModelCompactionPct = (provider, model) => provider === 'xd' && model === 'pi-test-model' ? pct : null;
+ const agent = new PiAgent(deps);
+ const workingDir = mkdtempSync(path.join(tmpdir(), 'pi-model-compaction-'));
+ let handle: AgentSessionHandle | undefined;
+ try {
+ handle = await agent.startSession({ sessionId: 'model-compaction-native', workingDir, model: 'pi-test-model', providerId: 'xd' });
+ expect((await handle.previewModelSwitch?.('pi-test-model', { providerId: 'xd' }))?.action).toBe('hot');
+ pct = 80;
+ expect((await handle.previewModelSwitch?.('pi-test-model', { providerId: 'xd' }))?.action).toBe('rebuild');
+ await handle.close();
+ handle = await agent.startSession({ sessionId: 'model-compaction-native-next', workingDir, model: 'pi-test-model', providerId: 'xd' });
+ expect((await handle.previewModelSwitch?.('pi-test-model', { providerId: 'xd' }))?.action).toBe('hot');
+ pct = null;
+ expect((await handle.previewModelSwitch?.('pi-test-model', { providerId: 'xd' }))?.action).toBe('rebuild');
+ } finally { await handle?.close(); rmSync(workingDir, { recursive: true, force: true }); }
+ });
+
it.each(['CLAUDE.md', 'AGENTS.md', 'AGENTS.override.md'])(
'loads global %s with native precedence and keeps the prompt stable across turns',
{ timeout: 60_000 },
diff --git a/packages/maker-core/src/agents/pi/__tests__/pi-startsession-cleanup.test.ts b/packages/maker-core/src/agents/pi/__tests__/pi-startsession-cleanup.test.ts
index 7f34618782..1ebd50082e 100644
--- a/packages/maker-core/src/agents/pi/__tests__/pi-startsession-cleanup.test.ts
+++ b/packages/maker-core/src/agents/pi/__tests__/pi-startsession-cleanup.test.ts
@@ -259,6 +259,24 @@ describe('PiAgent.startSession failure cleanup (mocked pi process)', () => {
};
}
+ it('writes model-scoped compaction without replacing the inherited policy of other models or providers', async () => {
+ const agent = new PiAgent(buildDeps({
+ runtimeConfig: { endpoint: 'http://127.0.0.1:9', piAutoCompactThresholdPct: 85 },
+ capabilityAdditions: { availableModels: [
+ { id: 'm', displayName: 'M', contextWindow: 200_000, efforts: [], defaultEffort: null },
+ { id: 'other', displayName: 'Other', contextWindow: 200_000, efforts: [], defaultEffort: null },
+ ] },
+ resolveModelCompactionPct: (source, model) => source === 'xd' && model === 'm' ? 75 : null,
+ }));
+ const handle = await agent.startSession({ sessionId: 'compaction-policy', workingDir: cwd, model: 'm', providerId: 'xd' });
+ try {
+ const home = knobs.spawnedEnvs.at(-1)!.PI_CODING_AGENT_DIR!;
+ const settings = JSON.parse(readFileSync(path.join(home, 'settings.json'), 'utf8'));
+ expect(settings.compaction.modelOverrides['cindy/m'].reserveTokens).toBe(50_000);
+ expect(settings.compaction.modelOverrides['cindy/other'].reserveTokens).toBe(30_000);
+ } finally { await handle.close(); }
+ });
+
function approvedInput(
workingDir: string,
revision: string,
diff --git a/packages/maker-core/src/agents/pi/index.ts b/packages/maker-core/src/agents/pi/index.ts
index 3666361c93..a04d9ac3eb 100644
--- a/packages/maker-core/src/agents/pi/index.ts
+++ b/packages/maker-core/src/agents/pi/index.ts
@@ -2531,15 +2531,18 @@ export class PiAgent extends BaseAgent {
// Agent-level retries stay with Pi (provider maxRetries stays 0 — Pi docs:
// SDK retries can swallow quota errors before the agent sees them).
const compactionModelOverrides: Record<string, { reserveTokens: number }> = {};
- const addBudget = (provider: string, id: string, window: number, workingWindow?: number) => {
+ const addBudget = (provider: string, id: string, window: number, workingWindow?: number,
+ source = provider, sourceModel = id) => {
// 任务级预算优先:预算存在时**每个**可选模型都按预算生成保留量(与预演、切后写盘
// 同一口径),否则顶层 reserveTokens 会被同模型的 model-level override 盖掉。
const effectiveWorkingWindow = opts.sessionContextWindowBudget ?? workingWindow;
- const settings = JSON.parse(buildPiSettingsJsonContent(window, opts.piCompactionPct, [], effectiveWorkingWindow));
+ const pct = this.deps.resolveModelCompactionPct?.(source, sourceModel) ?? opts.piCompactionPct;
+ const settings = JSON.parse(buildPiSettingsJsonContent(window, pct, [], effectiveWorkingWindow));
compactionModelOverrides[`${provider}/${id}`] = { reserveTokens: settings.compaction?.reserveTokens ?? 16_384 };
};
for (const model of models) addBudget(PI_PROVIDER_ID, model.id, model.contextWindow,
- this.deps.resolveModelContextLimit?.(gatewayProviderId ?? 'xd', model.id) ?? undefined);
+ this.deps.resolveModelContextLimit?.(gatewayProviderId ?? 'xd', model.id) ?? undefined,
+ gatewayProviderId ?? 'xd');
for (const provider of nativeProviders) {
if (provider.id === PI_PROVIDER_ID) continue;
for (const model of provider.models) {
@@ -2564,7 +2567,7 @@ export class PiAgent extends BaseAgent {
? workingWindow
: Math.max(model.contextWindow ?? learnedWindow ?? 128_000, workingWindow ?? 0);
addBudget(provider.id, model.wireId ?? model.id,
- budgetWindow, workingWindow);
+ budgetWindow, workingWindow, provider.sourceProviderId ?? provider.id, model.id);
}
}
const settingsJsonContent = await this.buildSettingsJsonPreservingUserKeys(
@@ -6731,7 +6734,8 @@ export class PiAgent extends BaseAgent {
model: string,
budget: number | null = sessionContextWindowBudget,
): number => {
- const settings = JSON.parse(buildPiSettingsJsonContent(window, sessionPiAutoCompactPct, [],
+ const settings = JSON.parse(buildPiSettingsJsonContent(window,
+ this.deps.resolveModelCompactionPct?.(source, model) ?? sessionPiAutoCompactPct, [],
budget ?? this.deps.resolveModelContextLimit?.(source, model) ?? undefined));
return settings.compaction?.reserveTokens ?? 16_384;
};