Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
Enforce Promise.withResolvers with unicorn's oxlint rule (#7717)
Dimitri POSTOLOV597affbd38cf
diff --git a/.github/scripts/retry-transient.mjs b/.github/scripts/retry-transient.mjsindex 3cc9f961e..b242789d1 100644--- a/.github/scripts/retry-transient.mjs+++ b/.github/scripts/retry-transient.mjs@@ -641,10 +641,7 @@ async function runAttempt({});let closeValue;- let resolveClose;- const closePromise = new Promise((resolve) => {- resolveClose = resolve;- });+ const { promise: closePromise, resolve: resolveClose } = Promise.withResolvers();let spawnError;child.once('error', (error) => {spawnError = error;diff --git a/.github/scripts/retry-transient.test.mjs b/.github/scripts/retry-transient.test.mjsindex da40a9cbf..3074e5967 100644--- a/.github/scripts/retry-transient.test.mjs+++ b/.github/scripts/retry-transient.test.mjs@@ -1542,10 +1542,7 @@ describe('deadlines and cancellation', () => {test('parent cancellation during backoff prevents another attempt', async () => {const signals = new EventEmitter();const count = join(scratch, 'backoff-cancel-count');- let enterBackoff;- const backoffStarted = new Promise((resolve) => {- enterBackoff = resolve;- });+ const { promise: backoffStarted, resolve: enterBackoff } = Promise.withResolvers();writeFileSync(count, '0');const promise = run({command: nodeCmd(diff --git a/oxlint.config.ts b/oxlint.config.tsindex c11b5d2c7..3b19ef671 100644--- a/oxlint.config.ts+++ b/oxlint.config.ts@@ -48,6 +48,7 @@ export default defineConfig({plugins: ['unicorn', 'typescript', 'oxc', 'react', 'jsx-a11y'],jsPlugins: [{ name: 'eslint-js', specifier: 'oxlint-plugin-eslint' },+ { name: 'unicorn-js', specifier: 'eslint-plugin-unicorn' },NO_COMMENTS_PLUGIN,OK_RULES_PLUGIN,],@@ -95,6 +96,7 @@ export default defineConfig({},],'eslint-js/no-restricted-syntax': ['error', ...restrictedSyntax],+ 'unicorn-js/prefer-promise-with-resolvers': 'error','react/jsx-curly-brace-presence': ['error',{ children: 'never', props: 'never', propElementValues: 'ignore' },diff --git a/package.json b/package.jsonindex 3e9548ed4..fdd0e85e5 100644--- a/package.json+++ b/package.json@@ -80,6 +80,7 @@"@changesets/cli": "^2.29.7","@types/node": "^24.7.0","@typescript/native": "npm:typescript@~7.0.2",+ "eslint-plugin-unicorn": "^79.0.0","husky": "^9.1.7","knip": "^6.26.0","lint-staged": "^16.4.0",diff --git a/packages/app/src/comments/dispatch-batch.test.ts b/packages/app/src/comments/dispatch-batch.test.tsindex 3478d942c..cbb2c1704 100644--- a/packages/app/src/comments/dispatch-batch.test.ts+++ b/packages/app/src/comments/dispatch-batch.test.ts@@ -125,10 +125,7 @@ describe('dispatchComments', () => {const store = await import('./store');await store.refresh();- let release = (): void => {};- const held = new Promise<void>((resolve) => {- release = resolve;- });+ const { promise: held, resolve: release } = Promise.withResolvers<void>();const composed: number[] = [];const first = dispatchWith(store, async (items) => {diff --git a/packages/app/src/components/AuthModal.host-probe.dom.test.tsx b/packages/app/src/components/AuthModal.host-probe.dom.test.tsxindex cd5947712..efb7b8dc5 100644--- a/packages/app/src/components/AuthModal.host-probe.dom.test.tsx+++ b/packages/app/src/components/AuthModal.host-probe.dom.test.tsx@@ -124,12 +124,11 @@ describe('AuthModal host probe refusal', () => {vi.useFakeTimers();try {let answer: ((status: AuthQueryStatus) => void) | undefined;- const onOpenChange = renderModal(- () =>- new Promise<AuthQueryStatus>((resolve) => {- answer = resolve;- }),- );+ const onOpenChange = renderModal(() => {+ const { promise, resolve } = Promise.withResolvers<AuthQueryStatus>();+ answer = resolve;+ return promise;+ });await act(async () => {await vi.advanceTimersByTimeAsync(9_999);@@ -163,12 +162,11 @@ describe('AuthModal host probe refusal', () => {vi.useFakeTimers();try {let answer: ((status: AuthQueryStatus) => void) | undefined;- renderModal(- () =>- new Promise<AuthQueryStatus>((resolve) => {- answer = resolve;- }),- );+ renderModal(() => {+ const { promise, resolve } = Promise.withResolvers<AuthQueryStatus>();+ answer = resolve;+ return promise;+ });await act(async () => {await vi.advanceTimersByTimeAsync(10_000);diff --git a/packages/app/src/components/BottomComposer.dom.test.tsx b/packages/app/src/components/BottomComposer.dom.test.tsxindex 06db8760f..b28799e22 100644--- a/packages/app/src/components/BottomComposer.dom.test.tsx+++ b/packages/app/src/components/BottomComposer.dom.test.tsx@@ -842,10 +842,11 @@ describe('BottomComposer (dispatch + picker + sticky default)', () => {test('Send shows a pending state while the dispatch is in flight', async () => {let resolveDispatch: (value: { ok: boolean }) => void = () => {};- dispatchImpl = () =>- new Promise<{ ok: boolean }>((resolve) => {- resolveDispatch = resolve;- });+ dispatchImpl = () => {+ const { promise, resolve } = Promise.withResolvers<{ ok: boolean }>();+ resolveDispatch = resolve;+ return promise;+ };await renderComposer();fireEvent.change(getInput(), { target: { value: 'in flight' } });diff --git a/packages/app/src/components/BranchRecycleBanner.dom.test.tsx b/packages/app/src/components/BranchRecycleBanner.dom.test.tsxindex bc70a6c75..535691191 100644--- a/packages/app/src/components/BranchRecycleBanner.dom.test.tsx+++ b/packages/app/src/components/BranchRecycleBanner.dom.test.tsx@@ -75,12 +75,11 @@ test('the transient switch banner dismisses itself after its deadline', async ()test('with the desktop bridge, Restart server disables in flight and re-enables on failure', async () => {let resolveRestart: (v: { ok: boolean }) => void = () => {};- restartMock.mockImplementation(- () =>- new Promise<{ ok: boolean }>((resolve) => {- resolveRestart = resolve;- }),- );+ restartMock.mockImplementation(() => {+ const { promise, resolve } = Promise.withResolvers<{ ok: boolean }>();+ resolveRestart = resolve;+ return promise;+ });Object.defineProperty(window, 'okDesktop', {value: { restart: true },configurable: true,diff --git a/packages/app/src/components/BugReportHistory.dom.test.tsx b/packages/app/src/components/BugReportHistory.dom.test.tsxindex 0bfb9d9ab..a8760951e 100644--- a/packages/app/src/components/BugReportHistory.dom.test.tsx+++ b/packages/app/src/components/BugReportHistory.dom.test.tsx@@ -136,13 +136,14 @@ function makeRow(overrides: Partial<OkBugReportListRow> & { id: string }): OkBug}function deferredSend() {- let resolve: (result: OkBugReportSendResult) => void = () => {};+ let resolveSend: (result: OkBugReportSendResult) => void = () => {};return {- send: () =>- new Promise<OkBugReportSendResult>((r) => {- resolve = r;- }),- finish: (result: OkBugReportSendResult) => resolve(result),+ send: () => {+ const { promise, resolve } = Promise.withResolvers<OkBugReportSendResult>();+ resolveSend = resolve;+ return promise;+ },+ finish: (result: OkBugReportSendResult) => resolveSend(result),};}diff --git a/packages/app/src/components/ConsentDialogBody.dom.test.tsx b/packages/app/src/components/ConsentDialogBody.dom.test.tsxindex 065cca122..3124bee25 100644--- a/packages/app/src/components/ConsentDialogBody.dom.test.tsx+++ b/packages/app/src/components/ConsentDialogBody.dom.test.tsx@@ -47,10 +47,7 @@ function statusBridge(}function deferredStatusBridge(detectedEditorIds: string[]) {- let release!: () => void;- const gate = new Promise<void>((resolve) => {- release = resolve;- });+ const { promise: gate, resolve: release } = Promise.withResolvers<void>();const status = {available: true,editors: detectedEditorIds.map((id) => ({ id, state: 'installed' })),diff --git a/packages/app/src/components/CreateProjectDialog.cascade-staleness.dom.test.tsx b/packages/app/src/components/CreateProjectDialog.cascade-staleness.dom.test.tsxindex 75e49fd95..624d7a8ca 100644--- a/packages/app/src/components/CreateProjectDialog.cascade-staleness.dom.test.tsx+++ b/packages/app/src/components/CreateProjectDialog.cascade-staleness.dom.test.tsx@@ -489,9 +489,9 @@ describe('CreateProjectDialog cascade staleness (Tier-3 mount)', () => {let resolveDeferred: (value: OkFindEnclosingGitRootResult | null) => void = () => {};stub.setFindEnclosingGitRootImpl((_path) => {probeCallCount += 1;- return new Promise<OkFindEnclosingGitRootResult | null>((r) => {- resolveDeferred = r;- });+ const { promise, resolve } = Promise.withResolvers<OkFindEnclosingGitRootResult | null>();+ resolveDeferred = resolve;+ return promise;});const probesBefore = probeCallCount;@@ -549,9 +549,9 @@ describe('CreateProjectDialog cascade staleness (Tier-3 mount)', () => {let resolveDeferred: (value: OkFindEnclosingGitRootResult | null) => void = () => {};stub.setFindEnclosingGitRootImpl((_path) => {probeCallCount += 1;- return new Promise<OkFindEnclosingGitRootResult | null>((r) => {- resolveDeferred = r;- });+ const { promise, resolve } = Promise.withResolvers<OkFindEnclosingGitRootResult | null>();+ resolveDeferred = resolve;+ return promise;});await typeName(`${PROJECT_NAME} (v2)`);diff --git a/packages/app/src/components/CreateProjectDialog.runtime.dom.test.tsx b/packages/app/src/components/CreateProjectDialog.runtime.dom.test.tsxindex 114018be8..dec8b4638 100644--- a/packages/app/src/components/CreateProjectDialog.runtime.dom.test.tsx+++ b/packages/app/src/components/CreateProjectDialog.runtime.dom.test.tsx@@ -807,12 +807,11 @@ describe('CreateProjectDialog runtime wiring', () => {test('while createNew is in-flight the busy guard blocks dialog dismissal until it settles', async () => {const stub = makeBridge();let releaseCreate: () => void = () => {};- stub.setCreateNewImpl(- () =>- new Promise<void>((resolve) => {- releaseCreate = resolve;- }),- );+ stub.setCreateNewImpl(() => {+ const { promise, resolve } = Promise.withResolvers<void>();+ releaseCreate = resolve;+ return promise;+ });const { onOpenChange } = await renderDialog(stub);await waitForLocationHydrate();diff --git a/packages/app/src/components/DiffViewBoundary.dom.test.tsx b/packages/app/src/components/DiffViewBoundary.dom.test.tsxindex 5017f0bcf..d090854b4 100644--- a/packages/app/src/components/DiffViewBoundary.dom.test.tsx+++ b/packages/app/src/components/DiffViewBoundary.dom.test.tsx@@ -335,10 +335,7 @@ describe('DiffViewBoundary (Tier-3 mount)', () => {});test('resolve buttons disable while a dispatch is in flight', async () => {- let release: (() => void) | undefined;- const pending = new Promise<void>((resolve) => {- release = resolve;- });+ const { promise: pending, resolve: release } = Promise.withResolvers<void>();strategyFetch('foo.md', 'delete-modify', { resolvePending: pending });render(<DiffViewBoundary docName="foo" conflict={entry('foo.md')} />);@@ -355,7 +352,7 @@ describe('DiffViewBoundary (Tier-3 mount)', () => {await waitFor(() => expect(keep.disabled).toBe(true));expect(restore.disabled).toBe(true);- release?.();+ release();});test('delete-modify (DU) renders header / content / footer with no collapsible-preview chrome', async () => {@@ -464,10 +461,7 @@ describe('DiffViewBoundary (Tier-3 mount)', () => {});test('resolve buttons come back after a dispatch that succeeds without unmounting', async () => {- let release: (() => void) | undefined;- const pending = new Promise<void>((resolve) => {- release = resolve;- });+ const { promise: pending, resolve: release } = Promise.withResolvers<void>();strategyFetch('foo.md', 'delete-modify', { resolvePending: pending });render(<DiffViewBoundary docName="foo" conflict={entry('foo.md')} />);@@ -481,7 +475,7 @@ describe('DiffViewBoundary (Tier-3 mount)', () => {fireEvent.click(keep);await waitFor(() => expect(keep.disabled).toBe(true));- release?.();+ release();await waitFor(() => expect(keep.disabled).toBe(false));expect(restore.disabled).toBe(false);diff --git a/packages/app/src/components/DocumentErrorBoundary.dom.test.tsx b/packages/app/src/components/DocumentErrorBoundary.dom.test.tsxindex 234f863be..12185decb 100644--- a/packages/app/src/components/DocumentErrorBoundary.dom.test.tsx+++ b/packages/app/src/components/DocumentErrorBoundary.dom.test.tsx@@ -310,12 +310,11 @@ describe('DocumentErrorBoundary (Tier-3 mount)', () => {shouldThrow = true;installBugReportBridge();let releaseRestart!: (value: { ok: true }) => void;- restartServer.mockImplementationOnce(- () =>- new Promise<{ ok: true }>((resolve) => {- releaseRestart = resolve;- }),- );+ restartServer.mockImplementationOnce(() => {+ const { promise, resolve } = Promise.withResolvers<{ ok: true }>();+ releaseRestart = resolve;+ return promise;+ });render(<DocumentErrorBoundary activeDocName="alpha.md" onRecycle={vi.fn(() => {})}>diff --git a/packages/app/src/components/EditorPane.agents-panel-reload-visibility.dom.test.tsx b/packages/app/src/components/EditorPane.agents-panel-reload-visibility.dom.test.tsxindex b770b4652..1feb2b578 100644--- a/packages/app/src/components/EditorPane.agents-panel-reload-visibility.dom.test.tsx+++ b/packages/app/src/components/EditorPane.agents-panel-reload-visibility.dom.test.tsx@@ -251,20 +251,6 @@ function readPersistedAgentsPanelLevel(): boolean | undefined {return readWebDockSessionOrder('agents')?.agentPanelVisible;}-function deferredDockState(): {- promise: Promise<DockStatePayload>;- resolve: (state: DockStatePayload) => void;- reject: (reason: unknown) => void;-} {- let resolve!: (state: DockStatePayload) => void;- let reject!: (reason: unknown) => void;- const promise = new Promise<DockStatePayload>((res, rej) => {- resolve = res;- reject = rej;- });- return { promise, resolve, reject };-}-function installDesktopBridge(getDockState: () => Promise<DockStatePayload>,hooks: { onViewMenuStateChanged?: (state: Record<string, unknown>) => void } = {},@@ -420,7 +406,7 @@ describe('EditorPane agents-panel reload visibility', () => {});test('desktop: a roster snapshot landing while the dock restore is pending does not reveal the closed panel', async () => {- const pendingDockState = deferredDockState();+ const pendingDockState = Promise.withResolvers<DockStatePayload>();installDesktopBridge(() => pendingDockState.promise);await renderPane(6);@@ -442,7 +428,7 @@ describe('EditorPane agents-panel reload visibility', () => {});test('desktop: a live thread arriving while the dock restore is pending reveals the panel once the restore settles', async () => {- const pendingDockState = deferredDockState();+ const pendingDockState = Promise.withResolvers<DockStatePayload>();installDesktopBridge(() => pendingDockState.promise);await renderPane(6);@@ -526,7 +512,7 @@ describe('EditorPane agents-panel reload visibility', () => {});test('desktop: a header show during a pending dock restore reads closed first and survives settlement', async () => {- const pendingDockState = deferredDockState();+ const pendingDockState = Promise.withResolvers<DockStatePayload>();const viewMenuStates: Array<Record<string, unknown>> = [];installDesktopBridge(() => pendingDockState.promise, {onViewMenuStateChanged: (state) => viewMenuStates.push(state),@@ -561,7 +547,7 @@ describe('EditorPane agents-panel reload visibility', () => {});test('desktop: a toggle during a pending dock restore survives settlement with the toggled level', async () => {- const pendingDockState = deferredDockState();+ const pendingDockState = Promise.withResolvers<DockStatePayload>();const viewMenuStates: Array<Record<string, unknown>> = [];installDesktopBridge(() => pendingDockState.promise, {onViewMenuStateChanged: (state) => viewMenuStates.push(state),@@ -588,7 +574,7 @@ describe('EditorPane agents-panel reload visibility', () => {});test('desktop: a live thread after the dock restore settles reveals the persisted-closed panel', async () => {- const pendingDockState = deferredDockState();+ const pendingDockState = Promise.withResolvers<DockStatePayload>();installDesktopBridge(() => pendingDockState.promise);await renderPane(6);@@ -633,7 +619,7 @@ describe('EditorPane agents-panel reload visibility', () => {test('desktop: a hung dock-state restore force-settles at the deadline, warns, writes nothing, and a thread arriving afterwards still reveals the panel', async () => {vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});- const hungDockState = deferredDockState();+ const hungDockState = Promise.withResolvers<DockStatePayload>();const viewMenuStates: Array<Record<string, unknown>> = [];installDesktopBridge(() => hungDockState.promise, {onViewMenuStateChanged: (state) => viewMenuStates.push(state),@@ -713,7 +699,7 @@ describe('EditorPane agents-panel reload visibility', () => {test('desktop: a failed dock-state restore settles without writing the un-restored defaults', async () => {const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});- const failingDockState = deferredDockState();+ const failingDockState = Promise.withResolvers<DockStatePayload>();const viewMenuStates: Array<Record<string, unknown>> = [];installDesktopBridge(() => failingDockState.promise, {onViewMenuStateChanged: (state) => viewMenuStates.push(state),@@ -769,7 +755,7 @@ describe('EditorPane agents-panel reload visibility', () => {test('desktop: a panel opened and closed before an ABANDONED settle publishes the closed level, and the untouched terminal level stays withheld', async () => {vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});- const hungDockState = deferredDockState();+ const hungDockState = Promise.withResolvers<DockStatePayload>();const viewMenuStates: Array<Record<string, unknown>> = [];installDesktopBridge(() => hungDockState.promise, {onViewMenuStateChanged: (state) => viewMenuStates.push(state),@@ -819,7 +805,7 @@ describe('EditorPane agents-panel reload visibility', () => {test('desktop: a panel opened and closed before a REJECTED read publishes the closed level too', async () => {const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});- const failingDockState = deferredDockState();+ const failingDockState = Promise.withResolvers<DockStatePayload>();const viewMenuStates: Array<Record<string, unknown>> = [];installDesktopBridge(() => failingDockState.promise, {onViewMenuStateChanged: (state) => viewMenuStates.push(state),@@ -866,7 +852,7 @@ describe('EditorPane agents-panel reload visibility', () => {vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});- const hungDockState = deferredDockState();+ const hungDockState = Promise.withResolvers<DockStatePayload>();const viewMenuStates: Array<Record<string, unknown>> = [];installDesktopBridge(() => hungDockState.promise, {onViewMenuStateChanged: (state) => viewMenuStates.push(state),@@ -924,7 +910,7 @@ describe('EditorPane agents-panel reload visibility', () => {test('desktop: a toggle during a pending dock restore survives the force-settle deadline with the toggled level', async () => {vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});- const hungDockState = deferredDockState();+ const hungDockState = Promise.withResolvers<DockStatePayload>();const viewMenuStates: Array<Record<string, unknown>> = [];installDesktopBridge(() => hungDockState.promise, {onViewMenuStateChanged: (state) => viewMenuStates.push(state),@@ -970,7 +956,7 @@ describe('EditorPane agents-panel reload visibility', () => {test('desktop: a toggle during a pending dock restore survives a restore rejection with the toggled level', async () => {const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});- const failingDockState = deferredDockState();+ const failingDockState = Promise.withResolvers<DockStatePayload>();const viewMenuStates: Array<Record<string, unknown>> = [];installDesktopBridge(() => failingDockState.promise, {onViewMenuStateChanged: (state) => viewMenuStates.push(state),@@ -1015,7 +1001,7 @@ describe('EditorPane agents-panel reload visibility', () => {test('desktop: a terminal toggle during a pending dock restore survives the force-settle deadline with the toggled level', async () => {vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});- const hungDockState = deferredDockState();+ const hungDockState = Promise.withResolvers<DockStatePayload>();const viewMenuStates: Array<Record<string, unknown>> = [];installDesktopBridge(() => hungDockState.promise, {onViewMenuStateChanged: (state) => viewMenuStates.push(state),@@ -1060,7 +1046,7 @@ describe('EditorPane agents-panel reload visibility', () => {test('desktop: an on-time dock restore clears the deadline so no late bound-exceeded warn fires', async () => {vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});- const deferred = deferredDockState();+ const deferred = Promise.withResolvers<DockStatePayload>();installDesktopBridge(() => deferred.promise);try {diff --git a/packages/app/src/components/EditorPane.dom.test.tsx b/packages/app/src/components/EditorPane.dom.test.tsxindex 16f1c6883..b05c24f38 100644--- a/packages/app/src/components/EditorPane.dom.test.tsx+++ b/packages/app/src/components/EditorPane.dom.test.tsx@@ -1125,12 +1125,11 @@ describe('EditorPane session-panel wiring', () => {test('desktop: a late project-state restore cannot override a user-owned per-install layout', async () => {localStorage.setItem('ok-terminal-placement-v1', 'right');let resolveDockState: ((state: DockStateResult) => void) | undefined;- const desk = makeOkDesktopStub(- () =>- new Promise<DockStateResult>((resolve) => {- resolveDockState = resolve;- }),- );+ const desk = makeOkDesktopStub(() => {+ const { promise, resolve } = Promise.withResolvers<DockStateResult>();+ resolveDockState = resolve;+ return promise;+ });(window as { okDesktop?: unknown }).okDesktop = desk.stub;const { EditorPane } = await import('./EditorPane');render(<EditorPane />);@@ -2385,13 +2384,14 @@ describe('EditorPane pane visibility for the header', () => {query === '(width < 48rem)' ? narrowQuery : originalMatchMedia(query),});let resolveConfig: (response: Response) => void = () => {};- globalThis.fetch = vi.fn((input: RequestInfo | URL) =>- String(input) === '/api/config'- ? new Promise<Response>((resolve) => {- resolveConfig = resolve;- })- : Promise.resolve(new Response(null, { status: 404 })),- );+ globalThis.fetch = vi.fn((input: RequestInfo | URL) => {+ if (String(input) !== '/api/config') {+ return Promise.resolve(new Response(null, { status: 404 }));+ }+ const { promise, resolve } = Promise.withResolvers<Response>();+ resolveConfig = resolve;+ return promise;+ });const key = narrowWorkspaceSessionKey('/tmp/project', 'web');sessionStorage.setItem(key, JSON.stringify({ version: 1, selected: null }));@@ -2476,12 +2476,11 @@ describe('EditorPane saves and restores whether the editor is shown', () => {test('desktop: a saved hidden editor that lands after the settle bound still comes back hidden', async () => {let release: (value: DockStateResult) => void = () => {};- const desk = makeOkDesktopStub(- () =>- new Promise<DockStateResult>((resolve) => {- release = resolve;- }),- );+ const desk = makeOkDesktopStub(() => {+ const { promise, resolve } = Promise.withResolvers<DockStateResult>();+ release = resolve;+ return promise;+ });(window as { okDesktop?: unknown }).okDesktop = desk.stub;vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });try {@@ -2511,12 +2510,11 @@ describe('EditorPane saves and restores whether the editor is shown', () => {async function renderPastTheSettleBound() {let release: (value: DockStateResult) => void = () => {};- const desk = makeOkDesktopStub(- () =>- new Promise<DockStateResult>((resolve) => {- release = resolve;- }),- );+ const desk = makeOkDesktopStub(() => {+ const { promise, resolve } = Promise.withResolvers<DockStateResult>();+ release = resolve;+ return promise;+ });(window as { okDesktop?: unknown }).okDesktop = desk.stub;vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] });try {@@ -2615,12 +2613,11 @@ describe('EditorPane saves and restores whether the editor is shown', () => {test('desktop: the editor stays shown through the restore wait, and an open during the wait keeps it shown', async () => {let release: (value: DockStateResult) => void = () => {};- const desk = makeOkDesktopStub(- () =>- new Promise<DockStateResult>((resolve) => {- release = resolve;- }),- );+ const desk = makeOkDesktopStub(() => {+ const { promise, resolve } = Promise.withResolvers<DockStateResult>();+ release = resolve;+ return promise;+ });(window as { okDesktop?: unknown }).okDesktop = desk.stub;await renderEditorPane();expect(editorVisibleAttr()).toBe('true');@@ -2683,12 +2680,11 @@ describe('EditorPane saves and restores whether the editor is shown', () => {test('desktop: a document opened during the restore wait keeps a saved-hidden editor shown', async () => {let release: (value: DockStateResult) => void = () => {};- const desk = makeOkDesktopStub(- () =>- new Promise<DockStateResult>((resolve) => {- release = resolve;- }),- );+ const desk = makeOkDesktopStub(() => {+ const { promise, resolve } = Promise.withResolvers<DockStateResult>();+ release = resolve;+ return promise;+ });(window as { okDesktop?: unknown }).okDesktop = desk.stub;await renderEditorPane();diff --git a/packages/app/src/components/FileTree.duplicate.dom.test.tsx b/packages/app/src/components/FileTree.duplicate.dom.test.tsxindex 839fcb2f4..a796fc0a7 100644--- a/packages/app/src/components/FileTree.duplicate.dom.test.tsx+++ b/packages/app/src/components/FileTree.duplicate.dom.test.tsx@@ -769,9 +769,7 @@ describe('FileTree duplicate action runtime behavior', () => {test('duplicate busy guard suppresses overlapping duplicate requests', async () => {let releaseDuplicate: () => void = () => {};- duplicateGate = new Promise<void>((resolve) => {- releaseDuplicate = resolve;- });+ ({ promise: duplicateGate, resolve: releaseDuplicate } = Promise.withResolvers<void>());const user = userEvent.setup();renderFileTree();@@ -1005,9 +1003,7 @@ describe('FileTree duplicate action runtime behavior', () => {test('Delete does not open confirmation while another file-tree action is busy', async () => {let releaseDuplicate: () => void = () => {};- duplicateGate = new Promise<void>((resolve) => {- releaseDuplicate = resolve;- });+ ({ promise: duplicateGate, resolve: releaseDuplicate } = Promise.withResolvers<void>());const user = userEvent.setup();renderFileTree();@@ -1035,9 +1031,7 @@ describe('FileTree duplicate action runtime behavior', () => {test('the tree reports busy while a file-tree action is in flight and idle once it settles', async () => {let releaseDuplicate: () => void = () => {};- duplicateGate = new Promise<void>((resolve) => {- releaseDuplicate = resolve;- });+ ({ promise: duplicateGate, resolve: releaseDuplicate } = Promise.withResolvers<void>());const user = userEvent.setup();renderFileTree();diff --git a/packages/app/src/components/FileTree.restart-server.dom.test.tsx b/packages/app/src/components/FileTree.restart-server.dom.test.tsxindex 0adb0d983..f2bb5e137 100644--- a/packages/app/src/components/FileTree.restart-server.dom.test.tsx+++ b/packages/app/src/components/FileTree.restart-server.dom.test.tsx@@ -288,12 +288,11 @@ describe('FileTree unreachable-server restart action', () => {installBridge();listingFails = true;let releaseRestart!: (value: { ok: true }) => void;- restartServer.mockImplementationOnce(- () =>- new Promise<{ ok: true }>((resolve) => {- releaseRestart = resolve;- }),- );+ restartServer.mockImplementationOnce(() => {+ const { promise, resolve } = Promise.withResolvers<{ ok: true }>();+ releaseRestart = resolve;+ return promise;+ });render(<FileTree />);const restart = await screen.findByRole('button', { name: RESTART_LABEL });diff --git a/packages/app/src/components/FileTree.showall-lazy.dom.test.tsx b/packages/app/src/components/FileTree.showall-lazy.dom.test.tsxindex 134053bc5..9adbf2517 100644--- a/packages/app/src/components/FileTree.showall-lazy.dom.test.tsx+++ b/packages/app/src/components/FileTree.showall-lazy.dom.test.tsx@@ -565,10 +565,7 @@ describe('FileTree showAll lazy root seed', () => {});test('paints the first NDJSON chunk before the stream completes (incremental seed)', async () => {- let releaseRest: () => void = () => {};- const gate = new Promise<void>((resolve) => {- releaseRest = resolve;- });+ const { promise: gate, resolve: releaseRest } = Promise.withResolvers<void>();const encoder = new TextEncoder();showAllResponseFactory = () =>new Response(@@ -602,10 +599,7 @@ describe('FileTree showAll lazy root seed', () => {});test('a first chunk of only hidden entries does not clear the skeleton (no empty-state flash)', async () => {- let releaseVisible: () => void = () => {};- const gate = new Promise<void>((resolve) => {- releaseVisible = resolve;- });+ const { promise: gate, resolve: releaseVisible } = Promise.withResolvers<void>();const encoder = new TextEncoder();showAllResponseFactory = () =>new Response(diff --git a/packages/app/src/components/McpConsentDialog.dom.test.tsx b/packages/app/src/components/McpConsentDialog.dom.test.tsxindex e91856750..d5b3e3fa7 100644--- a/packages/app/src/components/McpConsentDialog.dom.test.tsx+++ b/packages/app/src/components/McpConsentDialog.dom.test.tsx@@ -86,14 +86,6 @@ const noneDetectedPayload: OkMcpWiringShowPayload = {globalSkills: [{ ...DISCOVERY_SKILL, paths: [] }],};-function deferredResult() {- let resolve!: (result: OkMcpWiringResult) => void;- const promise = new Promise<OkMcpWiringResult>((nextResolve) => {- resolve = nextResolve;- });- return { promise, resolve };-}-interface RecordedConfirm {editorIds: readonly string[];pathInstall: boolean | undefined;@@ -508,8 +500,8 @@ describe('McpConsentDialog AI-tools decision', () => {});test('failed Continue resets busy state, reports the error, and allows retry', async () => {- const first = deferredResult();- const second = deferredResult();+ const first = Promise.withResolvers<OkMcpWiringResult>();+ const second = Promise.withResolvers<OkMcpWiringResult>();const outcomes = [first, second];const harness = makeHarness({confirmResult: async () => outcomes.shift()?.promise ?? { ok: true },@@ -699,7 +691,7 @@ describe('McpConsentDialog dismissal', () => {});test('failed skip resets busy state and reports the error', async () => {- const first = deferredResult();+ const first = Promise.withResolvers<OkMcpWiringResult>();const harness = makeHarness({ skipResult: async () => first.promise });await renderDialog(harness);@@ -854,7 +846,7 @@ describe('McpConsentDialog surface by origin', () => {});test('no dismiss surface can fire while a request is in flight', async () => {- const pending = deferredResult();+ const pending = Promise.withResolvers<OkMcpWiringResult>();const harness = await renderDialog(makeHarness({snapshot: { ...payload, origin: 'reconfigure' },@@ -881,7 +873,7 @@ describe('McpConsentDialog surface by origin', () => {});test('the close X is visibly inert while a request is in flight', async () => {- const pending = deferredResult();+ const pending = Promise.withResolvers<OkMcpWiringResult>();await renderDialog(makeHarness({snapshot: { ...payload, origin: 'reconfigure' },diff --git a/packages/app/src/components/NavigatorApp.dom.test.tsx b/packages/app/src/components/NavigatorApp.dom.test.tsxindex 3ffc0f206..786dc5af0 100644--- a/packages/app/src/components/NavigatorApp.dom.test.tsx+++ b/packages/app/src/components/NavigatorApp.dom.test.tsx@@ -234,12 +234,11 @@ describe('NavigatorApp launcher runtime behavior', () => {test('shows the "Opening…" overlay while a project open is in flight, then clears it', async () => {const bridge = createBridge();let resolveOpen: (() => void) | undefined;- bridge.project.open = vi.fn(- () =>- new Promise<void>((resolve) => {- resolveOpen = resolve;- }),- );+ bridge.project.open = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<void>();+ resolveOpen = resolve;+ return promise;+ });await renderNavigator(bridge);expect(screen.queryByTestId('nav-opening-overlay')).toBeNull();diff --git a/packages/app/src/components/NavigatorApp.first-run.dom.test.tsx b/packages/app/src/components/NavigatorApp.first-run.dom.test.tsxindex 75fcaac93..db58bceee 100644--- a/packages/app/src/components/NavigatorApp.first-run.dom.test.tsx+++ b/packages/app/src/components/NavigatorApp.first-run.dom.test.tsx@@ -310,12 +310,11 @@ describe('NavigatorApp launcher — starter-pack line', () => {test('listPacks failure drops the pack line entirely, leaving the four cards', async () => {let settle: (result: unknown) => void = () => {};- const listPacks = vi.fn(- () =>- new Promise((resolve) => {- settle = resolve;- }),- );+ const listPacks = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers();+ settle = resolve;+ return promise;+ });listPacksImpl = listPacks;const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});const bridge = createBridge([]);diff --git a/packages/app/src/components/ProblemsPanel.dom.test.tsx b/packages/app/src/components/ProblemsPanel.dom.test.tsxindex 2c01075e3..e798c43cc 100644--- a/packages/app/src/components/ProblemsPanel.dom.test.tsx+++ b/packages/app/src/components/ProblemsPanel.dom.test.tsx@@ -1048,10 +1048,11 @@ describe('ProblemsPanel — project scope', () => {test('a pending audit shows the loading skeleton with the refresh disabled', async () => {let resolveAudit: (value: ValidationAuditResponse | null) => void = () => {};- runLintAuditImpl = () =>- new Promise((resolve) => {- resolveAudit = resolve;- });+ runLintAuditImpl = () => {+ const { promise, resolve } = Promise.withResolvers<ValidationAuditResponse | null>();+ resolveAudit = resolve;+ return promise;+ };render(<ProblemsPanel docName="notes" diagnostics={[]} />);fireEvent.click(screen.getByTestId('panel-scope-project'));@@ -1290,10 +1291,7 @@ describe('ProblemsPanel — project scope', () => {{ file: 'c.md', diagnostics: [diag({ fixes: [fixableEdit] })] },],});- let releaseFirst: (() => void) | undefined;- const firstInFlight = new Promise<void>((resolve) => {- releaseFirst = resolve;- });+ const { promise: firstInFlight, resolve: releaseFirst } = Promise.withResolvers<void>();fixLintDocImpl = async (docName: string) => {if (docName === 'a') await firstInFlight;return { ok: true as const, status: 200, problemType: null, errorDetail: null };@@ -1306,7 +1304,7 @@ describe('ProblemsPanel — project scope', () => {fireEvent.click(screen.getByTestId('problems-auto-fix'));const stop = await screen.findByTestId('problems-cancel-fix');fireEvent.click(stop);- releaseFirst?.();+ releaseFirst();await waitFor(() => expect(toastInfo).toHaveBeenCalledTimes(1));expect(fixLintDocCalls).toEqual(['a']);@@ -1329,10 +1327,7 @@ describe('ProblemsPanel — project scope', () => {{ file: 'c.md', diagnostics: [diag({ fixes: [fixableEdit] })] },],});- let releaseFirst: (() => void) | undefined;- const firstInFlight = new Promise<void>((resolve) => {- releaseFirst = resolve;- });+ const { promise: firstInFlight, resolve: releaseFirst } = Promise.withResolvers<void>();fixLintDocImpl = async (docName: string) => {if (docName === 'a') await firstInFlight;return { ok: true as const, status: 200, problemType: null, errorDetail: null };@@ -1345,7 +1340,7 @@ describe('ProblemsPanel — project scope', () => {fireEvent.click(screen.getByTestId('problems-auto-fix'));await screen.findByTestId('problems-cancel-fix');view.unmount();- releaseFirst?.();+ releaseFirst();await waitFor(() => expect(fixLintDocCalls).toEqual(['a', 'b', 'c']));await waitFor(() => expect(toastSuccess).toHaveBeenCalledTimes(1));@@ -1365,10 +1360,7 @@ describe('ProblemsPanel — project scope', () => {{ file: 'b.md', diagnostics: [diag({ fixes: [fixableEdit] })] },],});- let releaseFirst: (() => void) | undefined;- const firstInFlight = new Promise<void>((resolve) => {- releaseFirst = resolve;- });+ const { promise: firstInFlight, resolve: releaseFirst } = Promise.withResolvers<void>();fixLintDocImpl = async (docName: string) => {if (docName === 'a') await firstInFlight;return { ok: true as const, status: 200, problemType: null, errorDetail: null };@@ -1380,7 +1372,7 @@ describe('ProblemsPanel — project scope', () => {fireEvent.click(screen.getByTestId('problems-auto-fix'));fireEvent.click(await screen.findByTestId('problems-cancel-fix'));- releaseFirst?.();+ releaseFirst();await waitFor(() => expect(toastInfo).toHaveBeenCalledTimes(1));expect(fixLintDocCalls).toEqual(['a']);@@ -1536,9 +1528,9 @@ describe('ProblemsPanel — project scope', () => {auditResult({ files: [{ file: 'a.md', diagnostics: [diag({ fixes: [fixableEdit] })] }] });let releaseFix: (() => void) | undefined;fixLintDocImpl = async () => {- await new Promise<void>((resolve) => {- releaseFix = resolve;- });+ const { promise, resolve } = Promise.withResolvers<void>();+ releaseFix = resolve;+ await promise;return { ok: true };};render(<ProblemsPanel docName="notes" diagnostics={[]} onFixWithAi={vi.fn(() => {})} />);diff --git a/packages/app/src/components/ProjectSwitcher.dom.test.tsx b/packages/app/src/components/ProjectSwitcher.dom.test.tsxindex 2494656ba..0e06b7745 100644--- a/packages/app/src/components/ProjectSwitcher.dom.test.tsx+++ b/packages/app/src/components/ProjectSwitcher.dom.test.tsx@@ -518,10 +518,8 @@ describe('ProjectSwitcher dropdown behavior', () => {});test('does not flash "No recent projects." while the first listRecent is in flight, then resolves cleanly', async () => {- let resolveList: (value: Array<{ name: string; path: string }>) => void = () => {};- const pending = new Promise<Array<{ name: string; path: string }>>((resolve) => {- resolveList = resolve;- });+ const { promise: pending, resolve: resolveList } =+ Promise.withResolvers<Array<{ name: string; path: string }>>();const bridge = createBridge();bridge.project.listRecent = vi.fn(() => pending);render(<ProjectSwitcher bridge={bridge as never} />);diff --git a/packages/app/src/components/RecentProjectsMenu.dom.test.tsx b/packages/app/src/components/RecentProjectsMenu.dom.test.tsxindex b63810437..4a3e0eb33 100644--- a/packages/app/src/components/RecentProjectsMenu.dom.test.tsx+++ b/packages/app/src/components/RecentProjectsMenu.dom.test.tsx@@ -539,12 +539,14 @@ describe('RecentProjectsMenu — grouped browse (no query)', () => {let resolveInventory:| ((result: { ok: false; reason: 'enumeration-failed' }) => void)| undefined;- bridge.worktree.inventory.mockImplementation(- () =>- new Promise((resolve) => {- resolveInventory = resolve;- }),- );+ bridge.worktree.inventory.mockImplementation(() => {+ const { promise, resolve } = Promise.withResolvers<{+ ok: false;+ reason: 'enumeration-failed';+ }>();+ resolveInventory = resolve;+ return promise;+ });renderMenu({ bridge, recents: [main('/repo', '/repo/.git')] });fireEvent.mouseEnter(screen.getByTestId('project-switcher-group-/repo'));expect(await screen.findByText('Loading worktrees…')).not.toBeNull();diff --git a/packages/app/src/components/ReportBugDialog.dom.test.tsx b/packages/app/src/components/ReportBugDialog.dom.test.tsxindex bfe11c480..dfc62fd88 100644--- a/packages/app/src/components/ReportBugDialog.dom.test.tsx+++ b/packages/app/src/components/ReportBugDialog.dom.test.tsx@@ -163,14 +163,6 @@ function clearBridge() {}}-function deferred<T>() {- let resolve!: (value: T) => void;- const promise = new Promise<T>((r) => {- resolve = r;- });- return { promise, resolve };-}-async function renderDialog(props: {systemWide?: boolean;@@ -374,7 +366,7 @@ describe('ReportBugDialog', () => {});test('Send hands the reviewed zip to the background send manager and closes the dialog', async () => {- const send = deferred<OkBugReportSendResult>();+ const send = Promise.withResolvers<OkBugReportSendResult>();const log = installBridge({ send: () => send.promise });const { closeCalls } = await renderDialog({}, { statefulOpen: true });await createReport('upload me');diff --git a/packages/app/src/components/SeedDialog.dom.test.tsx b/packages/app/src/components/SeedDialog.dom.test.tsxindex 7b53bd552..68c7e5321 100644--- a/packages/app/src/components/SeedDialog.dom.test.tsx+++ b/packages/app/src/components/SeedDialog.dom.test.tsx@@ -197,9 +197,9 @@ describe('SeedDialog runtime behavior', () => {let resolveKnowledgeBasePlan: ((result: OkSeedPlanResult) => void) | null = null;planImpl = (options) => {if (options.packId === 'knowledge-base') {- return new Promise((resolve) => {- resolveKnowledgeBasePlan = resolve;- });+ const { promise, resolve } = Promise.withResolvers<OkSeedPlanResult>();+ resolveKnowledgeBasePlan = resolve;+ return promise;}return Promise.resolve({ ok: true, plan: plainNotesPlan });};diff --git a/packages/app/src/components/SessionsHost.agents.dom.test.tsx b/packages/app/src/components/SessionsHost.agents.dom.test.tsxindex 7166dc18b..66b80cfc7 100644--- a/packages/app/src/components/SessionsHost.agents.dom.test.tsx+++ b/packages/app/src/components/SessionsHost.agents.dom.test.tsx@@ -422,10 +422,11 @@ describe('SessionsHost — agents desktop order-restore gate', () => {const setDockState = vi.fn(() => ({ ok: true as const }));const bridge = {terminal: {- getDockState: () =>- new Promise((resolve) => {- resolveDockState = resolve;- }),+ getDockState: () => {+ const { promise, resolve } = Promise.withResolvers();+ resolveDockState = resolve;+ return promise;+ },setDockState,},editor: { notifyViewMenuStateChanged: vi.fn() },@@ -529,10 +530,11 @@ describe('SessionsHost — agents desktop order-restore gate', () => {const setDockState = vi.fn(() => ({ ok: true as const }));const bridge = {terminal: {- getDockState: () =>- new Promise((resolve) => {- resolveDockState = resolve;- }),+ getDockState: () => {+ const { promise, resolve } = Promise.withResolvers();+ resolveDockState = resolve;+ return promise;+ },setDockState,},editor: { notifyViewMenuStateChanged: vi.fn() },@@ -565,10 +567,11 @@ describe('SessionsHost — agents desktop order-restore gate', () => {let resolveDockState: (state: unknown) => void = () => {};const bridge = {terminal: {- getDockState: () =>- new Promise((resolve) => {- resolveDockState = resolve;- }),+ getDockState: () => {+ const { promise, resolve } = Promise.withResolvers();+ resolveDockState = resolve;+ return promise;+ },setDockState: vi.fn(() => ({ ok: true as const })),},editor: { notifyViewMenuStateChanged: vi.fn() },@@ -598,10 +601,11 @@ describe('SessionsHost — agents desktop order-restore gate', () => {const setDockState = vi.fn(() => ({ ok: true as const }));const bridge = {terminal: {- getDockState: () =>- new Promise((resolve) => {- resolveDockState = resolve;- }),+ getDockState: () => {+ const { promise, resolve } = Promise.withResolvers();+ resolveDockState = resolve;+ return promise;+ },setDockState,},editor: { notifyViewMenuStateChanged: vi.fn() },@@ -696,10 +700,11 @@ describe('SessionsHost — agents desktop order-restore gate', () => {const setDockState = vi.fn(() => ({ ok: true as const }));const bridge = {terminal: {- getDockState: () =>- new Promise((resolve) => {- resolveDockState = resolve;- }),+ getDockState: () => {+ const { promise, resolve } = Promise.withResolvers();+ resolveDockState = resolve;+ return promise;+ },setDockState,},editor: { notifyViewMenuStateChanged: vi.fn() },@@ -2798,12 +2803,11 @@ describe('SessionsHost — agents panel (web / no bridge)', () => {setInitialRosterIds(new Set());let settleTrackedLaunch: (outcome: 'failed') => void = () => {};launchAgentThread- .mockImplementationOnce(- () =>- new Promise((resolve) => {- settleTrackedLaunch = resolve;- }),- )+ .mockImplementationOnce(() => {+ const { promise, resolve } = Promise.withResolvers<'failed'>();+ settleTrackedLaunch = resolve;+ return promise;+ }).mockResolvedValueOnce('deduped');render(<Harness initialVisible />);await waitFor(() => expect(launchAgentThread).toHaveBeenCalledTimes(1));diff --git a/packages/app/src/components/ShareBranchSwitchDialog.dom.test.tsx b/packages/app/src/components/ShareBranchSwitchDialog.dom.test.tsxindex 25536c906..c6ba88d84 100644--- a/packages/app/src/components/ShareBranchSwitchDialog.dom.test.tsx+++ b/packages/app/src/components/ShareBranchSwitchDialog.dom.test.tsx@@ -433,10 +433,7 @@ describe('ShareBranchSwitchDialog — Switch path (runCheckout + CC1 gate)', ()test('Switch does not navigate or warm-focus until CC1 resolves', async () => {const store = createShareReceiveStore();- let resolveCc1: (result: { ok: true }) => void = () => {};- const cc1Promise = new Promise<{ ok: true }>((resolve) => {- resolveCc1 = resolve;- });+ const { promise: cc1Promise, resolve: resolveCc1 } = Promise.withResolvers<{ ok: true }>();const { bridge, calls } = makeBridge({awaitBranchSwitched: vi.fn(() => cc1Promise),});@@ -1221,12 +1218,11 @@ describe('ShareBranchSwitchDialog — worktree leg', () => {const store = createShareReceiveStore();let resolveCheckout: (result: WorktreeCreateResult) => void = () => {};const { bridge, calls } = makeBridge({- checkout: vi.fn(- () =>- new Promise<WorktreeCreateResult>((resolve) => {- resolveCheckout = resolve;- }),- ),+ checkout: vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<WorktreeCreateResult>();+ resolveCheckout = resolve;+ return promise;+ }),});renderDialog(bridge, store);@@ -1439,12 +1435,11 @@ describe('ShareBranchSwitchDialog — worktree leg', () => {const store = createShareReceiveStore();let resolveCheckout: (result: WorktreeCreateResult) => void = () => {};const { bridge, calls } = makeBridge({- checkout: vi.fn(- () =>- new Promise<WorktreeCreateResult>((resolve) => {- resolveCheckout = resolve;- }),- ),+ checkout: vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<WorktreeCreateResult>();+ resolveCheckout = resolve;+ return promise;+ }),});const { emit } = renderDialog(bridge, store);diff --git a/packages/app/src/components/SlidesToolbarControls.dom.test.tsx b/packages/app/src/components/SlidesToolbarControls.dom.test.tsxindex 6a8ac0513..a72c1ee2e 100644--- a/packages/app/src/components/SlidesToolbarControls.dom.test.tsx+++ b/packages/app/src/components/SlidesToolbarControls.dom.test.tsx@@ -230,10 +230,8 @@ describe('SlidesToolbarControls — activation', () => {);try {const user = userEvent.setup();- let resolveOpen: ((result: OkSlidesOpenResult) => void) | undefined;- const pendingOpen = new Promise<OkSlidesOpenResult>((resolve) => {- resolveOpen = resolve;- });+ const { promise: pendingOpen, resolve: resolveOpen } =+ Promise.withResolvers<OkSlidesOpenResult>();const { openSpy } = installBridge({status: () => Promise.resolve({ kind: 'status', available: true, source: 'global' }),open: () => pendingOpen,@@ -251,7 +249,7 @@ describe('SlidesToolbarControls — activation', () => {duration: Number.POSITIVE_INFINITY,});- resolveOpen?.({ kind: 'open', ok: true });+ resolveOpen({ kind: 'open', ok: true });await waitFor(() => expect(action.getAttribute('aria-busy')).toBe('false'));expect(toastDismissSpy).toHaveBeenCalledWith('slides-opening');} finally {diff --git a/packages/app/src/components/TerminalAgentConnectionBanner.dom.test.tsx b/packages/app/src/components/TerminalAgentConnectionBanner.dom.test.tsxindex fe2aab3d0..362a03f76 100644--- a/packages/app/src/components/TerminalAgentConnectionBanner.dom.test.tsx+++ b/packages/app/src/components/TerminalAgentConnectionBanner.dom.test.tsx@@ -248,10 +248,11 @@ describe('TerminalAgentConnectionBanner', () => {'fetch',vi.fn(async (_url: string, init: RequestInit) => {const { intents } = JSON.parse(String(init.body)) as { intents: ApplyIntent[] };- if (intents.length === 0)- return new Promise<Response>((resolve) => {- finishRead = resolve;- });+ if (intents.length === 0) {+ const { promise, resolve } = Promise.withResolvers<Response>();+ finishRead = resolve;+ return promise;+ }return new Response(JSON.stringify({actions: [claudeMcpInstall],diff --git a/packages/app/src/components/TerminalGate.dom.test.tsx b/packages/app/src/components/TerminalGate.dom.test.tsxindex c551ca144..e4850c897 100644--- a/packages/app/src/components/TerminalGate.dom.test.tsx+++ b/packages/app/src/components/TerminalGate.dom.test.tsx@@ -255,10 +255,7 @@ describe('TerminalGate', () => {test('the lazy-chunk Suspense fallback shows the same starting notice (PRD-8313)', async () => {vi.resetModules();- let releasePanel: () => void = () => {};- const panelGate = new Promise<void>((resolve) => {- releasePanel = resolve;- });+ const { promise: panelGate, resolve: releasePanel } = Promise.withResolvers<void>();vi.doMock('./TerminalPanel', async () => {await panelGate;return { TerminalPanel: () => <span data-testid="terminal-panel" /> };diff --git a/packages/app/src/components/TerminalPanel.dom.test.tsx b/packages/app/src/components/TerminalPanel.dom.test.tsxindex 9d5d447f4..229ce0099 100644--- a/packages/app/src/components/TerminalPanel.dom.test.tsx+++ b/packages/app/src/components/TerminalPanel.dom.test.tsx@@ -1725,12 +1725,11 @@ describe('TerminalPanel', () => {Object.defineProperty(globalThis.navigator, 'clipboard', {configurable: true,value: {- readText: vi.fn(- () =>- new Promise<string>((resolve) => {- resolveClipboard = resolve;- }),- ),+ readText: vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<string>();+ resolveClipboard = resolve;+ return promise;+ }),writeText: vi.fn(async () => {}),},});@@ -2227,10 +2226,8 @@ describe('TerminalPanel', () => {});test('reaps a PTY that finishes spawning after the panel has already unmounted', async () => {- let resolveCreate: ((r: OkPtyCreateResult) => void) | undefined;- const createPromise = new Promise<OkPtyCreateResult>((res) => {- resolveCreate = res;- });+ const { promise: createPromise, resolve: resolveCreate } =+ Promise.withResolvers<OkPtyCreateResult>();const kill = vi.fn(async (_id: string) => {});const terminal = {create: vi.fn(() => createPromise),@@ -2251,7 +2248,7 @@ describe('TerminalPanel', () => {act(() => unmount());await act(async () => {- resolveCreate?.({ ok: true, ptyId: 'pty-late' });+ resolveCreate({ ok: true, ptyId: 'pty-late' });await createPromise;});@@ -2260,10 +2257,8 @@ describe('TerminalPanel', () => {});test('reaps a PTY that is mid-start when the panel unmounts', async () => {- let resolveAdopt: ((r: OkPtyAdoptResult) => void) | undefined;- const adoptPromise = new Promise<OkPtyAdoptResult>((res) => {- resolveAdopt = res;- });+ const { promise: adoptPromise, resolve: resolveAdopt } =+ Promise.withResolvers<OkPtyAdoptResult>();const { bridge, terminal } = makeBridge({ ok: true, ptyId: 'pty-1' },WIRED,@@ -2276,7 +2271,7 @@ describe('TerminalPanel', () => {act(() => unmount());await act(async () => {- resolveAdopt?.({ ok: true, replay: '' });+ resolveAdopt({ ok: true, replay: '' });await adoptPromise;});@@ -2411,11 +2406,8 @@ describe('TerminalPanel', () => {});test('surfaces a restartable error state when create() rejects (startup failure, no silent dead-end)', async () => {- let resolveCreate: (() => void) | undefined;let createCalls = 0;- const createGate = new Promise<void>((res) => {- resolveCreate = res;- });+ const { promise: createGate, resolve: resolveCreate } = Promise.withResolvers<void>();const terminal = {create: vi.fn(async () => {createCalls += 1;@@ -2451,7 +2443,7 @@ describe('TerminalPanel', () => {fireEvent.click(restart);await waitFor(() => expect(terminal.create).toHaveBeenCalledTimes(2));await act(async () => {- resolveCreate?.();+ resolveCreate();await Promise.resolve();});await waitFor(() => expect(screen.queryByRole('alert')).toBeNull());@@ -2514,14 +2506,11 @@ describe('TerminalPanel', () => {test('a throw after the adopted shell is live keeps the session running instead of reporting never-started', async () => {let releaseAdopt: ((r: OkPtyAdoptResult) => void) | undefined;- const h = makeBridge(- { ok: true, ptyId: 'unused' },- WIRED,- async () =>- await new Promise<OkPtyAdoptResult>((resolve) => {- releaseAdopt = resolve;- }),- );+ const h = makeBridge({ ok: true, ptyId: 'unused' }, WIRED, () => {+ const { promise, resolve } = Promise.withResolvers<OkPtyAdoptResult>();+ releaseAdopt = resolve;+ return promise;+ });render(<TerminalPanel bridge={h.bridge} adoptPtyId="surv-1" />);await waitFor(() => expect(h.terminal.adopt).toHaveBeenCalledWith('surv-1'));lastTerm?.write.mockImplementationOnce(() => {diff --git a/packages/app/src/components/TimelineDiffPane.dom.test.tsx b/packages/app/src/components/TimelineDiffPane.dom.test.tsxindex 018cb1def..b8185a31e 100644--- a/packages/app/src/components/TimelineDiffPane.dom.test.tsx+++ b/packages/app/src/components/TimelineDiffPane.dom.test.tsx@@ -74,9 +74,9 @@ function mockDiffFetch({ holdRollback = false }: { holdRollback?: boolean } = {}signal: init?.signal,});if (holdRollback) {- return new Promise<Response>((resolve) => {- resolveHeld = resolve;- });+ const { promise, resolve } = Promise.withResolvers<Response>();+ resolveHeld = resolve;+ return promise;}return Promise.resolve(new Response(null, { status: 200 }));}diff --git a/packages/app/src/components/TimelinePanel.restore-dismissal.dom.test.tsx b/packages/app/src/components/TimelinePanel.restore-dismissal.dom.test.tsxindex 2fcaa5235..e32498f64 100644--- a/packages/app/src/components/TimelinePanel.restore-dismissal.dom.test.tsx+++ b/packages/app/src/components/TimelinePanel.restore-dismissal.dom.test.tsx@@ -80,9 +80,9 @@ function mockTimelineFetch(signal: init?.signal,});if (holdRollback) {- return new Promise<Response>((resolve) => {- resolveHeld = resolve;- });+ const { promise, resolve } = Promise.withResolvers<Response>();+ resolveHeld = resolve;+ return promise;}return Promise.resolve(new Response(null, { status: 200 }));}diff --git a/packages/app/src/components/acp/GitHubReferenceCard.dom.test.tsx b/packages/app/src/components/acp/GitHubReferenceCard.dom.test.tsxindex 08f3232e5..fb59d047f 100644--- a/packages/app/src/components/acp/GitHubReferenceCard.dom.test.tsx+++ b/packages/app/src/components/acp/GitHubReferenceCard.dom.test.tsx@@ -83,12 +83,11 @@ describe('GitHub links in agent messages', () => {test('leaving the link before the card loads never opens it later', async () => {let release: (res: Response) => void = () => {};- const fetchMock = vi.fn(- () =>- new Promise<Response>((resolve) => {- release = resolve;- }),- );+ const fetchMock = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<Response>();+ release = resolve;+ return promise;+ });globalThis.fetch = fetchMock as unknown as typeof fetch;render(<AgentMarkdown text="https://github.com/inkeep/agents/pull/77" />);const link = screen.getByRole('link');diff --git a/packages/app/src/components/acp/ThreadView.dom.test.tsx b/packages/app/src/components/acp/ThreadView.dom.test.tsxindex 7476de5c8..77c49f39a 100644--- a/packages/app/src/components/acp/ThreadView.dom.test.tsx+++ b/packages/app/src/components/acp/ThreadView.dom.test.tsx@@ -3013,19 +3013,15 @@ describe('ThreadView retry', () => {});test('a retry rejection that lands after the thread moved on never surfaces when the thread fails again', async () => {- let rejectRetry: ((err: unknown) => void) | undefined;- retryThread.mockReturnValueOnce(- new Promise<ThreadInfo>((_resolve, reject) => {- rejectRetry = reject;- }),- );+ const { promise: pendingRetry, reject: rejectRetry } = Promise.withResolvers<ThreadInfo>();+ retryThread.mockReturnValueOnce(pendingRetry);model = makeModel({ turnActive: false, items: [failureNotice('connect')] });const view = render(<ThreadView info={makeInfo({ status: 'error' })} />);await userEvent.click(screen.getByTestId('agent-thread-retry'));view.rerender(<ThreadView info={makeInfo({ status: 'spawning' })} />);await act(async () => {- rejectRetry?.(new ThreadRetryError('timeout', 'retry timed out'));+ rejectRetry(new ThreadRetryError('timeout', 'retry timed out'));});view.rerender(<ThreadView info={makeInfo({ status: 'error' })} />);@@ -4332,12 +4328,8 @@ describe('ThreadView auth-required dead ends', () => {});test('a new chat that lost the race to another launch says so rather than going quiet', async () => {- let releaseCreate: (() => void) | undefined;- createThread.mockReturnValueOnce(- new Promise<void>((resolve) => {- releaseCreate = resolve;- }),- );+ const { promise: pendingCreate, resolve: releaseCreate } = Promise.withResolvers<void>();+ createThread.mockReturnValueOnce(pendingCreate);const inflight = launchAgentThread({ source: 'registry', id: 'claude' }, null, null, null);model = makeModel({ turnActive: false, items: [authNotice()] });render(<ThreadView info={makeInfo({ archived: true, status: 'exited', resumable: false })} />);@@ -4351,7 +4343,7 @@ describe('ThreadView auth-required dead ends', () => {expect(createThread).toHaveBeenCalledTimes(1);await act(async () => {- releaseCreate?.();+ releaseCreate();await inflight;});});@@ -4588,12 +4580,8 @@ describe('ThreadView auth-required dead ends', () => {test.each(IN_FLIGHT_CASES)('the $kind offer is disabled and announced while it is in flight',async ({ info, items, spy, announcement }) => {- let release: (() => void) | undefined;- spy().mockReturnValueOnce(- new Promise<void>((resolve) => {- release = resolve;- }),- );+ const { promise: pending, resolve: release } = Promise.withResolvers<void>();+ spy().mockReturnValueOnce(pending);model = makeModel({ turnActive: false, items: [...items] });render(<ThreadView info={makeInfo(info)} />);@@ -4606,7 +4594,7 @@ describe('ThreadView auth-required dead ends', () => {expect(spy()).toHaveBeenCalledTimes(1);await act(async () => {- release?.();+ release();});await waitFor(() => expect(offerButton().hasAttribute('disabled')).toBe(false));expect(offerButton().getAttribute('aria-busy')).toBe('false');@@ -4740,12 +4728,8 @@ describe('ThreadView auth-required dead ends', () => {resumeThread.mockRejectedValueOnce(new ThreadResumeError('capacity', 'maximum of 8 concurrent agent threads'),);- let releaseCreate: (() => void) | undefined;- createThread.mockReturnValueOnce(- new Promise<void>((resolve) => {- releaseCreate = resolve;- }),- );+ const { promise: pendingCreate, resolve: releaseCreate } = Promise.withResolvers<void>();+ createThread.mockReturnValueOnce(pendingCreate);model = makeModel({ turnActive: false, items: [authNotice()] });render(<ThreadView info={makeInfo({ archived: true, status: 'exited' })} />);@@ -4759,7 +4743,7 @@ describe('ThreadView auth-required dead ends', () => {expect(within(offerButton()).queryByRole('status')).toBeNull();await act(async () => {- releaseCreate?.();+ releaseCreate();});await waitFor(() => expect(offerButton().hasAttribute('disabled')).toBe(false));});@@ -4768,12 +4752,8 @@ describe('ThreadView auth-required dead ends', () => {resumeThread.mockRejectedValueOnce(new ThreadResumeError('capacity', 'maximum of 8 concurrent agent threads'),);- let releaseCreate: (() => void) | undefined;- createThread.mockReturnValueOnce(- new Promise<void>((resolve) => {- releaseCreate = resolve;- }),- );+ const { promise: pendingCreate, resolve: releaseCreate } = Promise.withResolvers<void>();+ createThread.mockReturnValueOnce(pendingCreate);model = makeModel({ turnActive: false, items: [authNotice()] });render(<ThreadView info={makeInfo({ archived: true, status: 'exited' })} />);@@ -4790,18 +4770,14 @@ describe('ThreadView auth-required dead ends', () => {expect(offerButton().hasAttribute('disabled')).toBe(true);await act(async () => {- releaseCreate?.();+ releaseCreate();});await waitFor(() => expect(createThread).toHaveBeenCalledTimes(1));});test('an unresumable chat keeps its new-chat offer through the launch it starts', async () => {- let releaseCreate: (() => void) | undefined;- createThread.mockReturnValueOnce(- new Promise<void>((resolve) => {- releaseCreate = resolve;- }),- );+ const { promise: pendingCreate, resolve: releaseCreate } = Promise.withResolvers<void>();+ createThread.mockReturnValueOnce(pendingCreate);model = makeModel({ turnActive: false, items: [authNotice()] });render(<ThreadView info={makeInfo({ archived: true, status: 'exited', resumable: false })} />);@@ -4809,7 +4785,7 @@ describe('ThreadView auth-required dead ends', () => {expect(offerButton().getAttribute('data-auth-offer-kind')).toBe('new-chat');await act(async () => {- releaseCreate?.();+ releaseCreate();});await waitFor(() => expect(createThread).toHaveBeenCalledTimes(1));expect(offerButton().getAttribute('data-auth-offer-kind')).toBe('new-chat');@@ -4851,12 +4827,8 @@ describe('ThreadView auth-required dead ends', () => {resumeThread.mockRejectedValueOnce(new ThreadResumeError('resume-unsupported', 'this thread never completed an agent session'),);- let releaseCreate: (() => void) | undefined;- createThread.mockReturnValueOnce(- new Promise<void>((resolve) => {- releaseCreate = resolve;- }),- );+ const { promise: pendingCreate, resolve: releaseCreate } = Promise.withResolvers<void>();+ createThread.mockReturnValueOnce(pendingCreate);model = makeModel({ turnActive: false, items: [authNotice()] });render(<ThreadView info={makeInfo({ archived: true, status: 'exited' })} />);@@ -4873,7 +4845,7 @@ describe('ThreadView auth-required dead ends', () => {expect(offerButton().hasAttribute('disabled')).toBe(true);await act(async () => {- releaseCreate?.();+ releaseCreate();});await waitFor(() => expect(createThread).toHaveBeenCalledTimes(1));});diff --git a/packages/app/src/components/conflict-view-regressions.dom.test.tsx b/packages/app/src/components/conflict-view-regressions.dom.test.tsxindex db08110c8..23d579285 100644--- a/packages/app/src/components/conflict-view-regressions.dom.test.tsx+++ b/packages/app/src/components/conflict-view-regressions.dom.test.tsx@@ -121,10 +121,7 @@ test('Apply commits once however many times it is clicked', async () => {});test('the Apply latch is held until the resolve settles, not until the next tick', async () => {- let release!: () => void;- const inFlight = new Promise<void>((r) => {- release = r;- });+ const { promise: inFlight, resolve: release } = Promise.withResolvers<void>();const onResolve = vi.fn(() => inFlight);await mount({diff --git a/packages/app/src/components/file-tree-rename-focus-reconciliation.dom.test.tsx b/packages/app/src/components/file-tree-rename-focus-reconciliation.dom.test.tsxindex d7aa3e1d5..51d27f487 100644--- a/packages/app/src/components/file-tree-rename-focus-reconciliation.dom.test.tsx+++ b/packages/app/src/components/file-tree-rename-focus-reconciliation.dom.test.tsx@@ -47,14 +47,6 @@ const reconcileLocalRenameMock = vi.fn(async () => {});const reconcileLocalRemovalMock = vi.fn(async () => {});const dispatchHandoffMock = vi.fn(async () => ({ ok: true as const }));-function deferred() {- let resolve!: () => void;- const promise = new Promise<void>((resolvePromise) => {- resolve = resolvePromise;- });- return { promise, resolve };-}-const INITIAL_DOCUMENTS: FileEntry[] = [{kind: 'document',@@ -491,7 +483,7 @@ describe('FileTree post-rename Pierre/React store reconciliation', () => {});test('waits for local rename reconciliation before adding the destination page or resetting the tree', async () => {- const reconciliation = deferred();+ const reconciliation = Promise.withResolvers<void>();reconcileLocalRenameMock.mockImplementation(() => reconciliation.promise);render(<FileTree />);diff --git a/packages/app/src/components/handoff/ExternalHandoffGate.dom.test.tsx b/packages/app/src/components/handoff/ExternalHandoffGate.dom.test.tsxindex a7d152156..7b774c908 100644--- a/packages/app/src/components/handoff/ExternalHandoffGate.dom.test.tsx+++ b/packages/app/src/components/handoff/ExternalHandoffGate.dom.test.tsx@@ -63,16 +63,6 @@ function unavailableResult(): ApplyAgentConnectionsResult {};}-function deferred<T>() {- let resolve!: (value: T) => void;- let reject!: (reason?: unknown) => void;- const promise = new Promise<T>((next, fail) => {- resolve = next;- reject = fail;- });- return { promise, resolve, reject };-}-function GateHarness({rawDispatch,target = 'claude-code',@@ -251,7 +241,7 @@ describe('ExternalHandoffGate', () => {test('a fast readiness check completes without showing a delayed checking status', async () => {vi.useFakeTimers();- const read = deferred<ApplyAgentConnectionsResult>();+ const read = Promise.withResolvers<ApplyAgentConnectionsResult>();const applyConnections = vi.fn(() => read.promise);const rawDispatch = vi.fn(async () => ({ ok: true as const }));const onOutcome = vi.fn();@@ -269,7 +259,7 @@ describe('ExternalHandoffGate', () => {test('a slow readiness check exposes a perceivable status after a short delay', async () => {vi.useFakeTimers();- const read = deferred<ApplyAgentConnectionsResult>();+ const read = Promise.withResolvers<ApplyAgentConnectionsResult>();const applyConnections = vi.fn(() => read.promise);const rawDispatch = vi.fn(async () => ({ ok: true as const }));renderGate(applyConnections, <GateHarness rawDispatch={rawDispatch} />);@@ -288,7 +278,7 @@ describe('ExternalHandoffGate', () => {test('a stalled readiness read fails open within a bounded time and warns before dispatch', async () => {vi.useFakeTimers();const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});- const read = deferred<ApplyAgentConnectionsResult>();+ const read = Promise.withResolvers<ApplyAgentConnectionsResult>();const applyConnections = vi.fn(() => read.promise);const rawDispatch = vi.fn(async () => ({ ok: true as const }));const onOutcome = vi.fn();@@ -620,7 +610,7 @@ describe('ExternalHandoffGate', () => {});test('closing setup restores focus to the stable picker trigger', async () => {- const read = deferred<ApplyAgentConnectionsResult>();+ const read = Promise.withResolvers<ApplyAgentConnectionsResult>();const applyConnections = vi.fn(() => read.promise);const rawDispatch = vi.fn(async () => ({ ok: true as const }));renderGate(applyConnections, <DismissingPickerHarness rawDispatch={rawDispatch} />);@@ -637,7 +627,7 @@ describe('ExternalHandoffGate', () => {});test('closing setup uses the caller focus fallback after the initiating item unmounts', async () => {- const read = deferred<ApplyAgentConnectionsResult>();+ const read = Promise.withResolvers<ApplyAgentConnectionsResult>();const applyConnections = vi.fn(() => read.promise);const rawDispatch = vi.fn(async () => ({ ok: true as const }));renderGate(applyConnections, <UnmountingPickerHarness rawDispatch={rawDispatch} />);@@ -829,8 +819,8 @@ describe('ExternalHandoffGate', () => {});test('a newer request supersedes an older readiness check', async () => {- const first = deferred<ApplyAgentConnectionsResult>();- const second = deferred<ApplyAgentConnectionsResult>();+ const first = Promise.withResolvers<ApplyAgentConnectionsResult>();+ const second = Promise.withResolvers<ApplyAgentConnectionsResult>();const applyConnections = vi.fn<() => Promise<ApplyAgentConnectionsResult>>().mockReturnValueOnce(first.promise)@@ -868,7 +858,7 @@ describe('ExternalHandoffGate', () => {test('a superseded stalled read cannot later bypass readiness or launch its destination', async () => {vi.useFakeTimers();const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});- const first = deferred<ApplyAgentConnectionsResult>();+ const first = Promise.withResolvers<ApplyAgentConnectionsResult>();const applyConnections = vi.fn<() => Promise<ApplyAgentConnectionsResult>>().mockReturnValueOnce(first.promise)@@ -897,7 +887,7 @@ describe('ExternalHandoffGate', () => {test('a rejected stale check does not warn about bypassing readiness', async () => {const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});- const first = deferred<ApplyAgentConnectionsResult>();+ const first = Promise.withResolvers<ApplyAgentConnectionsResult>();const applyConnections = vi.fn<() => Promise<ApplyAgentConnectionsResult>>().mockReturnValueOnce(first.promise)@@ -928,7 +918,7 @@ describe('ExternalHandoffGate', () => {});test('a newer request supersedes an in-flight setup save', async () => {- const save = deferred<ApplyAgentConnectionsResult>();+ const save = Promise.withResolvers<ApplyAgentConnectionsResult>();const applyConnections = vi.fn<() => Promise<ApplyAgentConnectionsResult>>().mockResolvedValueOnce(result(terminalAgentSnapshot()))diff --git a/packages/app/src/components/settings/AboutSection.dom.test.tsx b/packages/app/src/components/settings/AboutSection.dom.test.tsxindex e3bf1cf55..627a06d4c 100644--- a/packages/app/src/components/settings/AboutSection.dom.test.tsx+++ b/packages/app/src/components/settings/AboutSection.dom.test.tsx@@ -443,12 +443,11 @@ describe('AboutSection automatic updates switch', () => {});let resolveStaleRead: (value: unknown) => void = () => {};- bridge.state.query.mockImplementationOnce(- () =>- new Promise((resolve) => {- resolveStaleRead = resolve;- }),- );+ bridge.state.query.mockImplementationOnce(() => {+ const { promise, resolve } = Promise.withResolvers();+ resolveStaleRead = resolve;+ return promise;+ });window.dispatchEvent(new Event('focus'));await userEvent.click(toggle);await waitFor(() => expect(toggle.getAttribute('aria-checked')).toBe('false'));diff --git a/packages/app/src/components/settings/AccountSection.dom.test.tsx b/packages/app/src/components/settings/AccountSection.dom.test.tsxindex 8888a681e..4445c0f3e 100644--- a/packages/app/src/components/settings/AccountSection.dom.test.tsx+++ b/packages/app/src/components/settings/AccountSection.dom.test.tsx@@ -269,10 +269,7 @@ describe('AccountSection', () => {test('double-clicking Disconnect spawns only one relay signout', async () => {let signoutCalls = 0;- let releaseSignout: (() => void) | undefined;- const signoutGate = new Promise<void>((resolve) => {- releaseSignout = resolve;- });+ const { promise: signoutGate, resolve: releaseSignout } = Promise.withResolvers<void>();let signedOut = false;renderSection(makeQueryTransport({@@ -294,7 +291,7 @@ describe('AccountSection', () => {expect(signoutCalls).toBe(1);- releaseSignout?.();+ releaseSignout();expect(await screen.findByText('Not connected')).toBeDefined();});@@ -513,10 +510,7 @@ describe('AccountSection host-token prefill', () => {test('never seeds over a host the user has already typed', async () => {const user = userEvent.setup();- let release: (() => void) | undefined;- const gate = new Promise<void>((resolve) => {- release = resolve;- });+ const { promise: gate, resolve: release } = Promise.withResolvers<void>();syncStatusCalls = 0;globalThis.fetch = (async (url: string) => {if (String(url).includes('/api/sync/status')) {@@ -533,7 +527,7 @@ describe('AccountSection host-token prefill', () => {renderSection(makeQueryTransport({ status: async () => CONNECTED }));await user.type(await screen.findByLabelText('Host'), 'git.mine.test');- release?.();+ release();await waitFor(() => expect(syncStatusCalls).toBeGreaterThan(0));await act(async () => {await Promise.resolve();diff --git a/packages/app/src/components/settings/CustomThemeEditor.dom.test.tsx b/packages/app/src/components/settings/CustomThemeEditor.dom.test.tsxindex 2b95167b4..9607dd915 100644--- a/packages/app/src/components/settings/CustomThemeEditor.dom.test.tsx+++ b/packages/app/src/components/settings/CustomThemeEditor.dom.test.tsx@@ -567,12 +567,11 @@ describe('CustomThemeEditor', () => {},};let resolveUpdate: ((result: UpdateSavedThemeResult) => void) | undefined;- updateTheme.mockImplementation(- async () =>- new Promise<UpdateSavedThemeResult>((resolve) => {- resolveUpdate = resolve;- }),- );+ updateTheme.mockImplementation(() => {+ const { promise, resolve } = Promise.withResolvers<UpdateSavedThemeResult>();+ resolveUpdate = resolve;+ return promise;+ });const { container, rerenderEditor, getByText } = await renderEditor();const first = hexInputs(container)[0] as HTMLInputElement;@@ -616,12 +615,11 @@ describe('CustomThemeEditor', () => {},};let resolveUpdate: ((result: UpdateSavedThemeResult) => void) | undefined;- updateTheme.mockImplementation(- async () =>- new Promise<UpdateSavedThemeResult>((resolve) => {- resolveUpdate = resolve;- }),- );+ updateTheme.mockImplementation(() => {+ const { promise, resolve } = Promise.withResolvers<UpdateSavedThemeResult>();+ resolveUpdate = resolve;+ return promise;+ });const { container, rerenderEditor } = await renderEditor();const first = hexInputs(container)[0] as HTMLInputElement;@@ -698,12 +696,11 @@ describe('CustomThemeEditor', () => {},];let resolveUpdate: ((result: UpdateSavedThemeResult) => void) | undefined;- updateTheme.mockImplementation(- async () =>- new Promise<UpdateSavedThemeResult>((resolve) => {- resolveUpdate = resolve;- }),- );+ updateTheme.mockImplementation(() => {+ const { promise, resolve } = Promise.withResolvers<UpdateSavedThemeResult>();+ resolveUpdate = resolve;+ return promise;+ });const { container, rerenderEditor } = await renderEditor();const first = hexInputs(container)[0] as HTMLInputElement;@@ -743,12 +740,11 @@ describe('CustomThemeEditor', () => {];let resolveUpdate: ((result: UpdateSavedThemeResult) => void) | undefined;updateTheme- .mockImplementationOnce(- async () =>- new Promise<UpdateSavedThemeResult>((resolve) => {- resolveUpdate = resolve;- }),- )+ .mockImplementationOnce(() => {+ const { promise, resolve } = Promise.withResolvers<UpdateSavedThemeResult>();+ resolveUpdate = resolve;+ return promise;+ }).mockResolvedValue({ ok: true, id: 'saved-active', filename: 'active.yaml' });const { container } = await renderEditor();const first = hexInputs(container)[0] as HTMLInputElement;@@ -792,12 +788,11 @@ describe('CustomThemeEditor', () => {{ id: 'saved-b', label: 'Theme B', kind: 'dark', scheme: themeB },];let resolveUpdate: ((result: UpdateSavedThemeResult) => void) | undefined;- updateTheme.mockImplementation(- async () =>- new Promise<UpdateSavedThemeResult>((resolve) => {- resolveUpdate = resolve;- }),- );+ updateTheme.mockImplementation(() => {+ const { promise, resolve } = Promise.withResolvers<UpdateSavedThemeResult>();+ resolveUpdate = resolve;+ return promise;+ });const { container, rerenderEditor } = await renderEditor();const first = hexInputs(container)[0] as HTMLInputElement;@@ -833,12 +828,11 @@ describe('CustomThemeEditor', () => {},];let resolveUpdate: ((result: UpdateSavedThemeResult) => void) | undefined;- updateTheme.mockImplementation(- async () =>- new Promise<UpdateSavedThemeResult>((resolve) => {- resolveUpdate = resolve;- }),- );+ updateTheme.mockImplementation(() => {+ const { promise, resolve } = Promise.withResolvers<UpdateSavedThemeResult>();+ resolveUpdate = resolve;+ return promise;+ });const { container, rerenderEditor, getByText, queryByText } = await renderEditor();const first = hexInputs(container)[0] as HTMLInputElement;diff --git a/packages/app/src/components/settings/SavedThemesTiles.dom.test.tsx b/packages/app/src/components/settings/SavedThemesTiles.dom.test.tsxindex df0607685..402889283 100644--- a/packages/app/src/components/settings/SavedThemesTiles.dom.test.tsx+++ b/packages/app/src/components/settings/SavedThemesTiles.dom.test.tsx@@ -214,10 +214,11 @@ describe('SavedThemesTiles', () => {test('warns when the saved-theme scan returns an incomplete list', async () => {let resolveScan: ((response: Response) => void) | undefined;- globalThis.fetch = async () =>- new Promise<Response>((resolve) => {- resolveScan = resolve;- });+ globalThis.fetch = () => {+ const { promise, resolve } = Promise.withResolvers<Response>();+ resolveScan = resolve;+ return promise;+ };await renderTiles();const status = screen.getByRole('status');diff --git a/packages/app/src/components/ui/pane-card.dom.test.tsx b/packages/app/src/components/ui/pane-card.dom.test.tsxindex e154bfc13..de403a521 100644--- a/packages/app/src/components/ui/pane-card.dom.test.tsx+++ b/packages/app/src/components/ui/pane-card.dom.test.tsx@@ -135,10 +135,7 @@ describe('PaneCard', () => {});test('a suspending child reaches the boundary outside the card, so the card owns no Suspense', () => {- let resolve: (() => void) | null = null;- const gate = new Promise<void>((done) => {- resolve = done;- });+ const { promise: gate, resolve } = Promise.withResolvers<void>();function Suspending() {throw gate;}@@ -152,7 +149,7 @@ describe('PaneCard', () => {expect(screen.getByTestId('outer-fallback')).toBeTruthy();expect(document.querySelector('[data-slot="pane-card"]')).toBeNull();- resolve?.();+ resolve();});test('a throwing child reaches the boundary outside the card, so the card owns no error boundary', () => {diff --git a/packages/app/src/editor/bubble-menu/LinkEditPopover.dom.test.tsx b/packages/app/src/editor/bubble-menu/LinkEditPopover.dom.test.tsxindex 8b086f733..4efe60c04 100644--- a/packages/app/src/editor/bubble-menu/LinkEditPopover.dom.test.tsx+++ b/packages/app/src/editor/bubble-menu/LinkEditPopover.dom.test.tsx@@ -371,12 +371,11 @@ describe('LinkEditPopover clipboard pre-fill', () => {test('leaves the input empty when the clipboard holds prose, with no error surfaced', async () => {let resolveRead!: (value: string) => void;- const clip = stubClipboardRead(- () =>- new Promise<string>((resolve) => {- resolveRead = resolve;- }),- );+ const clip = stubClipboardRead(() => {+ const { promise, resolve } = Promise.withResolvers<string>();+ resolveRead = resolve;+ return promise;+ });try {renderPopover(makeEditor({ active: false }));fireEvent.mouseDown(screen.getByRole('button', { name: 'Insert link' }));@@ -395,12 +394,11 @@ describe('LinkEditPopover clipboard pre-fill', () => {test('degrades silently to an empty, functional input when the clipboard read is denied', async () => {let rejectRead!: (reason: unknown) => void;- const clip = stubClipboardRead(- () =>- new Promise<string>((_resolve, reject) => {- rejectRead = reject;- }),- );+ const clip = stubClipboardRead(() => {+ const { promise, reject } = Promise.withResolvers<string>();+ rejectRead = reject;+ return promise;+ });try {renderPopover(makeEditor({ active: false }));fireEvent.mouseDown(screen.getByRole('button', { name: 'Insert link' }));@@ -440,12 +438,11 @@ describe('LinkEditPopover clipboard pre-fill', () => {test('a value the user typed before the clipboard resolved wins', async () => {let resolveRead!: (value: string) => void;- const clip = stubClipboardRead(- () =>- new Promise<string>((resolve) => {- resolveRead = resolve;- }),- );+ const clip = stubClipboardRead(() => {+ const { promise, resolve } = Promise.withResolvers<string>();+ resolveRead = resolve;+ return promise;+ });try {renderPopover(makeEditor({ active: false }));fireEvent.mouseDown(screen.getByRole('button', { name: 'Insert link' }));diff --git a/packages/app/src/editor/client-removal-reconciliation.test.ts b/packages/app/src/editor/client-removal-reconciliation.test.tsindex c159ea29b..b8244d688 100644--- a/packages/app/src/editor/client-removal-reconciliation.test.ts+++ b/packages/app/src/editor/client-removal-reconciliation.test.ts@@ -4,16 +4,6 @@ import {createClientRemovalReconciler,} from './client-removal-reconciliation';-function deferred<T = void>() {- let resolve!: (value: T | PromiseLike<T>) => void;- let reject!: (reason?: unknown) => void;- const promise = new Promise<T>((resolvePromise, rejectPromise) => {- resolve = resolvePromise;- reject = rejectPromise;- });- return { promise, resolve, reject };-}-function createPorts(options: {activePoolDocName?: string | null;@@ -26,7 +16,7 @@ function createPorts() {const log: string[] = [];let activePoolDocName = options.activePoolDocName ?? null;- const clearDeferred = new Map<string, ReturnType<typeof deferred>>();+ const clearDeferred = new Map<string, PromiseWithResolvers<void>>();const ports: ClientRemovalReconciliationPorts = {captureRenameSnapshots: (renamed) =>log.push(@@ -42,7 +32,7 @@ function createPorts(log.push(`clear:end:${docName}`);return Promise.resolve();}- const pending = deferred();+ const pending = Promise.withResolvers<void>();clearDeferred.set(docName, pending);pending.promise.then(() => {if (activePoolDocName === docName) activePoolDocName = null;diff --git a/packages/app/src/editor/editor-cache.test.ts b/packages/app/src/editor/editor-cache.test.tsindex 5991eee5b..7eed0936d 100644--- a/packages/app/src/editor/editor-cache.test.ts+++ b/packages/app/src/editor/editor-cache.test.ts@@ -2558,13 +2558,13 @@ describe('US-004: D20 mount-promise cancellation wired into evict', () => {const origYield = scheduler.yield.bind(scheduler);let stallResolve: (() => void) | null = null;let yieldCallCount = 0;- scheduler.yield = (() => {+ scheduler.yield = () => {yieldCallCount++;if (yieldCallCount === 1) return Promise.resolve();- return new Promise<void>((res) => {- stallResolve = res;- });- }) as typeof scheduler.yield;+ const { promise, resolve } = Promise.withResolvers<void>();+ stallResolve = resolve;+ return promise;+ };try {const pending = mountTiptapEditorPromise({diff --git a/packages/app/src/editor/link-preview/external-link-preview.test.ts b/packages/app/src/editor/link-preview/external-link-preview.test.tsindex 1a7e5aab2..5dddca36b 100644--- a/packages/app/src/editor/link-preview/external-link-preview.test.ts+++ b/packages/app/src/editor/link-preview/external-link-preview.test.ts@@ -136,12 +136,11 @@ describe('loadLinkPreview — single-flight + abort', () => {test('concurrent identical hovers coalesce to a single request', async () => {const url = uniqueUrl();let resolveFetch!: (r: Response) => void;- const fetchMock = vi.fn(- () =>- new Promise<Response>((resolve) => {- resolveFetch = resolve;- }),- );+ const fetchMock = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<Response>();+ resolveFetch = resolve;+ return promise;+ });globalThis.fetch = fetchMock as unknown as typeof fetch;const first = loadLinkPreview(url);diff --git a/packages/app/src/editor/mount-promise.test.ts b/packages/app/src/editor/mount-promise.test.tsindex 32b52d8e1..4cc2bd4c6 100644--- a/packages/app/src/editor/mount-promise.test.ts+++ b/packages/app/src/editor/mount-promise.test.ts@@ -338,13 +338,13 @@ describe('invalidate-during-construction silent teardown (D27 silent-only)', ()const origYield = scheduler.yield.bind(scheduler);let stallResolve: (() => void) | null = null;let yieldCallCount = 0;- scheduler.yield = (() => {+ scheduler.yield = () => {yieldCallCount++;if (yieldCallCount === 1) return Promise.resolve();- return new Promise<void>((res) => {- stallResolve = res;- });- }) as typeof scheduler.yield;+ const { promise, resolve } = Promise.withResolvers<void>();+ stallResolve = resolve;+ return promise;+ };try {const promise = mountTiptapEditorPromise({@@ -532,13 +532,13 @@ describe('mount-failure error path', () => {const origYield = scheduler.yield.bind(scheduler);let stallResolve: (() => void) | null = null;let yieldCallCount = 0;- scheduler.yield = (() => {+ scheduler.yield = () => {yieldCallCount++;if (yieldCallCount === 1) return Promise.resolve();- return new Promise<void>((res) => {- stallResolve = res;- });- }) as typeof scheduler.yield;+ const { promise, resolve } = Promise.withResolvers<void>();+ stallResolve = resolve;+ return promise;+ };try {const promise = mountTiptapEditorPromise({@@ -647,10 +647,11 @@ describe('stalled-but-pending observability (D27 LOCKED, precedent 41)', () => {const h = makeHarness('doc-stalled-once');const origYield = scheduler.yield.bind(scheduler);let stallResolve: (() => void) | null = null;- scheduler.yield = (() =>- new Promise<void>((res) => {- stallResolve = res;- })) as typeof scheduler.yield;+ scheduler.yield = () => {+ const { promise, resolve } = Promise.withResolvers<void>();+ stallResolve = resolve;+ return promise;+ };try {const promise = mountTiptapEditorPromise({docName: h.docName,@@ -672,10 +673,11 @@ describe('stalled-but-pending observability (D27 LOCKED, precedent 41)', () => {const h = makeHarness('doc-stalled-reaper');const origYield = scheduler.yield.bind(scheduler);let stallResolve: (() => void) | null = null;- scheduler.yield = (() =>- new Promise<void>((res) => {- stallResolve = res;- })) as typeof scheduler.yield;+ scheduler.yield = () => {+ const { promise, resolve } = Promise.withResolvers<void>();+ stallResolve = resolve;+ return promise;+ };try {const promise = mountTiptapEditorPromise({docName: h.docName,@@ -696,10 +698,11 @@ describe('stalled-but-pending observability (D27 LOCKED, precedent 41)', () => {const h = makeHarness('doc-stalled-idempotent');const origYield = scheduler.yield.bind(scheduler);let stallResolve: (() => void) | null = null;- scheduler.yield = (() =>- new Promise<void>((res) => {- stallResolve = res;- })) as typeof scheduler.yield;+ scheduler.yield = () => {+ const { promise, resolve } = Promise.withResolvers<void>();+ stallResolve = resolve;+ return promise;+ };try {const promise = mountTiptapEditorPromise({docName: h.docName,@@ -730,10 +733,11 @@ describe('D27 no-timer-reject regression guard', () => {const h = makeHarness('d27-no-timer-reject');const origYield = scheduler.yield.bind(scheduler);let stallResolve: (() => void) | null = null;- scheduler.yield = (() =>- new Promise<void>((res) => {- stallResolve = res;- })) as typeof scheduler.yield;+ scheduler.yield = () => {+ const { promise, resolve } = Promise.withResolvers<void>();+ stallResolve = resolve;+ return promise;+ };if (typeof globalThis.window === 'undefined') {// biome-ignore lint/suspicious/noExplicitAny: minimal test-only window stub(globalThis as any).window = {@@ -824,15 +828,15 @@ describe('getMountAbortController (FW13 explicit-cancel surface)', () => {const origYield = scheduler.yield.bind(scheduler);let stallResolve: (() => void) | null = null;let yieldCallCount = 0;- scheduler.yield = (() => {+ scheduler.yield = () => {yieldCallCount++;if (yieldCallCount === 1) {return Promise.resolve();}- return new Promise<void>((res) => {- stallResolve = res;- });- }) as typeof scheduler.yield;+ const { promise, resolve } = Promise.withResolvers<void>();+ stallResolve = resolve;+ return promise;+ };try {const promise = mountTiptapEditorPromise({@@ -886,10 +890,11 @@ describe('subscribeMountStalled (FW13 affordance contract)', () => {const h = makeHarness('subscribe-fan-out');const origYield = scheduler.yield.bind(scheduler);let stallResolve: (() => void) | null = null;- scheduler.yield = (() =>- new Promise<void>((res) => {- stallResolve = res;- })) as typeof scheduler.yield;+ scheduler.yield = () => {+ const { promise, resolve } = Promise.withResolvers<void>();+ stallResolve = resolve;+ return promise;+ };const events: { docName: string; mountId: string }[] = [];const unsubscribe = subscribeMountStalled((docName, mountId) => {events.push({ docName, mountId });@@ -914,10 +919,11 @@ describe('subscribeMountStalled (FW13 affordance contract)', () => {const h = makeHarness('subscribe-replay');const origYield = scheduler.yield.bind(scheduler);let stallResolve: (() => void) | null = null;- scheduler.yield = (() =>- new Promise<void>((res) => {- stallResolve = res;- })) as typeof scheduler.yield;+ scheduler.yield = () => {+ const { promise, resolve } = Promise.withResolvers<void>();+ stallResolve = resolve;+ return promise;+ };try {const promise = mountTiptapEditorPromise({docName: h.docName,diff --git a/packages/app/src/editor/mount-promise.ts b/packages/app/src/editor/mount-promise.tsindex 9f67fcb2a..1dd9311aa 100644--- a/packages/app/src/editor/mount-promise.ts+++ b/packages/app/src/editor/mount-promise.ts@@ -147,12 +147,11 @@ export function mountTiptapEditorPromise(const controller = new AbortController();const createdAt = Date.now();- let resolveFn: (entry: TiptapCacheEntry) => void = () => {};- let rejectFn: (error: Error) => void = () => {};- const promise = new Promise<TiptapCacheEntry>((res, rej) => {- resolveFn = res;- rejectFn = rej;- });+ const {+ promise,+ resolve: resolveFn,+ reject: rejectFn,+ } = Promise.withResolvers<TiptapCacheEntry>();const entry: MountPromiseEntry = {promise,diff --git a/packages/app/src/editor/provider-pool-pending-replay.test.ts b/packages/app/src/editor/provider-pool-pending-replay.test.tsindex 7f681a582..b152efbc7 100644--- a/packages/app/src/editor/provider-pool-pending-replay.test.ts+++ b/packages/app/src/editor/provider-pool-pending-replay.test.ts@@ -140,10 +140,7 @@ describe('ProviderPool pending replay', () => {{ branch: UNKNOWN_BRANCH_SENTINEL, docName, namespace: null },{ delta, fullState },);- let releaseClaim: () => void = () => {};- const claimGate = new Promise<void>((resolve) => {- releaseClaim = resolve;- });+ const { promise: claimGate, resolve: releaseClaim } = Promise.withResolvers<void>();const actual = await vi.importActual<typeof import('./replay-outbox')>('./replay-outbox');vi.mocked(consumeReplayOutboxEntry).mockImplementationOnce(async (key) => {await claimGate;@@ -172,10 +169,7 @@ describe('ProviderPool pending replay', () => {{ branch: UNKNOWN_BRANCH_SENTINEL, docName, namespace: null },{ delta, fullState },);- let releaseClaim: () => void = () => {};- const claimGate = new Promise<void>((resolve) => {- releaseClaim = resolve;- });+ const { promise: claimGate, resolve: releaseClaim } = Promise.withResolvers<void>();vi.mocked(consumeReplayOutboxEntry).mockImplementationOnce(async () => {await claimGate;return false;diff --git a/packages/app/src/editor/provider-pool.test.ts b/packages/app/src/editor/provider-pool.test.tsindex 1182e4ed1..3339d5428 100644--- a/packages/app/src/editor/provider-pool.test.ts+++ b/packages/app/src/editor/provider-pool.test.ts@@ -1766,12 +1766,11 @@ describe('ProviderPool stored-state validation spine', () => {test('a re-dispatch onto an entry with an in-flight spine run is a no-op (attach ownership)', async () => {let resolvePeek: (value: string | null) => void = () => {};- const peek = vi.fn(- () =>- new Promise<string | null>((resolve) => {- resolvePeek = resolve;- }),- );+ const peek = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<string | null>();+ resolvePeek = resolve;+ return promise;+ });const persistenceFactory = vi.fn(makePersistenceStub);pool = new ProviderPool(3, DUMMY_WS, {storage: null,@@ -2072,12 +2071,11 @@ describe("ProviderPool authenticationFailed handling (US-002 / 'server-instance-pool.setActive('doc1');let resolveClear: () => void = () => {};- persistence.clearData = vi.fn(- () =>- new Promise<void>((resolve) => {- resolveClear = resolve;- }),- );+ persistence.clearData = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<void>();+ resolveClear = resolve;+ return promise;+ });syncPromise('doc1', entry.provider).catch(() => {});expect(__syncPromiseCacheSize()).toBe(1);@@ -3428,12 +3426,11 @@ describe('ProviderPool client-persistence attachment (US-003)', () => {test('closeAndClearPersistence dedups concurrent calls via in-flight reuse', async () => {let resolveClear: () => void = () => {};- const { stub, clearSpy } = makeControllableStub(- () =>- new Promise<void>((resolve) => {- resolveClear = resolve;- }),- );+ const { stub, clearSpy } = makeControllableStub(() => {+ const { promise, resolve } = Promise.withResolvers<void>();+ resolveClear = resolve;+ return promise;+ });const persistenceFactory = vi.fn(() => stub);const deleteDbSpy = vi.spyOn(indexedDB, 'deleteDatabase');@@ -3460,12 +3457,11 @@ describe('ProviderPool client-persistence attachment (US-003)', () => {test('deferred persistence attach: pool.open during in-flight clear leaves persistence null synchronously, attaches once clear resolves', async () => {let resolveClear: () => void = () => {};- const cleared = makeControllableStub(- () =>- new Promise<void>((resolve) => {- resolveClear = resolve;- }),- );+ const cleared = makeControllableStub(() => {+ const { promise, resolve } = Promise.withResolvers<void>();+ resolveClear = resolve;+ return promise;+ });const fresh = makeControllableStub(async () => {});let callCount = 0;const persistenceFactory = vi.fn(() => {@@ -3495,12 +3491,11 @@ describe('ProviderPool client-persistence attachment (US-003)', () => {test('deferred persistence attach skipped on pending-clear-failed (structured warn fires, persistence stays null)', async () => {let rejectClear: (err: Error) => void = () => {};- const cleared = makeControllableStub(- () =>- new Promise<void>((_, reject) => {- rejectClear = reject;- }),- );+ const cleared = makeControllableStub(() => {+ const { promise, reject } = Promise.withResolvers<void>();+ rejectClear = reject;+ return promise;+ });const persistenceFactory = vi.fn(() => cleared.stub);pool = new ProviderPool(3, DUMMY_WS, { persistenceFactory, clearDataTimeoutMs: 30_000 });@@ -3535,12 +3530,11 @@ describe('ProviderPool client-persistence attachment (US-003)', () => {test('dispose() clears pendingClears tracking so the deferred-attach .then never reattaches', async () => {let resolveClear: () => void = () => {};- const cleared = makeControllableStub(- () =>- new Promise<void>((resolve) => {- resolveClear = resolve;- }),- );+ const cleared = makeControllableStub(() => {+ const { promise, resolve } = Promise.withResolvers<void>();+ resolveClear = resolve;+ return promise;+ });const fresh = makeControllableStub(async () => {});let callCount = 0;const persistenceFactory = vi.fn(() => {diff --git a/packages/app/src/editor/provider-pool.ts b/packages/app/src/editor/provider-pool.tsindex e86964c41..58fd35945 100644--- a/packages/app/src/editor/provider-pool.ts+++ b/packages/app/src/editor/provider-pool.ts@@ -231,10 +231,7 @@ export class ProviderPool {private tabIdentity: { principalId: string; tabSessionId: string } | null = null;private serverRestartRecoveryState: ServerRestartRecoveryState = IDLE_SERVER_RESTART_RECOVERY;private cachedServerInstanceId: string | null = null;- private pendingServerInstanceKnown: {- promise: Promise<string>;- resolve: (id: string) => void;- } | null = null;+ private pendingServerInstanceKnown: PromiseWithResolvers<string> | null = null;private recoveryMismatchStaleClaim: string | undefined;private readonly handledStaleClaims = new Set<string>();private readonly bufferedUpdates = new Map<string, BufferedReplayUpdate>();@@ -320,12 +317,8 @@ export class ProviderPool {if (this.pendingServerInstanceKnown !== null) {return this.pendingServerInstanceKnown.promise;}- let resolve!: (id: string) => void;- const promise = new Promise<string>((res) => {- resolve = res;- });- this.pendingServerInstanceKnown = { promise, resolve };- return promise;+ this.pendingServerInstanceKnown = Promise.withResolvers<string>();+ return this.pendingServerInstanceKnown.promise;}private buildPersistence(@@ -1772,12 +1765,11 @@ export class ProviderPool {if (inFlight !== undefined) {return inFlight;}- let resolveWork: () => void = () => {};- let rejectWork: (err: unknown) => void = () => {};- const work = new Promise<void>((resolve, reject) => {- resolveWork = resolve;- rejectWork = reject;- });+ const {+ promise: work,+ resolve: resolveWork,+ reject: rejectWork,+ } = Promise.withResolvers<void>();this.pendingClears.set(docName, work);const finalize = () => {if (this.pendingClears.get(docName) === work) {diff --git a/packages/app/src/editor/sync-promise.ts b/packages/app/src/editor/sync-promise.tsindex 84eca3802..ef2e8ae43 100644--- a/packages/app/src/editor/sync-promise.ts+++ b/packages/app/src/editor/sync-promise.ts@@ -184,12 +184,7 @@ export function syncPromise(docName: string, provider: HocuspocusProvider): Prom}const createdAt = Date.now();- let resolveFn: () => void = () => {};- let rejectFn: (error: Error) => void = () => {};- const promise = new Promise<void>((res, rej) => {- resolveFn = res;- rejectFn = rej;- });+ const { promise, resolve: resolveFn, reject: rejectFn } = Promise.withResolvers<void>();const onSynced = () => {const entry = cache.get(docName);diff --git a/packages/app/src/hooks/use-explore-preview-install.dom.test.tsx b/packages/app/src/hooks/use-explore-preview-install.dom.test.tsxindex 6eee233cc..54c10e651 100644--- a/packages/app/src/hooks/use-explore-preview-install.dom.test.tsx+++ b/packages/app/src/hooks/use-explore-preview-install.dom.test.tsx@@ -20,29 +20,21 @@ describe('useExplorePreviewInstall', () => {});test('serializes rapid target changes and finishes with the latest intended set', async () => {- let resolveFirstInstall:- | ((value: {- ok: true;- hosts: string[];- scripts: false;- warnings: [];- warningCodes: [];- }) => void)- | undefined;+ const { promise: firstInstall, resolve: resolveFirstInstall } = Promise.withResolvers<{+ ok: true;+ hosts: string[];+ scripts: false;+ warnings: [];+ warningCodes: [];+ }>();importSkill.mockResolvedValue({ ok: true, name: 'example' });- installSkill- .mockReturnValueOnce(- new Promise((resolve) => {- resolveFirstInstall = resolve;- }),- )- .mockResolvedValueOnce({- ok: true,- hosts: ['claude', 'codex'],- scripts: false,- warnings: [],- warningCodes: [],- });+ installSkill.mockReturnValueOnce(firstInstall).mockResolvedValueOnce({+ ok: true,+ hosts: ['claude', 'codex'],+ scripts: false,+ warnings: [],+ warningCodes: [],+ });const { result } = renderHook(() =>useExplorePreviewInstall({@@ -62,7 +54,7 @@ describe('useExplorePreviewInstall', () => {expect(installSkill.mock.calls[0]?.[0].targets).toEqual(['claude']);await act(async () => {- resolveFirstInstall?.({+ resolveFirstInstall({ok: true,hosts: ['claude'],scripts: false,@@ -77,12 +69,11 @@ describe('useExplorePreviewInstall', () => {});test('imports once when multiple targets change before acquisition finishes', async () => {- let resolveImport: ((value: { ok: true; name: string }) => void) | undefined;- importSkill.mockReturnValue(- new Promise((resolve) => {- resolveImport = resolve;- }),- );+ const { promise: pendingImport, resolve: resolveImport } = Promise.withResolvers<{+ ok: true;+ name: string;+ }>();+ importSkill.mockReturnValue(pendingImport);installSkill.mockResolvedValue({ok: true,hosts: ['claude', 'cursor'],@@ -106,7 +97,7 @@ describe('useExplorePreviewInstall', () => {expect(importSkill).toHaveBeenCalledTimes(1);await act(async () => {- resolveImport?.({ ok: true, name: 'example' });+ resolveImport({ ok: true, name: 'example' });});await waitFor(() =>diff --git a/packages/app/src/hooks/use-onboarding-card-visible.dom.test.tsx b/packages/app/src/hooks/use-onboarding-card-visible.dom.test.tsxindex 0c3cd0ae8..80df58a2a 100644--- a/packages/app/src/hooks/use-onboarding-card-visible.dom.test.tsx+++ b/packages/app/src/hooks/use-onboarding-card-visible.dom.test.tsx@@ -132,12 +132,11 @@ describe('useOnboardingCardVisible', () => {test('cancels a pending activation when the probe unmounts mid-flight', async () => {let resolveRecents!: (r: Array<{ path: string }>) => void;- const listRecent = vi.fn(- () =>- new Promise<Array<{ path: string }>>((res) => {- resolveRecents = res;- }),- );+ const listRecent = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<Array<{ path: string }>>();+ resolveRecents = resolve;+ return promise;+ });(window as unknown as { okDesktop: unknown }).okDesktop = {project: { listRecent },config: { projectPath: CURRENT_PATH },diff --git a/packages/app/src/hooks/use-skills.dom.test.tsx b/packages/app/src/hooks/use-skills.dom.test.tsxindex ed9757b52..932207905 100644--- a/packages/app/src/hooks/use-skills.dom.test.tsx+++ b/packages/app/src/hooks/use-skills.dom.test.tsx@@ -45,10 +45,7 @@ describe('useSkills', () => {test(`a mutation mid-flight is not served pre-write data (${trigger})`, async () => {const { useSkills, emitSkillsChanged, emitDocumentsChanged } = await freshModules();- let release: ((body: unknown) => void) | undefined;- const first = new Promise<unknown>((resolve) => {- release = resolve;- });+ const { promise: first, resolve: release } = Promise.withResolvers<unknown>();let live = 0;let maxLive = 0;@@ -93,7 +90,7 @@ describe('useSkills', () => {expect(fetchMock).toHaveBeenCalledTimes(1);- release?.(skillsBody(['kept', 'removed']));+ release(skillsBody(['kept', 'removed']));await waitFor(() => expect(screen.getByTestId('names').textContent).toBe('kept'));expect(fetchMock).toHaveBeenCalledTimes(2);diff --git a/packages/app/src/lib/acp/launch-agent-thread.test.ts b/packages/app/src/lib/acp/launch-agent-thread.test.tsindex f3ba9a4c2..820e58a8f 100644--- a/packages/app/src/lib/acp/launch-agent-thread.test.ts+++ b/packages/app/src/lib/acp/launch-agent-thread.test.ts@@ -36,20 +36,6 @@ function nextAgent(): { source: 'registry'; id: string } {return { source: 'registry', id: `agent-${agentSeq}` };}-function deferred<T>(): {- promise: Promise<T>;- resolve: (v: T) => void;- reject: (e: unknown) => void;-} {- let resolve!: (v: T) => void;- let reject!: (e: unknown) => void;- const promise = new Promise<T>((res, rej) => {- resolve = res;- reject = rej;- });- return { promise, resolve, reject };-}-function startedThread(threadId: string, agentName = 'Claude Agent') {return { threadId, agent: { source: 'registry', id: 'claude-acp', name: agentName } };}@@ -71,7 +57,7 @@ beforeEach(() => {describe('launchAgentThread dedup guard', () => {test('a second launch for the same agent while one is in flight is dropped, not duplicated', async () => {const agent = nextAgent();- const first = deferred<{ threadId: string }>();+ const first = Promise.withResolvers<{ threadId: string }>();createThread.mockReturnValueOnce(first.promise);const inFlight = launchAgentThread(agent, 'first prompt', null, null);@@ -85,7 +71,7 @@ describe('launchAgentThread dedup guard', () => {});test('a different agent is never blocked by the first one', async () => {- const held = deferred<{ threadId: string }>();+ const held = Promise.withResolvers<{ threadId: string }>();createThread.mockReturnValue(held.promise);const first = launchAgentThread(nextAgent(), 'prompt', null, null);const other = launchAgentThread(nextAgent(), 'prompt', null, null);diff --git a/packages/app/src/lib/bug-report-capture.dom.test.ts b/packages/app/src/lib/bug-report-capture.dom.test.tsindex 584dc935d..3d941c5f5 100644--- a/packages/app/src/lib/bug-report-capture.dom.test.ts+++ b/packages/app/src/lib/bug-report-capture.dom.test.ts@@ -57,14 +57,6 @@ async function releaseHeldFrames(queued: FrameRequestCallback[]): Promise<void>);}-function deferred<T>() {- let resolve!: (value: T) => void;- const promise = new Promise<T>((r) => {- resolve = r;- });- return { promise, resolve };-}-describe('captureBugReport', () => {let stopPointerTracking: (() => void) | undefined;@@ -125,8 +117,8 @@ describe('captureBugReport', () => {});test('overlapping launcher-borne captures keep launchers hidden until the last one settles', async () => {- const first = deferred<OkBugReportScreenshot>();- const second = deferred<OkBugReportScreenshot>();+ const first = Promise.withResolvers<OkBugReportScreenshot>();+ const second = Promise.withResolvers<OkBugReportScreenshot>();const queue = [first.promise, second.promise];const log = installCapture(() => queue.shift() ?? Promise.resolve(null));const capturing = () => document.documentElement.hasAttribute('data-bug-report-capturing');@@ -238,7 +230,7 @@ describe('captureBugReport', () => {stopPointerTracking = installPointerPositionTracker();movePointerTo(140, 200);const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});- const pending = deferred<OkBugReportScreenshot>();+ const pending = Promise.withResolvers<OkBugReportScreenshot>();const log = installCapture(() => pending.promise);const result = await captureBugReport(LAUNCHER_FREE);@@ -308,7 +300,7 @@ describe('createBugReportController', () => {}test('start captures, runs the dismissal, then opens with the result', async () => {- const pending = deferred<OkBugReportScreenshot>();+ const pending = Promise.withResolvers<OkBugReportScreenshot>();installCapture(() => pending.promise);const { controller, captures } = controllerWithLog();const order: string[] = [];@@ -338,8 +330,8 @@ describe('createBugReportController', () => {});test('close drops a result that lands afterwards and leaves the next start free to run', async () => {- const first = deferred<OkBugReportScreenshot>();- const second = deferred<OkBugReportScreenshot>();+ const first = Promise.withResolvers<OkBugReportScreenshot>();+ const second = Promise.withResolvers<OkBugReportScreenshot>();const queue = [first.promise, second.promise];installCapture(() => queue.shift() ?? Promise.resolve(null));const { controller, captures } = controllerWithLog();diff --git a/packages/app/src/lib/documents-fetch.test.ts b/packages/app/src/lib/documents-fetch.test.tsindex 414351703..94dd64401 100644--- a/packages/app/src/lib/documents-fetch.test.ts+++ b/packages/app/src/lib/documents-fetch.test.ts@@ -18,10 +18,7 @@ function jsonResponse(body: unknown, status = 200): Response {describe('fetchDocumentListShared', () => {test('coalesces concurrent callers onto a single in-flight request', async () => {let calls = 0;- let release: () => void = () => {};- const gate = new Promise<void>((resolve) => {- release = resolve;- });+ const { promise: gate, resolve: release } = Promise.withResolvers<void>();globalThis.fetch = (async () => {calls += 1;await gate;diff --git a/packages/app/src/lib/handoff/cowork-skill-install.test.ts b/packages/app/src/lib/handoff/cowork-skill-install.test.tsindex 6a7216d54..76e71905c 100644--- a/packages/app/src/lib/handoff/cowork-skill-install.test.ts+++ b/packages/app/src/lib/handoff/cowork-skill-install.test.ts@@ -237,9 +237,9 @@ describe('ensureCoworkSkillInstalled — concurrency', () => {const installer: SkillInstaller = {install: () => {installInvocationCount += 1;- return new Promise<SkillInstallResult>((resolve: Resolver) => {- resolver = resolve;- });+ const { promise, resolve } = Promise.withResolvers<SkillInstallResult>();+ resolver = resolve;+ return promise;},};diff --git a/packages/app/src/lib/handoff/install-detect.test.ts b/packages/app/src/lib/handoff/install-detect.test.tsindex ffa65f2f4..7ea951d0a 100644--- a/packages/app/src/lib/handoff/install-detect.test.ts+++ b/packages/app/src/lib/handoff/install-detect.test.ts@@ -297,9 +297,9 @@ describe('createProbeCoordinator — throttle, dedup, subscribe, cancel', () =>const handle = createProbeCoordinator({probe: () => {callCount += 1;- return new Promise<SchemeStates>((resolve) => {- resolveProbe = resolve;- });+ const { promise, resolve } = Promise.withResolvers<SchemeStates>();+ resolveProbe = resolve;+ return promise;},isElectronHost: () => true,now: () => 0,@@ -369,10 +369,11 @@ describe('createProbeCoordinator — throttle, dedup, subscribe, cancel', () =>const received: Array<Record<string, unknown>> = [];let resolveProbe: ((v: SchemeStates) => void) | null = null;const handle = createProbeCoordinator({- probe: () =>- new Promise<SchemeStates>((r) => {- resolveProbe = r;- }),+ probe: () => {+ const { promise, resolve } = Promise.withResolvers<SchemeStates>();+ resolveProbe = resolve;+ return promise;+ },isElectronHost: () => true,now: () => 0,});diff --git a/packages/app/src/lib/install-stale-tab-reload-prompt.test.ts b/packages/app/src/lib/install-stale-tab-reload-prompt.test.tsindex 4f71110db..0a4c2731f 100644--- a/packages/app/src/lib/install-stale-tab-reload-prompt.test.ts+++ b/packages/app/src/lib/install-stale-tab-reload-prompt.test.ts@@ -229,10 +229,7 @@ describe('stale tab reload prompt', () => {});test('Reload waits for unsaved edits to reach the server before reloading', async () => {- let finishSaving: (result: SavedWorkResult) => void = () => {};- const saving = new Promise<SavedWorkResult>((resolve) => {- finishSaving = resolve;- });+ const { promise: saving, resolve: finishSaving } = Promise.withResolvers<SavedWorkResult>();const reload = vi.fn();install({ bridge: undefined, waitForSavedWork: () => saving, reload });observeServerVersion(loadedFrom);@@ -383,10 +380,7 @@ describe('stale tab reload prompt', () => {});test('a withheld reload does not bring the prompt back once the server is back in sync', async () => {- let finishSaving: (result: SavedWorkResult) => void = () => {};- const saving = new Promise<SavedWorkResult>((resolve) => {- finishSaving = resolve;- });+ const { promise: saving, resolve: finishSaving } = Promise.withResolvers<SavedWorkResult>();const watch = refusalWatch();install({bridge: undefined,@@ -532,10 +526,7 @@ describe('waitForSavedWork', () => {});test('waits for a server-restart recovery to finish first', async () => {- let settle: () => void = () => {};- const settled = new Promise<void>((resolve) => {- settle = resolve;- });+ const { promise: settled, resolve: settle } = Promise.withResolvers<void>();const work = workSource({ unsynced: false, settled });let done = false;@@ -605,10 +596,7 @@ describe('watchForSavedWork', () => {});test('stopping it before recovery settles means it never reports', async () => {- let settle: () => void = () => {};- const settled = new Promise<void>((resolve) => {- settle = resolve;- });+ const { promise: settled, resolve: settle } = Promise.withResolvers<void>();const work = workSource({ unsynced: false, settled });const onSaved = vi.fn();diff --git a/packages/app/src/lib/ipc-user-config-binding.test.ts b/packages/app/src/lib/ipc-user-config-binding.test.tsindex 000935cd0..f44776c38 100644--- a/packages/app/src/lib/ipc-user-config-binding.test.ts+++ b/packages/app/src/lib/ipc-user-config-binding.test.ts@@ -7,31 +7,15 @@ import type {import { describe, expect, test, vi } from 'vitest';import { createIpcUserConfigBinding } from './ipc-user-config-binding';-interface Deferred<T> {- promise: Promise<T>;- resolve: (value: T) => void;- reject: (error: unknown) => void;-}--function deferred<T>(): Deferred<T> {- let resolve!: (value: T) => void;- let reject!: (error: unknown) => void;- const promise = new Promise<T>((res, rej) => {- resolve = res;- reject = rej;- });- return { promise, resolve, reject };-}-function fakeTransport(initialText: string) {- const read = deferred<OkUserConfigSnapshot>();+ const read = Promise.withResolvers<OkUserConfigSnapshot>();const changeListeners = new Set<(snapshot: OkUserConfigSnapshot) => void>();- const patchResponses: Array<Deferred<OkUserConfigPatchResult>> = [];+ const patchResponses: Array<PromiseWithResolvers<OkUserConfigPatchResult>> = [];const patches: ConfigPatch[] = [];let readCount = 0;let diskText = initialText;let readError: Error | null = null;- let heldRead: Deferred<OkUserConfigSnapshot> | null = null;+ let heldRead: PromiseWithResolvers<OkUserConfigSnapshot> | null = null;const transport: OkUserConfigBridge = {read: () => {readCount += 1;@@ -45,7 +29,7 @@ function fakeTransport(initialText: string) {},patch: (patch) => {patches.push(patch);- const response = deferred<OkUserConfigPatchResult>();+ const response = Promise.withResolvers<OkUserConfigPatchResult>();patchResponses.push(response);return response.promise;},@@ -71,7 +55,7 @@ function fakeTransport(initialText: string) {},readCount: () => readCount,holdNextRead: () => {- const held = deferred<OkUserConfigSnapshot>();+ const held = Promise.withResolvers<OkUserConfigSnapshot>();heldRead = held;return held;},diff --git a/packages/app/src/lib/project-fix-sweep-store.test.ts b/packages/app/src/lib/project-fix-sweep-store.test.tsindex dcff81560..60fa005f6 100644--- a/packages/app/src/lib/project-fix-sweep-store.test.ts+++ b/packages/app/src/lib/project-fix-sweep-store.test.ts@@ -113,21 +113,15 @@ describe('startProjectFixSweep — progress', () => {describe('startProjectFixSweep — one sweep at a time', () => {test('refuses a second start while one is running, however many panels ask', async () => {const attempts: string[] = [];- let releaseFirst: (() => void) | undefined;- const firstFixLanded = new Promise<void>((resolve) => {- releaseFirst = resolve;- });- let held: (() => void) | undefined;- const parked = new Promise<void>((resolve) => {- held = resolve;- });+ const { promise: firstFixLanded, resolve: releaseFirst } = Promise.withResolvers<void>();+ const { promise: parked, resolve: held } = Promise.withResolvers<void>();const first = startProjectFixSweep({items: files(2),sleep: async () => {},fixItem: async (item) => {attempts.push(item.file);if (item.file === 'doc-0.md') {- releaseFirst?.();+ releaseFirst();await parked;}return { ok: true };@@ -140,7 +134,7 @@ describe('startProjectFixSweep — one sweep at a time', () => {expect(second).not.toHaveBeenCalled();expect(getProjectFixSweepProgress()?.total).toBe(2);- held?.();+ held();await first;expect(attempts).toHaveLength(2);});diff --git a/packages/app/src/lib/promise-with-resolvers-polyfill.ts b/packages/app/src/lib/promise-with-resolvers-polyfill.tsnew file mode 100644index 000000000..cc8978370--- /dev/null+++ b/packages/app/src/lib/promise-with-resolvers-polyfill.ts@@ -0,0 +1,12 @@+if (typeof Promise.withResolvers !== 'function') {+ Promise.withResolvers = <T>(): PromiseWithResolvers<T> => {+ let resolve!: PromiseWithResolvers<T>['resolve'];+ let reject!: PromiseWithResolvers<T>['reject'];+ // oxlint-disable-next-line unicorn-js/prefer-promise-with-resolvers -- the fallback for browsers that lack Promise.withResolvers+ const promise = new Promise<T>((res, rej) => {+ resolve = res;+ reject = rej;+ });+ return { promise, resolve, reject };+ };+}diff --git a/packages/app/src/lib/saved-themes-client.dom.test.tsx b/packages/app/src/lib/saved-themes-client.dom.test.tsxindex cae57b088..12a2dfa35 100644--- a/packages/app/src/lib/saved-themes-client.dom.test.tsx+++ b/packages/app/src/lib/saved-themes-client.dom.test.tsx@@ -775,9 +775,9 @@ describe('SavedThemesProvider', () => {const method = init?.method ?? 'GET';methods.push(method);if (method === 'PUT') {- return new Promise<Response>((resolve) => {- resolveUpdate = resolve;- });+ const { promise, resolve } = Promise.withResolvers<Response>();+ resolveUpdate = resolve;+ return promise;}if (method === 'DELETE') {return Response.json(diff --git a/packages/app/src/lib/self-scheduling-poll.test.ts b/packages/app/src/lib/self-scheduling-poll.test.tsindex 569854150..a7f3c4474 100644--- a/packages/app/src/lib/self-scheduling-poll.test.ts+++ b/packages/app/src/lib/self-scheduling-poll.test.ts@@ -29,10 +29,10 @@ function makePollController() {return {poll: (_signal: AbortSignal) => {calls += 1;- return new Promise<PollOutcome>((res, rej) => {- resolveLatest = res;- rejectLatest = rej;- });+ const { promise, resolve, reject } = Promise.withResolvers<PollOutcome>();+ resolveLatest = resolve;+ rejectLatest = reject;+ return promise;},get calls() {return calls;diff --git a/packages/app/src/lib/transports/auth-query-transport.test.ts b/packages/app/src/lib/transports/auth-query-transport.test.tsindex 7ea769a7c..4f9754017 100644--- a/packages/app/src/lib/transports/auth-query-transport.test.ts+++ b/packages/app/src/lib/transports/auth-query-transport.test.ts@@ -75,10 +75,7 @@ describe('httpAuthQueryTransport().status', () => {});it('coalesces concurrent same-host checks across transport instances', async () => {- let resolveFetch: ((response: Response) => void) | undefined;- const pendingResponse = new Promise<Response>((resolve) => {- resolveFetch = resolve;- });+ const { promise: pendingResponse, resolve: resolveFetch } = Promise.withResolvers<Response>();stubFetch(() => pendingResponse);const a = httpAuthQueryTransport().status();@@ -87,7 +84,7 @@ describe('httpAuthQueryTransport().status', () => {expect(fetchCalls).toHaveLength(1);expect(fetchCalls[0]?.url).toBe('/api/local-op/auth/status');- resolveFetch?.(+ resolveFetch(new Response(JSON.stringify({ authenticated: true, host: 'github.com', login: 'octocat' }), {status: 200,}),@@ -104,16 +101,9 @@ describe('httpAuthQueryTransport().status', () => {});it('keeps concurrent different-host checks isolated', async () => {- let resolveGithub: ((response: Response) => void) | undefined;- let resolveGitlab: ((response: Response) => void) | undefined;- const pendingResponses = [- new Promise<Response>((resolve) => {- resolveGithub = resolve;- }),- new Promise<Response>((resolve) => {- resolveGitlab = resolve;- }),- ];+ const { promise: githubResponse, resolve: resolveGithub } = Promise.withResolvers<Response>();+ const { promise: gitlabResponse, resolve: resolveGitlab } = Promise.withResolvers<Response>();+ const pendingResponses = [githubResponse, gitlabResponse];stubFetch(() => {const response = pendingResponses.shift();if (!response) throw new Error('unexpected extra fetch');@@ -129,10 +119,10 @@ describe('httpAuthQueryTransport().status', () => {'gitlab.com',]);- resolveGithub?.(+ resolveGithub(new Response(JSON.stringify({ authenticated: true, host: 'github.com', login: 'octocat' })),);- resolveGitlab?.(new Response(JSON.stringify({ authenticated: false, host: 'gitlab.com' })));+ resolveGitlab(new Response(JSON.stringify({ authenticated: false, host: 'gitlab.com' })));await expect(githubStatus).resolves.toEqual({authenticated: true,diff --git a/packages/app/src/lib/worktree-store.test.ts b/packages/app/src/lib/worktree-store.test.tsindex fefc0d6db..239d36772 100644--- a/packages/app/src/lib/worktree-store.test.ts+++ b/packages/app/src/lib/worktree-store.test.ts@@ -69,9 +69,9 @@ describe('createWorktreeStore', () => {const fetchModel = vi.fn(() => {call += 1;if (call === 1) {- return new Promise<WorktreeSelectorModel>((r) => {- resolveFirst = r;- });+ const { promise, resolve } = Promise.withResolvers<WorktreeSelectorModel>();+ resolveFirst = resolve;+ return promise;}return Promise.resolve(model('/repo-after-create'));});@@ -173,9 +173,9 @@ describe('createWorktreeStore', () => {const fetchModel = vi.fn(() => {call += 1;if (call === 1) {- return new Promise<WorktreeSelectorModel>((r) => {- resolveFirst = r;- });+ const { promise, resolve } = Promise.withResolvers<WorktreeSelectorModel>();+ resolveFirst = resolve;+ return promise;}return Promise.resolve(model('/repo-revalidated'));});diff --git a/packages/app/src/main.tsx b/packages/app/src/main.tsxindex 8e14a1e2a..a06662125 100644--- a/packages/app/src/main.tsx+++ b/packages/app/src/main.tsx@@ -4,6 +4,7 @@ initFrontendTelemetry();void import('./telemetry-startup').then((m) => m.initStartupTrace());import '@/lib/perf/scheduler-polyfill-shim';+import '@/lib/promise-with-resolvers-polyfill';import { I18nProvider } from '@lingui/react';import { QueryClient, QueryClientProvider } from '@tanstack/react-query';diff --git a/packages/app/src/server/hocuspocus-plugin.test.ts b/packages/app/src/server/hocuspocus-plugin.test.tsindex af152874f..e4e72089b 100644--- a/packages/app/src/server/hocuspocus-plugin.test.ts+++ b/packages/app/src/server/hocuspocus-plugin.test.ts@@ -67,10 +67,7 @@ describe('hocuspocusPlugin.configureServer middleware ordering', () => {const createAssetServeMiddlewareSpy = vi.fn(() => innerAssetFn);const handleUpgrade = vi.fn(() => false);const teardownOrder: string[] = [];- let resolveHostShutdown: (() => void) | undefined;- const hostShutdown = new Promise<void>((resolve) => {- resolveHostShutdown = resolve;- });+ const { promise: hostShutdown, resolve: resolveHostShutdown } = Promise.withResolvers<void>();const fakeHost = {handleUpgrade,shutdown: vi.fn(async () => {@@ -217,7 +214,7 @@ describe('hocuspocusPlugin.configureServer middleware ordering', () => {httpServer.emit('close');expect(fakeHost.shutdown).toHaveBeenCalledOnce();expect(teardownOrder).toEqual(['acp', 'host']);- resolveHostShutdown?.();+ resolveHostShutdown();await buildEnd;expect(buildEndSettled).toBe(true);expect(fakeHost.shutdown).toHaveBeenCalledOnce();diff --git a/packages/app/tests/foundation/owned-server-lifetime-loss.node.test.ts b/packages/app/tests/foundation/owned-server-lifetime-loss.node.test.tsindex 6cd9d7cd9..2af953057 100644--- a/packages/app/tests/foundation/owned-server-lifetime-loss.node.test.ts+++ b/packages/app/tests/foundation/owned-server-lifetime-loss.node.test.ts@@ -64,13 +64,7 @@ describe('an owned server whose lifetime is lost while it launches', () => {test('a lifetime lost before the server answers fails the launch with that loss and releases the server, even when the server answers afterwards', async () => {const tmp = scratchTmpdir();harness.proc = Object.assign(new EventEmitter(), { exitCode: null, signalCode: null });- let resolveReadiness!: (value: unknown) => void;- harness.readiness = {- promise: new Promise((resolve) => {- resolveReadiness = resolve;- }),- resolve: (value) => resolveReadiness(value),- };+ harness.readiness = Promise.withResolvers();const outcome = launchOwnedWorkerServer({label: LABEL,diff --git a/packages/app/tests/foundation/server-lease-acquire-failure.node.test.ts b/packages/app/tests/foundation/server-lease-acquire-failure.node.test.tsindex b6ad03ebe..5847ed0e1 100644--- a/packages/app/tests/foundation/server-lease-acquire-failure.node.test.ts+++ b/packages/app/tests/foundation/server-lease-acquire-failure.node.test.ts@@ -63,14 +63,8 @@ async function supervisorWithGatedLaunch(): Promise<GatedSupervisor> {const scratch = realpathSync(mkdtempSync(join(tmpdir(), 'ok-lease-acquire-failure-')));scratchDirs.push(scratch);const launcher = contractServerLauncher();- let markStarted: () => void = () => {};- const launchStarted = new Promise<void>((resolve) => {- markStarted = resolve;- });- let openGate: (launch: boolean) => void = () => {};- const gate = new Promise<boolean>((resolve) => {- openGate = resolve;- });+ const { promise: launchStarted, resolve: markStarted } = Promise.withResolvers<void>();+ const { promise: gate, resolve: openGate } = Promise.withResolvers<boolean>();openGates.push(openGate);const launch: LaunchOwnedServer = async (slot, env) => {markStarted();@@ -152,14 +146,10 @@ describe('a worker whose lease request fails', () => {test('a supervisor that does not answer before the setup deadline leaves the worker on its own server, and the server it launches afterwards is discarded rather than held for that worker', async () => {vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout', 'Date'] });const rig = await supervisorWithGatedLaunch();- let finishUse: () => void = () => {};- const useMayFinish = new Promise<void>((resolve) => {- finishUse = resolve;- });- let markOffered: (lease: ServerLease | undefined) => void = () => {};- const offered = new Promise<ServerLease | undefined>((resolve) => {- markOffered = resolve;- });+ const { promise: useMayFinish, resolve: finishUse } = Promise.withResolvers<void>();+ const { promise: offered, resolve: markOffered } = Promise.withResolvers<+ ServerLease | undefined+ >();const fixtureFailure = failureOf(leaseThroughWorkerFixture(rig.endpoint.socketPath, async (lease) => {diff --git a/packages/app/tests/foundation/server-lease.node.test.ts b/packages/app/tests/foundation/server-lease.node.test.tsindex e009b06ca..236833a92 100644--- a/packages/app/tests/foundation/server-lease.node.test.ts+++ b/packages/app/tests/foundation/server-lease.node.test.ts@@ -492,14 +492,8 @@ interface HeldLaunch {}function holdLaunch(heldSlot: number): HeldLaunch {- let markStarted: () => void = () => {};- const started = new Promise<void>((resolve) => {- markStarted = resolve;- });- let proceed: () => void = () => {};- const gate = new Promise<void>((resolve) => {- proceed = resolve;- });+ const { promise: started, resolve: markStarted } = Promise.withResolvers<void>();+ const { promise: gate, resolve: proceed } = Promise.withResolvers<void>();return {started,proceed: () => proceed(),diff --git a/packages/app/tests/foundation/server-supervisor-shutdown.node.test.ts b/packages/app/tests/foundation/server-supervisor-shutdown.node.test.tsindex dae218c93..41c8b79c5 100644--- a/packages/app/tests/foundation/server-supervisor-shutdown.node.test.ts+++ b/packages/app/tests/foundation/server-supervisor-shutdown.node.test.ts@@ -87,14 +87,8 @@ interface Gate {}function gate(): Gate {- let markReached: () => void = () => {};- const reached = new Promise<void>((resolve) => {- markReached = resolve;- });- let open: () => void = () => {};- const opened = new Promise<void>((resolve) => {- open = resolve;- });+ const { promise: reached, resolve: markReached } = Promise.withResolvers<void>();+ const { promise: opened, resolve: open } = Promise.withResolvers<void>();openGates.push(open);return { reached, opened, open, markReached };}diff --git a/packages/app/tests/integration/audit-scope-http.test.ts b/packages/app/tests/integration/audit-scope-http.test.tsindex 069da49ba..5e6c13a04 100644--- a/packages/app/tests/integration/audit-scope-http.test.ts+++ b/packages/app/tests/integration/audit-scope-http.test.ts@@ -130,9 +130,7 @@ function resultText(result: Awaited<ReturnType<typeof client.callTool>>): stringdescribe('scope parity through HTTP and registered MCP tools', () => {test('concurrent physical and extensionless paths share one real audit flight', async () => {let release: () => void = () => {};- auditGate = new Promise<void>((resolve) => {- release = resolve;- });+ ({ promise: auditGate, resolve: release } = Promise.withResolvers<void>());observedFlights.length = 0;executedFlights = 0;const requests = [diff --git a/packages/app/tests/integration/branch-switch-agent-write.test.ts b/packages/app/tests/integration/branch-switch-agent-write.test.tsindex 3d261fa3e..c95a5456d 100644--- a/packages/app/tests/integration/branch-switch-agent-write.test.ts+++ b/packages/app/tests/integration/branch-switch-agent-write.test.ts@@ -97,10 +97,7 @@ describe('agent writes during a git branch switch', () => {test.runIf(process.platform !== 'win32')('a patch sent while the switch settles is held, then written to the new branch',async () => {- let releaseSettle: () => void = () => {};- const settleHeld = new Promise<void>((resolve) => {- releaseSettle = resolve;- });+ const { promise: settleHeld, resolve: releaseSettle } = Promise.withResolvers<void>();const settleBranchFromDisk = DerivedDocumentIndex.prototype.settleBranchFromDisk;const settleSpy = vi.spyOn(DerivedDocumentIndex.prototype, 'settleBranchFromDisk')diff --git a/packages/app/tests/stress/_helpers/load-progress.ts b/packages/app/tests/stress/_helpers/load-progress.tsindex 6294528df..7ff537f5d 100644--- a/packages/app/tests/stress/_helpers/load-progress.ts+++ b/packages/app/tests/stress/_helpers/load-progress.ts@@ -36,10 +36,7 @@ export async function gotoWhileLoadProgresses(let failed = 0;let timer: ReturnType<typeof setTimeout> | undefined;let deadlineTimer: ReturnType<typeof setTimeout> | undefined;- let refuse: (reason: Error) => void = () => {};- const stalled = new Promise<never>((_, reject) => {- refuse = reject;- });+ const { promise: stalled, reject: refuse } = Promise.withResolvers<never>();const progressSoFar = (): string => {const named = [...outstanding].slice(0, OUTSTANDING_URLS_NAMED_ON_STALL)diff --git a/packages/app/tests/stress/_helpers/port-ownership/cleanup-order-control.test-helper.ts b/packages/app/tests/stress/_helpers/port-ownership/cleanup-order-control.test-helper.tsindex 93da5d0ac..5168902b7 100644--- a/packages/app/tests/stress/_helpers/port-ownership/cleanup-order-control.test-helper.ts+++ b/packages/app/tests/stress/_helpers/port-ownership/cleanup-order-control.test-helper.ts@@ -31,10 +31,7 @@ export async function runCleanupOrderControl(const ordering = await createCleanupOrder(outputDir, 'control');const participants: Participant[] = [];const dismissed = new Set<ChildProcess>();- let reject: (error: Error) => void = () => {};- const interrupted = new Promise<never>((_, fail) => {- reject = fail;- });+ const { promise: interrupted, reject } = Promise.withResolvers<never>();const interrupt = (child: ChildProcess, error: Error) => {if (!dismissed.has(child)) reject(error);};diff --git a/packages/app/tests/stress/_helpers/port-ownership/cleanup-order.test-helper.ts b/packages/app/tests/stress/_helpers/port-ownership/cleanup-order.test-helper.tsindex 113a9bce5..812a30c8b 100644--- a/packages/app/tests/stress/_helpers/port-ownership/cleanup-order.test-helper.ts+++ b/packages/app/tests/stress/_helpers/port-ownership/cleanup-order.test-helper.ts@@ -56,10 +56,7 @@ export async function createCleanupOrder(const removers = new Set<number>();let runner: number | undefined;let server: number | undefined;- let readyResolve: ((error?: Error) => void) | undefined;- const ready = new Promise<Error | undefined>((resolve) => {- readyResolve = resolve;- });+ const { promise: ready, resolve: readyResolve } = Promise.withResolvers<Error | undefined>();const key = (phase: string, pid: number | undefined) => `${phase}:${pid}`;const has = (phase: string, pid: number | undefined) => seen.has(key(phase, pid));const advanced = (pid: number | undefined) =>@@ -73,7 +70,7 @@ export async function createCleanupOrder(events.push({ phase: `ack:${phase}`, pid: Number(pid) });}function advance() {- if (runner !== undefined && server !== undefined) readyResolve?.();+ if (runner !== undefined && server !== undefined) readyResolve(undefined);if (removers.size > 0 || advanced(runner)) release('before-record', server);if ([...removers].some((pid) => has('before-error', pid)) || advanced(runner)) {release('after-record', server);@@ -103,7 +100,7 @@ export async function createCleanupOrder(const [phase, rawPid] = buffer.trim().split('\t');const pid = Number(rawPid);if (!phase || !Number.isInteger(pid) || pid <= 1) {- readyResolve?.(new Error('invalid cleanup ordering participant'));+ readyResolve(new Error('invalid cleanup ordering participant'));socket.destroy();return;}@@ -134,7 +131,7 @@ export async function createCleanupOrder(ended.add(actor);events.push({ phase: 'exit', pid: actor });if (runner === undefined || server === undefined) {- readyResolve?.(+ readyResolve(new Error('cleanup ordering participant exited before registration completed'),);}diff --git a/packages/app/tests/stress/_helpers/port-ownership/owner-loss.test-helper.ts b/packages/app/tests/stress/_helpers/port-ownership/owner-loss.test-helper.tsindex 8b79d8911..aa1bab81b 100644--- a/packages/app/tests/stress/_helpers/port-ownership/owner-loss.test-helper.ts+++ b/packages/app/tests/stress/_helpers/port-ownership/owner-loss.test-helper.ts@@ -99,10 +99,7 @@ async function awaitReceipt(runDir: string, child: ChildProcess): Promise<Receip}function watchScratchGone(runDir: string): { result: Promise<boolean>; stop: () => void } {- let finishResult: (gone: boolean) => void = () => {};- const result = new Promise<boolean>((resolve) => {- finishResult = resolve;- });+ const { promise: result, resolve: finishResult } = Promise.withResolvers<boolean>();let watcher: ReturnType<typeof watch> | undefined;let bound: ReturnType<typeof setTimeout> | undefined;let settled = false;diff --git a/packages/app/tests/stress/_helpers/reuse/supervisor-socket.ts b/packages/app/tests/stress/_helpers/reuse/supervisor-socket.tsindex ec7145366..5199428c1 100644--- a/packages/app/tests/stress/_helpers/reuse/supervisor-socket.ts+++ b/packages/app/tests/stress/_helpers/reuse/supervisor-socket.ts@@ -100,10 +100,7 @@ export async function serveSupervisor(): Promise<SupervisorEndpoint> {await claimSocketPath(socketPath);const connections = new Set<Socket>();- let resolveClosed: (outcome: EndpointClosed) => void = () => {};- const closed = new Promise<EndpointClosed>((resolve) => {- resolveClosed = resolve;- });+ const { promise: closed, resolve: resolveClosed } = Promise.withResolvers<EndpointClosed>();let closing: Promise<void> | undefined;const server = createServer((socket) => {diff --git a/packages/app/tests/stress/_helpers/theme-fade.ts b/packages/app/tests/stress/_helpers/theme-fade.tsindex 4cdc9345a..87cbf5d00 100644--- a/packages/app/tests/stress/_helpers/theme-fade.ts+++ b/packages/app/tests/stress/_helpers/theme-fade.ts@@ -65,14 +65,8 @@ export async function installThemeFadeProbe(page: Page): Promise<void> {| { matched: false; reason: string }| { matched: true; transition: CSSTransition; durationMs: number; delayMs: number };let captured: Capture = { matched: false, reason: 'no transition was captured' };- let resolveStart!: (value: ThemeFadeStart) => void;- const started = new Promise<ThemeFadeStart>((resolve) => {- resolveStart = resolve;- });- let resolveSettle!: (value: ThemeFadeSettle) => void;- const settled = new Promise<ThemeFadeSettle>((resolve) => {- resolveSettle = resolve;- });+ const { promise: started, resolve: resolveStart } = Promise.withResolvers<ThemeFadeStart>();+ const { promise: settled, resolve: resolveSettle } = Promise.withResolvers<ThemeFadeSettle>();const lifetime = new AbortController();let startTimer = 0;diff --git a/packages/app/tests/stress/_helpers/worker-server-lifetime.ts b/packages/app/tests/stress/_helpers/worker-server-lifetime.tsindex 59d9c3cf7..4a48fb937 100644--- a/packages/app/tests/stress/_helpers/worker-server-lifetime.ts+++ b/packages/app/tests/stress/_helpers/worker-server-lifetime.ts@@ -123,24 +123,21 @@ export function acquireWorkerServer(let releaseCompleted = false;let transportFailure: Error | undefined;const nativeEmit = proc.emit.bind(proc);- let resolveStopped: () => void;- let rejectStopped: (error: Error) => void;- const stopped = new Promise<void>((resolve, reject) => {- resolveStopped = resolve;- rejectStopped = reject;- });- let resolveReleased: () => void;- let rejectReleased: (error: Error) => void;- const released = new Promise<void>((resolve, reject) => {- resolveReleased = resolve;- rejectReleased = reject;- });- let resolveExited: () => void;- let rejectExited: (error: Error) => void;- const exited = new Promise<void>((resolve, reject) => {- resolveExited = resolve;- rejectExited = reject;- });+ const {+ promise: stopped,+ resolve: resolveStopped,+ reject: rejectStopped,+ } = Promise.withResolvers<void>();+ const {+ promise: released,+ resolve: resolveReleased,+ reject: rejectReleased,+ } = Promise.withResolvers<void>();+ const {+ promise: exited,+ resolve: resolveExited,+ reject: rejectExited,+ } = Promise.withResolvers<void>();void stopped.catch(() => undefined);void released.catch(() => undefined);void exited.catch(() => undefined);diff --git a/packages/app/tests/stress/chat-explicit-hide-late-restore.e2e.ts b/packages/app/tests/stress/chat-explicit-hide-late-restore.e2e.tsindex 5759f19ed..10a7c8a05 100644--- a/packages/app/tests/stress/chat-explicit-hide-late-restore.e2e.ts+++ b/packages/app/tests/stress/chat-explicit-hide-late-restore.e2e.ts@@ -25,7 +25,7 @@ test('a hidden Chat stays hidden through late thread restoration until its shortconst createdThreadIds = new Set<string>();let threadSocket: WebSocketRoute | null = null;let holdInitialFrames = true;- let releaseHost: (() => void) | undefined;+ const { promise: heldHost, resolve: releaseHost } = Promise.withResolvers<void>();await page.addInitScript((agentId) => {localStorage.setItem(@@ -113,9 +113,6 @@ test('a hidden Chat stays hidden through late thread restoration until its short.toBe(false);let heldRequests = 0;- const heldHost = new Promise<void>((resolve) => {- releaseHost = resolve;- });await page.route('**/src/components/SessionsHost*', async (route) => {heldRequests += 1;await heldHost;@@ -185,7 +182,7 @@ test('a hidden Chat stays hidden through late thread restoration until its shortexpect(frames.some((frame) => frame.visible)).toBe(true);expect(frames.filter((frame) => frame.visible !== frame.pressed)).toEqual([]);} finally {- releaseHost?.();+ releaseHost();try {for (const id of createdThreadIds) await fixture.closeThread(id);} finally {diff --git a/packages/app/tests/stress/editor-card-side-panel-width.e2e.ts b/packages/app/tests/stress/editor-card-side-panel-width.e2e.tsindex 3e55e7f54..de4e28327 100644--- a/packages/app/tests/stress/editor-card-side-panel-width.e2e.ts+++ b/packages/app/tests/stress/editor-card-side-panel-width.e2e.ts@@ -2397,10 +2397,7 @@ test('Links page creation cannot be activated twice while its delayed request isconst target = `editor-card-double-created-${test.info().workerIndex}`;await api.seedDocs([{ name: source, markdown: `# Source\n\n[[${target}]]` }]);let createRequests = 0;- let releaseCreate: () => void = () => {};- const createHeld = new Promise<void>((resolve) => {- releaseCreate = resolve;- });+ const { promise: createHeld, resolve: releaseCreate } = Promise.withResolvers<void>();await page.route('**/api/create-page', async (route) => {createRequests += 1;await createHeld;diff --git a/packages/app/tests/stress/fixtures/handoff-mocks.ts b/packages/app/tests/stress/fixtures/handoff-mocks.tsindex 7f712a4b3..7ed49255f 100644--- a/packages/app/tests/stress/fixtures/handoff-mocks.ts+++ b/packages/app/tests/stress/fixtures/handoff-mocks.ts@@ -143,10 +143,7 @@ export async function installHandoffMocks(page: Page, cfg: HandoffMockConfig): PdockStateRequests: number;releaseDockState: () => void;}- let releaseDockState = (): void => {};- const dockStateReleased = new Promise<void>((resolve) => {- releaseDockState = resolve;- });+ const { promise: dockStateReleased, resolve: releaseDockState } = Promise.withResolvers<void>();const mocks: HandoffMocksState = {anchorClicks: [],openExternalCalls: [],diff --git a/packages/app/tests/stress/pagelist-refresh-lifetime.e2e.ts b/packages/app/tests/stress/pagelist-refresh-lifetime.e2e.tsindex 9b745fafa..091abba84 100644--- a/packages/app/tests/stress/pagelist-refresh-lifetime.e2e.ts+++ b/packages/app/tests/stress/pagelist-refresh-lifetime.e2e.ts@@ -134,10 +134,7 @@ test.describe('PageListProvider refresh lifetime', () => {await openScratchDocument(page, api, suffix);let handlerEntries = 0;- let releaseHeldRequests: () => void = () => undefined;- const held = new Promise<void>((resolve) => {- releaseHeldRequests = resolve;- });+ const { promise: held, resolve: releaseHeldRequests } = Promise.withResolvers<void>();await page.route(PAGES_ROUTE, async (route) => {handlerEntries += 1;await Promise.race([@@ -261,10 +258,7 @@ test.describe('PageListProvider refresh lifetime', () => {await openScratchDocument(page, api, suffix);let handlerEntries = 0;- let releaseHeldRequests: () => void = () => undefined;- const held = new Promise<void>((resolve) => {- releaseHeldRequests = resolve;- });+ const { promise: held, resolve: releaseHeldRequests } = Promise.withResolvers<void>();await page.route(DOCUMENTS_ROUTE, async (route) => {handlerEntries += 1;await Promise.race([diff --git a/packages/app/tests/stress/promise-with-resolvers-fallback.e2e.ts b/packages/app/tests/stress/promise-with-resolvers-fallback.e2e.tsnew file mode 100644index 000000000..9e1a34e23--- /dev/null+++ b/packages/app/tests/stress/promise-with-resolvers-fallback.e2e.ts@@ -0,0 +1,13 @@+import { expectDocumentOpen, test } from './_helpers';++test('a document opens in a browser that lacks Promise.withResolvers', async ({ page, api }) => {+ const docName = `no-with-resolvers-${Date.now().toString(36)}`;+ await api.seedDocs([{ name: docName, markdown: `# ${docName}\n\nBody text.\n` }]);+ await page.addInitScript(() => {+ Reflect.deleteProperty(Promise, 'withResolvers');+ });++ await page.goto(`/#/${docName}`);++ await expectDocumentOpen(page, docName);+});diff --git a/packages/core/src/util/file-lock.test.ts b/packages/core/src/util/file-lock.test.tsindex f5b9d942b..9a4e09436 100644--- a/packages/core/src/util/file-lock.test.ts+++ b/packages/core/src/util/file-lock.test.ts@@ -98,10 +98,7 @@ describe('withFileLock — stale-lock recovery', () => {describe('withFileLock — timeout', () => {test('rejects with FileLockTimeoutError when the lock is held past timeoutMs', async () => {- let release!: () => void;- const releaseSignal = new Promise<void>((r) => {- release = r;- });+ const { promise: releaseSignal, resolve: release } = Promise.withResolvers<void>();const heldPromise = withFileLock(lockPath, async () => {await releaseSignal;@@ -120,10 +117,7 @@ describe('withFileLock — timeout', () => {});test('FileLockTimeoutError carries lockPath and timeoutMs', async () => {- let release!: () => void;- const releaseSignal = new Promise<void>((r) => {- release = r;- });+ const { promise: releaseSignal, resolve: release } = Promise.withResolvers<void>();const heldPromise = withFileLock(lockPath, async () => {await releaseSignal;diff --git a/packages/desktop/src/main/boot-restore-decision.settle.test.ts b/packages/desktop/src/main/boot-restore-decision.settle.test.tsindex dcf098d90..72af1ca8c 100644--- a/packages/desktop/src/main/boot-restore-decision.settle.test.ts+++ b/packages/desktop/src/main/boot-restore-decision.settle.test.ts@@ -34,10 +34,7 @@ function makeHandler() {}function manualSettle() {- let release!: () => void;- const promise = new Promise<void>((res) => {- release = res;- });+ const { promise, resolve: release } = Promise.withResolvers<void>();return { waitForUrlLaunchSettled: () => promise, release };}diff --git a/packages/desktop/src/main/git-preflight-handler.test.ts b/packages/desktop/src/main/git-preflight-handler.test.tsindex aa6cc1825..558e429be 100644--- a/packages/desktop/src/main/git-preflight-handler.test.ts+++ b/packages/desktop/src/main/git-preflight-handler.test.ts@@ -597,12 +597,11 @@ describe('ensureGitAvailable', () => {});});let answer: (value: { response: number }) => void = () => {};- const showMessageBox = vi.fn(- () =>- new Promise<{ response: number }>((resolve) => {- answer = resolve;- }),- );+ const showMessageBox = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<{ response: number }>();+ answer = resolve;+ return promise;+ });const warn = vi.fn((_msg: string, _obj?: unknown) => {});const info = vi.fn((_msg: string, _obj?: unknown) => {});diff --git a/packages/desktop/src/main/graceful-terminate.test.ts b/packages/desktop/src/main/graceful-terminate.test.tsindex ee5b03dc8..752523a38 100644--- a/packages/desktop/src/main/graceful-terminate.test.ts+++ b/packages/desktop/src/main/graceful-terminate.test.ts@@ -64,10 +64,11 @@ describe('gracefulTerminate', () => {let releaseSignal: (() => void) | undefined;let polled = false;const termination = gracefulTerminate({- sendSignal: () =>- new Promise<void>((resolve) => {- releaseSignal = resolve;- }),+ sendSignal: () => {+ const { promise, resolve } = Promise.withResolvers<void>();+ releaseSignal = resolve;+ return promise;+ },isAlive: () => {polled = true;return false;diff --git a/packages/desktop/src/main/integrations-settings.test.ts b/packages/desktop/src/main/integrations-settings.test.tsindex 4798d3419..c34940c6d 100644--- a/packages/desktop/src/main/integrations-settings.test.ts+++ b/packages/desktop/src/main/integrations-settings.test.ts@@ -562,9 +562,9 @@ describe('ok:integrations:dispatch — gates and serialization', () => {let releaseFirst: () => void = () => {};path.install = async () => {order.push('install-start');- await new Promise<void>((resolve) => {- releaseFirst = resolve;- });+ const { promise, resolve } = Promise.withResolvers<void>();+ releaseFirst = resolve;+ await promise;order.push('install-end');return { ok: true };};@@ -599,9 +599,9 @@ describe('ok:integrations:dispatch — gates and serialization', () => {let releaseInstall: () => void = () => {};path.install = async () => {order.push('toggle-start');- await new Promise<void>((resolve) => {- releaseInstall = resolve;- });+ const { promise, resolve } = Promise.withResolvers<void>();+ releaseInstall = resolve;+ await promise;order.push('toggle-end');return { ok: true };};diff --git a/packages/desktop/src/main/ipc/local-op-auth-idempotent-start.test.ts b/packages/desktop/src/main/ipc/local-op-auth-idempotent-start.test.tsindex 74fa196fb..d27aaca25 100644--- a/packages/desktop/src/main/ipc/local-op-auth-idempotent-start.test.ts+++ b/packages/desktop/src/main/ipc/local-op-auth-idempotent-start.test.ts@@ -20,10 +20,7 @@ vi.doMock('@inkeep/open-knowledge-server', () => ({runAuthStatusSubprocess: () => Promise.resolve({ authenticated: false, host: 'github.com' }),runAuthReposSubprocess: () => Promise.resolve({ ok: false, error: 'unused' }),runDeviceFlowSubprocess: ({ onEvent }: { onEvent: (event: AuthEvent) => void }) => {- let resolveDone: () => void = () => {};- const done = new Promise<void>((resolve) => {- resolveDone = resolve;- });+ const { promise: done, resolve: resolveDone } = Promise.withResolvers<void>();const entry: DeviceFlowEntry = { resolve: resolveDone, cancelCalled: false, onEvent };deviceFlowControllers.push(entry);return {@@ -34,10 +31,7 @@ vi.doMock('@inkeep/open-knowledge-server', () => ({};},runCloneSubprocess: ({ onEvent }: { onEvent: (event: CloneEvent) => void }) => {- let resolveDone: () => void = () => {};- const done = new Promise<void>((resolve) => {- resolveDone = resolve;- });+ const { promise: done, resolve: resolveDone } = Promise.withResolvers<void>();const entry: CloneEntry = { resolve: resolveDone, cancelCalled: false, onEvent };cloneControllers.push(entry);return {diff --git a/packages/desktop/src/main/ipc/local-op-failure-logging.test.ts b/packages/desktop/src/main/ipc/local-op-failure-logging.test.tsindex fe0394ead..579c391bf 100644--- a/packages/desktop/src/main/ipc/local-op-failure-logging.test.ts+++ b/packages/desktop/src/main/ipc/local-op-failure-logging.test.ts@@ -22,10 +22,7 @@ function pushController<E>(registry: StreamEntry<E>[],onEvent: (event: E) => void,): { done: Promise<void>; cancel: () => void } {- let resolveDone: () => void = () => {};- const done = new Promise<void>((resolve) => {- resolveDone = resolve;- });+ const { promise: done, resolve: resolveDone } = Promise.withResolvers<void>();registry.push({ resolve: resolveDone, onEvent });return { done, cancel: () => {} };}diff --git a/packages/desktop/src/main/ipc/slides.test.ts b/packages/desktop/src/main/ipc/slides.test.tsindex 682bc81ea..3e37ec804 100644--- a/packages/desktop/src/main/ipc/slides.test.ts+++ b/packages/desktop/src/main/ipc/slides.test.ts@@ -156,10 +156,7 @@ describe('handleSlidesOpen', () => {it('joins an in-flight open instead of spawning a rival server for the same deck', async () => {const registry = createSlidesDeckRegistry();let spawns = 0;- let releaseProbe: (() => void) | undefined;- const gate = new Promise<void>((resolve) => {- releaseProbe = resolve;- });+ const { promise: gate, resolve: releaseProbe } = Promise.withResolvers<void>();const startDeps: StartSlidevDeps = {findFreePort: () => Promise.resolve(5300),spawnSlidev: () => {@@ -188,7 +185,7 @@ describe('handleSlidesOpen', () => {const first = handleSlidesOpen(DECK, deps);const second = handleSlidesOpen(DECK, deps);- releaseProbe?.();+ releaseProbe();const results = await Promise.all([first, second]);expect(results).toEqual([@@ -356,10 +353,7 @@ describe('handleSlidesOpen', () => {it('records one open attempt — not two — when a second activation joins the in-flight open', async () => {const registry = createSlidesDeckRegistry();- let releaseProbe: (() => void) | undefined;- const gate = new Promise<void>((resolve) => {- releaseProbe = resolve;- });+ const { promise: gate, resolve: releaseProbe } = Promise.withResolvers<void>();const startDeps: StartSlidevDeps = {findFreePort: () => Promise.resolve(5300),spawnSlidev: () => fakeSlidevProcess(),@@ -384,7 +378,7 @@ describe('handleSlidesOpen', () => {const first = handleSlidesOpen(DECK, deps);const second = handleSlidesOpen(DECK, deps);- releaseProbe?.();+ releaseProbe();await Promise.all([first, second]);expect(attempts).toEqual([{ kind: 'open', ok: true }]);diff --git a/packages/desktop/src/main/share-handoff.test.ts b/packages/desktop/src/main/share-handoff.test.tsindex 3bfd2347e..9b1ec670e 100644--- a/packages/desktop/src/main/share-handoff.test.ts+++ b/packages/desktop/src/main/share-handoff.test.ts@@ -271,21 +271,13 @@ describe('startFirstRunHandshake', () => {expect(token).toHaveLength(3984);let server: HttpServer | undefined;- let resolveContinueUrl: ((url: string) => void) | undefined;- let resolveRoutedUrl: ((url: string) => void) | undefined;- const continueUrl = new Promise<string>((resolve) => {- resolveContinueUrl = resolve;- });- const routedUrl = new Promise<string>((resolve) => {- resolveRoutedUrl = resolve;- });+ const { promise: continueUrl, resolve: resolveContinueUrl } = Promise.withResolvers<string>();+ const { promise: routedUrl, resolve: resolveRoutedUrl } = Promise.withResolvers<string>();const outcomes: HandoffOutcome[] = [];const normalizedShares: ShareUrlPayload[] = [];const parsedResults: Array<ShareParseResult | null> = [];- let resolveRoutedResult!: (result: ShareNavigatorPayload) => void;- const routedResult = new Promise<ShareNavigatorPayload>((resolve) => {- resolveRoutedResult = resolve;- });+ const { promise: routedResult, resolve: resolveRoutedResult } =+ Promise.withResolvers<ShareNavigatorPayload>();const protocolControl = registerProtocolHandler({app: {on: () => {},@@ -313,9 +305,9 @@ describe('startFirstRunHandshake', () => {server = createHttpServer(handler);return server;},- openExternal: (url) => resolveContinueUrl?.(url),+ openExternal: (url) => resolveContinueUrl(url),routeShareUrl: (url) => {- resolveRoutedUrl?.(url);+ resolveRoutedUrl(url);parsedResults.push(parseShareUrl(url));protocolControl.routeUrl(url);},diff --git a/packages/desktop/src/main/slides-registry.test.ts b/packages/desktop/src/main/slides-registry.test.tsindex db0280fd4..742a2bdf7 100644--- a/packages/desktop/src/main/slides-registry.test.ts+++ b/packages/desktop/src/main/slides-registry.test.ts@@ -108,10 +108,7 @@ describe('createSlidesDeckRegistry', () => {it('clears immediately but waits for every process signal', async () => {const registry = createSlidesDeckRegistry();- let release: (() => void) | undefined;- const pendingSignal = new Promise<void>((resolve) => {- release = resolve;- });+ const { promise: pendingSignal, resolve: release } = Promise.withResolvers<void>();const { deck } = fakeDeck('/decks/a.md', 3001);deck.process.signal = () => pendingSignal;registry.register(deck);@@ -124,7 +121,7 @@ describe('createSlidesDeckRegistry', () => {await Promise.resolve();expect(settled).toBe(false);- release?.();+ release();await drain;expect(settled).toBe(true);});diff --git a/packages/desktop/src/main/slidev-server.test.ts b/packages/desktop/src/main/slidev-server.test.tsindex a7b814940..7c4be68bb 100644--- a/packages/desktop/src/main/slidev-server.test.ts+++ b/packages/desktop/src/main/slidev-server.test.ts@@ -619,12 +619,11 @@ describe('signalSlidevChild', () => {it('waits for the Windows tree kill to settle', async () => {const { child } = fakeChild();let release: (() => void) | undefined;- const killWindowsTree = vi.fn(- () =>- new Promise<void>((resolve) => {- release = resolve;- }),- );+ const killWindowsTree = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<void>();+ release = resolve;+ return promise;+ });let settled = false;const signal = signalSlidevChild(child, 'SIGTERM', {diff --git a/packages/desktop/src/main/terminal-quit-drain.test.ts b/packages/desktop/src/main/terminal-quit-drain.test.tsindex 2c81535c2..e1d2974f1 100644--- a/packages/desktop/src/main/terminal-quit-drain.test.ts+++ b/packages/desktop/src/main/terminal-quit-drain.test.ts@@ -1,19 +1,9 @@import { describe, expect, test, vi } from 'vitest';import { createTerminalQuitDrain } from './terminal-quit-drain.ts';-function deferred<T>() {- let resolve!: (value: T | PromiseLike<T>) => void;- let reject!: (reason?: unknown) => void;- const promise = new Promise<T>((resolvePromise, rejectPromise) => {- resolve = resolvePromise;- reject = rejectPromise;- });- return { promise, reject, resolve };-}-describe('createTerminalQuitDrain', () => {test('defers quit re-entry until after the terminal drain and native event turn', async () => {- const drain = deferred<void>();+ const drain = Promise.withResolvers<void>();const deferredCallbacks: Array<() => void> = [];const resumeQuit = vi.fn();const onWillQuit = createTerminalQuitDrain({@@ -42,7 +32,7 @@ describe('createTerminalQuitDrain', () => {});test('coalesces repeated will-quit events while the drain is pending', () => {- const drain = deferred<void>();+ const drain = Promise.withResolvers<void>();const drainTerminals = vi.fn(() => drain.promise);const onWillQuit = createTerminalQuitDrain({defer: vi.fn(),@@ -60,7 +50,7 @@ describe('createTerminalQuitDrain', () => {});test('resumes quit after a rejected best-effort drain', async () => {- const drain = deferred<void>();+ const drain = Promise.withResolvers<void>();const deferredCallbacks: Array<() => void> = [];const resumeQuit = vi.fn();const onWillQuit = createTerminalQuitDrain({diff --git a/packages/desktop/src/main/url-scheme.settle.test.ts b/packages/desktop/src/main/url-scheme.settle.test.tsindex a18c2f11e..56bb751e9 100644--- a/packages/desktop/src/main/url-scheme.settle.test.ts+++ b/packages/desktop/src/main/url-scheme.settle.test.ts@@ -11,10 +11,7 @@ async function flushMicrotasks(): Promise<void> {function makeHandler(opts: { platform: NodeJS.Platform }) {let openUrlListener: ((event: { preventDefault: () => void }, url: string) => void) | null = null;- let resolveReady!: () => void;- const ready = new Promise<void>((res) => {- resolveReady = res;- });+ const { promise: ready, resolve: resolveReady } = Promise.withResolvers<void>();const scheduled: Array<() => void> = [];const control = registerProtocolHandler({diff --git a/packages/desktop/src/main/url-scheme.ts b/packages/desktop/src/main/url-scheme.tsindex b9b930aaa..d3a379e79 100644--- a/packages/desktop/src/main/url-scheme.ts+++ b/packages/desktop/src/main/url-scheme.ts@@ -465,15 +465,11 @@ export function registerProtocolHandler(deps: ProtocolHandlerDeps): ProtocolHandlet urlLaunchOwnsWindow = false;let settled = false;- let settleResolve: (() => void) | null = null;- const settlePromise = new Promise<void>((res) => {- settleResolve = res;- });+ const { promise: settlePromise, resolve: settleResolve } = Promise.withResolvers<void>();const settleNow = (): void => {if (settled) return;settled = true;- settleResolve?.();- settleResolve = null;+ settleResolve();};if (deps.app.isPackaged) {diff --git a/packages/desktop/src/main/worktree-inventory.test.ts b/packages/desktop/src/main/worktree-inventory.test.tsindex a5d761b6a..97e79f71e 100644--- a/packages/desktop/src/main/worktree-inventory.test.ts+++ b/packages/desktop/src/main/worktree-inventory.test.ts@@ -182,13 +182,10 @@ describe('WorktreeInventoryService', () => {test('deduplicates concurrent raw snapshots and reuses a successful snapshot within the TTL', async () => {let reads = 0;- let release: ((result: { ok: true; entries: readonly BridgeWorktreeEntry[] }) => void) | null =- null;- const pending = new Promise<{ ok: true; entries: readonly BridgeWorktreeEntry[] }>(- (resolve) => {- release = resolve;- },- );+ const { promise: pending, resolve: release } = Promise.withResolvers<{+ ok: true;+ entries: readonly BridgeWorktreeEntry[];+ }>();const service = new WorktreeInventoryService({classifyProject: async () => ({gitCommonDir: '/repo/.git',@@ -211,7 +208,7 @@ describe('WorktreeInventoryService', () => {await Promise.resolve();await Promise.resolve();expect(reads).toBe(1);- release?.({+ release({ok: true,entries: [{diff --git a/packages/desktop/src/utility/server-entry.ts b/packages/desktop/src/utility/server-entry.tsindex 5c158849f..4f1d37bf9 100644--- a/packages/desktop/src/utility/server-entry.ts+++ b/packages/desktop/src/utility/server-entry.ts@@ -157,12 +157,11 @@ export function setupUtility(deps: SetupUtilityDeps): UtilityHandle {let parentPollHandle: { unref?: () => void; clear: () => void } | null = null;let initInFlight: Promise<void> | null = null;let shutdownInFlight: Promise<void> | null = null;- let resolveReady!: (msg: UtilityReadyMessage) => void;- let rejectReady!: (err: Error) => void;- const readyPromise = new Promise<UtilityReadyMessage>((resolve, reject) => {- resolveReady = resolve;- rejectReady = reject;- });+ const {+ promise: readyPromise,+ resolve: resolveReady,+ reject: rejectReady,+ } = Promise.withResolvers<UtilityReadyMessage>();function startParentPoll() {const pollMs = deps.parentPollMs ?? 5000;diff --git a/packages/desktop/tests/integration/auto-updater.test.ts b/packages/desktop/tests/integration/auto-updater.test.tsindex 9892e87f5..03d3c67af 100644--- a/packages/desktop/tests/integration/auto-updater.test.ts+++ b/packages/desktop/tests/integration/auto-updater.test.ts@@ -5320,12 +5320,11 @@ describe('staged-cache reclaim — fires only once every install commitment is stest('the launch check waits for the reclaim to settle (no rm/download interleave)', async () => {let resolveReclaim: (() => void) | undefined;- const reclaim = vi.fn(- () =>- new Promise<void>((resolve) => {- resolveReclaim = resolve;- }),- );+ const reclaim = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<void>();+ resolveReclaim = resolve;+ return promise;+ });const { rig } = makeRig({ reclaimStagedUpdateCache: reclaim });expect(reclaim).toHaveBeenCalledTimes(1);await Promise.resolve();@@ -6471,12 +6470,11 @@ describe('a manual check that finds the staged build re-offers the card', () =>test('Quit and Restart after the pending install was dropped behind the open dialog tells the user', async () => {let answer: (choice: 'relaunch' | 'dismiss') => void = () => {};- const showCheckNowResult = vi.fn(- () =>- new Promise<'relaunch' | 'dismiss'>((resolve) => {- answer = resolve;- }),- );+ const showCheckNowResult = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<'relaunch' | 'dismiss'>();+ answer = resolve;+ return promise;+ });const { rig } = makeRig({versionPendingInstall: null,showCheckNowResult,@@ -6791,12 +6789,11 @@ describe('update mode off switch', () => {test('turning updates off before the deferred launch check runs skips that check', async () => {let settleReclaim: () => void = () => {};- const reclaim = vi.fn(- () =>- new Promise<void>((resolve) => {- settleReclaim = resolve;- }),- );+ const reclaim = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<void>();+ settleReclaim = resolve;+ return promise;+ });const { rig } = makeRig({ reclaimStagedUpdateCache: reclaim });await rig.ipc.invoke('ok:update:dispatch', { kind: 'set-mode', mode: 'off' });settleReclaim();diff --git a/packages/desktop/tests/main/bundle-replace-detector.test.ts b/packages/desktop/tests/main/bundle-replace-detector.test.tsindex fa8523677..db23e0a37 100644--- a/packages/desktop/tests/main/bundle-replace-detector.test.ts+++ b/packages/desktop/tests/main/bundle-replace-detector.test.ts@@ -212,12 +212,14 @@ describe('startBundleReplaceWatcher', () => {test('second tick while dialog is still pending does NOT fire a second prompt', async () => {const fx = makeFixtures();let resolveDialog: ((v: { response: number; checkboxChecked: boolean }) => void) | null = null;- fx.showMessageBox = vi.fn(- () =>- new Promise<{ response: number; checkboxChecked: boolean }>((r) => {- resolveDialog = r;- }),- );+ fx.showMessageBox = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<{+ response: number;+ checkboxChecked: boolean;+ }>();+ resolveDialog = resolve;+ return promise;+ });startBundleReplaceWatcher({infoPlistPath: '/x/Info.plist',getCurrentVersion: () => '0.4.1',@@ -273,12 +275,14 @@ describe('startBundleReplaceWatcher', () => {test('stop() while dialog is pending, then dialog rejection: does NOT re-arm', async () => {const fx = makeFixtures();let rejectDialog: ((err: Error) => void) | null = null;- fx.showMessageBox = vi.fn(- () =>- new Promise<{ response: number; checkboxChecked: boolean }>((_, r) => {- rejectDialog = r;- }),- );+ fx.showMessageBox = vi.fn(() => {+ const { promise, reject } = Promise.withResolvers<{+ response: number;+ checkboxChecked: boolean;+ }>();+ rejectDialog = reject;+ return promise;+ });const handle = startBundleReplaceWatcher({infoPlistPath: '/x/Info.plist',getCurrentVersion: () => '0.4.1',@@ -308,12 +312,14 @@ describe('startBundleReplaceWatcher', () => {test('stop() during a pending dialog suppresses relaunch+quit on user response', async () => {const fx = makeFixtures();let resolveDialog: ((v: { response: number; checkboxChecked: boolean }) => void) | null = null;- fx.showMessageBox = vi.fn(- () =>- new Promise<{ response: number; checkboxChecked: boolean }>((r) => {- resolveDialog = r;- }),- );+ fx.showMessageBox = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<{+ response: number;+ checkboxChecked: boolean;+ }>();+ resolveDialog = resolve;+ return promise;+ });const handle = startBundleReplaceWatcher({infoPlistPath: '/x/Info.plist',getCurrentVersion: () => '0.4.1',diff --git a/packages/desktop/tests/main/desktop-uninstall-feedback.test.ts b/packages/desktop/tests/main/desktop-uninstall-feedback.test.tsindex 9db260605..42adeab7b 100644--- a/packages/desktop/tests/main/desktop-uninstall-feedback.test.ts+++ b/packages/desktop/tests/main/desktop-uninstall-feedback.test.ts@@ -51,10 +51,11 @@ describe('desktop uninstall feedback step', () => {const step = runDesktopUninstallFeedbackStep({collect: async () => answered,appVersion: '1.4.0',- submit: () =>- new Promise<UninstallFeedbackResult>((resolve) => {- releaseSubmit = resolve;- }),+ submit: () => {+ const { promise, resolve } = Promise.withResolvers<UninstallFeedbackResult>();+ releaseSubmit = resolve;+ return promise;+ },}).then((outcome) => {stepDone = true;return outcome;diff --git a/packages/desktop/tests/main/navigator-window.test.ts b/packages/desktop/tests/main/navigator-window.test.tsindex 505c6995e..3597bf7e9 100644--- a/packages/desktop/tests/main/navigator-window.test.ts+++ b/packages/desktop/tests/main/navigator-window.test.ts@@ -401,12 +401,8 @@ describe('navigator boot narration (the phase consent-dialog waits over)', () =>}test('narrates while the navigator renderer is still loading, on the app cadence', () => {- let resolveLoad: (() => void) | undefined;- const h = harness(- new Promise<void>((r) => {- resolveLoad = r;- }),- );+ const { promise: loaded, resolve: resolveLoad } = Promise.withResolvers<void>();+ const h = harness(loaded);createNavigatorWindow(h.deps);const beat = h.intervals.find((i) => !i.cleared);@@ -416,7 +412,7 @@ describe('navigator boot narration (the phase consent-dialog waits over)', () =>beat?.cb();expect(h.lines.filter((l) => l.event === 'desktop-navigator-load-progress')).toHaveLength(2);expect(h.flushes()).toBe(2);- resolveLoad?.();+ resolveLoad();});test('stops narrating and records the terminal line once the renderer resolves', async () => {diff --git a/packages/desktop/tests/main/url-scheme-handler.test.ts b/packages/desktop/tests/main/url-scheme-handler.test.tsindex 2f5692909..232906660 100644--- a/packages/desktop/tests/main/url-scheme-handler.test.ts+++ b/packages/desktop/tests/main/url-scheme-handler.test.ts@@ -54,10 +54,11 @@ interface FakeApp {function makeFakeApp(opts?: { isPackaged?: boolean }): FakeApp {const listeners = new Map<AppEvent, AppListener>();let resolveReadyFn: (() => void) | null = null;- const whenReady = () =>- new Promise<void>((resolve) => {- resolveReadyFn = resolve;- });+ const whenReady = () => {+ const { promise, resolve } = Promise.withResolvers<void>();+ resolveReadyFn = resolve;+ return promise;+ };const on = vi.fn((event: AppEvent, cb: AppListener) => {listeners.set(event, cb);});@@ -1965,16 +1966,12 @@ describe('registerProtocolHandler — resolved share routing (US-003)', () => {env.readyWindow = { id: 'ready' };let resolveA: (s: CandidateSelection) => void = () => {};let resolveB: (s: CandidateSelection) => void = () => {};- const resolveShareTarget = vi.fn(- (share: ShareUrlPayload): Promise<CandidateSelection> =>- share.repo === 'repo-a'- ? new Promise<CandidateSelection>((r) => {- resolveA = r;- })- : new Promise<CandidateSelection>((r) => {- resolveB = r;- }),- );+ const resolveShareTarget = vi.fn((share: ShareUrlPayload): Promise<CandidateSelection> => {+ const { promise, resolve } = Promise.withResolvers<CandidateSelection>();+ if (share.repo === 'repo-a') resolveA = resolve;+ else resolveB = resolve;+ return promise;+ });registerProtocolHandler({app: env.app,diff --git a/packages/desktop/tests/main/window-manager-ephemeral.test.ts b/packages/desktop/tests/main/window-manager-ephemeral.test.tsindex 888cd2b12..23ec78916 100644--- a/packages/desktop/tests/main/window-manager-ephemeral.test.ts+++ b/packages/desktop/tests/main/window-manager-ephemeral.test.ts@@ -490,12 +490,11 @@ describe('createEphemeralWindow', () => {env.deps.createWindow = (opts) => {env.createWindowOpts.push(opts);const w = makeWindow();- w.loadFile = vi.fn(- () =>- new Promise<void>((resolve) => {- releaseLoad = resolve;- }),- ) as typeof w.loadFile;+ w.loadFile = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<void>();+ releaseLoad = resolve;+ return promise;+ });env.windows.push(w);return w;};diff --git a/packages/desktop/tests/main/window-manager.test.ts b/packages/desktop/tests/main/window-manager.test.tsindex 8d68e7605..157863438 100644--- a/packages/desktop/tests/main/window-manager.test.ts+++ b/packages/desktop/tests/main/window-manager.test.ts@@ -751,10 +751,11 @@ describe('WindowManager', () => {test('starts no project server for an open still in progress when the drain begins', async () => {let finishClean: (() => void) | undefined;- env.deps.runClean = () =>- new Promise<void>((resolveClean) => {- finishClean = resolveClean;- });+ env.deps.runClean = () => {+ const { promise, resolve } = Promise.withResolvers<void>();+ finishClean = resolve;+ return promise;+ };const wm = new WindowManager(env.deps);const openFailure = wm.createProjectWindow({ projectPath: '/tmp/quit-drain-pending-open' })@@ -876,12 +877,11 @@ describe('WindowManager', () => {env.deps.createWindow = (opts) => {env.createWindowOpts.push(opts);const w = makeWindow();- w.loadFile = vi.fn(- () =>- new Promise<void>((resolve) => {- releaseLoad = resolve;- }),- ) as typeof w.loadFile;+ w.loadFile = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<void>();+ releaseLoad = resolve;+ return promise;+ });env.windows.push(w);return w;};@@ -909,12 +909,11 @@ describe('WindowManager', () => {env.deps.createWindow = (opts) => {env.createWindowOpts.push(opts);const w = makeWindow();- w.loadFile = vi.fn(- () =>- new Promise<void>((_resolve, reject) => {- rejectLoad = reject;- }),- ) as typeof w.loadFile;+ w.loadFile = vi.fn(() => {+ const { promise, reject } = Promise.withResolvers<void>();+ rejectLoad = reject;+ return promise;+ });env.windows.push(w);return w;};@@ -1508,12 +1507,11 @@ describe('WindowManager', () => {env.deps.createWindow = (opts) => {env.createWindowOpts.push(opts);const w = makeWindow();- w.loadFile = vi.fn(- () =>- new Promise<void>((resolve) => {- releaseLoad = resolve;- }),- ) as typeof w.loadFile;+ w.loadFile = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<void>();+ releaseLoad = resolve;+ return promise;+ });env.windows.push(w);return w;};@@ -2266,10 +2264,10 @@ describe('WindowManager', () => {let resolveSpawn: (() => void) | undefined;let rejectSpawn: ((err: Error) => void) | undefined;env.deps.spawnDetachedServer = async () => {- await new Promise<void>((resolve, reject) => {- resolveSpawn = resolve;- rejectSpawn = reject;- });+ const { promise, resolve, reject } = Promise.withResolvers<void>();+ resolveSpawn = resolve;+ rejectSpawn = reject;+ await promise;spawned = true;return heldChild(env.deps, 6666);};diff --git a/packages/desktop/tests/smoke/_helpers/dock-height-settlement.uncached.test.ts b/packages/desktop/tests/smoke/_helpers/dock-height-settlement.uncached.test.tsindex 34b0eb07c..be2d99610 100644--- a/packages/desktop/tests/smoke/_helpers/dock-height-settlement.uncached.test.ts+++ b/packages/desktop/tests/smoke/_helpers/dock-height-settlement.uncached.test.ts@@ -69,17 +69,11 @@ function currentDockHeightWait(label: string): string {function runCurrentDockWait(label: string, panelHeight: number) {const source = currentDockHeightWait(label);const path = fileURLToPath(new URL('../terminal-dock.e2e.ts', import.meta.url));- let releaseRead: (() => void) | undefined;- let markReadStarted: (() => void) | undefined;- const readStarted = new Promise<void>((resolve) => {- markReadStarted = resolve;- });- const reading = new Promise<void>((resolve) => {- releaseRead = resolve;- });+ const { promise: readStarted, resolve: markReadStarted } = Promise.withResolvers<void>();+ const { promise: reading, resolve: releaseRead } = Promise.withResolvers<void>();const panel = {async evaluate(callback: (element: unknown) => number): Promise<number> {- markReadStarted?.();+ markReadStarted();await reading;return runInNewContext(`(${callback.toString()})(element)`, {element: { getBoundingClientRect: () => ({ height: panelHeight }) },diff --git a/packages/desktop/tests/smoke/_helpers/launch-readiness.test.ts b/packages/desktop/tests/smoke/_helpers/launch-readiness.test.tsindex 25b626601..d8bb12e7f 100644--- a/packages/desktop/tests/smoke/_helpers/launch-readiness.test.ts+++ b/packages/desktop/tests/smoke/_helpers/launch-readiness.test.ts@@ -2772,12 +2772,11 @@ describe('the cap bounds the wait itself, not only the gaps between polls', () =pollMs: 1,now: () => 0,readLog: () => snapshot({ lineCount: 3, lastEvent: 'desktop.startup.serverSpawned' }),- startDeadline: () => ({- expired: new Promise<void>((resolve) => {- reachDeadline = resolve;- }),- cancel: () => {},- }),+ startDeadline: () => {+ const { promise: expired, resolve } = Promise.withResolvers<void>();+ reachDeadline = resolve;+ return { expired, cancel: () => {} };+ },}).then((value) => ({ resolvedWith: value }),(error: unknown) => ({ rejectedWith: (error as Error).message }),@@ -2853,12 +2852,11 @@ describe('the cap bounds the wait itself, not only the gaps between polls', () =setTimeout(resolve, 0);}),readLog: () => snapshot({ lineCount: 3, lastEvent: 'desktop.startup.serverSpawned' }),- startDeadline: () => ({- expired: new Promise<void>((resolve) => {- reachDeadline = resolve;- }),- cancel: () => {},- }),+ startDeadline: () => {+ const { promise: expired, resolve } = Promise.withResolvers<void>();+ reachDeadline = resolve;+ return { expired, cancel: () => {} };+ },}).catch((e: unknown) => e);const message = (error as Error).message;expect(probes).toBe(1);diff --git a/packages/desktop/tests/support/pty-readiness.test-helper.ts b/packages/desktop/tests/support/pty-readiness.test-helper.tsindex 051a886a7..be158f5d3 100644--- a/packages/desktop/tests/support/pty-readiness.test-helper.ts+++ b/packages/desktop/tests/support/pty-readiness.test-helper.ts@@ -831,10 +831,7 @@ export async function runHarness(let spawnError = null as Error | null;let exitResult = null as { code: number | null; signal: string | null } | null;- let resolveExit: () => void = () => undefined;- const exitPromise = new Promise<void>((resolve) => {- resolveExit = resolve;- });+ const { promise: exitPromise, resolve: resolveExit } = Promise.withResolvers<void>();child.once('error', (error) => {spawnError = error;});diff --git a/packages/desktop/tests/support/windows-os-state.test-helper.ts b/packages/desktop/tests/support/windows-os-state.test-helper.tsindex fd5cc62a1..bbe20b430 100644--- a/packages/desktop/tests/support/windows-os-state.test-helper.ts+++ b/packages/desktop/tests/support/windows-os-state.test-helper.ts@@ -434,10 +434,7 @@ export function startWindowsOsState(options: WindowsOsStateOptions): WindowsOsCo});workerValue = unavailable('worker-request-deadline');}- let resolveResult: (result: PtyOsObservation) => void = () => undefined;- const result = new Promise<PtyOsObservation>((resolve) => {- resolveResult = resolve;- });+ const { promise: result, resolve: resolveResult } = Promise.withResolvers<PtyOsObservation>();const requestTermination = (reason: TerminationReason): void => {if (terminationReason !== null) return;terminationReason = reason;diff --git a/packages/desktop/tests/utility/project-server-quit-drain.harness.ts b/packages/desktop/tests/utility/project-server-quit-drain.harness.tsindex fbb4e2613..12114c5cb 100644--- a/packages/desktop/tests/utility/project-server-quit-drain.harness.ts+++ b/packages/desktop/tests/utility/project-server-quit-drain.harness.ts@@ -136,10 +136,7 @@ const wm = new WindowManager({});let quitDrainSettled = false;-let resolveQuitProceeds!: () => void;-const quitProceeds = new Promise<void>((resolve) => {- resolveQuitProceeds = resolve;-});+const { promise: quitProceeds, resolve: resolveQuitProceeds } = Promise.withResolvers<void>();const runQuitDrain = createTerminalQuitDrain({defer: (callback) => setImmediate(callback),drain: async () => {diff --git a/packages/desktop/tests/utility/project-server-quit-drain.worker.harness.ts b/packages/desktop/tests/utility/project-server-quit-drain.worker.harness.tsindex d08f9132b..e2aa1cf99 100644--- a/packages/desktop/tests/utility/project-server-quit-drain.worker.harness.ts+++ b/packages/desktop/tests/utility/project-server-quit-drain.worker.harness.ts@@ -36,10 +36,8 @@ function parcelOperation(): 'subscribe' | 'unsubscribe' | 'other' | null {}const messageListeners: Array<(event: { data: unknown }) => void> = [];-let resolveShutdownReceived!: () => void;-const shutdownReceived = new Promise<void>((resolve) => {- resolveShutdownReceived = resolve;-});+const { promise: shutdownReceived, resolve: resolveShutdownReceived } =+ Promise.withResolvers<void>();function deliverFromParent(data: unknown): void {if ((data as { type?: unknown }).type === 'shutdown') {diff --git a/packages/desktop/tests/utility/pty-host-startup-trace.test.ts b/packages/desktop/tests/utility/pty-host-startup-trace.test.tsindex 71fae5da3..5fc239a9b 100644--- a/packages/desktop/tests/utility/pty-host-startup-trace.test.ts+++ b/packages/desktop/tests/utility/pty-host-startup-trace.test.ts@@ -384,14 +384,8 @@ test('a failing harness scenario snapshots its live session before releasing it'test('a hard timeout snapshots the live session of the scenario still in flight', async () => {vi.mocked(execFileSync).mockReturnValue(`${SHELL}\r\n`);const scenario = harnessScenario('shell still starting');- let proceed = () => {};- const blocked = new Promise<void>((resolve) => {- proceed = resolve;- });- let started = () => {};- const inFlight = new Promise<void>((resolve) => {- started = resolve;- });+ const { promise: blocked, resolve: proceed } = Promise.withResolvers<void>();+ const { promise: inFlight, resolve: started } = Promise.withResolvers<void>();const running = scenario.runner.run('shell still starting', async () => {scenario.openSession().output(PROLOGUE);started();diff --git a/packages/desktop/tests/utility/server-entry.test.ts b/packages/desktop/tests/utility/server-entry.test.tsindex af3b5ba76..cbada9f12 100644--- a/packages/desktop/tests/utility/server-entry.test.ts+++ b/packages/desktop/tests/utility/server-entry.test.ts@@ -1404,14 +1404,8 @@ function startUtilityWhoseBootPreparationWaits(env: MockEnv): {reachedBootPreparation: Promise<void>;finishBootPreparation: () => void;} {- let enterBootPreparation!: () => void;- let finishBootPreparation!: () => void;- const entered = new Promise<void>((resolve) => {- enterBootPreparation = resolve;- });- const finished = new Promise<void>((resolve) => {- finishBootPreparation = resolve;- });+ const { promise: entered, resolve: enterBootPreparation } = Promise.withResolvers<void>();+ const { promise: finished, resolve: finishBootPreparation } = Promise.withResolvers<void>();const bootServer = vi.fn(() =>Promise.resolve({port: 51289,@@ -1478,10 +1472,7 @@ describe('setupUtility honours a shutdown that arrives before its init reaches bfunction startUtilityWhoseServerStartWaits(env: MockEnv) {const destroy = vi.fn(() => Promise.resolve());- let enterServerStart!: () => void;- const reachedServerStart = new Promise<void>((resolve) => {- enterServerStart = resolve;- });+ const { promise: reachedServerStart, resolve: enterServerStart } = Promise.withResolvers<void>();let settleServerStart!: (failure?: Error) => void;const serverStarted = new Promise<void>((resolve, reject) => {settleServerStart = (failure) => (failure === undefined ? resolve() : reject(failure));@@ -1558,12 +1549,11 @@ describe('setupUtility repeated shutdown', () => {test('a second shutdown resolves only after the first has finished draining the server', async () => {const env = buildEnv();let finishDestroy!: () => void;- const destroy = vi.fn(- () =>- new Promise<void>((resolve) => {- finishDestroy = resolve;- }),- );+ const destroy = vi.fn(() => {+ const { promise, resolve } = Promise.withResolvers<void>();+ finishDestroy = resolve;+ return promise;+ });const handle = setupUtility({parentPort: env.parentPort,importServer: () =>diff --git a/packages/desktop/tests/utility/windows-os-state-proof-acceptance.test.ts b/packages/desktop/tests/utility/windows-os-state-proof-acceptance.test.tsindex aa7702726..051bcc109 100644--- a/packages/desktop/tests/utility/windows-os-state-proof-acceptance.test.ts+++ b/packages/desktop/tests/utility/windows-os-state-proof-acceptance.test.ts@@ -231,10 +231,7 @@ vi.mock('../support/windows-os-state.test-helper.ts', async (importOriginal) =>});function createScenario(queryMode: QueryMode, options: ScenarioOptions = {}) {- let resolveQuerySpawned: () => void = () => undefined;- const querySpawned = new Promise<void>((resolve) => {- resolveQuerySpawned = resolve;- });+ const { promise: querySpawned, resolve: resolveQuerySpawned } = Promise.withResolvers<void>();scenario = {queryMode,directCli: options.directCli ?? false,diff --git a/packages/server/src/acp/held-install-registry.test-helper.ts b/packages/server/src/acp/held-install-registry.test-helper.tsindex 8683bd19b..0c6f79056 100644--- a/packages/server/src/acp/held-install-registry.test-helper.ts+++ b/packages/server/src/acp/held-install-registry.test-helper.ts@@ -229,10 +229,7 @@ export async function withHeldInstallRegistry(const openers: Array<() => void> = [];const gate = (): { open: () => void; opened: Promise<void> } => {- let open = (): void => {};- const opened = new Promise<void>((resolve) => {- open = resolve;- });+ const { promise: opened, resolve: open } = Promise.withResolvers<void>();openers.push(open);return { open, opened };};diff --git a/packages/server/src/acp/launch.test.ts b/packages/server/src/acp/launch.test.tsindex 2bd6f9cb9..4dd01ff1d 100644--- a/packages/server/src/acp/launch.test.ts+++ b/packages/server/src/acp/launch.test.ts@@ -472,10 +472,7 @@ describe('ensureBinaryInstalled', () => {const first = buildBinaryTarball(firstSource, 'first');const second = buildBinaryTarball(secondSource, 'second');let arrivals = 0;- let releaseCommit!: () => void;- const commitGate = new Promise<void>((resolve) => {- releaseCommit = resolve;- });+ const { promise: commitGate, resolve: releaseCommit } = Promise.withResolvers<void>();const beforeCommit = async () => {arrivals += 1;if (arrivals === 2) releaseCommit();diff --git a/packages/server/src/acp/managed-runtime.test.ts b/packages/server/src/acp/managed-runtime.test.tsindex 9d010b764..99375ddd8 100644--- a/packages/server/src/acp/managed-runtime.test.ts+++ b/packages/server/src/acp/managed-runtime.test.ts@@ -196,10 +196,7 @@ describe('ensureManagedRuntime', () => {const first = buildTarball(firstStage, 'node-vFIRST', ['bin/node', 'bin/npx'], 'first');const second = buildTarball(secondStage, 'node-vSECOND', ['bin/node', 'bin/npx'], 'second');let arrivals = 0;- let releaseCommit!: () => void;- const commitGate = new Promise<void>((resolve) => {- releaseCommit = resolve;- });+ const { promise: commitGate, resolve: releaseCommit } = Promise.withResolvers<void>();const beforeCommit = async () => {arrivals += 1;if (arrivals === 2) releaseCommit();diff --git a/packages/server/src/api-artifact-flush-settlement.test.ts b/packages/server/src/api-artifact-flush-settlement.test.tsindex b517740a8..88996bfab 100644--- a/packages/server/src/api-artifact-flush-settlement.test.ts+++ b/packages/server/src/api-artifact-flush-settlement.test.ts@@ -19,14 +19,8 @@ test('test flush waits for accepted artifact attribution before acknowledging selet server: BootedServer | undefined;let gated = false;let released = false;- let release!: () => void;- let entered!: () => void;- const gate = new Promise<void>((resolve) => {- release = resolve;- });- const started = new Promise<void>((resolve) => {- entered = resolve;- });+ const { promise: gate, resolve: release } = Promise.withResolvers<void>();+ const { promise: started, resolve: entered } = Promise.withResolvers<void>();const gitFlushes: boolean[] = [];const create = persistence.createPersistenceExtension;vi.spyOn(persistence, 'createPersistenceExtension').mockImplementation((...args) => {@@ -64,10 +58,7 @@ test('test flush waits for accepted artifact attribution before acknowledging seexpect(write.status, write.body).toBe(200);await started;expect(__formatContributorsForTests()).toContain('templates/.ok/templates/example');- let received!: () => void;- const requestReceived = new Promise<void>((resolve) => {- received = resolve;- });+ const { promise: requestReceived, resolve: received } = Promise.withResolvers<void>();server.httpServer.prependListener('request', (req) => {if (req.url === '/api/test-flush-git') received();});@@ -100,18 +91,9 @@ test('shared settlement joins the separate skill-file attribution flush', async);let server: BootedServer | undefined;let tracked = false;- let release!: () => void;- let commitEntered!: () => void;- let joinEntered!: () => void;- const commitGate = new Promise<void>((resolve) => {- release = resolve;- });- const commitStarted = new Promise<void>((resolve) => {- commitEntered = resolve;- });- const joinStarted = new Promise<void>((resolve) => {- joinEntered = resolve;- });+ const { promise: commitGate, resolve: release } = Promise.withResolvers<void>();+ const { promise: commitStarted, resolve: commitEntered } = Promise.withResolvers<void>();+ const { promise: joinStarted, resolve: joinEntered } = Promise.withResolvers<void>();let joinCompleted = false;const commit = shadowRepo.commitWipFromTree;vi.spyOn(shadowRepo, 'commitWipFromTree').mockImplementation(async (...args) => {diff --git a/packages/server/src/api-derived-index-ready-gate.test.ts b/packages/server/src/api-derived-index-ready-gate.test.tsindex 6d4ef33c0..521013406 100644--- a/packages/server/src/api-derived-index-ready-gate.test.ts+++ b/packages/server/src/api-derived-index-ready-gate.test.ts@@ -147,14 +147,9 @@ describe('derived-index API readiness gate', () => {join(sourceSkillDir, 'SKILL.md'),'---\nname: old-skill\ndescription: Use when testing moves.\n---\n\n# Old skill\n',);- let releaseProjection!: () => void;- const projectionBarrier = new Promise<void>((resolve) => {- releaseProjection = resolve;- });- let projectionStarted!: () => void;- const started = new Promise<void>((resolve) => {- projectionStarted = resolve;- });+ const { promise: projectionBarrier, resolve: releaseProjection } =+ Promise.withResolvers<void>();+ const { promise: started, resolve: projectionStarted } = Promise.withResolvers<void>();const recordDirectMutations = vi.fn(async () => {projectionStarted();await projectionBarrier;diff --git a/packages/server/src/api-derived-index-warmup-durability.test.ts b/packages/server/src/api-derived-index-warmup-durability.test.tsindex 148d68587..446808539 100644--- a/packages/server/src/api-derived-index-warmup-durability.test.ts+++ b/packages/server/src/api-derived-index-warmup-durability.test.ts@@ -72,9 +72,8 @@ describe('agent writes while the derived index is still starting (PRD-8839)', ()await git.init();await git.addConfig('user.name', 'Test User');await git.addConfig('user.email', '[email protected]');- const startupStalled = new Promise<void>((resolve) => {- releaseStartup = resolve;- });+ const { promise: startupStalled, resolve } = Promise.withResolvers<void>();+ releaseStartup = resolve;const rebuild = vi.spyOn(BacklinkIndex.prototype, 'rebuildFromDisk').mockReturnValue(startupStalled);diff --git a/packages/server/src/api-document-list-ready-gate.test.ts b/packages/server/src/api-document-list-ready-gate.test.tsindex ced541e16..fb2c4c233 100644--- a/packages/server/src/api-document-list-ready-gate.test.ts+++ b/packages/server/src/api-document-list-ready-gate.test.ts@@ -45,10 +45,7 @@ describe('handleDocumentList ready gating', () => {writeFileSync(join(tmp, 'notes.md'), '# Notes\n', 'utf-8');const fileIndex = new Map<string, FileIndexEntry>();- let resolveReady!: () => void;- const ready = new Promise<void>((res) => {- resolveReady = res;- });+ const { promise: ready, resolve: resolveReady } = Promise.withResolvers<void>();const hocuspocus = new Hocuspocus({ quiet: true });const ext = createApiExtension({diff --git a/packages/server/src/api-extension.ts b/packages/server/src/api-extension.tsindex d00a51dbd..90dc01618 100644--- a/packages/server/src/api-extension.ts+++ b/packages/server/src/api-extension.ts@@ -2590,10 +2590,8 @@ export function createApiExtension(options: ApiExtensionOptions): Extension & {let pending = Promise.resolve();return async function runSerialized<T>(task: () => Promise<T>): Promise<T> {const waitFor = pending;- let release = () => {};- pending = new Promise<void>((resolve) => {- release = resolve;- });+ const { promise, resolve: release } = Promise.withResolvers<void>();+ pending = promise;await waitFor;try {return await task();diff --git a/packages/server/src/api-search.test.ts b/packages/server/src/api-search.test.tsindex 421e51104..6bf6d00b7 100644--- a/packages/server/src/api-search.test.ts+++ b/packages/server/src/api-search.test.ts@@ -850,10 +850,7 @@ describe('GET /api/search — cold-start readiness', () => {writeFileSync(join(dir, 'architecture/overview.md'), '# System Overview\n', 'utf-8');const fileIndex = buildFileIndex(dir);- let resolveReady: () => void = () => {};- const ready = new Promise<void>((resolve) => {- resolveReady = resolve;- });+ const { promise: ready, resolve: resolveReady } = Promise.withResolvers<void>();const ext = createApiExtension({hocuspocus: {} as unknown as Parameters<typeof createApiExtension>[0]['hocuspocus'],sessionManager: {} as unknown as Parameters<typeof createApiExtension>[0]['sessionManager'],@@ -893,10 +890,7 @@ describe('GET /api/search — cold-start readiness', () => {writeFileSync(join(dir, 'guide.md'), '# Guide\n', 'utf-8');const fileIndex = buildFileIndex(dir);- let rejectReady: (err: Error) => void = () => {};- const ready = new Promise<void>((_resolve, reject) => {- rejectReady = reject;- });+ const { promise: ready, reject: rejectReady } = Promise.withResolvers<void>();ready.catch(() => {});const ext = createApiExtension({hocuspocus: {} as unknown as Parameters<typeof createApiExtension>[0]['hocuspocus'],diff --git a/packages/server/src/boot-shadow-housekeeping-deferral.test.ts b/packages/server/src/boot-shadow-housekeeping-deferral.test.tsindex 84f6da8f5..fda7391bc 100644--- a/packages/server/src/boot-shadow-housekeeping-deferral.test.ts+++ b/packages/server/src/boot-shadow-housekeeping-deferral.test.ts@@ -6,10 +6,7 @@ import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';import { configureTestGitRepository } from '../../../test-support/configure-git-fixture.test-helper.ts';function makeGate() {- let release!: () => void;- const held = new Promise<void>((r) => {- release = r;- });+ const { promise: held, resolve: release } = Promise.withResolvers<void>();return { held, release, calls: 0, readyHadSettledAtCall: null as boolean | null };}diff --git a/packages/server/src/content/generated-artifact.test.ts b/packages/server/src/content/generated-artifact.test.tsindex 30136311e..6f83df309 100644--- a/packages/server/src/content/generated-artifact.test.ts+++ b/packages/server/src/content/generated-artifact.test.ts@@ -172,9 +172,9 @@ describe('writeGeneratedArtifact', () => {const { env, rec } = harness();let release!: () => void;env.writeDisk = async () => {- await new Promise<void>((resolve) => {- release = resolve;- });+ const { promise, resolve } = Promise.withResolvers<void>();+ release = resolve;+ await promise;rec.disk.push({ absPath: WRITE.absPath, markdown: WRITE.markdown });};diff --git a/packages/server/src/derived-document-index.test.ts b/packages/server/src/derived-document-index.test.tsindex 4f941621f..68e8f6d26 100644--- a/packages/server/src/derived-document-index.test.ts+++ b/packages/server/src/derived-document-index.test.ts@@ -29,21 +29,8 @@ interface Rig {index: DerivedDocumentIndex;}-interface Deferred {- promise: Promise<void>;- resolve: () => void;-}-const cleanups: Array<() => Promise<void>> = [];-function createDeferred(): Deferred {- let resolve!: () => void;- const promise = new Promise<void>((settle) => {- resolve = settle;- });- return { promise, resolve };-}-function createRig(getLocalTargetInventory?: () => WatcherLocalTargetInventory | null,onRecoveredFileTarget?: (relativePath: string, exists: boolean) => void,@@ -496,8 +483,8 @@ describe('DerivedDocumentIndex', () => {test('refreshContentScope gates later mutations and queries until both replacements settle', async () => {const rig = createRig();await settleStartup(rig);- const backlinksReplacement = createDeferred();- const tagsReplacement = createDeferred();+ const backlinksReplacement = Promise.withResolvers<void>();+ const tagsReplacement = Promise.withResolvers<void>();vi.spyOn(BacklinkIndex.prototype, 'reconcileWithDisk').mockImplementationOnce(() =>backlinksReplacement.promise.then(() => ({added: 0,@@ -883,7 +870,7 @@ describe('DerivedDocumentIndex', () => {test('repeated close calls wait for the same dependency drain', async () => {const rig = createRig();await settleStartup(rig);- const tagClose = createDeferred();+ const tagClose = Promise.withResolvers<void>();const closeTagIndex = vi.spyOn(TagIndex.prototype, 'close').mockReturnValueOnce(tagClose.promise);@@ -906,7 +893,7 @@ describe('DerivedDocumentIndex', () => {test('close rejects an already-admitted queued disk mutation before it can arm a timer', async () => {vi.useFakeTimers();- const deferredSave = createDeferred();+ const deferredSave = Promise.withResolvers<void>();const backlinkSave = vi.spyOn(BacklinkIndex.prototype, 'saveToDisk');const tagSave = vi.spyOn(TagIndex.prototype, 'saveToDisk');const indexLog = getLogger('derived-document-index');@@ -945,7 +932,7 @@ describe('DerivedDocumentIndex', () => {test('close drains a debounced save already enqueued behind in-flight work', async () => {vi.useFakeTimers();- const deferredSave = createDeferred();+ const deferredSave = Promise.withResolvers<void>();const backlinkSave = vi.spyOn(BacklinkIndex.prototype, 'saveToDisk');const rig = createRig();await settleStartup(rig);diff --git a/packages/server/src/derived-document-index.ts b/packages/server/src/derived-document-index.tsindex a59cb1a83..98969dda9 100644--- a/packages/server/src/derived-document-index.ts+++ b/packages/server/src/derived-document-index.ts@@ -135,21 +135,8 @@ export interface DerivedDocumentIndexOptions {onRecoveredFileTarget?: (relativePath: string, exists: boolean) => void;}-interface Deferred {- promise: Promise<void>;- resolve: () => void;-}-interface BranchTransition extends DerivedDocumentIndexBranchTransition {- barrier: Deferred;-}--function createDeferred(): Deferred {- let resolve!: () => void;- const promise = new Promise<void>((settle) => {- resolve = settle;- });- return { promise, resolve };+ barrier: PromiseWithResolvers<void>;}class DerivedDocumentIndexClosedError extends Error {@@ -190,8 +177,8 @@ export class DerivedDocumentIndexprivate readonly getLocalTargetInventory: () => WatcherLocalTargetInventory | null;private readonly signalChannel: (channel: DerivedDocumentRelationChannel) => void;private readonly onRecoveredFileTarget?: (relativePath: string, exists: boolean) => void;- private readonly startupAdmission = createDeferred();- private readonly readyBarrier = createDeferred();+ private readonly startupAdmission = Promise.withResolvers<void>();+ private readonly readyBarrier = Promise.withResolvers<void>();private tail: Promise<void> = Promise.resolve();private saveTimer: ReturnType<typeof setTimeout> | null = null;private localTargetRebuildRetryTimer: ReturnType<typeof setTimeout> | null = null;@@ -327,7 +314,7 @@ export class DerivedDocumentIndexif (this.branchTransition) {throw new Error(`Derived document index branch switch already active`);}- const transition: BranchTransition = { branch, barrier: createDeferred() };+ const transition: BranchTransition = { branch, barrier: Promise.withResolvers<void>() };this.liveUpdateToken++;this.branchTransition = transition;this.cancelScheduledSave();diff --git a/packages/server/src/embeddings/semantic-search-service.test.ts b/packages/server/src/embeddings/semantic-search-service.test.tsindex 33d7c7179..977c4913e 100644--- a/packages/server/src/embeddings/semantic-search-service.test.ts+++ b/packages/server/src/embeddings/semantic-search-service.test.ts@@ -453,14 +453,8 @@ describe('SemanticSearchService', () => {const info = vi.spyOn(getLogger('embeddings'), 'info');try {const inner = createConceptEmbedder({ concepts });- let release: (() => void) | null = null;- let signalEntered: (() => void) | null = null;- const enteredEmbed = new Promise<void>((r) => {- signalEntered = r;- });- const gate = new Promise<void>((r) => {- release = r;- });+ const { promise: enteredEmbed, resolve: signalEntered } = Promise.withResolvers<void>();+ const { promise: gate, resolve: release } = Promise.withResolvers<void>();let blockNextDocEmbed = false;const gated: Embedder = {providerId: inner.providerId,@@ -469,7 +463,7 @@ describe('SemanticSearchService', () => {async embed(texts, opts) {if (opts.role === 'document' && blockNextDocEmbed) {blockNextDocEmbed = false;- signalEntered?.();+ signalEntered();await gate;}return inner.embed(texts, opts);@@ -504,7 +498,7 @@ describe('SemanticSearchService', () => {},'[embeddings] resetting embedder',);- release?.();+ release();await pending;expect(info).toHaveBeenCalledWith({diff --git a/packages/server/src/file-watcher-freshness.test.ts b/packages/server/src/file-watcher-freshness.test.tsindex 125137527..5e0f9a27f 100644--- a/packages/server/src/file-watcher-freshness.test.ts+++ b/packages/server/src/file-watcher-freshness.test.ts@@ -541,10 +541,7 @@ describe('timed freshness re-check', () => {test('a full re-check requested while a timed recovery is queued runs that recovery in full', async () => {settleTimestamps();const double = createWatcherDouble();- let releaseQueue: () => void = () => {};- const queueHeld = new Promise<void>((resolve) => {- releaseQueue = resolve;- });+ const { promise: queueHeld, resolve: releaseQueue } = Promise.withResolvers<void>();handle = await startWatcher(contentDir,async (event) => {diff --git a/packages/server/src/head-watcher.test.ts b/packages/server/src/head-watcher.test.tsindex 247af4e19..2c610ca60 100644--- a/packages/server/src/head-watcher.test.ts+++ b/packages/server/src/head-watcher.test.ts@@ -163,10 +163,7 @@ describe('startHeadWatcher batch serialization', () => {git('branch second');let dispatch!: (rawPath: string) => void;- let releaseFirst!: () => void;- const firstCanSettle = new Promise<void>((resolve) => {- releaseFirst = resolve;- });+ const { promise: firstCanSettle, resolve: releaseFirst } = Promise.withResolvers<void>();const branches: Array<string | null> = [];let activeCallbacks = 0;let maxActiveCallbacks = 0;diff --git a/packages/server/src/link-preview/preview-cache.test.ts b/packages/server/src/link-preview/preview-cache.test.tsindex d4da3dcd3..12ba5abed 100644--- a/packages/server/src/link-preview/preview-cache.test.ts+++ b/packages/server/src/link-preview/preview-cache.test.ts@@ -129,10 +129,7 @@ describe('LinkPreviewCache', () => {test('coalesces concurrent identical lookups into a single compute (single-flight)', async () => {const cache = makeCache();await cache.init();- let resolveGate!: (o: LinkPreviewOutcome) => void;- const gate = new Promise<LinkPreviewOutcome>((resolve) => {- resolveGate = resolve;- });+ const { promise: gate, resolve: resolveGate } = Promise.withResolvers<LinkPreviewOutcome>();let calls = 0;const compute = () => {calls += 1;diff --git a/packages/server/src/local-ops/subprocess-lifetime.test.ts b/packages/server/src/local-ops/subprocess-lifetime.test.tsindex 1e2b52d46..08313725b 100644--- a/packages/server/src/local-ops/subprocess-lifetime.test.ts+++ b/packages/server/src/local-ops/subprocess-lifetime.test.ts@@ -46,10 +46,7 @@ interface OwnedRun {async function openReleaseChannel(): Promise<ReleaseChannel> {const held = new Set<{ socket: Socket; closed: Promise<void> }>();let releasing = false;- let connect!: (descendant: Descendant) => void;- const descendant = new Promise<Descendant>((resolve) => {- connect = resolve;- });+ const { promise: descendant, resolve: connect } = Promise.withResolvers<Descendant>();const server = createServer((socket) => {let open = true;const closed = new Promise<void>((resolve) => {diff --git a/packages/server/src/local-ops/subprocess-lifetime.ts b/packages/server/src/local-ops/subprocess-lifetime.tsindex 28aa2cf7a..7be9c233a 100644--- a/packages/server/src/local-ops/subprocess-lifetime.ts+++ b/packages/server/src/local-ops/subprocess-lifetime.ts@@ -31,10 +31,7 @@ export class LocalOpSubprocessLifetime {begin(): () => void {this.assertOpen();- let finish!: () => void;- const completion = new Promise<void>((resolve) => {- finish = resolve;- });+ const { promise: completion, resolve: finish } = Promise.withResolvers<void>();this.operations.add(completion);return () => {this.operations.delete(completion);diff --git a/packages/server/src/parcel-drop-notice.test.ts b/packages/server/src/parcel-drop-notice.test.tsindex d6e01889f..02ee2587e 100644--- a/packages/server/src/parcel-drop-notice.test.ts+++ b/packages/server/src/parcel-drop-notice.test.ts@@ -441,10 +441,7 @@ async function watchContent(}function deferred(): { promise: Promise<void>; release: () => void } {- let release!: () => void;- const promise = new Promise<void>((resolve) => {- release = resolve;- });+ const { promise, resolve: release } = Promise.withResolvers<void>();releaseLatches.push(release);return { promise, release };}@@ -3740,10 +3737,7 @@ test('alias-only recovery publishes a local-targets stateless frame from the reaexpect(systemDoc).toBeDefined();if (!systemDoc) throw new Error('system document unavailable');const originalBroadcast = systemDoc.broadcastStateless.bind(systemDoc);- let resolveFrame!: () => void;- const frame = new Promise<void>((resolve) => {- resolveFrame = resolve;- });+ const { promise: frame, resolve: resolveFrame } = Promise.withResolvers<void>();let observingNotice = false;const outbound = vi.spyOn(systemDoc, 'broadcastStateless').mockImplementation((payload) => {const result = originalBroadcast(payload);@@ -3861,10 +3855,7 @@ test('overlapping content and HEAD notices settle the owned Git branch and aliasexpect(await inventoryAuditBroken(server.port, 'linked.md')).toBe(true);const broadcaster = server.serverInstance.cc1Broadcaster;const originalEmit = broadcaster.emitBranchSwitched.bind(broadcaster);- let resolveBranch!: (branch: string) => void;- const branchSettled = new Promise<string>((resolve) => {- resolveBranch = resolve;- });+ const { promise: branchSettled, resolve: resolveBranch } = Promise.withResolvers<string>();vi.spyOn(broadcaster, 'emitBranchSwitched').mockImplementation((branch) => {originalEmit(branch);resolveBranch(branch);diff --git a/packages/server/src/persistence-flush-during-commit.test.ts b/packages/server/src/persistence-flush-during-commit.test.tsindex 9abea6461..1c085e76c 100644--- a/packages/server/src/persistence-flush-during-commit.test.ts+++ b/packages/server/src/persistence-flush-during-commit.test.ts@@ -97,17 +97,9 @@ test.each([context: {},} as never);- let entered = () => {};- let release = () => {};- const reachedCommit = new Promise<void>((resolve) => {- entered = resolve;- });- commitGate.next = {- entered,- release: new Promise<void>((resolve) => {- release = resolve;- }),- };+ const { promise: reachedCommit, resolve: entered } = Promise.withResolvers<void>();+ const { promise: released, resolve: release } = Promise.withResolvers<void>();+ commitGate.next = { entered, release: released };recordContributor('notes', EARLIER.id, EARLIER.name, EARLIER.id);replaceBody(document, 'first edit');diff --git a/packages/server/src/persistence-staleness-watchdog.test.ts b/packages/server/src/persistence-staleness-watchdog.test.tsindex 28604f80c..f44306dc2 100644--- a/packages/server/src/persistence-staleness-watchdog.test.ts+++ b/packages/server/src/persistence-staleness-watchdog.test.ts@@ -367,10 +367,7 @@ describe('exclusions', () => {});test('dispose drains an in-flight sweep and stops it before the next doc', async () => {- let releaseFirstStore: (() => void) | undefined;- const gate = new Promise<void>((resolve) => {- releaseFirstStore = resolve;- });+ const { promise: gate, resolve: releaseFirstStore } = Promise.withResolvers<void>();const blockingRig = makeRig({forceStore: async (_document, documentName) => {blockingRig.forceCalls.push(documentName);@@ -383,13 +380,13 @@ describe('exclusions', () => {const sweepPromise = blockingRig.watchdog.sweep();const disposePromise = blockingRig.watchdog.dispose();- releaseFirstStore?.();+ releaseFirstStore();await disposePromise;await sweepPromise;expect(blockingRig.forceCalls).toEqual(['doc-a']);} finally {- releaseFirstStore?.();+ releaseFirstStore();await blockingRig.watchdog.dispose();}});diff --git a/packages/server/src/server-factory.test.ts b/packages/server/src/server-factory.test.tsindex fc73e2099..98bdcdf44 100644--- a/packages/server/src/server-factory.test.ts+++ b/packages/server/src/server-factory.test.ts@@ -472,12 +472,11 @@ describe('createServer() — derived-index branch lifecycle', () => {let rejectBegin!: (error: Error) => void;const beginBranch = vi.spyOn(DerivedDocumentIndex.prototype, 'beginBranchSwitch')- .mockImplementationOnce(- () =>- new Promise<never>((_resolve, reject) => {- rejectBegin = reject;- }),- );+ .mockImplementationOnce(() => {+ const { promise, reject } = Promise.withResolvers<never>();+ rejectBegin = reject;+ return promise;+ });const abort = vi.spyOn(DerivedDocumentIndex.prototype, 'abortBranchSwitch');await git.checkout('feature');@@ -1619,10 +1618,7 @@ describe('createServer().destroy() — graceful shutdown flush', () => {await server.ready;const coordinator = beginStartup.mock.instances[0] as DerivedDocumentIndex;beginStartup.mockRestore();- let releaseTagClose!: () => void;- const tagCloseReleased = new Promise<void>((resolve) => {- releaseTagClose = resolve;- });+ const { promise: tagCloseReleased, resolve: releaseTagClose } = Promise.withResolvers<void>();let tagCloseEntered = false;const tagCloseImplementation = TagIndex.prototype.close;const tagClose = vi.spyOn(TagIndex.prototype, 'close').mockImplementation(async function (@@ -4524,14 +4520,8 @@ describe('createServer() — generated index wiring', () => {test('server readiness settles before the boot index sweep starts planning', async () => {writeDoc('existing.md', 'Existing at boot', 'note');- let enterPlanning!: () => void;- const planningEntered = new Promise<void>((resolve) => {- enterPlanning = resolve;- });- let releasePlanning!: () => void;- const planningBarrier = new Promise<void>((resolve) => {- releasePlanning = resolve;- });+ const { promise: planningEntered, resolve: enterPlanning } = Promise.withResolvers<void>();+ const { promise: planningBarrier, resolve: releasePlanning } = Promise.withResolvers<void>();let readySettled = false;const activeServer = await startServerWithIndexHooks({@@ -4588,14 +4578,9 @@ describe('createServer() — generated index wiring', () => {const rootMtime = statSync(indexPath()).mtimeMs;const betaMtime = statSync(indexPathAt('beta')).mtimeMs;- let firstWriteFinished!: () => void;- const firstWrite = new Promise<void>((resolve) => {- firstWriteFinished = resolve;- });- let releaseFirstWrite!: () => void;- const firstWriteBarrier = new Promise<void>((resolve) => {- releaseFirstWrite = resolve;- });+ const { promise: firstWrite, resolve: firstWriteFinished } = Promise.withResolvers<void>();+ const { promise: firstWriteBarrier, resolve: releaseFirstWrite } =+ Promise.withResolvers<void>();let paused = false;const activeServer = await startServerWithIndexHooks({@@ -4640,22 +4625,11 @@ describe('createServer() — generated index wiring', () => {test('boot sweep readiness waits for live requests coalesced behind it', async () => {writeDoc('anchor.md', 'Anchor', 'note');- let firstPassEntered!: () => void;- const firstPassStarted = new Promise<void>((resolve) => {- firstPassEntered = resolve;- });- let releaseFirstPass!: () => void;- const firstPassBarrier = new Promise<void>((resolve) => {- releaseFirstPass = resolve;- });- let coordinatorIdle!: () => void;- const coordinatorSettled = new Promise<void>((resolve) => {- coordinatorIdle = resolve;- });- let blockedKickObserved!: () => void;- const followupDeferredBySingleFlight = new Promise<void>((resolve) => {- blockedKickObserved = resolve;- });+ const { promise: firstPassStarted, resolve: firstPassEntered } = Promise.withResolvers<void>();+ const { promise: firstPassBarrier, resolve: releaseFirstPass } = Promise.withResolvers<void>();+ const { promise: coordinatorSettled, resolve: coordinatorIdle } = Promise.withResolvers<void>();+ const { promise: followupDeferredBySingleFlight, resolve: blockedKickObserved } =+ Promise.withResolvers<void>();let passCount = 0;const activeServer = await startServerWithIndexHooks({@@ -4701,18 +4675,9 @@ describe('createServer() — generated index wiring', () => {test('destroy cancels and drains an in-flight generated-index write', async () => {writeDoc('deep/note.md', 'Deep note', 'note');- let writePaused!: () => void;- const firstWritePaused = new Promise<void>((resolve) => {- writePaused = resolve;- });- let releaseWrite!: () => void;- const writeBarrier = new Promise<void>((resolve) => {- releaseWrite = resolve;- });- let abortObserved!: () => void;- const regenerationAborted = new Promise<void>((resolve) => {- abortObserved = resolve;- });+ const { promise: firstWritePaused, resolve: writePaused } = Promise.withResolvers<void>();+ const { promise: writeBarrier, resolve: releaseWrite } = Promise.withResolvers<void>();+ const { promise: regenerationAborted, resolve: abortObserved } = Promise.withResolvers<void>();let blocked = false;const activeServer = await startServerWithIndexHooks({diff --git a/packages/server/src/server-factory.ts b/packages/server/src/server-factory.tsindex 953f1f08b..0c00511d6 100644--- a/packages/server/src/server-factory.ts+++ b/packages/server/src/server-factory.ts@@ -1302,12 +1302,11 @@ export function createServer(options: ServerOptions): ServerInstance {let forceUnloadDocument!: (document: Document, isCurrent?: () => boolean) => Promise<void>;let defaultShouldUnloadDocument!: (document: Document) => boolean;- let resolveReady!: () => void;- let rejectReady!: (err: unknown) => void;- const ready = new Promise<void>((res, rej) => {- resolveReady = res;- rejectReady = rej;- });+ const {+ promise: ready,+ resolve: resolveReady,+ reject: rejectReady,+ } = Promise.withResolvers<void>();let readyForNotices = false;void ready.then(() => {@@ -1353,10 +1352,8 @@ export function createServer(options: ServerOptions): ServerInstance {});const offlineRemovalsReconciled = Promise.withResolvers<void>();- let resolveBranchScopeAligned!: () => void;- const branchScopeAligned = new Promise<void>((res) => {- resolveBranchScopeAligned = res;- });+ const { promise: branchScopeAligned, resolve: resolveBranchScopeAligned } =+ Promise.withResolvers<void>();const BRANCH_SCOPE_GATE_TIMEOUT_MS = 10_000;@@ -1410,10 +1407,8 @@ export function createServer(options: ServerOptions): ServerInstance {let generatedIndexSweepSettled = false;let generatedIndexBootSweepCount = 0;- let resolveGeneratedIndexSweep!: (result: GeneratedIndexSweepResult) => void;- const generatedIndexSweepReady = new Promise<GeneratedIndexSweepResult>((resolve) => {- resolveGeneratedIndexSweep = resolve;- });+ const { promise: generatedIndexSweepReady, resolve: resolveGeneratedIndexSweep } =+ Promise.withResolvers<GeneratedIndexSweepResult>();function settleGeneratedIndexSweep(result: GeneratedIndexSweepResult): void {if (generatedIndexSweepSettled) return;diff --git a/packages/server/src/shadow-drain-on-destroy.test.ts b/packages/server/src/shadow-drain-on-destroy.test.tsindex 18ebd65cb..853882eb3 100644--- a/packages/server/src/shadow-drain-on-destroy.test.ts+++ b/packages/server/src/shadow-drain-on-destroy.test.ts@@ -39,10 +39,7 @@ describe('createServer() — shadow mutator drain on destroy', () => {let warmupStarted: Promise<{ promise: Promise<string> }>;function deferred(): { promise: Promise<void>; resolve: () => void } {- let resolve!: () => void;- const promise = new Promise<void>((r) => {- resolve = r;- });+ const { promise, resolve } = Promise.withResolvers<void>();heldReleases.push(resolve);return { promise, resolve };}diff --git a/packages/server/src/shadow-op-gate.test.ts b/packages/server/src/shadow-op-gate.test.tsindex f1507852b..7de5d7bde 100644--- a/packages/server/src/shadow-op-gate.test.ts+++ b/packages/server/src/shadow-op-gate.test.ts@@ -1,21 +1,13 @@import { describe, expect, test } from 'vitest';import { releaseShadowOpGate, ShadowOpGate, shadowOpGateFor } from './shadow-op-gate.ts';-function deferred(): { promise: Promise<void>; resolve: () => void } {- let resolve!: () => void;- const promise = new Promise<void>((r) => {- resolve = r;- });- return { promise, resolve };-}-const tick = () => new Promise((r) => setTimeout(r, 0));describe('ShadowOpGate (forced interleavings, deterministic)', () => {test('mutators run concurrently with each other', async () => {const gate = new ShadowOpGate();- const a = deferred();- const b = deferred();+ const a = Promise.withResolvers<void>();+ const b = Promise.withResolvers<void>();let aStarted = false;let bStarted = false;const pa = gate.withMutator(async () => {@@ -38,7 +30,7 @@ describe('ShadowOpGate (forced interleavings, deterministic)', () => {test('exclusive waits for an in-flight mutator to drain before running', async () => {const gate = new ShadowOpGate();- const hold = deferred();+ const hold = Promise.withResolvers<void>();let gcRan = false;const mutator = gate.withMutator(() => hold.promise);await tick();@@ -56,7 +48,7 @@ describe('ShadowOpGate (forced interleavings, deterministic)', () => {test('mutators queue while exclusive holds, run after release', async () => {const gate = new ShadowOpGate();- const gcHold = deferred();+ const gcHold = Promise.withResolvers<void>();let mutatorRan = false;const gc = gate.withExclusive(() => gcHold.promise);await tick();@@ -74,7 +66,7 @@ describe('ShadowOpGate (forced interleavings, deterministic)', () => {test('new top-level mutator is not blocked by a waiting (not holding) exclusive', async () => {const gate = new ShadowOpGate();- const mutatorHold = deferred();+ const mutatorHold = Promise.withResolvers<void>();const firstMutator = gate.withMutator(() => mutatorHold.promise);await tick();let gcRan = false;@@ -96,7 +88,7 @@ describe('ShadowOpGate (forced interleavings, deterministic)', () => {test('nested mutator holds never deadlock against a waiting exclusive', async () => {const gate = new ShadowOpGate();- const outerHold = deferred();+ const outerHold = Promise.withResolvers<void>();let innerRan = false;const outer = gate.withMutator(async () => {await outerHold.promise;@@ -120,7 +112,7 @@ describe('ShadowOpGate (forced interleavings, deterministic)', () => {test('exclusives serialize against each other', async () => {const gate = new ShadowOpGate();- const firstHold = deferred();+ const firstHold = Promise.withResolvers<void>();const order: string[] = [];const first = gate.withExclusive(async () => {order.push('first-start');@@ -140,8 +132,8 @@ describe('ShadowOpGate (forced interleavings, deterministic)', () => {test('two exclusives queued behind one mutator still serialize', async () => {const gate = new ShadowOpGate();- const mutatorHold = deferred();- const firstHold = deferred();+ const mutatorHold = Promise.withResolvers<void>();+ const firstHold = Promise.withResolvers<void>();const order: string[] = [];const mutator = gate.withMutator(() => mutatorHold.promise);await tick();@@ -206,8 +198,8 @@ describe('ShadowOpGate (forced interleavings, deterministic)', () => {test('drain waits for the last of several concurrent mutators', async () => {const gate = new ShadowOpGate();- const a = deferred();- const b = deferred();+ const a = Promise.withResolvers<void>();+ const b = Promise.withResolvers<void>();const pa = gate.withMutator(() => a.promise);const pb = gate.withMutator(() => b.promise);await tick();@@ -233,7 +225,7 @@ describe('ShadowOpGate (forced interleavings, deterministic)', () => {test('drain does not acquire the gate — a later mutator still runs freely', async () => {const gate = new ShadowOpGate();- const held = deferred();+ const held = Promise.withResolvers<void>();const first = gate.withMutator(() => held.promise);await tick();diff --git a/packages/server/src/shadow-op-gate.ts b/packages/server/src/shadow-op-gate.tsindex fa241603d..ff64ba02e 100644--- a/packages/server/src/shadow-op-gate.ts+++ b/packages/server/src/shadow-op-gate.ts@@ -52,10 +52,8 @@ export class ShadowOpGate {'[shadow-op-gate] exclusive acquisition waited a long time for the mutator drain — sustained write stream is starving maintenance',);}- let release!: () => void;- this.exclusiveHeld = new Promise<void>((r) => {- release = r;- });+ const { promise, resolve: release } = Promise.withResolvers<void>();+ this.exclusiveHeld = promise;try {return await fn();} finally {diff --git a/packages/server/src/single-flight.test.ts b/packages/server/src/single-flight.test.tsindex c05f50a3b..eaf50b552 100644--- a/packages/server/src/single-flight.test.ts+++ b/packages/server/src/single-flight.test.ts@@ -5,10 +5,7 @@ describe('createSingleFlight (PRD-6972 FR2)', () => {test('N concurrent identical keys run fn exactly once and share one result', async () => {const sf = createSingleFlight<number>();let calls = 0;- let resolveWalk: (v: number) => void = () => {};- const gate = new Promise<number>((r) => {- resolveWalk = r;- });+ const { promise: gate, resolve: resolveWalk } = Promise.withResolvers<number>();const fn = () => {calls += 1;return gate;diff --git a/packages/server/src/sync-engine.test.ts b/packages/server/src/sync-engine.test.tsindex b66f00ce4..896498994 100644--- a/packages/server/src/sync-engine.test.ts+++ b/packages/server/src/sync-engine.test.ts@@ -23,7 +23,12 @@ import { createContentFilter } from './content-filter.ts';import { classifyGitError } from './error-classification.ts';import type { GitHandle } from './git-handle.ts';import { listNames } from './git-paths.ts';-import type { DetectGhAccountsFn, DetectGhFn } from './github-permissions.ts';+import type {+ CheckPushPermissionOptions,+ DetectGhAccountsFn,+ DetectGhFn,+ PushPermission,+} from './github-permissions.ts';import { getLogger } from './logger.ts';import { createSyncCredentialConfigResolver } from './share/git-context.ts';import { declareGitHubHosts, useIsolatedHome } from './share/git-host-declarations.test-helper.ts';@@ -150,14 +155,12 @@ async function initGitWithOrigin(originUrl = 'https://github.com/inkeep/open-knointerface FakeProbeRecorder {calls: number;- next: import('./github-permissions.ts').PushPermission[];- opts: import('./github-permissions.ts').CheckPushPermissionOptions[];- fn: (- opts: import('./github-permissions.ts').CheckPushPermissionOptions,- ) => Promise<import('./github-permissions.ts').PushPermission>;+ next: PushPermission[];+ opts: CheckPushPermissionOptions[];+ fn: (opts: CheckPushPermissionOptions) => Promise<PushPermission>;}-function fakeProbe(...sequence: Array<import('./github-permissions.ts').PushPermission>) {+function fakeProbe(...sequence: Array<PushPermission>) {const rec: FakeProbeRecorder = {calls: 0,next: [...sequence],@@ -4541,11 +4544,12 @@ describe('SyncEngine push-permission probe', () => {test('FR7: pushPermission is absent during the probe window (cold-start latency)', async () => {await initGitWithOrigin();- let resolveProbe: (p: import('./github-permissions.ts').PushPermission) => void = () => {};- const slowProbe: FakeProbeRecorder['fn'] = () =>- new Promise((res) => {- resolveProbe = res;- });+ let resolveProbe: (p: PushPermission) => void = () => {};+ const slowProbe: FakeProbeRecorder['fn'] = () => {+ const { promise, resolve } = Promise.withResolvers<PushPermission>();+ resolveProbe = resolve;+ return promise;+ };const engine = makeProbeEngine({ syncEnabled: false, fakeProbe: slowProbe });await engine.start();expect(engine.getStatus().pushPermission).toBeUndefined();@@ -4567,11 +4571,12 @@ describe('SyncEngine push-permission probe', () => {test('FR7: transitioning idle → fetching during probe window does NOT set no-push-permission pausedReason', async () => {await initGitWithOrigin();- let resolveProbe: (p: import('./github-permissions.ts').PushPermission) => void = () => {};- const slowProbe: FakeProbeRecorder['fn'] = () =>- new Promise((res) => {- resolveProbe = res;- });+ let resolveProbe: (p: PushPermission) => void = () => {};+ const slowProbe: FakeProbeRecorder['fn'] = () => {+ const { promise, resolve } = Promise.withResolvers<PushPermission>();+ resolveProbe = resolve;+ return promise;+ };const engine = makeProbeEngine({ syncEnabled: true, fakeProbe: slowProbe });await engine.start();expect(engine.getStatus().state).toBe('idle');diff --git a/packages/server/src/watcher-process.test-helper.ts b/packages/server/src/watcher-process.test-helper.tsindex c06c0fb58..07baa2d70 100644--- a/packages/server/src/watcher-process.test-helper.ts+++ b/packages/server/src/watcher-process.test-helper.ts@@ -278,10 +278,7 @@ function holdFirstBaselineStat(let starting = true;let releaseWorker: () => void = () => {};let releaseSample: () => void = () => {};- let markReleased: () => void = () => {};- const released = new Promise<void>((resolve) => {- markReleased = resolve;- });+ const { promise: released, resolve: markReleased } = Promise.withResolvers<void>();const letSampleRun = (): void => {if (sampleState !== 'held') return;releaseSample();@@ -311,11 +308,10 @@ function holdFirstBaselineStat(samples.unwatch(heldPath);if (form === 'sync' || !starting) return undefined;sampleState = 'held';- const gate = new Promise<void>((resolve) => {- releaseSample = resolve;- });+ const gate = Promise.withResolvers<void>();+ releaseSample = gate.resolve;onHeld('sample');- return gate;+ return gate.promise;},after() {sampleLanded = true;diff --git a/packages/server/src/write-advisory-gate.test.ts b/packages/server/src/write-advisory-gate.test.tsindex fe7edc13b..d04e92da3 100644--- a/packages/server/src/write-advisory-gate.test.ts+++ b/packages/server/src/write-advisory-gate.test.ts@@ -30,20 +30,6 @@ function captureGateLines(): () => Array<[string, unknown]> {return () => [...lines];}-function stalled<T>(): {- promise: Promise<T>;- resolve: (value: T) => void;- reject: (error: Error) => void;-} {- let resolve!: (value: T) => void;- let reject!: (error: Error) => void;- const promise = new Promise<T>((onResolve, onReject) => {- resolve = onResolve;- reject = onReject;- });- return { promise, resolve, reject };-}-describe('write advisory gate', () => {beforeEach(() => {vi.useFakeTimers();@@ -68,7 +54,7 @@ describe('write advisory gate', () => {test('answers with the fallback at the deadline while the advisory is still waiting', async () => {const gate = createWriteAdvisoryGate({ deadlineMs: 1_000 });- const slow = stalled<string>();+ const slow = Promise.withResolvers<string>();let settled: string | undefined;void gate@@ -108,7 +94,7 @@ describe('write advisory gate', () => {test('logs an advisory failure that arrives after the deadline with its kind and error', async () => {const warn = vi.spyOn(getLogger('write-advisory'), 'warn');const gate = createWriteAdvisoryGate({ deadlineMs: 1_000 });- const failing = stalled<string>();+ const failing = Promise.withResolvers<string>();const first = gate.run('lint-links',() => failing.promise,@@ -128,7 +114,7 @@ describe('write advisory gate', () => {});async function closeFor(gate: WriteAdvisoryGate, closedMs: number): Promise<void> {- const slow = stalled<string>();+ const slow = Promise.withResolvers<string>();const deferred = gate.run('orphan-hints',() => slow.promise,@@ -144,7 +130,7 @@ describe('write advisory gate', () => {test('logs the gate reopening with how long it was closed and how many advisories it skipped', async () => {const gateLines = captureGateLines();const gate = createWriteAdvisoryGate({ deadlineMs: 1_000 });- const slow = stalled<string>();+ const slow = Promise.withResolvers<string>();const first = gate.run('link-check',() => slow.promise,@@ -184,7 +170,7 @@ describe('write advisory gate', () => {test('a gate that never reopens logs its closing once and no reopening', async () => {const gateLines = captureGateLines();const gate = createWriteAdvisoryGate({ deadlineMs: 1_000 });- const stuck = stalled<string>();+ const stuck = Promise.withResolvers<string>();const first = gate.run('orphan-hints',() => stuck.promise,@@ -252,7 +238,7 @@ describe('write advisory gate', () => {test('skips new advisories without starting them while an earlier one is overdue, then resumes', async () => {const gate = createWriteAdvisoryGate({ deadlineMs: 1_000 });- const slow = stalled<string>();+ const slow = Promise.withResolvers<string>();const first = gate.run('link-check',() => slow.promise,@@ -274,8 +260,8 @@ describe('write advisory gate', () => {test('stays closed until every overdue advisory has settled', async () => {const gate = createWriteAdvisoryGate({ deadlineMs: 1_000 });- const first = stalled<string>();- const second = stalled<string>();+ const first = Promise.withResolvers<string>();+ const second = Promise.withResolvers<string>();const firstRun = gate.run('link-check',() => first.promise,@@ -306,7 +292,7 @@ describe('write advisory gate', () => {test('an overdue advisory that later fails also reopens the gate', async () => {const gate = createWriteAdvisoryGate({ deadlineMs: 1_000 });- const failing = stalled<string>();+ const failing = Promise.withResolvers<string>();const first = gate.run('link-check',() => failing.promise,diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex c762ab890..4257726cd 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -179,6 +179,9 @@ importers:'@typescript/native':specifier: npm:typescript@~7.0.2version: [email protected]+ eslint-plugin-unicorn:+ specifier: ^79.0.0+ version: 79.0.0([email protected]([email protected])([email protected]))([email protected])([email protected])husky:specifier: ^9.1.7version: 9.1.7@@ -1277,7 +1280,7 @@ importers:devDependencies:'@napi-rs/cli':specifier: ^3.7.2- version: 3.7.3(@emnapi/[email protected])(@emnapi/[email protected])(@types/[email protected])([email protected])+ version: 3.7.3(@emnapi/[email protected])(@emnapi/[email protected])(@types/[email protected])([email protected])([email protected])packages/plugin: {}@@ -1730,6 +1733,12 @@ packages:resolution: {integrity: sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw==}hasBin: true+ '@cacheable/[email protected]':+ resolution: {integrity: sha512-CTLKqLItRCEixEAewD3/j9DB3/o96gpTPD4eJ1v+DGOlxZRZncRQkGYqqnAGCscYd6RNeXfGeiuCphsPtqyIfQ==}++ '@cacheable/[email protected]':+ resolution: {integrity: sha512-buipgOVDkkPXNR5+xBpDw7Zk2n1EvU7qBJCNUcL7rhQ//kfpOXPAvQ511Os0vpLYJ1pZnvudNytkQt2hst3wqA==}+'@changesets/[email protected]':resolution: {integrity: sha512-9qPCm/rLx/xoOFXIHGB229+4GOL76S4MC+7tyOuTsR6+1jYlfFDQORdvwR5hDA6y4FL2BPt3qpbcQIS+dW85LA==}@@ -2168,6 +2177,40 @@ packages:cpu: [x64]os: [win32]+ '@eslint-community/[email protected]':+ resolution: {integrity: sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg==}+ engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}+ peerDependencies:+ eslint: ^6.0.0 || ^7.0.0 || >=8.0.0++ '@eslint-community/[email protected]':+ resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}+ engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}++ '@eslint/[email protected]':+ resolution: {integrity: sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==}+ engines: {node: ^20.19.0 || ^22.13.0 || >=24}++ '@eslint/[email protected]':+ resolution: {integrity: sha512-DObd/KKUsU+FaFv4PLxSRenpXfQWmPXXP3pPZ6/K1PCrMu2vQpMDMuQe/BqYeoLcz8ro0bVDF1RxOJgfVEdhUw==}+ engines: {node: ^20.19.0 || ^22.13.0 || >=24}++ '@eslint/[email protected]':+ resolution: {integrity: sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==}+ engines: {node: ^20.19.0 || ^22.13.0 || >=24}++ '@eslint/[email protected]':+ resolution: {integrity: sha512-rVcxLmwSkEL3aWS3vAgsTRrQHoYE1b0XcgDtKHDJ92XOkyUpcbS/g0tUJKhvCtlEhYzgKBWsgDd+Z/aPhd166w==}+ engines: {node: ^20.19.0 || ^22.13.0 || >=24}++ '@eslint/[email protected]':+ resolution: {integrity: sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==}+ engines: {node: ^20.19.0 || ^22.13.0 || >=24}++ '@eslint/[email protected]':+ resolution: {integrity: sha512-IkO+/KEUvwbVpiURZg+P7zF74z5Jxe0UgJxVni+RtoHQ6IZieXaO02kmadomap/q+l6bc/jdPGGqTjhuZnuz1Q==}+ engines: {node: ^20.19.0 || ^22.13.0 || >=24}+'@excalidraw/[email protected]':resolution: {integrity: sha512-st3TJlmlR46yxoQ9IEOalL7MAUaGaA0RfwwHMjG33lx+sc6ZD2xUSs7oz2RFcY3JkHRWf2qsjXfjiUusaeavfA==}@@ -2276,6 +2319,26 @@ packages:react-hook-form: ^7.55.0zod: ^3.25.0 || ^4.0.0+ '@humanfs/[email protected]':+ resolution: {integrity: sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==}+ engines: {node: '>=18.18.0'}++ '@humanfs/[email protected]':+ resolution: {integrity: sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==}+ engines: {node: '>=18.18.0'}++ '@humanfs/[email protected]':+ resolution: {integrity: sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==}+ engines: {node: '>=18.18.0'}++ '@humanwhocodes/[email protected]':+ resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}+ engines: {node: '>=12.22'}++ '@humanwhocodes/[email protected]':+ resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}+ engines: {node: '>=18.18'}+'@iconify/[email protected]':resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}@@ -2812,6 +2875,15 @@ packages:'@jridgewell/[email protected]':resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}+ '@keyv/[email protected]':+ resolution: {integrity: sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ==}+ engines: {node: '>= 18'}+ peerDependencies:+ keyv: ^5.6.0++ '@keyv/[email protected]':+ resolution: {integrity: sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==}+'@kwsites/[email protected]':resolution: {integrity: sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==}@@ -6133,6 +6205,9 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-xFdR6tkm0MWvBfO8xXCSsinYxHcqkQUlcHeSpMC2ukzOb6lwQAfDmW+Qt0AvlGd8HpsS28qKsB+oPeJn9I39jg==}+ '@types/[email protected]':+ resolution: {integrity: sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==}+'@types/[email protected]':resolution: {integrity: sha512-52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==}@@ -6163,6 +6238,9 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-/HQ2uFoetFTXuye8vzIcHw2z6Fwi7Hi/qcgC+RoS9NCyewiqxhVGqlG+ViGB6lkax481R6dmhf1I7lIGlzJStQ==}+ '@types/[email protected]':+ resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}+'@types/[email protected]':resolution: {integrity: sha512-trgaNyfU+Xh2Tc+ABIb44a5AYUpicB3uwirOioeOkNPPbmgRNtcWyDeeFRzjPZENO9Vq8gvVqfhaaXWLlevVwg==}@@ -6733,6 +6811,9 @@ packages:ajv:optional: true+ resolution: {integrity: sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==}+resolution: {integrity: sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==}@@ -6953,6 +7034,11 @@ packages:engines: {node: '>=6.0.0'}hasBin: true+ resolution: {integrity: sha512-UvuxFU9P3hM29LrQdwu0cD6w6/+SFr+UlB9s/knI7+O2rK9xFxKUwSDWxGdbbqQ9/V7BJ5s0NI5nQAE4uJp3gQ==}+ engines: {node: '>=6.0.0'}+ hasBin: true+resolution: {integrity: sha512-bopVNp6ugyA150DDuZfPFdt1KZ5a94ZDiwX4hMgZDzF+GttD80lEy8kj98kbyhLXnPvhtIo93mdnLIjpCAeeOw==}engines: {node: '>=10.0.0'}@@ -7015,6 +7101,11 @@ packages:engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}hasBin: true+ resolution: {integrity: sha512-2TcbbiwXEq+N0kD36tykpCfyyQigUXmuwNQbnPp4Xk4PX9JOqVIKjJlIDjpH7uY6tmRGoAd+apeT1p60T8wsdA==}+ engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}+ hasBin: true+resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}@@ -7040,6 +7131,10 @@ packages:resolution: {integrity: sha512-RLyJhB7Si3YkzKR9ubQslWuXW3Vhs3CGe1i+SeixBZ0qTd1mk3XBmssvY22TlB6CS5blyko8Gu1JzpYk8UkYAg==}engines: {node: '>=14.0.0'}+ resolution: {integrity: sha512-JCWSCdun+4Ovd9BhM/Vtlmwb7oD6Wl4YiPRXXwhAuwlPhW1un/MKgXn7GZoFm53ginnoNzus69V8JWx0K393jg==}+ engines: {node: '>=18.20'}+resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==}engines: {node: '>=18'}@@ -7072,6 +7167,9 @@ packages:resolution: {integrity: sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==}engines: {node: '>=8'}+ resolution: {integrity: sha512-60cyAOytib/OzBw1JNSoSV/boK1AtHryDIjvVBk7XbN4ugfkM3+Sry7fEjNgPMGgOjuaZPAp8ruZ0Cxafwyq9g==}+resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}engines: {node: '>= 0.4'}@@ -7095,6 +7193,9 @@ packages:resolution: {integrity: sha512-52noaS3DubycKSXaU30TwPGIp+POyQSUVa5jBEq3vkRkY0kjyb3LQgvhU6WGyCcyXqVLWO0Cw0Q6BSdD0kUfVA==}+ resolution: {integrity: sha512-LFUqIIAwpzsIuevnKnsR9qnStBcgzPShTX61lBwN9uFkkf8o8zLiebEjbW8AYtZiF+1YKDWfdt/pWDtMuG8Xwg==}+resolution: {integrity: sha512-ryQkDX26yJ3CXzb3hxUVNlg1NKE4REc5crLBq661Nxzr8TNd236SaEf2ffYLXyI5tSABSeguHLqcVq4vf9L3Zg==}engines: {node: '>=12'}@@ -7117,6 +7218,9 @@ packages:resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==}engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}+ resolution: {integrity: sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==}+resolution: {integrity: sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==}@@ -7367,6 +7471,10 @@ packages:resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==}engines: {node: '>=18'}+ resolution: {integrity: sha512-52r6fkXgxv4GLMjmFcMWRx7X9bw071xTTdrDcdyPGRqU2oE+9pCG0bAOMifSBdLw0JRBZKEF0q3B55qPlLuE8g==}+ engines: {node: '>=6.4.0'}+resolution: {integrity: sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==}@@ -7674,6 +7782,9 @@ packages:resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}engines: {node: '>=4.0.0'}+ resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}+resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}engines: {node: '>=0.10.0'}@@ -7732,6 +7843,10 @@ packages:resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}engines: {node: '>=8'}+ resolution: {integrity: sha512-y+8xyqdGLL+6sh0tVeHcfP/QDd8gUgbasolJJpY7NgeQGSZ739bDtSiaiDgtoicy+mtYB81dKLxO9xRhCyIB3A==}+ engines: {node: '>=12.20'}+resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}engines: {node: '>=8'}@@ -7842,6 +7957,9 @@ packages:resolution: {integrity: sha512-cEto7aeOqBfU1D+c5py5pE+ooscKE75JifxLBdFUZsqAxRS6y7kebtxAZvICszSl05gPjYHDTjY+lXpyGvpJbg==}+ resolution: {integrity: sha512-nRa65aFge40viPAKxMKULIY8tcXKwKboJWNn4RoKwyWXJ6SP7BnrDGKUTzc64818jIciH0PK7LSF8QzZes19GA==}+resolution: {integrity: sha512-LsJnXXpS3zhDPUv+YNBRf+OeX8D5h0DRZZa93ajCR43ncSZHYRs7m+4KlEN1Xhl7lQvB9snq95ELoGqdGJdytA==}@@ -7910,6 +8028,10 @@ packages:resolution: {integrity: sha512-zwfzJecQ/Uej6tusMqwAqU/6KL2XaB2VZ2Jg54Je6ahNBGNH6Ek6g3jjNCF0fG9EWQKGZNddNjU5F1ZQn/sBnA==}engines: {node: '>=20.19.0'}+ resolution: {integrity: sha512-kxL7msIffSuh9aaFAMD7rxAIuTRMAHMeBtgHW2yUdWw732ZNh4MehkF2gdjvtdmikkaIP9bFDDJOPlsvm7avrA==}+ engines: {node: '>=20.19.0'}+resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}engines: {node: '>=6'}@@ -8003,11 +8125,55 @@ packages:engines: {node: '>=6.0'}hasBin: true+ resolution: {integrity: sha512-k7MWrjoVTVCnjKpgaxBuScPNSPomLvDpsd9uADpWrIFzrnwiec27eWhGrmmyuTj1bC3xVNYP4QfG3MEzEw6ifg==}+ engines: {node: '>=22'}+ peerDependencies:+ eslint: '>=10.4'+ typescript: '*'+ peerDependenciesMeta:+ typescript:+ optional: true++ resolution: {integrity: sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ==}+ engines: {node: ^20.19.0 || ^22.13.0 || >=24}++ resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}+ engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}++ resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}+ engines: {node: ^20.19.0 || ^22.13.0 || >=24}++ resolution: {integrity: sha512-UohDjD4zSzEwhf58M3O7vc/ycc8O1I7dNlhtD0WxE8Px8EHNJKtUwzBqrzeGhisRuv2ag4sAYswszCJRgKXYUg==}+ engines: {node: ^20.19.0 || ^22.13.0 || >=24}+ hasBin: true+ peerDependencies:+ jiti: '*'+ peerDependenciesMeta:+ jiti:+ optional: true++ resolution: {integrity: sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw==}+ engines: {node: ^20.19.0 || ^22.13.0 || >=24}+resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}engines: {node: '>=4'}hasBin: true+ resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==}+ engines: {node: '>=0.10'}++ resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}+ engines: {node: '>=4.0'}+resolution: {integrity: sha512-Q9asaAAM3KZc4Ckr8GMcJWYc3hNCf0KnmhkfzHuAWmqGoPssQoe5Mb8et1CYmmkeMfPTlUyeBHRi53Bedvnl1Q==}engines: {node: '>=18'}@@ -8135,6 +8301,12 @@ packages:resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}engines: {node: '>=8.6.0'}+ resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}++ resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}+resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}@@ -8188,6 +8360,9 @@ packages:resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==}engines: {node: '>=18'}+ resolution: {integrity: sha512-+PFTHITI08JIGhnNpGNI8T8inUpgZfk3GNEqfT9R2zZV2iFXg3CvqzSl/uEhs7TSGujYRELEANyDvS8Fj7+S7Q==}+resolution: {integrity: sha512-Ievi/yy8DS3ygGvT47PjSfdFoX+2isQueoYP1cntFW1JLYAuS4GD7NUPGg4zv2iZfV52uDyk5w5Z0TdpRS6Q1g==}engines: {node: '>=20'}@@ -8211,6 +8386,10 @@ packages:resolution: {integrity: sha512-iKiqIb7FsA0hwnq0vvDay4RsmHUFLvWVquTb59XVlxfHS68XaWZfEjriF2vTZ3k/plicyKZxMJLqxKt10kSOtQ==}engines: {node: '>=18.0.0'}+ resolution: {integrity: sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==}+ engines: {node: '>=18'}+resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==}engines: {node: '>=6'}@@ -8219,6 +8398,13 @@ packages:resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}engines: {node: '>=8'}+ resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}+ engines: {node: '>=10'}++ resolution: {integrity: sha512-f++BY9pTk+983xK1FLzlLpmM0i0z+jHmx3QESGkURMXujQZz1k5wzwX6hjnQ8goaD0B+sYnDK1yZ6MTyZfUaqA==}+resolution: {integrity: sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==}@@ -8490,6 +8676,10 @@ packages:resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}engines: {node: '>= 6'}+ resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}+ engines: {node: '>=10.13.0'}+resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting [email protected]@@ -8498,6 +8688,10 @@ packages:resolution: {integrity: sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==}engines: {node: '>=10.0'}+ resolution: {integrity: sha512-RwMTC61u7hrG3ZJMkZQOK4JLJrKS8QtoTii63EmWvFXHqycY9FObBJQCbsLxSO8kjKhWE5kV1GC+Vb1g3RI0Zg==}+ engines: {node: '>=18'}+resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}engines: {node: '>= 0.4'}@@ -8550,6 +8744,10 @@ packages:resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}engines: {node: '>= 0.4'}+ resolution: {integrity: sha512-iZyKG96/JwPz1N55vj2Ie2vXbhu440zfUfJvSwEqEbeLluk7NnapfGqa7LH0mOsnDxTF85Mx8/dyR6HfqcbmbQ==}+ engines: {node: '>=20'}+resolution: {integrity: sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==}engines: {node: '>= 0.4'}@@ -8628,6 +8826,12 @@ packages:resolution: {integrity: sha512-U9LYDy1CwhMCnprUfeAZWZGByVbhd54hwepegYTK7Pi5NvqEj63ifz5z+xukznehT7i6NIZRu89Ay1AZmRsLEQ==}+ resolution: {integrity: sha512-MvG/clsADq1GPM2KGo2nyfaWVyn9naPiXrqIe4jYjXNZQt238kWyOGrsyc/DmRAQ+Re6yeo6yX/yoNCG5KAEVg==}++ resolution: {integrity: sha512-p/LgFzRN5FeoD3DLS6bkUapeye6E4SI6yJs6KetENd18S+FBthqYq2amJUWpt5z0EQwwHemidjY5OqJGEKm5uA==}+resolution: {integrity: sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==}engines: {node: '>=10'}@@ -8696,6 +8900,10 @@ packages:resolution: {integrity: sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==}engines: {node: '>=0.10.0'}+ resolution: {integrity: sha512-SLX4H/vtcYlYnL7XqnuJKHU7Z8517TgsW9nmQiGOgMCjQ8V/deLYu6bEmbGoXe7WMMhc9+EUGyFFneHja8KabA==}+ engines: {node: '>=18'}+resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}@@ -8728,10 +8936,18 @@ packages:resolution: {integrity: sha512-NkJQA7oZ4YHQhd2+H3BoRFKF3d/XNsiKpHZCQEMH9pDX27hQQLsTyOocyRgaIVtf8gHX3Nt3LPkR4e5EdtPAGQ==}engines: {node: ^22.18.0 || >=24.0.0}+ resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}+ engines: {node: '>=0.8.19'}+resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}engines: {node: '>=8'}+ resolution: {integrity: sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==}+ engines: {node: '>=12'}+resolution: {integrity: sha512-SP23P27OUKzXWEC/TOyWlwLviofQkCSCKONnc62eItjp69yCZZPqDQtr3Pw5gJDnPeUMqExmKydNZaJO0FU9pw==}engines: {node: '>=12'}@@ -8811,6 +9027,10 @@ packages:resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}+ resolution: {integrity: sha512-f4RqJKBUe5rQkJ2eJEJBXSticB3hGbN9j0yxxMQFqIW89Jp9WYFtzfTcRlstDKVUTRzSOTLKRfO9vIztenwtxA==}+ engines: {node: '>=18.20'}+resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}engines: {node: '>= 0.4'}@@ -9105,6 +9325,9 @@ packages:resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}+ resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}+resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}@@ -9114,6 +9337,9 @@ packages:resolution: {integrity: sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==}+ resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}+resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}@@ -9149,6 +9375,9 @@ packages:resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}+ resolution: {integrity: sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==}+resolution: {integrity: sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==}@@ -9182,6 +9411,10 @@ packages:resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}engines: {node: '>=6'}+ resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}+ engines: {node: '>= 0.8.0'}+resolution: {integrity: sha512-DeXj9X5xDCjgKLU/7RR+/HQEVzuuEUiwldwOGsHK/sfAfELGWEyTcf0x+uOvCvK3O2zPmZePXWL85vtia6GyZw==}engines: {node: '>=16'}@@ -9288,6 +9521,10 @@ packages:resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}engines: {node: '>=8'}+ resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}+ engines: {node: '>=10'}+resolution: {integrity: sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==}@@ -9479,6 +9716,9 @@ packages:resolution: {integrity: sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==}+ resolution: {integrity: sha512-rz9YOBGItdSbe7HcSArUbhiAv4SB/4DKRYg96CSFS2CcIYMbUvBtZlzA1NCbk2AdgbmYwMqwNblLpR441lLeiQ==}+resolution: {integrity: sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==}engines: {node: '>= 0.8'}@@ -9592,6 +9832,9 @@ packages:resolution: {integrity: sha512-nDV/77Fj6eH1ynwscYTOsbK7rR//Uj0bZXBwJZRfaLEJ1iGBR6kIfNmlNqaqJf649EP0F3NWNdeJi03elllNUQ==}+ resolution: {integrity: sha512-Pa2ljlsEL6sVwFaYeyrOLSYbQt73JvGbPOYFq+9AElXiSnfI5Q4465RRZ1sHv7lDjDOnGRDDaqPXqClqWK/q1Q==}+resolution: {integrity: sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==}@@ -9622,6 +9865,9 @@ packages:resolution: {integrity: sha512-zpe98Q6kvavpCr1NPVSCMebCKfD7CA2NqZ+rykeNhONIJBpc1tFKt9hucLGwha3jNTNI8lHpctWJWoimVF4PfA==}+ resolution: {integrity: sha512-oGYfQzHSG5dOMovQcJ3fyTmZlWAWpi0XA0sJwJs+i6OT88o1+Jtw/8z0CmdowSLxGhhFK89rQ/oXph/wN02PNw==}+resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}engines: {node: '>=8.6'}@@ -9757,6 +10003,9 @@ packages:resolution: {integrity: sha512-zkVhZUA3y8mbz652WrL5x0fB0ehrBkulWT3TomAQ9iDtyXZvzKeEA6GPxAItBYeNYl5yngKRX612qHOhvMkDeg==}+ resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}+resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==}engines: {node: '>= 0.6'}@@ -9866,6 +10115,10 @@ packages:resolution: {integrity: sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ==}engines: {node: '>=18'}+ resolution: {integrity: sha512-OmO8+GM1JUZqXET720VrJCwkjUCXmCMQm0Z3UDDRbfNLHS4NEAvY60j5jiFv0tkKw2PNNlqOLhahVmwJIOLDIQ==}+ engines: {node: '>=18'}+node@runtime:24.21.0:resolution:type: variations@@ -10097,6 +10350,10 @@ packages:zod:optional: true+ resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}+ engines: {node: '>= 0.8.0'}+resolution: {integrity: sha512-weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==}engines: {node: '>=18'}@@ -10167,6 +10424,10 @@ packages:resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}engines: {node: '>=8'}+ resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}+ engines: {node: '>=10'}+resolution: {integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==}engines: {node: '>=6'}@@ -10345,6 +10606,10 @@ packages:resolution: {integrity: sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==}engines: {node: '>=10.4.0'}+ resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}+ engines: {node: '>=4'}+resolution: {integrity: sha512-DEROKU3SkkLGWNMzru3xPVgxyd48UGuMSZvioErCure6yhOc/pRH2ZV+SEn7nmaf7WNf3NdIpH+UTrRdKyq9Lw==}@@ -10417,6 +10682,10 @@ packages:deprecated: No longer maintained. Please contact the author of the relevant native addon; alternatives are available.hasBin: true+ resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}+ engines: {node: '>= 0.8.0'}+resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}engines: {node: '>=10.13.0'}@@ -10575,6 +10844,10 @@ packages:resolution: {integrity: sha512-6Du7IZdIy7cHiv7AhtDy4X2QRM8IAD5DII69mt5qWibC2d15ZU8DmBG1WdZKekG11cChSu4zkSUGPF9sweOl6w==}+ resolution: {integrity: sha512-+Owyggi9IxT1ePKGafcI87ubSmxol6smwJ+RAHDQlx9+9cPwFWDiKFFCPuWhr9ignlGpZ9vDQLw67N4dcTVFEA==}+ engines: {node: '>=20'}+resolution: {integrity: sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==}engines: {node: '>=0.6'}@@ -10605,6 +10878,10 @@ packages:resolution: {integrity: sha512-So0Sqw869y/S2oE3Nuc0uT3Dhqgvsj8FSrwBdsuTosVsG8ME5/OcudU1GxsrIFdFABgy17GHnTVO9TYV/bLQcA==}engines: {node: '>=16.0.0'}+ resolution: {integrity: sha512-Y3NoRtprEEZQD8RfxMCfS0ZTqc4e+i18OrXEXAvpM6TfC/3y+0L5rNbZiSnbBBEkDfFzbpd8o+cE8q3/anjMGA==}+ engines: {node: '>=22'}+resolution: {integrity: sha512-aWizCQiyeAenIdUbqEpXgRA1ya65P13NKn/W8rWkcN0OPkRDxdBVLWnIEDsS2RpwCK2nobI7oMUSmexzTDyAmA==}peerDependencies:@@ -10821,6 +11098,10 @@ packages:resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==}engines: {node: '>= 0.4'}+ resolution: {integrity: sha512-EWV80YgFaVgFrjGCAsV7oybp4GOxbls5RzBg8OB0nKEVXsBJR1JlV8Di1JhCROg3MzTfe1RI8yitIm1eOs68iA==}+ hasBin: true+resolution: {integrity: sha512-Qn7vR1xrf6fZCrkm9TDWi/AB4ylrHy+jqsNm1EHOAmbARYA6gsnVJBq/sdBh6kmT4NEZxH5vgIjrscefJAOXcw==}@@ -10904,6 +11185,10 @@ packages:resolution: {integrity: sha512-XGoLeRAVzUTcJ1qkxPQhDJyIZ5d6zzZD9nT7AEZOaaU9UbWclhycElmhO+VD5bFeLuzhPBaOV2oXC8uG35ZSpg==}+ resolution: {integrity: sha512-yE7KUfFvaBFzGPs5H3Ops1RevfUEsDc5Iz65rOwWg4lE8HJSYtle77uul3+573457oHvBKuHYDl/xqUkKpEEdw==}+ engines: {node: '>=18'}+resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==}@@ -11407,6 +11692,10 @@ packages:resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}engines: {node: '>=8'}+ resolution: {integrity: sha512-SlyRoSkdh1dYP0PzclLE7r0M9sgbFKKMFXpFRUMNuKhQSbC6VQIGzq3E0qsfvGJaUFJPGv6Ws1NZ/haTAjfbMA==}+ engines: {node: '>=12'}+resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}engines: {node: '>=0.10.0'}@@ -11705,6 +11994,10 @@ packages:resolution: {integrity: sha512-ZW/lVMRabETuYCd9O9ZvMhAh8GslSqaUjxmK/JLPCh6l73CvLBiuXswj/+7LdnWOgYsQ130FqLzFz5aGT4I3Ug==}+ resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}+ engines: {node: '>= 0.8.0'}+resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==}engines: {node: '>=10'}@@ -11839,6 +12132,15 @@ packages:peerDependencies:browserslist: '>= 4.21.0'+ resolution: {integrity: sha512-t8wonIOdQyOjtPd2VktlBu6QjTVTks6v8bSi7kd0r2Vll8TK1JYDZtRRdbmCHOAMphkZgrzK+L+vXK4pyZ8t4A==}+ hasBin: true+ peerDependencies:+ browserslist: '>= 4.21.0'++ resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}+resolution: {integrity: sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==}engines: {node: '>=10'}@@ -12136,6 +12438,10 @@ packages:engines: {node: '>=20.11'}hasBin: true+ resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}+ engines: {node: '>=0.10.0'}+resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}engines: {node: '>=10'}@@ -12241,6 +12547,11 @@ packages:engines: {node: '>= 14.6'}hasBin: true+ resolution: {integrity: sha512-3NxN8+78OdzbT7C/WjGsyfPAtJaN3FNDsWxv7Y7mcDsT/oOmgW8BpyQQFFBnvZE3j9Y2Sdz1ULFLezL7Eb2yFw==}+ engines: {node: '>= 14.6'}+ hasBin: true+resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}engines: {node: '>=12'}@@ -12621,6 +12932,18 @@ snapshots:dependencies:css-tree: 3.2.1+ '@cacheable/[email protected]':+ dependencies:+ '@cacheable/utils': 2.5.0+ '@keyv/bigmap': 1.3.1([email protected])+ hookified: 1.15.1+ keyv: 5.6.0++ '@cacheable/[email protected]':+ dependencies:+ hashery: 1.5.1+ keyv: 5.6.0+'@changesets/[email protected]':dependencies:'@changesets/config': 3.1.4@@ -13221,6 +13544,41 @@ snapshots:'@esbuild/[email protected]':optional: true+ dependencies:+ eslint: 10.13.0([email protected])([email protected])+ eslint-visitor-keys: 3.4.3++ '@eslint-community/[email protected]': {}++ '@eslint/[email protected]([email protected])':+ dependencies:+ '@eslint/object-schema': 3.0.5+ debug: 4.4.3([email protected])+ minimatch: 10.2.5+ transitivePeerDependencies:+ - supports-color++ '@eslint/[email protected]':+ dependencies:+ '@eslint/core': 1.2.1++ '@eslint/[email protected]':+ dependencies:+ '@types/json-schema': 7.0.15++ '@eslint/[email protected]':+ dependencies:+ mdn-data: 2.37.2+ source-map-js: 1.2.1++ '@eslint/[email protected]': {}++ '@eslint/[email protected]':+ dependencies:+ '@eslint/core': 1.2.1+ levn: 0.4.1+'@excalidraw/[email protected]':dependencies:tinycolor2: 1.6.0@@ -13388,6 +13746,22 @@ snapshots:react-hook-form: 7.81.0([email protected])zod: 4.4.3+ '@humanfs/[email protected]':+ dependencies:+ '@humanfs/types': 0.15.0++ '@humanfs/[email protected]':+ dependencies:+ '@humanfs/core': 0.19.2+ '@humanfs/types': 0.15.0+ '@humanwhocodes/retry': 0.4.3++ '@humanfs/[email protected]': {}++ '@humanwhocodes/[email protected]': {}++ '@humanwhocodes/[email protected]': {}+'@iconify/[email protected]': {}'@iconify/[email protected]':@@ -13888,6 +14262,14 @@ snapshots:'@jridgewell/resolve-uri': 3.1.2'@jridgewell/sourcemap-codec': 1.6.0+ '@keyv/[email protected]([email protected])':+ dependencies:+ hashery: 1.5.1+ hookified: 1.15.1+ keyv: 5.6.0++ '@keyv/[email protected]': {}+'@kwsites/[email protected]([email protected])':dependencies:debug: 4.4.3([email protected])@@ -14330,10 +14712,10 @@ snapshots:'@napi-rs/canvas-win32-x64-msvc': 1.0.3optional: true- '@napi-rs/[email protected](@emnapi/[email protected])(@emnapi/[email protected])(@types/[email protected])([email protected])':+ '@napi-rs/[email protected](@emnapi/[email protected])(@emnapi/[email protected])(@types/[email protected])([email protected])([email protected])':dependencies:'@inquirer/prompts': 8.5.2(@types/[email protected])- '@napi-rs/cross-toolchain': 1.0.3(@emnapi/[email protected])(@emnapi/[email protected])+ '@napi-rs/cross-toolchain': 1.0.3(@emnapi/[email protected])(@emnapi/[email protected])([email protected])'@napi-rs/wasm-tools': 1.0.1(@emnapi/[email protected])(@emnapi/[email protected])'@octokit/rest': 22.0.1clipanion: 4.0.0-rc.4([email protected])@@ -14362,7 +14744,7 @@ snapshots:- node-addon-api- supports-color+ '@napi-rs/[email protected](@emnapi/[email protected])(@emnapi/[email protected])([email protected])':dependencies:'@napi-rs/lzma': 1.4.5(@emnapi/[email protected])(@emnapi/[email protected])'@napi-rs/tar': 1.1.0(@emnapi/[email protected])(@emnapi/[email protected])@@ -17006,6 +17388,8 @@ snapshots:'@types/[email protected]': {}+ '@types/[email protected]': {}+'@types/[email protected]':dependencies:'@types/estree': 1.0.9@@ -17041,6 +17425,8 @@ snapshots:parse5: 8.0.1undici-types: 7.28.0+ '@types/[email protected]': {}+'@types/[email protected]': {}'@types/[email protected]':@@ -17514,6 +17900,13 @@ snapshots:optionalDependencies:ajv: 8.20.0+ dependencies:+ fast-deep-equal: 3.1.3+ fast-json-stable-stringify: 2.1.0+ json-schema-traverse: 0.4.1+ uri-js: 4.4.1+dependencies:fast-deep-equal: 3.1.3@@ -17739,6 +18132,8 @@ snapshots:+ [email protected]: {}+@@ -17810,6 +18205,14 @@ snapshots:node-releases: 2.0.51update-browserslist-db: 1.2.3([email protected])+ dependencies:+ baseline-browser-mapping: 2.11.32+ caniuse-lite: 1.0.30001819+ electron-to-chromium: 1.5.464+ node-releases: 2.0.60+ update-browserslist-db: 1.3.4([email protected])+@@ -17852,6 +18255,8 @@ snapshots:transitivePeerDependencies:- supports-color+ [email protected]: {}+dependencies:run-applescript: 7.1.0@@ -17880,6 +18285,14 @@ snapshots:normalize-url: 6.1.0responselike: 2.0.1+ dependencies:+ '@cacheable/memory': 2.2.0+ '@cacheable/utils': 2.5.0+ hookified: 1.15.1+ keyv: 5.6.0+ qified: 0.10.1+dependencies:es-errors: 1.3.0@@ -17903,6 +18316,8 @@ snapshots:+ [email protected]: {}+dependencies:tinycolor2: 1.6.0@@ -17920,6 +18335,8 @@ snapshots:+ [email protected]: {}+@@ -18146,6 +18563,10 @@ snapshots:+ dependencies:+ browserslist: 4.29.4+@@ -18462,6 +18883,8 @@ snapshots:optional: true+ [email protected]: {}+@@ -18509,6 +18932,8 @@ snapshots:+ [email protected]: {}+@@ -18634,6 +19059,8 @@ snapshots:+ [email protected]: {}+dependencies:builder-util-runtime: 9.7.0([email protected])@@ -18711,6 +19138,8 @@ snapshots:+ [email protected]: {}+@@ -18869,8 +19298,7 @@ snapshots:- optional: true+ [email protected]: {}@@ -18882,8 +19310,100 @@ snapshots:optionalDependencies:source-map: 0.6.1+ [email protected]([email protected]([email protected])([email protected]))([email protected])([email protected]):+ dependencies:+ '@eslint/css-tree': 4.1.2+ browserslist: 4.29.4+ change-case: 5.4.4+ ci-info: 4.4.0+ core-js-compat: 3.51.0+ detect-indent: 7.0.2+ entities: 8.1.0+ eslint: 10.13.0([email protected])([email protected])+ find-up-simple: 1.0.1+ globals: 17.13.0+ identifier-regex: 1.1.0+ indent-string: 5.0.0+ is-builtin-module: 5.0.0+ micromark: 4.0.3([email protected])+ parse5: 8.0.1+ pluralize: 8.0.0+ quote-js-string: 0.1.0+ regjsparser: 0.13.4+ reserved-identifiers: 1.2.0+ semver: 7.8.5+ strip-indent: 4.1.1+ yaml: 2.9.1+ optionalDependencies:+ typescript: 6.0.3+ transitivePeerDependencies:+ - supports-color++ dependencies:+ '@types/esrecurse': 4.3.1+ '@types/estree': 1.0.9+ esrecurse: 4.3.0+ estraverse: 5.3.0++ [email protected]: {}++ [email protected]: {}++ dependencies:+ '@eslint-community/regexpp': 4.12.2+ '@eslint/config-array': 0.23.5([email protected])+ '@eslint/config-helpers': 0.7.0+ '@eslint/core': 1.2.1+ '@eslint/plugin-kit': 0.7.3+ '@humanfs/node': 0.16.8+ '@humanwhocodes/module-importer': 1.0.1+ '@humanwhocodes/retry': 0.4.3+ '@types/estree': 1.0.9+ ajv: 6.15.0+ cross-spawn: 7.0.6+ debug: 4.4.3([email protected])+ escape-string-regexp: 4.0.0+ eslint-scope: 9.1.2+ eslint-visitor-keys: 5.0.1+ espree: 11.2.0+ esquery: 1.7.0+ esutils: 2.0.3+ fast-deep-equal: 3.1.3+ file-entry-cache: 11.1.5+ find-up: 5.0.0+ glob-parent: 6.0.2+ ignore: 5.3.2+ imurmurhash: 0.1.4+ is-glob: 4.0.3+ json-stable-stringify-without-jsonify: 1.0.1+ minimatch: 10.2.5+ natural-compare: 1.4.0+ optionator: 0.9.4+ optionalDependencies:+ jiti: 2.7.0+ transitivePeerDependencies:+ - supports-color++ dependencies:+ acorn: 8.17.0+ acorn-jsx: 5.3.2([email protected])+ eslint-visitor-keys: 5.0.1++ dependencies:+ estraverse: 5.3.0++ dependencies:+ estraverse: 5.3.0+dependencies:'@sitespeed.io/tracium': 0.3.3([email protected])@@ -19068,6 +19588,10 @@ snapshots:merge2: 1.4.1micromatch: 4.0.8+ [email protected]: {}++ [email protected]: {}+@@ -19124,6 +19648,10 @@ snapshots:dependencies:is-unicode-supported: 2.1.0+ dependencies:+ flat-cache: 6.1.23+dependencies:'@tokenizer/inflate': 0.4.1([email protected])@@ -19170,6 +19698,8 @@ snapshots:- react-native-b4a- supports-color+ [email protected]: {}+dependencies:locate-path: 3.0.0@@ -19179,6 +19709,17 @@ snapshots:locate-path: 5.0.0path-exists: 4.0.0+ dependencies:+ locate-path: 6.0.0+ path-exists: 4.0.0++ dependencies:+ cacheable: 2.5.0+ flatted: 3.4.4+ hookified: 1.15.1+@@ -19503,6 +20044,10 @@ snapshots:dependencies:is-glob: 4.0.3+ dependencies:+ is-glob: 4.0.3+dependencies:fs.realpath: 1.0.0@@ -19522,6 +20067,8 @@ snapshots:serialize-error: 7.0.1optional: true+ [email protected]: {}+dependencies:define-properties: 1.2.1@@ -19589,6 +20136,10 @@ snapshots:dependencies:has-symbols: 1.1.0+ dependencies:+ hookified: 1.15.1+dependencies:function-bind: 1.1.2@@ -19785,6 +20336,10 @@ snapshots:+ [email protected]: {}++ [email protected]: {}+dependencies:lru-cache: 6.0.0@@ -19858,6 +20413,10 @@ snapshots:dependencies:safer-buffer: 2.1.2+ dependencies:+ reserved-identifiers: 1.2.0+@@ -19886,8 +20445,12 @@ snapshots:+ [email protected]: {}++ [email protected]: {}+@@ -19960,6 +20523,10 @@ snapshots:+ dependencies:+ builtin-modules: 5.4.0+@@ -20205,12 +20772,16 @@ snapshots:+ [email protected]: {}++ [email protected]: {}+optional: true@@ -20265,6 +20836,10 @@ snapshots:dependencies:json-buffer: 3.0.1+ dependencies:+ '@keyv/serialize': 1.1.1+@@ -20303,6 +20878,11 @@ snapshots:+ dependencies:+ prelude-ls: 1.2.1+ type-check: 0.4.0+dependencies:isomorphic.js: 0.2.5@@ -20389,6 +20969,10 @@ snapshots:dependencies:p-locate: 4.1.0+ dependencies:+ p-locate: 5.0.0+@@ -20698,6 +21282,8 @@ snapshots:+ [email protected]: {}+@@ -20999,6 +21585,10 @@ snapshots:micromark-util-decode-numeric-character-reference: 2.0.2micromark-util-symbol: 2.0.1+ dependencies:+ micromark-util-types: 2.0.2+@@ -21060,6 +21650,29 @@ snapshots:transitivePeerDependencies:- supports-color+ dependencies:+ '@types/debug': 4.1.13+ debug: 4.4.3([email protected])+ decode-named-character-reference: 1.3.0+ devlop: 1.1.0+ micromark-core-commonmark: 2.0.3+ micromark-factory-space: 2.0.1+ micromark-util-character: 2.1.1+ micromark-util-chunked: 2.0.1+ micromark-util-combine-extensions: 2.0.1+ micromark-util-decode-numeric-character-reference: 2.0.2+ micromark-util-edit-map: 1.0.0+ micromark-util-encode: 2.0.1+ micromark-util-normalize-identifier: 2.0.1+ micromark-util-resolve-all: 2.0.1+ micromark-util-sanitize-uri: 2.0.1+ micromark-util-subtokenize: 2.1.0+ micromark-util-symbol: 2.0.1+ micromark-util-types: 2.0.2+ transitivePeerDependencies:+ - supports-color+dependencies:braces: 3.0.3@@ -21159,6 +21772,8 @@ snapshots:+ [email protected]: {}+@@ -21270,6 +21885,8 @@ snapshots:+ [email protected]: {}+node@runtime:24.21.0: {}@@ -21377,6 +21994,15 @@ snapshots:transitivePeerDependencies:- encoding+ dependencies:+ deep-is: 0.1.4+ fast-levenshtein: 2.0.6+ levn: 0.4.1+ prelude-ls: 1.2.1+ type-check: 0.4.0+ word-wrap: 1.2.5+dependencies:chalk: 5.6.2@@ -21513,6 +22139,10 @@ snapshots:dependencies:p-limit: 2.3.0+ dependencies:+ p-limit: 3.1.0+@@ -21700,6 +22330,8 @@ snapshots:base64-js: 1.5.1xmlbuilder: 15.1.1+ [email protected]: {}+@@ -21783,6 +22415,8 @@ snapshots:tunnel-agent: 0.6.0optional: true+ [email protected]: {}+@@ -22052,6 +22686,10 @@ snapshots:+ dependencies:+ hookified: 2.2.0+dependencies:es-define-property: 1.0.1@@ -22081,6 +22719,8 @@ snapshots:'@jitl/quickjs-wasmfile-release-sync': 0.32.0quickjs-emscripten-core: 0.32.0+ [email protected]: {}+[email protected](@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected]):dependencies:'@radix-ui/primitive': 1.1.4@@ -22399,6 +23039,10 @@ snapshots:gopd: 1.2.0set-function-name: 2.0.2+ dependencies:+ jsesc: 3.1.0+dependencies:unist-util-visit: 5.1.0@@ -22554,6 +23198,8 @@ snapshots:+ [email protected]: {}+@@ -23274,6 +23920,8 @@ snapshots:dependencies:min-indent: 1.0.1+ [email protected]: {}+optional: true@@ -23587,6 +24235,10 @@ snapshots:+ dependencies:+ prelude-ls: 1.2.1+optional: true@@ -23763,6 +24415,16 @@ snapshots:escalade: 3.2.0picocolors: 1.1.1+ dependencies:+ browserslist: 4.29.4+ escalade: 3.2.0+ picocolors: 1.1.1++ dependencies:+ punycode: 2.3.1+dependencies:react: 19.2.5@@ -24017,6 +24679,8 @@ snapshots:+ [email protected]: {}+dependencies:ansi-styles: 4.3.0@@ -24088,6 +24752,8 @@ snapshots:+ [email protected]: {}+diff --git a/test-support/fixtures/no-net-connect/no-net-connect.fixture.ts b/test-support/fixtures/no-net-connect/no-net-connect.fixture.tsindex 11516947b..8e607ed4a 100644--- a/test-support/fixtures/no-net-connect/no-net-connect.fixture.ts+++ b/test-support/fixtures/no-net-connect/no-net-connect.fixture.ts@@ -105,14 +105,9 @@ describe('suite hook declarations cannot authorize sibling suite blocks', () =>});describe('a block that lands after its scope drained is reported, not enforced', () => {- let resolveOrphan: (outcome: unknown) => void;- let resolveLateDeclaration: (outcome: unknown) => void;- const orphanOutcome = new Promise<unknown>((resolve) => {- resolveOrphan = resolve;- });- const lateDeclarationOutcome = new Promise<unknown>((resolve) => {- resolveLateDeclaration = resolve;- });+ const { promise: orphanOutcome, resolve: resolveOrphan } = Promise.withResolvers<unknown>();+ const { promise: lateDeclarationOutcome, resolve: resolveLateDeclaration } =+ Promise.withResolvers<unknown>();test('schedules a forbidden fetch that lands after it returns', () => {expect(() => {@@ -145,18 +140,12 @@ test('unrelated console error passes', () => {});describe('concurrent siblings isolate exact hostname expectations', () => {- let releaseAlpha: (() => void) | undefined;- let releaseBeta: (() => void) | undefined;- const alphaDeclared = new Promise<void>((resolve) => {- releaseAlpha = resolve;- });- const betaDeclared = new Promise<void>((resolve) => {- releaseBeta = resolve;- });+ const { promise: alphaDeclared, resolve: releaseAlpha } = Promise.withResolvers<void>();+ const { promise: betaDeclared, resolve: releaseBeta } = Promise.withResolvers<void>();test.concurrent('alpha request', async ({ expect }) => {expectBlockedNetworkRequest('alpha.invalid');- releaseAlpha?.();+ releaseAlpha();await betaDeclared;const error = await captureBlockedRequest('alpha.invalid');expect(error).toBeInstanceOf(NetConnectBlockedError);@@ -165,43 +154,33 @@ describe('concurrent siblings isolate exact hostname expectations', () => {test.concurrent('beta request', async ({ expect }) => {await alphaDeclared;expectBlockedNetworkRequest('beta.invalid');- releaseBeta?.();+ releaseBeta();const error = await captureBlockedRequest('beta.invalid');expect(error).toBeInstanceOf(NetConnectBlockedError);});});describe('concurrent unexpected block stays with its owning test', () => {- let releaseOffenderStarted: (() => void) | undefined;- let releaseInnocentReady: (() => void) | undefined;- let releaseOffenderBlocked: (() => void) | undefined;- let releaseInnocentDone: (() => void) | undefined;- const offenderStarted = new Promise<void>((resolve) => {- releaseOffenderStarted = resolve;- });- const innocentReady = new Promise<void>((resolve) => {- releaseInnocentReady = resolve;- });- const offenderBlocked = new Promise<void>((resolve) => {- releaseOffenderBlocked = resolve;- });- const innocentDone = new Promise<void>((resolve) => {- releaseInnocentDone = resolve;- });+ const { promise: offenderStarted, resolve: releaseOffenderStarted } =+ Promise.withResolvers<void>();+ const { promise: innocentReady, resolve: releaseInnocentReady } = Promise.withResolvers<void>();+ const { promise: offenderBlocked, resolve: releaseOffenderBlocked } =+ Promise.withResolvers<void>();+ const { promise: innocentDone, resolve: releaseInnocentDone } = Promise.withResolvers<void>();test.concurrent('offender swallows its unexpected block', async ({ expect }) => {- releaseOffenderStarted?.();+ releaseOffenderStarted();await innocentReady;const error = await captureBlockedRequest('concurrent-offender.invalid');- releaseOffenderBlocked?.();+ releaseOffenderBlocked();await innocentDone;expect(error).toBeInstanceOf(NetConnectBlockedError);});test.concurrent('innocent sibling passes', async ({ expect }) => {await offenderStarted;- releaseInnocentReady?.();+ releaseInnocentReady();await expect(offenderBlocked).resolves.toBeUndefined();- releaseInnocentDone?.();+ releaseInnocentDone();});});diff --git a/test-support/tsconfig.no-net-connect.json b/test-support/tsconfig.no-net-connect.jsonindex c170ba911..f5b31ba07 100644--- a/test-support/tsconfig.no-net-connect.json+++ b/test-support/tsconfig.no-net-connect.json@@ -2,6 +2,7 @@"extends": "../tsconfig.json","compilerOptions": {"noEmit": true,+ "lib": ["ES2024"],"types": ["node"],"allowImportingTsExtensions": true},