fix

Author: edoardoc

codex-cli/src/cli.tsx

@@ -53,14 +53,14 @@ initLogger();
     const sessions: Array<{ id: string }> = [];
     if (fs.existsSync(sessionsRoot)) {
       for (const file of fs.readdirSync(sessionsRoot)) {
-        const m = file.match(/^rollout-([^.]+)\.json$/);
+        const m = file.match(/^(.+)\.json$/);
         if (m && m[1]) {
           sessions.push({ id: m[1] });
         }
       }
     }
     for (const session of sessions) {
-      const sessionPath = path.join(sessionsRoot, `rollout-${session.id}.json`);
+      const sessionPath = path.join(sessionsRoot, `${session.id}.json`);
       const stats = fs.statSync(sessionPath);
       const size = stats.size;
       const formattedDate = new Intl.DateTimeFormat(undefined, {
@@ -351,15 +351,17 @@ if (
     console.error("session id required");
     process.exit(1);
   }
+  // Use provided session id for new or resuming sessions
+  if (cli.flags.session) {
+    setSessionId(sessionIdFlag);
+  }
 
   let targetFile: string | undefined;
   if (fs.existsSync(sessionsDir)) {
-    const files = fs
-      .readdirSync(sessionsDir)
-      .filter((f) => f.endsWith(`-${sessionIdFlag}.json`));
-    if (files.length > 0) {
-      files.sort();
-      targetFile = path.join(sessionsDir, files[files.length - 1] ?? "");
+    const candidateFile = `${sessionIdFlag}.json`;
+    const candidatePath = path.join(sessionsDir, candidateFile);
+    if (fs.existsSync(candidatePath)) {
+      targetFile = candidatePath;
     }
   }
   if (!targetFile) {
@@ -381,8 +383,7 @@ if (
       console.error(`error loading session ${sessionIdFlag}: ${e}`);
       process.exit(1);
     }
-    // Start or resume the named session
-    setSessionId(sessionIdFlag);
+    // Resume the named session (session id already set above)
   }
 
   if (cli.flags.sessionPath) {

codex-cli/src/utils/storage/save-rollout.ts

@@ -16,7 +16,7 @@ async function saveRolloutAsync(
   await fs.mkdir(SESSIONS_ROOT, { recursive: true });
 
   const timestamp = new Date().toISOString();
-  const filename = `rollout-${sessionId}.json`;
+  const filename = `${sessionId}.json`;
   const filePath = path.join(SESSIONS_ROOT, filename);
   const config = loadConfig();
 

codex-cli/tests/cli-session.test.ts

@@ -55,7 +55,7 @@ describe("codex session CLI", () => {
     const sessId = "testsess";
     const sessDir = path.join(tmpHome, sessionsDirName);
     fs.mkdirSync(sessDir, { recursive: true });
-    const filename = `rollout-${sessId}.json`;
+    const filename = `${sessId}.json`;
     const filePath = path.join(sessDir, filename);
     const fileContent = JSON.stringify(
       {