@cloudcli-ai/cloudcli 1.37.2 → 1.37.4

package/dist-server/server/modules/providers/tests/codex-message-editing.test.js

@@ -0,0 +1,338 @@
+import assert from 'node:assert/strict';
+import { existsSync } from 'node:fs';
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
+import { createRequire } from 'node:module';
+import os from 'node:os';
+import path from 'node:path';
+import test from 'node:test';
+import { closeConnection, initializeDatabase, sessionsDb } from '../../../modules/database/index.js';
+import { codexAppServer } from '../../../modules/providers/list/codex/codex-app-server.client.js';
+import { CodexSessionSynchronizer } from '../../../modules/providers/list/codex/codex-session-synchronizer.provider.js';
+import { CodexSessionsProvider } from '../../../modules/providers/list/codex/codex-sessions.provider.js';
+/**
+ * Codex rows carry no id of their own, so an edit addresses the enclosing
+ * *turn*. These cover the two halves of that: that the reader can name the
+ * turn a prompt belongs to, and that a turn the thread has retired is never
+ * offered as one.
+ */
+const patchHomeDir = (nextHomeDir) => {
+    const original = os.homedir;
+    os.homedir = () => nextHomeDir;
+    return () => {
+        os.homedir = original;
+    };
+};
+async function withIsolatedDatabase(runTest) {
+    const previousDatabasePath = process.env.DATABASE_PATH;
+    const tempDirectory = await mkdtemp(path.join(os.tmpdir(), 'codex-edit-db-'));
+    closeConnection();
+    process.env.DATABASE_PATH = path.join(tempDirectory, 'auth.db');
+    await initializeDatabase();
+    try {
+        await runTest();
+    }
+    finally {
+        closeConnection();
+        if (previousDatabasePath === undefined) {
+            delete process.env.DATABASE_PATH;
+        }
+        else {
+            process.env.DATABASE_PATH = previousDatabasePath;
+        }
+        await rm(tempDirectory, { recursive: true, force: true });
+    }
+}
+/** One completed turn: the bracket rows that name it, plus its prompt(s). */
+function turn(turnId, prompts) {
+    return [
+        { type: 'event_msg', payload: { type: 'task_started', turn_id: turnId } },
+        { type: 'turn_context', payload: { turn_id: turnId, cwd: '/tmp' } },
+        ...prompts.map((message) => ({ type: 'event_msg', payload: { type: 'user_message', message } })),
+        { type: 'event_msg', payload: { type: 'agent_message', message: `answer to ${prompts[0]}` } },
+        { type: 'event_msg', payload: { type: 'task_complete', turn_id: turnId } },
+    ];
+}
+async function writeRollout(homeDir, threadId, workspacePath, rows) {
+    const sessionsDir = path.join(homeDir, '.codex', 'sessions', '2026', '07', '07');
+    await mkdir(sessionsDir, { recursive: true });
+    const lines = [
+        JSON.stringify({ type: 'session_meta', payload: { id: threadId, cwd: workspacePath } }),
+        ...rows.map((row) => JSON.stringify(row)),
+    ];
+    const filePath = path.join(sessionsDir, `rollout-${threadId}.jsonl`);
+    await writeFile(filePath, `${lines.join('\n')}\n`, 'utf8');
+    return filePath;
+}
+/** Stands up an indexed Codex session from a set of transcript rows. */
+async function withIndexedSession(rows, runTest) {
+    const tempRoot = await mkdtemp(path.join(os.tmpdir(), 'codex-edit-'));
+    const workspacePath = path.join(tempRoot, 'workspace');
+    await mkdir(workspacePath, { recursive: true });
+    const restoreHomeDir = patchHomeDir(tempRoot);
+    try {
+        await writeRollout(tempRoot, 'thread-1', workspacePath, rows);
+        await withIsolatedDatabase(async () => {
+            await new CodexSessionSynchronizer().synchronize();
+            await runTest({ sessionId: 'thread-1', workspacePath, homeDir: tempRoot });
+        });
+    }
+    finally {
+        restoreHomeDir();
+        await rm(tempRoot, { recursive: true, force: true });
+    }
+}
+const THREE_TURNS = [
+    ...turn('turn-a', ['first prompt']),
+    ...turn('turn-b', ['second prompt']),
+    ...turn('turn-c', ['third prompt']),
+];
+test('every Codex prompt is anchored to the turn that contains it', { concurrency: false }, async () => {
+    await withIndexedSession(THREE_TURNS, async ({ sessionId }) => {
+        const history = await new CodexSessionsProvider().fetchHistory(sessionId);
+        const prompts = history.messages.filter((message) => message.role === 'user');
+        assert.deepEqual(prompts.map((message) => [message.content, message.transcriptAnchorId]), [
+            ['first prompt', 'turn-a'],
+            ['second prompt', 'turn-b'],
+            ['third prompt', 'turn-c'],
+        ]);
+        // An anchor on an answer would put a pencil on a message that cannot be
+        // edited, so only prompts carry one.
+        assert.equal(history.messages.some((message) => message.role !== 'user' && message.transcriptAnchorId), false);
+    });
+});
+test('only the first prompt of a turn is anchored', { concurrency: false }, async () => {
+    // A follow-up typed while a turn is running is recorded inside that same
+    // turn. The cut is per turn, so anchoring the follow-up would silently take
+    // the prompt before it as well.
+    await withIndexedSession(turn('turn-a', ['first prompt', 'queued follow-up']), async ({ sessionId }) => {
+        const history = await new CodexSessionsProvider().fetchHistory(sessionId);
+        const prompts = history.messages.filter((message) => message.role === 'user');
+        assert.deepEqual(prompts.map((message) => [message.content, message.transcriptAnchorId]), [
+            ['first prompt', 'turn-a'],
+            ['queued follow-up', undefined],
+        ]);
+    });
+});
+test('a turn the thread rolled back keeps its rows but loses its anchor', { concurrency: false }, async () => {
+    const rows = [
+        ...turn('turn-a', ['first prompt']),
+        ...turn('turn-b', ['abandoned prompt']),
+        { type: 'event_msg', payload: { type: 'thread_rolled_back', num_turns: 1 } },
+        ...turn('turn-c', ['replacement prompt']),
+    ];
+    await withIndexedSession(rows, async ({ sessionId }) => {
+        const provider = new CodexSessionsProvider();
+        const history = await provider.fetchHistory(sessionId);
+        const prompts = history.messages.filter((message) => message.role === 'user');
+        assert.deepEqual(prompts.map((message) => [message.content, message.transcriptAnchorId]), [
+            ['first prompt', 'turn-a'],
+            // Still rendered — it is what the conversation looked like — but the
+            // turn is gone from the thread and the fork endpoint would reject it.
+            ['abandoned prompt', undefined],
+            ['replacement prompt', 'turn-c'],
+        ]);
+        assert.deepEqual(await provider.resolveEditAnchor(sessionId, 'turn-b'), { found: false, resumeThroughId: null });
+        // turn-b is out of the sequence, so turn-c resumes through turn-a.
+        assert.deepEqual(await provider.resolveEditAnchor(sessionId, 'turn-c'), { found: true, resumeThroughId: 'turn-a' });
+    });
+});
+test('the edit anchor resolves to the turn before the one being replaced', { concurrency: false }, async () => {
+    await withIndexedSession(THREE_TURNS, async ({ sessionId }) => {
+        const provider = new CodexSessionsProvider();
+        assert.deepEqual(await provider.resolveEditAnchor(sessionId, 'turn-c'), { found: true, resumeThroughId: 'turn-b' });
+        // Nothing precedes the first prompt, so the conversation starts over.
+        assert.deepEqual(await provider.resolveEditAnchor(sessionId, 'turn-a'), { found: true, resumeThroughId: null });
+        assert.deepEqual(await provider.resolveEditAnchor(sessionId, 'turn-nope'), { found: false, resumeThroughId: null });
+    });
+});
+test('rewinding a Codex session moves it onto the branch and retires the old thread', { concurrency: false }, async () => {
+    await withIndexedSession(THREE_TURNS, async ({ sessionId, homeDir, workspacePath }) => {
+        const forkPath = path.join(homeDir, '.codex', 'sessions', '2026', '07', '08', 'rollout-thread-2.jsonl');
+        await mkdir(path.dirname(forkPath), { recursive: true });
+        await writeFile(forkPath, `${JSON.stringify({ type: 'session_meta', payload: { id: 'thread-2', cwd: workspacePath } })}\n`, 'utf8');
+        const realForkThread = codexAppServer.forkThread;
+        const forkCalls = [];
+        codexAppServer.forkThread = async (input) => {
+            forkCalls.push(input);
+            return { threadId: 'thread-2', path: forkPath };
+        };
+        try {
+            await new CodexSessionsProvider().rewindSession(sessionId, 'turn-b');
+        }
+        finally {
+            codexAppServer.forkThread = realForkThread;
+        }
+        assert.deepEqual(forkCalls, [{ threadId: 'thread-1', lastTurnId: 'turn-b', cwd: workspacePath }]);
+        const session = sessionsDb.getSessionById(sessionId);
+        assert.equal(session?.provider_session_id, 'thread-2');
+        // Not `COALESCE`d onto the old path: the session reads its transcript from
+        // here, and leaving it on the pre-edit file would serve the conversation
+        // the user just edited away from, for good.
+        assert.equal(session?.jsonl_path, forkPath);
+        assert.equal(sessionsDb.isProviderSessionSuperseded('thread-1', 'codex'), true);
+    });
+});
+test('editing the first prompt starts the conversation over', { concurrency: false }, async () => {
+    await withIndexedSession(THREE_TURNS, async ({ sessionId }) => {
+        const realForkThread = codexAppServer.forkThread;
+        let forked = false;
+        codexAppServer.forkThread = async () => {
+            forked = true;
+            throw new Error('a fork of no turns should never be attempted');
+        };
+        try {
+            await new CodexSessionsProvider().rewindSession(sessionId, null);
+        }
+        finally {
+            codexAppServer.forkThread = realForkThread;
+        }
+        assert.equal(forked, false);
+        const session = sessionsDb.getSessionById(sessionId);
+        assert.equal(session?.provider_session_id, null);
+        assert.equal(session?.jsonl_path, null);
+        assert.equal(sessionsDb.isProviderSessionSuperseded('thread-1', 'codex'), true);
+    });
+});
+test('the indexer does not hand back a thread a session was edited off', { concurrency: false }, async () => {
+    await withIndexedSession(THREE_TURNS, async ({ sessionId, homeDir, workspacePath }) => {
+        const forkPath = path.join(homeDir, '.codex', 'sessions', '2026', '07', '08', 'rollout-thread-2.jsonl');
+        await mkdir(path.dirname(forkPath), { recursive: true });
+        await writeFile(forkPath, `${JSON.stringify({ type: 'session_meta', payload: { id: 'thread-2', cwd: workspacePath } })}\n`, 'utf8');
+        const realForkThread = codexAppServer.forkThread;
+        codexAppServer.forkThread = async () => ({ threadId: 'thread-2', path: forkPath });
+        try {
+            await new CodexSessionsProvider().rewindSession(sessionId, 'turn-b');
+        }
+        finally {
+            codexAppServer.forkThread = realForkThread;
+        }
+        // The pre-edit transcript is still on disk on purpose. A full rescan finds
+        // it again, and for a session discovered from disk — whose app id is its
+        // original thread id — reindexing it would point the row straight back at
+        // the conversation the edit replaced.
+        await new CodexSessionSynchronizer().synchronize();
+        const session = sessionsDb.getSessionById(sessionId);
+        assert.equal(session?.provider_session_id, 'thread-2');
+        assert.equal(session?.jsonl_path, forkPath);
+    });
+});
+test('deleting an edited session removes every transcript it lived in', { concurrency: false }, async () => {
+    await withIndexedSession(THREE_TURNS, async ({ sessionId, homeDir, workspacePath }) => {
+        const { sessionsService } = await import('../../../modules/providers/services/sessions.service.js');
+        const preEditPath = sessionsDb.getSessionById(sessionId)?.jsonl_path;
+        const forkPath = path.join(homeDir, '.codex', 'sessions', '2026', '07', '08', 'rollout-thread-2.jsonl');
+        await mkdir(path.dirname(forkPath), { recursive: true });
+        await writeFile(forkPath, `${JSON.stringify({ type: 'session_meta', payload: { id: 'thread-2', cwd: workspacePath } })}\n`, 'utf8');
+        const realForkThread = codexAppServer.forkThread;
+        codexAppServer.forkThread = async () => ({ threadId: 'thread-2', path: forkPath });
+        try {
+            await new CodexSessionsProvider().rewindSession(sessionId, 'turn-b');
+        }
+        finally {
+            codexAppServer.forkThread = realForkThread;
+        }
+        await sessionsService.deleteOrArchiveSessionById(sessionId, { force: true, deletedFromDisk: true });
+        // The row only ever points at the newest transcript, so deleting from that
+        // alone would leave the replaced turns on disk — and unreachable, because
+        // the indexer refuses a superseded thread.
+        assert.equal(existsSync(forkPath), false);
+        assert.equal(existsSync(preEditPath), false);
+        assert.equal(sessionsDb.isProviderSessionSuperseded('thread-1', 'codex'), false);
+    });
+});
+test('a session detached by an edit reports no token usage of its own', { concurrency: false }, async () => {
+    const spentTurns = [
+        ...THREE_TURNS,
+        {
+            type: 'event_msg',
+            payload: {
+                type: 'token_count',
+                info: {
+                    total_token_usage: { input_tokens: 100_000, output_tokens: 25_000, total_tokens: 125_000 },
+                    model_context_window: 200_000,
+                },
+            },
+        },
+    ];
+    await withIndexedSession(spentTurns, async ({ sessionId }) => {
+        const { createProviderTokenUsageService } = await import('../../../modules/providers/services/provider-token-usage.service.js');
+        const service = createProviderTokenUsageService();
+        assert.equal((await service.getSessionTokenUsage(sessionId)).used, 125_000);
+        await new CodexSessionsProvider().rewindSession(sessionId, null);
+        // A session discovered from disk is keyed by its own thread id, so the
+        // "no provider id was ever recorded" fallback resolves the very thread the
+        // edit discarded — by filename, which still matches — and an empty
+        // conversation reports the spent context of the one it replaced.
+        const usage = await service.getSessionTokenUsage(sessionId);
+        assert.equal(usage.used, 0);
+        assert.equal(usage.inputTokens, 0);
+    });
+});
+/**
+ * Everything above stubs the app-server. This one runs the real thing, because
+ * the whole feature rests on a protocol this repo does not own: that
+ * `thread/fork` exists without asking for experimental capabilities, that
+ * `lastTurnId` is inclusive, and that the copy is a rollout of its own rather
+ * than a pointer at the original.
+ */
+test('codex app-server forks a real thread at a turn', { concurrency: false }, async (t) => {
+    const require_ = createRequire(import.meta.url);
+    try {
+        require_.resolve('@openai/codex/bin/codex.js');
+    }
+    catch {
+        t.skip('the Codex CLI package is not installed');
+        return;
+    }
+    const fixture = path.join(process.cwd(), 'temp-jsonls/codex/ask and todolist', 'rollout-2026-08-22T20-24-44-01a02a80-dfb9-7882-8013-00e41955e656.jsonl');
+    const { readFile } = await import('node:fs/promises');
+    let transcript;
+    try {
+        transcript = await readFile(fixture, 'utf8');
+    }
+    catch {
+        t.skip('the committed Codex rollout fixture is not available');
+        return;
+    }
+    const tempRoot = await mkdtemp(path.join(os.tmpdir(), 'codex-appserver-'));
+    const previousCodexHome = process.env.CODEX_HOME;
+    process.env.CODEX_HOME = tempRoot;
+    try {
+        const sessionsDir = path.join(tempRoot, 'sessions', '2026', '08', '22');
+        await mkdir(sessionsDir, { recursive: true });
+        await writeFile(path.join(sessionsDir, path.basename(fixture)), transcript, 'utf8');
+        const workspacePath = path.join(tempRoot, 'workspace');
+        await mkdir(workspacePath, { recursive: true });
+        const fork = await codexAppServer.forkThread({
+            threadId: '01a02a80-dfb9-7882-8013-00e41955e656',
+            // The fixture's second turn; the third must not survive the cut.
+            lastTurnId: '01a02a81-2427-7853-b5e2-6eee36690146',
+            cwd: workspacePath,
+        });
+        assert.notEqual(fork.threadId, '01a02a80-dfb9-7882-8013-00e41955e656');
+        const copy = await readFile(fork.path, 'utf8');
+        const prompts = copy
+            .split('\n')
+            .filter(Boolean)
+            .map((line) => JSON.parse(line))
+            .filter((row) => row.type === 'event_msg' && row.payload?.type === 'user_message')
+            .map((row) => String(row.payload?.message ?? '').trim());
+        assert.deepEqual(prompts, [
+            'ask me a question using ur ask tool...wanted to check somehting',
+            'anytning...just wanted to test',
+        ]);
+        // The source is a copy source, not a move source.
+        const source = await readFile(path.join(sessionsDir, path.basename(fixture)), 'utf8');
+        assert.equal(source, transcript);
+    }
+    finally {
+        if (previousCodexHome === undefined) {
+            delete process.env.CODEX_HOME;
+        }
+        else {
+            process.env.CODEX_HOME = previousCodexHome;
+        }
+        await rm(tempRoot, { recursive: true, force: true });
+    }
+});
+//# sourceMappingURL=codex-message-editing.test.js.map

