diff --git a/config/main-blocking-sqlite-baseline.txt b/config/main-blocking-sqlite-baseline.txt index d4c38ca3f49..dbd65c33455 100644 --- a/config/main-blocking-sqlite-baseline.txt +++ b/config/main-blocking-sqlite-baseline.txt @@ -1,8 +1,8 @@ # Legacy synchronous sqlite uses per file; counts may only go DOWN. # Only explicit worker/utility entry files are exempt; their imports remain guarded. 3 src/main/ai-vault-search/query/session-search-engine.ts -5 src/main/ai-vault-search/query/session-search-postings.ts -7 src/main/ai-vault-search/query/session-search-retrieval.ts +6 src/main/ai-vault-search/query/session-search-postings.ts +8 src/main/ai-vault-search/query/session-search-retrieval.ts 2 src/main/ai-vault-search/query/session-search-snippet.ts 2 src/main/ai-vault-search/query/session-search-source-presence.ts 2 src/main/ai-vault-search/query/session-search-typo-repair.ts @@ -15,15 +15,15 @@ 13 src/main/ai-vault-search/storage/session-search-schema.ts 16 src/main/ai-vault-search/storage/session-search-store.ts 26 src/main/ai-vault-search/storage/session-search-tool-purge.ts -8 src/main/ai-vault-search/storage/session-search-write-buffer.ts +9 src/main/ai-vault-search/storage/session-search-write-buffer.ts 19 src/main/ai-vault/parse-cache/session-parse-cache-database.ts 13 src/main/ai-vault/parse-cache/session-scope-cwds-table.ts 2 src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-capture.ts -3 src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-list.ts +4 src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-list.ts 1 src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite-open.ts 6 src/main/ai-vault/scanners/opencode/sqlite/session-scanner-opencode-sqlite.ts -4 src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-sqlite-list.ts -8 src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-sqlite.ts +5 src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-sqlite-list.ts +9 src/main/ai-vault/scanners/opencode2/session-scanner-opencode2-sqlite.ts 5 src/main/browser-passwords/browser-password-chromium-import.ts 1 src/main/browser/cookies/chromium/prepare-import.ts 5 src/main/browser/cookies/sources/browser-cookie-firefox-import.ts @@ -39,14 +39,14 @@ 13 src/main/native-chat/agent-session-journal/database/journal-database.ts 1 src/main/native-chat/agent-session-journal/database/journal-host-database.ts 12 src/main/native-chat/agent-session-journal/durable-rows/journal-row-table.ts -17 src/main/native-chat/agent-session-journal/history-import/journal-pi-active-branch.ts +18 src/main/native-chat/agent-session-journal/history-import/journal-pi-active-branch.ts 15 src/main/native-chat/agent-session-journal/outcomes/journal-outcome-format.ts 6 src/main/native-chat/agent-session-journal/outcomes/journal-outcome-table.ts 6 src/main/native-chat/agent-session-journal/queued-messages/journal-queue-import.ts 5 src/main/native-chat/agent-session-journal/queued-messages/queued-message-schema.ts -9 src/main/native-chat/agent-session-journal/replay/journal-historical-inputs.ts -3 src/main/native-chat/agent-session-journal/replay/journal-read-row.ts -7 src/main/native-chat/agent-session-journal/replay/journal-retained-inputs.ts +10 src/main/native-chat/agent-session-journal/replay/journal-historical-inputs.ts +4 src/main/native-chat/agent-session-journal/replay/journal-read-row.ts +8 src/main/native-chat/agent-session-journal/replay/journal-retained-inputs.ts 1 src/main/native-chat/agent-session-journal/writing/command-receipt-schema.ts 8 src/main/native-chat/agent-session-journal/writing/command-receipt-table.ts 2 src/main/native-chat/agent-session-journal/writing/journal-goal-attachment-inverse.ts @@ -57,7 +57,7 @@ 1 src/main/opencode-usage/scanner.ts 12 src/main/persistence/moving-wsl-projects/desktop-state/wsl-move-orchestration-history-rewrite.ts 8 src/main/persistence/profile-state/automation-runs/profile-state-automation-runs-migration.ts -3 src/main/persistence/profile-state/automation-runs/profile-state-automation-runs-reader.ts +4 src/main/persistence/profile-state/automation-runs/profile-state-automation-runs-reader.ts 6 src/main/persistence/profile-state/automation-runs/profile-state-automation-runs-storage.ts 2 src/main/persistence/profile-state/automation-runs/profile-state-automation-runs-validation.ts 8 src/main/persistence/profile-state/automation-runs/profile-state-automation-runs-writer.ts @@ -69,18 +69,18 @@ 4 src/main/persistence/profile-state/database/profile-state-revision.ts 3 src/main/persistence/profile-state/database/profile-state-write-transaction.ts 2 src/main/persistence/profile-state/document-parts/profile-state-document-parts-reader.ts -23 src/main/persistence/profile-state/document-parts/profile-state-document-parts-storage.ts +25 src/main/persistence/profile-state/document-parts/profile-state-document-parts-storage.ts 3 src/main/persistence/profile-state/document-parts/profile-state-document-parts.ts 4 src/main/persistence/profile-state/document-parts/profile-state-legacy-document-refresh.ts -1 src/main/persistence/profile-state/documents/profile-state-document-reader.ts +2 src/main/persistence/profile-state/documents/profile-state-document-reader.ts 7 src/main/persistence/profile-state/documents/profile-state-documents.ts 8 src/main/persistence/profile-state/documents/profile-state-domain-writes.ts 4 src/main/persistence/profile-state/legacy-json/profile-state-json-acceptance.ts -1 src/main/persistence/profile-state/recovery/profile-state-section-repair.ts +2 src/main/persistence/profile-state/recovery/profile-state-section-repair.ts 3 src/main/rate-limits/providers/opencode-go/opencode-go-api-key-source.ts 2 src/main/runtime/agent-session/records/agent-session-record-lineage.ts 34 src/main/runtime/agent-session/records/agent-session-record-rows.ts -22 src/main/runtime/orchestration/db/dispatch-context/presentation-completion-source.ts +23 src/main/runtime/orchestration/db/dispatch-context/presentation-completion-source.ts 6 src/main/runtime/orchestration/db/dispatch-row-writer.ts 1 src/main/runtime/orchestration/db/federation/federated-stub-home-run-backfill.ts 9 src/main/runtime/orchestration/db/lifecycle-transition.ts @@ -94,7 +94,7 @@ 14 src/main/runtime/orchestration/db/schema/structured-worker-orca-session-backfill.ts 5 src/main/runtime/orchestration/db/worker-dispatch/worker-dispatch-settlement.ts 4 src/main/runtime/orchestration/workers/lifecycle/context-only-dispatch-release.ts -3 src/main/sqlite/node-sqlite-statement.ts +4 src/main/sqlite/node-sqlite-statement.ts 19 src/main/sqlite/row-cache/keyed-json-row-cache.ts 5 src/main/sqlite/sync-database.ts 8 src/main/sqlite/versioned-cache-database.ts diff --git a/config/scripts/static-analysis/process-boundaries/main-blocking-source-paths.mjs b/config/scripts/static-analysis/process-boundaries/main-blocking-source-paths.mjs index 0c09ff5ffd9..035176aed0b 100644 --- a/config/scripts/static-analysis/process-boundaries/main-blocking-source-paths.mjs +++ b/config/scripts/static-analysis/process-boundaries/main-blocking-source-paths.mjs @@ -18,7 +18,7 @@ for (const [file, reason] of Object.entries(entries)) { export function isMainBlockingSource(file) { return ( /\.[cm]?[jt]sx?$/.test(file) && - !file.endsWith('.d.ts') && + !/\.d\.[cm]?ts$/.test(file) && !isTestOnlySourcePath(file) && !Object.hasOwn(entries, file) ) diff --git a/config/scripts/static-analysis/process-boundaries/sqlite-call-use-collector.mjs b/config/scripts/static-analysis/process-boundaries/sqlite-call-use-collector.mjs index 8bd794911d0..ad689f0b3b3 100644 --- a/config/scripts/static-analysis/process-boundaries/sqlite-call-use-collector.mjs +++ b/config/scripts/static-analysis/process-boundaries/sqlite-call-use-collector.mjs @@ -1,7 +1,7 @@ import ts from 'typescript-api' import { propertyName, unwrap } from '../module-requests/static-module-specifiers.mjs' -const METHODS = new Set(['prepare', 'run', 'get', 'all', 'exec']) +const METHODS = new Set(['prepare', 'run', 'get', 'all', 'iterate', 'exec']) const SQLITE_MODULE = /^(?:node:sqlite|better-sqlite3)$|(?:^|\/)(?:sync-database|sqlite-statement)(?:\.[cm]?[jt]s)?$/ diff --git a/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-main-blocking-api-ratchet.mjs b/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-main-blocking-api-ratchet.mjs index fd50c178285..3be64ba86ca 100644 --- a/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-main-blocking-api-ratchet.mjs +++ b/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-main-blocking-api-ratchet.mjs @@ -75,7 +75,7 @@ export function countBlockingApis(sources) { let ipc = 0 function visit(node) { if ( - file.startsWith('src/preload/') && + (file.startsWith('src/preload/') || file.startsWith('src/shared/')) && ts.isCallExpression(node) && (ts.isPropertyAccessExpression(node.expression) || ts.isElementAccessExpression(node.expression)) && @@ -84,7 +84,7 @@ export function countBlockingApis(sources) { ipc++ } if ( - file.startsWith('src/main/') && + (file.startsWith('src/main/') || file.startsWith('src/shared/')) && ts.isBinaryExpression(node) && node.operatorToken.kind === ts.SyntaxKind.EqualsToken && (ts.isPropertyAccessExpression(node.left) || ts.isElementAccessExpression(node.left)) && diff --git a/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-main-blocking-api-ratchet.test.mjs b/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-main-blocking-api-ratchet.test.mjs index 0ca2ee538c8..5111b158265 100644 --- a/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-main-blocking-api-ratchet.test.mjs +++ b/config/scripts/static-analysis/ratchets/runtime-lifecycle/check-main-blocking-api-ratchet.test.mjs @@ -4,7 +4,10 @@ import { tmpdir } from 'node:os' import path from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' import { main as fsMain } from './check-main-sync-fs-ratchet.mjs' -import { collectSyncLaunchUses } from '../../process-boundaries/check-main-sync-spawn-ratchet.mjs' +import { + collectSyncLaunchUses, + isRatchetedSourcePath +} from '../../process-boundaries/check-main-sync-spawn-ratchet.mjs' import { countBlockingApis, main } from './check-main-blocking-api-ratchet.mjs' const file = 'src/main/consumer.ts' @@ -47,9 +50,9 @@ describe('main blocking API ratchets', () => { const db = new ${ctor}('db') db.exec('schema') const statement = db.prepare('select') - statement.run(); statement.get(); statement.all() + statement.run(); statement.get(); statement.all(); for (const row of statement.iterate()) {} db.prepare('select').get()`) - ).toEqual({ compression: 0, crypto: 0, atomics: 0, sqlite: 8, ipc: 0 }) + ).toEqual({ compression: 0, crypto: 0, atomics: 0, sqlite: 9, ipc: 0 }) }) it('guards typed SQL receivers without charging Map.get or async backup', () => { @@ -97,6 +100,17 @@ describe('main blocking API ratchets', () => { ).ipc ).toBe(1) expect(counts("ipcMain.on('get', (event) => { event.returnValue = value })").ipc).toBe(1) + expect(counts("ipc.sendSync('get'); event.returnValue = value", 'src/shared/ipc.ts').ipc).toBe( + 2 + ) + }) + + it.each(['ts', 'mts', 'cts'])('does not charge .d.%s declarations as executable code', (ext) => { + const declaration = `src/main/types.d.${ext}` + expect(isRatchetedSourcePath(declaration)).toBe(false) + expect( + counts("import { scryptSync } from 'crypto'; scryptSync('pw')", declaration).crypto + ).toBe(0) }) it('exempts only an explicit entry, leaving shared worker dependencies guarded', () => {