@codingame/monaco-vscode-chat-service-override 31.0.1 → 32.0.0

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

@@ -23,11 +23,17 @@ import { setupBreadcrumbKeyboardNavigation, TextBreadcrumbItem } from './chatDeb
 
 const $ = $$1;
 const numberFormatter = safeIntl.NumberFormat();
+const aicFormatter = safeIntl.NumberFormat(undefined, {
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2
+});
+const NANO_AIU_PER_AIC = 1_000_000_000;
 var OverviewNavigation;
 (function(OverviewNavigation) {
     OverviewNavigation["Home"] = "home";
     OverviewNavigation["Logs"] = "logs";
     OverviewNavigation["FlowChart"] = "flowchart";
+    OverviewNavigation["CacheExplorer"] = "cache";
 })(OverviewNavigation || (OverviewNavigation = {}));
 let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
     constructor(
@@ -106,7 +112,7 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
             return;
         }
         const sessionTitle = this.chatService.getSessionTitle(this.currentSessionResource) || LocalChatSessionUri.parseLocalSessionId(this.currentSessionResource) || ( this.currentSessionResource.toString());
-        this.breadcrumbWidget.setItems([( new TextBreadcrumbItem(( localize(6024, "Agent Debug Logs")), true)), ( new TextBreadcrumbItem(sessionTitle))]);
+        this.breadcrumbWidget.setItems([( new TextBreadcrumbItem(( localize(6256, "Agent Debug Logs")), true)), ( new TextBreadcrumbItem(sessionTitle))]);
     }
     load() {
         clearNode(this.content);
@@ -122,8 +128,8 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
         titleEl.append(sessionTitle);
         const titleActions = append(titleRow, $(".chat-debug-overview-title-actions"));
         const revealSessionBtn = this.loadDisposables.add(( new Button(titleActions, {
-            ariaLabel: ( localize(6025, "Reveal Chat Session")),
-            title: ( localize(6025, "Reveal Chat Session"))
+            ariaLabel: ( localize(6257, "Reveal Chat Session")),
+            title: ( localize(6257, "Reveal Chat Session"))
         })));
         revealSessionBtn.element.classList.add("chat-debug-icon-button");
         revealSessionBtn.icon = Codicon.goToFile;
@@ -142,36 +148,36 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
         const details = [];
         const sessionType = getChatSessionType(sessionUri);
         const contribution = this.chatSessionsService.getChatSessionContribution(sessionType);
-        const sessionTypeName = contribution?.displayName || (sessionType === localChatSessionType ? ( localize(6026, "Local")) : sessionType);
+        const sessionTypeName = contribution?.displayName || (sessionType === localChatSessionType ? ( localize(6258, "Local")) : sessionType);
         details.push({
-            label: ( localize(6027, "Session Type")),
+            label: ( localize(6259, "Session Type")),
             value: sessionTypeName
         });
         if (model) {
             const locationLabel = this.getLocationLabel(model.initialLocation);
             details.push({
-                label: ( localize(6028, "Location")),
+                label: ( localize(6260, "Location")),
                 value: locationLabel
             });
             const inProgress = model.requestInProgress.get();
-            const statusLabel = inProgress ? ( localize(6029, "In Progress")) : ( localize(6030, "Idle"));
+            const statusLabel = inProgress ? ( localize(6261, "In Progress")) : ( localize(6262, "Idle"));
             details.push({
-                label: ( localize(6031, "Status")),
+                label: ( localize(6263, "Status")),
                 value: statusLabel
             });
             const timing = model.timing;
             details.push({
-                label: ( localize(6032, "Created")),
+                label: ( localize(6264, "Created")),
                 value: ( new Date(timing.created)).toLocaleString()
             });
             if (timing.lastRequestEnded) {
                 details.push({
-                    label: ( localize(6033, "Last Activity")),
+                    label: ( localize(6265, "Last Activity")),
                     value: ( new Date(timing.lastRequestEnded)).toLocaleString()
                 });
             } else if (timing.lastRequestStarted) {
                 details.push({
-                    label: ( localize(6033, "Last Activity")),
+                    label: ( localize(6265, "Last Activity")),
                     value: ( new Date(timing.lastRequestStarted)).toLocaleString()
                 });
             }
@@ -180,7 +186,7 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
             const section = append(this.content, $(".chat-debug-overview-section"));
             append(
                 section,
-                $("h3.chat-debug-overview-section-label", undefined, ( localize(6034, "Session Details")))
+                $("h3.chat-debug-overview-section-label", undefined, ( localize(6266, "Session Details")))
             );
             const detailsGrid = append(section, $(".chat-debug-overview-details"));
             for (const detail of details) {
@@ -193,13 +199,13 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
     getLocationLabel(location) {
         switch (location) {
         case ChatAgentLocation.Chat:
-            return localize(6035, "Chat Panel");
+            return localize(6267, "Chat Panel");
         case ChatAgentLocation.Terminal:
-            return localize(6036, "Terminal");
+            return localize(6268, "Terminal");
         case ChatAgentLocation.Notebook:
-            return localize(6037, "Notebook");
+            return localize(6269, "Notebook");
         case ChatAgentLocation.EditorInline:
-            return localize(6038, "Editor Inline");
+            return localize(6270, "Editor Inline");
         default:
             return String(location);
         }
@@ -208,7 +214,7 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
         const metricsSection = append(this.content, $(".chat-debug-overview-section"));
         append(
             metricsSection,
-            $("h3.chat-debug-overview-section-label", undefined, ( localize(6039, "Summary")))
+            $("h3.chat-debug-overview-section-label", undefined, ( localize(6271, "Summary")))
         );
         this.metricsContainer = append(metricsSection, $(".chat-debug-overview-metrics"));
         if (showShimmer) {
@@ -219,17 +225,17 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
         const actionsSection = append(this.content, $(".chat-debug-overview-section"));
         append(
             actionsSection,
-            $("h3.chat-debug-overview-section-label", undefined, ( localize(6040, "Explore Trace Data")))
+            $("h3.chat-debug-overview-section-label", undefined, ( localize(6272, "Explore Trace Data")))
         );
         const row = append(actionsSection, $(".chat-debug-overview-actions"));
         const viewLogsBtn = this.loadDisposables.add(( new Button(row, {
             ...defaultButtonStyles,
             secondary: true,
             supportIcons: true,
-            title: ( localize(6041, "View Logs"))
+            title: ( localize(6273, "View Logs"))
         })));
         viewLogsBtn.element.classList.add("chat-debug-overview-action-button");
-        viewLogsBtn.label = `$(list-flat) ${( localize(6041, "View Logs"))}`;
+        viewLogsBtn.label = `$(list-flat) ${( localize(6273, "View Logs"))}`;
         this.loadDisposables.add(viewLogsBtn.onDidClick(() => {
             this._onNavigate.fire(OverviewNavigation.Logs);
         }));
@@ -237,16 +243,27 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
             ...defaultButtonStyles,
             secondary: true,
             supportIcons: true,
-            title: ( localize(6042, "Agent Flow Chart"))
+            title: ( localize(6274, "Agent Flow Chart"))
         })));
         flowChartBtn.element.classList.add("chat-debug-overview-action-button");
-        flowChartBtn.label = `$(type-hierarchy) ${( localize(6042, "Agent Flow Chart"))}`;
+        flowChartBtn.label = `$(type-hierarchy) ${( localize(6274, "Agent Flow Chart"))}`;
         this.loadDisposables.add(flowChartBtn.onDidClick(() => {
             this._onNavigate.fire(OverviewNavigation.FlowChart);
         }));
+        const cacheBtn = this.loadDisposables.add(( new Button(row, {
+            ...defaultButtonStyles,
+            secondary: true,
+            supportIcons: true,
+            title: ( localize(6275, "Cache Explorer"))
+        })));
+        cacheBtn.element.classList.add("chat-debug-overview-action-button");
+        cacheBtn.label = `$(database) ${( localize(6275, "Cache Explorer"))}`;
+        this.loadDisposables.add(cacheBtn.onDidClick(() => {
+            this._onNavigate.fire(OverviewNavigation.CacheExplorer);
+        }));
     }
     renderMetricsShimmer(container) {
-        const placeholderLabels = [( localize(6043, "Model Turns")), ( localize(6044, "Tool Calls")), ( localize(6045, "Total Tokens")), ( localize(6046, "Errors")), ( localize(6047, "Total Events"))];
+        const placeholderLabels = [( localize(6276, "Model Turns")), ( localize(6277, "Tool Calls")), ( localize(6278, "Total Input Tokens")), ( localize(6279, "Total Output Tokens")), ( localize(6280, "Total Cached Input Tokens")), ( localize(6281, "Total Tokens")), ( localize(6282, "Errors"))];
         for (const label of placeholderLabels) {
             const card = append(container, $(".chat-debug-overview-metric-card"));
             append(card, $("div.chat-debug-overview-metric-label", undefined, label));
@@ -261,23 +278,41 @@ let ChatDebugOverviewView = class ChatDebugOverviewView extends Disposable {
         const errors = events.filter(
             e => (e.kind === "generic" && e.level === ChatDebugLogLevel.Error) || (e.kind === "toolCall" && e.result === "error")
         );
+        const fmt = numberFormatter.value;
+        const totalInputTokens = modelTurns.reduce((sum, e) => sum + (e.inputTokens ?? 0), 0);
+        const totalOutputTokens = modelTurns.reduce((sum, e) => sum + (e.outputTokens ?? 0), 0);
+        const totalCachedTokens = modelTurns.reduce((sum, e) => sum + (e.cachedTokens ?? 0), 0);
         const totalTokens = modelTurns.reduce((sum, e) => sum + (e.totalTokens ?? 0), 0);
+        const totalCopilotUsageNanoAiu = modelTurns.reduce((sum, e) => sum + (e.copilotUsageNanoAiu ?? 0), 0);
         const metrics = [{
-            label: ( localize(6043, "Model Turns")),
-            value: String(modelTurns.length)
+            label: ( localize(6276, "Model Turns")),
+            value: fmt.format(modelTurns.length)
         }, {
-            label: ( localize(6044, "Tool Calls")),
-            value: String(toolCalls.length)
+            label: ( localize(6277, "Tool Calls")),
+            value: fmt.format(toolCalls.length)
         }, {
-            label: ( localize(6045, "Total Tokens")),
-            value: numberFormatter.value.format(totalTokens)
+            label: ( localize(6278, "Total Input Tokens")),
+            value: fmt.format(totalInputTokens)
         }, {
-            label: ( localize(6046, "Errors")),
-            value: String(errors.length)
+            label: ( localize(6279, "Total Output Tokens")),
+            value: fmt.format(totalOutputTokens)
         }, {
-            label: ( localize(6047, "Total Events")),
-            value: String(events.length)
+            label: ( localize(6280, "Total Cached Input Tokens")),
+            value: fmt.format(totalCachedTokens)
+        }, {
+            label: ( localize(6281, "Total Tokens")),
+            value: fmt.format(totalTokens)
+        }, {
+            label: ( localize(6282, "Errors")),
+            value: fmt.format(errors.length)
         }];
+        if (totalCopilotUsageNanoAiu > 0) {
+            const aic = totalCopilotUsageNanoAiu / NANO_AIU_PER_AIC;
+            metrics.push({
+                label: ( localize(6283, "Copilot Usage (AIC)")),
+                value: aicFormatter.value.format(aic)
+            });
+        }
         for (const metric of metrics) {
             const card = append(container, $(".chat-debug-overview-metric-card"));
             append(card, $("div.chat-debug-overview-metric-label", undefined, metric.label));

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

@@ -53,8 +53,8 @@ function renderSection(
     append(header, $("span.chat-debug-message-section-title", undefined, label));
     if (clipboardService) {
         const copyBtn = disposables.add(( new Button(header, {
-            title: ( localize(6048, "Copy")),
-            ariaLabel: ( localize(6048, "Copy")),
+            title: ( localize(6284, "Copy")),
+            ariaLabel: ( localize(6284, "Copy")),
             hoverDelegate: getDefaultHoverDelegate("mouse")
         })));
         copyBtn.icon = Codicon.copy;
@@ -97,10 +97,10 @@ async function renderToolCallContent(content, languageService, clipboardService,
     );
     const statusParts = [];
     if (content.result) {
-        statusParts.push(content.result === "success" ? ( localize(6049, "Success")) : ( localize(6050, "Error")));
+        statusParts.push(content.result === "success" ? ( localize(6285, "Success")) : ( localize(6286, "Error")));
     }
     if (content.durationInMillis !== undefined) {
-        statusParts.push(( localize(6051, "{0}ms", content.durationInMillis)));
+        statusParts.push(( localize(6287, "{0}ms", content.durationInMillis)));
     }
     if (statusParts.length > 0) {
         append(container, $(
@@ -115,14 +115,14 @@ async function renderToolCallContent(content, languageService, clipboardService,
             plainText,
             tokenizedHtml
         } = await tokenizeContent(content.input, languageService);
-        renderSection(sectionsContainer, ( localize(6052, "Arguments")), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
+        renderSection(sectionsContainer, ( localize(6288, "Arguments")), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
     }
     if (content.output) {
         const {
             plainText,
             tokenizedHtml
         } = await tokenizeContent(content.output, languageService);
-        renderSection(sectionsContainer, ( localize(6053, "Output")), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
+        renderSection(sectionsContainer, ( localize(6289, "Output")), plainText, tokenizedHtml, disposables, false, clipboardService, scrollable);
     }
     return {
         element: container,
@@ -131,16 +131,16 @@ async function renderToolCallContent(content, languageService, clipboardService,
 }
 function toolCallContentToPlainText(content) {
     const lines = [];
-    lines.push(( localize(6054, "Tool: {0}", content.toolName)));
+    lines.push(( localize(6290, "Tool: {0}", content.toolName)));
     if (content.result) {
-        lines.push(( localize(6055, "Status: {0}", content.result)));
+        lines.push(( localize(6291, "Status: {0}", content.result)));
     }
     if (content.durationInMillis !== undefined) {
-        lines.push(( localize(6056, "Duration: {0}ms", content.durationInMillis)));
+        lines.push(( localize(6292, "Duration: {0}ms", content.durationInMillis)));
     }
     if (content.input) {
         lines.push("");
-        lines.push(`[${( localize(6052, "Arguments"))}]`);
+        lines.push(`[${( localize(6288, "Arguments"))}]`);
         try {
             const parsed = JSON.parse(content.input);
             lines.push(JSON.stringify(parsed, null, 2));
@@ -150,7 +150,7 @@ function toolCallContentToPlainText(content) {
     }
     if (content.output) {
         lines.push("");
-        lines.push(`[${( localize(6053, "Output"))}]`);
+        lines.push(`[${( localize(6289, "Output"))}]`);
         try {
             const parsed = JSON.parse(content.output);
             lines.push(JSON.stringify(parsed, null, 2));

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

@@ -9,7 +9,7 @@ import { IEditorOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/
  */
 export interface IChatDebugEditorOptions extends IEditorOptions {
     readonly sessionResource?: URI;
-    readonly viewHint?: "home" | "overview" | "logs" | "flowchart";
+    readonly viewHint?: "home" | "overview" | "logs" | "flowchart" | "cache";
     /** When set, automatically applies this text as the log filter. */
     readonly filter?: string;
 }
@@ -17,7 +17,8 @@ export declare enum ViewState {
     Home = "home",
     Overview = "overview",
     Logs = "logs",
-    FlowChart = "flowchart"
+    FlowChart = "flowchart",
+    CacheExplorer = "cache"
 }
 export declare enum LogsViewMode {
     List = "list",

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

@@ -10,6 +10,7 @@ var ViewState;
     ViewState["Overview"] = "overview";
     ViewState["Logs"] = "logs";
     ViewState["FlowChart"] = "flowchart";
+    ViewState["CacheExplorer"] = "cache";
 })(ViewState || (ViewState = {}));
 var LogsViewMode;
 (function(LogsViewMode) {