@codingame/monaco-vscode-chat-service-override 34.1.2 → 35.0.0

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

@@ -134,14 +134,14 @@ function renderCustomizationDiscoveryContent(
     const container = $("div.chat-debug-file-list");
     container.tabIndex = 0;
     const capitalizedType = content.discoveryType.charAt(0).toUpperCase() + content.discoveryType.slice(1);
-    append(container, $("div.chat-debug-file-list-title", undefined, ( localize(6124, "{0} Discovery Results", capitalizedType))));
-    append(container, $("div.chat-debug-file-list-summary", undefined, ( localize(6125, "Total files: {0}", content.files.length))));
+    append(container, $("div.chat-debug-file-list-title", undefined, ( localize(6524, "{0} Discovery Results", capitalizedType))));
+    append(container, $("div.chat-debug-file-list-summary", undefined, ( localize(6525, "Total files: {0}", content.files.length))));
     const loaded = content.files.filter(f => f.status === "loaded");
     if (loaded.length > 0) {
         const section = append(container, $("div.chat-debug-file-list-section"));
         append(
             section,
-            $("div.chat-debug-file-list-section-title", undefined, ( localize(6126, "Loaded ({0})", loaded.length)))
+            $("div.chat-debug-file-list-section-title", undefined, ( localize(6526, "Loaded ({0})", loaded.length)))
         );
         const groups = ( new Map());
         for (const file of loaded) {
@@ -155,7 +155,7 @@ function renderCustomizationDiscoveryContent(
         }
         const listEl = append(section, $("div.chat-debug-file-list-rows"));
         listEl.setAttribute("role", "list");
-        listEl.setAttribute("aria-label", ( localize(6127, "Loaded files")));
+        listEl.setAttribute("aria-label", ( localize(6527, "Loaded files")));
         const rows = [];
         for (const [locationLabel, files] of groups) {
             const groupHeader = append(listEl, $("div.chat-debug-file-list-group-header"));
@@ -168,7 +168,7 @@ function renderCustomizationDiscoveryContent(
                 link.textContent = locationLabel;
                 link.tabIndex = -1;
                 disposables.add(
-                    hoverService.setupManagedHover(getDefaultHoverDelegate("element"), link, ( localize(6128, "Open {0} in Extensions", firstFile.extensionId)))
+                    hoverService.setupManagedHover(getDefaultHoverDelegate("element"), link, ( localize(6528, "Open {0} in Extensions", firstFile.extensionId)))
                 );
                 disposables.add(addDisposableListener(link, EventType.CLICK, e => {
                     e.preventDefault();
@@ -224,11 +224,11 @@ function renderCustomizationDiscoveryContent(
         const section = append(container, $("div.chat-debug-file-list-section"));
         append(
             section,
-            $("div.chat-debug-file-list-section-title", undefined, ( localize(6129, "Skipped ({0})", skipped.length)))
+            $("div.chat-debug-file-list-section-title", undefined, ( localize(6529, "Skipped ({0})", skipped.length)))
         );
         const groups = ( new Map());
         for (const file of skipped) {
-            const key = file.skipReason ?? ( localize(6130, "unknown"));
+            const key = file.skipReason ?? ( localize(6530, "unknown"));
             let group = groups.get(key);
             if (!group) {
                 group = [];
@@ -238,7 +238,7 @@ function renderCustomizationDiscoveryContent(
         }
         const listEl = append(section, $("div.chat-debug-file-list-rows"));
         listEl.setAttribute("role", "list");
-        listEl.setAttribute("aria-label", ( localize(6131, "Skipped files")));
+        listEl.setAttribute("aria-label", ( localize(6531, "Skipped files")));
         const rows = [];
         for (const [reasonLabel, files] of groups) {
             const groupHeader = append(listEl, $("div.chat-debug-file-list-group-header"));
@@ -260,7 +260,7 @@ function renderCustomizationDiscoveryContent(
                     if (detail) {
                         detail += ", ";
                     }
-                    detail += ( localize(6132, "duplicate of {0}", file.duplicateOf.path));
+                    detail += ( localize(6532, "duplicate of {0}", file.duplicateOf.path));
                 }
                 row.appendChild(createInlineFileLink(
                     file.uri,
@@ -299,13 +299,13 @@ function renderCustomizationDiscoveryContent(
         const chevron = append(header, $("span.chat-debug-message-section-chevron"));
         append(
             header,
-            $("span.chat-debug-message-section-title", undefined, ( localize(6133, "Sources ({0})", content.sourceFolders.length)))
+            $("span.chat-debug-message-section-title", undefined, ( localize(6533, "Sources ({0})", content.sourceFolders.length)))
         );
         const settingsKey = getSettingsKeyForDiscoveryType(content.discoveryType);
         if (settingsKey) {
             const gearBtn = disposables.add(( new Button(header, {
-                title: ( localize(6134, "Configure locations")),
-                ariaLabel: ( localize(6135, "Configure locations")),
+                title: ( localize(6534, "Configure locations")),
+                ariaLabel: ( localize(6535, "Configure locations")),
                 hoverDelegate: getDefaultHoverDelegate("mouse")
             })));
             gearBtn.icon = Codicon.settingsGear;
@@ -334,13 +334,13 @@ function renderCustomizationDiscoveryContent(
         const contentEl = append(sectionEl, $("div.chat-debug-source-folder-content"));
         contentEl.tabIndex = 0;
         contentEl.setAttribute("role", "region");
-        contentEl.setAttribute("aria-label", ( localize(6136, "Source folders")));
+        contentEl.setAttribute("aria-label", ( localize(6536, "Source folders")));
         const capitalizedType = content.discoveryType.charAt(0).toUpperCase() + content.discoveryType.slice(1);
         const sourcesCaption = capitalizedType.endsWith("s") ? capitalizedType : capitalizedType + "s";
         append(
             contentEl,
             $("div.chat-debug-source-folder-note", undefined, ( localize(
-                6137,
+                6537,
                 "{0} were discovered by checking the following sources in order:",
                 sourcesCaption
             )))
@@ -368,13 +368,13 @@ function renderCustomizationDiscoveryContent(
 function fileListToPlainText(content) {
     const lines = [];
     const capitalizedType = content.discoveryType.charAt(0).toUpperCase() + content.discoveryType.slice(1);
-    lines.push(( localize(6138, "{0} Discovery Results", capitalizedType)));
-    lines.push(( localize(6139, "Total files: {0}", content.files.length)));
+    lines.push(( localize(6538, "{0} Discovery Results", capitalizedType)));
+    lines.push(( localize(6539, "Total files: {0}", content.files.length)));
     lines.push("");
     const loaded = content.files.filter(f => f.status === "loaded");
     const skipped = content.files.filter(f => f.status === "skipped");
     if (loaded.length > 0) {
-        lines.push(( localize(6140, "Loaded ({0})", loaded.length)));
+        lines.push(( localize(6540, "Loaded ({0})", loaded.length)));
         const groups = ( new Map());
         for (const f of loaded) {
             const parentDir = content.discoveryType === "skill" ? dirname(dirname(f.uri)) : dirname(f.uri);
@@ -396,10 +396,10 @@ function fileListToPlainText(content) {
         lines.push("");
     }
     if (skipped.length > 0) {
-        lines.push(( localize(6141, "Skipped ({0})", skipped.length)));
+        lines.push(( localize(6541, "Skipped ({0})", skipped.length)));
         const skippedGroups = ( new Map());
         for (const f of skipped) {
-            const key = f.skipReason ?? ( localize(6142, "unknown"));
+            const key = f.skipReason ?? ( localize(6542, "unknown"));
             let group = skippedGroups.get(key);
             if (!group) {
                 group = [];
@@ -418,7 +418,7 @@ function fileListToPlainText(content) {
                         parts.push(f.errorMessage);
                     }
                     if (f.duplicateOf) {
-                        parts.push(( localize(6143, "duplicate of {0}", f.duplicateOf.path)));
+                        parts.push(( localize(6543, "duplicate of {0}", f.duplicateOf.path)));
                     }
                     detail += ` (${parts.join(", ")})`;
                 }
@@ -428,7 +428,7 @@ function fileListToPlainText(content) {
     }
     if (content.sourceFolders && content.sourceFolders.length > 0) {
         lines.push("");
-        lines.push(( localize(6144, "Sources ({0})", content.sourceFolders.length)));
+        lines.push(( localize(6544, "Sources ({0})", content.sourceFolders.length)));
         for (const folder of content.sourceFolders) {
             lines.push(`  ${folder.uri.path}`);
         }
@@ -438,17 +438,17 @@ function fileListToPlainText(content) {
 function getCategorySectionTitle(category, count) {
     switch (category) {
     case "applying":
-        return localize(6145, "Instructions ({0})", count);
+        return localize(6545, "Instructions ({0})", count);
     case "referenced":
-        return localize(6146, "Referenced ({0})", count);
+        return localize(6546, "Referenced ({0})", count);
     case "skill":
-        return localize(6147, "Skills ({0})", count);
+        return localize(6547, "Skills ({0})", count);
     case "custom-agent":
-        return localize(6148, "Agents ({0})", count);
+        return localize(6548, "Agents ({0})", count);
     case "hook":
-        return localize(6149, "Hooks ({0})", count);
+        return localize(6549, "Hooks ({0})", count);
     case "skipped":
-        return localize(6150, "Skipped ({0})", count);
+        return localize(6550, "Skipped ({0})", count);
     }
 }
 function renderCustomizationSummaryContent(
@@ -464,11 +464,11 @@ function renderCustomizationSummaryContent(
     const container = $("div.chat-debug-customization-summary");
     container.tabIndex = 0;
     const mainSection = append(container, $("div.chat-debug-file-list"));
-    append(mainSection, $("div.chat-debug-file-list-title", undefined, ( localize(6151, "Customization Resolution Results"))));
+    append(mainSection, $("div.chat-debug-file-list-title", undefined, ( localize(6551, "Customization Resolution Results"))));
     append(
         mainSection,
         $("div.chat-debug-file-list-summary", undefined, ( localize(
-            6152,
+            6552,
             "{0} instructions, {1} skills, {2} agents, {3} hooks, {4} skipped in {5}ms",
             content.counts.instructions,
             content.counts.skills,
@@ -614,7 +614,7 @@ function renderCustomizationSummaryContent(
     if (content.resolutionLogs.length === 0) {
         append(
             mainSection,
-            $("div.chat-debug-file-list-summary", undefined, ( localize(6153, "No resolution logs")))
+            $("div.chat-debug-file-list-summary", undefined, ( localize(6553, "No resolution logs")))
         );
     }
     return {
@@ -624,9 +624,9 @@ function renderCustomizationSummaryContent(
 }
 function customizationSummaryToPlainText(content) {
     const lines = [];
-    lines.push(( localize(6154, "Customization Resolution Results")));
+    lines.push(( localize(6554, "Customization Resolution Results")));
     lines.push(( localize(
-        6155,
+        6555,
         "{0} instructions, {1} skills, {2} agents, {3} hooks, {4} skipped in {5}ms",
         content.counts.instructions,
         content.counts.skills,

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

@@ -1,7 +1,7 @@
 
 
 var CacheDiffKind;
-(function (CacheDiffKind) {
+(function(CacheDiffKind) {
     CacheDiffKind["Identical"] = "identical";
     CacheDiffKind["ContentDrift"] = "contentDrift";
     CacheDiffKind["LengthChange"] = "lengthChange";
@@ -15,96 +15,110 @@ function parseInputMessages(inputMessagesJson) {
     let raw;
     try {
         raw = JSON.parse(inputMessagesJson);
-    }
-    catch {
+    } catch {
         return [];
     }
     if (!Array.isArray(raw)) {
         return [];
     }
+    const toolNameByCallId = ( new Map());
+    for (const m of raw) {
+        if (!m || typeof m !== "object" || !Array.isArray(m.parts)) {
+            continue;
+        }
+        for (const p of m.parts) {
+            if (p && typeof p === "object" && p.type === "tool_call" && typeof p.id === "string" && typeof p.name === "string" && p.name) {
+                toolNameByCallId.set(p.id, p.name);
+            }
+        }
+    }
     const out = [];
     for (const m of raw) {
-        if (!m || typeof m !== 'object') {
+        if (!m || typeof m !== "object") {
             continue;
         }
-        let role = typeof m.role === 'string' ? m.role : 'unknown';
-        const name = typeof m.name === 'string' ? m.name : undefined;
-        let text = '';
+        let role = typeof m.role === "string" ? m.role : "unknown";
+        let name = typeof m.name === "string" && m.name ? m.name : undefined;
+        let text = "";
+        let toolResponseName;
         let hasToolResponse = false;
         let hasToolCall = false;
         let hasToolSearchOutput = false;
         let hasText = false;
         if (Array.isArray(m.parts)) {
             for (const p of m.parts) {
-                if (!p || typeof p !== 'object') {
+                if (!p || typeof p !== "object") {
                     continue;
                 }
                 switch (p.type) {
-                    case undefined:
-                    case 'text':
-                    case 'reasoning':
-                        if (typeof p.content === 'string') {
-                            text += p.content;
-                            hasText = true;
-                        }
-                        break;
-                    case 'tool_call_response':
-                    case 'tool_result':
-                        if (typeof p.response === 'string') {
-                            text += p.response;
-                        }
-                        else if (p.response !== undefined) {
-                            text += stableStringify(p.response);
-                        }
-                        else if (typeof p.content === 'string') {
-                            text += p.content;
-                        }
-                        else if (p.content !== undefined) {
-                            text += stableStringify(p.content);
-                        }
-                        hasToolResponse = true;
-                        break;
-                    case 'tool_call':
-                        if (p.name) {
-                            text += `call:${p.name}`;
-                        }
-                        if (p.arguments !== undefined) {
-                            text += stableStringify(p.arguments);
-                        }
-                        hasToolCall = true;
-                        break;
-                    case 'tool_search_output':
-                        text += stableStringify({
-                            id: p.id,
-                            status: p.status,
-                            tools: p.tools,
-                        });
-                        hasToolSearchOutput = true;
-                        break;
+                case undefined:
+                case "text":
+                case "reasoning":
+                    if (typeof p.content === "string") {
+                        text += p.content;
+                        hasText = true;
+                    }
+                    break;
+                case "tool_call_response":
+                case "tool_result":
+                    if (typeof p.response === "string") {
+                        text += p.response;
+                    } else if (p.response !== undefined) {
+                        text += stableStringify(p.response);
+                    } else if (typeof p.content === "string") {
+                        text += p.content;
+                    } else if (p.content !== undefined) {
+                        text += stableStringify(p.content);
+                    }
+                    if (toolResponseName === undefined && typeof p.id === "string") {
+                        toolResponseName = toolNameByCallId.get(p.id);
+                    }
+                    hasToolResponse = true;
+                    break;
+                case "tool_call":
+                    if (p.name) {
+                        text += `call:${p.name}`;
+                    }
+                    if (p.arguments !== undefined) {
+                        text += stableStringify(p.arguments);
+                    }
+                    hasToolCall = true;
+                    break;
+                case "tool_search_output":
+                    text += stableStringify({
+                        id: p.id,
+                        status: p.status,
+                        tools: p.tools
+                    });
+                    hasToolSearchOutput = true;
+                    break;
                 }
             }
         }
         if (hasToolSearchOutput && !hasText) {
-            role = 'tool_search';
-        }
-        else if (hasToolResponse && !hasText) {
-            role = 'tool';
+            role = "tool_search";
+        } else if (hasToolResponse && !hasText) {
+            role = "tool";
+            name = name ?? toolResponseName;
+        } else if (hasToolCall && !hasText && role === "assistant") {
+            role = "assistant";
         }
-        else if (hasToolCall && !hasText && role === 'assistant') {
-            role = 'assistant';
-        }
-        if (text.length === 0 && role === 'unknown') {
+        if (text.length === 0 && role === "unknown") {
             text = stableStringify(m);
         }
-        out.push({ role, name, text, charLength: text.length });
+        out.push({
+            role,
+            name,
+            text,
+            charLength: text.length
+        });
     }
     return out;
 }
 function stableStringify(value) {
     try {
         return JSON.stringify(value);
-    }
-    catch {
+    } catch {
         return String(value);
     }
 }
@@ -114,7 +128,13 @@ function messagesEqual(a, b) {
 function diffPromptSignature(a, b) {
     const signature = [];
     const drift = [];
-    const counts = { identical: 0, contentDrift: 0, lengthChange: 0, onlyInA: 0, onlyInB: 0 };
+    const counts = {
+        identical: 0,
+        contentDrift: 0,
+        lengthChange: 0,
+        onlyInA: 0,
+        onlyInB: 0
+    };
     let breakResult;
     let broken = false;
     const max = Math.max(a.length, b.length);
@@ -123,21 +143,51 @@ function diffPromptSignature(a, b) {
         const bi = b[i];
         if (ai && !bi) {
             counts.onlyInA++;
-            signature.push({ index: i, kind: CacheDiffKind.OnlyInA, aRole: ai.role, aName: ai.name, aCharLength: ai.charLength });
-            drift.push({ name: `messages[${i}]`, role: ai.role, status: CacheDiffKind.OnlyInA, aSize: ai.charLength, bSize: 0 });
+            signature.push({
+                index: i,
+                kind: CacheDiffKind.OnlyInA,
+                aRole: ai.role,
+                aName: ai.name,
+                aCharLength: ai.charLength
+            });
+            drift.push({
+                name: `messages[${i}]`,
+                role: ai.role,
+                status: CacheDiffKind.OnlyInA,
+                aSize: ai.charLength,
+                bSize: 0
+            });
             if (!broken) {
                 broken = true;
-                breakResult = { index: i, kind: CacheDiffKind.OnlyInA };
+                breakResult = {
+                    index: i,
+                    kind: CacheDiffKind.OnlyInA
+                };
             }
             continue;
         }
         if (bi && !ai) {
             counts.onlyInB++;
-            signature.push({ index: i, kind: CacheDiffKind.OnlyInB, bRole: bi.role, bName: bi.name, bCharLength: bi.charLength });
-            drift.push({ name: `messages[${i}]`, role: bi.role, status: CacheDiffKind.OnlyInB, aSize: 0, bSize: bi.charLength });
+            signature.push({
+                index: i,
+                kind: CacheDiffKind.OnlyInB,
+                bRole: bi.role,
+                bName: bi.name,
+                bCharLength: bi.charLength
+            });
+            drift.push({
+                name: `messages[${i}]`,
+                role: bi.role,
+                status: CacheDiffKind.OnlyInB,
+                aSize: 0,
+                bSize: bi.charLength
+            });
             if (!broken) {
                 broken = true;
-                breakResult = { index: i, kind: CacheDiffKind.OnlyInB };
+                breakResult = {
+                    index: i,
+                    kind: CacheDiffKind.OnlyInB
+                };
             }
             continue;
         }
@@ -147,33 +197,56 @@ function diffPromptSignature(a, b) {
         if (messagesEqual(ai, bi)) {
             counts.identical++;
             signature.push({
-                index: i, kind: CacheDiffKind.Identical,
-                aRole: ai.role, aName: ai.name, aCharLength: ai.charLength,
-                bRole: bi.role, bName: bi.name, bCharLength: bi.charLength,
+                index: i,
+                kind: CacheDiffKind.Identical,
+                aRole: ai.role,
+                aName: ai.name,
+                aCharLength: ai.charLength,
+                bRole: bi.role,
+                bName: bi.name,
+                bCharLength: bi.charLength
             });
             continue;
         }
         const kind = ai.charLength === bi.charLength ? CacheDiffKind.ContentDrift : CacheDiffKind.LengthChange;
         if (kind === CacheDiffKind.ContentDrift) {
             counts.contentDrift++;
-        }
-        else {
+        } else {
             counts.lengthChange++;
         }
         signature.push({
-            index: i, kind,
-            aRole: ai.role, aName: ai.name, aCharLength: ai.charLength,
-            bRole: bi.role, bName: bi.name, bCharLength: bi.charLength,
+            index: i,
+            kind,
+            aRole: ai.role,
+            aName: ai.name,
+            aCharLength: ai.charLength,
+            bRole: bi.role,
+            bName: bi.name,
+            bCharLength: bi.charLength
+        });
+        drift.push({
+            name: `messages[${i}]`,
+            role: ai.role,
+            status: kind,
+            aSize: ai.charLength,
+            bSize: bi.charLength
         });
-        drift.push({ name: `messages[${i}]`, role: ai.role, status: kind, aSize: ai.charLength, bSize: bi.charLength });
         if (!broken) {
             broken = true;
-            breakResult = { index: i, kind };
+            breakResult = {
+                index: i,
+                kind
+            };
         }
     }
-    return { signature, break: breakResult, drift, counts };
+    return {
+        signature,
+        break: breakResult,
+        drift,
+        counts
+    };
 }
-const PREFIX_COMPONENT_ORDER = ['system', 'tools'];
+const PREFIX_COMPONENT_ORDER = ["system", "tools"];
 function insertPrefixComponent(drift, entry) {
     const prefixEntries = [];
     const rest = [];
@@ -182,13 +255,14 @@ function insertPrefixComponent(drift, entry) {
             if (d.name !== entry.name) {
                 prefixEntries.push(d);
             }
-        }
-        else {
+        } else {
             rest.push(d);
         }
     }
     prefixEntries.push(entry);
-    prefixEntries.sort((a, b) => PREFIX_COMPONENT_ORDER.indexOf(a.name) - PREFIX_COMPONENT_ORDER.indexOf(b.name));
+    prefixEntries.sort(
+        (a, b) => PREFIX_COMPONENT_ORDER.indexOf(a.name) - PREFIX_COMPONENT_ORDER.indexOf(b.name)
+    );
     return [...prefixEntries, ...rest];
 }
 function classifyStringDrift(a, b) {
@@ -208,14 +282,24 @@ function appendSystemDrift(drift, aSystem, bSystem) {
     if (status === undefined) {
         return drift;
     }
-    return insertPrefixComponent(drift, { name: 'system', status, aSize: aSystem?.length ?? 0, bSize: bSystem?.length ?? 0 });
+    return insertPrefixComponent(drift, {
+        name: "system",
+        status,
+        aSize: aSystem?.length ?? 0,
+        bSize: bSystem?.length ?? 0
+    });
 }
 function appendToolsDrift(drift, aTools, bTools) {
     const status = classifyStringDrift(aTools, bTools);
     if (status === undefined) {
         return drift;
     }
-    return insertPrefixComponent(drift, { name: 'tools', status, aSize: aTools?.length ?? 0, bSize: bTools?.length ?? 0 });
+    return insertPrefixComponent(drift, {
+        name: "tools",
+        status,
+        aSize: aTools?.length ?? 0,
+        bSize: bTools?.length ?? 0
+    });
 }
 
 export { CacheDiffKind, appendSystemDrift, appendToolsDrift, diffPromptSignature, parseInputMessages };