package/dist-server/server/modules/providers/tests/codex-message-editing.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-message-editing.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/codex-message-editing.test.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/providers/tests/codex-models.test.js

@@ -0,0 +1,25 @@
+import assert from 'node:assert/strict';
+import { createRequire } from 'node:module';
+import test from 'node:test';
+import { CODEX_PREDEFINED_MODELS } from '../../../modules/providers/list/codex/codex-models.provider.js';
+const require = createRequire(import.meta.url);
+const findCodexModel = (value) => CODEX_PREDEFINED_MODELS.OPTIONS.find((option) => option.value === value);
+test('lists GPT-6 Sol and GPT-6 Luna with the effort levels the Codex CLI accepts', () => {
+    const sol = findCodexModel('gpt-6-sol');
+    assert.equal(sol?.label, 'GPT-6 Sol');
+    assert.equal(sol?.effort?.default, 'medium');
+    assert.deepEqual(sol?.effort?.values.map((effort) => effort.value), ['low', 'medium', 'high', 'xhigh', 'max', 'ultra']);
+    const luna = findCodexModel('gpt-6-luna');
+    assert.equal(luna?.label, 'GPT-6 Luna');
+    assert.equal(luna?.effort?.default, 'medium');
+    assert.deepEqual(luna?.effort?.values.map((effort) => effort.value), ['low', 'medium', 'high', 'xhigh', 'max']);
+});
+test('bundles a Codex CLI new enough to know the GPT-6 Sol and Luna models', () => {
+    // Codex only ships metadata for gpt-6-sol / gpt-6-luna from 0.155.0 on. An
+    // older CLI still sends the request, but on fallback metadata: it warns
+    // "Model metadata ... not found" and quietly drops `ultra` to `medium`.
+    const { version } = require('@openai/codex/package.json');
+    const [major, minor] = version.split('.').map(Number);
+    assert.ok(major > 0 || minor >= 155, `bundled @openai/codex ${version} predates 0.155.0`);
+});
+//# sourceMappingURL=codex-models.test.js.map

