@atlasharness/atlascode 0.1.67 → 0.1.68

package/dist/cli.js

@@ -80987,10 +80987,10 @@ function buildPostCompactMessages(result) {
     ...result.hookResults
   ];
 }
-function compactConversation(messages, contextOrDeps, cacheSafeParamsOrInstructions, suppressFollowUpQuestions, customInstructions, isAutoCompact, recompactionInfo) {
+function compactConversation(messages, contextOrDeps, cacheSafeParamsOrInstructions, suppressFollowUpQuestions, customInstructions, isAutoCompact, recompactionInfo, keepRecent) {
   const rich = typeof contextOrDeps.getAppState === "function";
   if (rich) {
-    return richCompactConversation(messages, contextOrDeps, cacheSafeParamsOrInstructions, suppressFollowUpQuestions ?? false, customInstructions, isAutoCompact ?? false, recompactionInfo);
+    return richCompactConversation(messages, contextOrDeps, cacheSafeParamsOrInstructions, suppressFollowUpQuestions ?? false, customInstructions, isAutoCompact ?? false, recompactionInfo, keepRecent ?? 0);
   }
   return trimmedCompactConversation(messages, contextOrDeps, typeof cacheSafeParamsOrInstructions === "string" ? cacheSafeParamsOrInstructions : undefined);
 }
@@ -81039,7 +81039,7 @@ async function trimmedCompactConversation(messages, deps, customInstructions) {
   }
   return result;
 }
