@ai-agent-forge/agent-forge 0.88.1 → 0.88.2

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

@@ -24,6 +24,7 @@ import { setI18nLanguage, t } from "../../core/i18n/index.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
 import { DefaultPackageManager } from "../../core/package-manager.js";
+import { runCleanSessions } from "../../core/session-cleanup.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager, sessionEntryToContextMessages } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
@@ -56,6 +57,7 @@ import { SettingsSelectorComponent } from "./components/settings-selector.js";
 import { SkillInvocationMessageComponent } from "./components/skill-invocation-message.js";
 import { BranchSummaryStatusIndicator, CompactionStatusIndicator, IdleStatus, RetryStatusIndicator, WorkingStatusIndicator, } from "./components/status-indicator.js";
 import { ToolExecutionComponent } from "./components/tool-execution.js";
+import { ToolRunGroupComponent } from "./components/tool-run-group.js";
 import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { WorkflowViewComponent } from "./components/workflow-view.js";
@@ -296,6 +298,9 @@ export class InteractiveMode {
     streamingMessage = undefined;
     // Tool execution tracking: toolCallId -> component
     pendingTools = new Map();
+    // D-083 quiet transcript: the tool-run group for the current assistant
+    // turn (one group per message_start; null between turns).
+    activeToolRunGroup = undefined;
     // Tool output expansion state
     /** Host-visible for ./interactive-dialog-ui.ts (S5 slice 2). */
     toolOutputExpanded = false;
@@ -1784,7 +1789,17 @@ export class InteractiveMode {
                     this.ui.requestRender();
                 }
                 else if (event.message.role === "assistant") {
+                    // D-083: a new assistant turn closes the previous turn's
+                    // tool-run group (tools executed between the turns) and
+                    // starts a fresh one on its first toolCall.
+                    this.activeToolRunGroup?.markRunComplete();
+                    this.activeToolRunGroup = undefined;
                     this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
+                    // D-083: components created after a ctrl+o toggle inherit the
+                    // current expansion so detail mode holds across turns.
+                    if (this.toolOutputExpanded) {
+                        this.streamingComponent.setExpanded(true);
+                    }
                     this.streamingMessage = event.message;
                     this.chatContainer.addChild(this.streamingComponent);
                     this.streamingComponent.updateContent(this.streamingMessage, true);
@@ -1803,7 +1818,7 @@ export class InteractiveMode {
                                     imageWidthCells: this.settingsManager.getImageWidthCells(),
                                 }, this.getRegisteredToolDefinition(content.name), this.ui, this.facade.getCwd());
                                 component.setExpanded(this.toolOutputExpanded);
-                                this.chatContainer.addChild(component);
+                                this.addToolToRunGroup(component);
                                 this.pendingTools.set(content.id, component);
                             }
                             else {
@@ -1844,7 +1859,11 @@ export class InteractiveMode {
                                 content: [{ type: "text", text: errorMessage }],
                                 isError: true,
                             });
+                            this.activeToolRunGroup?.noteResult(true);
                         }
+                        // No tool execution follows an aborted/errored message:
+                        // finalize the group marker here.
+                        this.activeToolRunGroup?.markRunComplete();
                         this.pendingTools.clear();
                     }
                     else {
@@ -1857,6 +1876,11 @@ export class InteractiveMode {
                     }
                     this.streamingComponent = undefined;
                     this.streamingMessage = undefined;
+                    // D-083: a toolUse stop reason is followed by tool execution
+                    // events (start/end arrive after message_end — the session
+                    // executes tools once the streamed message completes), so the
+                    // group stays open for setActiveTool/noteResult here and is
+                    // finalized at agent_end / the next message_start.
                     this.footer.invalidate();
                 }
                 this.ui.requestRender();
@@ -1872,10 +1896,11 @@ export class InteractiveMode {
                         imageWidthCells: this.settingsManager.getImageWidthCells(),
                     }, this.getRegisteredToolDefinition(event.toolName), this.ui, this.facade.getCwd());
                     component.setExpanded(this.toolOutputExpanded);
-                    this.chatContainer.addChild(component);
+                    this.addToolToRunGroup(component);
                     this.pendingTools.set(event.toolCallId, component);
                 }
                 component.markExecutionStarted();
+                this.activeToolRunGroup?.setActiveTool(event.toolName);
                 this.ui.requestRender();
                 break;
             }
