@codingame/monaco-vscode-katex-common 34.1.3 → 35.0.1

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

@@ -35,6 +35,13 @@ export declare function hasModelsTargetingSession(allModels: ILanguageModelChatM
  * If no models target this session, the model must not be session-specific.
  */
 export declare function isModelValidForSession(model: ILanguageModelChatMetadataAndIdentifier, allModels: ILanguageModelChatMetadataAndIdentifier[], sessionType: string | undefined): boolean;
+/**
+ * Find a model in `pool` that matches `previous` by id, then family, then
+ * name (case-insensitive). Used to carry a selection across model pools
+ * (e.g. `copilot/claude-sonnet-4.6` → `agent-host-copilotcli:claude-sonnet-4.6`).
+ * Returns `undefined` when no candidate matches.
+ */
+export declare function findBestMatchingModel(previous: ILanguageModelChatMetadataAndIdentifier | undefined, pool: readonly ILanguageModelChatMetadataAndIdentifier[]): ILanguageModelChatMetadataAndIdentifier | undefined;
 /**
  * Find the default model for a given location from a list of models.
  * Prefers the model marked as default for the location, falls back to the first model.
@@ -82,15 +89,15 @@ export declare function resolveModelFromSyncState(stateModel: ILanguageModelChat
     action: "keep" | "apply" | "default";
 };
 /**
- * Merges live models with cached models per-vendor, evicting cache for vendors
- * no longer contributed.
+ * Merges live models with cached models per-vendor, evicting cache for vendors no longer contributed.
  *
- * - `resolvedVendors`: vendors whose providers have produced at least one
- *   result. An empty live list for these is authoritative (e.g. BYOK key
- *   removed) and their cache entries are dropped.
- * - When no contributor info is available yet and there are no live models
- *   (startup / extension reload), the full cache is returned to avoid
- *   flickering the picker to empty.
+ * - `resolvedVendors`: vendors that have finished resolving. An empty live list for these is authoritative
+ *   (e.g. BYOK key removed), so their cache is dropped.
+ * - Copilot is the exception: its models are gated on an async token that can resolve slower than fast/local BYOK
+ *   providers, so an early empty resolution is transient. Keeping its cache avoids resetting (and persisting) a
+ *   restored Copilot selection to a BYOK default, which also preserves the selection across sign-out/in (see #321037).
+ * - When nothing is contributed yet and there are no live models (startup / reload), the full cache is returned to
+ *   avoid flickering the picker to empty.
  */
 export declare function mergeModelsWithCache(liveModels: ILanguageModelChatMetadataAndIdentifier[], cachedModels: ILanguageModelChatMetadataAndIdentifier[], contributedVendors: Set<string>, resolvedVendors?: ReadonlySet<string>): ILanguageModelChatMetadataAndIdentifier[];
 /**
@@ -111,4 +118,61 @@ export declare function shouldResetOnModelListChange(currentModelId: string | un
  * restoration.
  */
 export declare function shouldRestoreLateArrivingModel(persistedModelId: string, persistedAsDefault: boolean, model: ILanguageModelChatMetadataAndIdentifier, location: ChatAgentLocation): boolean;
+/**
+ * Resolve a configured default-model value to a concrete model from the given pool.
+ *
+ * The configured value (e.g. from `chat.defaultModel`, which may be set
+ * by enterprise policy) is matched case-insensitively in this order:
+ * 1. `auto` — the synthetic "Auto" model (id `auto`), when present.
+ * 2. A full model id — an exact match on `metadata.id`.
+ * 3. A model family name (e.g. `opus`, `gemini`) — the model with the highest
+ *    {@link compareModelVersions version} among models whose `metadata.family` matches.
+ *
+ * Returns `undefined` when the value is empty or no model matches, letting the caller
+ * fall back to its normal default selection.
+ */
+export declare function resolveConfiguredModel(configuredValue: string | undefined, models: ILanguageModelChatMetadataAndIdentifier[]): ILanguageModelChatMetadataAndIdentifier | undefined;
+/**
+ * Why a model picker has no model to offer, when that is the case. Drives a
+ * "Models" placeholder plus a contextual action instead of a misleading
+ * lone "Auto".
+ */
+export declare enum ModelPickerUnavailableReason {
+    /** The workspace is untrusted, which disables the model providers. */
+    Restricted = "restricted",
+    /** Chat requires sign-in / setup before any model is available. */
+    SetupRequired = "setupRequired"
+}
+/**
+ * Determines whether a model picker should present an "unavailable" state and,
+ * if so, why. Returns `undefined` when the picker has a usable model (or its
+ * state is not yet known), so the normal model / Auto label is shown.
+ *
+ * A model counts as usable only when it is both offered by this picker
+ * (`pickerModels`, already filtered to the picker's location / session type) AND
+ * currently live in the language model registry (`liveModelIds`). This ignores
+ * two kinds of phantom models that would otherwise mask the unavailable state:
+ * - stale cross-window machine cache entries (present in `pickerModels` but not live), and
+ * - models registered for other surfaces such as agent-host session-scoped models
+ *   (live in the global registry but not offered by this picker).
+ *
+     * Once trust has initialized, Restricted Mode takes precedence: an untrusted workspace is
+     * reported as Restricted even when a live picker-offered model exists, because Restricted Mode disables all model providers. This matters because a
+     * harness's session-scoped models (e.g. `claude-code`, `copilotcli`) register
+ * without a trust gate and stay live while untrusted, which would otherwise mask
+ * the Restricted state behind a misleading "Auto". In a *trusted* workspace, a
+ * live, picker-offered model (e.g. BYOK) wins over setup, so BYOK and anonymous
+ * access are never shown a setup-required state regardless of sign-in. `trusted`
+ * reflects `isWorkspaceTrusted()` (which is `true` when trust is disabled
+ * entirely) and is only authoritative once `trustInitialized` is `true`; until
+ * then this returns `undefined` to avoid a trusted workspace briefly rendering as
+ * unavailable at startup.
+ */
+export declare function getModelPickerUnavailableReason(context: {
+    readonly trustInitialized: boolean;
+    readonly trusted: boolean;
+    readonly pickerModels: readonly ILanguageModelChatMetadataAndIdentifier[];
+    readonly liveModelIds: Iterable<string>;
+    readonly requiresSetup: boolean;
+}): ModelPickerUnavailableReason | undefined;
 export {};

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

@@ -1,6 +1,6 @@
 
 import { ChatModeKind, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ILanguageModelChatMetadata } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
+import { ILanguageModelChatMetadata, COPILOT_VENDOR_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 
 function filterModelsForSession(models, sessionType, currentModeKind, location) {
     if (sessionType && sessionType !== "local" && hasModelsTargetingSession(models, sessionType)) {
@@ -36,6 +36,15 @@ function isModelValidForSession(model, allModels, sessionType) {
     }
     return !model.metadata.targetChatSessionType;
 }
+function findBestMatchingModel(previous, pool) {
+    if (!previous || pool.length === 0) {
+        return undefined;
+    }
+    const id = previous.metadata.id?.trim().toLowerCase();
+    const family = previous.metadata.family?.trim().toLowerCase();
+    const name = previous.metadata.name?.trim().toLowerCase();
+    return (id ? pool.find(m => m.metadata.id?.trim().toLowerCase() === id) : undefined) ?? (family ? pool.find(m => m.metadata.family?.trim().toLowerCase() === family) : undefined) ?? (name ? pool.find(m => m.metadata.name?.trim().toLowerCase() === name) : undefined);
+}
 function findDefaultModel(models, location) {
     return models.find(m => m.metadata.isDefaultForLocation[location]) || models[0];
 }
@@ -77,14 +86,14 @@ function shouldResetModelToDefault(currentModel, availableModels, context, allMo
     return false;
 }
 function resolveModelFromSyncState(stateModel, currentModel, allModels, sessionType, context) {
-    if (currentModel && currentModel.identifier === stateModel.identifier) {
+    if (!isModelValidForSession(stateModel, allModels, sessionType)) {
         return {
-            action: "keep"
+            action: "default"
         };
     }
-    if (!isModelValidForSession(stateModel, allModels, sessionType)) {
+    if (currentModel && currentModel.identifier === stateModel.identifier) {
         return {
-            action: "default"
+            action: "keep"
         };
     }
     if (context) {
@@ -108,7 +117,16 @@ function mergeModelsWithCache(liveModels, cachedModels, contributedVendors, reso
         return cachedModels;
     }
     const liveVendors = ( new Set(( liveModels.map(m => m.metadata.vendor))));
-    const usableCached = cachedModels.filter(m => ( contributedVendors.has(m.metadata.vendor)) && !( liveVendors.has(m.metadata.vendor)) && !resolvedVendors?.has(m.metadata.vendor));
+    const usableCached = cachedModels.filter(m => {
+        const vendor = m.metadata.vendor;
+        if (!( contributedVendors.has(vendor)) || ( liveVendors.has(vendor))) {
+            return false;
+        }
+        if (resolvedVendors?.has(vendor) && vendor !== COPILOT_VENDOR_ID) {
+            return false;
+        }
+        return true;
+    });
     return [...liveModels, ...usableCached];
 }
 function shouldResetOnModelListChange(currentModelId, availableModels) {
@@ -124,5 +142,62 @@ function shouldRestoreLateArrivingModel(persistedModelId, persistedAsDefault, mo
     const result = shouldRestorePersistedModel(persistedModelId, persistedAsDefault, [model], location);
     return result.shouldRestore;
 }
+const AUTO_MODEL_ID = "auto";
+function compareModelVersions(a, b) {
+    const rawA = a ?? "";
+    const rawB = b ?? "";
+    const segmentsA = rawA.match(/\d+/g)?.map(Number) ?? [];
+    const segmentsB = rawB.match(/\d+/g)?.map(Number) ?? [];
+    const length = Math.max(segmentsA.length, segmentsB.length);
+    for (let i = 0; i < length; i++) {
+        const numA = segmentsA[i] ?? 0;
+        const numB = segmentsB[i] ?? 0;
+        if (numA !== numB) {
+            return numA - numB;
+        }
+    }
+    return rawA.localeCompare(rawB);
+}
+function resolveConfiguredModel(configuredValue, models) {
+    const value = configuredValue?.trim().toLowerCase();
+    if (!value) {
+        return undefined;
+    }
+    if (value === AUTO_MODEL_ID) {
+        return models.find(m => m.metadata.id?.trim().toLowerCase() === AUTO_MODEL_ID);
+    }
+    const byId = models.find(m => m.metadata.id?.trim().toLowerCase() === value);
+    if (byId) {
+        return byId;
+    }
+    const family = models.filter(m => m.metadata.family?.trim().toLowerCase() === value);
+    if (family.length > 0) {
+        return family.reduce(
+            (latest, candidate) => compareModelVersions(candidate.metadata.version, latest.metadata.version) > 0 ? candidate : latest
+        );
+    }
+    return undefined;
+}
+var ModelPickerUnavailableReason;
+(function(ModelPickerUnavailableReason) {
+    ModelPickerUnavailableReason["Restricted"] = "restricted";
+    ModelPickerUnavailableReason["SetupRequired"] = "setupRequired";
+})(ModelPickerUnavailableReason || (ModelPickerUnavailableReason = {}));
+function getModelPickerUnavailableReason(context) {
+    if (!context.trustInitialized) {
+        return undefined;
+    }
+    if (!context.trusted) {
+        return ModelPickerUnavailableReason.Restricted;
+    }
+    const live = context.liveModelIds instanceof Set ? context.liveModelIds : ( new Set(context.liveModelIds));
+    if (( context.pickerModels.some(model => ( live.has(model.identifier))))) {
+        return undefined;
+    }
+    if (context.requiresSetup) {
+        return ModelPickerUnavailableReason.SetupRequired;
+    }
+    return undefined;
+}
 
-export { filterModelsForSession, findDefaultModel, hasModelsTargetingSession, isModelSupportedForInlineChat, isModelSupportedForMode, isModelValidForSession, mergeModelsWithCache, resolveModelFromSyncState, shouldResetModelToDefault, shouldResetOnModelListChange, shouldRestoreLateArrivingModel, shouldRestorePersistedModel };
+export { ModelPickerUnavailableReason, filterModelsForSession, findBestMatchingModel, findDefaultModel, getModelPickerUnavailableReason, hasModelsTargetingSession, isModelSupportedForInlineChat, isModelSupportedForMode, isModelValidForSession, mergeModelsWithCache, resolveConfiguredModel, resolveModelFromSyncState, shouldResetModelToDefault, shouldResetOnModelListChange, shouldRestoreLateArrivingModel, shouldRestorePersistedModel };

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

@@ -87,7 +87,7 @@ let MobileChatInputCombinedPickerActionItem = class MobileChatInputCombinedPicke
             append(trigger, renderIcon(modeIcon));
         }
         const currentModel = this._modelDelegate.currentModel.get();
-        const labelText = currentModel?.metadata.name ?? ( localize(7735, "Auto"));
+        const labelText = currentModel?.metadata.name ?? ( localize(8315, "Auto"));
         const labelSpan = append(trigger, $("span.chat-input-picker-label"));
         labelSpan.textContent = labelText;
         const ariaParts = [];
@@ -96,7 +96,7 @@ let MobileChatInputCombinedPickerActionItem = class MobileChatInputCombinedPicke
             ariaParts.push(modeLabel);
         }
         ariaParts.push(labelText);
-        trigger.ariaLabel = ( localize(7736, "Pick Mode and Model, {0}", ariaParts.join(", ")));
+        trigger.ariaLabel = ( localize(8316, "Pick Mode and Model, {0}", ariaParts.join(", ")));
     }
     onClick() {}
     async _showSheet() {

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

@@ -5,7 +5,7 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IChatMode } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes";
 import { ILanguageModelChatMetadataAndIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels";
 import { UserSelectedTools } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents";
-import { IToolAndToolSetEnablementMap } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
+import { ToolAndToolSetEnablementMap } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 export declare enum ToolsScope {
     Global = 0,
@@ -26,11 +26,11 @@ export declare class ChatSelectedTools extends Disposable {
      * All tools and tool sets with their enabled state.
      * Tools are filtered based on the current model context.
      */
-    readonly entriesMap: IObservable<IToolAndToolSetEnablementMap>;
+    readonly entriesMap: IObservable<ToolAndToolSetEnablementMap>;
     readonly userSelectedTools: IObservable<UserSelectedTools>;
     get entriesScope(): ToolsScope;
     get currentMode(): IChatMode;
     resetSessionEnablementState(): void;
-    set(enablementMap: IToolAndToolSetEnablementMap, sessionOnly: boolean): void;
+    set(enablementMap: ToolAndToolSetEnablementMap, sessionOnly: boolean): void;
     private updateCustomModeTools;
 }

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

@@ -10,7 +10,7 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { PromptsStorage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
-import { isToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { isToolSet, ToolAndToolSetEnablementMap } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { PromptFileRewriter } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/promptSyntax/promptFileRewriter';
 import { ObservableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/map';
@@ -21,7 +21,7 @@ var ToolEnablementStates;
     function fromMap(map) {
         const toolSets = ( new Map()),
               tools = ( new Map());
-        for (const [entry, enabled] of map.entries()) {
+        for (const [entry, enabled] of map) {
             if (isToolSet(entry)) {
                 toolSets.set(entry.id, enabled);
             } else {
@@ -114,13 +114,16 @@ let ChatSelectedTools = class ChatSelectedTools extends Disposable {
                 }
             }
             for (const toolSet of this._toolsService.getToolSetsForModel(lm, r)) {
+                if (toolSet.hiddenInToolsPicker) {
+                    continue;
+                }
                 const toolSetEnabled = currentMap.toolSets.get(toolSet.id) !== false;
                 map.set(toolSet, toolSetEnabled);
                 for (const tool of toolSet.getTools(r)) {
                     map.set(tool, toolSetEnabled || currentMap.tools.get(tool.id) === true);
                 }
             }
-            return map;
+            return ToolAndToolSetEnablementMap.fromMap(map);
         });
         this.userSelectedTools = derived(r => {
             const result = {};

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

@@ -10,6 +10,7 @@ import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
+import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
 import { AgentSessionTarget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions";
 import { ISessionTypePickerDelegate } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatInputPickerOptions } from "./chatInputPickerActionItem.js";
@@ -22,7 +23,7 @@ import { IGitService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/co
 export declare class DelegationSessionPickerActionItem extends SessionTypePickerActionItem {
     private readonly gitService;
     private readonly _isSessionsWindow;
-    constructor(action: MenuItemAction, chatSessionPosition: "sidebar" | "editor", delegate: ISessionTypePickerDelegate, pickerOptions: IChatInputPickerOptions, actionWidgetService: IActionWidgetService, keybindingService: IKeybindingService, contextKeyService: IContextKeyService, chatSessionsService: IChatSessionsService, commandService: ICommandService, openerService: IOpenerService, telemetryService: ITelemetryService, chatEntitlementService: IChatEntitlementService, configurationService: IConfigurationService, gitService: IGitService);
+    constructor(action: MenuItemAction, chatSessionPosition: "sidebar" | "editor", delegate: ISessionTypePickerDelegate, pickerOptions: IChatInputPickerOptions, actionWidgetService: IActionWidgetService, keybindingService: IKeybindingService, contextKeyService: IContextKeyService, chatSessionsService: IChatSessionsService, commandService: ICommandService, openerService: IOpenerService, telemetryService: ITelemetryService, chatEntitlementService: IChatEntitlementService, languageModelsService: ILanguageModelsService, configurationService: IConfigurationService, gitService: IGitService);
     protected _run(sessionTypeItem: ISessionTypeItem): void;
     protected _getSelectedSessionType(): AgentSessionTarget | undefined;
     protected _isSessionTypeEnabled(type: AgentSessionTarget): boolean;

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

@@ -14,10 +14,13 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IsSessionsWindowContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
+import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
+import { isVisibleEditorChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ACTION_ID_NEW_CHAT } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { getAgentSessionProvider, AgentSessionProviders, getAgentCanContinueIn, isFirstPartyAgentSessionProvider } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import { SessionTypePickerActionItem } from './sessionTargetPickerActionItem.js';
 import { IGitService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/git/common/gitService.service';
+import { isAgentHostTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 
 let DelegationSessionPickerActionItem = class DelegationSessionPickerActionItem extends SessionTypePickerActionItem {
     constructor(
@@ -33,6 +36,7 @@ let DelegationSessionPickerActionItem = class DelegationSessionPickerActionItem
         openerService,
         telemetryService,
         chatEntitlementService,
+        languageModelsService,
         configurationService,
         gitService
     ) {
@@ -49,6 +53,7 @@ let DelegationSessionPickerActionItem = class DelegationSessionPickerActionItem
             openerService,
             telemetryService,
             chatEntitlementService,
+            languageModelsService,
             configurationService
         );
         this.gitService = gitService;
@@ -71,12 +76,15 @@ let DelegationSessionPickerActionItem = class DelegationSessionPickerActionItem
     }
     _isSessionTypeEnabled(type) {
         const allContributions = this.chatSessionsService.getAllChatSessionContributions();
-        const contribution = allContributions.find(contribution => getAgentSessionProvider(contribution.type) === type);
+        const contribution = allContributions.find(
+            contribution => getAgentSessionProvider(contribution.type) === type || contribution.type === type
+        );
         const activeProvider = this.delegate.getActiveSessionProvider();
-        if (!this._isSessionsWindow && activeProvider !== AgentSessionProviders.Local) {
+        const isAgentHostSource = activeProvider !== undefined && isAgentHostTarget(activeProvider);
+        if (!this._isSessionsWindow && activeProvider !== AgentSessionProviders.Local && !isAgentHostSource) {
             return false;
         }
-        if (this._isSessionsWindow && activeProvider !== AgentSessionProviders.Background) {
+        if (this._isSessionsWindow && activeProvider !== AgentSessionProviders.Background && !isAgentHostSource) {
             return false;
         }
         if (this._isSessionsWindow && type === AgentSessionProviders.Cloud && !this._hasGitRepository()) {
@@ -100,18 +108,24 @@ let DelegationSessionPickerActionItem = class DelegationSessionPickerActionItem
         if (this.delegate.getActiveSessionProvider() === type) {
             return true;
         }
+        if (this._isSessionsWindow && type === AgentSessionProviders.Background && this.chatSessionsService.getChatSessionContribution(AgentSessionProviders.AgentHostCopilot)) {
+            return false;
+        }
+        if (!isVisibleEditorChatSessionType(type, this.configurationService, this.chatSessionsService)) {
+            return false;
+        }
         return getAgentCanContinueIn(type);
     }
     _getSessionCategory(sessionTypeItem) {
         if (isFirstPartyAgentSessionProvider(sessionTypeItem.type)) {
             return {
-                label: ( localize(7744, "Continue In")),
+                label: ( localize(8324, "Continue In")),
                 order: 1,
                 showHeader: true
             };
         }
         return {
-            label: ( localize(7745, "Continue In (Third Party)")),
+            label: ( localize(8325, "Continue In (Third Party)")),
             order: 2,
             showHeader: false
         };
@@ -123,7 +137,7 @@ let DelegationSessionPickerActionItem = class DelegationSessionPickerActionItem
         const learnMoreUrl = "https://aka.ms/vscode-continue-chat-in";
         return {
             id: "workbench.action.chat.agentOverview.learnMoreHandOff",
-            label: ( localize(7746, "Learn about agent handoff...")),
+            label: ( localize(8326, "Learn about agent handoff...")),
             tooltip: learnMoreUrl,
             class: undefined,
             enabled: true,
@@ -139,7 +153,7 @@ let DelegationSessionPickerActionItem = class DelegationSessionPickerActionItem
         return [{
             id: "newChatSession",
             class: undefined,
-            label: ( localize(7747, "New Chat Session")),
+            label: ( localize(8327, "New Chat Session")),
             tooltip: "",
             hover: {
                 content: ""
@@ -148,7 +162,7 @@ let DelegationSessionPickerActionItem = class DelegationSessionPickerActionItem
             icon: Codicon.plus,
             enabled: true,
             category: {
-                label: ( localize(7748, "New Chat Session")),
+                label: ( localize(8328, "New Chat Session")),
                 order: 0,
                 showHeader: false
             },
@@ -159,6 +173,6 @@ let DelegationSessionPickerActionItem = class DelegationSessionPickerActionItem
         }];
     }
 };
-DelegationSessionPickerActionItem = ( __decorate([( __param(4, IActionWidgetService)), ( __param(5, IKeybindingService)), ( __param(6, IContextKeyService)), ( __param(7, IChatSessionsService)), ( __param(8, ICommandService)), ( __param(9, IOpenerService)), ( __param(10, ITelemetryService)), ( __param(11, IChatEntitlementService)), ( __param(12, IConfigurationService)), ( __param(13, IGitService))], DelegationSessionPickerActionItem));
+DelegationSessionPickerActionItem = ( __decorate([( __param(4, IActionWidgetService)), ( __param(5, IKeybindingService)), ( __param(6, IContextKeyService)), ( __param(7, IChatSessionsService)), ( __param(8, ICommandService)), ( __param(9, IOpenerService)), ( __param(10, ITelemetryService)), ( __param(11, IChatEntitlementService)), ( __param(12, ILanguageModelsService)), ( __param(13, IConfigurationService)), ( __param(14, IGitService))], DelegationSessionPickerActionItem));
 
 export { DelegationSessionPickerActionItem };

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/media/chatGoalBannerWidget.css

@@ -25,7 +25,7 @@
 	border-top-right-radius: 4px;
 	background-color: color-mix(in srgb, var(--vscode-focusBorder) 6%, var(--vscode-editorWidget-background));
 	color: var(--vscode-foreground);
-	font-size: 12px;
+	font-size: var(--vscode-agents-fontSize-label1);
 	line-height: 18px;
 	min-width: 0;
 }
@@ -39,7 +39,7 @@
 
 .chat-goal-banner .chat-goal-banner-label {
 	flex-shrink: 0;
-	font-weight: 600;
+	font-weight: var(--vscode-agents-fontWeight-semiBold);
 }
 
 .chat-goal-banner .chat-goal-banner-text {

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/media/chatInputNotificationWidget.css

@@ -84,9 +84,9 @@
 
 /* Title */
 .chat-input-notification .chat-input-notification-title {
-	font-size: var(--vscode-chat-font-size-body-s);
-	font-weight: 600;
-	line-height: 1.4;
+	font-size: var(--vscode-agents-fontSize-label1);
+	font-weight: var(--vscode-agents-fontWeight-semiBold);
+	line-height: 18px;
 	color: var(--vscode-foreground);
 	flex: 1;
 	min-width: 0;
@@ -106,9 +106,19 @@
 	margin: 0;
 }
 
+.chat-input-notification .chat-input-notification-title-markdown a,
+.chat-input-notification .chat-input-notification-title-markdown a:visited {
+	color: var(--vscode-textLink-foreground);
+}
+
+.chat-input-notification .chat-input-notification-title-markdown a:hover,
+.chat-input-notification .chat-input-notification-title-markdown a:active {
+	color: var(--vscode-textLink-activeForeground);
+}
+
 .chat-input-notification .chat-input-notification-title-markdown code {
 	font-family: var(--monaco-monospace-font);
-	font-size: 11px;
+	font-size: var(--vscode-agents-fontSize-body2);
 	padding: 0 3px;
 	border-radius: 3px;
 	background: var(--vscode-textCodeBlock-background);
@@ -125,8 +135,8 @@
 
 /* Description */
 .chat-input-notification .chat-input-notification-description {
-	font-size: var(--vscode-chat-font-size-body-s);
-	line-height: 1.4;
+	font-size: var(--vscode-agents-fontSize-label1);
+	line-height: 18px;
 	color: var(--vscode-descriptionForeground);
 	flex: 1 1 auto;
 	min-width: 0;
@@ -146,8 +156,8 @@
 
 /* Action buttons */
 .chat-input-notification .chat-input-notification-action-button {
-	font-size: var(--vscode-chat-font-size-body-s);
-	padding: 2px 8px;
+	font-size: var(--vscode-agents-fontSize-label2);
+	padding: 4px 12px;
 	min-width: unset;
 	width: auto;
 	height: 24px;
@@ -167,8 +177,9 @@
 	opacity: 1;
 }
 
-/* Dismiss button */
-.chat-input-notification .chat-input-notification-dismiss {
+/* Dismiss + mute icon buttons (header, right-aligned) */
+.chat-input-notification .chat-input-notification-dismiss,
+.chat-input-notification .chat-input-notification-mute {
 	display: flex;
 	align-items: center;
 	justify-content: center;
@@ -181,14 +192,19 @@
 	border: none;
 	outline: none;
 	flex-shrink: 0;
+}
+
+.chat-input-notification .chat-input-notification-dismiss {
 	margin-left: auto;
 }
 
-.chat-input-notification .chat-input-notification-dismiss:hover {
+.chat-input-notification .chat-input-notification-dismiss:hover,
+.chat-input-notification .chat-input-notification-mute:hover {
 	background-color: var(--vscode-toolbar-hoverBackground);
 }
 
-.chat-input-notification .chat-input-notification-dismiss:focus-visible {
+.chat-input-notification .chat-input-notification-dismiss:focus-visible,
+.chat-input-notification .chat-input-notification-mute:focus-visible {
 	outline: 1px solid var(--vscode-focusBorder);
 	outline-offset: -1px;
 }

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

@@ -20,6 +20,8 @@ export interface IModePickerDelegate {
     readonly currentMode: IObservable<IChatMode>;
     readonly currentChatModes: IObservable<IChatModes>;
     readonly sessionResource: () => URI | undefined;
+    /** Direct mode-change callback for hosts without a registered IChatWidget (bypasses ToggleAgentModeActionId). */
+    readonly setMode?: (mode: IChatMode) => void;
     /**
      * When set, the mode picker will show custom agents whose target matches this value.
      * Custom agents without a target are always shown in all session types. If no agents match the target, shows a default "Agent" option.
@@ -36,3 +38,4 @@ export declare class ModePickerActionItem extends ChatInputPickerActionViewItem
     render(container: HTMLElement): void;
     protected renderLabel(element: HTMLElement): IDisposable | null;
 }
+export declare function isModeConsideredBuiltIn(mode: IChatMode, productService: IProductService): boolean;

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

@@ -36,8 +36,6 @@ const builtinDefaultIcon = mode => {
     switch (mode.name.get().toLowerCase()) {
     case "ask":
         return Codicon.ask;
-    case "edit":
-        return Codicon.edit;
     case "plan":
         return Codicon.tasklist;
     default:
@@ -66,15 +64,15 @@ let ModePickerActionItem = class ModePickerActionItem extends ChatInputPickerAct
         });
         const getCustomAgentTarget = () => delegate.customAgentTarget?.() ?? Target.Undefined;
         const builtInCategory = {
-            label: ( localize(7769, "Built-In")),
+            label: ( localize(8349, "Built-In")),
             order: 0
         };
         const customCategory = {
-            label: ( localize(7770, "Custom")),
+            label: ( localize(8350, "Custom")),
             order: 1
         };
         const policyDisabledCategory = {
-            label: ( localize(7771, "Managed by your organization")),
+            label: ( localize(8351, "Managed by your organization")),
             order: 999,
             showHeader: true
         };
@@ -89,11 +87,11 @@ let ModePickerActionItem = class ModePickerActionItem extends ChatInputPickerAct
                     if (mode.source?.storage === PromptsStorage.extension) {
                         icon = Codicon.file;
                         id = `viewAgent:${mode.id}`;
-                        label = ( localize(7772, "View {0} agent", mode.label.get()));
+                        label = ( localize(8352, "View {0} agent", mode.label.get()));
                     } else {
                         icon = Codicon.edit;
                         id = `editAgent:${mode.id}`;
-                        label = ( localize(7773, "Edit {0} agent", mode.label.get()));
+                        label = ( localize(8353, "Edit {0} agent", mode.label.get()));
                     }
                     const modeResource = mode.uri;
                     toolbarActions.push({
@@ -125,6 +123,13 @@ let ModePickerActionItem = class ModePickerActionItem extends ChatInputPickerAct
                     if (isDisabledViaPolicy) {
                         return;
                     }
+                    if (this.delegate.setMode && !this.delegate.sessionResource()) {
+                        this.delegate.setMode(mode);
+                        if (this.element) {
+                            this.renderLabel(this.element);
+                        }
+                        return;
+                    }
                     const result = await commandService.executeCommand(ToggleAgentModeActionId, {
                         modeId: mode.id,
                         sessionResource: this.delegate.sessionResource()
@@ -308,12 +313,8 @@ function isModeConsideredBuiltIn(mode, productService) {
     return !isOrganizationPromptFile(modeUri, mode.source.extensionId, productService);
 }
 function shouldShowBuiltInMode(mode, assignments, agentModeDisabledViaPolicy) {
-    if (mode.id === ChatMode.Edit.id || mode.name.get().toLowerCase() === "edit") {
-        if (mode.id === ChatMode.Edit.id) {
-            return agentModeDisabledViaPolicy;
-        } else {
-            return !agentModeDisabledViaPolicy;
-        }
+    if (mode.id === ChatMode.Edit.id) {
+        return agentModeDisabledViaPolicy;
     }
     if (mode.id === ChatMode.Ask.id || mode.name.get().toLowerCase() === "ask") {
         if (mode.id === ChatMode.Ask.id) {
@@ -325,4 +326,4 @@ function shouldShowBuiltInMode(mode, assignments, agentModeDisabledViaPolicy) {
     return true;
 }
 
-export { ModePickerActionItem };
+export { ModePickerActionItem, isModeConsideredBuiltIn };