fix(recovery): more aggressive truncation, remove revert fallback

- Change charsPerToken from 4 to 2 for more aggressive truncation calculation
- Remove revert fallback (PHASE 2.5)
- Always try Continue after truncation if anything was truncated

🤖 Generated with assistance of OhMyOpenCode (https://github.com/code-yeongyu/oh-my-opencode)

src/hooks/anthropic-context-window-limit-recovery/executor.ts

@@ -158,27 +158,7 @@ export async function getLastAssistant(
   }
 }
 
-async function getLastMessageId(
-  sessionID: string,
-  client: Client,
-  directory: string,
-): Promise<string | null> {
-  try {
-    const resp = await client.session.messages({
-      path: { id: sessionID },
-      query: { directory },
-    });
 
-    const data = (resp as { data?: unknown[] }).data;
-    if (!Array.isArray(data) || data.length === 0) return null;
-
-    const lastMsg = data[data.length - 1] as Record<string, unknown>;
-    const info = lastMsg.info as Record<string, unknown> | undefined;
-    return (info?.id as string) ?? null;
-  } catch {
-    return null;
-  }
-}
 
 function clearSessionState(
   autoCompactState: AutoCompactState,
@@ -421,95 +401,21 @@ export async function executeCompact(
 
         log("[auto-compact] aggressive truncation completed", aggressiveResult);
 
-        if (aggressiveResult.sufficient) {
+        clearSessionState(autoCompactState, sessionID);
-          clearSessionState(autoCompactState, sessionID);
+        setTimeout(async () => {
-          setTimeout(async () => {
+          try {
-            try {
+            await (client as Client).session.prompt_async({
-              await (client as Client).session.prompt_async({
+              path: { sessionID },
-                path: { sessionID },
+              body: { parts: [{ type: "text", text: "Continue" }] },
-                body: { parts: [{ type: "text", text: "Continue" }] },
+              query: { directory },
-                query: { directory },
+            });
-              });
+          } catch {}
-            } catch {}
+        }, 500);
-          }, 500);
+        return;
-          return;
-        }
-      } else {
-        log("[auto-compact] no tool outputs found to truncate", { sessionID });
-      }
-
-      // PHASE 2.5: Revert fallback - if still over limit, remove last message
-      log("[auto-compact] PHASE 2.5: revert fallback - still over limit after truncation", {
-        sessionID,
-        currentTokens: errorData.currentTokens,
-        maxTokens: errorData.maxTokens,
-      });
-
-      const lastMessageId = await getLastMessageId(
-        sessionID,
-        client as Client,
-        directory,
-      );
-
-      if (lastMessageId) {
-        try {
-          await (client as Client).session.revert({
-            path: { id: sessionID },
-            body: { messageID: lastMessageId },
-            query: { directory },
-          });
-
-          await (client as Client).tui
-            .showToast({
-              body: {
-                title: "Message Reverted",
-                message: "Removed last message to reduce context. Retrying...",
-                variant: "warning",
-                duration: 3000,
-              },
-            })
-            .catch(() => {});
-
-          clearSessionState(autoCompactState, sessionID);
-          setTimeout(async () => {
-            try {
-              await (client as Client).session.prompt_async({
-                path: { sessionID },
-                body: { parts: [{ type: "text", text: "Continue" }] },
-                query: { directory },
-              });
-            } catch {}
-          }, 500);
-          return;
-        } catch (revertError) {
-          log("[auto-compact] revert failed", { error: String(revertError) });
-        }
       }
     }
 
-    // PHASE 3: Summarize - only when under limit (otherwise it will also fail)
+    // PHASE 3: Summarize - fallback when no tool outputs to truncate
-    if (isOverLimit) {
-      log("[auto-compact] skipping summarize - still over token limit", {
-        sessionID,
-        currentTokens: errorData?.currentTokens,
-        maxTokens: errorData?.maxTokens,
-      });
-
-      clearSessionState(autoCompactState, sessionID);
-
-      await (client as Client).tui
-        .showToast({
-          body: {
-            title: "Recovery Failed",
-            message: `Still over token limit (${errorData?.currentTokens}/${errorData?.maxTokens}). Please start a new session or manually compact.`,
-            variant: "error",
-            duration: 10000,
-          },
-        })
-        .catch(() => {});
-      return;
-    }
-
     const retryState = getOrCreateRetryState(autoCompactState, sessionID);
 
     if (errorData?.errorType?.includes("non-empty content")) {

src/hooks/anthropic-context-window-limit-recovery/types.ts

@@ -44,5 +44,5 @@ export const TRUNCATE_CONFIG = {
   maxTruncateAttempts: 20,
   minOutputSizeToTruncate: 500,
   targetTokenRatio: 0.5,
-  charsPerToken: 4,
+  charsPerToken: 2,
 } as const