@@ -1891,6 +1916,7 @@ export class InteractiveMode {
                 const component = this.pendingTools.get(event.toolCallId);
                 if (component) {
                     component.updateResult({ ...event.result, isError: event.isError });
+                    this.activeToolRunGroup?.noteResult(event.isError);
                     this.pendingTools.delete(event.toolCallId);
                     this.ui.requestRender();
                 }
@@ -1917,6 +1943,11 @@ export class InteractiveMode {
                     this.streamingMessage = undefined;
                 }
                 this.pendingTools.clear();
+                // D-083: the whole agent turn (messages + tool executions) is
+                // over — finalize the last group's marker (count/sole-tool name
+                // + failure count). Completed groups stay in the transcript.
+                this.activeToolRunGroup?.markRunComplete();
+                this.activeToolRunGroup = undefined;
                 this.ui.requestRender();
                 break;
             case "agent_settled":
@@ -2149,6 +2180,12 @@ export class InteractiveMode {
             }
             case "assistant": {
                 const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
+                // D-083: restored/finished-turn thinking must follow detail mode
+                // (ctrl+o) — the setToolsExpanded loop only reaches children on
+                // toggle, not components created while already expanded.
+                if (this.toolOutputExpanded) {
+                    assistantComponent.setExpanded(true);
+                }
                 this.chatContainer.addChild(assistantComponent);
                 break;
             }
@@ -2188,6 +2225,9 @@ export class InteractiveMode {
             // Assistant messages need special handling for tool calls
             if (message.role === "assistant") {
                 this.addMessageToChat(message);
+                // No message_start on the restore path: reset the group pointer
+                // so each assistant message forms its own tool-run group (D-083).
+                this.activeToolRunGroup = undefined;
                 // Render tool call components
                 for (const content of message.content) {
                     if (content.type === "toolCall") {
@@ -2196,7 +2236,7 @@ export class InteractiveMode {
                             imageWidthCells: this.settingsManager.getImageWidthCells(),
                         }, this.getRegisteredToolDefinition(content.name), this.ui, this.facade.getCwd());
                         component.setExpanded(this.toolOutputExpanded);
-                        this.chatContainer.addChild(component);
+                        this.addToolToRunGroup(component);
                         if (message.stopReason === "aborted" || message.stopReason === "error") {
                             let errorMessage;
                             if (message.stopReason === "aborted") {
@@ -2212,12 +2252,14 @@ export class InteractiveMode {
                                 errorMessage = message.errorMessage || t("Error");
                             }
                             component.updateResult({ content: [{ type: "text", text: errorMessage }], isError: true });
+                            this.noteResultInActiveToolRunGroup(true);
                         }
                         else {
                             renderedPendingTools.set(content.id, component);
                         }
                     }
                 }
+                this.markActiveToolRunGroupComplete();
                 if (message.stopReason !== "aborted" && message.stopReason !== "error") {
                     const miss = cacheMisses.get(message);
                     if (miss)
@@ -2229,6 +2271,9 @@ export class InteractiveMode {
                 const component = renderedPendingTools.get(message.toolCallId);
                 if (component) {
                     component.updateResult(message);
+                    // Failure never goes silent (D-083): count it on the group
+                    // the restored tool call belongs to.
+                    this.noteResultInActiveToolRunGroup(message.isError);
                     renderedPendingTools.delete(message.toolCallId);
                 }
             }
@@ -2240,6 +2285,9 @@ export class InteractiveMode {
         for (const [toolCallId, component] of renderedPendingTools) {
             this.pendingTools.set(toolCallId, component);
         }
+        // Groups stay in the transcript; reset the pointer so a live turn
+        // starts a fresh group (D-083).
+        this.activeToolRunGroup = undefined;
         this.ui.requestRender();
     }
     /**
@@ -2666,6 +2714,32 @@ export class InteractiveMode {
     toggleToolOutputExpansion() {
         this.setToolsExpanded(!this.toolOutputExpanded);
     }
+    /**
+     * D-083 quiet transcript: mount a tool component into the current
+     * assistant turn's tool-run group (creating the group on first tool of
+     * the turn) instead of the chat container directly. Collapsed groups
+     * render one dim marker line for the whole turn.
+     */
+    addToolToRunGroup(component) {
+        if (!this.activeToolRunGroup) {
+            this.activeToolRunGroup = new ToolRunGroupComponent();
+            this.activeToolRunGroup.setExpanded(this.toolOutputExpanded);
+            this.chatContainer.addChild(this.activeToolRunGroup);
+        }
+        this.activeToolRunGroup.addTool(component);
+    }
+    /**
+     * Narrowing-safe faces for the active group inside renderSessionItems:
+     * addToolToRunGroup may (re)assign this.activeToolRunGroup behind the
+     * compiler's back, so group reads go through methods instead of the
+     * narrowed property reference.
+     */
+    noteResultInActiveToolRunGroup(isError) {
+        this.activeToolRunGroup?.noteResult(isError);
+    }
+    markActiveToolRunGroupComplete() {
+        this.activeToolRunGroup?.markRunComplete();
+    }
     setToolsExpanded(expanded) {
         if (expanded === this.toolOutputExpanded)
             return;
@@ -4362,6 +4436,14 @@ ${externalEditorRow}${copyMessageRow}${followUpRow}${dequeueRow}
             // Ignore, will be emitted as an event
         }
     }
+    /** /clean-sessions：会话清理两阶段流程；输出/确认走宿主既有机制（设计 §7）。 */
+    async handleCleanSessionsCommand(arg) {
+        await runCleanSessions({
+            showMessage: (text) => this.showStatus(text),
+            showError: (text) => this.showError(text),
+            confirm: (title, message) => this.showDialogConfirm(title, message),
+        }, arg);
+    }
     stop(fullscreenExitOutput = this.settingsManager.getFullscreenExitOutput()) {
         this.disposeActiveSelector();
         if (this.settingsManager.getShowTerminalProgress()) {