@codingame/monaco-vscode-katex-common 30.0.1 → 31.0.1

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

@@ -1,19 +1,18 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { $ as $$1, clearNode, h, append, addStandardDisposableListener, EventType, DisposableResizeObserver, setVisibility, isKeyboardEvent, getActiveElement, getWindow, addDisposableListener, getTotalWidth } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $ as $$1, clearNode, h, hide, append, addStandardDisposableListener, EventType, DisposableResizeObserver, setVisibility, isKeyboardEvent, getActiveElement, getWindow, show, addDisposableListener, getTotalWidth } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { DEFAULT_FONT_FAMILY } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/fonts';
 import { hasModifierKeys } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/keyboardEvent';
 import { BaseActionViewItem, ActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { status } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { ButtonWithIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { createInstantHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
-import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { RunOnceScheduler, DeferredPromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
@@ -62,12 +61,12 @@ import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/t
 import { ISharedWebContentExtractorService } from '@codingame/monaco-vscode-api/vscode/vs/platform/webContentExtractor/common/webContentExtractor.service';
 import { WorkbenchState } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+import { ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { ResourceLabels } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/labels';
-import { IWorkbenchAssignmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { SIDE_GROUP, ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -76,13 +75,12 @@ import { AccessibilityCommandId } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { getSimpleEditorOptions, getSimpleCodeEditorWidgetOptions, setupSimpleEditorSelectionStyling } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { InlineChatConfigKeys } from '../../../../inlineChat/common/inlineChat.js';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
-import { ChatRequestVariableSet, isImageVariableEntry, isStringVariableEntry, MAX_IMAGES_PER_REQUEST, OmittedState, isNotebookOutputVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isElementVariableEntry, isPasteVariableEntry, isSCMHistoryItemVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemChangeRangeVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
+import { ChatRequestVariableSet, isImageVariableEntry, isStringVariableEntry, getImageAttachmentLimit, OmittedState, isNotebookOutputVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isElementVariableEntry, isPasteVariableEntry, isSCMHistoryItemVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemChangeRangeVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 import { getModeNameForTelemetry, ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
-import { agentOptionId, localChatSessionType, isIChatSessionFileChange2 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { localChatSessionType, isIChatSessionFileChange2 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
-import { ChatAgentLocation, ChatModeKind, ChatPermissionLevel, validateChatMode, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatAgentLocation, ChatModeKind, ChatConfiguration, ChatPermissionLevel, isChatPermissionLevel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { ILanguageModelChatMetadata } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
@@ -101,12 +99,13 @@ import { ToolSetOrToolItemAttachmentWidget, NotebookCellOutputChatAttachmentWidg
 import { ChatImplicitContexts } from '../../attachments/chatImplicitContext.js';
 import { ImplicitContextAttachmentWidget } from '../../attachments/implicitContextAttachment.js';
 import { isIChatResourceViewContext, isIChatViewViewContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
-import { ChatEditingShowChangesAction, ViewPreviousEditsAction, ViewAllSessionChangesAction } from '../../chatEditing/chatEditingActions.js';
+import { ChatEditingShowChangesAction, ViewPreviousEditsAction } from '../../chatEditing/chatEditingActions.js';
 import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageUtils';
 import { ChatSessionPickerActionItem } from '../../chatSessions/chatSessionPickerActionItem.js';
-import { SearchableOptionPickerActionItem } from '../../chatSessions/searchableOptionPickerActionItem.js';
 import { IChatContextService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service';
+import { ChatPlanReviewPart } from '../chatContentParts/chatPlanReviewPart.js';
 import { ChatQuestionCarouselPart } from '../chatContentParts/chatQuestionCarouselPart.js';
+import { ChatToolConfirmationCarouselPart } from '../chatContentParts/toolInvocationParts/chatToolConfirmationCarouselPart.js';
 import { CollapsibleListPool } from '../chatContentParts/chatReferencesContentPart.js';
 import { ChatTodoListWidget } from '../chatContentParts/chatTodoListWidget.js';
 import { ChatArtifactsWidget } from '../chatArtifactsWidget.js';
@@ -115,13 +114,13 @@ import { ChatFollowups } from './chatFollowups.js';
 import { ChatInputPartWidgetController } from './chatInputPartWidgets.js';
 import { ChatSelectedTools } from './chatSelectedTools.js';
 import { DelegationSessionPickerActionItem } from './delegationSessionPickerActionItem.js';
+import { ModelPickerActionItem } from './modelPickerActionItem.js';
 import { ModePickerActionItem } from './modePickerActionItem.js';
 import { PermissionPickerActionItem } from './permissionPickerActionItem.js';
 import { SessionTypePickerActionItem } from './sessionTargetPickerActionItem.js';
 import { WorkspacePickerActionItem } from './workspacePickerActionItem.js';
 import { ChatContextUsageWidget } from '../../widgetHosts/viewPane/chatContextUsageWidget.js';
 import { Target } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
-import { EnhancedModelPickerActionItem } from './modelPickerActionItem2.js';
 import { findLast } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arraysFind';
 import { ConfigureToolsAction } from '../../actions/chatToolActions.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -285,15 +284,14 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         storageService,
         agentService,
         sharedWebExtracterService,
-        experimentService,
         entitlementService,
         chatModeService,
         toolService,
-        chatService,
         chatSessionsService,
         chatContextService,
         agentSessionsService,
         workspaceContextService,
+        scmService,
         layoutService,
         viewDescriptorService,
         _chatAttachmentWidgetRegistry
@@ -317,15 +315,14 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.storageService = storageService;
         this.agentService = agentService;
         this.sharedWebExtracterService = sharedWebExtracterService;
-        this.experimentService = experimentService;
         this.entitlementService = entitlementService;
         this.chatModeService = chatModeService;
         this.toolService = toolService;
-        this.chatService = chatService;
         this.chatSessionsService = chatSessionsService;
         this.chatContextService = chatContextService;
         this.agentSessionsService = agentSessionsService;
         this.workspaceContextService = workspaceContextService;
+        this.scmService = scmService;
         this.layoutService = layoutService;
         this.viewDescriptorService = viewDescriptorService;
         this._chatAttachmentWidgetRegistry = _chatAttachmentWidgetRegistry;
@@ -336,6 +333,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._chatQuestionCarouselWidgets = this._register(( new DisposableMap()));
         this._questionCarouselResponseIds = ( new Map());
         this._questionCarouselSessionResources = ( new Map());
+        this._chatPlanReviewWidgets = this._register(( new DisposableMap()));
+        this._planReviewResponseIds = ( new Map());
+        this._planReviewSessionResources = ( new Map());
+        this._chatToolConfirmationCarousels = this._register(( new DisposableMap()));
         this._chatEditingTodosDisposables = this._register(( new DisposableStore()));
         this._onDidLoadInputState = this._register(( new Emitter()));
         this.onDidLoadInputState = this._onDidLoadInputState.event;
@@ -392,7 +393,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             onDidChangeVisibility: this._onDidChangeVisibility.event
         }));
         this._currentModeObservable = observableValue("currentMode", this.options.defaultMode ?? ChatMode.Agent);
-        this._currentPermissionLevel = observableValue("permissionLevel", ChatPermissionLevel.Default);
+        this._currentPermissionLevel = observableValue("permissionLevel", this.getDefaultPermissionLevel());
         this._register(this.editorService.onDidActiveEditorChange(() => {
             this._indexOfLastOpenedContext = -1;
             this.refreshChatSessionPickers();
@@ -406,9 +407,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._register(this.chatSessionsService.onDidChangeOptionGroups(chatSessionType => {
             const sessionResource = this._widget?.viewModel?.model.sessionResource;
             if (sessionResource) {
-                const ctx = this.chatService.getChatSessionFromInternalUri(sessionResource);
                 const delegateSessionType = this.options.sessionTypePickerDelegate?.getActiveSessionProvider?.();
-                if (ctx && (getChatSessionType(ctx.chatSessionResource) === chatSessionType) || delegateSessionType === chatSessionType) {
+                if (getChatSessionType(sessionResource) === chatSessionType || delegateSessionType === chatSessionType) {
                     this.refreshChatSessionPickers();
                 }
             }
@@ -416,10 +416,11 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (this.options.sessionTypePickerDelegate?.onDidChangeActiveSessionProvider) {
             this._register(
                 this.options.sessionTypePickerDelegate.onDidChangeActiveSessionProvider(async newSessionType => {
-                    this.computeVisibleOptionGroups();
+                    this.getVisibleOptionGroupsModeAndUpdateContextKeys(this.getCurrentSessionResource());
                     this.agentSessionTypeKey.set(newSessionType);
                     this.chatSessionSupportsDelegationKey.set(this.chatSessionsService.supportsDelegationForSessionType(newSessionType));
                     this.updateWidgetLockStateFromSessionType(newSessionType);
+                    this.checkModeInSessionPool(newSessionType);
                     this.refreshChatSessionPickers();
                 })
             );
@@ -443,6 +444,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.chatModeNameKey = ChatContextKeys.chatModeName.bindTo(contextKeyService);
         this.chatModelIdKey = ChatContextKeys.chatModelId.bindTo(contextKeyService);
         this.permissionLevelKey = ChatContextKeys.chatPermissionLevel.bindTo(contextKeyService);
+        this.permissionLevelKey.set(this._currentPermissionLevel.get());
         this.withinEditSessionKey = ChatContextKeys.withinEditSessionDiff.bindTo(contextKeyService);
         this.filePartOfEditSessionKey = ChatContextKeys.filePartOfEditSession.bindTo(contextKeyService);
         this.chatSessionHasOptions = ChatContextKeys.chatSessionHasModels.bindTo(contextKeyService);
@@ -465,6 +467,14 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         );
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             const newOptions = {};
+            if (e.affectsConfiguration(ChatConfiguration.GlobalAutoApprove)) {
+                this.setPermissionLevel(this._currentPermissionLevel.get());
+            }
+            if (e.affectsConfiguration(ChatConfiguration.DefaultPermissionLevel)) {
+                if (this._chatSessionIsEmpty) {
+                    this.setPermissionLevel(this.getDefaultPermissionLevel());
+                }
+            }
             if (e.affectsConfiguration(AccessibilityVerbositySettingId.Chat)) {
                 newOptions.ariaLabel = this._getAriaLabel();
             }
@@ -528,26 +538,6 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 this.switchModelByQualifiedName(models);
             }
         }));
-        this._register(autorun(r => {
-            const mode = this._currentModeObservable.read(r);
-            const modeName = mode.name.read(r);
-            const sessionResource = this._widget?.viewModel?.model.sessionResource;
-            if (sessionResource) {
-                const ctx = this.chatService.getChatSessionFromInternalUri(sessionResource);
-                if (ctx) {
-                    let needsUpdate = true;
-                    const agentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, agentOptionId);
-                    if (typeof agentOption !== "undefined") {
-                        const agentId = (typeof agentOption === "string" ? agentOption : agentOption.id) || ChatMode.Agent.id;
-                        const isDefaultAgent = agentId === ChatMode.Agent.id;
-                        needsUpdate = isDefaultAgent ? mode.id !== ChatMode.Agent.id : mode.label.read(undefined) !== agentId;
-                    }
-                    if (needsUpdate) {
-                        this.chatSessionsService.updateSessionOptions(ctx.chatSessionResource, ( new Map([[agentOptionId, mode.isBuiltin ? "" : modeName]])));
-                    }
-                }
-            }
-        }));
         this.validateCurrentChatMode();
     }
     setImplicitContextEnablement() {
@@ -651,11 +641,22 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.permissionWidget?.show();
     }
     setPermissionLevel(level) {
+        level = this.getPermittedPermissionLevel(level);
         this._currentPermissionLevel.set(level, undefined);
         this.permissionLevelKey.set(level);
         this.permissionWidget?.refresh();
         this._syncInputStateToModel();
     }
+    getDefaultPermissionLevel() {
+        const level = this.configurationService.getValue(ChatConfiguration.DefaultPermissionLevel);
+        return isChatPermissionLevel(level) ? level : ChatPermissionLevel.Default;
+    }
+    getPermittedPermissionLevel(level) {
+        if (this.configurationService.inspect(ChatConfiguration.GlobalAutoApprove).policyValue === false && level !== ChatPermissionLevel.Default) {
+            return ChatPermissionLevel.Default;
+        }
+        return level;
+    }
     openSessionTargetPicker() {
         this.sessionTargetWidget?.show();
     }
@@ -669,21 +670,18 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     createChatSessionPickerWidgets(action, pickerOptions) {
         this._lastSessionPickerAction = action;
         this._lastSessionPickerOptions = pickerOptions;
-        const result = this.computeVisibleOptionGroups();
-        if (!result) {
+        const sessionResource = this.getCurrentSessionResource();
+        const visibleOptionGroups = this.getVisibleOptionGroupsModeAndUpdateContextKeys(sessionResource);
+        if (!visibleOptionGroups.length) {
+            return [];
+        }
+        const effectiveSessionType = this.getEffectiveSessionType(sessionResource);
+        if (!effectiveSessionType) {
             return [];
         }
-        const {
-            visibleGroupIds,
-            optionGroups,
-            effectiveSessionType
-        } = result;
         this.chatSessionPickerWidgets.clearAndDisposeAll();
         const widgets = [];
-        for (const optionGroup of optionGroups) {
-            if (!( visibleGroupIds.has(optionGroup.id))) {
-                continue;
-            }
+        for (const optionGroup of visibleOptionGroups) {
             const initialItem = this.getCurrentOptionForGroup(optionGroup.id);
             const initialState = {
                 group: optionGroup,
@@ -696,9 +694,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     this.updateOptionContextKey(optionGroup.id, option.id);
                     this.getOrCreateOptionEmitter(optionGroup.id).fire(option);
                     const sessionResource = this._widget?.viewModel?.model.sessionResource;
-                    const currentCtx = sessionResource ? this.chatService.getChatSessionFromInternalUri(sessionResource) : undefined;
-                    if (currentCtx) {
-                        this.chatSessionsService.setSessionOption(currentCtx.chatSessionResource, optionGroup.id, option);
+                    if (sessionResource) {
+                        this.chatSessionsService.setSessionOption(sessionResource, optionGroup.id, option);
                     }
                     this.refreshChatSessionPickers();
                 },
@@ -711,7 +708,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 }
             };
             const widget = this.instantiationService.createInstance(
-                optionGroup.searchable ? SearchableOptionPickerActionItem : ChatSessionPickerActionItem,
+                ChatSessionPickerActionItem,
                 action,
                 initialState,
                 itemDelegate,
@@ -732,6 +729,16 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._chatSessionIsEmpty = chatSessionIsEmpty;
         if (chatSessionIsEmpty) {
             this._setEmptyModelState();
+            this._modelSyncDisposables.add(this.configurationService.onDidChangeConfiguration(e => {
+                if (this._chatSessionIsEmpty && e.affectsConfiguration(ChatConfiguration.DefaultNewSessionMode)) {
+                    this._setEmptyModelState();
+                }
+            }));
+            this._modelSyncDisposables.add(this.chatModeService.onDidChangeChatModes(() => {
+                if (this._chatSessionIsEmpty) {
+                    this._setEmptyModelState();
+                }
+            }));
         }
         this._modelSyncDisposables.add(autorun(reader => {
             let state = model.state.read(reader);
@@ -742,24 +749,26 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }));
     }
     _setEmptyModelState() {
-        const storageKey = this.getDefaultModeExperimentStorageKey();
-        const hasSetDefaultMode = this.storageService.getBoolean(storageKey, StorageScope.WORKSPACE, false);
-        if (!hasSetDefaultMode) {
-            const isAnonymous = this.entitlementService.anonymous;
-            this.experimentService.getTreatment("chat.defaultMode").then((defaultModeTreatment => {
-                if (isAnonymous) {
-                    defaultModeTreatment = ChatModeKind.Agent;
-                }
-                if (typeof defaultModeTreatment === "string") {
-                    this.storageService.store(storageKey, true, StorageScope.WORKSPACE, StorageTarget.MACHINE);
-                    const defaultMode = validateChatMode(defaultModeTreatment);
-                    if (defaultMode) {
-                        this.logService.trace(`Applying default mode from experiment: ${defaultMode}`);
-                        this.setChatMode(defaultMode, false);
-                        this.checkModelSupported();
-                    }
+        this.setPermissionLevel(this.getDefaultPermissionLevel());
+        if (this.entitlementService.anonymous) {
+            this.setChatMode(ChatModeKind.Agent, false);
+            this.checkModelSupported();
+            return;
+        }
+        const rawDefaultMode = this.configurationService.getValue(ChatConfiguration.DefaultNewSessionMode);
+        if (typeof rawDefaultMode === "string") {
+            const defaultMode = rawDefaultMode.trim();
+            if (defaultMode) {
+                const defaultModeLower = defaultMode.toLowerCase();
+                const resolved = this.chatModeService.findModeById(defaultMode) ?? this.chatModeService.findModeByName(defaultMode) ?? this.chatModeService.getModes().custom.find(m => m.name.get().toLowerCase() === defaultModeLower);
+                if (resolved) {
+                    this.logService.trace(
+                        `[ChatInputPart] Applying default mode from setting: ${defaultMode} -> ${resolved.id}`
+                    );
+                    this.setChatMode(resolved.id, false);
+                    this.checkModelSupported();
                 }
-            }));
+            }
         }
     }
     _syncFromModel(state) {
@@ -808,7 +817,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 }
             }
             if (!this.configurationService.getValue(ChatConfiguration.GlobalAutoApprove)) {
-                const targetLevel = state?.permissionLevel ?? ChatPermissionLevel.Default;
+                const targetLevel = this.getPermittedPermissionLevel(state?.permissionLevel ?? ChatPermissionLevel.Default);
                 if (this._currentPermissionLevel.get() !== targetLevel) {
                     this._currentPermissionLevel.set(targetLevel, undefined);
                     this.permissionLevelKey.set(targetLevel);
@@ -918,8 +927,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             return delegateSessionType;
         }
         const sessionResource = this._widget?.viewModel?.model.sessionResource;
-        const ctx = sessionResource ? this.chatService.getChatSessionFromInternalUri(sessionResource) : undefined;
-        return ctx ? getChatSessionType(ctx.chatSessionResource) : undefined;
+        return sessionResource ? getChatSessionType(sessionResource) : undefined;
     }
     hasModelsTargetingSessionType() {
         return hasModelsTargetingSession(this.getAllMergedModels(), this.getCurrentSessionType());
@@ -933,6 +941,31 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this.setCurrentLanguageModelToDefault();
         }
     }
+    checkModeInSessionPool(sessionType) {
+        if (!sessionType) {
+            const sessionResource = this._widget?.viewModel?.model.sessionResource;
+            if (!sessionResource) {
+                return;
+            }
+            sessionType = getChatSessionType(sessionResource);
+        }
+        const customAgentTarget = this.chatSessionsService.getCustomAgentTargetForSessionType(sessionType);
+        if (!customAgentTarget || customAgentTarget === Target.Undefined) {
+            return;
+        }
+        const currentMode = this._currentModeObservable.get();
+        if (currentMode.id === ChatMode.Agent.id) {
+            return;
+        }
+        if (currentMode.isBuiltin) {
+            this.setChatMode(ChatModeKind.Agent, false);
+            return;
+        }
+        const modeTarget = currentMode.target.get();
+        if (modeTarget !== customAgentTarget && modeTarget !== Target.Undefined) {
+            this.setChatMode(ChatModeKind.Agent, false);
+        }
+    }
     preselectModelFromSessionHistory() {
         const requests = this._widget?.viewModel?.model.getRequests();
         if (!requests || requests.length === 0) {
@@ -1001,40 +1034,40 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         const mode = this._currentModeObservable.get();
         const modelName = this._currentLanguageModel.get()?.metadata.name;
-        const modelInfo = modelName ? ( localize(7032, ", {0}. ", modelName)) : "";
+        const modelInfo = modelName ? ( localize(7156, ", {0}. ", modelName)) : "";
         let modeLabel = "";
         if (!mode.isBuiltin) {
             const mode = this.currentModeObs.get();
-            modeLabel = ( localize(7033, "({0}), {1}", mode.label.get(), mode.description.get()));
+            modeLabel = ( localize(7157, "({0}), {1}", mode.label.get(), mode.description.get()));
         } else {
             switch (this.currentModeKind) {
             case ChatModeKind.Agent:
-                modeLabel = ( localize(7034, "(Agent), edit files in your workspace."));
+                modeLabel = ( localize(7158, "(Agent), edit files in your workspace."));
                 break;
             case ChatModeKind.Edit:
-                modeLabel = ( localize(7035, "(Edit), edit files in your workspace."));
+                modeLabel = ( localize(7159, "(Edit), edit files in your workspace."));
                 break;
             case ChatModeKind.Ask:
             default:
-                modeLabel = ( localize(7036, "(Ask), ask questions or type / for topics."));
+                modeLabel = ( localize(7160, "(Ask), ask questions or type / for topics."));
                 break;
             }
         }
         if (verbose) {
             return kbLabel ? ( localize(
-                7037,
+                7161,
                 "Chat Input {0}{1} Press Enter to send out the request. Use {2} for Chat Accessibility Help.",
                 modeLabel,
                 modelInfo,
                 kbLabel
             )) : ( localize(
-                7038,
+                7162,
                 "Chat Input {0}{1} Press Enter to send out the request. Use the Chat Accessibility Help command for more information.",
                 modeLabel,
                 modelInfo
             ));
         } else {
-            return localize(7039, "Chat Input {0}{1}.", modeLabel, modelInfo);
+            return localize(7163, "Chat Input {0}{1}.", modeLabel, modelInfo);
         }
     }
     validateCurrentChatMode() {
@@ -1050,10 +1083,6 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             return;
         }
     }
-    getDefaultModeExperimentStorageKey() {
-        const tag = this.options.widgetViewKindTag;
-        return `chat.${tag}.hasSetDefaultModeByExperiment`;
-    }
     logInputHistory() {
         const historyStr = ( this.history.values.map(entry => JSON.stringify(entry))).join("\n");
         this.logService.info(`[${this.location}] Chat input history:`, historyStr);
@@ -1271,99 +1300,81 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         return this._scopedContextKeyService.contextMatchesRules(expr);
     }
-    computeVisibleOptionGroups() {
-        const setNoOptions = () => {
-            this.chatSessionHasOptions.set(false);
-            this.chatSessionOptionsValid.set(true);
-        };
-        const sessionResource = this._widget?.viewModel?.model.sessionResource;
-        const ctx = sessionResource ? this.chatService.getChatSessionFromInternalUri(sessionResource) : undefined;
-        const customAgentTarget = ctx && this.chatSessionsService.getCustomAgentTargetForSessionType(getChatSessionType(ctx.chatSessionResource));
+    getVisibleOptionGroupsModeAndUpdateContextKeys(sessionResource) {
+        const customAgentTarget = sessionResource && this.chatSessionsService.getCustomAgentTargetForSessionType(getChatSessionType(sessionResource));
         this.chatSessionHasCustomAgentTarget.set(customAgentTarget !== Target.Undefined);
-        const requiresCustomModels = ctx && this.chatSessionsService.requiresCustomModelsForSessionType(getChatSessionType(ctx.chatSessionResource));
+        const requiresCustomModels = sessionResource && this.chatSessionsService.requiresCustomModelsForSessionType(getChatSessionType(sessionResource));
         this.chatSessionHasTargetedModels.set(!!requiresCustomModels);
-        if (customAgentTarget) {
-            const contribution = ctx && this.chatSessionsService.getChatSessionContribution(getChatSessionType(ctx.chatSessionResource));
-            const agentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, agentOptionId);
-            if (typeof agentOption !== "undefined" && !contribution?.useRequestToPopulateBuiltInPickers) {
-                const agentId = (typeof agentOption === "string" ? agentOption : agentOption.id) || ChatMode.Agent.id;
-                const currentMode = this._currentModeObservable.get();
-                const isDefaultAgent = agentId === ChatMode.Agent.id;
-                const needsUpdate = isDefaultAgent ? currentMode.id !== ChatMode.Agent.id : currentMode.label.get() !== agentId;
-                if (needsUpdate) {
-                    this.setChatMode(agentId);
+        const visibleOptionGroups = this.getVisibleOptionGroups(sessionResource);
+        if (!visibleOptionGroups.length) {
+            this.chatSessionHasOptions.set(false);
+            this.chatSessionOptionsValid.set(true);
+            return [];
+        }
+        const allOptionsValid = sessionResource ? this.areAllOptionsValid(sessionResource, visibleOptionGroups) : true;
+        this.chatSessionHasOptions.set(true);
+        this.chatSessionOptionsValid.set(allOptionsValid);
+        return visibleOptionGroups;
+    }
+    getCurrentSessionResource() {
+        return this._widget?.viewModel?.model.sessionResource;
+    }
+    areAllOptionsValid(sessionResource, visibleOptionGroups) {
+        for (const optionGroup of visibleOptionGroups) {
+            const currentOption = this.chatSessionsService.getSessionOption(sessionResource, optionGroup.id);
+            if (currentOption) {
+                const currentOptionId = typeof currentOption === "string" ? currentOption : currentOption.id;
+                if (!( optionGroup.items.some(item => item.id === currentOptionId)) && typeof currentOption === "string") {
+                    return false;
                 }
             }
         }
+        return true;
+    }
+    getAllOptionsGroups(sessionResource) {
         const delegateSessionType = this.options.sessionTypePickerDelegate?.getActiveSessionProvider?.();
-        const effectiveSessionType = delegateSessionType ?? (ctx ? getChatSessionType(ctx.chatSessionResource) : undefined);
+        const effectiveSessionType = delegateSessionType ?? (sessionResource ? getChatSessionType(sessionResource) : undefined);
         if (!effectiveSessionType) {
-            setNoOptions();
-            return undefined;
+            return [];
         }
-        const optionGroups = this.chatSessionsService.getOptionGroupsForSessionType(effectiveSessionType);
-        if (!optionGroups || optionGroups.length === 0) {
-            setNoOptions();
-            return undefined;
+        const allOptionGroups = this.chatSessionsService.getOptionGroupsForSessionType(effectiveSessionType);
+        return allOptionGroups ?? [];
+    }
+    getVisibleOptionGroups(sessionResource) {
+        const allOptionGroups = this.getAllOptionsGroups(sessionResource);
+        if (!allOptionGroups.length) {
+            return [];
         }
-        if (ctx) {
-            for (const optionGroup of optionGroups) {
-                const currentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroup.id);
+        if (sessionResource) {
+            for (const optionGroup of allOptionGroups) {
+                const currentOption = this.chatSessionsService.getSessionOption(sessionResource, optionGroup.id);
                 if (currentOption) {
                     const optionId = typeof currentOption === "string" ? currentOption : currentOption.id;
                     this.updateOptionContextKey(optionGroup.id, optionId);
                 }
             }
         }
-        const visibleGroupIds = ( new Set());
-        for (const optionGroup of optionGroups) {
+        const visibleGroups = ( new Map());
+        for (const optionGroup of allOptionGroups) {
             const hasItems = optionGroup.items.length > 0 || (optionGroup.commands || []).length > 0;
             const passesWhenClause = this.evaluateOptionGroupVisibility(optionGroup);
-            const sessionHasOption = !ctx || this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroup.id) !== undefined;
+            const sessionHasOption = !sessionResource || this.chatSessionsService.getSessionOption(sessionResource, optionGroup.id) !== undefined;
             if (hasItems && passesWhenClause && sessionHasOption) {
-                visibleGroupIds.add(optionGroup.id);
+                visibleGroups.set(optionGroup.id, optionGroup);
             }
         }
-        if (visibleGroupIds.size === 0) {
-            setNoOptions();
-            return undefined;
-        }
-        let allOptionsValid = true;
-        if (ctx) {
-            for (const groupId of visibleGroupIds) {
-                const optionGroup = optionGroups.find(g => g.id === groupId);
-                const currentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, groupId);
-                if (optionGroup && currentOption) {
-                    const currentOptionId = typeof currentOption === "string" ? currentOption : currentOption.id;
-                    if (!( optionGroup.items.some(item => item.id === currentOptionId)) && typeof currentOption === "string") {
-                        allOptionsValid = false;
-                        break;
-                    }
-                }
-            }
-        }
-        this.chatSessionHasOptions.set(true);
-        this.chatSessionOptionsValid.set(allOptionsValid);
-        return {
-            visibleGroupIds,
-            optionGroups,
-            ctx,
-            effectiveSessionType
-        };
+        return Array.from(( visibleGroups.values()));
     }
     refreshChatSessionPickers() {
-        const result = this.computeVisibleOptionGroups();
-        if (!result) {
+        const sessionResource = this.getCurrentSessionResource();
+        const allOptionsGroups = this.getAllOptionsGroups(sessionResource);
+        const visibleOptionGroups = this.getVisibleOptionGroupsModeAndUpdateContextKeys(sessionResource);
+        if (!allOptionsGroups.length || !visibleOptionGroups.length) {
             this.hideAllSessionPickerWidgets();
             return;
         }
-        const {
-            visibleGroupIds,
-            optionGroups,
-            ctx
-        } = result;
         const currentWidgetGroupIds = ( new Set(( this.chatSessionPickerWidgets.keys())));
-        const needsRecreation = currentWidgetGroupIds.size !== visibleGroupIds.size || !Array.from(visibleGroupIds).every(id => ( currentWidgetGroupIds.has(id)));
+        const needsRecreation = currentWidgetGroupIds.size !== visibleOptionGroups.length || !visibleOptionGroups.every(group => ( currentWidgetGroupIds.has(group.id)));
         if (needsRecreation && this._lastSessionPickerAction && this.chatSessionPickerContainer) {
             const widgets = this.createChatSessionPickerWidgets(this._lastSessionPickerAction, this._lastSessionPickerOptions);
             clearNode(this.chatSessionPickerContainer);
@@ -1376,11 +1387,11 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (this.chatSessionPickerContainer) {
             this.chatSessionPickerContainer.style.display = "";
         }
-        if (ctx) {
+        if (sessionResource) {
             for (const [optionGroupId] of this.chatSessionPickerWidgets) {
-                const currentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroupId);
+                const currentOption = this.chatSessionsService.getSessionOption(sessionResource, optionGroupId);
                 if (currentOption) {
-                    const optionGroup = optionGroups.find(g => g.id === optionGroupId);
+                    const optionGroup = allOptionsGroups.find(g => g.id === optionGroupId);
                     if (optionGroup) {
                         const currentOptionId = typeof currentOption === "string" ? currentOption : currentOption.id;
                         const item = optionGroup.items.find(m => m.id === currentOptionId);
@@ -1404,20 +1415,16 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (!sessionResource) {
             return;
         }
-        const ctx = this.chatService.getChatSessionFromInternalUri(sessionResource);
-        if (!ctx) {
-            return;
-        }
-        if (this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroupId) === undefined) {
+        if (this.chatSessionsService.getSessionOption(sessionResource, optionGroupId) === undefined) {
             return;
         }
-        const effectiveSessionType = this.getEffectiveSessionType(ctx, this.options.sessionTypePickerDelegate);
-        const optionGroups = this.chatSessionsService.getOptionGroupsForSessionType(effectiveSessionType);
+        const effectiveSessionType = this.getEffectiveSessionType(sessionResource);
+        const optionGroups = effectiveSessionType ? this.chatSessionsService.getOptionGroupsForSessionType(effectiveSessionType) : undefined;
         const optionGroup = optionGroups?.find(g => g.id === optionGroupId);
         if (!optionGroup || optionGroup.items.length === 0) {
             return;
         }
-        const currentOptionValue = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroupId);
+        const currentOptionValue = this.chatSessionsService.getSessionOption(sessionResource, optionGroupId);
         if (!currentOptionValue) {
             const defaultItem = optionGroup.items.find(item => item.default);
             return defaultItem;
@@ -1429,8 +1436,20 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             return currentOptionValue;
         }
     }
-    getEffectiveSessionType(ctx, delegate) {
-        return this.options.sessionTypePickerDelegate?.getActiveSessionProvider?.() || (ctx && getChatSessionType(ctx.chatSessionResource)) || "";
+    hasWorkspaceScmRepository() {
+        const folders = this.workspaceContextService.getWorkspace().folders;
+        if (folders.length === 0) {
+            return false;
+        }
+        for (const repo of this.scmService.repositories) {
+            if (repo.provider.rootUri && this.workspaceContextService.getWorkspaceFolder(repo.provider.rootUri)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    getEffectiveSessionType(sessionResource) {
+        return this.options.sessionTypePickerDelegate?.getActiveSessionProvider?.() ?? (sessionResource ? getChatSessionType(sessionResource) : undefined);
     }
     updateAgentSessionTypeContextKey() {
         const sessionResource = this._widget?.viewModel?.model.sessionResource;
@@ -1489,7 +1508,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     }
     render(container, initialValue, widget) {
         this._widget = widget;
-        this.computeVisibleOptionGroups();
+        this.getVisibleOptionGroupsModeAndUpdateContextKeys(this.getCurrentSessionResource());
         const delegate = this.options.sessionTypePickerDelegate;
         if (delegate?.setActiveSessionProvider && delegate?.getActiveSessionProvider) {
             const initialSessionType = delegate.getActiveSessionProvider();
@@ -1515,18 +1534,36 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             if (this._questionCarouselSessionResources.size > 0 && (!e.currentSessionResource || !hasMatchingResource)) {
                 this.clearQuestionCarousel();
             }
+            let hasMatchingPlanReviewResource = false;
+            if (e.currentSessionResource) {
+                for (const r of ( this._planReviewSessionResources.values())) {
+                    if (isEqual(r, e.currentSessionResource)) {
+                        hasMatchingPlanReviewResource = true;
+                        break;
+                    }
+                }
+            }
+            if (this._planReviewSessionResources.size > 0 && (!e.currentSessionResource || !hasMatchingPlanReviewResource)) {
+                this.clearPlanReview();
+            }
+            this._syncToolConfirmationCarouselForSession();
             const newSessionType = this.getCurrentSessionType();
             if (e.currentSessionResource && newSessionType !== this._currentSessionType) {
                 this._currentSessionType = newSessionType;
                 this.initSelectedModel();
                 this.checkModelInSessionPool();
+                this.checkModeInSessionPool();
             }
             this.preselectModelFromSessionHistory();
         }));
         let elements;
         if (this.options.renderStyle === "compact") {
             elements = h(".interactive-input-part", [h(".interactive-input-and-edit-session", [
+                h(".chat-plan-review-widget-container@chatPlanReviewContainer"),
                 h(".chat-question-carousel-widget-container@chatQuestionCarouselContainer"),
+                h(
+                    ".chat-tool-confirmation-carousel-container@chatToolConfirmationCarouselContainer"
+                ),
                 h(".chat-input-widgets-container@chatInputWidgetsContainer"),
                 h(".chat-todo-list-widget-container@chatInputTodoListWidgetContainer"),
                 h(".chat-artifacts-widget-container@chatArtifactsWidgetContainer"),
@@ -1551,7 +1588,11 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             ])]);
         } else {
             elements = h(".interactive-input-part", [
+                h(".chat-plan-review-widget-container@chatPlanReviewContainer"),
                 h(".chat-question-carousel-widget-container@chatQuestionCarouselContainer"),
+                h(
+                    ".chat-tool-confirmation-carousel-container@chatToolConfirmationCarouselContainer"
+                ),
                 h(".interactive-input-followups@followupsContainer"),
                 h(".chat-input-widgets-container@chatInputWidgetsContainer"),
                 h(".chat-todo-list-widget-container@chatInputTodoListWidgetContainer"),
@@ -1595,6 +1636,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.chatGettingStartedTipContainer = elements.chatGettingStartedTipContainer;
         this.chatGettingStartedTipContainer.style.display = "none";
         this.chatQuestionCarouselContainer = elements.chatQuestionCarouselContainer;
+        this.chatPlanReviewContainer = elements.chatPlanReviewContainer;
+        this.chatToolConfirmationCarouselContainer = elements.chatToolConfirmationCarouselContainer;
+        hide(this.chatToolConfirmationCarouselContainer);
         this.chatInputWidgetsContainer = elements.chatInputWidgetsContainer;
         this.contextUsageWidgetContainer = elements.contextUsageWidgetContainer;
         if (this.options.isSessionsWindow || this.options.renderStyle === "compact") {
@@ -1737,8 +1781,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }));
         const hoverDelegate = this._register(createInstantHoverDelegate());
         const {
-            location,
-            isMaximized
+            location
         } = this.getWidgetLocationInfo(widget);
         const pickerOptions = {
             getOverflowAnchor: () => this.inputActionsToolbar.getElement(),
@@ -1747,11 +1790,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             },
             hideChevrons: derived(
                 reader => this._stableInputPartWidth.read(reader) < CHAT_INPUT_PICKER_COLLAPSE_WIDTH
-            ),
-            hoverPosition: {
-                forcePosition: true,
-                hoverPosition: location === ChatWidgetLocation.SidebarRight && !isMaximized ? HoverPosition.LEFT : HoverPosition.RIGHT
-            }
+            )
         };
         this._register(
             addStandardDisposableListener(toolbarsContainer, EventType.CLICK, e => this.inputEditor.focus())
@@ -1810,15 +1849,14 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                                 return !sessionType || sessionType === localChatSessionType;
                             }
                         };
-                        return this.modelWidget = this.instantiationService.createInstance(EnhancedModelPickerActionItem, action, itemDelegate, pickerOptions);
+                        return this.modelWidget = this.instantiationService.createInstance(ModelPickerActionItem, action, itemDelegate, pickerOptions);
                     } else if (action.id === OpenModePickerAction.ID && action instanceof MenuItemAction) {
                         const delegate = {
                             currentMode: this._currentModeObservable,
                             sessionResource: () => this._widget?.viewModel?.sessionResource,
                             customAgentTarget: () => {
                                 const sessionResource = this._widget?.viewModel?.model.sessionResource;
-                                const ctx = sessionResource && this.chatService.getChatSessionFromInternalUri(sessionResource);
-                                return (ctx && this.chatSessionsService.getCustomAgentTargetForSessionType(getChatSessionType(ctx.chatSessionResource))) ?? Target.Undefined;
+                                return (sessionResource && this.chatSessionsService.getCustomAgentTargetForSessionType(getChatSessionType(sessionResource))) ?? Target.Undefined;
                             }
                         };
                         return this.modeWidget = this.instantiationService.createInstance(ModePickerActionItem, action, delegate, pickerOptions);
@@ -1840,7 +1878,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                                 this.updateWidgetLockStateFromSessionType(provider);
                                 this.updateAgentSessionTypeContextKey();
                                 this.refreshChatSessionPickers();
-                            }
+                            },
+                            hasGitRepository: () => this.hasWorkspaceScmRepository()
                         };
                         const isWelcomeViewMode = !!this.options.sessionTypePickerDelegate?.setActiveSessionProvider;
                         const Picker = (action.id === OpenSessionTargetPickerAction.ID || isWelcomeViewMode) ? SessionTypePickerActionItem : DelegationSessionPickerActionItem;
@@ -1960,7 +1999,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                                 this.updateWidgetLockStateFromSessionType(provider);
                                 this.updateAgentSessionTypeContextKey();
                                 this.refreshChatSessionPickers();
-                            }
+                            },
+                            hasGitRepository: () => this.hasWorkspaceScmRepository()
                         };
                         const isWelcomeViewMode = !!this.options.sessionTypePickerDelegate?.setActiveSessionProvider;
                         const Picker = (action.id === OpenSessionTargetPickerAction.ID || isWelcomeViewMode) ? SessionTypePickerActionItem : DelegationSessionPickerActionItem;
@@ -2054,6 +2094,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }));
         this.renderAttachedContext();
         const inputResizeObserver = this._register(new DisposableResizeObserver(() => {
+            this.updateToolConfirmationCarouselMaxHeight();
             const newHeight = this.container.offsetHeight;
             this.height.set(newHeight, undefined);
         }));
@@ -2131,9 +2172,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
             this._indexOfLastOpenedContext = -1;
         }
+        const maxImagesPerRequest = getImageAttachmentLimit(this._currentLanguageModel.get()?.metadata);
         const imageAttachments = attachments.filter(([, a]) => isImageVariableEntry(a));
-        if (imageAttachments.length > MAX_IMAGES_PER_REQUEST) {
-            const excessCount = imageAttachments.length - MAX_IMAGES_PER_REQUEST;
+        if (maxImagesPerRequest !== undefined && imageAttachments.length > maxImagesPerRequest) {
+            const excessCount = imageAttachments.length - maxImagesPerRequest;
             for (let i = 0; i < excessCount; i++) {
                 const attachment = imageAttachments[i][1];
                 if (attachment.omittedState === OmittedState.NotOmitted || attachment.omittedState === OmittedState.ImageLimitExceeded) {
@@ -2386,10 +2428,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             clearNode(this.chatArtifactsWidgetContainer);
             append(this.chatArtifactsWidgetContainer, widget.domNode);
         }
-        this._chatArtifactsWidget.value.render(chatSessionResource);
+        this._chatArtifactsWidget.value.setSessionResource(chatSessionResource);
     }
     clearArtifactsWidget() {
-        this._chatArtifactsWidget.value?.hide();
+        this._chatArtifactsWidget.value?.setSessionResource(undefined);
     }
     renderQuestionCarousel(carousel, context, options) {
         const carouselKey = carousel.resolveId ?? `${isResponseVM(context.element) ? context.element.requestId : ""}_${context.contentIndex}`;
@@ -2468,6 +2510,124 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         const carousel = this.questionCarousel;
         return carousel?.navigateToNextQuestion() ?? false;
     }
+    renderPlanReview(review, context, options) {
+        const key = review.resolveId ?? `${isResponseVM(context.element) ? context.element.requestId : ""}_${context.contentIndex}`;
+        const existing = this._chatPlanReviewWidgets.get(key);
+        if (existing) {
+            return existing;
+        }
+        if (isResponseVM(context.element)) {
+            this._planReviewResponseIds.set(key, context.element.requestId);
+            this._planReviewSessionResources.set(key, context.element.sessionResource);
+        }
+        const part = this.instantiationService.createInstance(ChatPlanReviewPart, review, context, options);
+        this._chatPlanReviewWidgets.set(key, part);
+        append(this.chatPlanReviewContainer, part.domNode);
+        return part;
+    }
+    clearPlanReview(responseId, resolveId) {
+        if (resolveId !== undefined) {
+            const part = this._chatPlanReviewWidgets.get(resolveId);
+            if (part) {
+                part.domNode.remove();
+                this._chatPlanReviewWidgets.deleteAndDispose(resolveId);
+            }
+            this._planReviewResponseIds.delete(resolveId);
+            this._planReviewSessionResources.delete(resolveId);
+        } else if (responseId !== undefined) {
+            for (const [key, rid] of this._planReviewResponseIds) {
+                if (rid === responseId) {
+                    const part = this._chatPlanReviewWidgets.get(key);
+                    if (part) {
+                        part.domNode.remove();
+                        this._chatPlanReviewWidgets.deleteAndDispose(key);
+                    }
+                    this._planReviewResponseIds.delete(key);
+                    this._planReviewSessionResources.delete(key);
+                }
+            }
+        } else {
+            this._chatPlanReviewWidgets.clearAndDisposeAll();
+            this._planReviewResponseIds.clear();
+            this._planReviewSessionResources.clear();
+            clearNode(this.chatPlanReviewContainer);
+        }
+    }
+    get planReview() {
+        return this._chatPlanReviewWidgets.size > 0 ? ( this._chatPlanReviewWidgets.values()).next().value : undefined;
+    }
+    get _currentSessionKey() {
+        return this._widget?.viewModel?.model.sessionResource.toString();
+    }
+    get _currentToolConfirmationCarousel() {
+        const key = this._currentSessionKey;
+        return key ? this._chatToolConfirmationCarousels.get(key) : undefined;
+    }
+    renderToolConfirmationCarousel(tool, factory, subAgentInvocationId, agentName, scrollToSubagent, toolPart) {
+        const existing = this._currentToolConfirmationCarousel;
+        if (existing) {
+            existing.addToolInvocation(tool, subAgentInvocationId, agentName, scrollToSubagent, toolPart);
+            this.updateToolConfirmationCarouselMaxHeight();
+            return existing;
+        }
+        const key = this._currentSessionKey;
+        if (!key) {
+            throw ( new Error("Cannot render tool confirmation carousel without an active session"));
+        }
+        const part = ( new ChatToolConfirmationCarouselPart(factory, [], scrollToSubagent, subAgentInvocationId, agentName));
+        part.addToolInvocation(tool, subAgentInvocationId, agentName, scrollToSubagent, toolPart);
+        this._chatToolConfirmationCarousels.set(key, part);
+        append(this.chatToolConfirmationCarouselContainer, part.domNode);
+        show(this.chatToolConfirmationCarouselContainer);
+        this.updateToolConfirmationCarouselMaxHeight();
+        const capturedKey = key;
+        Event.once(part.onDidEmpty)(() => {
+            this._chatToolConfirmationCarousels.deleteAndDispose(capturedKey);
+            if (this._currentSessionKey === capturedKey) {
+                clearNode(this.chatToolConfirmationCarouselContainer);
+                hide(this.chatToolConfirmationCarouselContainer);
+            }
+        });
+        return part;
+    }
+    addToolToConfirmationCarousel(tool, factory, subAgentInvocationId, agentName, scrollToSubagent, toolPart) {
+        const existing = this._currentToolConfirmationCarousel;
+        if (existing) {
+            existing.addToolInvocation(tool, subAgentInvocationId, agentName, scrollToSubagent, toolPart);
+            this.updateToolConfirmationCarouselMaxHeight();
+        } else {
+            this.renderToolConfirmationCarousel(tool, factory, subAgentInvocationId, agentName, scrollToSubagent, toolPart);
+        }
+    }
+    activateCarouselForSubagent(subAgentInvocationId) {
+        this._currentToolConfirmationCarousel?.activateFirstToolForSubagent(subAgentInvocationId);
+    }
+    hasToolInConfirmationCarousel(toolCallId) {
+        return this._currentToolConfirmationCarousel?.hasToolInvocation(toolCallId) ?? false;
+    }
+    get hasActiveToolConfirmationCarousel() {
+        const carousel = this._currentToolConfirmationCarousel;
+        return !!carousel && carousel.pendingCount > 0;
+    }
+    clearToolConfirmationCarousel() {
+        const key = this._currentSessionKey;
+        if (key) {
+            this._chatToolConfirmationCarousels.deleteAndDispose(key);
+        }
+        clearNode(this.chatToolConfirmationCarouselContainer);
+        hide(this.chatToolConfirmationCarouselContainer);
+    }
+    _syncToolConfirmationCarouselForSession() {
+        clearNode(this.chatToolConfirmationCarouselContainer);
+        const carousel = this._currentToolConfirmationCarousel;
+        if (carousel && carousel.pendingCount > 0) {
+            append(this.chatToolConfirmationCarouselContainer, carousel.domNode);
+            show(this.chatToolConfirmationCarouselContainer);
+            this.updateToolConfirmationCarouselMaxHeight();
+        } else {
+            hide(this.chatToolConfirmationCarouselContainer);
+        }
+    }
     setWorkingSetCollapsed(collapsed) {
         this._workingSetCollapsed.set(collapsed, undefined);
     }
@@ -2585,7 +2745,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         const button = this._chatEditsActionsDisposables.add(( new ButtonWithIcon(overviewTitle, {
             supportIcons: true,
             secondary: true,
-            ariaLabel: ( localize(7040, "Toggle changed files."))
+            ariaLabel: ( localize(7164, "Toggle changed files."))
         })));
         const topLevelStats = derived(reader => {
             const entries = editSessionEntriesObs.read(reader);
@@ -2640,7 +2800,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     }) : undefined,
                     disableWhileRunning: isSessionMenu,
                     buttonConfigProvider: action => {
-                        if (action.id === ChatEditingShowChangesAction.ID || action.id === ViewPreviousEditsAction.Id || action.id === ViewAllSessionChangesAction.ID) {
+                        if (action.id === ChatEditingShowChangesAction.ID || action.id === ViewPreviousEditsAction.Id) {
                             return {
                                 showIcon: true,
                                 showLabel: false,
@@ -2659,10 +2819,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 removed,
                 shouldShowEditingSession
             } = topLevelStats.read(reader);
-            const buttonLabel = files === 1 ? ( localize(7041, "1 file changed")) : ( localize(7042, "{0} files changed", files));
+            const buttonLabel = files === 1 ? ( localize(7165, "1 file changed")) : ( localize(7166, "{0} files changed", files));
             button.label = buttonLabel;
             button.element.setAttribute("aria-label", ( localize(
-                7043,
+                7167,
                 "{0}, {1} lines added, {2} lines removed",
                 buttonLabel,
                 added,
@@ -2778,6 +2938,20 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     }
     setMaxHeight(maxHeight) {
         this._maxHeight = maxHeight;
+        this.updateToolConfirmationCarouselMaxHeight();
+    }
+    updateToolConfirmationCarouselMaxHeight() {
+        const carousel = this._currentToolConfirmationCarousel;
+        if (!carousel) {
+            return;
+        }
+        if (this._maxHeight === undefined) {
+            carousel.setMaxHeight(undefined);
+            return;
+        }
+        const carouselHeight = this.chatToolConfirmationCarouselContainer.offsetHeight;
+        const otherInputHeight = Math.max(0, this.container.offsetHeight - carouselHeight);
+        carousel.setMaxHeight(this._maxHeight - otherInputHeight);
     }
     layout(width) {
         this.cachedWidth = width;
@@ -2910,7 +3084,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.updateInputEditorScrollbarOptions();
     }
 };
-ChatInputPart = ChatInputPart_1 = ( __decorate([( __param(4, IModelService)), ( __param(5, IInstantiationService)), ( __param(6, IContextKeyService)), ( __param(7, IConfigurationService)), ( __param(8, IKeybindingService)), ( __param(9, IAccessibilityService)), ( __param(10, ILanguageModelsService)), ( __param(11, ILogService)), ( __param(12, IFileService)), ( __param(13, IEditorService)), ( __param(14, IThemeService)), ( __param(15, ITextModelService)), ( __param(16, IStorageService)), ( __param(17, IChatAgentService)), ( __param(18, ISharedWebContentExtractorService)), ( __param(19, IWorkbenchAssignmentService)), ( __param(20, IChatEntitlementService)), ( __param(21, IChatModeService)), ( __param(22, ILanguageModelToolsService)), ( __param(23, IChatService)), ( __param(24, IChatSessionsService)), ( __param(25, IChatContextService)), ( __param(26, IAgentSessionsService)), ( __param(27, IWorkspaceContextService)), ( __param(28, IWorkbenchLayoutService)), ( __param(29, IViewDescriptorService)), ( __param(30, IChatAttachmentWidgetRegistry))], ChatInputPart));
+ChatInputPart = ChatInputPart_1 = ( __decorate([( __param(4, IModelService)), ( __param(5, IInstantiationService)), ( __param(6, IContextKeyService)), ( __param(7, IConfigurationService)), ( __param(8, IKeybindingService)), ( __param(9, IAccessibilityService)), ( __param(10, ILanguageModelsService)), ( __param(11, ILogService)), ( __param(12, IFileService)), ( __param(13, IEditorService)), ( __param(14, IThemeService)), ( __param(15, ITextModelService)), ( __param(16, IStorageService)), ( __param(17, IChatAgentService)), ( __param(18, ISharedWebContentExtractorService)), ( __param(19, IChatEntitlementService)), ( __param(20, IChatModeService)), ( __param(21, ILanguageModelToolsService)), ( __param(22, IChatSessionsService)), ( __param(23, IChatContextService)), ( __param(24, IAgentSessionsService)), ( __param(25, IWorkspaceContextService)), ( __param(26, ISCMService)), ( __param(27, IWorkbenchLayoutService)), ( __param(28, IViewDescriptorService)), ( __param(29, IChatAttachmentWidgetRegistry))], ChatInputPart));
 function getLastPosition(model) {
     return {
         lineNumber: model.getLineCount(),