@codingame/monaco-vscode-chat-service-override 30.0.0 → 31.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEventDetailRenderer.js

@@ -7,47 +7,47 @@ function formatEventDetail(event) {
     switch (event.kind) {
     case "toolCall":
         {
-            const parts = [( localize(5796, "Tool: {0}", event.toolName))];
+            const parts = [( localize(5886, "Tool: {0}", event.toolName))];
             if (event.toolCallId) {
-                parts.push(( localize(5797, "Call ID: {0}", event.toolCallId)));
+                parts.push(( localize(5887, "Call ID: {0}", event.toolCallId)));
             }
             if (event.result) {
-                parts.push(( localize(5798, "Result: {0}", event.result)));
+                parts.push(( localize(5888, "Result: {0}", event.result)));
             }
             if (event.durationInMillis !== undefined) {
                 parts.push(( localize(
-                    5799,
+                    5889,
                     "Duration: {0}ms",
                     numberFormatter.value.format(event.durationInMillis)
                 )));
             }
             if (event.input) {
-                parts.push(`\n${( localize(5800, "Input:"))}\n${event.input}`);
+                parts.push(`\n${( localize(5890, "Input:"))}\n${event.input}`);
             }
             if (event.output) {
-                parts.push(`\n${( localize(5801, "Output:"))}\n${event.output}`);
+                parts.push(`\n${( localize(5891, "Output:"))}\n${event.output}`);
             }
             return parts.join("\n");
         }
     case "modelTurn":
         {
-            const parts = [event.model ?? ( localize(5802, "Model Turn"))];
+            const parts = [event.model ?? ( localize(5892, "Model Turn"))];
             if (event.inputTokens !== undefined) {
-                parts.push(( localize(5803, "Input tokens: {0}", numberFormatter.value.format(event.inputTokens))));
+                parts.push(( localize(5893, "Input tokens: {0}", numberFormatter.value.format(event.inputTokens))));
             }
             if (event.outputTokens !== undefined) {
                 parts.push(( localize(
-                    5804,
+                    5894,
                     "Output tokens: {0}",
                     numberFormatter.value.format(event.outputTokens)
                 )));
             }
             if (event.totalTokens !== undefined) {
-                parts.push(( localize(5805, "Total tokens: {0}", numberFormatter.value.format(event.totalTokens))));
+                parts.push(( localize(5895, "Total tokens: {0}", numberFormatter.value.format(event.totalTokens))));
             }
             if (event.durationInMillis !== undefined) {
                 parts.push(( localize(
-                    5799,
+                    5889,
                     "Duration: {0}ms",
                     numberFormatter.value.format(event.durationInMillis)
                 )));
@@ -58,26 +58,26 @@ function formatEventDetail(event) {
         return `${event.name}\n${event.details ?? ""}`;
     case "subagentInvocation":
         {
-            const parts = [( localize(5806, "Agent: {0}", event.agentName))];
+            const parts = [( localize(5896, "Agent: {0}", event.agentName))];
             if (event.description) {
-                parts.push(( localize(5807, "Description: {0}", event.description)));
+                parts.push(( localize(5897, "Description: {0}", event.description)));
             }
             if (event.status) {
-                parts.push(( localize(5808, "Status: {0}", event.status)));
+                parts.push(( localize(5898, "Status: {0}", event.status)));
             }
             if (event.durationInMillis !== undefined) {
                 parts.push(( localize(
-                    5799,
+                    5889,
                     "Duration: {0}ms",
                     numberFormatter.value.format(event.durationInMillis)
                 )));
             }
             if (event.toolCallCount !== undefined) {
-                parts.push(( localize(5809, "Tool calls: {0}", numberFormatter.value.format(event.toolCallCount))));
+                parts.push(( localize(5899, "Tool calls: {0}", numberFormatter.value.format(event.toolCallCount))));
             }
             if (event.modelTurnCount !== undefined) {
                 parts.push(( localize(
-                    5810,
+                    5900,
                     "Model turns: {0}",
                     numberFormatter.value.format(event.modelTurnCount)
                 )));
@@ -86,7 +86,7 @@ function formatEventDetail(event) {
         }
     case "userMessage":
         {
-            const parts = [( localize(5811, "User Message: {0}", event.message))];
+            const parts = [( localize(5901, "User Message: {0}", event.message))];
             for (const section of event.sections) {
                 parts.push(`\n--- ${section.name} ---\n${section.content}`);
             }
@@ -94,7 +94,7 @@ function formatEventDetail(event) {
         }
     case "agentResponse":
         {
-            const parts = [( localize(5812, "Agent Response: {0}", event.message))];
+            const parts = [( localize(5902, "Agent Response: {0}", event.message))];
             for (const section of event.sections) {
                 parts.push(`\n--- ${section.name} ---\n${section.content}`);
             }

package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugEventList.js

@@ -25,17 +25,17 @@ function getEventCreatedText(element) {
 function getEventNameText(element) {
     switch (element.kind) {
     case "toolCall":
-        return safeStr(element.toolName, ( localize(5813, "(unknown)")));
+        return safeStr(element.toolName, ( localize(5903, "(unknown)")));
     case "modelTurn":
-        return safeStr(element.model) || ( localize(5814, "Model Turn"));
+        return safeStr(element.model) || ( localize(5904, "Model Turn"));
     case "generic":
-        return safeStr(element.name, ( localize(5813, "(unknown)")));
+        return safeStr(element.name, ( localize(5903, "(unknown)")));
     case "subagentInvocation":
-        return safeStr(element.agentName, ( localize(5813, "(unknown)")));
+        return safeStr(element.agentName, ( localize(5903, "(unknown)")));
     case "userMessage":
-        return localize(5815, "User Message");
+        return localize(5905, "User Message");
     case "agentResponse":
-        return localize(5816, "Agent Response");
+        return localize(5906, "Agent Response");
     }
 }
 function getEventDetailsText(element) {
@@ -45,7 +45,7 @@ function getEventDetailsText(element) {
     case "modelTurn":
         return [
             safeStr(element.requestName),
-            element.totalTokens !== undefined ? ( localize(5817, "{0} tokens", numberFormatter.value.format(element.totalTokens))) : ""
+            element.totalTokens !== undefined ? ( localize(5907, "{0} tokens", numberFormatter.value.format(element.totalTokens))) : ""
         ].filter(Boolean).join(" · ");
     case "generic":
         return safeStr(element.details);

package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFilters.js

@@ -5,7 +5,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { viewFilterSubmenu } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewFilter';
-import { parseTimeToken, stripTimestampTokens } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/common/chatDebugEvents';
+import { parseTimeToken, stripTimestampTokens } from '../../common/chatDebugEvents.js';
 import { CHAT_DEBUG_FILTER_ACTIVE, CHAT_DEBUG_KIND_TOOL_CALL, CHAT_DEBUG_KIND_MODEL_TURN, CHAT_DEBUG_KIND_PROMPT_DISCOVERY, CHAT_DEBUG_KIND_SUBAGENT, CHAT_DEBUG_CMD_TOGGLE_TOOL_CALL, CHAT_DEBUG_CMD_TOGGLE_MODEL_TURN, CHAT_DEBUG_CMD_TOGGLE_PROMPT_DISCOVERY, CHAT_DEBUG_CMD_TOGGLE_SUBAGENT } from './chatDebugTypes.js';
 
 class ChatDebugFilterState extends Disposable {
@@ -26,7 +26,7 @@ class ChatDebugFilterState extends Disposable {
         case "modelTurn":
             return this.filterKindModelTurn;
         case "generic":
-            if (category !== "discovery") {
+            if (category !== "discovery" && category !== "customization") {
                 return true;
             }
             return this.filterKindPromptDiscovery;
@@ -96,16 +96,16 @@ function registerFilterMenuItems(state, scopedContextKeyService) {
             when: CHAT_DEBUG_FILTER_ACTIVE
         }));
     };
-    registerToggle(CHAT_DEBUG_CMD_TOGGLE_TOOL_CALL, ( localize(5818, "Tool Calls")), CHAT_DEBUG_KIND_TOOL_CALL, "1_kind", () => state.filterKindToolCall, v => {
+    registerToggle(CHAT_DEBUG_CMD_TOGGLE_TOOL_CALL, ( localize(5908, "Tool Calls")), CHAT_DEBUG_KIND_TOOL_CALL, "1_kind", () => state.filterKindToolCall, v => {
         state.filterKindToolCall = v;
     }, kindToolCallKey);
-    registerToggle(CHAT_DEBUG_CMD_TOGGLE_MODEL_TURN, ( localize(5819, "Model Turns")), CHAT_DEBUG_KIND_MODEL_TURN, "1_kind", () => state.filterKindModelTurn, v => {
+    registerToggle(CHAT_DEBUG_CMD_TOGGLE_MODEL_TURN, ( localize(5909, "Model Turns")), CHAT_DEBUG_KIND_MODEL_TURN, "1_kind", () => state.filterKindModelTurn, v => {
         state.filterKindModelTurn = v;
     }, kindModelTurnKey);
-    registerToggle(CHAT_DEBUG_CMD_TOGGLE_PROMPT_DISCOVERY, ( localize(5820, "Chat Customization")), CHAT_DEBUG_KIND_PROMPT_DISCOVERY, "1_kind", () => state.filterKindPromptDiscovery, v => {
+    registerToggle(CHAT_DEBUG_CMD_TOGGLE_PROMPT_DISCOVERY, ( localize(5910, "Chat Customization")), CHAT_DEBUG_KIND_PROMPT_DISCOVERY, "1_kind", () => state.filterKindPromptDiscovery, v => {
         state.filterKindPromptDiscovery = v;
     }, kindPromptDiscoveryKey);
-    registerToggle(CHAT_DEBUG_CMD_TOGGLE_SUBAGENT, ( localize(5821, "Subagent Invocations")), CHAT_DEBUG_KIND_SUBAGENT, "1_kind", () => state.filterKindSubagent, v => {
+    registerToggle(CHAT_DEBUG_CMD_TOGGLE_SUBAGENT, ( localize(5911, "Subagent Invocations")), CHAT_DEBUG_KIND_SUBAGENT, "1_kind", () => state.filterKindSubagent, v => {
         state.filterKindSubagent = v;
     }, kindSubagentKey);
     return store;

package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFlowChartView.js

@@ -98,8 +98,8 @@ let ChatDebugFlowChartView = class ChatDebugFlowChartView extends Disposable {
         syncContextKeys();
         const childInstantiationService = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, scopedContextKeyService]))));
         this.filterWidget = this._register(childInstantiationService.createInstance(FilterWidget, {
-            placeholder: ( localize(5822, "Filter nodes...")),
-            ariaLabel: ( localize(5823, "Filter flow chart nodes"))
+            placeholder: ( localize(5912, "Filter nodes...")),
+            ariaLabel: ( localize(5913, "Filter flow chart nodes"))
         }));
         const filterContainer = append(headerContainer, $(".viewpane-filter-container"));
         filterContainer.appendChild(this.filterWidget.element);
@@ -158,7 +158,7 @@ let ChatDebugFlowChartView = class ChatDebugFlowChartView extends Disposable {
             return;
         }
         const sessionTitle = this.chatService.getSessionTitle(this.currentSessionResource) || LocalChatSessionUri.parseLocalSessionId(this.currentSessionResource) || ( this.currentSessionResource.toString());
-        this.breadcrumbWidget.setItems([( new TextBreadcrumbItem(( localize(5824, "Agent Debug Logs")), true)), ( new TextBreadcrumbItem(sessionTitle, true)), ( new TextBreadcrumbItem(( localize(5825, "Agent Flow Chart"))))]);
+        this.breadcrumbWidget.setItems([( new TextBreadcrumbItem(( localize(5914, "Agent Debug Logs")), true)), ( new TextBreadcrumbItem(sessionTitle, true)), ( new TextBreadcrumbItem(( localize(5915, "Agent Flow Chart"))))]);
     }
     load() {
         const hadFocus = isAncestorOfActiveElement(this.content);
@@ -176,7 +176,7 @@ let ChatDebugFlowChartView = class ChatDebugFlowChartView extends Disposable {
         }
         if (events.length === 0) {
             const emptyMsg = append(this.content, $(".chat-debug-flowchart-empty"));
-            emptyMsg.textContent = ( localize(5826, "No events recorded for this session."));
+            emptyMsg.textContent = ( localize(5916, "No events recorded for this session."));
             return;
         }
         const flowNodes = buildFlowGraph(events);
@@ -186,7 +186,7 @@ let ChatDebugFlowChartView = class ChatDebugFlowChartView extends Disposable {
         });
         if (filtered.length === 0) {
             const emptyMsg = append(this.content, $(".chat-debug-flowchart-empty"));
-            emptyMsg.textContent = ( localize(5827, "No nodes match the current filter."));
+            emptyMsg.textContent = ( localize(5917, "No nodes match the current filter."));
             return;
         }
         const slice = sliceFlowNodes(filtered, this.visibleLimit);
@@ -205,9 +205,9 @@ let ChatDebugFlowChartView = class ChatDebugFlowChartView extends Disposable {
             const showMoreBtn = this.loadDisposables.add(( new Button(showMoreContainer, {
                 ...defaultButtonStyles,
                 secondary: true,
-                title: ( localize(5828, "Load more nodes"))
+                title: ( localize(5918, "Load more nodes"))
             })));
-            showMoreBtn.label = ( localize(5829, "Show More ({0})", remaining));
+            showMoreBtn.label = ( localize(5919, "Show More ({0})", remaining));
             this.loadDisposables.add(showMoreBtn.onDidClick(() => {
                 this.visibleLimit += PAGE_SIZE;
                 this.load();

package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFlowGraph.js

@@ -8,11 +8,29 @@ function truncateLabel(text, maxLength) {
     return text.substring(0, maxLength - 1) + "…";
 }
 function buildFlowGraph(events) {
-    const subagentToolNames = ( new Set(["runSubagent", "search_subagent"]));
+    const subagentToolNames = ["runSubagent", "search_subagent"];
+    function isSubagentName(name) {
+        for (const toolName of subagentToolNames) {
+            if (name === toolName) {
+                return true;
+            }
+            if (name.startsWith(toolName)) {
+                const nextChar = name[toolName.length];
+                if (nextChar === "-" || nextChar === " " || nextChar === "(" || nextChar === ":") {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    const emojiPrefixRe = /^\u{1F6E0}\uFE0F?\s*/u;
+    function stripToolEmoji(name) {
+        return name.replace(emojiPrefixRe, "");
+    }
     const completionDescsByParent = ( new Map());
     const startedCountByParent = ( new Map());
     for (const e of events) {
-        if (e.kind === "subagentInvocation" && ( subagentToolNames.has(e.agentName)) && e.description && e.parentEventId) {
+        if (e.kind === "subagentInvocation" && isSubagentName(e.agentName) && e.description && e.parentEventId) {
             let descs = completionDescsByParent.get(e.parentEventId);
             if (!descs) {
                 descs = [];
@@ -34,10 +52,7 @@ function buildFlowGraph(events) {
         return descs[idx] ?? descs[0];
     }
     const filtered = events.filter(e => {
-        if (e.kind === "toolCall" && ( subagentToolNames.has(e.toolName.replace(/^\u{1F6E0}\uFE0F?\s*/u, "")))) {
-            return false;
-        }
-        if (e.kind === "subagentInvocation" && ( subagentToolNames.has(e.agentName))) {
+        if (e.kind === "subagentInvocation" && isSubagentName(e.agentName)) {
             return false;
         }
         return true;
@@ -71,7 +86,8 @@ function buildFlowGraph(events) {
         let description;
         if (effectiveKind === "subagentInvocation") {
             description = getSubagentDescription(event);
-            label = description ? ( localize(5830, "Subagent: {0}", truncateLabel(description, 30))) : ( localize(5831, "Subagent"));
+            const cleanDesc = description?.replace(/^Subagent:\s*/i, "");
+            label = cleanDesc ? ( localize(5920, "Subagent: {0}", truncateLabel(cleanDesc, 30))) : ( localize(5921, "Subagent"));
             if (description) {
                 if (tooltip && !tooltip.includes(description)) {
                     const lines = tooltip.split("\n");
@@ -93,7 +109,66 @@ function buildFlowGraph(events) {
             children: children?.map(toFlowNode) ?? []
         };
     }
-    return ( roots.map(toFlowNode));
+    const rawNodes = ( roots.map(toFlowNode));
+    return collapseSubagentToolCalls(rawNodes);
+    function collapseSubagentToolCalls(nodeList) {
+        let changed = false;
+        const result = [];
+        for (const node of nodeList) {
+            if (node.kind === "toolCall" && isSubagentName(stripToolEmoji(node.label))) {
+                changed = true;
+                const flatChildren = flattenChildSessionRefs(node.children);
+                const subagentChildren = flatChildren.filter(c => c.kind === "subagentInvocation");
+                if (subagentChildren.length > 0) {
+                    const otherChildren = flatChildren.filter(c => c.kind !== "subagentInvocation");
+                    for (let i = 0; i < subagentChildren.length; i++) {
+                        const extra = i === 0 ? otherChildren : [];
+                        result.push({
+                            ...subagentChildren[i],
+                            children: collapseSubagentToolCalls([...subagentChildren[i].children, ...extra])
+                        });
+                    }
+                } else {
+                    result.push(...collapseSubagentToolCalls(flatChildren));
+                }
+            } else {
+                const newChildren = collapseSubagentToolCalls(node.children);
+                if (newChildren !== node.children) {
+                    changed = true;
+                    result.push({
+                        ...node,
+                        children: newChildren
+                    });
+                } else {
+                    result.push(node);
+                }
+            }
+        }
+        return changed ? result : nodeList;
+    }
+    function flattenChildSessionRefs(nodeList) {
+        if (!( nodeList.some(n => n.kind === "generic" && n.category === "subagent"))) {
+            return nodeList;
+        }
+        const result = [];
+        for (const node of nodeList) {
+            if (node.kind === "generic" && node.category === "subagent") {
+                const subagentChild = node.children.find(c => c.kind === "subagentInvocation");
+                if (subagentChild) {
+                    const siblings = node.children.filter(c => c !== subagentChild);
+                    result.push({
+                        ...subagentChild,
+                        children: [...subagentChild.children, ...siblings]
+                    });
+                } else {
+                    result.push(...node.children);
+                }
+            } else {
+                result.push(node);
+            }
+        }
+        return result;
+    }
 }
 function filterFlowNodes(nodes, options) {
     let result = filterByKind(nodes, options.isKindVisible);
@@ -225,13 +300,13 @@ function mergeDiscoveryNodes(nodes) {
         const mergedId = `merged-discovery:${run[0].id}`;
         const labels = ( run.map(n => n.label));
         const uniqueLabels = [...( new Set(labels))];
-        const summaryLabel = uniqueLabels.length <= 2 ? uniqueLabels.join(", ") : ( localize(5832, "{0} +{1} more", uniqueLabels[0], run.length - 1));
+        const summaryLabel = uniqueLabels.length <= 2 ? uniqueLabels.join(", ") : ( localize(5922, "{0} +{1} more", uniqueLabels[0], run.length - 1));
         result.push({
             id: mergedId,
             kind: "generic",
             category: "discovery",
             label: summaryLabel,
-            sublabel: ( localize(5833, "{0} discovery steps", run.length)),
+            sublabel: ( localize(5923, "{0} discovery steps", run.length)),
             tooltip: ( run.map(n => n.label + (n.sublabel ? `: ${n.sublabel}` : ""))).join("\n"),
             created: run[0].created,
             children: [],
@@ -282,7 +357,7 @@ function mergeToolCallNodes(nodes) {
             id: mergedId,
             kind: "toolCall",
             label: toolName,
-            sublabel: ( localize(5834, "{0} calls", run.length)),
+            sublabel: ( localize(5924, "{0} calls", run.length)),
             tooltip: ( run.map(n => n.label + (n.sublabel ? `: ${n.sublabel}` : ""))).join("\n"),
             created: run[0].created,
             children: [],
@@ -315,17 +390,17 @@ function getEventLabel(event, effectiveKind) {
     const kind = effectiveKind ?? event.kind;
     switch (kind) {
     case "userMessage":
-        return localize(5835, "User Message");
+        return localize(5925, "User Message");
     case "modelTurn":
-        return event.kind === "modelTurn" ? (event.model ?? ( localize(5836, "Model Turn"))) : ( localize(5836, "Model Turn"));
+        return event.kind === "modelTurn" ? (event.model ?? ( localize(5926, "Model Turn"))) : ( localize(5926, "Model Turn"));
     case "toolCall":
-        return event.kind === "toolCall" ? event.toolName : event.kind === "generic" ? event.name : ( localize(5837, "Tool Call"));
+        return event.kind === "toolCall" ? event.toolName : event.kind === "generic" ? event.name : ( localize(5927, "Tool Call"));
     case "subagentInvocation":
-        return event.kind === "subagentInvocation" ? event.agentName : ( localize(5838, "Subagent"));
+        return event.kind === "subagentInvocation" ? event.agentName : ( localize(5928, "Subagent"));
     case "agentResponse":
-        return localize(5839, "Agent Response");
+        return localize(5929, "Agent Response");
     case "generic":
-        return event.kind === "generic" ? event.name : ( localize(5840, "Event"));
+        return event.kind === "generic" ? event.name : ( localize(5930, "Event"));
     }
 }
 function getEventSublabel(event, effectiveKind) {
@@ -338,7 +413,7 @@ function getEventSublabel(event, effectiveKind) {
                 parts.push(event.requestName);
             }
             if (event.kind === "modelTurn" && event.totalTokens) {
-                parts.push(( localize(5841, "{0} tokens", event.totalTokens)));
+                parts.push(( localize(5931, "{0} tokens", event.totalTokens)));
             }
             if (event.kind === "modelTurn" && event.durationInMillis) {
                 parts.push(formatDuration(event.durationInMillis));
@@ -426,7 +501,7 @@ function getEventTooltip(event) {
             if (event.input) {
                 const input = event.input.trim();
                 parts.push(( localize(
-                    5842,
+                    5932,
                     "Input: {0}",
                     input.length > TOOLTIP_MAX_LENGTH ? input.substring(0, TOOLTIP_MAX_LENGTH) + "…" : input
                 )));
@@ -434,13 +509,13 @@ function getEventTooltip(event) {
             if (event.output) {
                 const output = event.output.trim();
                 parts.push(( localize(
-                    5843,
+                    5933,
                     "Output: {0}",
                     output.length > TOOLTIP_MAX_LENGTH ? output.substring(0, TOOLTIP_MAX_LENGTH) + "…" : output
                 )));
             }
             if (event.result) {
-                parts.push(( localize(5844, "Result: {0}", event.result)));
+                parts.push(( localize(5934, "Result: {0}", event.result)));
             }
             return parts.join("\n");
         }
@@ -451,13 +526,13 @@ function getEventTooltip(event) {
                 parts.push(event.description);
             }
             if (event.status) {
-                parts.push(( localize(5845, "Status: {0}", event.status)));
+                parts.push(( localize(5935, "Status: {0}", event.status)));
             }
             if (event.toolCallCount !== undefined) {
-                parts.push(( localize(5846, "Tool calls: {0}", event.toolCallCount)));
+                parts.push(( localize(5936, "Tool calls: {0}", event.toolCallCount)));
             }
             if (event.modelTurnCount !== undefined) {
-                parts.push(( localize(5847, "Model turns: {0}", event.modelTurnCount)));
+                parts.push(( localize(5937, "Model turns: {0}", event.modelTurnCount)));
             }
             return parts.join("\n");
         }
@@ -476,16 +551,16 @@ function getEventTooltip(event) {
                 parts.push(event.model);
             }
             if (event.totalTokens) {
-                parts.push(( localize(5848, "Tokens: {0}", event.totalTokens)));
+                parts.push(( localize(5938, "Tokens: {0}", event.totalTokens)));
             }
             if (event.inputTokens) {
-                parts.push(( localize(5849, "Input tokens: {0}", event.inputTokens)));
+                parts.push(( localize(5939, "Input tokens: {0}", event.inputTokens)));
             }
             if (event.outputTokens) {
-                parts.push(( localize(5850, "Output tokens: {0}", event.outputTokens)));
+                parts.push(( localize(5940, "Output tokens: {0}", event.outputTokens)));
             }
             if (event.durationInMillis) {
-                parts.push(( localize(5851, "Duration: {0}", formatDuration(event.durationInMillis))));
+                parts.push(( localize(5941, "Duration: {0}", formatDuration(event.durationInMillis))));
             }
             return parts.length > 0 ? parts.join("\n") : undefined;
         }

package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugFlowLayout.js

@@ -298,13 +298,14 @@ function resolvePendingExpansions(pendingExpansions, result) {
             result.nodes.push(childNode);
             expandY += NODE_HEIGHT + NODE_GAP_Y;
         }
+        const edgeY = childNodes[0].y + childNodes[0].height / 2;
         result.edges.push({
             fromId: mergedNode.id,
             toId: childNodes[0].id,
             fromX: mergedNode.x + mergedNode.width,
-            fromY: mergedNode.y + mergedNode.height / 2,
+            fromY: edgeY,
             toX: expandX,
-            toY: childNodes[0].y + childNodes[0].height / 2
+            toY: edgeY
         });
         for (let k = 0; k < childNodes.length - 1; k++) {
             result.edges.push(makeEdge(childNodes[k], childNodes[k + 1]));

package/vscode/src/vs/workbench/contrib/chat/browser/chatDebug/chatDebugHomeView.d.ts

@@ -4,11 +4,13 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IChatDebugService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatDebugService.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
+import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
 import { IPreferencesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service";
 export declare class ChatDebugHomeView extends Disposable {
     private readonly chatService;
     private readonly chatDebugService;
     private readonly chatWidgetService;
+    private readonly agentSessionsService;
     private readonly configurationService;
     private readonly preferencesService;
     private readonly _onNavigateToSession;
@@ -16,8 +18,16 @@ export declare class ChatDebugHomeView extends Disposable {
     readonly container: HTMLElement;
     private readonly scrollContent;
     private readonly renderDisposables;
-    constructor(parent: HTMLElement, chatService: IChatService, chatDebugService: IChatDebugService, chatWidgetService: IChatWidgetService, configurationService: IConfigurationService, preferencesService: IPreferencesService);
+    /** Number of sessions currently visible (grows on "Show More"). */
+    private _visibleCount;
+    /** Session resource that the user last navigated to from the home view. */
+    private _lastOpenedSessionResource;
+    /** Tracks the number of known sessions so we can detect new ones. */
+    private _lastKnownSessionCount;
+    constructor(parent: HTMLElement, chatService: IChatService, chatDebugService: IChatDebugService, chatWidgetService: IChatWidgetService, agentSessionsService: IAgentSessionsService, configurationService: IConfigurationService, preferencesService: IPreferencesService);
     show(): void;
     hide(): void;
     render(): void;
+    private _getFilteredSessionResources;
+    private _renderWithSessions;
 }