Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .ai/contexts/session-cache.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/background-membership-719.test.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
1 change: 1 addition & 0 deletions test/bridge-divergent-history.test.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
1 change: 1 addition & 0 deletions test/bridge-history-refresh.test.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
5 changes: 1 addition & 4 deletions test/codex-index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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`);
Expand Down
5 changes: 3 additions & 2 deletions test/codex-launch-ownership.test.js
Original file line number Diff line number Diff line change
@@ -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');
Expand All @@ -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 });
Expand Down
1 change: 1 addition & 0 deletions test/continuation-callers-identity.test.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion test/disabled-claude-index.test.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions test/fixtures/continuation-718.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion test/fixtures/get-projects-during-scan.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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-');
Expand Down Expand Up @@ -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; });
28 changes: 28 additions & 0 deletions test/fixtures/isolated-codex-home.cjs
Original file line number Diff line number Diff line change
@@ -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;
1 change: 1 addition & 0 deletions test/fixtures/warm-start-1144.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
1 change: 1 addition & 0 deletions test/get-projects-after-delete.test.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
13 changes: 3 additions & 10 deletions test/harness-codex-launch.test.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down Expand Up @@ -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 });
Expand Down Expand Up @@ -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 });
Expand Down
8 changes: 3 additions & 5 deletions test/harness-codex.test.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down Expand Up @@ -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();
}
}

Expand Down
6 changes: 2 additions & 4 deletions test/harness-settings.test.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down Expand Up @@ -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`), [
Expand Down
5 changes: 3 additions & 2 deletions test/harness-worktree-grouping.test.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down Expand Up @@ -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 = () => {
Expand Down
24 changes: 24 additions & 0 deletions test/isolated-codex-home-hooks.test.js
Original file line number Diff line number Diff line change
@@ -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);
});
Loading
Loading