package/dist-server/server/modules/providers/tests/codex-models.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-models.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/codex-models.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,yDAAyD,CAAC;AAElG,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAE/C,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,EAAE,CACvC,uBAAuB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;AAE3E,IAAI,CAAC,6EAA6E,EAAE,GAAG,EAAE;IACvF,MAAM,GAAG,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC;IACxC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;IACtC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC7C,MAAM,CAAC,SAAS,CACd,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EACjD,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CACnD,CAAC;IAEF,MAAM,IAAI,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC;IAC1C,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IACxC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC9C,MAAM,CAAC,SAAS,CACd,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAClD,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAC1C,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sEAAsE,EAAE,GAAG,EAAE;IAChF,2EAA2E;IAC3E,wEAAwE;IACxE,wEAAwE;IACxE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAwB,CAAC;IACjF,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACtD,MAAM,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC,IAAI,KAAK,IAAI,GAAG,EAAE,yBAAyB,OAAO,mBAAmB,CAAC,CAAC;AAC5F,CAAC,CAAC,CAAC"}

package/dist-server/server/modules/providers/tests/codex-runtime.test.js

@@ -0,0 +1,83 @@
+import assert from 'node:assert/strict';
+import path from 'node:path';
+import test from 'node:test';
+import { Codex } from '@openai/codex-sdk';
+import { codexRuntime } from '../../../modules/providers/list/codex/codex-runtime.provider.js';
+for (const resumed of [false, true]) {
+    for (const permissionMode of [undefined, 'default', 'unknown', 'acceptEdits', 'bypassPermissions']) {
+        test(`Codex ${resumed ? 'resumes' : 'starts'} with supported permissions (${permissionMode ?? 'omitted'})`, async (t) => {
+            let capturedOptions;
+            let capturedPrompt;
+            const messages = [];
+            const thread = {
+                id: 'native-thread',
+                async runStreamed(prompt) {
+                    capturedPrompt = prompt;
+                    return { events: (async function* () {
+                            yield { type: 'thread.started', thread_id: 'native-thread' };
+                        })() };
+                },
+            };
+            const start = t.mock.method(Codex.prototype, 'startThread', (options) => {
+                capturedOptions = options;
+                return thread;
+            });
+            const resume = t.mock.method(Codex.prototype, 'resumeThread', (id, options) => {
+                assert.equal(id, 'native-thread');
+                capturedOptions = options;
+                return thread;
+            });
+            const context = {
+                resolveProviderSessionId: () => resumed ? 'native-thread' : null,
+                resolveResumeModel: async () => 'test-model',
+                getProviderModels: async () => ({ OPTIONS: [], DEFAULT: 'test-model' }),
+                normalizeMessage: () => [],
+                isProviderInstalled: async () => true,
+            };
+            await codexRuntime.run('hey there', {
+                sessionId: resumed ? 'app-session' : undefined,
+                permissionMode,
+                cwd: process.cwd(),
+            }, { isWebSocketWriter: true, send: (message) => messages.push(message) }, context);
+            assert.equal(start.mock.callCount(), resumed ? 0 : 1);
+            assert.equal(resume.mock.callCount(), resumed ? 1 : 0);
+            assert.equal(capturedPrompt, 'hey there');
+            assert.equal(capturedOptions?.sandboxMode, permissionMode === 'bypassPermissions' ? 'danger-full-access' : 'workspace-write');
+            assert.equal(capturedOptions?.approvalPolicy, permissionMode === 'acceptEdits' || permissionMode === 'bypassPermissions' ? 'never' : 'on-request');
+            assert.ok(messages.some((message) => message.kind === 'complete' && message.exitCode === 0));
+            assert.ok(!messages.some((message) => message.kind === 'error'));
+        });
+    }
+}
+for (const command of ['', '  \n\t']) {
+    test(`Codex supplies a prompt for an image-only turn (${JSON.stringify(command)})`, async (t) => {
+        let capturedPrompt;
+        const imagePath = path.join(process.cwd(), 'public', 'favicon.png');
+        const thread = {
+            id: 'native-thread',
+            async runStreamed(prompt) {
+                capturedPrompt = prompt;
+                return { events: (async function* () {
+                        yield { type: 'thread.started', thread_id: 'native-thread' };
+                    })() };
+            },
+        };
+        t.mock.method(Codex.prototype, 'startThread', () => thread);
+        const context = {
+            resolveProviderSessionId: () => null,
+            resolveResumeModel: async () => 'test-model',
+            getProviderModels: async () => ({ OPTIONS: [], DEFAULT: 'test-model' }),
+            normalizeMessage: () => [],
+            isProviderInstalled: async () => true,
+        };
+        await codexRuntime.run(command, {
+            cwd: process.cwd(),
+            images: [{ path: imagePath, mimeType: 'image/png' }],
+        }, { isWebSocketWriter: true, send: () => { } }, context);
+        assert.deepEqual(capturedPrompt, [
+            { type: 'text', text: 'Please analyze the attached image(s).' },
+            { type: 'local_image', path: imagePath },
+        ]);
+    });
+}
+//# sourceMappingURL=codex-runtime.test.js.map

