[juliusmarminge]

Problem

A Codex chat started with No project lives in Codex's scratch folder under ~/Documents/Codex. If the user later moves it into a project in Codex, T3's session import still skips it. Moving a chat in Codex (thread/metadata/update { projectId }) leaves every cwd in the rollout pointing at the scratch folder, which the scanner excludes. Codex records the assignment only in its state database (<CODEX_HOME>/state_5.sqlite: threads.project_id, project_roots).

Reproduced with the real Codex app-server (codex-cli 0.163.0) in an isolated Codex home. A chat started in <home>/Documents/Codex/2026-11-08/new-chat was moved into a project rooted at <home>/code/my-project, and a control chat was started directly in that project. Codex's own thread/list { projectId } returns both chats. On main, T3's scanner offers the project with 1 chat, and recentThreads imports only the control chat.

Change

• AgentSessionScanner reads Codex's project assignments read-only, with one query per Codex home: thread ID → project roots. It opens state_5.sqlite with node:sqlite { readOnly: true }, the same way the server already reads other tools' databases. A missing, older or locked database falls back to the current behaviour.
• When a Codex chat's rollout cwd is a path the scanner already excludes (such as the Codex scratch folder) and Codex assigns the chat to a project, the chat uses that project's first root as its cwd. This applies both when grouping scan candidates and when recentThreads checks the chat against the selected project. Chats in any other real directory keep their own cwd, so linked worktrees and other repositories are unaffected.
• CODEX_ROLLOUT_ID_PATTERN now captures the thread ID and, for rewound rollouts, the rollout ID separately. The state database is keyed by thread ID, and the existing rewound-history lookup still uses the rollout ID.

Scope and approval

Fixes #32873

Verification

Head df3ffc1249 (main merged in). Before = merge-base fa2f4ff2a2.

• vp test run apps/server/src/project/AgentSessionScanner.test.ts: 68 passed at head.
  • New test: "imports Codex chats moved from a scratch folder into a Codex project" fails on main (expected [ 'Started in the project' ] to deeply equal [ 'Started in the project', 'Started with no project' ]) and passes with the fix.
  • The same test also covers a rewound rollout (<thread>_<rollout>.jsonl) of a moved chat, and a chat assigned to the project from another real folder, which keeps its own cwd.
  • New test: "keeps Codex rollout cwds when the Codex state database is unreadable".
• CI green on the head.
• Runtime transcript: the real scanner, before and after, run against the Codex home that the real Codex app-server wrote:

== before (09a54f01bc)
SCAN candidates: [{"path":"<fakehome>/code/my-project","threadCount":1}]
RECENT THREADS for <fakehome>/code/my-project [{"tag":"Importable","id":"01a1ba2e-13b8-…","title":"Reply with the single word: hi"}]
== after (60005e5afd)
SCAN candidates: [{"path":"<fakehome>/code/my-project","threadCount":2}]
RECENT THREADS for <fakehome>/code/my-project [{"tag":"Importable","id":"01a1ba2e-13b8-…","title":"Reply with the single word: hi"},{"tag":"Importable","id":"01a1ba2e-0a2e-…","title":"Reply with the single word: hello"}]

What Codex wrote (rollout cwds and state database), synthetic data

Codex app-server (codex-cli 0.163.0), isolated CODEX_HOME=<fakehome>/.codex, driver: codex-driver.mjs
turn 01a1ba2e-0a2e-74f2-9b6e-687336ad6045 completed
project 01a1ba2e-13a5-7242-bfe1-ebcc2e4218db [{"path":"<fakehome>/code/my-project"}]
moved thread after update: cwd= <fakehome>/Documents/Codex/2026-11-08/new-chat projectId= 01a1ba2e-13a5-7242-bfe1-ebcc2e4218db path= <fakehome>/.codex/sessions/2026/11/08/rollout-2026-11-08T08-02-21-01a1ba2e-0a2e-74f2-9b6e-687336ad6045.jsonl
turn 01a1ba2e-13b8-7f10-ba05-18b6d8c520ff completed
threads in project: [{"id":"01a1ba2e-13b8-7f10-ba05-18b6d8c520ff","cwd":"<fakehome>/code/my-project","projectId":"01a1ba2e-13a5-7242-bfe1-ebcc2e4218db"},{"id":"01a1ba2e-0a2e-74f2-9b6e-687336ad6045","cwd":"<fakehome>/Documents/Codex/2026-11-08/new-chat","projectId":"01a1ba2e-13a5-7242-bfe1-ebcc2e4218db"}]

Rollout records carrying a cwd:
rollout-2026-11-08T08-02-21-01a1ba2e-0a2e-74f2-9b6e-687336ad6045.jsonl
   session_meta cwd=<fakehome>/Documents/Codex/2026-11-08/new-chat
   turn_context cwd=<fakehome>/Documents/Codex/2026-11-08/new-chat
