diff --git a/.ai/contexts/session-cache.md b/.ai/contexts/session-cache.md index f45499a40..5bb46481c 100644 --- a/.ai/contexts/session-cache.md +++ b/.ai/contexts/session-cache.md @@ -3261,6 +3261,35 @@ refresh and reconcile. ## Harness folders (#821) +Scan tests isolate Codex history with `test/fixtures/isolated-codex-home.cjs` +(#1150). Call it with the `node:test` module for file scope, or a test context +for fixture scope, before starting a scan. It creates an empty temporary +`CODEX_HOME`, restores the exact prior environment value (including absence), +and removes its directory in the registered teardown. Codex-specific fixtures +can populate the returned `home`; synchronous callback fixtures can call the +returned `restore` in `finally` instead of registering a test hook. Repeated +calls per context are supported. A module-level stack defers released outer homes until +inner homes have been released, so FIFO hooks on one context and nested +file/test hooks both restore in LIFO order; repeated restore calls are inert. +The `warm-start-1144` and `continuation-718` fixtures install it for callers. +The existing `isolated-home` fixture is schedule-specific and inspects Claude +projects in the original home, so scan tests do not reuse it. + +`test/isolated-codex-home.test.js` guards direct scan entry points, synchronous +and asynchronous reconciliation, and projects-query/worker callers. Its AST +check requires file-scope isolation or isolation reached from every scan test +callback, including calls to local setup functions and shared fixture functions. +Importing a helper or only constants from a shared fixture does not count. +This is a bounded call-graph check, not control-flow or alias analysis. Explicit +exemptions carry reasons for mocks, source checks, pure transformations, and +child adapters whose guarded parents provide the inherited environment. +Real node:test hooks cover repeated calls and nested file/test lifetimes in +`isolated-codex-home.test.js` and `isolated-codex-home-hooks.test.js`. +When adding a scan caller, use the helper or a shared fixture that installs it; +do not add a guard exemption for a real scan. The regression witness uses a +disposable HOME/USERPROFILE with synthetic `.codex/sessions` rollouts and an +unset CODEX_HOME, never the developer's history. No production default changes. + A folder key with a harness prefix (`codex/2026/08/26`) belongs to a CLI whose store is not `~/.claude/projects`; `harnessForFolder` (`harnesses/index.js`) picks the adapter. `refreshFolder` dispatches such a key to diff --git a/test/background-membership-719.test.js b/test/background-membership-719.test.js index f02d713e8..5e82c6bbc 100644 --- a/test/background-membership-719.test.js +++ b/test/background-membership-719.test.js @@ -1,5 +1,6 @@ 'use strict'; const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); diff --git a/test/bridge-divergent-history.test.js b/test/bridge-divergent-history.test.js index eb289fa43..11e178028 100644 --- a/test/bridge-divergent-history.test.js +++ b/test/bridge-divergent-history.test.js @@ -1,4 +1,5 @@ const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); diff --git a/test/bridge-history-refresh.test.js b/test/bridge-history-refresh.test.js index 64e5c4078..6b53978ad 100644 --- a/test/bridge-history-refresh.test.js +++ b/test/bridge-history-refresh.test.js @@ -1,4 +1,5 @@ const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); diff --git a/test/codex-index.test.js b/test/codex-index.test.js index 360d58eee..474ad1dc4 100644 --- a/test/codex-index.test.js +++ b/test/codex-index.test.js @@ -47,14 +47,11 @@ function fakeDb() { function fixture(t) { const root = fs.mkdtempSync(path.join(os.tmpdir(), 'codex-index-')); const projectsDir = path.join(root, 'projects'); - const codexHome = path.join(root, 'codex-home'); + const { home: codexHome } = require('./fixtures/isolated-codex-home.cjs')(t); const project = path.join(root, 'project'); const day = path.join(codexHome, 'sessions', '2026', '08', '26'); fs.mkdirSync(projectsDir); fs.mkdirSync(project); fs.mkdirSync(day, { recursive: true }); - const previous = process.env.CODEX_HOME; - process.env.CODEX_HOME = codexHome; t.after(() => { - if (previous === undefined) delete process.env.CODEX_HOME; else process.env.CODEX_HOME = previous; fs.rmSync(root, { recursive: true, force: true }); }); const file = id => path.join(day, `rollout-2026-08-26T11-55-02-${id}.jsonl`); diff --git a/test/codex-launch-ownership.test.js b/test/codex-launch-ownership.test.js index 3ed310658..46d29c567 100644 --- a/test/codex-launch-ownership.test.js +++ b/test/codex-launch-ownership.test.js @@ -1,6 +1,7 @@ 'use strict'; const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); @@ -15,8 +16,8 @@ const REAL_ID = '11111111-1111-4111-8111-111111111111'; for (const lifecycle of ['exited', 'removed', 'adopted then removed']) { test(`a ${lifecycle} sibling keeps ownership of its issued launch tag`, { skip: !openStore.supported }, t => { const root = fs.mkdtempSync(path.join(os.tmpdir(), 'codex-ownership-')); - const previous = { CODEX_HOME: process.env.CODEX_HOME, SWITCHBOARD_DATA_DIR: process.env.SWITCHBOARD_DATA_DIR }; - process.env.CODEX_HOME = path.join(root, 'codex'); + const previous = { SWITCHBOARD_DATA_DIR: process.env.SWITCHBOARD_DATA_DIR }; + require('./fixtures/isolated-codex-home.cjs')(t); process.env.SWITCHBOARD_DATA_DIR = path.join(root, 'data'); const day = path.join(process.env.CODEX_HOME, 'sessions', '2026', '11', '19'); fs.mkdirSync(day, { recursive: true }); diff --git a/test/continuation-callers-identity.test.js b/test/continuation-callers-identity.test.js index b568fd8ad..097b368bc 100644 --- a/test/continuation-callers-identity.test.js +++ b/test/continuation-callers-identity.test.js @@ -1,6 +1,7 @@ 'use strict'; const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); diff --git a/test/disabled-claude-index.test.js b/test/disabled-claude-index.test.js index 6ba7522c2..b5e92f418 100644 --- a/test/disabled-claude-index.test.js +++ b/test/disabled-claude-index.test.js @@ -1,6 +1,7 @@ 'use strict'; const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); @@ -40,7 +41,6 @@ function scan(f, disabledHarnesses, extra = {}) { const messages = []; const worker = new Worker(path.join(__dirname, '../workers/scan-projects.js'), { workerData: { projectsDir: f.projectsDir, disabledHarnesses, ...extra }, - env: { ...process.env, CODEX_HOME: path.join(f.root, 'codex') }, }); worker.on('message', message => messages.push(message)); worker.on('error', reject); diff --git a/test/fixtures/continuation-718.cjs b/test/fixtures/continuation-718.cjs index 41c800c3b..f1714727c 100644 --- a/test/fixtures/continuation-718.cjs +++ b/test/fixtures/continuation-718.cjs @@ -14,10 +14,8 @@ const line = value => JSON.stringify(value) + '\n'; function barrier() { let resolve, reject; const promise = new Promise((a, b) => { resolve = a; reject = b; }); return { promise, resolve, reject }; } function fixture(t) { const root = fs.mkdtempSync(path.join(os.tmpdir(), 'sb-718-')); - const previousCodexHome = process.env.CODEX_HOME; - process.env.CODEX_HOME = path.join(root, 'codex'); + require('./isolated-codex-home.cjs')(t); t.after(() => { - if (previousCodexHome === undefined) delete process.env.CODEX_HOME; else process.env.CODEX_HOME = previousCodexHome; fs.rmSync(root, { recursive: true, force: true }); }); const folder = encodeProjectPath(root), dir = path.join(root, folder); diff --git a/test/fixtures/get-projects-during-scan.cjs b/test/fixtures/get-projects-during-scan.cjs index 37fd36dd3..a7e63e59e 100644 --- a/test/fixtures/get-projects-during-scan.cjs +++ b/test/fixtures/get-projects-during-scan.cjs @@ -9,6 +9,7 @@ const { Worker } = require('node:worker_threads'); const { createSessionIndexWriter } = require('../../session-index-writer'); const { createProjectsWorkerClient } = require('../../projects-worker-client'); const { encodeProjectPath } = require('../../encode-project-path'); +const { restore } = require('./isolated-codex-home.cjs')(); async function run() { const warm = process.argv[2].startsWith('warm-'); @@ -128,4 +129,4 @@ async function run() { } } -run().catch(error => { console.error(error); process.exitCode = 1; }); +run().finally(restore).catch(error => { console.error(error); process.exitCode = 1; }); diff --git a/test/fixtures/isolated-codex-home.cjs b/test/fixtures/isolated-codex-home.cjs new file mode 100644 index 000000000..4fa129621 --- /dev/null +++ b/test/fixtures/isolated-codex-home.cjs @@ -0,0 +1,28 @@ +'use strict'; + +const fs = require('node:fs'); +const os = require('node:os'); +const path = require('node:path'); +const homes = []; + +function isolateCodexHome(t) { + const previous = process.env.CODEX_HOME; + const home = fs.mkdtempSync(path.join(os.tmpdir(), 'switchboard-codex-home-')); + const frame = { previous, home, released: false }; + homes.push(frame); + process.env.CODEX_HOME = home; + function restore() { + if (frame.released) return; + frame.released = true; + while (homes.at(-1)?.released) { + const current = homes.pop(); + if (current.previous === undefined) delete process.env.CODEX_HOME; + else process.env.CODEX_HOME = current.previous; + fs.rmSync(current.home, { recursive: true, force: true }); + } + } + t?.after(restore); + return { home, restore }; +} + +module.exports = isolateCodexHome; diff --git a/test/fixtures/warm-start-1144.cjs b/test/fixtures/warm-start-1144.cjs index 00366449f..ba1ff798b 100644 --- a/test/fixtures/warm-start-1144.cjs +++ b/test/fixtures/warm-start-1144.cjs @@ -8,6 +8,7 @@ const { createSessionIndexWriter } = require('../../session-index-writer'); const { encodeProjectPath } = require('../../encode-project-path'); async function fixture(t, { separateReader = false } = {}) { + require('./isolated-codex-home.cjs')(t); const root = fs.mkdtempSync(path.join(os.tmpdir(), 'startup-1144-')); const previous = process.env.SWITCHBOARD_DATA_DIR; process.env.SWITCHBOARD_DATA_DIR = path.join(root, 'data'); diff --git a/test/get-projects-after-delete.test.js b/test/get-projects-after-delete.test.js index fa73594c8..18f2d97ad 100644 --- a/test/get-projects-after-delete.test.js +++ b/test/get-projects-after-delete.test.js @@ -1,6 +1,7 @@ 'use strict'; const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); diff --git a/test/harness-codex-launch.test.js b/test/harness-codex-launch.test.js index b4a30509a..fa6a6ff2f 100644 --- a/test/harness-codex-launch.test.js +++ b/test/harness-codex-launch.test.js @@ -1,6 +1,7 @@ 'use strict'; const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); @@ -157,13 +158,9 @@ test('open-terminal resumes a cached Codex row with codex argv and starts fresh test('a pending Codex launch is re-keyed onto its rollout through the fork re-key path', async t => { const transitions = require('../session-transitions'); - const home = fs.mkdtempSync(path.join(os.tmpdir(), 'codex-rekey-')); - const previous = process.env.CODEX_HOME; - process.env.CODEX_HOME = home; + const { home } = require('./fixtures/isolated-codex-home.cjs')(t); t.after(() => { - if (previous === undefined) delete process.env.CODEX_HOME; else process.env.CODEX_HOME = previous; transitions.init({ activeSessions: new Map() }); - fs.rmSync(home, { recursive: true, force: true }); }); const day = path.join(home, 'sessions', '2026', '08', '26'); fs.mkdirSync(day, { recursive: true }); @@ -196,13 +193,9 @@ test('a pending Codex launch is re-keyed onto its rollout through the fork re-ke function pendingForkFixture(t) { const transitions = require('../session-transitions'); - const home = fs.mkdtempSync(path.join(os.tmpdir(), 'codex-forks-')); - const previous = process.env.CODEX_HOME; - process.env.CODEX_HOME = home; + const { home } = require('./fixtures/isolated-codex-home.cjs')(t); t.after(() => { - if (previous === undefined) delete process.env.CODEX_HOME; else process.env.CODEX_HOME = previous; transitions.init({ activeSessions: new Map() }); - fs.rmSync(home, { recursive: true, force: true }); }); const day = path.join(home, 'sessions', '2026', '08', '26'); fs.mkdirSync(day, { recursive: true }); diff --git a/test/harness-codex.test.js b/test/harness-codex.test.js index 155027fbc..70b7f486e 100644 --- a/test/harness-codex.test.js +++ b/test/harness-codex.test.js @@ -1,6 +1,7 @@ 'use strict'; const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); @@ -40,12 +41,9 @@ function withFixture(files, fn) { } function withCodexHome(fn) { - const home = fs.mkdtempSync(path.join(os.tmpdir(), 'codex-home-')); - const previous = process.env.CODEX_HOME; - process.env.CODEX_HOME = home; + const { home, restore } = require('./fixtures/isolated-codex-home.cjs')(); try { return fn(home); } finally { - if (previous === undefined) delete process.env.CODEX_HOME; else process.env.CODEX_HOME = previous; - fs.rmSync(home, { recursive: true, force: true }); + restore(); } } diff --git a/test/harness-settings.test.js b/test/harness-settings.test.js index b7be6f65c..63f0a4889 100644 --- a/test/harness-settings.test.js +++ b/test/harness-settings.test.js @@ -1,6 +1,7 @@ 'use strict'; const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); @@ -38,13 +39,10 @@ test('the writer refuses a global patch that switches every CLI off', () => { test('a switched-off CLI is neither listed nor shown, its rows are kept', t => { const root = fs.mkdtempSync(path.join(os.tmpdir(), 'codex-toggle-')); - const codexHome = path.join(root, 'codex-home'); + const { home: codexHome } = require('./fixtures/isolated-codex-home.cjs')(t); const day = path.join(codexHome, 'sessions', '2026', '08', '26'); fs.mkdirSync(day, { recursive: true }); - const previous = process.env.CODEX_HOME; - process.env.CODEX_HOME = codexHome; t.after(() => { - if (previous === undefined) delete process.env.CODEX_HOME; else process.env.CODEX_HOME = previous; fs.rmSync(root, { recursive: true, force: true }); }); fs.writeFileSync(path.join(day, `rollout-2026-08-26T11-55-02-${ID}.jsonl`), [ diff --git a/test/harness-worktree-grouping.test.js b/test/harness-worktree-grouping.test.js index ca59d151c..3ae17aa18 100644 --- a/test/harness-worktree-grouping.test.js +++ b/test/harness-worktree-grouping.test.js @@ -1,4 +1,5 @@ const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); @@ -163,8 +164,8 @@ test('moved transcripts recognize uppercase worktree layouts only on win32', t = for (const deleted of [false, true]) { test(`Claude and Codex rows group under one repository and retain launch identity (deleted=${deleted})`, storeOptions, async t => { const h = fixture(t); - const previous = { CODEX_HOME: process.env.CODEX_HOME, SWITCHBOARD_DATA_DIR: process.env.SWITCHBOARD_DATA_DIR }; - process.env.CODEX_HOME = path.join(h.root, 'codex'); + const previous = { SWITCHBOARD_DATA_DIR: process.env.SWITCHBOARD_DATA_DIR }; + require('./fixtures/isolated-codex-home.cjs')(t); process.env.SWITCHBOARD_DATA_DIR = path.join(h.root, 'data'); const db = openStore(); h.cleanup.before = () => { diff --git a/test/isolated-codex-home-hooks.test.js b/test/isolated-codex-home-hooks.test.js new file mode 100644 index 000000000..ee22df09a --- /dev/null +++ b/test/isolated-codex-home-hooks.test.js @@ -0,0 +1,24 @@ +'use strict'; +const test = require('node:test'); +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const isolate = require('./fixtures/isolated-codex-home.cjs'); +const original = process.env.CODEX_HOME; +const outer = isolate(test); + +test('nested test isolation restores the file-scoped home', async t => { + let inner; + await t.test('test-scoped home', child => { + inner = isolate(child); + assert.notEqual(inner.home, outer.home); + assert.equal(process.env.CODEX_HOME, inner.home); + }); + assert.equal(process.env.CODEX_HOME, outer.home); + assert.equal(fs.existsSync(outer.home), true); + assert.equal(fs.existsSync(inner.home), false); +}); + +test.after(() => { + assert.equal(process.env.CODEX_HOME, original, 'file hook restores the original home'); + assert.equal(fs.existsSync(outer.home), false); +}); diff --git a/test/isolated-codex-home.test.js b/test/isolated-codex-home.test.js new file mode 100644 index 000000000..56bf5e18b --- /dev/null +++ b/test/isolated-codex-home.test.js @@ -0,0 +1,177 @@ +'use strict'; +const test = require('node:test'); +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const path = require('node:path'); + +test('Codex isolation restores absent and existing values with real test hooks', async t => { + const filename = path.join(__dirname, 'fixtures/isolated-codex-home.cjs'); + assert.ok(fs.existsSync(filename), 'the shared Codex home isolation helper must exist'); + const isolateCodexHome = require(filename); + const original = process.env.CODEX_HOME; + try { + for (const previous of [undefined, '', 'previous-disposable-codex-home']) { + if (previous === undefined) delete process.env.CODEX_HOME; + else process.env.CODEX_HOME = previous; + let home; + await t.test(`previous value: ${String(previous)}`, child => { + ({ home } = isolateCodexHome(child)); + assert.equal(process.env.CODEX_HOME, home); + assert.deepEqual(fs.readdirSync(home), []); + fs.mkdirSync(path.join(home, 'sessions')); + fs.writeFileSync(path.join(home, 'sessions/fixture.jsonl'), '{}\n'); + }); + assert.equal(process.env.CODEX_HOME, previous); + assert.equal(Object.hasOwn(process.env, 'CODEX_HOME'), previous !== undefined); + assert.equal(fs.existsSync(home), false); + } + } finally { + if (original === undefined) delete process.env.CODEX_HOME; + else process.env.CODEX_HOME = original; + } +}); + +test('two isolations on one test context restore the original value and remove both homes', async t => { + const isolate = require('./fixtures/isolated-codex-home.cjs'); + const previous = process.env.CODEX_HOME; + let first, second; + try { + await t.test('two hooks on the same context', child => { + first = isolate(child); + second = isolate(child); + assert.equal(process.env.CODEX_HOME, second.home); + }); + assert.equal(process.env.CODEX_HOME, previous, 'FIFO test hooks must restore the original CODEX_HOME'); + assert.equal(fs.existsSync(first.home), false); + assert.equal(fs.existsSync(second.home), false); + second.restore(); first.restore(); + assert.equal(process.env.CODEX_HOME, previous, 'restoration is idempotent'); + } finally { + if (previous === undefined) delete process.env.CODEX_HOME; + else process.env.CODEX_HOME = previous; + } +}); + +const scanTokens = /populateCacheViaWorker|scan-projects|readHarnessFolder|harnesses\/codex|scanFoldersViaWorker|reconcileCacheFromFilesystem|workers\/projects-query|projects-worker-/; + +function hasIsolation(source, shared = false, script = false) { + const ast = require('espree').parse(source, { ecmaVersion: 'latest', sourceType: 'commonjs', range: true }); + const functions = new Map(), fixtures = new Set(), isolates = new Set(), callbacks = []; + const isFunction = node => /^(?:FunctionDeclaration|FunctionExpression|ArrowFunctionExpression)$/.test(node?.type); + const required = node => node?.type === 'CallExpression' && node.callee.name === 'require' ? node.arguments[0]?.value : null; + const sharedPath = value => /(?:warm-start-1144|continuation-718)\.cjs$/.test(value || ''); + const helperPath = value => /isolated-codex-home\.cjs$/.test(value || ''); + function walk(node, visit) { + if (!node || typeof node !== 'object') return; + if (node.type) visit(node); + for (const value of Object.values(node)) { + if (Array.isArray(value)) value.forEach(child => walk(child, visit)); + else if (value && typeof value === 'object') walk(value, visit); + } + } + walk(ast, node => { + if (node.type === 'FunctionDeclaration') functions.set(node.id.name, node); + if (node.type === 'VariableDeclarator') { + if (isFunction(node.init)) functions.set(node.id.name, node.init); + if (helperPath(required(node.init))) isolates.add(node.id.name); + if (sharedPath(required(node.init)) && node.id.type === 'ObjectPattern') { + for (const property of node.id.properties) if (property.key?.name === 'fixture') fixtures.add(property.value.name); + } + } + if (node.type === 'CallExpression' && (node.callee.name === 'test' || node.callee.property?.name === 'test')) { + const callback = node.arguments.find(isFunction); + if (callback) callbacks.push(callback); + } + }); + function isolationCall(node) { + if (node.type !== 'CallExpression' || !node.arguments.length) return false; + const callee = node.callee; + return helperPath(required(callee)) || isolates.has(callee.name) || fixtures.has(callee.name) + || (callee.property?.name === 'fixture' && sharedPath(required(callee.object))); + } + if (script && ast.body.some(node => node.type === 'VariableDeclaration' && node.declarations.some(declaration => + declaration.init?.type === 'CallExpression' && helperPath(required(declaration.init.callee))))) return true; + if (ast.body.some(node => node.type === 'ExpressionStatement' && isolationCall(node.expression) + && node.expression.arguments[0]?.name === 'test')) return true; + function inspect(node, seen = new Set()) { + if (seen.has(node)) return { scan: false, isolated: false }; + seen.add(node); + let scan = scanTokens.test(source.slice(node.range[0], node.range[1])), isolated = false; + function visit(current) { + if (current !== node && isFunction(current)) return; + if (isolationCall(current)) isolated = true; + if (current.type === 'CallExpression' && functions.has(current.callee.name)) { + const result = inspect(functions.get(current.callee.name), seen); + scan ||= result.scan; isolated ||= result.isolated; + } + for (const value of Object.values(current)) { + if (Array.isArray(value)) value.filter(child => child?.type).forEach(visit); + else if (value?.type) visit(value); + } + } + visit(node); + return { scan, isolated }; + } + if (shared) return functions.has('fixture') && inspect(functions.get('fixture')).isolated; + const results = callbacks.map(callback => inspect(callback)); + const scans = results.filter(result => result.scan); + return scans.length > 0 ? scans.every(result => result.isolated) : results.length > 0 && results.every(result => result.isolated); +} + +test('guard rejects unused imports and isolation belonging to a different test', () => { + for (const source of [ + "const isolate = require('./fixtures/isolated-codex-home.cjs'); test('scan', () => cache.populateCacheViaWorker());", + "const { OLD } = require('./fixtures/continuation-718.cjs'); test('scan', () => cache.reconcileCacheFromFilesystem());", + "test('isolated', t => { require('./fixtures/isolated-codex-home.cjs')(t); cache.populateCacheViaWorker(); }); test('unsafe', () => cache.populateCacheViaWorker());", + "function unused() { require('./fixtures/isolated-codex-home.cjs')(test); } test('scan', () => cache.populateCacheViaWorker());", + ]) assert.equal(hasIsolation(source), false, `unprotected scan: ${source}`); +}); + +test('guard accepts file isolation and actually invoked scoped fixtures', () => { + for (const source of [ + "require('./fixtures/isolated-codex-home.cjs')(test); test('scan', () => cache.populateCacheViaWorker());", + "test('scan', t => { require('./fixtures/isolated-codex-home.cjs')(t); cache.reconcileCacheFromFilesystem(); });", + "const { fixture: setup } = require('./fixtures/continuation-718.cjs'); test('scan', t => { setup(t); cache.reconcileCacheFromFilesystem(); });", + ]) assert.equal(hasIsolation(source), true, source); +}); + +test('scan callers opt into the shared Codex home isolation fixture', () => { + const exempt = new Map([ + ['archive-writer-compatibility.test.js', 'scan API is stubbed'], + ['check-changelog.test.js', 'scan token occurs in changelog fixture text'], + ['codex-viewer-and-guard.test.js', 'pure viewer transformations and source checks'], + ['continuation-choice-sweep.test.js', 'scan API is stubbed'], + ['get-projects-archive-conflicts.test.js', 'scan API is stubbed'], + ['get-projects-archive-writer.test.js', 'scan API is stubbed'], + ['get-projects-cold-start-reconcile.test.js', 'scan and reconcile APIs are stubbed'], + ['get-projects-worker-wiring.test.js', 'scan and reconcile APIs are stubbed'], + ['harness-activity.test.js', 'pure activity transformations'], + ['project-delete-main.test.js', 'scan API is stubbed'], + ['session-restore-cold-cache.test.js', 'scan API is stubbed'], + ['head-turn-spinner.test.js', 'scanFoldersViaWorker is a counting stub'], + ['projects-worker-client.test.js', 'injected EventEmitter worker; never runs projects-query'], + ['worker-exit-grace.test.js', 'injected EventEmitter worker; never runs projects-query'], + ['session-index-writer-guard.test.js', 'source-only writer boundary guard'], + ['fixtures/projects-worker-718.cjs', 'VM adapter inherits caller environment; caller files are guarded'], + ['fixtures/projects-worker-delayed.cjs', 'worker inherits environment from guarded equivalence/slow-reconcile callers'], + ['fixtures/projects-worker-equivalence.cjs', 'child inherits environment from guarded projects-worker-equivalence.test.js'], + ['fixtures/projects-worker-progress.cjs', 'child inherits environment from guarded projects-worker-equivalence.test.js'], + ['fixtures/projects-worker-slow-reconcile.cjs', 'child inherits environment from guarded projects-worker-equivalence.test.js'], + ]); + const missing = []; + function walk(dir) { + for (const entry of fs.readdirSync(dir, { withFileTypes: true })) { + const filename = path.join(dir, entry.name); + if (entry.isDirectory()) { walk(filename); continue; } + if (!/\.(?:c?js)$/.test(entry.name) || filename === __filename) continue; + const relative = path.relative(__dirname, filename).split(path.sep).join('/'); + const source = fs.readFileSync(filename, 'utf8'); + const shared = ['fixtures/warm-start-1144.cjs', 'fixtures/continuation-718.cjs'].includes(relative); + if (!shared && !scanTokens.test(source)) continue; + if (exempt.has(relative)) continue; + if (!hasIsolation(source, shared, relative.endsWith('.cjs'))) missing.push(relative); + } + } + walk(__dirname); + assert.deepEqual(missing, [], 'scan callers must use the shared Codex isolation helper'); +}); diff --git a/test/projection-envelope-742.test.js b/test/projection-envelope-742.test.js index 746860486..2f6f4cb21 100644 --- a/test/projection-envelope-742.test.js +++ b/test/projection-envelope-742.test.js @@ -1,5 +1,6 @@ 'use strict'; const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); diff --git a/test/projects-worker-equivalence.test.js b/test/projects-worker-equivalence.test.js index 5f0cc3283..41ff28d97 100644 --- a/test/projects-worker-equivalence.test.js +++ b/test/projects-worker-equivalence.test.js @@ -1,6 +1,7 @@ 'use strict'; const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const { spawnSync } = require('node:child_process'); const fs = require('node:fs'); diff --git a/test/read-session-file-golden.test.js b/test/read-session-file-golden.test.js index d4d194ace..edc450f19 100644 --- a/test/read-session-file-golden.test.js +++ b/test/read-session-file-golden.test.js @@ -31,9 +31,8 @@ test('published content digest entries are append-only', () => { test('parser output requires a content version bump for Claude, bridge and Codex derivation', t => { const root = fs.mkdtempSync(path.join(os.tmpdir(), 'golden-index-1144-')); - const previous = process.env.CODEX_HOME; - process.env.CODEX_HOME = path.join(root, 'codex'); - t.after(() => { process.env.CODEX_HOME = previous; fs.rmSync(root, { recursive: true, force: true }); }); + require('./fixtures/isolated-codex-home.cjs')(t); + t.after(() => { fs.rmSync(root, { recursive: true, force: true }); }); const user = (uuid, day, text) => ({ type: 'user', uuid, timestamp: `2024-01-${day}T00:00:00.000Z`, message: { content: text } }); const bridge = { type: 'bridge-session', bridgeSessionId: 'cse_golden' }; const write = (name, entries) => { diff --git a/test/reconcile-cache.test.js b/test/reconcile-cache.test.js index 95c3a509b..45b047a43 100644 --- a/test/reconcile-cache.test.js +++ b/test/reconcile-cache.test.js @@ -1,4 +1,5 @@ const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('fs'); const os = require('os'); diff --git a/test/remote-indexing-e2e.test.js b/test/remote-indexing-e2e.test.js index 8f48bc453..791957535 100644 --- a/test/remote-indexing-e2e.test.js +++ b/test/remote-indexing-e2e.test.js @@ -12,6 +12,7 @@ // predicate, so a row written there is counted. const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('fs'); const os = require('os'); diff --git a/test/remote-scan-file-granularity.test.js b/test/remote-scan-file-granularity.test.js index d0cda6fd3..5decbf0b4 100644 --- a/test/remote-scan-file-granularity.test.js +++ b/test/remote-scan-file-granularity.test.js @@ -9,6 +9,7 @@ // ("Remote hosts file-level rescan"). const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('fs'); const os = require('os'); diff --git a/test/review-regressions-719b.test.js b/test/review-regressions-719b.test.js index 93fb615dd..55a3fd4e0 100644 --- a/test/review-regressions-719b.test.js +++ b/test/review-regressions-719b.test.js @@ -1,5 +1,6 @@ 'use strict'; const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); diff --git a/test/scan-projects-worker.test.js b/test/scan-projects-worker.test.js index 8899bb101..988041633 100644 --- a/test/scan-projects-worker.test.js +++ b/test/scan-projects-worker.test.js @@ -23,13 +23,7 @@ const { Worker } = require('worker_threads'); const { encodeProjectPath } = require('../encode-project-path'); const { readSessionFile } = require('../read-session-file'); const { fullIndexConfig } = require('../src/main/session-index/full-read-state'); -let originalCodexHome, isolatedCodexHome; -test.before(() => { - originalCodexHome = process.env.CODEX_HOME; - isolatedCodexHome = fs.mkdtempSync(path.join(os.tmpdir(), 'scan-a2-codex-')); - process.env.CODEX_HOME = isolatedCodexHome; -}); -test.after(() => { process.env.CODEX_HOME = originalCodexHome; fs.rmSync(isolatedCodexHome, { recursive: true, force: true }); }); +require('./fixtures/isolated-codex-home.cjs')(test); function startupScan(t, mutate, fault, derive) { const root = fs.mkdtempSync(path.join(os.tmpdir(), 'startup-a2-')); @@ -254,9 +248,7 @@ function runWorker(projectsDir, data = {}) { test('A2 explicit Claude scopes do not widen the coordinated Codex full phase', async t => { const root = fs.mkdtempSync(path.join(os.tmpdir(), 'codex-phase-a2-')); t.after(() => fs.rmSync(root, { recursive: true, force: true })); - const previous = process.env.CODEX_HOME; - process.env.CODEX_HOME = path.join(root, 'codex'); - t.after(() => { process.env.CODEX_HOME = previous; }); + require('./fixtures/isolated-codex-home.cjs')(t); const day = path.join(process.env.CODEX_HOME, 'sessions', '2026', '08', '26'); fs.mkdirSync(day, { recursive: true }); const id = '01a03f6c-fdf9-7c83-86e3-c388f81d765c'; diff --git a/test/session-cache-cold-start-progress.test.js b/test/session-cache-cold-start-progress.test.js index 53f404f96..928d4cd8e 100644 --- a/test/session-cache-cold-start-progress.test.js +++ b/test/session-cache-cold-start-progress.test.js @@ -21,6 +21,7 @@ // test/search-worker-db-failure.test.js (a different real worker). const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('fs'); const os = require('os'); diff --git a/test/session-cache-scan-retry.test.js b/test/session-cache-scan-retry.test.js index 51f9f99b5..57bcd1818 100644 --- a/test/session-cache-scan-retry.test.js +++ b/test/session-cache-scan-retry.test.js @@ -1,6 +1,7 @@ 'use strict'; const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const path = require('node:path'); diff --git a/test/session-cache-warm-start.test.js b/test/session-cache-warm-start.test.js index 503627a15..8af369c96 100644 --- a/test/session-cache-warm-start.test.js +++ b/test/session-cache-warm-start.test.js @@ -8,13 +8,7 @@ const { readSessionFile } = require('../read-session-file'); const openStore = require('./fixtures/conversation-store.cjs'); const { memoryWriter } = require('./fixtures/writer-memory.cjs'); const { encodeProjectPath } = require('../encode-project-path'); -let isolatedCodex, previousCodex; -test.before(() => { - previousCodex = process.env.CODEX_HOME; - isolatedCodex = fs.mkdtempSync(path.join(os.tmpdir(), 'warm-codex-1144-')); - process.env.CODEX_HOME = isolatedCodex; -}); -test.after(() => { process.env.CODEX_HOME = previousCodex; fs.rmSync(isolatedCodex, { recursive: true, force: true }); }); +require('./fixtures/isolated-codex-home.cjs')(test); function fixture(t) { const root = fs.mkdtempSync(path.join(os.tmpdir(), 'full-read-1144-')); @@ -394,9 +388,6 @@ test('A2 incremental restart equals a full rebuild of the same final transcript { skip: !openStore.supported && 'SQLite requires native binding or Node 22' }, async t => { const { fixture: startupFixture, logicalIndex } = require('./fixtures/warm-start-1144.cjs'); const f = await startupFixture(t); - const previousCodex = process.env.CODEX_HOME; - process.env.CODEX_HOME = path.join(f.root, 'codex'); - t.after(() => { process.env.CODEX_HOME = previousCodex; }); const day = path.join(process.env.CODEX_HOME, 'sessions', '2026', '08', '26'); fs.mkdirSync(day, { recursive: true }); const codexId = '01a03f6c-fdf9-7c83-86e3-c388f81d765c'; diff --git a/test/session-index-writer-producers.test.js b/test/session-index-writer-producers.test.js index a9f66a732..785534a20 100644 --- a/test/session-index-writer-producers.test.js +++ b/test/session-index-writer-producers.test.js @@ -11,13 +11,7 @@ const { createWriterCommands } = require('../session-index-commands'); const { createSessionIndexWriter } = require('../session-index-writer'); const os = require('node:os'); const openStore = require('./fixtures/conversation-store.cjs'); -let isolatedCodex, previousCodex; -test.before(() => { - previousCodex = process.env.CODEX_HOME; - isolatedCodex = fs.mkdtempSync(path.join(os.tmpdir(), 'producer-codex-1144-')); - process.env.CODEX_HOME = isolatedCodex; -}); -test.after(() => { process.env.CODEX_HOME = previousCodex; fs.rmSync(isolatedCodex, { recursive: true, force: true }); }); +require('./fixtures/isolated-codex-home.cjs')(test); function durableFixture(t) { const root = fs.mkdtempSync(path.join(os.tmpdir(), 'writer-1144-')); diff --git a/test/session-rename-680.test.js b/test/session-rename-680.test.js index f61cfd256..a99600d7e 100644 --- a/test/session-rename-680.test.js +++ b/test/session-rename-680.test.js @@ -1,5 +1,6 @@ 'use strict'; const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); diff --git a/test/sidebar-bg-names-db-631.test.js b/test/sidebar-bg-names-db-631.test.js index 1b9bba711..b5a1c8582 100644 --- a/test/sidebar-bg-names-db-631.test.js +++ b/test/sidebar-bg-names-db-631.test.js @@ -1,5 +1,6 @@ 'use strict'; const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); diff --git a/test/sidebar-bg-sessions-names-5645b.test.js b/test/sidebar-bg-sessions-names-5645b.test.js index a868c5ed3..2e15669f1 100644 --- a/test/sidebar-bg-sessions-names-5645b.test.js +++ b/test/sidebar-bg-sessions-names-5645b.test.js @@ -1,6 +1,7 @@ 'use strict'; const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('node:fs'); const os = require('node:os'); diff --git a/test/transcript-cwd-trust-cache.test.js b/test/transcript-cwd-trust-cache.test.js index a0fba9949..cf7a09203 100644 --- a/test/transcript-cwd-trust-cache.test.js +++ b/test/transcript-cwd-trust-cache.test.js @@ -1,4 +1,5 @@ const test = require('node:test'); +require('./fixtures/isolated-codex-home.cjs')(test); const assert = require('node:assert/strict'); const fs = require('fs'); const os = require('os');