@codingame/monaco-vscode-katex-common 33.0.9 → 34.0.0

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

@@ -5,10 +5,10 @@ import type { SessionConfigPropertySchema } from "@codingame/monaco-vscode-api/v
 import { IActionWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidget.service";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import type { IAction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import type { IChatWidget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IAgentHostSessionWorkingDirectoryResolver } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionWorkingDirectoryResolver.service";
-import type { IChatInputPickerOptions } from "../../widget/input/chatInputPickerActionItem.js";
 import { IAgentHostUntitledProvisionalSessionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.service";
 /**
  * Returns `true` when an `autoApprove` schema uses the well-known shape the
@@ -20,51 +20,49 @@ import { IAgentHostUntitledProvisionalSessionService } from "@codingame/monaco-v
  */
 export declare function isWellKnownAutoApproveSchema(schema: SessionConfigPropertySchema): boolean;
 /**
- * The set of well-known session-config property names that have a dedicated
- * picker chip in the secondary toolbar (registered as `MenuId.ChatInputSecondary`
- * actions). The generic-fallback chip lane filters these out so unknown
- * properties advertised by an agent get their own chip without duplicating
- * the dedicated ones.
+ * The set of well-known session-config property names that are either handled
+ * by dedicated UI or intentionally hidden from the workbench chat-input chip
+ * lane. The generic-fallback chip lane filters these out so unknown properties
+ * advertised by an agent get their own chip.
  *
  * `Permissions` has no chip — it is surfaced through other UI — but is
  * included so the generic lane does not invent a chip for it.
  */
 export declare const WELL_KNOWN_PICKER_PROPERTIES: ReadonlySet<string>;
 /**
- * Whether the given `(property, schema)` pair will be rendered by a dedicated
- * chip widget on the secondary toolbar. Used by the generic-fallback chip
- * lane to decide whether to render a chip for `property`.
+ * Whether the given `(property, schema)` pair is handled outside the
+ * generic-fallback chip lane. This includes properties rendered by dedicated
+ * chip widgets and properties intentionally hidden from workbench chat.
  *
- * For most well-known keys this is purely a property-name check. AutoApprove
- * is special: only well-known schema shapes are claimed by the dedicated
- * picker; non-conforming schemas (e.g. Claude's approval mode) fall through
- * to the generic lane.
+ * For most well-known keys this is purely a property-name check. AutoApprove is
+ * special: only well-known schema shapes are claimed by the dedicated picker;
+ * non-conforming schemas (e.g. Claude's approval mode) fall through to the
+ * generic lane.
  */
 export declare function isClaimedByDedicatedPicker(property: string, schema: SessionConfigPropertySchema): boolean;
 /**
  * One workbench chat-input chip bound to a single agent-host session-config
  * property. Used both for dedicated well-known property chips
- * (`SessionConfigKey.Mode`, `.Isolation`, `.Branch`, `.AutoApprove`) and for
- * generic per-property chips advertised by an agent's config schema but not
- * known to VS Code.
+ * (`SessionConfigKey.Mode`, `.AutoApprove`) and for generic per-property chips
+ * advertised by an agent's config schema but not known to VS Code.
  */
 export declare class AgentHostChatInputPicker extends Disposable {
     private readonly _widget;
     private readonly _property;
-    private readonly _pickerOptions;
     private readonly _agentHostService;
     private readonly _actionWidgetService;
     private readonly _openerService;
     private readonly _workingDirectoryResolver;
     private readonly _workspaceContextService;
     private readonly _provisional;
+    private readonly _configurationService;
     private readonly _renderDisposables;
     private readonly _filterDelayer;
     private readonly _subRef;
     private _container;
     private _initialResolved;
     private readonly _initialResolveCts;
-    constructor(_widget: IChatWidget, _property: string, _pickerOptions: IChatInputPickerOptions | undefined, _agentHostService: IAgentHostService, _actionWidgetService: IActionWidgetService, _openerService: IOpenerService, _workingDirectoryResolver: IAgentHostSessionWorkingDirectoryResolver, _workspaceContextService: IWorkspaceContextService, _provisional: IAgentHostUntitledProvisionalSessionService);
+    constructor(_widget: IChatWidget, _property: string, _agentHostService: IAgentHostService, _actionWidgetService: IActionWidgetService, _openerService: IOpenerService, _workingDirectoryResolver: IAgentHostSessionWorkingDirectoryResolver, _workspaceContextService: IWorkspaceContextService, _provisional: IAgentHostUntitledProvisionalSessionService, _configurationService: IConfigurationService);
     render(container: HTMLElement): void;
     private _reattach;
     private _cancelInitialResolve;

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

@@ -10,40 +10,29 @@ import { Delayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/asyn
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Disposable, DisposableStore, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IAgentHostService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService.service';
 import { SessionConfigKey, KNOWN_AUTO_APPROVE_VALUES } from '../../../../../../platform/agentHost/common/sessionConfigKeys.js';
 import { ClaudeSessionConfigKey } from '../../../../../../platform/agentHost/common/claudeSessionConfigKeys.js';
-import { ActionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/actions';
+import { ActionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/common/actions';
 import { StateComponents } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/sessionState';
 import { ActionListItemKind } from '@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionList';
 import { IActionWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidget.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { isUntitledChatSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { IAgentHostSessionWorkingDirectoryResolver } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionWorkingDirectoryResolver.service';
 import { IAgentHostUntitledProvisionalSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.service';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { toAgentHostBackendSessionUri } from './agentHostSessionUri.js';
 
 registerCss(agentHostChatInputPicker);
 const FILTER_THRESHOLD = 10;
 const LEARN_MORE_VALUE = "__agentHostChatInputPicker.learnMore__";
-const PERMISSION_MODE_LEARN_MORE_URL = "https://code.visualstudio.com/docs/copilot/agents/agent-tools#_permission-levels";
+const PERMISSION_MODE_LEARN_MORE_URL = "https://aka.ms/vscode/docs/permissions";
 function getConfigIcon(property, value) {
-    if (property === SessionConfigKey.Isolation) {
-        if (value === "folder") {
-            return Codicon.folder;
-        }
-        if (value === "worktree") {
-            return Codicon.worktree;
-        }
-        return undefined;
-    }
-    if (property === SessionConfigKey.Branch) {
-        return Codicon.gitBranch;
-    }
     if (property === SessionConfigKey.Mode) {
         switch (value) {
         case "plan":
@@ -65,7 +54,16 @@ function getConfigIcon(property, value) {
     }
     return undefined;
 }
-function toActionItems(property, items, currentValue) {
+function isAutoApprovePolicyRestricted(configurationService) {
+    return configurationService.inspect(ChatConfiguration.GlobalAutoApprove).policyValue === false;
+}
+function normalizeConfigValue(property, value, policyRestricted) {
+    if (property === SessionConfigKey.AutoApprove && policyRestricted && (value === "autoApprove" || value === "autopilot")) {
+        return "default";
+    }
+    return value;
+}
+function toActionItems(property, items, currentValue, policyRestricted = false) {
     return (items.map(item => ({
         kind: ActionListItemKind.Action,
         label: item.label,
@@ -74,12 +72,19 @@ function toActionItems(property, items, currentValue) {
             title: "",
             icon: getConfigIcon(property, item.value)
         },
+        disabled: policyRestricted && property === SessionConfigKey.AutoApprove && (item.value === "autoApprove" || item.value === "autopilot"),
         item: {
             ...item,
-            label: item.value === currentValue ? `${item.label} ${( localize(5207, "(Selected)"))}` : item.label
+            label: isSelectedValue(currentValue, item.value) ? `${item.label} ${( localize(5269, "(Selected)"))}` : item.label
         }
     })));
 }
+function isSelectedValue(currentValue, itemValue) {
+    if (typeof currentValue === "boolean") {
+        return currentValue === (itemValue === "true");
+    }
+    return itemValue === currentValue;
+}
 function renderPickerTrigger(slot, disabled, disposables, onOpen) {
     const trigger = append(slot, disabled ? $("span.action-label") : $("a.action-label"));
     if (disabled) {
@@ -105,22 +110,6 @@ function renderPickerTrigger(slot, disabled, disposables, onOpen) {
     slot.classList.toggle("disabled", disabled);
     return trigger;
 }
-function toBackendSessionUri(sessionResource) {
-    const scheme = sessionResource.scheme;
-    const prefix = "agent-host-";
-    if (!scheme.startsWith(prefix)) {
-        return undefined;
-    }
-    const provider = scheme.substring(prefix.length);
-    if (!provider) {
-        return undefined;
-    }
-    const rawId = sessionResource.path.replace(/^\//, "");
-    return ( URI.from({
-        scheme: provider,
-        path: `/${rawId}`
-    }));
-}
 function isWellKnownAutoApproveSchema(schema) {
     if (schema.type !== "string" || !Array.isArray(schema.enum) || schema.enum.length === 0) {
         return false;
@@ -133,6 +122,8 @@ function isWellKnownAutoApproveSchema(schema) {
 const WELL_KNOWN_PICKER_PROPERTIES = ( new Set([
     SessionConfigKey.Mode,
     SessionConfigKey.AutoApprove,
+    SessionConfigKey.Isolation,
+    SessionConfigKey.Branch,
     SessionConfigKey.Permissions,
     ClaudeSessionConfigKey.PermissionMode
 ]));
@@ -146,24 +137,24 @@ let AgentHostChatInputPicker = class AgentHostChatInputPicker extends Disposable
     constructor(
         _widget,
         _property,
-        _pickerOptions,
         _agentHostService,
         _actionWidgetService,
         _openerService,
         _workingDirectoryResolver,
         _workspaceContextService,
-        _provisional
+        _provisional,
+        _configurationService
     ) {
         super();
         this._widget = _widget;
         this._property = _property;
-        this._pickerOptions = _pickerOptions;
         this._agentHostService = _agentHostService;
         this._actionWidgetService = _actionWidgetService;
         this._openerService = _openerService;
         this._workingDirectoryResolver = _workingDirectoryResolver;
         this._workspaceContextService = _workspaceContextService;
         this._provisional = _provisional;
+        this._configurationService = _configurationService;
         this._renderDisposables = this._register(( new DisposableStore()));
         this._filterDelayer = this._register(( new Delayer(200)));
         this._subRef = this._register(( new MutableDisposable()));
@@ -171,13 +162,6 @@ let AgentHostChatInputPicker = class AgentHostChatInputPicker extends Disposable
         this._register(this._widget.onDidChangeViewModel(() => {
             this._reattach();
         }));
-        const opts = this._pickerOptions;
-        if (opts) {
-            this._register(autorun(reader => {
-                opts.hideChevrons.read(reader);
-                this._renderChip();
-            }));
-        }
         this._register(this._provisional.onDidChange(sessionResource => {
             const current = this._widget.viewModel?.sessionResource;
             if (current && ( current.toString()) === ( sessionResource.toString())) {
@@ -195,7 +179,7 @@ let AgentHostChatInputPicker = class AgentHostChatInputPicker extends Disposable
     _reattach() {
         const sessionResource = this._widget.viewModel?.sessionResource;
         const provisionalBackend = sessionResource ? this._provisional.get(sessionResource) : undefined;
-        const backendSession = provisionalBackend ?? (sessionResource ? toBackendSessionUri(sessionResource) : undefined);
+        const backendSession = provisionalBackend ?? (sessionResource ? toAgentHostBackendSessionUri(sessionResource) : undefined);
         if (!sessionResource || !backendSession) {
             this._subRef.clear();
             this._initialResolved = undefined;
@@ -215,7 +199,7 @@ let AgentHostChatInputPicker = class AgentHostChatInputPicker extends Disposable
         }
         this._initialResolved = undefined;
         this._cancelInitialResolve();
-        const ref = this._agentHostService.getSubscription(StateComponents.Session, backendSession);
+        const ref = this._agentHostService.getSubscription(StateComponents.Session, backendSession, "AgentHostChatInputPicker");
         const sub = ref.object;
         const listener = sub.onDidChange(() => this._renderChip());
         this._subRef.value = {
@@ -282,7 +266,6 @@ let AgentHostChatInputPicker = class AgentHostChatInputPicker extends Disposable
     }
     _renderTrigger(trigger, schema, value, isReadOnly) {
         clearNode(trigger);
-        const compact = this._pickerOptions?.hideChevrons.get() ?? false;
         const icon = getConfigIcon(this._property, value);
         if (icon) {
             append(trigger, renderIcon(icon));
@@ -292,16 +275,14 @@ let AgentHostChatInputPicker = class AgentHostChatInputPicker extends Disposable
             trigger.classList.toggle("info", value === "autoApprove");
         }
         const label = this._labelFor(schema, value);
-        if (!compact) {
-            const labelSpan = append(trigger, $("span.agent-host-chat-input-picker-label"));
-            labelSpan.textContent = label;
-        }
-        trigger.setAttribute("aria-label", isReadOnly ? ( localize(5208, "{0}: {1}, Read-Only", schema.title, label)) : ( localize(5209, "{0}: {1}", schema.title, label)));
-        if (!isReadOnly && !compact) {
-            append(trigger, renderIcon(Codicon.chevronDown));
-        }
+        const labelSpan = append(trigger, $("span.agent-host-chat-input-picker-label"));
+        labelSpan.textContent = label;
+        trigger.setAttribute("aria-label", isReadOnly ? ( localize(5270, "{0}: {1}, Read-Only", schema.title, label)) : ( localize(5271, "{0}: {1}", schema.title, label)));
     }
     _labelFor(schema, value) {
+        if (schema.type === "boolean") {
+            return value === true ? ( localize(5272, "On")) : ( localize(5273, "Off"));
+        }
         if (typeof value === "string") {
             const index = schema.enum?.indexOf(value) ?? -1;
             return index >= 0 ? schema.enumLabels?.[index] ?? value : value;
@@ -336,7 +317,7 @@ let AgentHostChatInputPicker = class AgentHostChatInputPicker extends Disposable
             if (!schema) {
                 return undefined;
             }
-            const backendSession = toBackendSessionUri(sessionResource);
+            const backendSession = toAgentHostBackendSessionUri(sessionResource);
             if (!backendSession) {
                 return undefined;
             }
@@ -362,18 +343,19 @@ let AgentHostChatInputPicker = class AgentHostChatInputPicker extends Disposable
             return;
         }
         const currentValue = ctx.value;
-        const actionItems = toActionItems(this._property, items, currentValue);
+        const policyRestricted = isAutoApprovePolicyRestricted(this._configurationService);
+        const actionItems = toActionItems(this._property, items, currentValue, policyRestricted);
         if (this._property === ClaudeSessionConfigKey.PermissionMode || this._property === SessionConfigKey.AutoApprove) {
             actionItems.push({
                 kind: ActionListItemKind.Action,
-                label: ( localize(5210, "Learn more about permissions")),
+                label: ( localize(5274, "Learn more about permissions")),
                 group: {
                     title: "",
                     icon: Codicon.blank
                 },
                 item: {
                     value: LEARN_MORE_VALUE,
-                    label: ( localize(5210, "Learn more about permissions"))
+                    label: ( localize(5274, "Learn more about permissions"))
                 }
             });
         }
@@ -394,7 +376,8 @@ let AgentHostChatInputPicker = class AgentHostChatInputPicker extends Disposable
                 return toActionItems(
                     this._property,
                     await this._getItems(refreshed.schema, query),
-                    refreshed.value
+                    refreshed.value,
+                    isAutoApprovePolicyRestricted(this._configurationService)
                 );
             }) : undefined,
             onHide: () => trigger.focus()
@@ -409,17 +392,26 @@ let AgentHostChatInputPicker = class AgentHostChatInputPicker extends Disposable
             [],
             {
                 getAriaLabel: item => item.label ?? "",
-                getWidgetAriaLabel: () => ( localize(5211, "{0} Picker", ctx.schema.title))
+                getWidgetAriaLabel: () => ( localize(5275, "{0} Picker", ctx.schema.title))
             },
             actionItems.length > FILTER_THRESHOLD || ctx.schema.enumDynamic ? {
                 showFilter: true,
-                filterPlaceholder: ( localize(5212, "Filter..."))
+                filterPlaceholder: ( localize(5276, "Filter..."))
             } : undefined
         );
     }
     async _getItems(schema, query) {
+        if (schema.type === "boolean") {
+            return [{
+                value: "true",
+                label: ( localize(5277, "On"))
+            }, {
+                value: "false",
+                label: ( localize(5278, "Off"))
+            }];
+        }
         const sessionResource = this._widget.viewModel?.sessionResource;
-        const backendSession = this._subRef.value?.backendSession ?? (sessionResource ? toBackendSessionUri(sessionResource) : undefined);
+        const backendSession = this._subRef.value?.backendSession ?? (sessionResource ? toAgentHostBackendSessionUri(sessionResource) : undefined);
         if (schema.enumDynamic && backendSession) {
             try {
                 const result = await this._agentHostService.sessionConfigCompletions({
@@ -455,19 +447,34 @@ let AgentHostChatInputPicker = class AgentHostChatInputPicker extends Disposable
         return (sessionResource && this._workingDirectoryResolver.resolve(sessionResource)) ?? this._workspaceContextService.getWorkspace().folders[0]?.uri;
     }
     _readCurrentValues() {
+        const sessionResource = this._widget.viewModel?.sessionResource;
+        const overlay = sessionResource ? this._provisional.getResolvedConfig(sessionResource) : undefined;
         const state = this._subRef.value?.sub.value;
         if (state && !(state instanceof Error)) {
-            return state.config?.values;
+            return {
+                ...(state.config?.values ?? {}),
+                ...(overlay?.values ?? {})
+            };
         }
-        return this._initialResolved?.result.values;
+        return overlay?.values ?? this._initialResolved?.result.values;
     }
     async _setValue(backendSession, value) {
         const sessionResource = this._widget.viewModel?.sessionResource;
         if (!sessionResource) {
             return;
         }
+        const ctx = this._readContext();
+        const normalizedValue = ctx?.schema.type === "boolean" ? value === "true" : normalizeConfigValue(
+            this._property,
+            value,
+            isAutoApprovePolicyRestricted(this._configurationService)
+        );
         const partial = {
-            [this._property]: value
+            [this._property]: normalizedValue
+        };
+        const nextConfig = {
+            ...(this._readCurrentValues() ?? {}),
+            ...partial
         };
         if (isUntitledChatSession(sessionResource)) {
             const provider = backendSession.scheme;
@@ -480,14 +487,19 @@ let AgentHostChatInputPicker = class AgentHostChatInputPicker extends Disposable
             }
             return;
         }
-        this._agentHostService.dispatch({
+        this._agentHostService.dispatch(( backendSession.toString()), {
             type: ActionType.SessionConfigChanged,
-            session: ( backendSession.toString()),
             config: partial
         });
+        void this._provisional.refreshResolvedConfig(
+            sessionResource,
+            backendSession.scheme,
+            this._readWorkingDirectory(),
+            nextConfig
+        );
     }
 };
-AgentHostChatInputPicker = ( __decorate([( __param(3, IAgentHostService)), ( __param(4, IActionWidgetService)), ( __param(5, IOpenerService)), ( __param(6, IAgentHostSessionWorkingDirectoryResolver)), ( __param(7, IWorkspaceContextService)), ( __param(8, IAgentHostUntitledProvisionalSessionService))], AgentHostChatInputPicker));
+AgentHostChatInputPicker = ( __decorate([( __param(2, IAgentHostService)), ( __param(3, IActionWidgetService)), ( __param(4, IOpenerService)), ( __param(5, IAgentHostSessionWorkingDirectoryResolver)), ( __param(6, IWorkspaceContextService)), ( __param(7, IAgentHostUntitledProvisionalSessionService)), ( __param(8, IConfigurationService))], AgentHostChatInputPicker));
 class AgentHostChatInputPickerActionViewItem extends BaseActionViewItem {
     constructor(action, _picker) {
         super(undefined, action);

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

@@ -2,7 +2,6 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IAgentHostService } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentService.service";
 import type { IChatWidget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
-import type { IChatInputPickerOptions } from "../../widget/input/chatInputPickerActionItem.js";
 import { IAgentHostSessionWorkingDirectoryResolver } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionWorkingDirectoryResolver.service";
 import { IAgentHostUntitledProvisionalSessionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
@@ -18,7 +17,6 @@ import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs
  */
 export declare class AgentHostGenericConfigChips extends Disposable {
     private readonly _widget;
-    private readonly _pickerOptions;
     private readonly _instantiationService;
     private readonly _agentHostService;
     private readonly _provisional;
@@ -34,7 +32,7 @@ export declare class AgentHostGenericConfigChips extends Disposable {
     private readonly _subRef;
     private _initialResolved;
     private readonly _initialResolveCts;
-    constructor(_widget: IChatWidget, _pickerOptions: IChatInputPickerOptions | undefined, _instantiationService: IInstantiationService, _agentHostService: IAgentHostService, _provisional: IAgentHostUntitledProvisionalSessionService, _workingDirectoryResolver: IAgentHostSessionWorkingDirectoryResolver, _workspaceContextService: IWorkspaceContextService);
+    constructor(_widget: IChatWidget, _instantiationService: IInstantiationService, _agentHostService: IAgentHostService, _provisional: IAgentHostUntitledProvisionalSessionService, _workingDirectoryResolver: IAgentHostSessionWorkingDirectoryResolver, _workspaceContextService: IWorkspaceContextService);
     render(container: HTMLElement): void;
     private _reattach;
     private _cancelInitialResolve;

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

@@ -12,27 +12,11 @@ import { isClaimedByDedicatedPicker, AgentHostChatInputPicker } from './agentHos
 import { IAgentHostSessionWorkingDirectoryResolver } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostSessionWorkingDirectoryResolver.service';
 import { IAgentHostUntitledProvisionalSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentHost/agentHostUntitledProvisionalSessionService.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+import { toAgentHostBackendSessionUri } from './agentHostSessionUri.js';
 
-function toBackendSessionUri(sessionResource) {
-    const scheme = sessionResource.scheme;
-    const prefix = "agent-host-";
-    if (!scheme.startsWith(prefix)) {
-        return undefined;
-    }
-    const provider = scheme.substring(prefix.length);
-    if (!provider) {
-        return undefined;
-    }
-    const rawId = sessionResource.path.replace(/^\//, "");
-    return ( URI.from({
-        scheme: provider,
-        path: `/${rawId}`
-    }));
-}
 let AgentHostGenericConfigChips = class AgentHostGenericConfigChips extends Disposable {
     constructor(
         _widget,
-        _pickerOptions,
         _instantiationService,
         _agentHostService,
         _provisional,
@@ -41,7 +25,6 @@ let AgentHostGenericConfigChips = class AgentHostGenericConfigChips extends Disp
     ) {
         super();
         this._widget = _widget;
-        this._pickerOptions = _pickerOptions;
         this._instantiationService = _instantiationService;
         this._agentHostService = _agentHostService;
         this._provisional = _provisional;
@@ -66,7 +49,7 @@ let AgentHostGenericConfigChips = class AgentHostGenericConfigChips extends Disp
     _reattach() {
         const sessionResource = this._widget.viewModel?.sessionResource;
         const provisionalBackend = sessionResource ? this._provisional.get(sessionResource) : undefined;
-        const backendSession = provisionalBackend ?? (sessionResource ? toBackendSessionUri(sessionResource) : undefined);
+        const backendSession = provisionalBackend ?? (sessionResource ? toAgentHostBackendSessionUri(sessionResource) : undefined);
         if (!sessionResource || !backendSession) {
             this._subRef.clear();
             this._initialResolved = undefined;
@@ -85,7 +68,7 @@ let AgentHostGenericConfigChips = class AgentHostGenericConfigChips extends Disp
         }
         this._initialResolved = undefined;
         this._cancelInitialResolve();
-        const ref = this._agentHostService.getSubscription(StateComponents.Session, backendSession);
+        const ref = this._agentHostService.getSubscription(StateComponents.Session, backendSession, "AgentHostGenericConfigChips");
         const sub = ref.object;
         const listener = sub.onDidChange(() => this._sync());
         this._subRef.value = {
@@ -168,7 +151,7 @@ let AgentHostGenericConfigChips = class AgentHostGenericConfigChips extends Disp
             if (( this._chips.has(property))) {
                 continue;
             }
-            const chip = this._instantiationService.createInstance(AgentHostChatInputPicker, this._widget, property, this._pickerOptions);
+            const chip = this._instantiationService.createInstance(AgentHostChatInputPicker, this._widget, property);
             const slot = append(
                 this._container,
                 $(".agent-host-generic-chip-slot.chat-input-picker-item")
@@ -183,6 +166,6 @@ let AgentHostGenericConfigChips = class AgentHostGenericConfigChips extends Disp
         }
     }
 };
-AgentHostGenericConfigChips = ( __decorate([( __param(2, IInstantiationService)), ( __param(3, IAgentHostService)), ( __param(4, IAgentHostUntitledProvisionalSessionService)), ( __param(5, IAgentHostSessionWorkingDirectoryResolver)), ( __param(6, IWorkspaceContextService))], AgentHostGenericConfigChips));
+AgentHostGenericConfigChips = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IAgentHostService)), ( __param(3, IAgentHostUntitledProvisionalSessionService)), ( __param(4, IAgentHostSessionWorkingDirectoryResolver)), ( __param(5, IWorkspaceContextService))], AgentHostGenericConfigChips));
 
 export { AgentHostGenericConfigChips };

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

@@ -0,0 +1,2 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+export declare function toAgentHostBackendSessionUri(sessionResource: URI): URI | undefined;

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

@@ -0,0 +1,21 @@
+
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+
+function toAgentHostBackendSessionUri(sessionResource) {
+    const scheme = sessionResource.scheme;
+    const prefix = "agent-host-";
+    if (!scheme.startsWith(prefix)) {
+        return undefined;
+    }
+    const provider = scheme.substring(prefix.length);
+    if (!provider) {
+        return undefined;
+    }
+    const rawId = sessionResource.path.replace(/^\//, "");
+    return ( URI.from({
+        scheme: provider,
+        path: `/${rawId}`
+    }));
+}
+
+export { toAgentHostBackendSessionUri };

package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentHost/media/agentHostChatInputPicker.css

@@ -37,7 +37,8 @@
 	align-items: center;
 	gap: 4px;
 	height: 16px;
-	padding: 3px 0 3px 6px;
+	padding: 3px 6px;
+	border-radius: 4px;
 	color: var(--vscode-icon-foreground);
 }
 
@@ -66,7 +67,7 @@
 .chat-secondary-generic-chips {
 	display: inline-flex;
 	align-items: center;
-	gap: 6px;
+	gap: 12px;
 
 	&:empty {
 		display: none;
@@ -87,6 +88,21 @@
 			font-size: 12px;
 		}
 	}
+
+	> .agent-host-generic-chip-slot + .agent-host-generic-chip-slot {
+		box-shadow: -5px 0 0 -4px var(--vscode-editorWidget-border);
+	}
+}
+
+/* Collapse agent host picker labels to icon-only when the secondary toolbar gets narrow. */
+.interactive-session .chat-secondary-toolbar {
+	container-type: inline-size;
+}
+
+@container (max-width: 480px) {
+	.agent-host-chat-input-picker-label {
+		display: none;
+	}
 }
 
 /*
@@ -125,29 +141,3 @@
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
-
-/*
- * Right-align the Branch + Isolation chips within the secondary chat-input
- * toolbar. The picker tags its host element with a per-property modifier
- * class (`agent-host-chat-input-picker-host-branch`) so these selectors can
- * target just the right-aligned pair without affecting Mode. Branch (when
- * present) takes the leading `margin-left: auto`; Isolation otherwise. With
- * both present the Isolation rule is suppressed by the general-sibling
- * selector below that detects a preceding (visible) Branch chip.
- */
-.chat-secondary-input-toolbar .monaco-action-bar .actions-container > .action-item.agent-host-chat-input-picker-host-branch {
-	margin-left: auto;
-}
-
-.chat-secondary-input-toolbar .monaco-action-bar .actions-container > .action-item.agent-host-chat-input-picker-host-isolation {
-	margin-left: auto;
-}
-
-/*
- * Suppress Isolation's leading-margin only when a *visible* Branch chip
- * precedes it. Hidden chips keep the `agent-host-chat-input-picker-host-hidden`
- * marker so this selector can ignore them.
- */
-.chat-secondary-input-toolbar .monaco-action-bar .actions-container > .action-item.agent-host-chat-input-picker-host-branch:not(.agent-host-chat-input-picker-host-hidden) ~ .action-item.agent-host-chat-input-picker-host-isolation {
-	margin-left: 0;
-}