@codingame/monaco-vscode-chat-service-override 11.1.2 → 12.0.1

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

@@ -0,0 +1,41 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IProgress } from "vscode/vscode/vs/platform/progress/common/progress";
+import { IChatMessage } from "vscode/vscode/vs/workbench/contrib/chat/common/languageModels";
+import { IChatFollowup, IChatProgress, IChatResponseProgressFileTreeData } from "vscode/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IExtensionService } from "vscode/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { ChatAgentLocation } from "vscode/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatSlashCommandService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service";
+export interface IChatSlashData {
+    command: string;
+    detail: string;
+    sortText?: string;
+    executeImmediately?: boolean;
+    locations: ChatAgentLocation[];
+}
+export interface IChatSlashFragment {
+    content: string | {
+        treeData: IChatResponseProgressFileTreeData;
+    };
+}
+export type IChatSlashCallback = {
+    (prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, token: CancellationToken): Promise<{
+        followUp: IChatFollowup[];
+    } | void>;
+};
+export declare class ChatSlashCommandService extends Disposable implements IChatSlashCommandService {
+    private readonly _extensionService;
+    _serviceBrand: undefined;
+    private readonly _commands;
+    private readonly _onDidChangeCommands;
+    readonly onDidChangeCommands: Event<void>;
+    constructor(_extensionService: IExtensionService);
+    dispose(): void;
+    registerSlashCommand(data: IChatSlashData, command: IChatSlashCallback): IDisposable;
+    getCommands(location: ChatAgentLocation): Array<IChatSlashData>;
+    hasCommand(id: string): boolean;
+    executeCommand(id: string, prompt: string, progress: IProgress<IChatProgress>, history: IChatMessage[], location: ChatAgentLocation, token: CancellationToken): Promise<{
+        followUp: IChatFollowup[];
+    } | void>;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';

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

@@ -0,0 +1,31 @@
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
+import { ChatAgentLocation } from "vscode/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { WorkingSetEntryState } from "vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { IChatRequestVariableEntry } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IChatWidgetHistoryService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatWidgetHistoryService.service";
+export interface IChatHistoryEntry {
+    text: string;
+    state?: IChatInputState;
+}
+export interface IChatInputState {
+    [key: string]: any;
+    chatContextAttachments?: ReadonlyArray<IChatRequestVariableEntry>;
+    chatWorkingSet?: ReadonlyArray<{
+        uri: URI;
+        state: WorkingSetEntryState;
+    }>;
+}
+export declare class ChatWidgetHistoryService implements IChatWidgetHistoryService {
+    _serviceBrand: undefined;
+    private memento;
+    private viewState;
+    private readonly _onDidClearHistory;
+    readonly onDidClearHistory: Event<void>;
+    constructor(storageService: IStorageService);
+    getHistory(location: ChatAgentLocation): IChatHistoryEntry[];
+    private getKey;
+    saveHistory(location: ChatAgentLocation, history: IChatHistoryEntry[]): void;
+    clearHistory(): void;
+}

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

@@ -1,16 +1,18 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
+import { Memento } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/common/memento';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 
 let ChatWidgetHistoryService = class ChatWidgetHistoryService {
     constructor(storageService) {
         this._onDidClearHistory = ( new Emitter());
         this.onDidClearHistory = this._onDidClearHistory.event;
         this.memento = ( new Memento('interactive-session', storageService));
-        const loadedState = this.memento.getMemento(1 , 1 );
+        const loadedState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
         for (const provider in loadedState.history) {
             loadedState.history[provider] = ( loadedState.history[provider].map(entry => typeof entry === 'string' ? { text: entry } : entry));
         }

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

@@ -0,0 +1,13 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { ILanguageModelIgnoredFilesService } from "vscode/vscode/vs/workbench/contrib/chat/common/ignoredFiles.service";
+export interface ILanguageModelIgnoredFileProvider {
+    isFileIgnored(uri: URI, token: CancellationToken): Promise<boolean>;
+}
+export declare class LanguageModelIgnoredFilesService implements ILanguageModelIgnoredFilesService {
+    _serviceBrand: undefined;
+    private readonly _providers;
+    fileIsIgnored(uri: URI, token: CancellationToken): Promise<boolean>;
+    registerIgnoredFileProvider(provider: ILanguageModelIgnoredFileProvider): IDisposable;
+}

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

@@ -1,3 +1,4 @@
+
 import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 
 class LanguageModelIgnoredFilesService {

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

@@ -0,0 +1,24 @@
+import { IJSONSchema } from "vscode/vscode/vs/base/common/jsonSchema";
+import { ILogService } from "vscode/vscode/vs/platform/log/common/log.service";
+import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
+import { ILanguageModelToolsService } from "vscode/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+export interface IRawToolContribution {
+    name: string;
+    displayName: string;
+    modelDescription: string;
+    toolReferenceName?: string;
+    icon?: string | {
+        light: string;
+        dark: string;
+    };
+    when?: string;
+    tags?: string[];
+    userDescription?: string;
+    inputSchema?: IJSONSchema;
+    canBeReferencedInPrompt?: boolean;
+}
+export declare class LanguageModelToolsExtensionPointHandler implements IWorkbenchContribution {
+    static readonly ID = "workbench.contrib.toolsExtensionPointHandler";
+    private _registrationDisposables;
+    constructor(languageModelToolsService: ILanguageModelToolsService, logService: ILogService);
+}

package/vscode/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
 import { joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
@@ -18,7 +19,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
     },
     jsonSchema: {
         description: ( localize(
-            7487,
+            4628,
             'Contributes a tool that can be invoked by a language model in a chat session, or from a standalone command. Registered tools can be used by all extensions.'
         )),
         type: 'array',
@@ -44,7 +45,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
             properties: {
                 name: {
                     description: ( localize(
-                        7488,
+                        4629,
                         "A unique name for this tool. This name must be a globally unique identifier, and is also used as a name when presenting this tool to a language model."
                     )),
                     type: 'string',
@@ -52,7 +53,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 toolReferenceName: {
                     markdownDescription: ( localize(
-                        7489,
+                        4630,
                         "If {0} is enabled for this tool, the user may use '#' with this name to invoke the tool in a query. Otherwise, the name is not required. Name must not contain whitespace.",
                         '`canBeReferencedInPrompt`'
                     )),
@@ -61,32 +62,32 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 displayName: {
                     description: ( localize(
-                        7490,
+                        4631,
                         "A human-readable name for this tool that may be used to describe it in the UI."
                     )),
                     type: 'string'
                 },
                 userDescription: {
-                    description: ( localize(7491, "A description of this tool that may be shown to the user.")),
+                    description: ( localize(4632, "A description of this tool that may be shown to the user.")),
                     type: 'string'
                 },
                 modelDescription: {
                     description: ( localize(
-                        7492,
+                        4633,
                         "A description of this tool that may be used by a language model to select it."
                     )),
                     type: 'string'
                 },
                 inputSchema: {
                     description: ( localize(
-                        7493,
+                        4634,
                         "A JSON schema for the input this tool accepts. The input must be an object at the top level. A particular language model may not support all JSON schema features. See the documentation for the language model family you are using for more information."
                     )),
-                    $ref: toolsParametersSchemaSchemaId,
+                    $ref: toolsParametersSchemaSchemaId
                 },
                 canBeReferencedInPrompt: {
                     markdownDescription: ( localize(
-                        7494,
+                        4635,
                         "If true, this tool shows up as an attachment that the user can add manually to their request. Chat participants will receive the tool in {0}.",
                         '`ChatRequest#toolReferences`'
                     )),
@@ -94,7 +95,7 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 icon: {
                     markdownDescription: ( localize(
-                        7495,
+                        4636,
                         "An icon that represents this tool. Either a file path, an object with file paths for dark and light themes, or a theme icon reference, like `$(zap)`"
                     )),
                     anyOf: [{
@@ -104,11 +105,11 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                             type: 'object',
                             properties: {
                                 light: {
-                                    description: ( localize(7496, 'Icon path when a light theme is used')),
+                                    description: ( localize(4637, 'Icon path when a light theme is used')),
                                     type: 'string'
                                 },
                                 dark: {
-                                    description: ( localize(7497, 'Icon path when a dark theme is used')),
+                                    description: ( localize(4638, 'Icon path when a dark theme is used')),
                                     type: 'string'
                                 }
                             }
@@ -116,14 +117,14 @@ const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoi
                 },
                 when: {
                     markdownDescription: ( localize(
-                        7498,
+                        4639,
                         "Condition which must be true for this tool to be enabled. Note that a tool may still be invoked by another extension even when its `when` condition is false."
                     )),
                     type: 'string'
                 },
                 tags: {
                     description: ( localize(
-                        7499,
+                        4640,
                         "A set of tags that roughly describe the tool's capabilities. A tool user may use these to filter the set of tools to just ones that are relevant for the task at hand, or they may want to pick a tag that can be used to identify just the tools contributed by this extension."
                     )),
                     type: 'array',
@@ -141,7 +142,7 @@ function toToolKey(extensionIdentifier, toolName) {
 let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionPointHandler {
     static { this.ID = 'workbench.contrib.toolsExtensionPointHandler'; }
     constructor(languageModelToolsService, logService) {
-        this._registrationDisposables = ( (new DisposableMap()));
+        this._registrationDisposables = ( new DisposableMap());
         languageModelToolsExtensionPoint.setHandler((extensions, delta) => {
             for (const extension of delta.added) {
                 for (const rawTool of extension.value) {
@@ -173,7 +174,8 @@ let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionP
                     }
                     const tool = {
                         ...rawTool,
-                        inputSchema: rawTool.inputSchema ?? rawTool.parametersSchema,
+                        extensionId: extension.description.identifier,
+                        inputSchema: rawTool.inputSchema,
                         id: rawTool.name,
                         icon,
                         when: rawTool.when ? ContextKeyExpr.deserialize(rawTool.when) : undefined,
@@ -190,9 +192,9 @@ let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionP
         });
     }
 };
-LanguageModelToolsExtensionPointHandler = ( (__decorate([
-    ( (__param(0, ILanguageModelToolsService))),
-    ( (__param(1, ILogService)))
-], LanguageModelToolsExtensionPointHandler)));
+LanguageModelToolsExtensionPointHandler = ( __decorate([
+    ( __param(0, ILanguageModelToolsService)),
+    ( __param(1, ILogService))
+], LanguageModelToolsExtensionPointHandler));
 
 export { LanguageModelToolsExtensionPointHandler };

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

@@ -0,0 +1 @@
+export declare const toolsParametersSchemaSchemaId = "vscode://schemas/toolsParameters";

package/vscode/src/vs/workbench/contrib/chat/common/tools/languageModelToolsParametersSchema.js

@@ -1,3 +1,4 @@
+
 import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 

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

@@ -0,0 +1,39 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { RawContextKey } from "vscode/vscode/vs/platform/contextkey/common/contextkey";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IChatAgentService } from "vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
+import { IChatModel } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { ISpeechToTextEvent } from "vscode/vscode/vs/workbench/contrib/speech/common/speechService";
+import { ISpeechService } from "vscode/vscode/vs/workbench/contrib/speech/common/speechService.service";
+import { IVoiceChatService } from "./voiceChatService.service.js";
+export interface IVoiceChatSessionOptions {
+    readonly usesAgents?: boolean;
+    readonly model?: IChatModel;
+}
+export interface IVoiceChatTextEvent extends ISpeechToTextEvent {
+    readonly waitingForInput?: boolean;
+}
+export interface IVoiceChatSession {
+    readonly onDidChange: Event<IVoiceChatTextEvent>;
+}
+export declare const VoiceChatInProgress: RawContextKey<boolean>;
+export declare class VoiceChatService extends Disposable implements IVoiceChatService {
+    private readonly speechService;
+    private readonly chatAgentService;
+    private readonly contextKeyService;
+    readonly _serviceBrand: undefined;
+    private static readonly AGENT_PREFIX;
+    private static readonly COMMAND_PREFIX;
+    private static readonly PHRASES_LOWER;
+    private static readonly PHRASES_UPPER;
+    private static readonly CHAT_AGENT_ALIAS;
+    private readonly voiceChatInProgress;
+    private activeVoiceChatSessions;
+    constructor(speechService: ISpeechService, chatAgentService: IChatAgentService, contextKeyService: IContextKeyService);
+    private createPhrases;
+    private toText;
+    createVoiceChatSession(token: CancellationToken, options: IVoiceChatSessionOptions): Promise<IVoiceChatSession>;
+    private normalizeWord;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { localize } from 'vscode/vscode/vs/nls';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -6,22 +7,22 @@ import { rtrim } from 'vscode/vscode/vs/base/common/strings';
 import { RawContextKey } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { SpeechToTextStatus } from 'vscode/vscode/vs/workbench/contrib/speech/common/speechService';
 import { ISpeechService } from 'vscode/vscode/vs/workbench/contrib/speech/common/speechService.service';
 
 var VoiceChatService_1;
 var PhraseTextType;
-( ((function(PhraseTextType) {
+(function (PhraseTextType) {
     PhraseTextType[PhraseTextType["AGENT"] = 1] = "AGENT";
     PhraseTextType[PhraseTextType["COMMAND"] = 2] = "COMMAND";
     PhraseTextType[PhraseTextType["AGENT_AND_COMMAND"] = 3] = "AGENT_AND_COMMAND";
-})(PhraseTextType || (PhraseTextType = {}))));
-const VoiceChatInProgress = ( (new RawContextKey(
+})(PhraseTextType || (PhraseTextType = {}));
+const VoiceChatInProgress = ( new RawContextKey(
     'voiceChatInProgress',
     false,
-    { type: 'boolean', description: ( localize(7500, "A speech-to-text session is in progress for chat.")) }
-)));
+    { type: 'boolean', description: ( localize(4641, "A speech-to-text session is in progress for chat.")) }
+));
 let VoiceChatService = class VoiceChatService extends Disposable {
     static { VoiceChatService_1 = this; }
     static { this.AGENT_PREFIX = chatAgentLeader; }
@@ -34,7 +35,7 @@ let VoiceChatService = class VoiceChatService extends Disposable {
         [this.AGENT_PREFIX]: 'At',
         [this.COMMAND_PREFIX]: 'Slash'
     }; }
-    static { this.CHAT_AGENT_ALIAS = ( (new Map([['vscode', 'code']]))); }
+    static { this.CHAT_AGENT_ALIAS = ( new Map([['vscode', 'code']])); }
     constructor(speechService, chatAgentService, contextKeyService) {
         super();
         this.speechService = speechService;
@@ -44,7 +45,7 @@ let VoiceChatService = class VoiceChatService extends Disposable {
         this.activeVoiceChatSessions = 0;
     }
     createPhrases(model) {
-        const phrases = ( (new Map()));
+        const phrases = ( new Map());
         for (const agent of this.chatAgentService.getActivatedAgents()) {
             const agentPhrase = `${VoiceChatService_1.PHRASES_LOWER[VoiceChatService_1.AGENT_PREFIX]} ${VoiceChatService_1.CHAT_AGENT_ALIAS.get(agent.name) ?? agent.name}`.toLowerCase();
             phrases.set(agentPhrase, { agent: agent.name });
@@ -68,7 +69,7 @@ let VoiceChatService = class VoiceChatService extends Disposable {
         }
     }
     async createVoiceChatSession(token, options) {
-        const disposables = ( (new DisposableStore()));
+        const disposables = ( new DisposableStore());
         const onSessionStoppedOrCanceled = (dispose) => {
             this.activeVoiceChatSessions = Math.max(0, this.activeVoiceChatSessions - 1);
             if (this.activeVoiceChatSessions === 0) {
@@ -81,7 +82,7 @@ let VoiceChatService = class VoiceChatService extends Disposable {
         disposables.add(token.onCancellationRequested(() => onSessionStoppedOrCanceled(true)));
         let detectedAgent = false;
         let detectedSlashCommand = false;
-        const emitter = disposables.add(( (new Emitter())));
+        const emitter = disposables.add(( new Emitter()));
         const session = await this.speechService.createSpeechToTextSession(token, 'chat');
         if (token.isCancellationRequested) {
             onSessionStoppedOrCanceled(true);
@@ -100,7 +101,7 @@ let VoiceChatService = class VoiceChatService extends Disposable {
                             let transformedWords;
                             let waitingForInput = false;
                             if (options.usesAgents && startsWithAgent && !detectedAgent && !detectedSlashCommand && originalWords.length >= 4) {
-                                const phrase = phrases.get(( (originalWords.slice(0, 4).map(word => this.normalizeWord(word)))).join(' '));
+                                const phrase = phrases.get(( originalWords.slice(0, 4).map(word => this.normalizeWord(word))).join(' '));
                                 if (phrase) {
                                     transformedWords = [this.toText(phrase, PhraseTextType.AGENT_AND_COMMAND), ...originalWords.slice(4)];
                                     waitingForInput = originalWords.length === 4;
@@ -111,7 +112,7 @@ let VoiceChatService = class VoiceChatService extends Disposable {
                                 }
                             }
                             if (options.usesAgents && startsWithAgent && !detectedAgent && !transformedWords && originalWords.length >= 2) {
-                                const phrase = phrases.get(( (originalWords.slice(0, 2).map(word => this.normalizeWord(word)))).join(' '));
+                                const phrase = phrases.get(( originalWords.slice(0, 2).map(word => this.normalizeWord(word))).join(' '));
                                 if (phrase) {
                                     transformedWords = [this.toText(phrase, PhraseTextType.AGENT), ...originalWords.slice(2)];
                                     waitingForInput = originalWords.length === 2;
@@ -121,7 +122,7 @@ let VoiceChatService = class VoiceChatService extends Disposable {
                                 }
                             }
                             if (startsWithSlashCommand && !detectedSlashCommand && !transformedWords && originalWords.length >= 2) {
-                                const phrase = phrases.get(( (originalWords.slice(0, 2).map(word => this.normalizeWord(word)))).join(' '));
+                                const phrase = phrases.get(( originalWords.slice(0, 2).map(word => this.normalizeWord(word))).join(' '));
                                 if (phrase) {
                                     transformedWords = [this.toText(phrase, options.usesAgents && !detectedAgent ?
                                             PhraseTextType.AGENT_AND_COMMAND :
@@ -168,10 +169,10 @@ let VoiceChatService = class VoiceChatService extends Disposable {
         return word.toLowerCase();
     }
 };
-VoiceChatService = VoiceChatService_1 = ( (__decorate([
-    ( (__param(0, ISpeechService))),
-    ( (__param(1, IChatAgentService))),
-    ( (__param(2, IContextKeyService)))
-], VoiceChatService)));
+VoiceChatService = VoiceChatService_1 = ( __decorate([
+    ( __param(0, ISpeechService)),
+    ( __param(1, IChatAgentService)),
+    ( __param(2, IContextKeyService))
+], VoiceChatService));
 
 export { VoiceChatInProgress, VoiceChatService };

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

@@ -0,0 +1,7 @@
+import { CancellationToken } from "vscode/vscode/vs/base/common/cancellation";
+import { IVoiceChatSessionOptions, IVoiceChatSession } from "./voiceChatService.js";
+export declare const IVoiceChatService: import("vscode/vscode/vs/platform/instantiation/common/instantiation").ServiceIdentifier<IVoiceChatService>;
+export interface IVoiceChatService {
+    readonly _serviceBrand: undefined;
+    createVoiceChatSession(token: CancellationToken, options: IVoiceChatSessionOptions): Promise<IVoiceChatSession>;
+}

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.d.ts

@@ -0,0 +1 @@
+export {};

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js

@@ -1,51 +1,48 @@
-import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+
+import { registerEditorContribution, EditorContributionInstantiation } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { registerAction2, MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { InlineChatController } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { StartSessionAction, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, DiscardHunkAction, RerunAction, MoveToNextHunk, MoveToPreviousHunk, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, ViewInChatAction, ToggleDiffForChange, AcceptChanges } from '@codingame/monaco-vscode-chat-notebook-terminal-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
-import { INLINE_CHAT_ID, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_EDITING, MENU_INLINE_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { InlineChatController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { StartSessionAction, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, DiscardHunkAction, RerunAction, MoveToNextHunk, MoveToPreviousHunk, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, ViewInChatAction, ToggleDiffForChange, AcceptChanges } from '@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
+import { INLINE_CHAT_ID, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_EDITING, MENU_INLINE_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { InlineChatNotebookContribution } from './inlineChatNotebook.js';
-import { Extensions, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
 import './inlineChatSavingServiceImpl.js';
 import { InlineChatAccessibleView } from './inlineChatAccessibleView.js';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { InlineChatEnabler } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
+import { InlineChatEnabler } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
 import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
-import { SubmitAction, CancelAction } from '@codingame/monaco-vscode-chat-extensions-notebook-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
+import { ChatSubmitAction, CancelAction } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
 import { localize } from 'vscode/vscode/vs/nls';
-import { CONTEXT_CHAT_INPUT_HAS_TEXT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { InlineChatAccessibilityHelp } from './inlineChatAccessibilityHelp.js';
-import { InlineChatExansionContextKey, InlineChatExpandLineAction } from './inlineChatCurrentLine.js';
+import { InlineChatExpandLineAction, ShowInlineChatHintAction, HideInlineChatHintAction, InlineChatHintsController } from './inlineChatCurrentLine.js';
 
-registerEditorContribution(INLINE_CHAT_ID, InlineChatController, 0 );
-registerEditorContribution(InlineChatExansionContextKey.Id, InlineChatExansionContextKey, 2 );
+registerEditorContribution(INLINE_CHAT_ID, InlineChatController, EditorContributionInstantiation.Eager);
 registerAction2(InlineChatExpandLineAction);
+registerAction2(ShowInlineChatHintAction);
+registerAction2(HideInlineChatHintAction);
+registerEditorContribution(InlineChatHintsController.ID, InlineChatHintsController, EditorContributionInstantiation.Eventually);
 const editActionMenuItem = {
     group: '0_main',
     order: 0,
     command: {
-        id: SubmitAction.ID,
-        title: ( localize(3211, "Edit Code")),
+        id: ChatSubmitAction.ID,
+        title: ( localize(6740, "Edit Code")),
     },
-    when: ( (ContextKeyExpr.and(
-        CONTEXT_CHAT_INPUT_HAS_TEXT,
-         (CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()),
-        CTX_INLINE_CHAT_EDITING
-    ))),
+    when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), CTX_INLINE_CHAT_EDITING)),
 };
 const generateActionMenuItem = {
     group: '0_main',
     order: 0,
     command: {
-        id: SubmitAction.ID,
-        title: ( localize(3212, "Generate")),
+        id: ChatSubmitAction.ID,
+        title: ( localize(6741, "Generate")),
     },
-    when: ( (ContextKeyExpr.and(
-        CONTEXT_CHAT_INPUT_HAS_TEXT,
-         (CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()),
-         (CTX_INLINE_CHAT_EDITING.toNegated())
-    ))),
+    when: ( ContextKeyExpr.and(ChatContextKeys.inputHasText, ( CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()), ( CTX_INLINE_CHAT_EDITING.toNegated()))),
 };
 MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, editActionMenuItem);
 MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, generateActionMenuItem);
@@ -54,10 +51,10 @@ const cancelActionMenuItem = {
     order: 0,
     command: {
         id: CancelAction.ID,
-        title: ( localize(3213, "Cancel Request")),
-        shortTitle: ( localize(3214, "Cancel")),
+        title: ( localize(6742, "Cancel Request")),
+        shortTitle: ( localize(6743, "Cancel")),
     },
-    when: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS))),
+    when: ( ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS)),
 };
 MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, cancelActionMenuItem);
 registerAction2(StartSessionAction);
@@ -74,8 +71,8 @@ registerAction2(FocusInlineChat);
 registerAction2(ViewInChatAction);
 registerAction2(ToggleDiffForChange);
 registerAction2(AcceptChanges);
-const workbenchContributionsRegistry = ( (Registry.as(Extensions.Workbench)));
-workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatNotebookContribution, 3 );
-registerWorkbenchContribution2(InlineChatEnabler.Id, InlineChatEnabler, 3 );
-AccessibleViewRegistry.register(( (new InlineChatAccessibleView())));
-AccessibleViewRegistry.register(( (new InlineChatAccessibilityHelp())));
+const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
+workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatNotebookContribution, LifecyclePhase.Restored);
+registerWorkbenchContribution2(InlineChatEnabler.Id, InlineChatEnabler, WorkbenchPhase.AfterRestored);
+AccessibleViewRegistry.register(( new InlineChatAccessibleView()));
+AccessibleViewRegistry.register(( new InlineChatAccessibilityHelp()));

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibilityHelp.d.ts

@@ -0,0 +1,10 @@
+import { ServicesAccessor } from "vscode/vscode/vs/editor/browser/editorExtensions";
+import { AccessibleViewType } from "vscode/vscode/vs/platform/accessibility/browser/accessibleView";
+import { IAccessibleViewImplentation } from "vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry";
+export declare class InlineChatAccessibilityHelp implements IAccessibleViewImplentation {
+    readonly priority = 106;
+    readonly name = "inlineChat";
+    readonly type = AccessibleViewType.Help;
+    readonly when: import("vscode/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression | undefined;
+    getProvider(accessor: ServicesAccessor): import("vscode/vscode/vs/platform/accessibility/browser/accessibleView").AccessibleContentProvider | undefined;
+}

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibilityHelp.js

@@ -1,15 +1,17 @@
+
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
+import { AccessibleViewType } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { getChatAccessibilityHelpProvider } from '../../chat/browser/actions/chatAccessibilityHelp.js';
-import { CONTEXT_CHAT_INPUT_HAS_FOCUS } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-chat-interactive-notebook-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { ChatContextKeys } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { CTX_INLINE_CHAT_RESPONSE_FOCUSED } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 
 class InlineChatAccessibilityHelp {
     constructor() {
         this.priority = 106;
         this.name = 'inlineChat';
-        this.type = "help" ;
-        this.when = ( ContextKeyExpr.or(CTX_INLINE_CHAT_RESPONSE_FOCUSED, CONTEXT_CHAT_INPUT_HAS_FOCUS));
+        this.type = AccessibleViewType.Help;
+        this.when = ( ContextKeyExpr.or(CTX_INLINE_CHAT_RESPONSE_FOCUSED, ChatContextKeys.inputHasFocus));
     }
     getProvider(accessor) {
         const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatAccessibleView.d.ts

@@ -0,0 +1,10 @@
+import { AccessibleViewType, AccessibleContentProvider } from "vscode/vscode/vs/platform/accessibility/browser/accessibleView";
+import { ServicesAccessor } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IAccessibleViewImplentation } from "vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry";
+export declare class InlineChatAccessibleView implements IAccessibleViewImplentation {
+    readonly priority = 100;
+    readonly name = "inlineChat";
+    readonly when: import("vscode/vscode/vs/platform/contextkey/common/contextkey").ContextKeyExpression | undefined;
+    readonly type = AccessibleViewType.View;
+    getProvider(accessor: ServicesAccessor): AccessibleContentProvider | undefined;
+}