rollout-2026-11-08T08-02-24-01a1ba2e-13b8-7f10-ba05-18b6d8c520ff.jsonl
   session_meta cwd=<fakehome>/code/my-project
   turn_context cwd=<fakehome>/code/my-project

state_5.sqlite threads(id, cwd, project_id) and project_roots:
01a1ba2e-0a2e-74f2-9b6e-687336ad6045|<fakehome>/Documents/Codex/2026-11-08/new-chat|01a1ba2e-13a5-7242-bfe1-ebcc2e4218db
01a1ba2e-13b8-7f10-ba05-18b6d8c520ff|<fakehome>/code/my-project|01a1ba2e-13a5-7242-bfe1-ebcc2e4218db
01a1ba2e-13a5-7242-bfe1-ebcc2e4218db|0|<fakehome>/code/my-project

Codex app-server driver used for the reproduction (scratch, not committed)

import { spawn } from "node:child_process";
import readline from "node:readline";
const HOME = process.argv[2];
const scratch = `${HOME}/Documents/Codex/2026-11-08/new-chat`;
const project = `${HOME}/code/my-project`;
const child = spawn("codex", ["app-server"], { env: { ...process.env, HOME, CODEX_HOME: `${HOME}/.codex` }, stdio: ["pipe", "pipe", "inherit"] });
const rl = readline.createInterface({ input: child.stdout });
let id = 0; const pending = new Map(); const waiters = [];
rl.on("line", (l) => { const m = JSON.parse(l);
  if (m.id !== undefined && pending.has(m.id)) { pending.get(m.id)(m); pending.delete(m.id); return; }
  if (m.method) { for (const w of [...waiters]) if (w.pred(m)) { waiters.splice(waiters.indexOf(w),1); w.res(m); } }
});
const call = (method, params) => new Promise((res) => { const i = ++id; pending.set(i, (m) => { if (m.error) console.log("ERR", method, JSON.stringify(m.error)); res(m.result); }); child.stdin.write(JSON.stringify({ id: i, method, params }) + "\n"); });
const waitFor = (pred) => new Promise((res) => waiters.push({ pred, res }));
await call("initialize", { clientInfo: { name: "repro", version: "0" }, capabilities: { experimentalApi: true } });
child.stdin.write(JSON.stringify({ method: "initialized" }) + "\n");
async function chat(cwd, text, projectId) {
  const { thread } = await call("thread/start", { cwd, ...(projectId ? { projectId } : {}) });
  const done = waitFor((m) => m.method === "turn/completed" && m.params.threadId === thread.id);
  await call("turn/start", { threadId: thread.id, input: [{ type: "text", text }] });
  const c = await done; console.log("turn", thread.id, c.params.turn.status);
  return thread.id;
}
const moved = await chat(scratch, "Reply with the single word: hello", null);
const { project: p } = await call("project/create", { idempotencyKey: "k1", name: "my-project", roots: [{ path: project }] });
console.log("project", p.id, JSON.stringify(p.roots));
const upd = await call("thread/metadata/update", { threadId: moved, projectId: p.id });
console.log("moved thread after update: cwd=", upd.thread.cwd, "projectId=", upd.thread.projectId, "path=", upd.thread.path);
const control = await chat(project, "Reply with the single word: hi", p.id);
const list = await call("thread/list", { projectId: p.id });
console.log("threads in project:", JSON.stringify(list.data.map((t) => ({ id: t.id, cwd: t.cwd, projectId: t.projectId }))));
console.log(JSON.stringify({ moved, control }));
child.kill();

Evidence

Server-only change, so the captures are before/after transcripts of the real AgentSessionScanner (scan candidates and recentThreads results), with a warm scan→recentThreads sequence and a cold recentThreads on a fresh scanner in every fixture. Viewport and theme do not apply. Environment: Node v26.12.1, Linux x86_64, synthetic Codex homes using the state_5.sqlite schema the real codex-cli 0.163.0 app-server creates (schema receipt, schema dump, probe). 30 scanner invocations, all with matching fixture hashes on both sides (receipts). Fixture matrix, index.

Row	Before (fa2f4ff)	After (df3ffc1)	Transcript
R01 chat started in the project	imports	imports, unchanged	M1
R02 scratch chat moved into the project	absent	imports under the project	M1
R03 scratch chat with no project	absent	absent	M1
R04 chat in another real folder, assigned to the project	imports under its own folder only	same	M1
R05 rewound moved chat (<thread>_<rollout>.jsonl)	absent	one import + two Duplicate, inherited history intact	M1
R06 corrupt state database	control only	control only, no scan failure	M2
R07 multi-root project	absent	under the first root by position only	M3
R08–R14 inherited guards (invalid destinations, separate Codex homes, age and row caps, repeat imports, filtered transcripts, warm/cold agreement)	unchanged	unchanged apart from mapped chats joining	supplemental