package/dist-server/server/modules/providers/tests/codex-runtime.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-runtime.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/codex-runtime.test.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/providers/tests/codex-session-fork.test.js

@@ -0,0 +1,54 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { codexAppServer } from '../../../modules/providers/list/codex/codex-app-server.client.js';
+import { CodexForkProvider } from '../../../modules/providers/list/codex/codex-fork.provider.js';
+/**
+ * The fork endpoint itself is exercised against the real `codex app-server` in
+ * codex-message-editing.test.ts, which is where the rewind that depends on it
+ * lives. What is left for the fork provider is the mapping either side of it.
+ */
+test('a Codex fork asks for the whole thread when no anchor is given', { concurrency: false }, async () => {
+    const realForkThread = codexAppServer.forkThread;
+    const forkCalls = [];
+    codexAppServer.forkThread = async (input) => {
+        forkCalls.push(input);
+        return { threadId: 'thread-2', path: '/tmp/rollout-thread-2.jsonl' };
+    };
+    try {
+        const forked = await new CodexForkProvider().forkSession({
+            providerSessionId: 'thread-1',
+            jsonlPath: '/tmp/rollout-thread-1.jsonl',
+            projectPath: '/tmp/workspace',
+            title: 'ignored by codex',
+        });
+        assert.deepEqual(forked, { providerSessionId: 'thread-2', jsonlPath: '/tmp/rollout-thread-2.jsonl' });
+    }
+    finally {
+        codexAppServer.forkThread = realForkThread;
+    }
+    assert.deepEqual(forkCalls, [{ threadId: 'thread-1', lastTurnId: undefined, cwd: '/tmp/workspace' }]);
+});
+test('forking from a message cuts through that message\'s turn', async () => {
+    const realForkThread = codexAppServer.forkThread;
+    const forkCalls = [];
+    codexAppServer.forkThread = async (input) => {
+        forkCalls.push(input);
+        return { threadId: 'thread-2', path: '/tmp/rollout-thread-2.jsonl' };
+    };
+    try {
+        await new CodexForkProvider().forkSession({
+            providerSessionId: 'thread-1',
+            jsonlPath: '/tmp/rollout-thread-1.jsonl',
+            projectPath: '/tmp/workspace',
+            upToAnchorId: 'turn-b',
+        });
+    }
+    finally {
+        codexAppServer.forkThread = realForkThread;
+    }
+    // Inclusive of the turn it names, so the branch keeps the message that was
+    // forked from *and* the answer it got. A turn is written as one thing; there
+    // is no cut that stops between them.
+    assert.deepEqual(forkCalls, [{ threadId: 'thread-1', lastTurnId: 'turn-b', cwd: '/tmp/workspace' }]);
+});
+//# sourceMappingURL=codex-session-fork.test.js.map

