@codemoot/cli 0.2.11 → 0.2.13

package/dist/index.js

@@ -447,11 +447,23 @@ Review for:
       constraints: run.reviewCycles > 0 ? [`This is review cycle ${run.reviewCycles + 1}. Focus on whether prior issues were addressed.`] : void 0
     });
     const progress = createProgressCallbacks("build-review");
-    const result = await adapter.callWithResume(prompt, {
-      sessionId: existingSession,
-      timeout: 6e5,
-      ...progress
-    });
+    let result;
+    try {
+      result = await adapter.callWithResume(prompt, {
+        sessionId: existingSession,
+        timeout: 6e5,
+        ...progress
+      });
+    } catch (err) {
+      if (existingSession) {
+        console.error(chalk3.yellow("  Clearing stale codex thread ID after failure."));
+        sessionMgr.updateThreadId(session2.id, null);
+      }
+      throw err;
+    }
+    if (existingSession && result.sessionId !== existingSession) {
+      sessionMgr.updateThreadId(session2.id, null);
+    }
     if (result.sessionId) {
       sessionMgr.updateThreadId(session2.id, result.sessionId);
     }
@@ -1310,7 +1322,18 @@ IMPORTANT KEY FORMAT: The key will be built as scope:file:symbol \u2014 use the
   });
   try {
     const progress = createProgressCallbacks("cleanup-scan");
-    const result = await adapter.callWithResume(prompt, { sessionId: sessionThreadId, timeout: timeoutSec * 1e3, ...progress });
+    let result;
+    try {
+      result = await adapter.callWithResume(prompt, { sessionId: sessionThreadId, timeout: timeoutSec * 1e3, ...progress });
+    } catch (err) {
+      if (sessionThreadId && sessionMgr && sessionId) {
+        sessionMgr.updateThreadId(sessionId, null);
+      }
+      throw err;
+    }
+    if (sessionThreadId && result.sessionId !== sessionThreadId && sessionMgr && sessionId) {
+      sessionMgr.updateThreadId(sessionId, null);
+    }
     if (sessionMgr && sessionId) {
       if (result.sessionId) {
         sessionMgr.updateThreadId(sessionId, result.sessionId);
@@ -1830,11 +1853,26 @@ ${fixOutputContract}`,
     const timeoutMs = options.timeout * 1e3;
     const progress = createProgressCallbacks("fix-review");
     console.error(chalk9.dim("  GPT reviewing..."));
-    const reviewResult = await adapter.callWithResume(reviewPrompt, {
-      sessionId: threadId,
-      timeout: timeoutMs,
-      ...progress
-    });
+    let reviewResult;
+    try {
+      reviewResult = await adapter.callWithResume(reviewPrompt, {
+        sessionId: threadId,
+        timeout: timeoutMs,
+        ...progress
+      });
+    } catch (err) {
+      if (threadId) {
+        console.error(chalk9.yellow("  Clearing stale codex thread ID after failure."));
+        sessionMgr.updateThreadId(session2.id, null);
+        threadId = void 0;
+      }
+      throw err;
+    }
+    const resumed = threadId && reviewResult.sessionId === threadId;
+    if (threadId && !resumed) {
+      threadId = void 0;
+      sessionMgr.updateThreadId(session2.id, null);
+    }
     if (reviewResult.sessionId) {
       threadId = reviewResult.sessionId;
       sessionMgr.updateThreadId(session2.id, reviewResult.sessionId);
@@ -3061,11 +3099,23 @@ Output format:
     const timeoutMs = (options.timeout ?? 300) * 1e3;
     const progress = createProgressCallbacks("plan-review");
     console.error(chalk15.cyan("Sending plan to codex for review..."));
-    const result = await adapter.callWithResume(prompt, {
-      sessionId: threadId,
-      timeout: timeoutMs,
-      ...progress
-    });
+    let result;
+    try {
+      result = await adapter.callWithResume(prompt, {
+        sessionId: threadId,
+        timeout: timeoutMs,
+        ...progress
+      });
+    } catch (err) {
+      if (threadId) {
+        console.error(chalk15.yellow("  Clearing stale codex thread ID after failure."));
+        sessionMgr.updateThreadId(session2.id, null);
+      }
+      throw err;
+    }
+    if (threadId && result.sessionId !== threadId) {
+      sessionMgr.updateThreadId(session2.id, null);
+    }
     if (result.sessionId) {
       sessionMgr.updateThreadId(session2.id, result.sessionId);
     }
@@ -3350,11 +3400,22 @@ ${fileContents}`,
     }
     const timeoutMs = (options.timeout ?? 600) * 1e3;
     const progress = createProgressCallbacks("review");
-    const result = await adapter.callWithResume(prompt, {
-      sessionId: sessionThreadId,
-      timeout: timeoutMs,
-      ...progress
-    });
+    let result;
+    try {
+      result = await adapter.callWithResume(prompt, {
+        sessionId: sessionThreadId,
+        timeout: timeoutMs,
+        ...progress
+      });
+    } catch (err) {
+      if (sessionThreadId) {
+        sessionMgr.updateThreadId(session2.id, null);
+      }
+      throw err;
+    }
+    if (sessionThreadId && result.sessionId !== sessionThreadId) {
+      sessionMgr.updateThreadId(session2.id, null);
+    }
     if (result.sessionId) {
       sessionMgr.updateThreadId(session2.id, result.sessionId);
     }