fix: harden and de-slop the merged contribution batch
Follow-ups promised on merge, plus review findings on the batch itself: - chat: task-tool output now respects the 512KiB render cap; quick-open icon is visible at rest on coarse pointers and reachable by keyboard (row keydown no longer swallows inner-button Enter/Space); composer inline-code decoration drops the metric-shifting padding; a btw fork send carries only the boundary instruction, never the promotion notice - sync: cascade revert/unrevert aborts busy descendants, busy state is read from every child store at the moment of use; rule 9 documents redo clearing all descendant revert markers - electron: renderer recovery keeps memory-eviction (a valid render-process-gone reason) and both windows share one attachRendererRecovery helper - vscode: process registry is a thin re-export of the web module (provider-env-aliases precedent) with ordered register/unregister writes and an awaited close - server/cli: managed-process registry takes injectable deps (fixes the unreaped-orphans ReferenceError), corrupt settings errors name the file, getWorktrees test restores console.warn - tests: module-mock harnesses removed (AgentsSidebar, SettingsView mobile focus — behaviors stay live but uncovered, accepted trade), QuestionMarkdown asserts rendered DOM - i18n: German gains the debug-panel request keys, Japanese/German drop removed worktree keys, Ukrainian unit spacing fixed - changelog: Copilot AI Credits entries (main + VS Code)
This commit is contained in:
@@ -1,7 +1,34 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { setTimeout } from 'node:timers/promises';
|
||||
|
||||
import { createRendererRecoveryPolicy } from './renderer-recovery.mjs';
|
||||
import { attachRendererRecovery, createRendererRecoveryPolicy } from './renderer-recovery.mjs';
|
||||
|
||||
const createFakeWindow = () => {
|
||||
const listeners = new Map();
|
||||
const state = { reloads: 0, destroyed: false };
|
||||
const browserWindow = {
|
||||
__ocLabel: 'main',
|
||||
state,
|
||||
destroy: () => {
|
||||
state.destroyed = true;
|
||||
},
|
||||
emit: (event, details) => listeners.get(event)?.(null, details),
|
||||
isDestroyed: () => state.destroyed,
|
||||
webContents: {
|
||||
on: (event, listener) => listeners.set(event, listener),
|
||||
reload: () => {
|
||||
state.reloads += 1;
|
||||
},
|
||||
},
|
||||
};
|
||||
return browserWindow;
|
||||
};
|
||||
|
||||
const createFakeLog = () => {
|
||||
const warnings = [];
|
||||
return { warnings, warn: (message, payload) => warnings.push({ message, payload }) };
|
||||
};
|
||||
|
||||
test('allows a bounded number of reloads for recoverable renderer failures', () => {
|
||||
const policy = createRendererRecoveryPolicy(() => 1_000);
|
||||
@@ -9,7 +36,20 @@ test('allows a bounded number of reloads for recoverable renderer failures', ()
|
||||
assert.equal(policy.shouldReload('crashed'), true);
|
||||
assert.equal(policy.shouldReload('oom'), true);
|
||||
assert.equal(policy.shouldReload('abnormal-exit'), true);
|
||||
assert.equal(policy.shouldReload('memory-eviction'), false);
|
||||
assert.equal(policy.shouldReload('crashed'), false);
|
||||
});
|
||||
|
||||
test('reloads after the renderer is evicted for memory', () => {
|
||||
const policy = createRendererRecoveryPolicy(() => 1_000);
|
||||
|
||||
assert.equal(policy.shouldReload('memory-eviction'), true);
|
||||
});
|
||||
|
||||
test('ignores reasons Electron never reports for render-process-gone', () => {
|
||||
const policy = createRendererRecoveryPolicy(() => 1_000);
|
||||
|
||||
assert.equal(policy.shouldReload('made-up-reason'), false);
|
||||
assert.equal(policy.shouldReload('crashed'), true);
|
||||
});
|
||||
|
||||
test('ignores clean and externally killed renderer exits', () => {
|
||||
@@ -32,3 +72,29 @@ test('resets the recovery budget after the recovery window', () => {
|
||||
currentTime += 60_000;
|
||||
assert.equal(policy.shouldReload('crashed'), true);
|
||||
});
|
||||
|
||||
test('reloads the attached window after a recoverable renderer failure', async () => {
|
||||
const browserWindow = createFakeWindow();
|
||||
const log = createFakeLog();
|
||||
attachRendererRecovery(browserWindow, { log, label: 'mini chat' });
|
||||
|
||||
browserWindow.emit('render-process-gone', { reason: 'crashed', exitCode: 5 });
|
||||
await setTimeout(150);
|
||||
|
||||
assert.equal(browserWindow.state.reloads, 1);
|
||||
assert.equal(log.warnings.length, 1);
|
||||
assert.equal(log.warnings[0].payload.surface, 'mini chat');
|
||||
assert.equal(log.warnings[0].payload.label, 'main');
|
||||
});
|
||||
|
||||
test('skips the reload when the window is gone or the exit is not recoverable', async () => {
|
||||
const browserWindow = createFakeWindow();
|
||||
attachRendererRecovery(browserWindow, { log: createFakeLog(), label: 'window' });
|
||||
|
||||
browserWindow.emit('render-process-gone', { reason: 'clean-exit', exitCode: 0 });
|
||||
browserWindow.emit('render-process-gone', { reason: 'crashed', exitCode: 5 });
|
||||
browserWindow.destroy();
|
||||
await setTimeout(150);
|
||||
|
||||
assert.equal(browserWindow.state.reloads, 0);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user