@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

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

@@ -0,0 +1,183 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IAgentHostService } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService.service";
+import { IRemoteAgentHostService } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/remoteAgentHostService.service";
+import { type ActionEnvelope } from "../../../../../platform/agentHost/common/state/sessionActions.js";
+import { type Customization } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState";
+/**
+ * One captured Copilot `ChatUsage` action, i.e. the usage report for a single
+ * model call. Persisted as a line in the session's sidecar so per-turn/per-round
+ * token metrics survive a VS Code restart (the reduced chat state keeps only the
+ * last request's input/cache per turn, and `events.jsonl` only records
+ * `outputTokens` until `session.shutdown`).
+ */
+export interface IAgentHostUsageRecord {
+    /** Turn the model call belongs to. */
+    readonly turnId: string;
+    /** Model that served the call, if reported. */
+    readonly model?: string;
+    /** Input tokens for this single call. */
+    readonly inputTokens?: number;
+    /** Output tokens for this single call. */
+    readonly outputTokens?: number;
+    /** Cache-read tokens for this single call. */
+    readonly cacheReadTokens?: number;
+    /** Per-turn cumulative Copilot AIU (nano) at the time of this call. */
+    readonly totalNanoAiu?: number;
+    /** ISO timestamp when the client captured the action. */
+    readonly ts: string;
+}
+/** Builds the sidecar URI for a session's usage records under `baseDir`. */
+export declare function buildAgentHostUsageUri(baseDir: URI, rawSessionId: string): URI;
+/**
+ * Reads a session's usage sidecar. Returns the records in capture order,
+ * skipping blank or malformed lines. Returns an empty array when the file does
+ * not exist (e.g. a session that ran before capture shipped).
+ */
+export declare function readAgentHostUsageRecords(fileService: IFileService, uri: URI): Promise<IAgentHostUsageRecord[]>;
+/**
+ * The minimal agent-host surface the recorders observe: a stream of protocol
+ * actions plus the notifications that drive sidecar lifetime. Satisfied by
+ * {@link IAgentHostService} in production and by bare emitters in tests, so the
+ * recorders don't depend on the full service.
+ */
+type IAgentHostActionSource = Pick<IAgentHostService, "onDidAction" | "onDidNotification">;
+/**
+ * Shared client-side plumbing for recorders that observe agent-host protocol
+ * actions across the ambient (local) connection and every live remote
+ * connection, and persist derived data to a client-local sidecar. Enable
+ * gating, local/remote fan-out, and sidecar lifetime live here; subclasses
+ * implement {@link _onAction} for the action(s) they care about and
+ * {@link _sidecarUri} for the file to delete when a session goes away.
+ *
+ * Running on the client (where wire logs are captured) means every session's
+ * actions arrive through the same subscription reducers regardless of
+ * transport, so subclasses work uniformly for local and remote hosts.
+ *
+ * ## Why these sidecars are client-side
+ *
+ * The data they capture (`ChatUsage` / `SessionCustomizationsChanged`) is
+ * produced by the agent host, and the host persists its own copy of the parts
+ * it needs for correctness (see `turns.usage` in the session database, which
+ * restores the context-usage gauge and session cost). These sidecars are NOT
+ * that store and should not be confused with it — they exist because the
+ * renderer has no way to read host-side session storage: the AHP protocol is
+ * generated outside this repo, so no "read session data" RPC can be added here,
+ * and the session data directory's path is never published to clients. Until
+ * such a contract exists, a client-side capture is the only mechanism that
+ * works uniformly for local *and* remote hosts.
+ *
+ * The two stores therefore differ deliberately:
+ * - host store: per turn, always on, all providers, correctness-critical;
+ * - these sidecars: per model call, debug-gated, best-effort diagnostics.
+ *
+ * What IS unified: lifetime (both are deleted with their session — see
+ * {@link _sidecarUri}) and collection (both are included in the exported debug
+ * log bundle, so an export can explain a usage discrepancy).
+ */
+declare abstract class AgentHostActionRecorder extends Disposable {
+    protected readonly _baseDir: URI;
+    protected readonly _isEnabled: () => boolean;
+    protected readonly _fileService: IFileService;
+    protected readonly _logService: ILogService;
+    private readonly _remoteAgentHostService;
+    /** Live per-remote-connection listeners (actions + notifications), keyed by agent-host authority. */
+    private readonly _remoteListeners;
+    /**
+     * Per-session serialized file-operation queue shared by writes and cleanup,
+     * so a delete can never be overtaken by an in-flight write for the same
+     * session. Owned by the base class because deletion is driven from here.
+     */
+    private readonly _queues;
+    /**
+     * The connection object currently subscribed for each authority. Tracked so
+     * a reconnect (which replaces the connection object under the same
+     * authority) is detected and the listener re-subscribed to the live object.
+     */
+    private readonly _remoteConnections;
+    constructor(_baseDir: URI, _isEnabled: () => boolean, _fileService: IFileService, _logService: ILogService, agentHostService: IAgentHostActionSource, _remoteAgentHostService: IRemoteAgentHostService);
+    /** Gate on the enable predicate before handing the action to the subclass. */
+    private _dispatch;
+    /**
+     * Deletes a session's sidecar when the host reports the session removed, so
+     * these files don't accumulate indefinitely for sessions the user deleted
+     * (the host's own per-session storage cascades away with the session
+     * directory; without this the client-side copies would outlive it).
+     *
+     * Deliberately NOT gated on {@link _isEnabled}: toggling debug logging off
+     * must not strand the files already written while it was on.
+     */
+    private _onNotification;
+    /**
+     * Runs `operation` after any previously queued work for `rawSessionId`,
+     * keeping per-session file operations in submission order. Failures are
+     * swallowed (and traced) so one failed operation cannot break the chain.
+     */
+    protected queued(rawSessionId: string, operation: () => Promise<unknown>): Promise<void>;
+    /** Handle a single action from any (local or remote) connection. */
+    protected abstract _onAction(envelope: ActionEnvelope): void;
+    /** The sidecar file owned by this recorder for the given raw session id. */
+    protected abstract _sidecarUri(rawSessionId: string): URI;
+    /** Subscribes to each current remote connection's streams; drops stale ones. */
+    private _syncRemoteListeners;
+}
+/**
+ * Captures Copilot `ChatUsage` actions on the client and appends them to a
+ * stable, client-local per-session sidecar so token metrics survive a VS Code
+ * restart and feed accurate per-round Cache Explorer numbers.
+ *
+ * Dedup: a single model call can surface multiple `ChatUsage` actions —
+ *   1. a parent-scope emit on the session's DEFAULT chat channel, and
+ *   2. for sub-agent calls, a sub-agent-scope emit on a sub-agent chat channel
+ *      (`parseChatUri` maps both to the same session), and
+ *   3. an async re-emit carrying the same tokens plus `_meta.contextAttribution`.
+ * Capturing only actions on the default chat channel (1) that lack
+ * `contextAttribution` yields exactly one record per model call — and the
+ * parent aggregate already includes sub-agent token usage.
+ */
+export declare class AgentHostUsageRecorder extends AgentHostActionRecorder {
+    protected _sidecarUri(rawSessionId: string): URI;
+    protected _onAction(envelope: ActionEnvelope): void;
+    /**
+     * Appends a record to the session's sidecar. Uses the file system's append
+     * capability so each record is a single small write (no read-modify-write of
+     * the whole file, and no in-memory copy of the growing file) — writes are
+     * still serialized per session to keep records ordered. Records written
+     * before a restart are preserved because we append to the existing file.
+     */
+    private _append;
+}
+/** Builds the sidecar URI for a session's customization snapshot under `baseDir`. */
+export declare function buildAgentHostCustomizationsUri(baseDir: URI, rawSessionId: string): URI;
+/**
+ * Reads a session's persisted customization snapshot — the last
+ * full-replacement `SessionCustomizationsChanged` payload captured live.
+ * Returns `undefined` when the file is absent (e.g. a session that ran before
+ * capture shipped) or malformed, so callers fall back to the live session
+ * state rather than showing nothing.
+ */
+export declare function readAgentHostCustomizationsSnapshot(fileService: IFileService, uri: URI): Promise<Customization[] | undefined>;
+/**
+ * Captures each session's loaded customizations (skills/hooks/agents/MCP) to a
+ * stable client-local snapshot so the debug view can surface them even for
+ * historical/closed sessions. This is necessary because the live
+ * {@link IAgentHostCustomizationService} only knows the customizations of
+ * sessions with an active state subscription, and the SDK's `session.*_loaded`
+ * events are ephemeral (never written to `events.jsonl`).
+ *
+ * Listens for the full-replacement `SessionCustomizationsChanged` action — the
+ * canonical way a host publishes its effective customization set — on the
+ * `<provider>:/<rawId>` session channel, and overwrites the session's snapshot.
+ * The raw id derived from the channel matches the one the reader derives from
+ * the client session resource (both are the URI path), so the snapshot lines up
+ * with the session it belongs to.
+ */
+export declare class AgentHostCustomizationRecorder extends AgentHostActionRecorder {
+    protected _sidecarUri(rawSessionId: string): URI;
+    protected _onAction(envelope: ActionEnvelope): void;
+    /** Overwrites the session's snapshot, serializing writes per session. */
+    private _write;
+}
+export {};

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

