@codingame/monaco-vscode-chat-service-override 37.1.0 → 37.2.0

package/vscode/src/vs/workbench/contrib/chat/browser/pluginInstallService.js

@@ -20,9 +20,9 @@ import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 import { IAgentPluginRepositoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { PluginSourceKind, MarketplaceType, hasSourceChanged } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService';
+import { PluginSourceKind, MarketplaceType, hasSourceChanged } from '../common/plugins/pluginMarketplaceService.js';
 import { IPluginMarketplaceService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service';
-import { parseMarketplaceReference, MarketplaceReferenceKind, readConfiguredMarketplaces, parseMarketplaceReferences } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/marketplaceReference';
+import { parseMarketplaceReference, MarketplaceReferenceKind, readConfiguredMarketplaces, parseMarketplaceReferences } from '../common/plugins/marketplaceReference.js';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 let PluginInstallService = class PluginInstallService {

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

@@ -7,7 +7,7 @@ import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/pla
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { IEnsureRepositoryOptions, IPullRepositoryOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService";
-import { IMarketplacePlugin, IPluginSourceDescriptor, PluginSourceKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService";
+import { IMarketplacePlugin, IPluginSourceDescriptor, PluginSourceKind } from "../common/plugins/pluginMarketplaceService.js";
 import { IPluginSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginSource";
 import { IPluginGitService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginGitService.service";
 declare abstract class AbstractGitPluginSource implements IPluginSource {

package/vscode/src/vs/workbench/contrib/chat/browser/pluginSources.js

@@ -19,7 +19,7 @@ import { ProgressLocation } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { PluginSourceKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService';
+import { PluginSourceKind } from '../common/plugins/pluginMarketplaceService.js';
 import { IPluginGitService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginGitService.service';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 

package/vscode/src/vs/workbench/contrib/chat/browser/pluginUrlHandler.js

@@ -19,7 +19,7 @@ import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode
 import { AgentPluginEditorInput } from './agentPluginEditor/agentPluginEditorInput.js';
 import { AgentPluginItemKind } from './agentPluginEditor/agentPluginItems.js';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { parseMarketplaceReference, MarketplaceReferenceKind, readConfiguredMarketplaces, parseMarketplaceReferences } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/marketplaceReference';
+import { parseMarketplaceReference, MarketplaceReferenceKind, readConfiguredMarketplaces, parseMarketplaceReferences } from '../common/plugins/marketplaceReference.js';
 import { IPluginInstallService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/hookActions.js

@@ -18,9 +18,9 @@ import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { HOOKS_BY_TARGET, HOOK_METADATA } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
 import { formatHookCommandLabel, getEffectiveCommandFieldKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
-import { resolveCopilotCliHookType, getCopilotCliHookTypeName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookCopilotCliCompat';
-import { getHookSourceFormat, HookSourceFormat, buildNewHookEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookCompatibility';
-import { getClaudeHookTypeName, resolveClaudeHookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookClaudeCompat';
+import { resolveCopilotCliHookType, getCopilotCliHookTypeName } from '../../common/promptSyntax/hookCopilotCliCompat.js';
+import { getHookSourceFormat, HookSourceFormat, buildNewHookEntry } from '../../common/promptSyntax/hookCompatibility.js';
+import { getClaudeHookTypeName, resolveClaudeHookType } from '../../common/promptSyntax/hookClaudeCompat.js';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { findHookCommandSelection, parseAllHookFiles, findHookCommandInYaml } from './hookUtils.js';

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/hookUtils.js

@@ -3,7 +3,7 @@ import { findNodeAtLocation, parseTree, parse } from '@codingame/monaco-vscode-a
 import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { formatHookCommandLabel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
 import { HOOK_METADATA, HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
-import { parseHooksFromFile, parseHooksIgnoringDisableAll } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookCompatibility';
+import { parseHooksFromFile, parseHooksIgnoringDisableAll } from '../../common/promptSyntax/hookCompatibility.js';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
 function offsetToPosition(content, offset) {

package/vscode/src/vs/workbench/contrib/chat/browser/promptsDebugContribution.js

@@ -15,7 +15,7 @@ import { formatHookCommandLabel } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
 import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
-import { lastInstructionsCollectionResult } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions';
+import { lastInstructionsCollectionResult } from '../common/promptSyntax/computeAutomaticInstructions.js';
 
 var PromptsDebugContribution_1;
 let PromptsDebugContribution = class PromptsDebugContribution extends Disposable {

package/vscode/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsService.js

@@ -47,7 +47,7 @@ import { chatSessionResourceToId, getChatSessionType } from '@codingame/monaco-v
 import { HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
 import { CopilotChatSettingId, CopilotToolId } from '../../common/tools/copilotToolIds.js';
 import { ILanguageModelToolsConfirmationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service';
-import { TerminalToolId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/terminalToolIds';
+import { TerminalToolId } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/tools/terminalToolIds';
 import { ToolDataSource, VSCodeToolReference, SpecedToolAliases, toolMatchesModel, isToolSet, createToolSchemaUri, ToolInvocationPresentation, stringifyPromptTsxPart, ToolSetForModel, ToolAndToolSetEnablementMap, ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { IToolResultCompressor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/toolResultCompressor.service';
 import { getToolConfirmationAlert } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/accessibility/chatAccessibilityProvider';

package/vscode/src/vs/workbench/contrib/chat/browser/tools/renameTool.js

@@ -18,7 +18,7 @@ import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
-import { createToolSimpleTextResult } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/builtinTools/toolHelpers';
+import { createToolSimpleTextResult } from '../../common/tools/builtinTools/toolHelpers.js';
 import { resolveSymbolToolFileUri, errorResult, findLineNumber, findSymbolColumn, isSymbolToolResourceInScope } from './toolHelpers.js';
 
 const RenameToolId = "vscode_renameSymbol";

package/vscode/src/vs/workbench/contrib/chat/browser/tools/toolHelpers.js

@@ -3,7 +3,7 @@ import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/comm
 import { escapeRegExpCharacters } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { ChatPermissionLevel, isAutoApproveLevel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { createToolSimpleTextResult } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/builtinTools/toolHelpers';
+import { createToolSimpleTextResult } from '../../common/tools/builtinTools/toolHelpers.js';
 import { WorkingDirectory } from '../../common/workingDirectory.js';
 
 function isSymbolToolResourceInScope(resource, workspaceContextService, uriIdentityService, workingDirectory) {

package/vscode/src/vs/workbench/contrib/chat/browser/tools/usagesTool.js

@@ -21,7 +21,7 @@ import { QueryType, resultIsMatch } from '@codingame/monaco-vscode-api/vscode/vs
 import { ISearchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search.service';
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
-import { createToolSimpleTextResult } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/builtinTools/toolHelpers';
+import { createToolSimpleTextResult } from '../../common/tools/builtinTools/toolHelpers.js';
 import { resolveSymbolToolFileUri, errorResult, findLineNumber, findSymbolColumn, isSymbolToolResourceInScope } from './toolHelpers.js';
 
 const UsagesToolId = "vscode_listCodeUsages";

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/agentHostInputCompletions.js

@@ -17,7 +17,7 @@ import { getCompletionAction } from '../../../../../../../platform/agentHost/com
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
 import { isAgentHostTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCommandArgumentHint.js

@@ -6,7 +6,7 @@ import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { getCommandArgumentHint } from '../../../../../../../platform/agentHost/common/meta/agentCompletionAttachmentMeta.js';
 import { getAgentHostCompletionReferenceKindFromValue, AgentHostCompletionReferenceKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
 import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
 import { getInputPlaceholderColor, getRangeForPlaceholder } from './chatInputPlaceholderDecoration.js';
 

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputCompletions.js

@@ -46,7 +46,7 @@ import { IChatAgentService, IChatAgentNameService } from '@codingame/monaco-vsco
 import { getAttachableImageExtension } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { ChatRequestAgentPart, chatSubcommandLeader, chatAgentLeader, ChatRequestAgentSubcommandPart, ChatRequestSlashPromptPart, ChatRequestTextPart, chatVariableLeader, ChatRequestToolPart, ChatRequestToolSetPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { IChatSlashCommandService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service';
-import { toAttachedContextDynamicVariable } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariables';
+import { toAttachedContextDynamicVariable } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/attachments/chatVariables';
 import { ChatModeKind, ChatAgentLocation, isSupportedChatFileScheme } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { isAgentHostTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
@@ -56,7 +56,7 @@ import { matchesSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { ChatSubmitAction } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageUtils';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { computeCompletionRanges, isEmptyUpToCompletionWord, escapeForCharClass, getCompletionRangeWord, getAttachedContextCompletionMatch, getAttachedContextCompletionSortText, attachedContextCompletionAdditionalTriggerCharacters } from './chatInputCompletionUtils.js';

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorContrib.js

@@ -17,7 +17,7 @@ import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { chatSlashCommandBackground, chatSlashCommandForeground } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/chatColors';
 import { ChatRequestTextPart, ChatRequestSlashPromptPart, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestToolPart, ChatRequestToolSetPart, ChatRequestDynamicVariablePart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
-import { slashReg, agentReg, variableReg } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
+import { slashReg, agentReg, variableReg } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
 import { ChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget';
 import { registerChatInputReferenceDecorationType } from './chatInputReferenceDecorations.js';
 import { NativeEditContextRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/controller/editContext/native/nativeEditContextRegistry';

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputEditorHover.js

@@ -11,9 +11,17 @@ import { ChatEditorHoverWrapper } from './editorHoverWrapper.js';
 import { extractAgentAndCommand, ChatRequestDynamicVariablePart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { isImageVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
-import { coerceImageBuffer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatImageExtraction';
-import { createImageHoverContent } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgets';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { coerceImageBuffer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatImageBuffer';
+import { createImageHoverContent } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentWidgets';
 
 let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
     constructor(editor, instantiationService, chatWidgetService, commandService) {

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatInputReferenceDecorations.js

@@ -1,7 +1,7 @@
 
 import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { TrackedRangeStickiness } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
-import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
+import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
 import { chatSlashCommandBackground, chatSlashCommandForeground } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/widget/chatColors';
 
 function registerChatInputReferenceDecorationType(codeEditorService, decorationType = dynamicVariableDecorationType) {

package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/viewPane/chatViewPane.d.ts

@@ -35,7 +35,7 @@ import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workb
 import { IActivityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service";
 import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
 import { IAgentHostEnablementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostEnablementService.service";
-import { IAgentSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel";
+import { IAgentSession } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
 import { IMicCaptureService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/voiceClient/micCaptureService.service";

package/vscode/src/vs/workbench/contrib/chat/common/chatDebugEvents.d.ts

@@ -1,4 +1,4 @@
-import { IChatDebugEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatDebugService";
+import { IChatDebugEvent } from "./chatDebugService.js";
 /**
  * Checks whether a debug event matches a single text search term.
  * Used by both the debug panel filter and the listDebugEvents tool.

package/vscode/src/vs/workbench/contrib/chat/common/chatDebugService.d.ts

@@ -0,0 +1,253 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
+import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+export declare const CHAT_DEBUG_HAS_ACTIVE_SESSION: RawContextKey<boolean>;
+export declare const CHAT_DEBUG_ACTIVE_SESSION_IS_AGENT_HOST: RawContextKey<boolean>;
+/**
+ * The severity level of a chat debug log event.
+ */
+export declare enum ChatDebugLogLevel {
+    Trace = 0,
+    Info = 1,
+    Warning = 2,
+    Error = 3
+}
+/**
+ * The result of a hook execution.
+ */
+export declare enum ChatDebugHookResult {
+    /** The hook executed successfully (exit code 0). */
+    Success = 0,
+    /** The hook returned a blocking error (exit code 2). */
+    Error = 1,
+    /** The hook returned a non-blocking warning (other non-zero exit codes). */
+    NonBlockingError = 2
+}
+/**
+ * Common properties shared by all chat debug event types.
+ */
+export interface IChatDebugEventCommon {
+    readonly id?: string;
+    readonly sessionResource: URI;
+    readonly created: Date;
+    readonly parentEventId?: string;
+}
+/**
+ * A tool call event in the chat debug log.
+ */
+export interface IChatDebugToolCallEvent extends IChatDebugEventCommon {
+    readonly kind: "toolCall";
+    readonly toolName: string;
+    readonly toolCallId?: string;
+    readonly input?: string;
+    readonly output?: string;
+    readonly result?: "success" | "error";
+    readonly durationInMillis?: number;
+}
+/**
+ * A model turn event representing an LLM request/response.
+ */
+export interface IChatDebugModelTurnEvent extends IChatDebugEventCommon {
+    readonly kind: "modelTurn";
+    readonly model?: string;
+    readonly requestName?: string;
+    readonly inputTokens?: number;
+    readonly outputTokens?: number;
+    readonly cachedTokens?: number;
+    readonly totalTokens?: number;
+    readonly copilotUsageNanoAiu?: number;
+    readonly durationInMillis?: number;
+}
+/**
+ * A generic log event for unstructured or miscellaneous messages.
+ */
+export interface IChatDebugGenericEvent extends IChatDebugEventCommon {
+    readonly kind: "generic";
+    readonly name: string;
+    readonly details?: string;
+    readonly level: ChatDebugLogLevel;
+    readonly category?: string;
+}
+/**
+ * A subagent invocation event, representing a spawned sub-agent within a session.
+ */
+export interface IChatDebugSubagentInvocationEvent extends IChatDebugEventCommon {
+    readonly kind: "subagentInvocation";
+    readonly agentName: string;
+    readonly description?: string;
+    readonly status?: "running" | "completed" | "failed";
+    readonly durationInMillis?: number;
+    readonly toolCallCount?: number;
+    readonly modelTurnCount?: number;
+}
+/**
+ * A named section within a user message or agent response.
+ */
+export interface IChatDebugMessageSection {
+    readonly name: string;
+    readonly content: string;
+}
+/**
+ * A user message event, representing the full prompt sent by the user.
+ */
+export interface IChatDebugUserMessageEvent extends IChatDebugEventCommon {
+    readonly kind: "userMessage";
+    readonly message: string;
+    readonly sections: readonly IChatDebugMessageSection[];
+}
+/**
+ * An agent response event, representing the agent's response.
+ */
+export interface IChatDebugAgentResponseEvent extends IChatDebugEventCommon {
+    readonly kind: "agentResponse";
+    readonly message: string;
+    readonly sections: readonly IChatDebugMessageSection[];
+}
+/**
+ * Union of all internal chat debug event types.
+ */
+export type IChatDebugEvent = IChatDebugToolCallEvent | IChatDebugModelTurnEvent | IChatDebugGenericEvent | IChatDebugSubagentInvocationEvent | IChatDebugUserMessageEvent | IChatDebugAgentResponseEvent;
+/**
+ * Plain text content for a resolved debug event.
+ */
+export interface IChatDebugEventTextContent {
+    readonly kind: "text";
+    readonly value: string;
+}
+/**
+ * The status of a file in a file list content.
+ */
+export type ChatDebugFileStatus = "loaded" | "skipped";
+/**
+ * A single file entry in a file list content.
+ */
+export interface IChatDebugFileEntry {
+    readonly uri: URI;
+    readonly name?: string;
+    readonly status: ChatDebugFileStatus;
+    readonly storage?: string;
+    readonly extensionId?: string;
+    readonly skipReason?: string;
+    readonly errorMessage?: string;
+    readonly duplicateOf?: URI;
+}
+/**
+ * A source folder entry in a file list content.
+ */
+export interface IChatDebugSourceFolderEntry {
+    readonly uri: URI;
+    readonly storage: string;
+}
+/**
+ * Structured file list content for a resolved debug event.
+ * Contains resolved files and skipped/failed paths for rich rendering.
+ */
+export interface IChatDebugEventFileListContent {
+    readonly kind: "fileList";
+    readonly discoveryType: string;
+    readonly durationInMillis: number;
+    readonly files: readonly IChatDebugFileEntry[];
+    readonly sourceFolders?: readonly IChatDebugSourceFolderEntry[];
+}
+/**
+ * Structured message content for a resolved debug event,
+ * containing collapsible sections.
+ */
+export interface IChatDebugEventMessageContent {
+    readonly kind: "message";
+    readonly type: "user" | "agent";
+    readonly message: string;
+    readonly sections: readonly IChatDebugMessageSection[];
+}
+/**
+ * Structured tool call content for a resolved debug event.
+ * Contains the tool name, status, arguments, and output for rich rendering.
+ */
+export interface IChatDebugEventToolCallContent {
+    readonly kind: "toolCall";
+    readonly toolName: string;
+    readonly result?: "success" | "error";
+    readonly durationInMillis?: number;
+    readonly input?: string;
+    readonly output?: string;
+}
+/**
+ * Structured model turn content for a resolved debug event.
+ * Contains request metadata, token usage, and timing for rich rendering.
+ */
+export interface IChatDebugEventModelTurnContent {
+    readonly kind: "modelTurn";
+    readonly requestName: string;
+    readonly model?: string;
+    readonly status?: string;
+    readonly durationInMillis?: number;
+    readonly timeToFirstTokenInMillis?: number;
+    readonly requestId?: string;
+    readonly maxInputTokens?: number;
+    readonly maxOutputTokens?: number;
+    readonly inputTokens?: number;
+    readonly outputTokens?: number;
+    readonly cachedTokens?: number;
+    readonly totalTokens?: number;
+    readonly requestOptions?: string;
+    readonly errorMessage?: string;
+    readonly sections?: readonly IChatDebugMessageSection[];
+}
+/**
+ * Structured hook execution content for a resolved debug event.
+ * Contains the hook type, command, input, output, and result for rich rendering.
+ */
+export interface IChatDebugEventHookContent {
+    readonly kind: "hook";
+    readonly hookType: string;
+    readonly command?: string;
+    readonly result?: ChatDebugHookResult;
+    readonly durationInMillis?: number;
+    readonly input?: string;
+    readonly output?: string;
+    readonly exitCode?: number;
+    readonly errorMessage?: string;
+}
+/**
+ * A single entry in the customization resolution log.
+ */
+export interface IChatDebugCustomizationLogEntry {
+    readonly category: "applying" | "skipped" | "referenced" | "skill" | "custom-agent" | "hook";
+    readonly name: string;
+    readonly uri?: URI;
+    readonly reason?: string;
+}
+/**
+ * Structured customization summary content for a resolved debug event.
+ * Contains per-file resolution logs showing how applyTo patterns, agent
+ * instructions, and referenced files were resolved by the instructions
+ * context computer.
+ */
+export interface IChatDebugEventCustomizationSummaryContent {
+    readonly kind: "customizationSummary";
+    /** Per-file resolution detail entries. */
+    readonly resolutionLogs: readonly IChatDebugCustomizationLogEntry[];
+    /** Total wall-clock time of the collect() call in milliseconds. */
+    readonly durationInMillis: number;
+    /** Counts by type for the summary header. */
+    readonly counts: {
+        readonly instructions: number;
+        readonly skills: number;
+        readonly agents: number;
+        readonly hooks: number;
+        readonly skipped: number;
+    };
+}
+/**
+ * Union of all resolved event content types.
+ */
+export type IChatDebugResolvedEventContent = IChatDebugEventTextContent | IChatDebugEventFileListContent | IChatDebugEventMessageContent | IChatDebugEventToolCallContent | IChatDebugEventModelTurnContent | IChatDebugEventHookContent | IChatDebugEventCustomizationSummaryContent;
+/**
+ * Provider interface for debug events.
+ */
+export interface IChatDebugLogProvider {
+    provideChatDebugLog(sessionResource: URI, token: CancellationToken): Promise<IChatDebugEvent[] | undefined>;
+    resolveChatDebugLogEvent?(eventId: string, token: CancellationToken): Promise<IChatDebugResolvedEventContent | undefined>;
+    provideChatDebugLogExport?(sessionResource: URI, token: CancellationToken): Promise<Uint8Array | undefined>;
+    resolveChatDebugLogImport?(data: Uint8Array, token: CancellationToken): Promise<URI | undefined>;
+}

package/vscode/src/vs/workbench/contrib/chat/common/chatDebugService.js

@@ -0,0 +1,20 @@
+
+import { RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+
+const CHAT_DEBUG_HAS_ACTIVE_SESSION = ( new RawContextKey("chatDebug.hasActiveSession", false));
+const CHAT_DEBUG_ACTIVE_SESSION_IS_AGENT_HOST = ( new RawContextKey("chatDebug.activeSessionIsAgentHost", false));
+var ChatDebugLogLevel;
+(function(ChatDebugLogLevel) {
+    ChatDebugLogLevel[ChatDebugLogLevel["Trace"] = 0] = "Trace";
+    ChatDebugLogLevel[ChatDebugLogLevel["Info"] = 1] = "Info";
+    ChatDebugLogLevel[ChatDebugLogLevel["Warning"] = 2] = "Warning";
+    ChatDebugLogLevel[ChatDebugLogLevel["Error"] = 3] = "Error";
+})(ChatDebugLogLevel || (ChatDebugLogLevel = {}));
+var ChatDebugHookResult;
+(function(ChatDebugHookResult) {
+    ChatDebugHookResult[ChatDebugHookResult["Success"] = 0] = "Success";
+    ChatDebugHookResult[ChatDebugHookResult["Error"] = 1] = "Error";
+    ChatDebugHookResult[ChatDebugHookResult["NonBlockingError"] = 2] = "NonBlockingError";
+})(ChatDebugHookResult || (ChatDebugHookResult = {}));
+
+export { CHAT_DEBUG_ACTIVE_SESSION_IS_AGENT_HOST, CHAT_DEBUG_HAS_ACTIVE_SESSION, ChatDebugHookResult, ChatDebugLogLevel };

package/vscode/src/vs/workbench/contrib/chat/common/chatDebugServiceImpl.d.ts

@@ -2,7 +2,7 @@ import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { ChatDebugLogLevel, IChatDebugEvent, IChatDebugLogProvider, IChatDebugResolvedEventContent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatDebugService";
+import { ChatDebugLogLevel, IChatDebugEvent, IChatDebugLogProvider, IChatDebugResolvedEventContent } from "./chatDebugService.js";
 import { IChatDebugService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatDebugService.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";

package/vscode/src/vs/workbench/contrib/chat/common/chatDebugServiceImpl.js

@@ -7,7 +7,7 @@ import { onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { extUri } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { CHAT_DEBUG_HAS_ACTIVE_SESSION, CHAT_DEBUG_ACTIVE_SESSION_IS_AGENT_HOST, ChatDebugLogLevel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatDebugService';
+import { CHAT_DEBUG_HAS_ACTIVE_SESSION, CHAT_DEBUG_ACTIVE_SESSION_IS_AGENT_HOST, ChatDebugLogLevel } from './chatDebugService.js';
 import { isAgentHostTarget, localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';

package/vscode/src/vs/workbench/contrib/chat/common/chatService/chatServiceImpl.js

@@ -40,7 +40,7 @@ import { chatEditingSessionIsReady } from '@codingame/monaco-vscode-api/vscode/v
 import { logChangesToStateModel, normalizeSerializableChatData, ChatModel, getRestoredChatRequestSource, ChatRequestModel, ChatRequestRemovalReason, updateRanges, toChatHistoryContent } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { ChatModelStore } from '../model/chatModelStore.js';
 import { ChatRequestTextPart, ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, getPromptText, chatSubcommandLeader, chatAgentLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
+import { ChatRequestParser } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/requestParser/chatRequestParser';
 import { ChatPendingRequestChangeEventName, ChatRequestQueueKind, ChatMcpServersStarting, ChatStopCancellationNoopEventName, ResponseModelState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { ChatServiceTelemetry, ChatRequestTelemetry } from './chatServiceTelemetry.js';
 import { isAgentHostTarget, localChatSessionType, isTerminalCommandPrompt } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
@@ -60,7 +60,7 @@ import { ChatSessionOperationLog } from '../model/chatSessionOperationLog.js';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING, TROUBLESHOOT_COMMAND_NAME, COPILOT_SKILL_URI_SCHEME, TROUBLESHOOT_SKILL_PATH } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { mergeHooks } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
-import { ComputeAutomaticInstructions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions';
+import { ComputeAutomaticInstructions } from '../promptSyntax/computeAutomaticInstructions.js';
 import { CustomizationMigrationHintTarget } from '../promptSyntax/service/customizationMigrationService.js';
 import { findLast } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arraysFind';
 import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';