@codingame/monaco-vscode-api 34.1.2 → 35.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostNewSessionFolderService.service.d.ts

@@ -0,0 +1,43 @@
+import { Event } from "../../../../../../base/common/event.js";
+import { URI } from "../../../../../../base/common/uri.js";
+export declare const IAgentHostNewSessionFolderService: import("../../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAgentHostNewSessionFolderService>;
+/**
+* Per-window store of the working directory a user picked for a not-yet-started
+* agent-host session, keyed by the chat session resource it was picked against
+* (including the untitled compose resource). An agent-host session's working
+* directory is an argument to session creation and is immutable afterwards, so
+* in a multi-root window the Folder picker chip records the choice here and the
+* working-directory resolution sites consult it before falling back to the
+* first workspace folder. Keying by the compose resource lets the choice
+* survive the untitled-to-real rebind that happens when the session is created.
+*/
+export interface IAgentHostNewSessionFolderService {
+    readonly _serviceBrand: undefined;
+    /**
+    * Fires with the session resource whose chosen folder changed.
+    */
+    readonly onDidChangeFolder: Event<URI>;
+    /**
+    * The folder chosen for the given session resource, or `undefined` if the
+    * user has not made an explicit choice.
+    */
+    getFolder(sessionResource: URI): URI | undefined;
+    /**
+    * Record the folder chosen for the given session resource. Fires
+    * {@link onDidChangeFolder} when the value actually changes.
+    */
+    setFolder(sessionResource: URI, folder: URI): void;
+    /**
+    * Forget any choice recorded for the given session resource.
+    */
+    clear(sessionResource: URI): void;
+    /**
+    * The most recently chosen folder in this window (across all sessions),
+    * provided it is still a current workspace folder, or `undefined` if the
+    * user has never made an explicit choice (or it is no longer in the
+    * workspace). Unlike {@link getFolder} this is a window-level "sticky"
+    * default that survives session disposal, so a new chat defaults to the
+    * folder the user last picked instead of resetting to the first folder.
+    */
+    getDefaultFolder(): URI | undefined;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostNewSessionFolderService.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../../../platform/instantiation/common/instantiation.js';
+
+const IAgentHostNewSessionFolderService = ( createDecorator("agentHostNewSessionFolderService"));
+
+export { IAgentHostNewSessionFolderService };

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostToolSetEnablementService.service.d.ts

@@ -0,0 +1,19 @@
+import { IObservable } from "../../../../../../base/common/observable.js";
+import { IToolEnablementState } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostToolSetEnablementService";
+export declare const IAgentHostToolSetEnablementService: import("../../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAgentHostToolSetEnablementService>;
+/**
+* Per-session-type tool / tool-set enablement for the Chat Customizations → Tools section,
+* persisted profile-wide. Settings are consumed by the agent host (the only target for Tools
+* customizations today).
+*/
+export interface IAgentHostToolSetEnablementService {
+    readonly _serviceBrand: undefined;
+    /** Observable enablement state for `sessionType`. Missing keys default to enabled. */
+    observe(sessionType: string): IObservable<IToolEnablementState>;
+    /** Current enablement state for `sessionType`. */
+    getState(sessionType: string): IToolEnablementState;
+    /** Enable/disable a whole tool set; clears any per-tool overrides for its members. */
+    setToolSetEnabled(sessionType: string, toolSetId: string, toolIds: readonly string[], enabled: boolean): void;
+    /** Enable/disable a single tool within `toolSetId`. */
+    setToolEnabled(sessionType: string, toolSetId: string, toolId: string, enabled: boolean): void;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostToolSetEnablementService.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../../../platform/instantiation/common/instantiation.js';
+
+const IAgentHostToolSetEnablementService = ( createDecorator("agentHostToolSetEnablementService"));
+
+export { IAgentHostToolSetEnablementService };

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

@@ -1,7 +1,7 @@
 import { URI } from "../../../../../base/common/uri.js";
 import { ThemeIcon } from "../../../../../base/common/themables.js";
-import { IProductService } from "../../../../../platform/product/common/productService.service.js";
 import { isAgentHostTarget } from "../../common/chatSessionsService.js";
+import { IChatRequestVariableEntry } from "../../common/attachments/chatVariableEntries.js";
 export declare enum AgentSessionProviders {
     Local = "local",
     Background = "copilotcli",
@@ -9,7 +9,9 @@ export declare enum AgentSessionProviders {
     Claude = "claude-code",
     Codex = "openai-codex",
     Growth = "copilot-growth",
-    AgentHostCopilot = "agent-host-copilotcli"
+    AgentHostCopilot = "agent-host-copilotcli",
+    AgentHostClaude = "agent-host-claude",
+    AgentHostCodex = "agent-host-codex"
 }
 /**
  * A session target is either a well-known {@link AgentSessionProviders} enum
@@ -22,16 +24,42 @@ export declare function isBuiltInAgentSessionProvider(provider: AgentSessionTarg
 export declare function getAgentSessionProvider(sessionResource: URI | string): AgentSessionProviders | undefined;
 export declare function getAgentSessionProviderName(provider: AgentSessionTarget): string;
 export declare function getAgentSessionProviderIcon(provider: AgentSessionTarget): ThemeIcon;
-/**
- * Returns the VS Code or VS Code Insiders icon depending on product quality.
- */
-export declare function getAgentHostIcon(productService: IProductService): ThemeIcon;
 export declare function isFirstPartyAgentSessionProvider(provider: AgentSessionTarget): boolean;
 /**
  * Re-exported from `common/chatSessionsService.ts` so existing browser-layer
  * callers keep working without changing imports.
  */
 export { isAgentHostTarget };
+/**
+ * Generic command used to delegate ("Continue in…") an existing conversation to
+ * a new agent host session. The conversation transcript travels as an
+ * attachment so the target agent can pick up the work.
+ *
+ * Both VS Code (the main window) and the Agents window surface agent host
+ * sessions, but they open sessions through different infrastructure. To avoid
+ * registering a command per session type, agent host delegation is funneled
+ * through this single command id. The Agents window registers a handler that
+ * creates the target session via its session management service; in the main
+ * window the chat action opens the session directly. The command id is
+ * intentionally a plain string constant so the `vs/sessions` layer can register
+ * a handler for it without importing chat browser internals.
+ */
+export declare const CHAT_DELEGATE_TO_AGENT_HOST_SESSION_COMMAND_ID = "workbench.action.chat.delegateToAgentHostSession";
+/**
+ * Arguments passed to {@link CHAT_DELEGATE_TO_AGENT_HOST_SESSION_COMMAND_ID}.
+ * The values are passed by reference within a single renderer, so rich types
+ * such as the attached context entries survive the command invocation.
+ */
+export interface IAgentHostDelegationRequest {
+    /** The target agent host session type, e.g. `agent-host-copilotcli`. */
+    readonly type: string;
+    /** Human readable name of the target session type. */
+    readonly displayName: string;
+    /** The user prompt to send to the new session. */
+    readonly prompt: string;
+    /** Attachments to include with the first request (e.g. the prior transcript). */
+    readonly attachedContext?: IChatRequestVariableEntry[];
+}
 export declare function getAgentCanContinueIn(provider: AgentSessionTarget): boolean;
 export declare function getAgentSessionProviderDescription(provider: AgentSessionTarget): string;
 export declare enum AgentSessionsViewerOrientation {

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

@@ -14,7 +14,7 @@ import '../../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../platform/theme/common/colors/searchColors.js';
 import { getChatSessionType } from '../../common/model/chatUri.js';
-export { isAgentHostTarget } from '../../common/chatSessionsService.js';
+import { isAgentHostTarget } from '../../common/chatSessionsService.js';
 
 var AgentSessionProviders;
 (function(AgentSessionProviders) {
@@ -25,6 +25,8 @@ var AgentSessionProviders;
     AgentSessionProviders["Codex"] = "openai-codex";
     AgentSessionProviders["Growth"] = "copilot-growth";
     AgentSessionProviders["AgentHostCopilot"] = "agent-host-copilotcli";
+    AgentSessionProviders["AgentHostClaude"] = "agent-host-claude";
+    AgentSessionProviders["AgentHostCodex"] = "agent-host-codex";
 })(AgentSessionProviders || (AgentSessionProviders = {}));
 function isBuiltInAgentSessionProvider(provider) {
     return provider === AgentSessionProviders.Local || provider === AgentSessionProviders.Background || provider === AgentSessionProviders.Cloud || provider === AgentSessionProviders.Claude;
@@ -38,6 +40,8 @@ function getAgentSessionProvider(sessionResource) {
     case AgentSessionProviders.Claude:
     case AgentSessionProviders.Codex:
     case AgentSessionProviders.AgentHostCopilot:
+    case AgentSessionProviders.AgentHostClaude:
+    case AgentSessionProviders.AgentHostCodex:
         return type;
     default:
         return undefined;
@@ -46,19 +50,21 @@ function getAgentSessionProvider(sessionResource) {
 function getAgentSessionProviderName(provider) {
     switch (provider) {
     case AgentSessionProviders.Local:
-        return localize(5296, "Local");
+        return localize(5524, "Local");
     case AgentSessionProviders.Background:
-        return localize(5297, "Copilot CLI");
+        return localize(5525, "Copilot CLI");
     case AgentSessionProviders.Cloud:
-        return localize(5298, "Cloud");
+        return localize(5526, "Cloud");
     case AgentSessionProviders.Claude:
+    case AgentSessionProviders.AgentHostClaude:
         return "Claude";
     case AgentSessionProviders.Codex:
+    case AgentSessionProviders.AgentHostCodex:
         return "Codex";
     case AgentSessionProviders.Growth:
         return "Growth";
     case AgentSessionProviders.AgentHostCopilot:
-        return localize(5299, "Copilot CLI [Agent Host]");
+        return localize(5527, "Copilot");
     default:
         return provider;
     }
@@ -72,13 +78,15 @@ function getAgentSessionProviderIcon(provider) {
     case AgentSessionProviders.Cloud:
         return Codicon.cloud;
     case AgentSessionProviders.Codex:
+    case AgentSessionProviders.AgentHostCodex:
         return Codicon.openai;
     case AgentSessionProviders.Claude:
+    case AgentSessionProviders.AgentHostClaude:
         return Codicon.claude;
     case AgentSessionProviders.Growth:
         return Codicon.lightbulb;
     case AgentSessionProviders.AgentHostCopilot:
-        return Codicon.vscodeInsiders;
+        return Codicon.vm;
     default:
         return Codicon.extensions;
     }
@@ -91,59 +99,63 @@ function isFirstPartyAgentSessionProvider(provider) {
     case AgentSessionProviders.AgentHostCopilot:
         return true;
     case AgentSessionProviders.Claude:
+    case AgentSessionProviders.AgentHostClaude:
     case AgentSessionProviders.Codex:
+    case AgentSessionProviders.AgentHostCodex:
     case AgentSessionProviders.Growth:
         return false;
     default:
         return false;
     }
 }
+const CHAT_DELEGATE_TO_AGENT_HOST_SESSION_COMMAND_ID = "workbench.action.chat.delegateToAgentHostSession";
 function getAgentCanContinueIn(provider) {
     switch (provider) {
     case AgentSessionProviders.Local:
     case AgentSessionProviders.Background:
     case AgentSessionProviders.Cloud:
+    case AgentSessionProviders.AgentHostCopilot:
         return true;
     case AgentSessionProviders.Claude:
     case AgentSessionProviders.Codex:
     case AgentSessionProviders.Growth:
-    case AgentSessionProviders.AgentHostCopilot:
         return false;
     default:
-        return false;
+        return isAgentHostTarget(provider);
     }
 }
 function getAgentSessionProviderDescription(provider) {
     switch (provider) {
     case AgentSessionProviders.Local:
         return localize(
-            5300,
+            5528,
             "Run tasks within VS Code chat. The agent iterates via chat and works interactively to implement changes on your main workspace."
         );
     case AgentSessionProviders.Background:
         return localize(
-            5301,
+            5529,
             "Delegate tasks to a background agent running locally on your machine. The agent iterates via chat and works asynchronously in a Git worktree to implement changes isolated from your main workspace using the GitHub Copilot CLI."
         );
     case AgentSessionProviders.Cloud:
         return localize(
-            5302,
+            5530,
             "Delegate tasks to the GitHub Copilot coding agent. The agent iterates via chat and works asynchronously in the cloud to implement changes and pull requests as needed."
         );
     case AgentSessionProviders.Claude:
+    case AgentSessionProviders.AgentHostClaude:
         return localize(
-            5303,
+            5531,
             "Delegate tasks to the Claude Agent SDK using the Claude models included in your GitHub Copilot subscription. The agent iterates via chat and works interactively to implement changes on your main workspace."
         );
     case AgentSessionProviders.Codex:
         return localize(
-            5304,
+            5532,
             "Opens a new Codex session in the editor. Codex sessions can be managed from the chat sessions view."
         );
     case AgentSessionProviders.Growth:
-        return localize(5305, "Learn about Copilot features.");
+        return localize(5533, "Learn about Copilot features.");
     case AgentSessionProviders.AgentHostCopilot:
-        return "Run a Copilot SDK agent in a dedicated process.";
+        return localize(5534, "Run a Copilot SDK agent in the local agent host process.");
     default:
         return "";
     }
@@ -163,23 +175,23 @@ registerColor("agentSessionReadIndicator.foreground", {
     light: ( transparent(foreground, 0.2)),
     hcDark: null,
     hcLight: null
-}, ( localize(5306, "Foreground color for the read indicator in an agent session.")));
+}, ( localize(5535, "Foreground color for the read indicator in an agent session.")));
 registerColor("agentSessionSelectedBadge.border", {
     dark: ( transparent(listActiveSelectionForeground, 0.3)),
     light: ( transparent(listActiveSelectionForeground, 0.3)),
     hcDark: foreground,
     hcLight: foreground
-}, ( localize(5307, "Border color for the badges in selected agent session items.")));
+}, ( localize(5536, "Border color for the badges in selected agent session items.")));
 registerColor("agentSessionSelectedUnfocusedBadge.border", {
     dark: ( transparent(foreground, 0.3)),
     light: ( transparent(foreground, 0.3)),
     hcDark: foreground,
     hcLight: foreground
 }, ( localize(
-    5308,
+    5537,
     "Border color for the badges in selected agent session items when the view is unfocused."
 )));
 const AGENT_SESSION_RENAME_ACTION_ID = "agentSession.rename";
 const AGENT_SESSION_DELETE_ACTION_ID = "agentSession.delete";
 
-export { AGENT_SESSION_DELETE_ACTION_ID, AGENT_SESSION_RENAME_ACTION_ID, AgentSessionProviders, AgentSessionsViewerOrientation, AgentSessionsViewerPosition, getAgentCanContinueIn, getAgentSessionProvider, getAgentSessionProviderDescription, getAgentSessionProviderIcon, getAgentSessionProviderName, isBuiltInAgentSessionProvider, isFirstPartyAgentSessionProvider };
+export { AGENT_SESSION_DELETE_ACTION_ID, AGENT_SESSION_RENAME_ACTION_ID, AgentSessionProviders, AgentSessionsViewerOrientation, AgentSessionsViewerPosition, CHAT_DELEGATE_TO_AGENT_HOST_SESSION_COMMAND_ID, getAgentCanContinueIn, getAgentSessionProvider, getAgentSessionProviderDescription, getAgentSessionProviderIcon, getAgentSessionProviderName, isAgentHostTarget, isBuiltInAgentSessionProvider, isFirstPartyAgentSessionProvider };

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel.js

@@ -105,7 +105,7 @@ function isMarshalledAgentSessionContext(thing) {
     return false;
 }
 const agentSessionsOutputChannelId = "agentSessionsOutput";
-const agentSessionsOutputChannelLabel = ( localize(5373, "Agent Sessions"));
+const agentSessionsOutputChannelLabel = ( localize(5603, "Agent Sessions"));
 function statusToString(status) {
     switch (status) {
     case ChatSessionStatus.Failed:

package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationItemsModel.service.d.ts

@@ -1,6 +1,6 @@
 import { IObservable } from "../../../../../base/common/observable.js";
 import { ItemsModelSection } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationItemsModel";
-import { IAICustomizationListItem, IAICustomizationItemSource } from "./aiCustomizationItemSource.js";
+import { IAICustomizationListItem, IAICustomizationItemSource } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationItemSource";
 export declare const IAICustomizationItemsModel: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAICustomizationItemsModel>;
 /**
 * Single source of truth for the items rendered by the AI Customizations

package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.js

@@ -28,14 +28,14 @@ const AICustomizationManagementCommands = {
     OpenMarketplace: "aiCustomization.openMarketplace",
     GenerateDebugReport: "aiCustomization.generateDebugReport"
 };
-const CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_EDITOR = ( new RawContextKey("aiCustomizationManagementEditorFocused", false, ( localize(5613, "Whether the Agent Customizations editor is focused"))));
+const CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_EDITOR = ( new RawContextKey("aiCustomizationManagementEditorFocused", false, ( localize(5855, "Whether the Agent Customizations editor is focused"))));
 const CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_SECTION = ( new RawContextKey(
     "chatCustomizationSection",
     AICustomizationManagementSection.Agents,
-    ( localize(5614, "The currently selected section in the Agent Customizations editor"))
+    ( localize(5856, "The currently selected section in the Agent Customizations editor"))
 ));
 const CONTEXT_AI_CUSTOMIZATION_MANAGEMENT_HARNESS = ( new RawContextKey("chatCustomizationSessionType", "", ( localize(
-    5615,
+    5857,
     "The active harness (session type) in the Agent Customizations editor"
 ))));
 MenuId.for("AICustomizationManagementEditorTitle");

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatScreenshotContext.js

@@ -5,7 +5,7 @@ const ScreenshotVariableId = "screenshot-focused-window";
 function convertBufferToScreenshotVariable(buffer) {
     return {
         id: ScreenshotVariableId,
-        name: ( localize(5864, "Screenshot")),
+        name: ( localize(6230, "Screenshot")),
         value: buffer.buffer,
         kind: "image"
     };

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

@@ -1,15 +1,15 @@
 import { IDynamicVariable } from "../../common/attachments/chatVariables.js";
 import { IChatVariablesService } from "../../common/attachments/chatVariables.service.js";
-import { IToolAndToolSetEnablementMap } from "../../common/tools/languageModelToolsService.js";
+import { ToolAndToolSetEnablementMap } from "../../common/tools/languageModelToolsService.js";
 import { IChatWidget } from "../chat.js";
 import { IChatWidgetService } from "../chat.service.js";
 import { URI } from "../../../../../base/common/uri.js";
 export declare function getDynamicVariablesForWidget(widget: IChatWidget): ReadonlyArray<IDynamicVariable>;
-export declare function getSelectedToolAndToolSetsForWidget(widget: IChatWidget): IToolAndToolSetEnablementMap;
+export declare function getSelectedToolAndToolSetsForWidget(widget: IChatWidget): ToolAndToolSetEnablementMap;
 export declare class ChatVariablesService implements IChatVariablesService {
     private readonly chatWidgetService;
     _serviceBrand: undefined;
     constructor(chatWidgetService: IChatWidgetService);
     getDynamicVariables(sessionResource: URI): ReadonlyArray<IDynamicVariable>;
-    getSelectedToolAndToolSets(sessionResource: URI): IToolAndToolSetEnablementMap;
+    getSelectedToolAndToolSets(sessionResource: URI): ToolAndToolSetEnablementMap;
 }

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatVariables.js

@@ -1,5 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { ToolAndToolSetEnablementMap } from '../../common/tools/languageModelToolsService.js';
 import { IChatWidgetService } from '../chat.service.js';
 import { ChatDynamicVariableModel } from './chatDynamicVariables.js';
 import { Range } from '../../../../../editor/common/core/range.js';
@@ -66,7 +67,7 @@ let ChatVariablesService = class ChatVariablesService {
     getSelectedToolAndToolSets(sessionResource) {
         const widget = this.chatWidgetService.getWidgetBySessionResource(sessionResource);
         if (!widget) {
-            return ( new Map());
+            return ToolAndToolSetEnablementMap.fromEntries([]);
         }
         return getSelectedToolAndToolSetsForWidget(widget);
     }

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

@@ -1,5 +1,6 @@
 import { IMouseWheelEvent } from "../../../../base/browser/mouseEvent.js";
 import { Event } from "../../../../base/common/event.js";
+import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
 import { ICodeEditor } from "../../../../editor/browser/editorBrowser.js";
 import { Selection } from "../../../../editor/common/core/selection.js";
@@ -28,6 +29,22 @@ export interface IWorkspacePickerItem {
     readonly label: string;
     readonly isFolder: boolean;
 }
+/**
+ * Narrow contract for a workspace picker hosted as a chip in
+ * {@link ChatInputPart}'s primary toolbar. Implementers own all selection
+ * state; the chip is purely a rendering / interaction surface.
+ *
+ * Used by the automations dialog so a single picker instance can drive both
+ * the form-row trigger and a toolbar chip without duplicating state.
+ */
+export interface IChatInputWorkspacePicker {
+    /**
+     * Renders a trigger chip into the given container. The returned disposable
+     * removes only this trigger; sibling triggers (e.g. the form-row trigger
+     * in the automations dialog) keep working.
+     */
+    renderTrigger(container: HTMLElement): IDisposable;
+}
 /**
  * Delegate interface for the workspace picker.
  * Allows consumers to get and set the target workspace for chat submissions in empty window contexts.
@@ -91,6 +108,14 @@ export interface ISessionTypePickerDelegate {
      * Used to gate cloud delegation which requires a GitHub repository.
      */
     hasGitRepository?(): boolean;
+    /**
+     * Optional visibility filter for the session-type dropdown. When
+     * provided, the picker hides any session type for which this returns
+     * `false`. Use to scope the dropdown to a host-specific subset (e.g.
+     * the automations dialog, which only supports a handful of session
+     * types). When omitted, every contributed session type is shown.
+     */
+    isSessionTypeVisible?(type: AgentSessionTarget): boolean;
 }
 export declare const ChatViewPaneTarget: unique symbol;
 export interface IQuickChatOpenOptions {
@@ -135,6 +160,7 @@ export interface IChatListItemRendererOptions {
     readonly renderTextEditsAsSummary?: (uri: URI) => boolean;
     readonly referencesExpandedWhenEmptyResponse?: boolean | ((mode: ChatModeKind) => boolean);
     readonly progressMessageAtBottomOfResponse?: boolean | ((mode: ChatModeKind) => boolean);
+    readonly contentHorizontalPadding?: number;
 }
 export interface IChatWidgetViewOptions {
     autoScroll?: boolean | ((mode: ChatModeKind) => boolean);
@@ -217,6 +243,11 @@ export interface IChatAcceptInputOptions {
      * If Steering, also sets yieldRequested on any active request to signal it should wrap up.
      */
     queue?: ChatRequestQueueKind;
+    /**
+     * Cancels the current request before sending this message instead of falling back to queueing.
+     */
+    cancelCurrentRequest?: boolean;
+    preserveFocus?: boolean;
 }
 export interface IChatWidgetViewModelChangeEvent {
     readonly previousSessionResource: URI | undefined;
@@ -326,7 +357,7 @@ export interface IChatWidget {
     getLastFocusedFileTreeForResponse(response: IChatResponseViewModel): IChatFileTreeInfo | undefined;
     clear(): Promise<void>;
     getViewState(): IChatModelInputState | undefined;
-    lockToCodingAgent(name: string, displayName: string, agentId?: string): void;
+    lockToCodingAgent(name: string, displayName: string, agentId?: string, agentHostProviderId?: string): void;
     unlockFromCodingAgent(): void;
     handleDelegationExitIfNeeded(sourceAgent: Pick<IChatAgentData, "id" | "name"> | undefined, targetAgent: IChatAgentData | undefined): Promise<void>;
     executeHandoff(handoff: IHandOff, agentId?: string): Promise<void>;

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.js

@@ -17,16 +17,16 @@ import { autorun } from '../../../../../base/common/observableInternal/reactions
 import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
 import { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.js';
 
-const ctxIsGlobalEditingSession = ( new RawContextKey("chatEdits.isGlobalEditingSession", undefined, ( localize(6499, "The current editor is part of the global edit session"))));
-const ctxHasEditorModification = ( new RawContextKey("chatEdits.hasEditorModifications", undefined, ( localize(6500, "The current editor contains chat modifications"))));
-const ctxIsCurrentlyBeingModified = ( new RawContextKey("chatEdits.isCurrentlyBeingModified", undefined, ( localize(6501, "The current editor is currently being modified"))));
-const ctxReviewModeEnabled = ( new RawContextKey("chatEdits.isReviewModeEnabled", true, ( localize(6502, "Review mode for chat changes is enabled"))));
+const ctxIsGlobalEditingSession = ( new RawContextKey("chatEdits.isGlobalEditingSession", undefined, ( localize(6990, "The current editor is part of the global edit session"))));
+const ctxHasEditorModification = ( new RawContextKey("chatEdits.hasEditorModifications", undefined, ( localize(6991, "The current editor contains chat modifications"))));
+const ctxIsCurrentlyBeingModified = ( new RawContextKey("chatEdits.isCurrentlyBeingModified", undefined, ( localize(6992, "The current editor is currently being modified"))));
+const ctxReviewModeEnabled = ( new RawContextKey("chatEdits.isReviewModeEnabled", true, ( localize(6993, "Review mode for chat changes is enabled"))));
 const ctxHasRequestInProgress = ( new RawContextKey("chatEdits.isRequestInProgress", false, ( localize(
-    6503,
+    6994,
     "The current editor shows a file from an edit session which is still in progress"
 ))));
-const ctxRequestCount = ( new RawContextKey("chatEdits.requestCount", 0, ( localize(6504, "The number of turns the editing session in this editor has"))));
-const ctxCursorInChangeRange = ( new RawContextKey("chatEdits.cursorInChangeRange", false, ( localize(6505, "The cursor is inside a change range made by chat editing."))));
+const ctxRequestCount = ( new RawContextKey("chatEdits.requestCount", 0, ( localize(6995, "The number of turns the editing session in this editor has"))));
+const ctxCursorInChangeRange = ( new RawContextKey("chatEdits.cursorInChangeRange", false, ( localize(6996, "The cursor is inside a change range made by chat editing."))));
 let ChatEditingEditorContextKeys = class ChatEditingEditorContextKeys {
     static {
         this.ID = "chat.edits.editorContextKeys";

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

@@ -9,5 +9,7 @@ export interface IChatImageCarouselService {
     * @param resource The URI of the clicked image to start the carousel at.
     * @param data Optional raw image data (e.g. for input attachment images that are Uint8Arrays).
     */
-    openCarouselAtResource(resource: URI, data?: Uint8Array): Promise<void>;
+    openCarouselAtResource(resource: URI, data?: Uint8Array, options?: {
+        readonly preferCurrentInput?: boolean;
+    }): Promise<void>;
 }

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

@@ -15,10 +15,9 @@ export declare function resizeImage(data: Uint8Array | string, mimeType?: string
  * @param cacheKey A stable identifier for the source image (e.g. the attachment id).
  * @param data The image bytes.
  * @param maxSize The maximum width or height of the thumbnail, in pixels.
- * @param targetWindow The window whose document is used to decode and resize the image.
  * @returns A promise that resolves to a {@link Blob} of the thumbnail, or `undefined` on failure.
  */
-export declare function getOrCreateImageThumbnail(cacheKey: string, data: Uint8Array, maxSize: number, targetWindow: Window): Promise<Blob | undefined>;
+export declare function getOrCreateImageThumbnail(cacheKey: string, data: Uint8Array, maxSize: number): Promise<Blob | undefined>;
 export declare function convertStringToUInt8Array(data: string): Uint8Array;
 export declare function convertUint8ArrayToString(data: Uint8Array): string;
 export declare function createFileForMedia(fileService: IFileService, imagesFolder: URI, dataTransfer: Uint8Array, mimeType: string): Promise<URI | undefined>;

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

@@ -66,10 +66,10 @@ async function resizeImage(data, mimeType) {
         };
     }));
 }
-function createImageThumbnail(data, maxSize, targetWindow) {
+function createImageThumbnail(data, maxSize) {
     return ( new Promise(resolve => {
         const blob = ( new Blob([data]));
-        const img = targetWindow.document.createElement("img");
+        const img = createElement("img");
         const url = URL.createObjectURL(blob);
         img.src = url;
         img.onload = () => {
@@ -81,7 +81,7 @@ function createImageThumbnail(data, maxSize, targetWindow) {
             const scaleFactor = Math.min(1, maxSize / Math.max(width, height));
             const targetWidth = Math.max(1, Math.round(width * scaleFactor));
             const targetHeight = Math.max(1, Math.round(height * scaleFactor));
-            const canvas = targetWindow.document.createElement("canvas");
+            const canvas = createElement("canvas");
             canvas.width = targetWidth;
             canvas.height = targetHeight;
             const ctx = canvas.getContext("2d");
@@ -101,16 +101,13 @@ function createImageThumbnail(data, maxSize, targetWindow) {
 }
 const thumbnailCache = ( new LRUCache(50));
 const THUMBNAIL_DECODE_TIMEOUT_MS = 10_000;
-function getOrCreateImageThumbnail(cacheKey, data, maxSize, targetWindow) {
+function getOrCreateImageThumbnail(cacheKey, data, maxSize) {
     const key = `${cacheKey}:${maxSize}:${data.byteLength}`;
     const cached = thumbnailCache.get(key);
     if (cached) {
         return cached;
     }
-    const thumbnail = raceTimeout(
-        createImageThumbnail(data, maxSize, targetWindow),
-        THUMBNAIL_DECODE_TIMEOUT_MS
-    ).then(blob => {
+    const thumbnail = raceTimeout(createImageThumbnail(data, maxSize), THUMBNAIL_DECODE_TIMEOUT_MS).then(blob => {
         if (!blob && thumbnailCache.peek(key) === thumbnail) {
             thumbnailCache.delete(key);
         }

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

@@ -0,0 +1,21 @@
+import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { IObservable } from "../../../../base/common/observable.js";
+import { URI } from "../../../../base/common/uri.js";
+import { IEditSessionEntryDiff } from "../common/editing/chatEditingService.js";
+import { IChatResponseFileChangesProvider } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/browser/chatResponseFileChangesService";
+export declare const IChatResponseFileChangesService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatResponseFileChangesService>;
+export interface IChatResponseFileChangesService {
+    readonly _serviceBrand: undefined;
+    /**
+    * Registers a provider for a chat session type (as returned by
+    * {@link getChatSessionType}). At most one provider may be registered per
+    * session type.
+    */
+    registerProvider(chatSessionType: string, provider: IChatResponseFileChangesProvider): IDisposable;
+    /**
+    * Returns the per-request change diffs for `sessionResource` from the
+    * provider registered for its session type, or `undefined` when there is
+    * no provider or the provider cannot supply changes for this request.
+    */
+    getChangesForRequest(sessionResource: URI, requestId: string): IObservable<readonly IEditSessionEntryDiff[]> | undefined;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/chatResponseFileChangesService.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+const IChatResponseFileChangesService = ( createDecorator("chatResponseFileChangesService"));
+
+export { IChatResponseFileChangesService };

package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionDescription.js

@@ -36,7 +36,7 @@ function getInProgressSessionDescription(chatModel) {
                 const confirmationTitle = state.confirmationMessages?.title;
                 const titleMessage = confirmationTitle && (typeof confirmationTitle === "string" ? confirmationTitle : confirmationTitle.value);
                 const descriptionValue = typeof description === "string" ? description : description.value;
-                description = titleMessage ?? ( localize(6674, "Waiting for confirmation: {0}", descriptionValue));
+                description = titleMessage ?? ( localize(7177, "Waiting for confirmation: {0}", descriptionValue));
             }
         } else if (part.kind === "toolInvocationSerialized") {
             if (IChatToolInvocation.isEffectivelyHidden(part)) {
@@ -46,7 +46,7 @@ function getInProgressSessionDescription(chatModel) {
         } else if (part.kind === "progressMessage") {
             description = part.content;
         } else if (part.kind === "thinking") {
-            description = ( localize(6675, "Thinking..."));
+            description = ( localize(7178, "Thinking..."));
         }
     }
     return description ? renderAsPlaintext(description, {