@bastani/atomic 0.8.30 → 0.8.31-alpha.1

package/dist/core/compaction/context-compaction.js

@@ -4,6 +4,7 @@ import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { Type } from "typebox";
+import { formatCopilotProviderError } from "../copilot-errors.js";
 import { createBranchSummaryMessage, createCustomMessage } from "../messages.js";
 import { isAssistantThinkingBlockType, messageHasAssistantThinkingContentBlock, } from "../thinking-blocks.js";
 import { buildContextDeletionFilteredPath, buildEffectiveContextDeletionFilters, } from "../session-manager.js";
@@ -1877,6 +1878,12 @@ async function runContextDeletionAssistant(inputTranscript, model, apiKey, heade
     try {
         await agent.prompt(promptMessage);
     }
+    catch (error) {
+        if (signal?.aborted) {
+            throw new Error("Context compaction failed: Request was aborted");
+        }
+        throw new Error(`Context compaction failed: ${formatCopilotProviderError(model.provider, formatErrorMessage(error))}`);
+    }
     finally {
         signal?.removeEventListener("abort", abortOnSignal);
         unsubscribeNudge();
@@ -1886,13 +1893,15 @@ async function runContextDeletionAssistant(inputTranscript, model, apiKey, heade
         throw new Error("Context compaction failed: Request was aborted");
     }
     if (agent.state.errorMessage) {
+        const formattedErrorMessage = formatCopilotProviderError(model.provider, agent.state.errorMessage);
         if (isContextCompactionOverflowError(model, agent.state.errorMessage)) {
             return {
                 validatedResult: deletionTool.getValidatedResult(),
                 lastToolError: deletionTool.getLastError(),
+                providerError: formattedErrorMessage === agent.state.errorMessage ? undefined : formattedErrorMessage,
             };
         }
-        throw new Error(`Context compaction failed: ${agent.state.errorMessage}`);
+        throw new Error(`Context compaction failed: ${formattedErrorMessage}`);
     }
     if (deletionTool.getCallCount() === 0) {
         throw new Error(`Context compaction did not call any transcript inspection, budget, or deletion tools (${CONTEXT_SEARCH_TRANSCRIPT_TOOL_NAME}, ${CONTEXT_READ_ENTRY_TOOL_NAME}, ${CONTEXT_COMPACTION_BUDGET_TOOL_NAME}, ${CONTEXT_DELETE_TOOL_NAME}, or ${CONTEXT_GREP_DELETE_TOOL_NAME})`);
@@ -1900,6 +1909,7 @@ async function runContextDeletionAssistant(inputTranscript, model, apiKey, heade
     return {
         validatedResult: deletionTool.getValidatedResult(),
         lastToolError: deletionTool.getLastError(),
+        providerError: undefined,
     };
 }
 function hasMetContextCompactionTarget(run, parameters) {
@@ -1914,8 +1924,9 @@ function formatContextCompactionTargetFailureMessage(attempts, parameters) {
         .map((attempt) => {
         const reduction = contextCompactionProgressPercent(attempt.validatedResult);
         const deletionCount = attempt.validatedResult?.deletedTargets.length ?? 0;
-        const errorText = attempt.lastToolError ? `; last deletion tool error: ${attempt.lastToolError}` : "";
-        return `attempt reached ${reduction}% with ${deletionCount} validated deletion target(s)${errorText}`;
+        const toolErrorText = attempt.lastToolError ? `; last deletion tool error: ${attempt.lastToolError}` : "";
+        const providerErrorText = attempt.providerError ? `; provider error: ${attempt.providerError}` : "";
+        return `attempt reached ${reduction}% with ${deletionCount} validated deletion target(s)${toolErrorText}${providerErrorText}`;
     })
         .join("; ");
     return `Context compaction did not meet the strict ${targetLabel} reduction requirement; ${attemptDetails}`;