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

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

@@ -6,7 +6,7 @@ import { escapeRegExpCharacters } from '@codingame/monaco-vscode-api/vscode/vs/b
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
-import { relativePath, isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
@@ -15,21 +15,22 @@ import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor
 import { getDefinitionsAtPosition, getReferencesAtPosition, getImplementationsAtPosition } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/gotoSymbol/browser/goToSymbol';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { QueryType, resultIsMatch } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search';
 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 { resolveSymbolToolFileUri, errorResult, findLineNumber, findSymbolColumn } from './toolHelpers.js';
+import { resolveSymbolToolFileUri, errorResult, findLineNumber, findSymbolColumn, isSymbolToolResourceInScope } from './toolHelpers.js';
 
 const UsagesToolId = "vscode_listCodeUsages";
 const BaseModelDescription = `Find all usages (references, definitions, and implementations) of a code symbol across the workspace. This tool locates where a symbol is referenced, defined, or implemented.
 
 Input:
 - "symbol": The exact name of the symbol to search for (function, class, method, variable, type, etc.).
-- "uri": A full URI (e.g. "file:///path/to/file.ts") of a file where the symbol appears. Provide either "uri" or "filePath".
-- "filePath": A workspace-relative file path (e.g. "src/utils/helpers.ts") of a file where the symbol appears. Provide either "uri" or "filePath".
+- "uri": A full URI (e.g. "file:///path/to/file.ts") of a file within the current workspace or working directory where the symbol appears. Provide either "uri" or "filePath".
+- "filePath": A file path relative to the current working directory when one is set, otherwise the first workspace folder (e.g. "src/utils/helpers.ts"). Provide either "uri" or "filePath".
 - "lineContent": A substring of the line of code where the symbol appears. This is used to locate the exact position in the file. Must be the actual text from the file - do NOT fabricate it.
 
 IMPORTANT: The file and line do NOT need to be the definition of the symbol. Any occurrence works - a usage, an import, a call site, etc. You can pick whichever occurrence is most convenient.
@@ -44,7 +45,8 @@ let UsagesTool = class UsagesTool extends Disposable {
         _modelService,
         _searchService,
         _textModelService,
-        _workspaceContextService
+        _workspaceContextService,
+        _uriIdentityService
     ) {
         super();
         this._languageFeaturesService = _languageFeaturesService;
@@ -52,9 +54,10 @@ let UsagesTool = class UsagesTool extends Disposable {
         this._searchService = _searchService;
         this._textModelService = _textModelService;
         this._workspaceContextService = _workspaceContextService;
+        this._uriIdentityService = _uriIdentityService;
     }
     getToolData() {
-        return this._buildToolData(StaticModelDescription, ( localize(7749, "Find references, definitions, and implementations of a symbol")));
+        return this._buildToolData(StaticModelDescription, ( localize(9109, "Find references, definitions, and implementations of a symbol")));
     }
     _buildToolData(modelDescription, userDescription) {
         return {
@@ -62,7 +65,7 @@ let UsagesTool = class UsagesTool extends Disposable {
             toolReferenceName: "usages",
             canBeReferencedInPrompt: false,
             icon: ThemeIcon.fromId(Codicon.references.id),
-            displayName: ( localize(7750, "List Code Usages")),
+            displayName: ( localize(9110, "List Code Usages")),
             userDescription,
             modelDescription,
             source: ToolDataSource.Internal,
@@ -75,11 +78,11 @@ let UsagesTool = class UsagesTool extends Disposable {
                     },
                     uri: {
                         type: "string",
-                        description: "A full URI of a file where the symbol appears (e.g. \"file:///path/to/file.ts\"). Provide either \"uri\" or \"filePath\"."
+                        description: "A full URI of a file within the current workspace or working directory where the symbol appears (e.g. \"file:///path/to/file.ts\"). Provide either \"uri\" or \"filePath\"."
                     },
                     filePath: {
                         type: "string",
-                        description: "A workspace-relative file path where the symbol appears (e.g. \"src/utils/helpers.ts\"). Provide either \"uri\" or \"filePath\"."
+                        description: "A file path relative to the current working directory when one is set, otherwise the first workspace folder, where the symbol appears (e.g. \"src/utils/helpers.ts\"). Provide either \"uri\" or \"filePath\"."
                     },
                     lineContent: {
                         type: "string",
@@ -93,16 +96,22 @@ let UsagesTool = class UsagesTool extends Disposable {
     async prepareToolInvocation(context, _token) {
         const input = context.parameters;
         return {
-            invocationMessage: ( localize(7751, "Analyzing usages of `{0}`", input.symbol))
+            invocationMessage: ( localize(9111, "Analyzing usages of `{0}`", input.symbol))
         };
     }
     async invoke(invocation, _countTokens, _progress, token) {
         const input = invocation.parameters;
-        const uri = resolveSymbolToolFileUri(input, this._workspaceContextService, invocation.context?.workingDirectory);
+        const uri = resolveSymbolToolFileUri(
+            input,
+            this._workspaceContextService,
+            this._uriIdentityService,
+            invocation.context?.workingDirectory
+        );
         if (!uri) {
-            return errorResult(
-                "Provide either \"uri\" (a full URI) or \"filePath\" (a workspace-relative path) to identify the file."
-            );
+            return errorResult(( localize(
+                9112,
+                "Provide either \"uri\" (a full URI) or \"filePath\" (a workspace-relative path) to identify a file within the current workspace or working directory."
+            )));
         }
         const ref = await this._textModelService.createModelReference(uri);
         try {
@@ -124,7 +133,7 @@ let UsagesTool = class UsagesTool extends Disposable {
                 );
             }
             const position = ( new Position(lineNumber, column));
-            const [definitions, references, implementations] = await Promise.all([getDefinitionsAtPosition(
+            const [definitions, allReferences, implementations] = await Promise.all([getDefinitionsAtPosition(
                 this._languageFeaturesService.definitionProvider,
                 model,
                 position,
@@ -144,12 +153,19 @@ let UsagesTool = class UsagesTool extends Disposable {
                 false,
                 token
             )]);
+            const workingDirectory = invocation.context?.workingDirectory;
+            const references = allReferences.filter(ref => isSymbolToolResourceInScope(
+                ref.uri,
+                this._workspaceContextService,
+                this._uriIdentityService,
+                workingDirectory
+            ));
             if (references.length === 0) {
                 const result = createToolSimpleTextResult(`No usages found for \`${input.symbol}\`.`);