@@ -0,0 +1,218 @@
+
+import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
+import { Disposable, DisposableMap, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
+import { agentHostAuthority } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostUri';
+import { NotificationType } from '../../../../../platform/agentHost/common/state/sessionActions.js';
+import { isDefaultChatUri, readUsageInfoMeta, parseChatUri } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState';
+import { getCopilotCliSessionRawId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/copilotCliEventsUri';
+import { ActionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/common/actions';
+
+const USAGE_DIR = "agentHostUsage";
+function buildAgentHostUsageUri(baseDir, rawSessionId) {
+    return joinPath(baseDir, USAGE_DIR, `${sanitizeSessionId(rawSessionId)}.jsonl`);
+}
+function sanitizeSessionId(rawSessionId) {
+    return rawSessionId.replace(/[^\w.-]/g, "_");
+}
+async function readAgentHostUsageRecords(fileService, uri) {
+    let text;
+    try {
+        const content = await fileService.readFile(uri);
+        text = ( content.value.toString());
+    } catch {
+        return [];
+    }
+    const records = [];
+    for (const line of text.split("\n")) {
+        const trimmed = line.trim();
+        if (!trimmed) {
+            continue;
+        }
+        try {
+            const parsed = JSON.parse(trimmed);
+            if (parsed && typeof parsed.turnId === "string" && typeof parsed.ts === "string") {
+                records.push(parsed);
+            }
+        } catch {}
+    }
+    return records;
+}
+class AgentHostActionRecorder extends Disposable {
+    constructor(
+        _baseDir,
+        _isEnabled,
+        _fileService,
+        _logService,
+        agentHostService,
+        _remoteAgentHostService
+    ) {
+        super();
+        this._baseDir = _baseDir;
+        this._isEnabled = _isEnabled;
+        this._fileService = _fileService;
+        this._logService = _logService;
+        this._remoteAgentHostService = _remoteAgentHostService;
+        this._remoteListeners = this._register(( new DisposableMap()));
+        this._queues = ( new Map());
+        this._remoteConnections = ( new Map());
+        this._register(agentHostService.onDidAction(envelope => this._dispatch(envelope)));
+        this._register(
+            agentHostService.onDidNotification(notification => this._onNotification(notification))
+        );
+        this._register(
+            this._remoteAgentHostService.onDidChangeConnections(() => this._syncRemoteListeners())
+        );
+        this._syncRemoteListeners();
+    }
+    _dispatch(envelope) {
+        if (!this._isEnabled()) {
+            return;
+        }
+        this._onAction(envelope);
+    }
+    _onNotification(notification) {
+        if (notification.type !== NotificationType.SessionRemoved) {
+            return;
+        }
+        const rawId = getCopilotCliSessionRawId(( URI.parse(notification.session)));
+        if (!rawId) {
+            return;
+        }
+        const uri = this._sidecarUri(rawId);
+        const pending = this.queued(rawId, () => this._fileService.del(uri));
+        void pending.finally(() => {
+            if (this._queues.get(rawId) === pending) {
+                this._queues.delete(rawId);
+            }
+        });
+    }
+    queued(rawSessionId, operation) {
+        const previous = this._queues.get(rawSessionId) ?? Promise.resolve();
+        const next = previous.then(operation).then(() => undefined).catch(err => {
+            this._logService.trace(
+                `[${this.constructor.name}] sidecar operation failed for ${rawSessionId}: ${toErrorMessage(err)}`
+            );
+        });
+        this._queues.set(rawSessionId, next);
+        return next;
+    }
+    _syncRemoteListeners() {
+        const seen = ( new Set());
+        for (const info of this._remoteAgentHostService.connections) {
+            const authority = agentHostAuthority(info.address);
+            seen.add(authority);
+            const connection = this._remoteAgentHostService.getConnectionByAuthority(authority);
+            if (!connection) {
+                continue;
+            }
+            if (this._remoteConnections.get(authority) === connection) {
+                continue;
+            }
+            this._remoteConnections.set(authority, connection);
+            const store = ( new DisposableStore());
+            store.add(connection.onDidAction(envelope => this._dispatch(envelope)));
+            store.add(
+                connection.onDidNotification(notification => this._onNotification(notification))
+            );
+            this._remoteListeners.set(authority, store);
+        }
+        for (const authority of [...( this._remoteListeners.keys())]) {
+            if (!( seen.has(authority))) {
+                this._remoteListeners.deleteAndDispose(authority);
+                this._remoteConnections.delete(authority);
+            }
+        }
+    }
+}
+class AgentHostUsageRecorder extends AgentHostActionRecorder {
+    _sidecarUri(rawSessionId) {
+        return buildAgentHostUsageUri(this._baseDir, rawSessionId);
+    }
+    _onAction(envelope) {
+        const action = envelope.action;
+        if (action.type !== ActionType.ChatUsage) {
+            return;
+        }
+        if (!isDefaultChatUri(envelope.channel)) {
+            return;
+        }
+        const usage = action.usage;
+        const meta = readUsageInfoMeta(usage);
+        if (meta.contextAttribution) {
+            return;
+        }
+        const session = parseChatUri(envelope.channel)?.session;
+        if (!session) {
+            return;
+        }
+        const rawId = getCopilotCliSessionRawId(( URI.parse(session)));
+        if (!rawId) {
+            return;
+        }
+        const record = {
+            turnId: action.turnId,
+            model: usage.model,
+            inputTokens: usage.inputTokens,
+            outputTokens: usage.outputTokens,
+            cacheReadTokens: usage.cacheReadTokens,
+            totalNanoAiu: meta.copilotUsage?.totalNanoAiu,
+            ts: ( new Date()).toISOString()
+        };
+        this._append(rawId, record);
+    }
+    _append(rawId, record) {
+        const uri = this._sidecarUri(rawId);
+        const line = JSON.stringify(record) + "\n";
+        void this.queued(rawId, () => this._fileService.writeFile(uri, VSBuffer.fromString(line), {
+            append: true
+        }));
+    }
+}
+const CUSTOMIZATIONS_DIR = "agentHostCustomizations";
+function buildAgentHostCustomizationsUri(baseDir, rawSessionId) {
+    return joinPath(baseDir, CUSTOMIZATIONS_DIR, `${sanitizeSessionId(rawSessionId)}.json`);
+}
+async function readAgentHostCustomizationsSnapshot(fileService, uri) {
+    let text;
+    try {
+        const content = await fileService.readFile(uri);
+        text = ( content.value.toString());
+    } catch {
+        return undefined;
+    }
+    try {
+        const parsed = JSON.parse(text);
+        if (Array.isArray(parsed)) {
+            return parsed;
+        }
+    } catch {}
+    return undefined;
+}
+class AgentHostCustomizationRecorder extends AgentHostActionRecorder {
+    _sidecarUri(rawSessionId) {
+        return buildAgentHostCustomizationsUri(this._baseDir, rawSessionId);
+    }
+    _onAction(envelope) {
+        if (envelope.action.type !== ActionType.SessionCustomizationsChanged) {
+            return;
+        }
+        const rawId = getCopilotCliSessionRawId(( URI.parse(envelope.channel)));
+        if (!rawId) {
+            return;
+        }
+        this._write(rawId, envelope.action.customizations);
+    }
+    _write(rawId, customizations) {
+        const uri = this._sidecarUri(rawId);
+        const content = JSON.stringify(customizations);
+        void this.queued(
+            rawId,
+            () => this._fileService.writeFile(uri, VSBuffer.fromString(content))
+        );
+    }
+}
+
+export { AgentHostCustomizationRecorder, AgentHostUsageRecorder, buildAgentHostCustomizationsUri, buildAgentHostUsageUri, readAgentHostCustomizationsSnapshot, readAgentHostUsageRecords };

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

@@ -12,6 +12,7 @@ import { dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/reso
 import { getIconClasses } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/getIconClasses';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { FileKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
+import { getCompactCodicon } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatIcons';
 import { InlineAnchorWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatInlineAnchorWidget';
 import { setupCollapsibleToggle } from './chatDebugCollapsible.js';
 
@@ -134,14 +135,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(6524, "{0} Discovery Results", capitalizedType))));
-    append(container, $("div.chat-debug-file-list-summary", undefined, ( localize(6525, "Total files: {0}", content.files.length))));
+    append(container, $("div.chat-debug-file-list-title", undefined, ( localize(7583, "{0} Discovery Results", capitalizedType))));
+    append(container, $("div.chat-debug-file-list-summary", undefined, ( localize(7584, "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(6526, "Loaded ({0})", loaded.length)))
+            $("div.chat-debug-file-list-section-title", undefined, ( localize(7585, "Loaded ({0})", loaded.length)))
         );
         const groups = ( new Map());
         for (const file of loaded) {
@@ -155,7 +156,7 @@ function renderCustomizationDiscoveryContent(
         }
         const listEl = append(section, $("div.chat-debug-file-list-rows"));
         listEl.setAttribute("role", "list");
-        listEl.setAttribute("aria-label", ( localize(6527, "Loaded files")));
+        listEl.setAttribute("aria-label", ( localize(7586, "Loaded files")));
         const rows = [];
         for (const [locationLabel, files] of groups) {
             const groupHeader = append(listEl, $("div.chat-debug-file-list-group-header"));
@@ -168,7 +169,7 @@ function renderCustomizationDiscoveryContent(
                 link.textContent = locationLabel;
                 link.tabIndex = -1;
                 disposables.add(
-                    hoverService.setupManagedHover(getDefaultHoverDelegate("element"), link, ( localize(6528, "Open {0} in Extensions", firstFile.extensionId)))
+                    hoverService.setupManagedHover(getDefaultHoverDelegate("element"), link, ( localize(7587, "Open {0} in Extensions", firstFile.extensionId)))
                 );
                 disposables.add(addDisposableListener(link, EventType.CLICK, e => {
                     e.preventDefault();
@@ -187,10 +188,9 @@ function renderCustomizationDiscoveryContent(
             }
             for (const file of files) {
                 const row = append(listEl, $("div.chat-debug-file-list-row"));
-                append(
-                    row,
-                    $(`span.chat-debug-file-list-icon${ThemeIcon.asCSSSelector(Codicon.check)}`)
-                );
+                append(row, $(
+                    `span.chat-debug-file-list-icon${ThemeIcon.asCSSSelector(Codicon.checkCompact)}`
+                ));
                 row.appendChild(createInlineFileLink(
                     file.uri,
                     file.name ?? file.uri.path,
@@ -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(6529, "Skipped ({0})", skipped.length)))
+            $("div.chat-debug-file-list-section-title", undefined, ( localize(7588, "Skipped ({0})", skipped.length)))
         );
         const groups = ( new Map());
         for (const file of skipped) {
-            const key = file.skipReason ?? ( localize(6530, "unknown"));
+            const key = file.skipReason ?? ( localize(7589, "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(6531, "Skipped files")));
+        listEl.setAttribute("aria-label", ( localize(7590, "Skipped files")));
         const rows = [];
         for (const [reasonLabel, files] of groups) {
             const groupHeader = append(listEl, $("div.chat-debug-file-list-group-header"));
@@ -248,10 +248,9 @@ function renderCustomizationDiscoveryContent(
             );
             for (const file of files) {
                 const row = append(listEl, $("div.chat-debug-file-list-row"));
-                append(
-                    row,
-                    $(`span.chat-debug-file-list-icon${ThemeIcon.asCSSSelector(Codicon.close)}`)
-                );
+                append(row, $(
+                    `span.chat-debug-file-list-icon${ThemeIcon.asCSSSelector(Codicon.closeCompact)}`
+                ));
                 let detail = "";
                 if (file.errorMessage) {
                     detail += file.errorMessage;
@@ -260,7 +259,7 @@ function renderCustomizationDiscoveryContent(
                     if (detail) {
                         detail += ", ";
                     }
-                    detail += ( localize(6532, "duplicate of {0}", file.duplicateOf.path));
+                    detail += ( localize(7591, "duplicate of {0}", file.duplicateOf.path));
                 }
                 row.appendChild(createInlineFileLink(
                     file.uri,
@@ -299,13 +298,13 @@ function renderCustomizationDiscoveryContent(
         const chevron = append(header, $("span.chat-debug-message-section-chevron"));
         append(
             header,
-            $("span.chat-debug-message-section-title", undefined, ( localize(6533, "Sources ({0})", content.sourceFolders.length)))
+            $("span.chat-debug-message-section-title", undefined, ( localize(7592, "Sources ({0})", content.sourceFolders.length)))
         );
         const settingsKey = getSettingsKeyForDiscoveryType(content.discoveryType);
         if (settingsKey) {
             const gearBtn = disposables.add(( new Button(header, {
-                title: ( localize(6534, "Configure locations")),
-                ariaLabel: ( localize(6535, "Configure locations")),
+                title: ( localize(7593, "Configure locations")),
+                ariaLabel: ( localize(7594, "Configure locations")),
                 hoverDelegate: getDefaultHoverDelegate("mouse")
             })));
             gearBtn.icon = Codicon.settingsGear;
@@ -334,13 +333,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(6536, "Source folders")));
+        contentEl.setAttribute("aria-label", ( localize(7595, "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(
-                6537,
+                7596,
                 "{0} were discovered by checking the following sources in order:",
                 sourcesCaption
             )))
@@ -368,13 +367,13 @@ function renderCustomizationDiscoveryContent(
 function fileListToPlainText(content) {
     const lines = [];
     const capitalizedType = content.discoveryType.charAt(0).toUpperCase() + content.discoveryType.slice(1);
-    lines.push(( localize(6538, "{0} Discovery Results", capitalizedType)));
-    lines.push(( localize(6539, "Total files: {0}", content.files.length)));
+    lines.push(( localize(7597, "{0} Discovery Results", capitalizedType)));
+    lines.push(( localize(7598, "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(6540, "Loaded ({0})", loaded.length)));
+        lines.push(( localize(7599, "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 +395,10 @@ function fileListToPlainText(content) {
         lines.push("");
     }
     if (skipped.length > 0) {
-        lines.push(( localize(6541, "Skipped ({0})", skipped.length)));
+        lines.push(( localize(7600, "Skipped ({0})", skipped.length)));
         const skippedGroups = ( new Map());
         for (const f of skipped) {
-            const key = f.skipReason ?? ( localize(6542, "unknown"));
+            const key = f.skipReason ?? ( localize(7601, "unknown"));
             let group = skippedGroups.get(key);
             if (!group) {
                 group = [];
@@ -418,7 +417,7 @@ function fileListToPlainText(content) {
                         parts.push(f.errorMessage);
                     }
                     if (f.duplicateOf) {
-                        parts.push(( localize(6543, "duplicate of {0}", f.duplicateOf.path)));
+                        parts.push(( localize(7602, "duplicate of {0}", f.duplicateOf.path)));
                     }
                     detail += ` (${parts.join(", ")})`;
                 }
@@ -428,7 +427,7 @@ function fileListToPlainText(content) {
     }
     if (content.sourceFolders && content.sourceFolders.length > 0) {
         lines.push("");
-        lines.push(( localize(6544, "Sources ({0})", content.sourceFolders.length)));
+        lines.push(( localize(7603, "Sources ({0})", content.sourceFolders.length)));
         for (const folder of content.sourceFolders) {
             lines.push(`  ${folder.uri.path}`);
         }
@@ -438,17 +437,17 @@ function fileListToPlainText(content) {
 function getCategorySectionTitle(category, count) {
     switch (category) {
     case "applying":
-        return localize(6545, "Instructions ({0})", count);
+        return localize(7604, "Instructions ({0})", count);
     case "referenced":
-        return localize(6546, "Referenced ({0})", count);
+        return localize(7605, "Referenced ({0})", count);
     case "skill":
-        return localize(6547, "Skills ({0})", count);
+        return localize(7606, "Skills ({0})", count);
     case "custom-agent":
-        return localize(6548, "Agents ({0})", count);
+        return localize(7607, "Agents ({0})", count);
     case "hook":
-        return localize(6549, "Hooks ({0})", count);
+        return localize(7608, "Hooks ({0})", count);
     case "skipped":
-        return localize(6550, "Skipped ({0})", count);
+        return localize(7609, "Skipped ({0})", count);
     }
 }
 function renderCustomizationSummaryContent(
@@ -464,11 +463,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(6551, "Customization Resolution Results"))));
+    append(mainSection, $("div.chat-debug-file-list-title", undefined, ( localize(7610, "Customization Resolution Results"))));
     append(
         mainSection,
         $("div.chat-debug-file-list-summary", undefined, ( localize(
-            6552,
+            7611,
             "{0} instructions, {1} skills, {2} agents, {3} hooks, {4} skipped in {5}ms",
             content.counts.instructions,
             content.counts.skills,
@@ -536,7 +535,9 @@ function renderCustomizationSummaryContent(
                 }
                 for (const entry of groupEntries) {
                     const row = append(listEl, $("div.chat-debug-file-list-row"));
-                    append(row, $(`span.chat-debug-file-list-icon${ThemeIcon.asCSSSelector(icon)}`));
+                    append(row, $(
+                        `span.chat-debug-file-list-icon${ThemeIcon.asCSSSelector(getCompactCodicon(icon))}`
+                    ));
                     if (entry.uri) {
                         row.appendChild(createInlineFileLink(
                             entry.uri,
@@ -570,7 +571,9 @@ function renderCustomizationSummaryContent(
         } else {
             for (const entry of entries) {
                 const row = append(listEl, $("div.chat-debug-file-list-row"));
-                append(row, $(`span.chat-debug-file-list-icon${ThemeIcon.asCSSSelector(icon)}`));
+                append(row, $(
+                    `span.chat-debug-file-list-icon${ThemeIcon.asCSSSelector(getCompactCodicon(icon))}`
+                ));
                 const showReason = entry.category !== "skill" && entry.category !== "custom-agent";
                 if (entry.uri) {
                     row.appendChild(createInlineFileLink(
@@ -614,7 +617,7 @@ function renderCustomizationSummaryContent(
     if (content.resolutionLogs.length === 0) {
         append(
             mainSection,
-            $("div.chat-debug-file-list-summary", undefined, ( localize(6553, "No resolution logs")))
+            $("div.chat-debug-file-list-summary", undefined, ( localize(7612, "No resolution logs")))
         );
     }
     return {
@@ -624,9 +627,9 @@ function renderCustomizationSummaryContent(
 }
 function customizationSummaryToPlainText(content) {
     const lines = [];
-    lines.push(( localize(6554, "Customization Resolution Results")));
+    lines.push(( localize(7613, "Customization Resolution Results")));
     lines.push(( localize(
-        6555,
+        7614,
         "{0} instructions, {1} skills, {2} agents, {3} hooks, {4} skipped in {5}ms",
         content.counts.instructions,
         content.counts.skills,