cleanup

Author: ethanndickson

src/browser/components/AIView.tsx

@@ -36,7 +36,7 @@ import { useAIViewKeybinds } from "@/browser/hooks/useAIViewKeybinds";
 import { evictModelFromLRU } from "@/browser/hooks/useModelLRU";
 import { QueuedMessage } from "./Messages/QueuedMessage";
 import { CompactionWarning } from "./CompactionWarning";
-import { shouldAutoCompact } from "@/browser/utils/compaction/autoCompactionCheck";
+import { checkAutoCompaction } from "@/browser/utils/compaction/autoCompactionCheck";
 import { useProviderOptions } from "@/browser/hooks/useProviderOptions";
 import { useAutoCompactionSettings } from "../hooks/useAutoCompactionSettings";
 
@@ -331,7 +331,7 @@ const AIViewInner: React.FC<AIViewProps> = ({
   // Get active stream message ID for token counting
   const activeStreamMessageId = aggregator.getActiveStreamMessageId();
 
-  const autoCompactionCheck = shouldAutoCompact(
+  const autoCompactionResult = checkAutoCompaction(
     workspaceUsage,
     currentModel,
     use1M,
@@ -340,7 +340,7 @@ const AIViewInner: React.FC<AIViewProps> = ({
   );
 
   // Show warning when: shouldShowWarning flag is true AND not currently compacting
-  const shouldShowCompactionWarning = !isCompacting && autoCompactionCheck.shouldShowWarning;
+  const shouldShowCompactionWarning = !isCompacting && autoCompactionResult.shouldShowWarning;
 
   // Note: We intentionally do NOT reset autoRetry when streams start.
   // If user pressed the interrupt key, autoRetry stays false until they manually retry.
@@ -529,8 +529,8 @@ const AIViewInner: React.FC<AIViewProps> = ({
         </div>
         {shouldShowCompactionWarning && (
           <CompactionWarning
-            usagePercentage={autoCompactionCheck.usagePercentage}
-            thresholdPercentage={autoCompactionCheck.thresholdPercentage}
+            usagePercentage={autoCompactionResult.usagePercentage}
+            thresholdPercentage={autoCompactionResult.thresholdPercentage}
           />
         )}
         <ChatInput
@@ -546,7 +546,7 @@ const AIViewInner: React.FC<AIViewProps> = ({
           onEditLastUserMessage={() => void handleEditLastUserMessage()}
           canInterrupt={canInterrupt}
           onReady={handleChatInputReady}
-          autoCompactionCheck={autoCompactionCheck}
+          autoCompactionCheck={autoCompactionResult}
         />
       </div>
 

src/browser/utils/compaction/autoCompactionCheck.ts

@@ -24,7 +24,6 @@ export interface AutoCompactionCheckResult {
   shouldShowWarning: boolean;
   usagePercentage: number;
   thresholdPercentage: number;
-  enabled: boolean;
 }
 
 // Show warning this many percentage points before threshold
@@ -45,53 +44,33 @@ const WARNING_ADVANCE_PERCENT = 10;
  * @param warningAdvancePercent - Show warning this many percentage points before threshold (default 10)
  * @returns Check result with warning flag and usage percentage
  */
-export function shouldAutoCompact(
+export function checkAutoCompaction(
   usage: WorkspaceUsageState | undefined,
-  model: string | null | undefined,
+  model: string | null,
   use1M: boolean,
-  enabled = true,
+  enabled: boolean,
   threshold: number = DEFAULT_AUTO_COMPACTION_THRESHOLD,
   warningAdvancePercent: number = WARNING_ADVANCE_PERCENT
 ): AutoCompactionCheckResult {
   const thresholdPercentage = threshold * 100;
 
   // Short-circuit if auto-compaction is disabled
-  if (!enabled || !model) {
+  // Or if no usage data yet
+  if (!enabled || !model || !usage || usage.usageHistory.length === 0) {
     return {
       shouldShowWarning: false,
       usagePercentage: 0,
       thresholdPercentage,
-      enabled: false,
-    };
-  }
-
-  // No usage data yet - safe default (don't trigger on first message)
-  if (!usage || usage.usageHistory.length === 0) {
-    return {
-      shouldShowWarning: false,
-      usagePercentage: 0,
-      thresholdPercentage,
-      enabled: true,
     };
   }
 
   // Determine max tokens for this model
   const modelStats = getModelStats(model);
   const maxTokens = use1M && supports1MContext(model) ? 1_000_000 : modelStats?.max_input_tokens;
+  const lastUsage = usage.usageHistory[usage.usageHistory.length - 1];
 
   // No max tokens known - safe default (can't calculate percentage)
   if (!maxTokens) {
-    return {
-      shouldShowWarning: false,
-      usagePercentage: 0,
-      thresholdPercentage,
-      enabled: true,
-    };
-  }
-
-  // Use last usage entry to calculate current context size (matches UI display)
-  const lastUsage = usage.usageHistory[usage.usageHistory.length - 1];
-  if (!lastUsage) {
     return {
       shouldShowWarning: false,
       usagePercentage: 0,
@@ -115,6 +94,5 @@ export function shouldAutoCompact(
     shouldShowWarning,
     usagePercentage,
     thresholdPercentage,
-    enabled: true,
   };
 }