-                result.toolResultMessage = ( new MarkdownString(( localize(7752, "Analyzed usages of `{0}`, no results", input.symbol))));
+                result.toolResultMessage = ( new MarkdownString(( localize(9113, "Analyzed usages of `{0}`, no results", input.symbol))));
                 return result;
             }
-            const previews = await this._getLinePreviews(input.symbol, references, token);
+            const previews = await this._getLinePreviews(input.symbol, references, workingDirectory, token);
             const lines = [];
             lines.push(`${references.length} usages of \`${input.symbol}\`:\n`);
             for (let i = 0; i < references.length; i++) {
@@ -167,8 +183,8 @@ let UsagesTool = class UsagesTool extends Disposable {
             }
             const text = lines.join("\n");
             const result = createToolSimpleTextResult(text);
-            result.toolResultMessage = references.length === 1 ? ( new MarkdownString(( localize(7753, "Analyzed usages of `{0}`, 1 result", input.symbol)))) : ( new MarkdownString(( localize(
-                7754,
+            result.toolResultMessage = references.length === 1 ? ( new MarkdownString(( localize(9114, "Analyzed usages of `{0}`, 1 result", input.symbol)))) : ( new MarkdownString(( localize(
+                9115,
                 "Analyzed usages of `{0}`, {1} results",
                 input.symbol,
                 references.length
@@ -182,7 +198,7 @@ let UsagesTool = class UsagesTool extends Disposable {
             ref.dispose();
         }
     }
-    async _getLinePreviews(symbol, references, token) {
+    async _getLinePreviews(symbol, references, workingDirectory, token) {
         const previews = ( new Array(references.length));
         const lookup = ( new Map());
         const needSearch = ( new ResourceSet());
@@ -201,12 +217,16 @@ let UsagesTool = class UsagesTool extends Disposable {
             return previews;
         }
         try {
-            const folders = this._workspaceContextService.getWorkspace().folders;
+            const folders = workingDirectory ? [{
+                uri: workingDirectory
+            }] : this._workspaceContextService.getWorkspace().folders;
             const relativePaths = [];
             for (const uri of needSearch) {
-                const folder = this._workspaceContextService.getWorkspaceFolder(uri);
+                const folder = folders.find(
+                    folder => isSymbolToolResourceInScope(uri, this._workspaceContextService, this._uriIdentityService, folder.uri)
+                );
                 if (folder) {
-                    const rel = relativePath(folder.uri, uri);
+                    const rel = this._uriIdentityService.extUri.relativePath(folder.uri, uri);
                     if (rel) {
                         relativePaths.push(rel);
                     }
@@ -270,7 +290,7 @@ let UsagesTool = class UsagesTool extends Disposable {
         return Range.areIntersectingOrTouching(a.range, b.range);
     }
 };
-UsagesTool = ( __decorate([( __param(0, ILanguageFeaturesService)), ( __param(1, IModelService)), ( __param(2, ISearchService)), ( __param(3, ITextModelService)), ( __param(4, IWorkspaceContextService))], UsagesTool));
+UsagesTool = ( __decorate([( __param(0, ILanguageFeaturesService)), ( __param(1, IModelService)), ( __param(2, ISearchService)), ( __param(3, ITextModelService)), ( __param(4, IWorkspaceContextService)), ( __param(5, IUriIdentityService))], UsagesTool));
 let UsagesToolContribution = class UsagesToolContribution extends Disposable {
     static {
         this.ID = "chat.usagesTool";

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

@@ -8,8 +8,8 @@ import { COPILOT_VENDOR_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { createDefaultModelArrays, DefaultModelContribution } from './defaultModelContribution.js';
 
-const defaultEntryLabel = ( localize(7755, "Default"));
-const defaultEntryDescription = ( localize(7756, "Use the default behavior for utility models"));
+const defaultEntryLabel = ( localize(9116, "Default"));
+const defaultEntryDescription = ( localize(9117, "Use the default behavior for utility models"));
 const utilityArrays = createDefaultModelArrays(defaultEntryLabel, defaultEntryDescription);
 const utilitySmallArrays = createDefaultModelArrays(defaultEntryLabel, defaultEntryDescription);
 let UtilityModelContribution = class UtilityModelContribution extends DefaultModelContribution {
@@ -67,12 +67,12 @@ UtilitySmallModelContribution = ( __decorate([( __param(0, ILanguageModelsServic
 registerWorkbenchContribution2(
     UtilityModelContribution.ID,
     UtilityModelContribution,
-    WorkbenchPhase.BlockRestore
+    WorkbenchPhase.AfterRestored
 );
 registerWorkbenchContribution2(
     UtilitySmallModelContribution.ID,
     UtilitySmallModelContribution,
-    WorkbenchPhase.BlockRestore
+    WorkbenchPhase.AfterRestored
 );
 
 export { UtilityModelContribution, UtilitySmallModelContribution };

package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcomeHandler.js

@@ -17,29 +17,29 @@ const chatViewsWelcomeJsonSchema = {
     properties: {
         icon: {
             type: "string",
-            description: ( localize(7757, "The icon for the welcome message."))
+            description: ( localize(9118, "The icon for the welcome message."))
         },
         title: {
             type: "string",
-            description: ( localize(7758, "The title of the welcome message."))
+            description: ( localize(9119, "The title of the welcome message."))
         },
         content: {
             type: "string",
             description: ( localize(
-                7759,
+                9120,
                 "The content of the welcome message. The first command link will be rendered as a button."
             ))
         },
         when: {
             type: "string",
-            description: ( localize(7760, "Condition when the welcome message is shown."))
+            description: ( localize(9121, "Condition when the welcome message is shown."))
         }
     }
 };
 const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "chatViewsWelcome",
     jsonSchema: {
-        description: ( localize(7761, "Contributes a welcome message to a chat view")),
+        description: ( localize(9122, "Contributes a welcome message to a chat view")),
         type: "array",
         items: chatViewsWelcomeJsonSchema
     }

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

@@ -3,8 +3,9 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
-import { IVoicePriorTimelineEntry, IVoiceSessionContext, IVoiceTranscription, IVoiceAudioResponse, IVoiceToolCall, IVoiceSpeechStarted, IVoiceSessionInit, IVoiceFeedbackPayload } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/voiceClient/voiceClientService";
+import { IVoicePriorTimelineEntry, IVoicePttStartOptions, IVoiceSessionContext, IVoiceTranscription, IVoiceAudioResponse, IVoiceToolCall, IVoiceSpeechStarted, IVoiceSessionInit, IVoiceFeedbackPayload, IVoiceTurnConfig, IVoiceTurnAutoEnded, IVoiceConnectionIssue, IVoiceFatalDisconnect, IVoiceBargeIn, IVoiceNarrationAck, IVoiceNarrationSignal, IVoiceDispatchResult, IVoiceCheckpointNarrationMetadata, VoiceConfirmationType, VoiceNarrationKind } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/common/voiceClient/voiceClientService";
 import { IVoiceClientService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/voiceClient/voiceClientService.service";
+export declare function resolveAutomaticVoiceLanguage(browserLanguage: string | undefined, displayLanguage: string | undefined): string;
 export declare class VoiceClientService extends Disposable implements IVoiceClientService {
     private readonly _configurationService;
     private readonly _logService;
@@ -16,6 +17,7 @@ export declare class VoiceClientService extends Disposable implements IVoiceClie
     private _reconnectTimer;
     private _isConnected;
     private _isResuming;
+    private _sessionStartedOnSocket;
     private _window;
     private _lastSessionId;
     private _pingTimer;
@@ -23,11 +25,19 @@ export declare class VoiceClientService extends Disposable implements IVoiceClie
     private _contextSendTimer;
     private _pendingContext;
     private _lastSentById;
-    private _lastSentActive;
+    private readonly _invalidatedSessionIds;
     private readonly _onTranscription;
     readonly onTranscription: Event<IVoiceTranscription>;
     private readonly _onAudioResponse;
     readonly onAudioResponse: Event<IVoiceAudioResponse>;
+    private readonly _onBargeIn;
+    readonly onBargeIn: Event<IVoiceBargeIn>;
+    private readonly _onNarrationAck;
+    readonly onNarrationAck: Event<IVoiceNarrationAck>;
+    private readonly _onNarrationUnblocked;
+    readonly onNarrationUnblocked: Event<IVoiceNarrationSignal>;
+    private readonly _onNarrationInterrupted;
+    readonly onNarrationInterrupted: Event<IVoiceNarrationSignal>;
     private readonly _onToolCall;
     readonly onToolCall: Event<IVoiceToolCall>;
     private readonly _onSpeechStarted;
@@ -38,21 +48,53 @@ export declare class VoiceClientService extends Disposable implements IVoiceClie
     readonly onError: Event<string>;
     private readonly _onDidChangeConnectionState;
     readonly onDidChangeConnectionState: Event<boolean>;
+    private readonly _onFatalDisconnect;
+    readonly onFatalDisconnect: Event<IVoiceFatalDisconnect>;
+    private readonly _onConnectionIssue;
+    readonly onConnectionIssue: Event<IVoiceConnectionIssue>;
+    private readonly _onTurnAutoEnded;
+    readonly onTurnAutoEnded: Event<IVoiceTurnAutoEnded>;
     get isConnected(): boolean;
     get isResuming(): boolean;
+    get willReconnect(): boolean;
     get currentSessionId(): string | undefined;
     private _authToken;
     constructor(_configurationService: IConfigurationService, _logService: ILogService, _productService: IProductService);
+    private _getVoice;
+    private _sendSetVoice;
+    private _getLanguage;
+    private _sendSetLanguage;
+    /**
+     * Whether a configuration setting has an explicit user/workspace/application
+     * value, as opposed to falling back to its registered default.
+     */
+    private _isExplicitlyConfigured;
+    /**
+     * Assemble the ``turn_config`` wire object from the ``agents.voice.turn.*``
+     * settings, normalizing each into the shape the backend expects. The
+     * ``auto_end_mode`` is derived from the other two settings: trailing-silence
+     * ending is enabled unless ``silenceMs`` is ``-1`` (or otherwise non-positive),
+     * and stop-phrase ending is enabled when at least one phrase is configured.
+     *
+     * When hands-free mode (``agents.voice.handsFree``) is disabled, the turn is
+     * not sent automatically by default: trailing-silence and stop-phrase ending
+     * are each suppressed unless the corresponding setting has been explicitly
+     * configured, so a user who opts out of the hands-free loop keeps manual
+     * control over when a turn is sent.
+     */
+    private _getTurnConfig;
+    private _sendSetTurnConfig;
     private _getWsUrl;
     connect(window: Window & typeof globalThis, authToken?: string): Promise<void>;
     private _connectWebSocket;
     disconnect(): void;
     private _cleanup;
+    private _resetReconnectBudget;
     private _startPing;
     private _stopPing;
     private _clearPongTimeout;
     private _setConnected;
-    sendPttStart(turnId: string): void;
+    sendPttStart(turnId: string, options: IVoicePttStartOptions): void;
     sendPttAudioChunk(audio: string): void;
     sendPttEnd(): void;
     sendPttDiagnostic(turnId: string, metrics: Record<string, unknown>): void;
@@ -61,7 +103,11 @@ export declare class VoiceClientService extends Disposable implements IVoiceClie
     invalidateSessionCache(sessionId: string): void;
     private _sendDelta;
     private _seedTracking;
-    sendToolResult(callId: string, result: string): void;
+    sendToolResult(callId: string, result: string | IVoiceDispatchResult): void;
+    sendNarrationPlaybackComplete(codingSessionId: string, narrationId: string, playbackId: string): void;
+    requestNarration(codingSessionId: string, kind: VoiceNarrationKind, text: string, narrationId?: string, checkpoint?: IVoiceCheckpointNarrationMetadata, confirmationType?: VoiceConfirmationType, pending?: {
+        pendingId: string;
+    }): string | undefined;
     sendSessionStateChange(sessionId: string, newState: string, _label: string, detail?: string, lastResponseSummary?: string): void;
     stopSpeaking(): void;
     /**
@@ -75,8 +121,8 @@ export declare class VoiceClientService extends Disposable implements IVoiceClie
      * can answer recall questions across reconnects without backend
      * persistence. See ``IVoicePriorTimelineEntry``.
      */
-    sendStartSession(context: IVoiceSessionContext, machineId: string, priorTimeline?: readonly IVoicePriorTimelineEntry[]): void;
-    sendResumeSession(context: IVoiceSessionContext, machineId: string): void;
+    sendStartSession(context: IVoiceSessionContext, machineId: string, priorTimeline?: readonly IVoicePriorTimelineEntry[], turnConfigOverride?: IVoiceTurnConfig, voiceInstructions?: string): void;
+    sendResumeSession(context: IVoiceSessionContext, machineId: string, voiceInstructions?: string): void;
     submitFeedback(payload: IVoiceFeedbackPayload): Promise<{
         ok: boolean;
         error?: string;