package/dist-server/server/modules/providers/tests/codex-session-fork.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-session-fork.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/codex-session-fork.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,cAAc,EAAE,MAAM,2DAA2D,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,MAAM,uDAAuD,CAAC;AAE1F;;;;GAIG;AAEH,IAAI,CAAC,gEAAgE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,KAAK,IAAI,EAAE;IACxG,MAAM,cAAc,GAAG,cAAc,CAAC,UAAU,CAAC;IACjD,MAAM,SAAS,GAAc,EAAE,CAAC;IAChC,cAAc,CAAC,UAAU,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE;QAC1C,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,6BAA6B,EAAE,CAAC;IACvE,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,iBAAiB,EAAE,CAAC,WAAW,CAAC;YACvD,iBAAiB,EAAE,UAAU;YAC7B,SAAS,EAAE,6BAA6B;YACxC,WAAW,EAAE,gBAAgB;YAC7B,KAAK,EAAE,kBAAkB;SAC1B,CAAC,CAAC;QACH,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,iBAAiB,EAAE,UAAU,EAAE,SAAS,EAAE,6BAA6B,EAAE,CAAC,CAAC;IACxG,CAAC;YAAS,CAAC;QACT,cAAc,CAAC,UAAU,GAAG,cAAc,CAAC;IAC7C,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;AACxG,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;IAC1E,MAAM,cAAc,GAAG,cAAc,CAAC,UAAU,CAAC;IACjD,MAAM,SAAS,GAAc,EAAE,CAAC;IAChC,cAAc,CAAC,UAAU,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE;QAC1C,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,6BAA6B,EAAE,CAAC;IACvE,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,IAAI,iBAAiB,EAAE,CAAC,WAAW,CAAC;YACxC,iBAAiB,EAAE,UAAU;YAC7B,SAAS,EAAE,6BAA6B;YACxC,WAAW,EAAE,gBAAgB;YAC7B,YAAY,EAAE,QAAQ;SACvB,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,cAAc,CAAC,UAAU,GAAG,cAAc,CAAC;IAC7C,CAAC;IAED,2EAA2E;IAC3E,6EAA6E;IAC7E,qCAAqC;IACrC,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;AACvG,CAAC,CAAC,CAAC"}