-async function richCompactConversation(messages, context, cacheSafeParams, suppressFollowUpQuestions, customInstructions, isAutoCompact, recompactionInfo) {
+async function richCompactConversation(messages, context, cacheSafeParams, suppressFollowUpQuestions, customInstructions, isAutoCompact, recompactionInfo, keepRecent = 0) {
   const p = getCompactPorts();
   if (!p) {
     throw new Error("compactConversation rich path requires setCompactPorts(...) — register host compact ports (tui wiring, D-2a S8)");
@@ -81140,6 +81140,7 @@ async function richCompactConversation(messages, context, cacheSafeParams, suppr
         preCompactDiscoveredTools: [...preCompactDiscovered].sort()
       };
     }
+    const messagesToKeep = keepRecent > 0 ? messages.slice(-keepRecent) : undefined;
     const transcriptPath = getTranscriptPath();
     const summaryMessages = [
       {
@@ -81149,7 +81150,7 @@ async function richCompactConversation(messages, context, cacheSafeParams, suppr
         timestamp: new Date().toISOString(),
         message: {
           role: "user",
-          content: getCompactUserSummaryMessage(summary, suppressFollowUpQuestions, transcriptPath)
+          content: getCompactUserSummaryMessage(summary, suppressFollowUpQuestions, transcriptPath, messagesToKeep !== undefined)
         }
       }
     ];
@@ -81159,6 +81160,7 @@ async function richCompactConversation(messages, context, cacheSafeParams, suppr
     const truePostCompactTokenCount = roughTokenCountEstimationForMessages([
       boundaryMarker,
       ...summaryMessages,
+      ...messagesToKeep ?? [],
       ...postCompactFileAttachments,
       ...hookMessages
     ]);
@@ -81184,6 +81186,7 @@ async function richCompactConversation(messages, context, cacheSafeParams, suppr
       summaryMessages,
       attachments: postCompactFileAttachments,
       hookResults: hookMessages,
+      ...messagesToKeep ? { messagesToKeep } : {},
       userDisplayMessage: combinedUserDisplayMessage || undefined,
       preCompactTokenCount,
       postCompactTokenCount: compactionCallTotalTokens,
@@ -81499,6 +81502,9 @@ function getAutoCompactThreshold(contextWindowOrModel, maxOutputTokens, pctOverr
   }
   return getAutoCompactThresholdCore(contextWindowOrModel, maxOutputTokens, pctOverride, windowOverride);
 }
+function isAutoCompactThresholdPositive(contextWindow, maxOutputTokens, pctOverride, windowOverride) {
+  return getAutoCompactThreshold(contextWindow, maxOutputTokens, pctOverride, windowOverride) > 0;
+}
 function calculateTokenWarningState(tokenUsage, paramsOrModel) {
   if (typeof paramsOrModel === "string") {
     const env = getAutoCompactEnvOverrides();
@@ -81524,13 +81530,15 @@ function calculateTokenWarningStateCore(tokenUsage, params) {
   } = params;
   const enabled = autoCompactEnabled !== false;
   const autoCompactThreshold = getAutoCompactThreshold(contextWindow, maxOutputTokens, pctOverride, windowOverride);
-  const threshold = enabled ? autoCompactThreshold : getEffectiveContextWindowSize(contextWindow, maxOutputTokens, windowOverride);
+  const thresholdUsable = isAutoCompactThresholdPositive(contextWindow, maxOutputTokens, pctOverride, windowOverride);
+  const effectivelyEnabled = enabled && thresholdUsable;
+  const threshold = effectivelyEnabled ? autoCompactThreshold : getEffectiveContextWindowSize(contextWindow, maxOutputTokens, windowOverride);
   const percentLeft = Math.max(0, Math.round((threshold - tokenUsage) / threshold * 100));
   const warningThreshold = threshold - WARNING_THRESHOLD_BUFFER_TOKENS;
   const errorThreshold = threshold - ERROR_THRESHOLD_BUFFER_TOKENS;
   const isAboveWarningThreshold = tokenUsage >= warningThreshold;
   const isAboveErrorThreshold = tokenUsage >= errorThreshold;
-  const isAboveAutoCompactThreshold = enabled && tokenUsage >= autoCompactThreshold;
+  const isAboveAutoCompactThreshold = effectivelyEnabled && tokenUsage >= autoCompactThreshold;
   const actualContextWindow = getEffectiveContextWindowSize(contextWindow, maxOutputTokens, windowOverride);
   const defaultBlockingLimit = actualContextWindow - MANUAL_COMPACT_BUFFER_TOKENS;
   const blockingLimit = blockingLimitOverride !== undefined && blockingLimitOverride > 0 ? blockingLimitOverride : defaultBlockingLimit;
@@ -81540,7 +81548,8 @@ function calculateTokenWarningStateCore(tokenUsage, params) {
     isAboveWarningThreshold,
     isAboveErrorThreshold,
     isAboveAutoCompactThreshold,
-    isAtBlockingLimit
+    isAtBlockingLimit,
+    ...enabled && !thresholdUsable ? { autoCompactDisabledBySmallWindow: true } : {}
   };
 }
 function isAutoCompactEnabled(flags) {
@@ -81571,6 +81580,9 @@ async function shouldAutoCompact(messages, deps) {
   if (!deps.countTokens) {
     return false;
   }
+  if (!isAutoCompactThresholdPositive(deps.contextWindow, deps.maxOutputTokens, deps.pctOverride, deps.windowOverride)) {
+    return false;
+  }
   const tokenCount = await deps.countTokens(messages);
   if (!Number.isFinite(tokenCount)) {
     return false;
@@ -81606,7 +81618,7 @@ async function autoCompactIfNeeded(messages, tracking, deps) {
     };
   }
 }
-var AUTOCOMPACT_BUFFER_TOKENS = 13000, MAX_CONSECUTIVE_AUTOCOMPACT_FAILURES = 3, autoCompactSettingsSource = null, autoCompactWindowSettingsSource = null, WARNING_THRESHOLD_BUFFER_TOKENS = 20000, ERROR_THRESHOLD_BUFFER_TOKENS = 20000, MANUAL_COMPACT_BUFFER_TOKENS = 3000;
+var AUTOCOMPACT_BUFFER_TOKENS = 13000, MAX_CONSECUTIVE_AUTOCOMPACT_FAILURES = 3, autoCompactSettingsSource = null, autoCompactWindowSettingsSource = null, WARNING_THRESHOLD_BUFFER_TOKENS = 20000, ERROR_THRESHOLD_BUFFER_TOKENS = 20000, MANUAL_COMPACT_BUFFER_TOKENS = 3000, AUTOCOMPACT_KEEP_RECENT = 3;
 var init_autoCompact = __esm(() => {
   init_modelprovider2();
   init_config();
@@ -81614,6 +81626,23 @@ var init_autoCompact = __esm(() => {
   init_autoCompactWindow();
 });
 
+// src/engine/context/autoCompactRich.ts
+function createAutoCompactCompact(options) {
+  return (messages) => {
+    if (options.richContext && getCompactPorts()) {
+      return compactConversation(messages, options.richContext, options.buildCacheSafeParams(messages), true, undefined, true, undefined, options.keepRecent ?? 0);
+    }
+    return compactConversation(messages, {
+      summarize: options.trimmedSummarize,
+      countTokens: options.countTokens,
+      keepRecent: 0
+    });
+  };
+}
+var init_autoCompactRich = __esm(() => {
+  init_compact();
+});
+
 // src/engine/context/compactWarningState.ts
 function suppressCompactWarning() {
   compactWarningStore.setState(() => true);
@@ -82088,6 +82117,7 @@ var init_context = __esm(() => {
   init_autoCompact();
   init_autoCompactWindow();
   init_autoCompact();
+  init_autoCompactRich();
   init_compact();
   init_compactPtl();
   init_microCompact();
@@ -82241,7 +82271,7 @@ async function queryAgentLoop(deps, args) {
     turns++;
     if (args.context?.autoCompact) {
       const oc = await autoCompactIfNeeded(messages, tracking, args.context.autoCompact);
-      if (oc.wasCompacted && oc.compactionResult) {
+      if (oc.wasCompacted && oc.compactionResult && !oc.compactionResult.compactionSkipped) {
         messages = buildPostCompactMessages(oc.compactionResult);
         if (oc.tracking) {
           tracking = oc.tracking;
@@ -82265,7 +82295,7 @@ async function queryAgentLoop(deps, args) {
         tracking = { ...tracking, consecutiveFailures: oc.consecutiveFailures };
         reportAutoCompactCircuitFailures(oc.consecutiveFailures);
       }
-      if (oc.wasCompacted && oc.compactionResult) {
+      if (oc.wasCompacted && oc.compactionResult && !oc.compactionResult.compactionSkipped) {
         deps.emit?.({ type: "compacted", turn: turns, messages });
       }
     }
@@ -180228,6 +180258,7 @@ __export(exports_engineCompat, {
   ASK_USER_QUESTION_TOOL_NAME: () => ASK_USER_QUESTION_TOOL_NAME,
   ASYNC_AGENT_ALLOWED_TOOLS: () => ASYNC_AGENT_ALLOWED_TOOLS,
   AUTOCOMPACT_BUFFER_TOKENS: () => AUTOCOMPACT_BUFFER_TOKENS,
+  AUTOCOMPACT_KEEP_RECENT: () => AUTOCOMPACT_KEEP_RECENT,
   AUTOCOMPACT_PRESET_WINDOW_TIERS: () => AUTOCOMPACT_PRESET_WINDOW_TIERS,
   AbortError: () => AbortError,
   AgentTool: () => AgentTool,
@@ -180432,6 +180463,7 @@ __export(exports_engineCompat, {
   createActivityDescriptionResolver: () => createActivityDescriptionResolver,
   createAgentLoopDeps: () => createAgentLoopDeps,
   createAgentWorktree: () => createAgentWorktree,
+  createAutoCompactCompact: () => createAutoCompactCompact,
   createChildAbortController: () => createChildAbortController,
   createCompactBoundaryMessage: () => createCompactBoundaryMessage,
   createCronScheduler: () => createCronScheduler,
@@ -180647,6 +180679,7 @@ __export(exports_engineCompat, {
   isAscendToolsEnabled: () => isAscendToolsEnabled,
   isAutoCompactCircuitTripped: () => isAutoCompactCircuitTripped,
   isAutoCompactEnabled: () => isAutoCompactEnabled,
+  isAutoCompactThresholdPositive: () => isAutoCompactThresholdPositive,
   isAutoModeGateEnabled: () => isAutoModeGateEnabled,
   isBuiltInAgent: () => isBuiltInAgent,
   isBypassPermissionsModeDisabled: () => isBypassPermissionsModeDisabled,
@@ -321265,8 +321298,8 @@ function buildAgentLoopParams(m) {
     enabled: mergedAutoCompact.autoCompactDisabled ? false : undefined,
     pctOverride: mergedAutoCompact.pctOverride,
     windowOverride: mergedAutoCompact.windowOverride,
-    compact: (msgs) => compactConversation(msgs, {
-      summarize: async (compactMsgs, prompt) => {
+    compact: createAutoCompactCompact({
+      trimmedSummarize: async (compactMsgs, prompt) => {
         const resp = await modelProvider.chat({
           messages: [...compactMsgs, prompt],
           role,
@@ -321278,7 +321311,15 @@ function buildAgentLoopParams(m) {
         return blocks.filter((b) => typeof b === "object" && b !== null && b.type === "text").map((b) => b.text ?? "").join("");
       },
       countTokens,
-      keepRecent: 0
+      richContext: m.toolUseContext,
+      keepRecent: AUTOCOMPACT_KEEP_RECENT,
+      buildCacheSafeParams: (msgs) => ({
+        systemPrompt: m.systemPrompt,
+        userContext: m.userContext,
+        systemContext: m.systemContext,
+        toolUseContext: m.toolUseContext,
+        forkContextMessages: msgs
+      })
     }),
     querySource: m.querySource
   };
@@ -451336,7 +451377,8 @@ function TokenWarning(t0) {
   const {
     percentLeft,
     isAboveWarningThreshold,
-    isAboveErrorThreshold
+    isAboveErrorThreshold,
+    autoCompactDisabledBySmallWindow
   } = t1;
   const suppressWarning = useCompactWarningSuppression();
   const circuitFailures = useAutoCompactCircuitFailures();
@@ -451402,7 +451444,7 @@ function TokenWarning(t0) {
     return t4;
   }
   const circuitTripped = isAutoCompactCircuitTripped(circuitFailures);
-  const autocompactLabel = circuitTripped ? `auto-compact paused after ${circuitFailures} consecutive failures · run /compact, switch to a smaller model, or start a new session` : reactiveOnlyMode ? `${100 - displayPercentLeft}% context used` : `${displayPercentLeft}% until auto-compact`;
+  const autocompactLabel = circuitTripped ? `auto-compact paused after ${circuitFailures} consecutive failures · run /compact, switch to a smaller model, or start a new session` : reactiveOnlyMode ? `${100 - displayPercentLeft}% context used` : autoCompactDisabledBySmallWindow ? `context window too small for auto-compact · auto-compact disabled · run /compact manually or use a smaller-context model` : `${displayPercentLeft}% until auto-compact`;
   let t4;
   if ($[9] !== autocompactLabel || $[10] !== isAboveErrorThreshold || $[11] !== percentLeft) {
     t4 = /* @__PURE__ */ jsx_dev_runtime364.jsxDEV(ThemedBox_default, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlasharness/atlascode",
-  "version": "0.1.67",
+  "version": "0.1.68",
   "description": "AtlasCode \u2014 Coding Agent for the domestic computing ecosystem (Ascend NPU + domestic LLM backends)",
   "bin": {
     "atlas": "dist/cli.js",