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。

fix(context): 删除连接时清理模型压缩偏好并更新圆环回归

Dash03a93eafbb3a
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 6530e552c9..fb61dfddf4 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
@@ -37,6 +37,7 @@ import {
writeModelContextLimits,
writeModelContextLimitsWithRefresh,
readModelCompactionPct,
+ stageProviderModelCompactionClear,
resolveModelCompactionPct,
writeModelCompactionWithRefresh,
} from '../model-context-limit-store';
@@ -86,6 +87,46 @@ describe('model context limit store', () => {
__testing.invalidate();
});
+ // PR #7460 deletion P1, unit: existing write/reset tests did not cover removing
+ // every model of one connection, including off-catalog models and rollback.
+ it('clears only the exact provider compaction policies and restores after deletion failure', async () => {
+ const providerId = 'custom:quote"connection';
+ const target = { providerId, modelId: 'gpt' };
+ const retired = { providerId, modelId: 'retired' };
+ const other = { providerId: `${providerId}:other`, modelId: 'gpt' };
+ const save = (targets: typeof target[], pct: number) =>
+ writeModelCompactionWithRefresh(targets, pct, async () => {}, async () => {});
+ await save([target, retired], 65);
+ await save([other], 80);
+ writeModelContextLimit('codex', providerId, 'gpt', 272_000);
+ const restore = stageProviderModelCompactionClear(providerId);
+ expect(readModelCompactionPct(providerId, 'gpt')).toBeNull();
+ expect(readModelCompactionPct(providerId, 'retired')).toBeNull();
+ expect(readModelCompactionPct(other.providerId, 'gpt')).toBe(80);
+ expect(readModelContextLimit('codex', providerId, 'gpt')).toBe(272_000);
+ expect(stageProviderModelCompactionClear(providerId)()).toBe(true);
+ await save([other], 70);
+ expect(restore()).toBe(true);
+ expect(readModelCompactionPct(providerId, 'gpt')).toBe(65);
+ expect(readModelCompactionPct(providerId, 'retired')).toBe(65);
+ expect(readModelCompactionPct(other.providerId, 'gpt')).toBe(70);
+ });
+
+ it('pins deletion rollback to the original owner and preserves newer compaction edits', async () => {
+ const targets = ['gpt', 'retired'].map(modelId => ({ providerId: 'custom:p', modelId }));
+ const save = (pct: number) => writeModelCompactionWithRefresh(targets, pct, async () => {}, async () => {});
+ await save(65);
+ const restore = stageProviderModelCompactionClear('custom:p');
+ await writeModelCompactionWithRefresh([targets[0]!], 80, async () => {}, async () => {});
+ ownerId = 'deletion-other-owner';
+ await save(70);
+ expect(restore()).toBe(true);
+ expect(readModelCompactionPct('custom:p', 'retired')).toBe(70);
+ ownerId = 'test-owner';
+ expect(readModelCompactionPct('custom:p', 'gpt')).toBe(80);
+ expect(readModelCompactionPct('custom:p', 'retired')).toBe(65);
+ });
+
it.each([1_000_000, null])('rolls back failed refresh for limit %s, including mixed/absent aliases', async (limit) => {
const targets = [
{ agent: 'codex' as const, providerId: 'xd', modelId: 'gpt' },
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 1f736437a3..48efd9cb7d 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
@@ -147,6 +147,36 @@ export function readModelCompactionPct(providerId: string, modelId: string): num
return readPrefs().compactionPcts?.[JSON.stringify([providerId, modelId])] ?? null;
}
+/** Participate in the existing provider deletion transaction, including rollback. */
+export function stageProviderModelCompactionClear(providerId: string): () => boolean {
+ const filePath = ownerScopedUserDataPath('model-context-limit-prefs.json');
+ const ownerStore = createStore(() => filePath);
+ const previous = ownerStore.read().compactionPcts ?? {};
+ // Match the serialized provider element exactly, including escaped characters.
+ const prefix = `[${JSON.stringify(providerId)},`;
+ const removed = Object.fromEntries(Object.entries(previous).filter(([key]) => key.startsWith(prefix)));
+ if (Object.keys(removed).length === 0) return () => true;
+ ownerStore.writePatch({
+ compactionPcts: Object.fromEntries(Object.entries(previous).filter(([key]) => !key.startsWith(prefix))),
+ });
+ return () => {
+ try {
+ ownerStore.invalidateIfChanged();
+ const current = { ...ownerStore.read().compactionPcts };
+ // Restore only removed entries; do not overwrite a newer external edit.
+ for (const [key, value] of Object.entries(removed)) current[key] ??= value;
+ ownerStore.writePatch({ compactionPcts: current });
+ return true;
+ } catch (error) {
+ log.warn('restore provider model compaction failed', {
+ providerId,
+ error: error instanceof Error ? error.message : String(error),
+ });
+ return false;
+ }
+ };
+}
+
/** All desktop harnesses use the same supplier/model policy, never the retired global sliders. */
export function resolveModelCompactionPct(
catalog: Pick<Catalog, 'providers'>,
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 ad1a7e34c1..5b21fb658b 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/providerHandlers.test.ts
@@ -168,6 +168,7 @@ function makeDeps(over: Partial<ProviderHandlerDeps> = {}): ProviderHandlerDeps
writeModelPriceOverride: vi.fn(() => {}),
clearModelPriceOverride: vi.fn(() => {}),
stageClearProviderModelPriceOverrides: vi.fn(() => () => true),
+ stageClearProviderModelCompaction: vi.fn(() => () => true),
broadcastPricingChanged: vi.fn(() => {}),
...over,
};
@@ -2625,6 +2626,7 @@ describe('provider:custom:* CRUD handlers', () => {
).resolves.toEqual({ ok: true });
expect(deps.stageClearProviderDisableOverrides).toHaveBeenCalledWith('custom:xai');
expect(deps.stageClearProviderModelPriceOverrides).toHaveBeenCalledWith('custom:xai');
+ expect(deps.stageClearProviderModelCompaction).toHaveBeenCalledWith('custom:xai');
expect(await listCustomProviders()).toEqual([]);
});
@@ -3347,6 +3349,46 @@ describe('provider:custom:* CRUD handlers', () => {
expect((await listCustomProviders())[0]?.name).toBe('Second edit');
});
+ // PR #7460 P1: the old delete transaction cleaned prices/disable flags only.
+ // Unit: delete + recreate must not revive a saved percentage; failed deletion
+ // must preserve it. Existing deletion tests never supplied compaction state.
+ it.each(['success', 'oauth-failed', 'cleanup-failed', 'restore-failed'] as const)(
+ 'cleans model compaction inside the provider deletion transaction (%s)', async (outcome) => {
+ mountDb();
+ const harness = new IpcHarness();
+ let pct: number | null = 65;
+ const deps = makeDeps({
+ stageClearProviderModelCompaction: vi.fn(() => {
+ if (outcome === 'cleanup-failed') throw new Error('compaction cleanup failed');
+ const previous = pct;
+ pct = null;
+ return () => {
+ if (outcome === 'restore-failed') return false;
+ pct = previous;
+ return true;
+ };
+ }),
+ removeOAuthCredentials: vi.fn(() => outcome === 'success' ? () => true : null),
+ });
+ registerProviderHandlers(harness, deps);
+ await createCustomProvider(validConfig);
+ const deletion = harness.invoke(MAKER_INVOKE.PROVIDER_CUSTOM_DELETE, validConfig.id);
+ if (outcome === 'success') {
+ await expect(deletion).resolves.toEqual({ ok: true });
+ expect(await getCustomProvider(validConfig.id)).toBeNull();
+ await createCustomProvider(validConfig);
+ expect(pct).toBeNull();
+ } else {
+ const message = outcome === 'cleanup-failed' ? 'compaction cleanup failed'
+ : outcome === 'restore-failed' ? 'could not be restored' : 'failed to remove existing OAuth';
+ await expect(deletion).rejects.toThrow(message);
+ expect(await getCustomProvider(validConfig.id)).not.toBeNull();
+ expect(pct).toBe(outcome === 'restore-failed' ? null : 65);
+ if (outcome === 'cleanup-failed') expect(deps.removeOAuthCredentials).not.toHaveBeenCalled();
+ }
+ },
+ );
+
it('deletes (idempotent) + broadcasts; bad providerId → INVALID_PARAMS', async () => {
mountDb();
const harness = new IpcHarness();
@@ -3415,6 +3457,7 @@ describe('provider:custom:* CRUD handlers', () => {
const deletion = harness.invoke(MAKER_INVOKE.PROVIDER_CUSTOM_DELETE, id).catch(error => error);
await vi.waitFor(() => expect(stop).toHaveBeenCalledOnce());
const writes = [deps.stageClearProviderDisableOverrides, deps.stageClearProviderModelPriceOverrides,
+ deps.stageClearProviderModelCompaction,
deps.removeOAuthCredentials, deps.removeCustomProviderKey, deps.removeCustomProviderHeaders];
for (const write of writes) expect(write).not.toHaveBeenCalled();
if (outcome === 'switch-account') owner.generation++;
diff --git a/apps/desktop/src/main/maker-ipc/providerHandlers.ts b/apps/desktop/src/main/maker-ipc/providerHandlers.ts
index a3ba08d246..1b582b6425 100644
--- a/apps/desktop/src/main/maker-ipc/providerHandlers.ts
+++ b/apps/desktop/src/main/maker-ipc/providerHandlers.ts
@@ -485,6 +485,7 @@ export interface ProviderHandlerDeps {
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>;
+ stageClearProviderModelCompaction?(providerId: string): () => boolean;
}
/** 上下文上限的读回视图(与写入返回同形,UI 一次拿齐当前值与是否自定义)。 */
@@ -2320,6 +2321,7 @@ export function registerProviderHandlers(
let restoreOAuthCredentials: (() => boolean) | null = null;
let restoreDisableOverrides: (() => boolean) | null = null;
let restorePriceOverrides: (() => boolean) | null = null;
+ let restoreCompactionOverrides: (() => boolean) | null = null;
// 整个删除事务(清 override → 删凭证 → 删配置 → 刷目录)在 disable 写队列**内**
// 执行,持队列直到 afterChange 刷完 active-catalog:只把清理入队的话,清理落盘
// 后队列即释放,「删除完成前」的窗口里并发 MODEL_DISABLE_SET 仍能从未刷新的
@@ -2351,6 +2353,8 @@ export function registerProviderHandlers(
deps.stageClearProviderDisableOverrides?.(runtimeProviderId) ?? null;
restorePriceOverrides =
deps.stageClearProviderModelPriceOverrides?.(runtimeProviderId) ?? null;
+ restoreCompactionOverrides =
+ deps.stageClearProviderModelCompaction?.(runtimeProviderId) ?? null;
assertProviderMutationOwner(ownerAtIngress);
restoreOAuthCredentials = deps.removeOAuthCredentials(providerId);
if (!restoreOAuthCredentials) {
@@ -2363,9 +2367,10 @@ export function registerProviderHandlers(
assertProviderMutationOwner(ownerAtIngress);
const overridesRestored = !restoreDisableOverrides || restoreDisableOverrides();
const pricesRestored = !restorePriceOverrides || restorePriceOverrides();
+ const compactionRestored = !restoreCompactionOverrides || restoreCompactionOverrides();
const oauthRestored = !restoreOAuthCredentials || restoreOAuthCredentials();
const credentialsRestored = restoreProviderCredentials(providerId, credentialSnapshots);
- if (!oauthRestored || !credentialsRestored || !overridesRestored || !pricesRestored) {
+ if (!oauthRestored || !credentialsRestored || !overridesRestored || !pricesRestored || !compactionRestored) {
commitRouteMutation();
throwIpcError(
'INTERNAL',
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index 7ac24e6a13..5e73cd6ab7 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -1205,6 +1205,7 @@ import {
isModelContextLimitCustomized,
readModelContextLimit,
readModelCompactionPct,
+ stageProviderModelCompactionClear,
resolveModelCompactionPct,
writeModelCompactionWithRefresh,
writeModelContextLimitsWithRefresh,
@@ -7622,6 +7623,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
setModelPriceOverride(target, desired, getActiveCatalog().modelRegistry),
clearModelPriceOverride,
stageClearProviderModelPriceOverrides: stageProviderModelPriceOverridesClear,
+ stageClearProviderModelCompaction: stageProviderModelCompactionClear,
broadcastPricingChanged: broadcastReferenceModelPricing,
// Keep the catalog specification unchanged. Persist the override and refresh only
// matching Codex tasks at a turn boundary; the editor reads back the effective value.
diff --git a/apps/desktop/src/renderer/__tests__/ccAgentSessionViewThemeContract.test.ts b/apps/desktop/src/renderer/__tests__/ccAgentSessionViewThemeContract.test.ts
index 7cdbbe4aee..b0a28e4236 100644
--- a/apps/desktop/src/renderer/__tests__/ccAgentSessionViewThemeContract.test.ts
+++ b/apps/desktop/src/renderer/__tests__/ccAgentSessionViewThemeContract.test.ts
@@ -4,7 +4,7 @@
* 源契约守卫(DESIGN.md §10 双模式交付门槛 / design-governance.md §6 Level 1):
* CCAgentSessionView 的 handoff pill 与 context 环不再裸写颜色——
* 1. handoff pill 文字走 text-muted-foreground;
- * 2. context 环阈值走 error-flat / warning-fg 语义 token;
+ * 2. context 环颜色现由 contextWindowBudgetChip.test.tsx 渲染真实组件验证;
* 3. 消费的 token 槽位同时具备 light / dark 双模式值。
*/
@@ -30,14 +30,6 @@ describe('CCAgentSessionView 主题契约(语义 token,双模式)', () =>
expect(viewSource).toContain('text-muted-foreground');
});
- it('context 环阈值色不再裸写红/橙,改走 error-flat / warning-fg', () => {
- expect(viewSource).not.toContain(hex('EF4444'));
- expect(viewSource).not.toContain(hex('F59E0B'));
- expect(viewSource).toMatch(
- /pct\s*>\s*90\s*\?\s*'var\(--error-flat\)'\s*:\s*pct\s*>\s*70\s*\?\s*'var\(--warning-fg\)'\s*:\s*'var\(--msg-tool-card-chevron\)'/,
- );
- });
-
it('消费的 token 槽位同时具备 light / dark 双模式值', () => {
for (const id of ['muted-foreground', 'error-flat', 'warning-fg', 'msg-tool-card-chevron']) {
expect(
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 f18247b21a..e042525c8e 100644
--- a/apps/desktop/src/renderer/components/status/__tests__/contextWindowBudgetChip.test.tsx
+++ b/apps/desktop/src/renderer/components/status/__tests__/contextWindowBudgetChip.test.tsx
@@ -309,6 +309,23 @@ describe('ContextWindowBudgetChip', () => {
});
});
+ // PR #7460: replace the obsolete session-view source regex with observable
+ // colors from the extracted production ring (DESIGN.md §2/§10, unit tier).
+ // At 70/71/90/91%, both threshold boundaries must retain their semantic tokens.
+ it.each([
+ [70, 'msg-tool-card-chevron'], [71, 'warning-fg'],
+ [90, 'warning-fg'], [91, 'error-flat'],
+ ] as const)('renders the context ring at %s%% using %s', (pct, token) => {
+ const { container } = render(<ContextCapacityRing
+ contextTokens={pct * 10_000}
+ sdkContextWindow={1_000_000}
+ model="grok-4.6"
+ vendorKey="cc"
+ />);
+ expect(container.querySelectorAll('circle')[1]?.getAttribute('stroke')).toBe(`var(--${token})`);
+ expect(container.querySelector('span')?.textContent).toBe(`${pct}%`);
+ });
+
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.