@bastani/atomic 0.8.26-alpha.1 → 0.8.26-alpha.10

package/dist/modes/interactive/interactive-mode.js

@@ -42,6 +42,7 @@ import { BranchSummaryMessageComponent } from "./components/branch-summary-messa
 import { chatEntriesFromAgentMessages, renderChatMessageEntry, } from "./components/chat-message-renderer.js";
 import { addChatTranscriptEntry } from "./components/chat-transcript.js";
 import { CompactionSummaryMessageComponent } from "./components/compaction-summary-message.js";
+import { ContextCompactionSummaryMessageComponent } from "./components/context-compaction-summary-message.js";
 import { CountdownTimer } from "./components/countdown-timer.js";
 import { CustomEditor } from "./components/custom-editor.js";
 import { CustomMessageComponent } from "./components/custom-message.js";
@@ -88,6 +89,13 @@ class ExpandableText extends Text {
         this.setText(this.expanded ? this.getExpandedText() : this.getCollapsedText());
     }
 }
+function isContextCompactionResult(result) {
+    return (typeof result === "object" &&
+        result !== null &&
+        "stats" in result &&
+        "deletedTargets" in result &&
+        "protectedEntryIds" in result);
+}
 const DEAD_TERMINAL_ERROR_CODES = new Set(["EIO", "EPIPE", "ENOTCONN"]);
 function isDeadTerminalError(error) {
     if (!error || typeof error !== "object" || !("code" in error)) {
@@ -2249,12 +2257,13 @@ export class InteractiveMode {
                 await this.handleClearCommand();
                 return;
             }
-            if (text === "/compact" || text.startsWith("/compact ")) {
-                const customInstructions = text.startsWith("/compact ")
-                    ? text.slice(9).trim()
-                    : undefined;
+            if (/^\/compact(?:\s|$)/.test(text)) {
                 this.editor.setText("");
-                await this.handleCompactCommand(customInstructions);
+                if (text !== "/compact") {
+                    this.showWarning("Usage: /compact");
+                    return;
+                }
+                await this.handleCompactCommand();
                 return;
             }
             if (text === "/reload") {
@@ -2553,10 +2562,11 @@ export class InteractiveMode {
                 };
                 this.statusContainer.clear();
                 const cancelHint = `(${keyText("app.interrupt")} Cancel)`;
+                const isOverflowAutoCompaction = event.reason === "overflow";
                 const label = event.reason === "manual"
                     ? `Compacting context... ${cancelHint}`
-                    : `${event.reason === "overflow" ? "Context overflow detected, " : ""}Auto-compacting... ${cancelHint}`;
-                this.autoCompactionLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), label);
+                    : `${isOverflowAutoCompaction ? "Context overflow detected. " : ""}Auto-compacting... ${cancelHint}`;
+                this.autoCompactionLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg(isOverflowAutoCompaction ? "warning" : "muted", text), label);
                 this.statusContainer.addChild(this.autoCompactionLoader);
                 this.ui.requestRender();
                 break;
@@ -2585,7 +2595,12 @@ export class InteractiveMode {
                 else if (event.result) {
                     this.chatContainer.clear();
                     this.rebuildChatFromMessages();
-                    this.addMessageToChat(createCompactionSummaryMessage(event.result.summary, event.result.tokensBefore, new Date().toISOString()));
+                    if (isContextCompactionResult(event.result)) {
+                        this.addContextCompactionSummaryToChat(event.result);
+                    }
+                    else {
+                        this.addMessageToChat(createCompactionSummaryMessage(event.result.summary, event.result.tokensBefore, new Date().toISOString()));
+                    }
                     this.footer.invalidate();
                 }
                 else if (event.errorMessage) {
@@ -2601,6 +2616,50 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 break;
             }
+            case "context_compaction_start": {
+                if (this.settingsManager.getShowTerminalProgress()) {
+                    this.ui.terminal.setProgress(true);
+                }
+                this.autoCompactionEscapeHandler = this.defaultEditor.onEscape;
+                this.defaultEditor.onEscape = () => {
+                    this.session.abortCompaction();
+                };
+                this.statusContainer.clear();
+                const cancelHint = `(${keyText("app.interrupt")} Cancel)`;
+                this.autoCompactionLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), `Compacting context... ${cancelHint}`);
+                this.statusContainer.addChild(this.autoCompactionLoader);
+                this.ui.requestRender();
+                break;
+            }
+            case "context_compaction_end": {
+                if (this.settingsManager.getShowTerminalProgress()) {
+                    this.ui.terminal.setProgress(false);
+                }
+                if (this.autoCompactionEscapeHandler) {
+                    this.defaultEditor.onEscape = this.autoCompactionEscapeHandler;
+                    this.autoCompactionEscapeHandler = undefined;
+                }
+                if (this.autoCompactionLoader) {
+                    this.autoCompactionLoader.stop();
+                    this.autoCompactionLoader = undefined;
+                    this.statusContainer.clear();
+                }
+                if (event.aborted) {
+                    this.showError("Context compaction cancelled");
+                }
+                else if (event.result) {
+                    this.chatContainer.clear();
+                    this.rebuildChatFromMessages();
+                    this.addContextCompactionSummaryToChat(event.result);
+                    this.footer.invalidate();
+                }
+                else if (event.errorMessage) {
+                    this.showError(event.errorMessage);
+                }
+                void this.flushCompactionQueue({ willRetry: event.willRetry });
+                this.ui.requestRender();
+                break;
+            }
             case "auto_retry_start": {
                 // Set up escape to abort retry
                 this.retryEscapeHandler = this.defaultEditor.onEscape;
@@ -2700,6 +2759,12 @@ export class InteractiveMode {
         addChatTranscriptEntry(this.chatContainer, component, entry.role);
         return component;
     }
+    addContextCompactionSummaryToChat(result) {
+        this.chatContainer.addChild(new Spacer(1));
+        const component = new ContextCompactionSummaryMessageComponent(result, this.getMarkdownThemeWithSettings());
+        component.setExpanded(this.toolOutputExpanded);
+        this.chatContainer.addChild(component);
+    }
     addMessageToChat(message, options) {
         switch (message.role) {
             case "bashExecution": {
@@ -4833,7 +4898,7 @@ export class InteractiveMode {
         this.bashComponent = undefined;
         this.ui.requestRender();
     }
-    async handleCompactCommand(customInstructions) {
+    async handleCompactCommand() {
         const entries = this.sessionManager.getEntries();
         const messageCount = entries.filter((e) => e.type === "message").length;
         if (messageCount < 2) {
@@ -4846,7 +4911,7 @@ export class InteractiveMode {
         }
         this.statusContainer.clear();
         try {
-            await this.session.compact(customInstructions);
+            await this.session.compact();
         }
         catch {
             // Ignore, will be emitted as an event