apex-code 0.2.0 → 0.3.0

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

@@ -82,9 +82,28 @@ import { refreshModelCatalogs } from "./model-catalog-refresh.js";
 import { getModelSearchText } from "./model-search.js";
 import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, onThemeChange, setRegisteredThemes, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
 import { InteractiveThemeController } from "./theme/theme-controller.js";
+const CHAT_DETAIL_ORDER = ["overview", "details", "all"];
+/** The next rung, wrapping from `all` back to `overview`. */
+export function nextChatDetail(detail) {
+    return CHAT_DETAIL_ORDER[(CHAT_DETAIL_ORDER.indexOf(detail) + 1) % CHAT_DETAIL_ORDER.length] ?? "details";
+}
+/** The single place the three rungs turn into rendering flags. */
+export function chatDetailView(detail) {
+    return {
+        toolOutputExpanded: detail === "all",
+        editDiffsExpanded: detail !== "overview",
+        revealThinking: detail === "all",
+    };
+}
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
+function hasEditDiffsExpansion(obj) {
+    return (typeof obj === "object" &&
+        obj !== null &&
+        "setEditDiffsExpanded" in obj &&
+        typeof obj.setEditDiffsExpanded === "function");
+}
 class ExpandableText extends Text {
     getCollapsedText;
     getExpandedText;
@@ -318,7 +337,9 @@ export class InteractiveMode {
     // Tool execution tracking: toolCallId -> component
     pendingTools = new Map();
     // Tool output expansion state
+    chatDetail = "details";
     toolOutputExpanded = false;
+    editDiffsExpanded = true;
     // Thinking block visibility state
     hideThinkingBlock = false;
     outputPad = 1;
@@ -2153,7 +2174,7 @@ export class InteractiveMode {
             }, {
                 tui: this.ui,
                 timeout: opts?.timeout,
-                onToggleToolsExpanded: () => this.toggleToolOutputExpansion(),
+                onToggleToolsExpanded: () => this.cycleChatDetail(),
                 enableSearch,
                 preamble: opts?.preview ? renderPermissionPreview(opts.preview) : undefined,
             });
@@ -2520,7 +2541,7 @@ export class InteractiveMode {
         // Global debug handler on TUI (works regardless of focus)
         this.ui.onDebug = () => this.handleDebugCommand();
         this.defaultEditor.onAction("app.model.select", () => this.showModelSelector());
-        this.defaultEditor.onAction("app.tools.expand", () => this.toggleToolOutputExpansion());
+        this.defaultEditor.onAction("app.tools.expand", () => this.cycleChatDetail());
         this.defaultEditor.onAction("app.thinking.toggle", () => this.toggleThinkingBlockVisibility());
         this.defaultEditor.onAction("app.editor.external", () => void this.handleOpenExternalEditor());
         this.defaultEditor.onAction("app.message.copy", () => void this.handleCopyCommand({ flashConfirmation: true, preferSelection: true }));
@@ -2874,7 +2895,7 @@ export class InteractiveMode {
                     this.ui.requestRender();
                 }
                 else if (event.message.role === "assistant") {
-                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
+                    this.streamingComponent = new AssistantMessageComponent(undefined, this.isThinkingHidden(), this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
                     this.streamingMessage = event.message;
                     this.chatContainer.addChild(this.streamingComponent);
                     this.streamingComponent.updateContent(this.streamingMessage, true);
@@ -2893,7 +2914,7 @@ export class InteractiveMode {
                                     showImages: this.settingsManager.getShowImages(),
                                     imageWidthCells: this.settingsManager.getImageWidthCells(),
                                 }, this.getRegisteredToolDefinition(content.name), this.ui, this.sessionManager.getCwd());
-                                component.setExpanded(this.toolOutputExpanded);
+                                this.adoptChatDetail(component);
                                 this.chatContainer.addChild(component);
                                 this.pendingTools.set(content.id, component);
                                 this.offerFirstUseHint("tool-expand");
@@ -2960,7 +2981,7 @@ export class InteractiveMode {
                         showImages: this.settingsManager.getShowImages(),
                         imageWidthCells: this.settingsManager.getImageWidthCells(),
                     }, this.getRegisteredToolDefinition(event.toolName), this.ui, this.sessionManager.getCwd());
-                    component.setExpanded(this.toolOutputExpanded);
+                    this.adoptChatDetail(component);
                     this.chatContainer.addChild(component);
                     this.pendingTools.set(event.toolCallId, component);
                 }
@@ -3161,7 +3182,7 @@ export class InteractiveMode {
             return;
         }
         const component = new CustomEntryComponent(entry, renderer);
-        component.setExpanded(this.toolOutputExpanded);
+        this.adoptChatDetail(component);
         if (!component.hasContent()) {
             return;
         }
@@ -3189,7 +3210,7 @@ export class InteractiveMode {
                 if (message.display) {
                     const renderer = this.session.extensionRunner.getMessageRenderer(message.customType);
                     const component = new CustomMessageComponent(message, renderer, this.getMarkdownThemeWithSettings(), this.outputPad);
-                    component.setExpanded(this.toolOutputExpanded);
+                    this.adoptChatDetail(component);
                     this.chatContainer.addChild(component);
                 }
                 break;
@@ -3197,14 +3218,14 @@ export class InteractiveMode {
             case "compactionSummary": {
                 this.chatContainer.addChild(new Spacer(1));
                 const component = new CompactionSummaryMessageComponent(message, this.getMarkdownThemeWithSettings());
-                component.setExpanded(this.toolOutputExpanded);
+                this.adoptChatDetail(component);
                 this.chatContainer.addChild(component);
                 break;
             }
             case "branchSummary": {
                 this.chatContainer.addChild(new Spacer(1));
                 const component = new BranchSummaryMessageComponent(message, this.getMarkdownThemeWithSettings());
-                component.setExpanded(this.toolOutputExpanded);
+                this.adoptChatDetail(component);
                 this.chatContainer.addChild(component);
                 break;
             }
@@ -3218,7 +3239,7 @@ export class InteractiveMode {
                     if (skillBlock) {
                         // Render skill block (collapsible)
                         const component = new SkillInvocationMessageComponent(skillBlock, this.getMarkdownThemeWithSettings());
-                        component.setExpanded(this.toolOutputExpanded);
+                        this.adoptChatDetail(component);
                         this.chatContainer.addChild(component);
                         // Render user message separately if present
                         if (skillBlock.userMessage) {
@@ -3238,7 +3259,7 @@ export class InteractiveMode {
                 break;
             }
             case "assistant": {
-                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
+                const assistantComponent = new AssistantMessageComponent(message, this.isThinkingHidden(), this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
                 this.chatContainer.addChild(assistantComponent);
                 break;
             }
@@ -3283,7 +3304,7 @@ export class InteractiveMode {
                             showImages: this.settingsManager.getShowImages(),
                             imageWidthCells: this.settingsManager.getImageWidthCells(),
                         }, this.getRegisteredToolDefinition(content.name), this.ui, this.sessionManager.getCwd());
-                        component.setExpanded(this.toolOutputExpanded);
+                        this.adoptChatDetail(component);
                         this.chatContainer.addChild(component);
                         if (message.stopReason === "aborted" || message.stopReason === "error") {
                             let errorMessage;
@@ -3694,31 +3715,76 @@ export class InteractiveMode {
             this.showError(error instanceof Error ? error.message : String(error));
         }
     }
-    toggleToolOutputExpansion() {
-        this.setToolsExpanded(!this.toolOutputExpanded);
+    /**
+     * Bring a freshly created transcript component up to the current detail level.
+     *
+     * Components are constructed collapsed and adopted here, so a new component
+     * type joins the cycle by having the methods rather than by its call site
+     * remembering to set every axis.
+     */
+    adoptChatDetail(component) {
+        if (isExpandable(component))
+            component.setExpanded(this.toolOutputExpanded);
+        if (hasEditDiffsExpansion(component))
+            component.setEditDiffsExpanded(this.editDiffsExpanded);
+    }
+    cycleChatDetail() {
+        this.setChatDetail(nextChatDetail(this.chatDetail));
     }
-    setToolsExpanded(expanded) {
-        if (expanded === this.toolOutputExpanded)
+    /**
+     * Presentation only. This never rewrites messages, settings, or the session
+     * transcript, which is why it may override the persisted thinking preference
+     * at `all` without saving that override.
+     */
+    setChatDetail(detail) {
+        if (detail === this.chatDetail)
             return;
-        this.toolOutputExpanded = expanded;
+        this.chatDetail = detail;
+        const view = chatDetailView(detail);
+        this.toolOutputExpanded = view.toolOutputExpanded;
+        this.editDiffsExpanded = view.editDiffsExpanded;
+        this.applyChatDetail();
+        this.showStatus(`Conversation detail: ${detail}`);
+    }
+    /** True when thinking blocks are hidden right now, setting and detail level combined. */
+    isThinkingHidden() {
+        return this.hideThinkingBlock && !chatDetailView(this.chatDetail).revealThinking;
+    }
+    applyChatDetail() {
         const activeHeader = this.customHeader ?? this.builtInHeader;
         if (isExpandable(activeHeader)) {
-            activeHeader.setExpanded(expanded);
+            activeHeader.setExpanded(this.toolOutputExpanded);
         }
         for (const container of [this.loadedResourcesContainer, this.chatContainer]) {
             for (const child of container.children) {
+                if (child instanceof AssistantMessageComponent) {
+                    child.setHideThinkingBlock(this.isThinkingHidden());
+                }
                 if (isExpandable(child)) {
-                    child.setExpanded(expanded);
+                    child.setExpanded(this.toolOutputExpanded);
+                }
+                if (hasEditDiffsExpansion(child)) {
+                    child.setEditDiffsExpanded(this.editDiffsExpanded);
                 }
             }
         }
-        this.showStatus(`Tool output: ${expanded ? "expanded" : "collapsed"}`);
+        this.ui.requestRender();
+    }
+    /**
+     * The extension-facing boolean, which names one axis of three.
+     *
+     * Collapsing maps to `details` rather than `overview`, because an extension
+     * asking to collapse tool output has not asked to hide edit diffs, and
+     * `details` is the level where only tool output is collapsed.
+     */
+    setToolsExpanded(expanded) {
+        this.setChatDetail(expanded ? "all" : "details");
     }
     /** Update rendered assistant messages without rebuilding live tool components. */
     updateThinkingBlockVisibility() {
         for (const child of this.chatContainer.children) {
             if (child instanceof AssistantMessageComponent) {
-                child.setHideThinkingBlock(this.hideThinkingBlock);
+                child.setHideThinkingBlock(this.isThinkingHidden());
             }
         }
         this.ui.requestRender();
@@ -4456,14 +4522,21 @@ export class InteractiveMode {
     }
     showModelSelector(initialSearchInput) {
         this.showSelector((done) => {
-            const selectModel = async (model, persist) => {
+            const selectModel = async (model, persist, thinkingLevel) => {
                 try {
                     await this.session.setModel(model, { persist });
+                    // setModel already applied the level this model switches to, so this
+                    // only overrides it when the picker's effort was actually dialled. The
+                    // cast is the session's own: it stores and clamps "off" but types the
+                    // field as ThinkingLevel, which does not name it.
+                    if (thinkingLevel !== undefined)
+                        this.session.setThinkingLevel(thinkingLevel);
                     this.updateAvailableProviderCount();
                     this.footer.invalidate();
                     this.updateEditorBorderColor();
                     done();
-                    this.showStatus(persist ? `Default model: ${model.provider}/${model.id}` : `Model: ${model.id}`);
+                    const effort = thinkingLevel === undefined ? "" : ` · ${thinkingLevel}`;
+                    this.showStatus(persist ? `Default model: ${model.provider}/${model.id}${effort}` : `Model: ${model.id}${effort}`);
                     void this.maybeWarnAboutAnthropicSubscriptionAuth(model);
                     this.checkDaxnutsEasterEgg(model);
                 }
@@ -4474,10 +4547,10 @@ export class InteractiveMode {
             };
             const defaultProvider = this.settingsManager.getDefaultProvider();
             const defaultModel = this.settingsManager.getDefaultModel();
-            const selector = new ModelSelectorComponent(this.ui, this.session.model, this.session.modelRuntime, this.session.scopedModels, (model) => selectModel(model, false), () => {
+            const selector = new ModelSelectorComponent(this.ui, this.session.model, this.session.modelRuntime, this.session.scopedModels, (model, thinkingLevel) => selectModel(model, false, thinkingLevel), () => {
                 done();
                 this.ui.requestRender();
-            }, initialSearchInput, (model) => selectModel(model, true), defaultProvider && defaultModel ? { provider: defaultProvider, id: defaultModel } : undefined);
+            }, initialSearchInput, (model, thinkingLevel) => selectModel(model, true, thinkingLevel), defaultProvider && defaultModel ? { provider: defaultProvider, id: defaultModel } : undefined, { thinkingLevel: this.session.thinkingLevel });
             return { component: selector, focus: selector, dispose: () => selector.dispose() };
         });
     }
@@ -5745,7 +5818,7 @@ export class InteractiveMode {
 | \`${cycleThinkingLevel}\` | Cycle thinking level |
 | \`${cycleModelForward}\` / \`${cycleModelBackward}\` | Cycle models |
 | \`${selectModel}\` | Open model selector |
-| \`${expandTools}\` | Toggle tool output expansion |
+| \`${expandTools}\` | Cycle conversation detail (overview / details / all) |
 | \`${toggleThinking}\` | Toggle thinking block visibility |
 | \`${externalEditor}\` | Edit message in external editor |
 | \`${copyMessage}\` | Copy last assistant message |