@ccpocket/bridge 1.81.4 → 1.81.5

package/dist/websocket.js

@@ -1015,7 +1015,7 @@ export class BridgeWebSocketServer {
         }
         const codexProcess = session.process;
         if (session.provider !== "codex" ||
-            typeof codexProcess.rollbackThread !== "function") {
+            typeof codexProcess.forkThreadAtUserTurn !== "function") {
             this.send(ws, {
                 type: "rewind_result",
                 sessionId,
@@ -1088,16 +1088,18 @@ export class BridgeWebSocketServer {
                 worktreeBranch: session.worktreeBranch,
             }
             : undefined;
-        const rolledBackThread = await codexProcess.rollbackThread(numTurns);
+        const forked = targetOrdinal > 1
+            ? await codexProcess.forkThreadAtUserTurn(targetOrdinal - 1)
+            : undefined;
         const pastMessages = this.codexHistoryFromThreadOrFallback({
-            thread: rolledBackThread,
+            thread: forked?.thread,
             expectedUserTurns: targetOrdinal - 1,
             fallback: buildCodexHistoryPrefix(session, targetOrdinal - 1),
         });
         this.destroySession(sessionId);
         const newSessionId = this.sessionManager.create(projectPath, undefined, pastMessages, worktreeOpts, "codex", this.withCodexAutoReviewPolicy({
             ...(codexSettings ?? {}),
-            threadId,
+            threadId: forked?.threadId,
         }));
         this.attachWorkspaceToRuntimeSession(newSessionId, workspace);
         const newSession = this.sessionManager.get(newSessionId);
@@ -1130,7 +1132,7 @@ export class BridgeWebSocketServer {
         }
         const codexProcess = session.process;
         if (session.provider !== "codex" ||
-            typeof codexProcess.forkThread !== "function") {
+            typeof codexProcess.forkThreadAtUserTurn !== "function") {
             this.send(ws, {
                 type: "error",
                 message: "Fork is only supported for Codex sessions",
@@ -1173,13 +1175,9 @@ export class BridgeWebSocketServer {
                 worktreeBranch: session.worktreeBranch,
             }
             : undefined;
-        const forked = await codexProcess.forkThread();
+        const forked = await codexProcess.forkThreadAtUserTurn(targetOrdinal);
         const forkedThreadId = forked.threadId;
-        const turnsToDrop = totalUserTurns - targetOrdinal;
-        let forkedThread = forked.thread;
-        if (turnsToDrop > 0) {
-            forkedThread = await codexProcess.rollbackThreadById(forkedThreadId, turnsToDrop);
-        }
+        const forkedThread = forked.thread;
         const pastMessages = this.codexHistoryFromThreadOrFallback({
             thread: forkedThread,
             expectedUserTurns: targetOrdinal,