@bastani/atomic 0.8.26-alpha.7 → 0.8.26-alpha.8

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,21 +2257,13 @@ export class InteractiveMode {
                 await this.handleClearCommand();
                 return;
             }
-            if (/^\/context-compact(?:\s|$)/.test(text)) {
+            if (/^\/compact(?:\s|$)/.test(text)) {
                 this.editor.setText("");
-                if (text !== "/context-compact") {
-                    this.showWarning("Usage: /context-compact");
+                if (text !== "/compact") {
+                    this.showWarning("Usage: /compact");
                     return;
                 }
-                await this.handleContextCompactCommand();
-                return;
-            }
-            if (text === "/compact" || text.startsWith("/compact ")) {
-                const customInstructions = text.startsWith("/compact ")
-                    ? text.slice(9).trim()
-                    : undefined;
-                this.editor.setText("");
-                await this.handleCompactCommand(customInstructions);
+                await this.handleCompactCommand();
                 return;
             }
             if (text === "/reload") {
@@ -2595,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) {
@@ -2621,7 +2626,7 @@ export class InteractiveMode {
                 };
                 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), `Context-compacting... ${cancelHint}`);
+                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;
@@ -2645,9 +2650,7 @@ export class InteractiveMode {
                 else if (event.result) {
                     this.chatContainer.clear();
                     this.rebuildChatFromMessages();
-                    const stats = event.result.stats;
-                    const backup = event.result.backupPath ? ` Backup: ${event.result.backupPath}` : "";
-                    this.showStatus(`Context-compacted ${stats.objectsDeleted} object${stats.objectsDeleted === 1 ? "" : "s"} (${stats.tokensBefore} → ${stats.tokensAfter} tokens, ${stats.percentReduction}% reduction).${backup}`);
+                    this.addContextCompactionSummaryToChat(event.result);
                     this.footer.invalidate();
                 }
                 else if (event.errorMessage) {
@@ -2756,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": {
@@ -4889,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) {
@@ -4902,26 +4911,7 @@ export class InteractiveMode {
         }
         this.statusContainer.clear();
         try {
-            await this.session.compact(customInstructions);
-        }
-        catch {
-            // Ignore, will be emitted as an event
-        }
-    }
-    async handleContextCompactCommand() {
-        const entries = this.sessionManager.getEntries();
-        const messageCount = entries.filter((e) => e.type === "message").length;
-        if (messageCount < 2) {
-            this.showWarning("Nothing to context-compact (no messages yet)");
-            return;
-        }
-        if (this.loadingAnimation) {
-            this.loadingAnimation.stop();
-            this.loadingAnimation = undefined;
-        }
-        this.statusContainer.clear();
-        try {
-            await this.session.contextCompact();
+            await this.session.compact();
         }
         catch {
             // Ignore, will be emitted as an event