What else changed: nothing outside the mapped-chat rows. In the composite fixture the project's count rises from 1 to 5 (the moved chat plus three rewind files), which also moves its last activity forward.

Proof audit: sufficient. The auditor rebuilt R05 and R07 from the uploaded scripts at the head with zero behavioural delta. Scripts: scanner-driver.mjs, seed-fixtures.py, run-captures.py, package-evidence.py.

Verification log

• Review round 1: two independent reviewers, both MERGE, no findings. Not a sensitive area.
• Tests: 68 passed in AgentSessionScanner.test.ts; the new regression test fails on main.
• CI: all checks green on df3ffc1.
• Unverified: cannot-verify macos (Codex Desktop end to end; the move was driven through the same app-server request Codex uses). A Codex sqlite_home setting that relocates the state database keeps the current behaviour.

AI-assisted; verified with the tests and tools listed above.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	5.0 KiB	5.0 KiB	0 B (0.0%)	6.8 KiB	✅
Codex	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Codex	Live turn WebSocket wire	1.2 KiB	1.2 KiB	0 B (0.0%)	2.0 KiB	✅
Codex	Live turn WebSocket decoded	21.5 KiB	21.5 KiB	0 B (0.0%)	24.4 KiB	✅
Codex	Live turn messages	1	1	0 (0.0%)	8	✅
Claude	Total thread wire	5.0 KiB	5.0 KiB	0 B (0.0%)	6.8 KiB	✅
Claude	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Claude	Live turn WebSocket wire	1.2 KiB	1.2 KiB	0 B (0.0%)	2.0 KiB	✅
Claude	Live turn WebSocket decoded	21.9 KiB	21.9 KiB	0 B (0.0%)	24.4 KiB	✅
Claude	Live turn messages	1	1	0 (0.0%)	8	✅

Baseline: 871b009 · PR result: 6d24bd7 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 108.5 KiB
• Claude decoded thread snapshot: 108.8 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[macroscopeapp]

Approvability

Verdict: Approved at 75e3f74

Macroscope's review found this PR approvable — This enables discovery and import of Codex chats moved from scratch folders into projects using local project metadata. Database access is read-only, failures preserve existing behavior, and destination checks remain in place.

No code changes detected at 6d24bd7. Prior analysis still applies.

^{You can add or adjust custom eligibility rules. Learn more.}

[coderabbitai]

Important

Review skipped

Review was skipped as selected files did not have any reviewable changes.

Run configuration

• Source mode: Auto
• Repository: pingdotgg/t3code
• Branch: fix/issue-32873
• File: .coderabbit.config.ts
• Commit: 6d24bd7
• Layers: Repository TS config
• Review profile: CHILL
• Plan: Team
• Run ID: f9cd4ed5-e93f-4e8a-a4da-66237c0cdda1

Commits

Reviewing files that changed from the base of the PR and between df3ffc1 and 6d24bd7.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• Trigger review

No actionable comments were generated in the recent review.

Walkthrough

The scanner now reads Codex project-root mappings from state_5.sqlite and uses them when grouping rollout transcripts and matching recent threads to workspaces. It also recognizes updated rollout filename forms and supports inherited rollout lookup through an optional second UUID suffix.

Changes: Codex session scanning

Layer / File(s)	Summary
Read Codex project-root state apps/server/src/project/AgentSessionScanner.ts, apps/server/src/project/AgentSessionScanner.test.ts	The scanner reads thread-to-project-root mappings from state_5.sqlite, skips invalid roots, and returns an empty mapping if reading fails. The test covers unreadable database contents.
Resolve transcript workspace membership apps/server/src/project/AgentSessionScanner.ts, apps/server/src/project/AgentSessionScanner.test.ts	Codex rollout transcripts are associated with mapped project roots. Resolved working directories are used for workspace grouping and recent-thread matching. Rollout lookup supports an optional second UUID suffix. Tests cover project-associated chats with scratch-directory working paths.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Change: Bug fix · Severity of issue fixed: Low

Possibly related PRs

• pingdotgg/t3code#32122: Both changes affect inherited-history handling and rollout lookup for rewound Codex sessions.

Suggested labels: bugfix

Suggested reviewers: marcodotio, macroscopeapp

Merge Risk: Minimal · previous review 75e3f

The change lets Codex chats moved into a project be imported with that project, and it falls back to the existing behavior if the Codex state database is missing or unreadable. No merge-blocking risk was identified.

Pre-merge checks: 4

Check name	Status	Explanation
Title check		The title names the main change: Codex chats moved into a project from the scratch folder are now imported. It follows the conventional commit form and matches the code changes in AgentSessionScanner,…
Linked Issues check		Objective [#32873]: when a Codex chat started in the scratch folder is assigned to a project in Codex, T3 import must include it with the control chat. Implementation at head: (1) readCodexProjectRoot…
Out of Scope Changes check		All changed hunks in AgentSessionScanner.ts connect to the issue. The node:sqlite import and readCodexProjectRoots are the state-database source for the project mapping. CodexStateReadError and the fa…
Description check		The description includes the required Problem, Change, Scope and approval, and Verification sections. It explains the issue and expected behavior, links the related issue, and reports focused tests, r…

Full details: Title check

Explanation

The title names the main change: Codex chats moved into a project from the scratch folder are now imported. It follows the conventional commit form and matches the code changes in AgentSessionScanner, which resolve project roots for excluded scratch-folder cwds.

Full details: Linked Issues check

Explanation

Objective [#32873]: when a Codex chat started in the scratch folder is assigned to a project in Codex, T3 import must include it with the control chat. Implementation at head: (1) readCodexProjectRoots reads thread ID to project roots from <CODEX_HOME>/state_5.sqlite with DatabaseSync and readOnly: true. (2) projectCwd replaces a rollout cwd with the project's first root only when the rollout cwd matches isExcludedProjectPath. (3) projectCwd is applied in candidate grouping (discoverable cwd key) and in recentThreads matching, so the moved chat groups under the project and passes the selected-project check. Chats in other real directories keep their own cwd. A missing, older, or locked database returns an empty map, so the existing behavior remains. Evidence limits: the diff confirms this logic. The test results and the 1-to-2 runtime transcript are author-reported; I did not run the tests. The macOS Codex Desktop flow is not verified end to end. The issue states those desktop steps are not required coding work. The objective is met by the code at head.

Full details: Out of Scope Changes check

Explanation

All changed hunks in AgentSessionScanner.ts connect to the issue. The node:sqlite import and readCodexProjectRoots are the state-database source for the project mapping. CodexStateReadError and the fallback provide the required read-only, unreadable-database behavior. MAX_CODEX_PROJECT_ROOT_ROWS bounds that read. projectCwd and its uses in grouping and recentThreads implement the moved-chat behavior. CODEX_ROLLOUT_ID_PATTERN now captures thread and rollout IDs separately. The rewound-history lookup uses match[2] ?? match[1], which keeps the rollout ID for that lookup and the thread ID for the state database. The discovery and candidate types carry projectRoots only to support these paths. No unrelated behavior change appears in the diff. The test file changes are supporting coverage for the same behavior, as stated in the PR description.

Full details: Description check

Explanation

The description includes the required Problem, Change, Scope and approval, and Verification sections. It explains the issue and expected behavior, links the related issue, and reports focused tests, runtime evidence, and unverified cases. The author notes AI assistance but does not name the model and harness, as the template requests.

Finishing Touches

Generate docstrings

• Commit to this branch
• Create a new PR

Generate unit tests (beta)

• Commit to this branch
• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Recent review info

Run configuration

• Source mode: Auto
• Repository: pingdotgg/t3code
• Branch: fix/issue-32873
• File: .coderabbit.config.ts
• Commit: 75e3f74
• Layers: Repository TS config
• Review profile: CHILL
• Plan: Team
• Run ID: c3fc970b-7de0-4146-ba33-6a45a727e144

Commits

Reviewing files that changed from the base of the PR and between dff0b11 and 75e3f74.

Files selected for processing: 2

• apps/server/src/project/AgentSessionScanner.test.ts
• apps/server/src/project/AgentSessionScanner.ts

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 8 remain after this review.

[batmanscode]

Thanks @juliusmarminge :D

[juliusmarminge]

Evidence

Environment for both sides: real web app and server in separate worktrees; Linux Chromium, 1280×800, light theme, fresh T3 databases, identical synthetic Codex history.

Steps: seed one chat with an original scratch-folder cwd and a current project assignment, plus one chat started directly in that project. Open the welcome wizard → Review all 1 → Other folders → Select all → Import 1 project and start. Expand Settled and inspect imported chats.

Before	After
871b00907d	6d24bd70d8
Import recording: 1 thread	Import recording: 2 threads

Seed script · Browser driver · Privacy redaction script

Private operational details are masked. Final stills passed the 500 ms identical-capture check. Codex Desktop's macOS move interaction was represented by synthetic on-disk history; it was not executed here.

AI-assisted; verified with the tests and tools listed above.

Not shown:

• Creating and moving a chat in Codex Desktop on macOS was not executed: this Linux VM used synthetic rollouts and state_5.sqlite project assignments.
• Rewound rollout handling, multiple project roots, and missing or unreadable Codex database fallback were not exercised by this two-chat reproduction.
• Authenticated Codex continuation was not exercised. The installed CLI rejected the minimal synthetic database during its provider probe; the real welcome import still completed on both sides.