@codingame/monaco-vscode-api 33.0.9 → 34.0.0

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

@@ -24,7 +24,7 @@ var AgentSessionProviders;
     AgentSessionProviders["Claude"] = "claude-code";
     AgentSessionProviders["Codex"] = "openai-codex";
     AgentSessionProviders["Growth"] = "copilot-growth";
-    AgentSessionProviders["AgentHostCopilot"] = "agent-host-copilot";
+    AgentSessionProviders["AgentHostCopilot"] = "agent-host-copilotcli";
 })(AgentSessionProviders || (AgentSessionProviders = {}));
 function isBuiltInAgentSessionProvider(provider) {
     return provider === AgentSessionProviders.Local || provider === AgentSessionProviders.Background || provider === AgentSessionProviders.Cloud || provider === AgentSessionProviders.Claude;
@@ -46,11 +46,11 @@ function getAgentSessionProvider(sessionResource) {
 function getAgentSessionProviderName(provider) {
     switch (provider) {
     case AgentSessionProviders.Local:
-        return localize(5230, "Local");
+        return localize(5296, "Local");
     case AgentSessionProviders.Background:
-        return localize(5231, "Copilot CLI");
+        return localize(5297, "Copilot CLI");
     case AgentSessionProviders.Cloud:
-        return localize(5232, "Cloud");
+        return localize(5298, "Cloud");
     case AgentSessionProviders.Claude:
         return "Claude";
     case AgentSessionProviders.Codex:
@@ -58,7 +58,7 @@ function getAgentSessionProviderName(provider) {
     case AgentSessionProviders.Growth:
         return "Growth";
     case AgentSessionProviders.AgentHostCopilot:
-        return "Copilot CLI [Local]";
+        return localize(5299, "Copilot CLI [Agent Host]");
     default:
         return provider;
     }
@@ -117,31 +117,31 @@ function getAgentSessionProviderDescription(provider) {
     switch (provider) {
     case AgentSessionProviders.Local:
         return localize(
-            5233,
+            5300,
             "Run tasks within VS Code chat. The agent iterates via chat and works interactively to implement changes on your main workspace."
         );
     case AgentSessionProviders.Background:
         return localize(
-            5234,
+            5301,
             "Delegate tasks to a background agent running locally on your machine. The agent iterates via chat and works asynchronously in a Git worktree to implement changes isolated from your main workspace using the GitHub Copilot CLI."
         );
     case AgentSessionProviders.Cloud:
         return localize(
-            5235,
+            5302,
             "Delegate tasks to the GitHub Copilot coding agent. The agent iterates via chat and works asynchronously in the cloud to implement changes and pull requests as needed."
         );
     case AgentSessionProviders.Claude:
         return localize(
-            5236,
+            5303,
             "Delegate tasks to the Claude Agent SDK using the Claude models included in your GitHub Copilot subscription. The agent iterates via chat and works interactively to implement changes on your main workspace."
         );
     case AgentSessionProviders.Codex:
         return localize(
-            5237,
+            5304,
             "Opens a new Codex session in the editor. Codex sessions can be managed from the chat sessions view."
         );
     case AgentSessionProviders.Growth:
-        return localize(5238, "Learn about Copilot features.");
+        return localize(5305, "Learn about Copilot features.");
     case AgentSessionProviders.AgentHostCopilot:
         return "Run a Copilot SDK agent in a dedicated process.";
     default:
@@ -163,20 +163,20 @@ registerColor("agentSessionReadIndicator.foreground", {
     light: ( transparent(foreground, 0.2)),
     hcDark: null,
     hcLight: null
-}, ( localize(5239, "Foreground color for the read indicator in an agent session.")));
+}, ( localize(5306, "Foreground color for the read indicator in an agent session.")));
 registerColor("agentSessionSelectedBadge.border", {
     dark: ( transparent(listActiveSelectionForeground, 0.3)),
     light: ( transparent(listActiveSelectionForeground, 0.3)),
     hcDark: foreground,
     hcLight: foreground
-}, ( localize(5240, "Border color for the badges in selected agent session items.")));
+}, ( localize(5307, "Border color for the badges in selected agent session items.")));
 registerColor("agentSessionSelectedUnfocusedBadge.border", {
     dark: ( transparent(foreground, 0.3)),
     light: ( transparent(foreground, 0.3)),
     hcDark: foreground,
     hcLight: foreground
 }, ( localize(
-    5241,
+    5308,
     "Border color for the badges in selected agent session items when the view is unfocused."
 )));
 const AGENT_SESSION_RENAME_ACTION_ID = "agentSession.rename";

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

@@ -73,6 +73,7 @@ export interface IAgentSession extends IAgentSessionData {
     setRead(read: boolean): void;
 }
 export declare function isLocalAgentSessionItem(session: IAgentSession): boolean;
+export declare function isAgentHostAgentSessionItem(session: IAgentSession): boolean;
 export declare function isAgentSession(obj: unknown): obj is IAgentSession;
 export declare function isAgentSessionsModel(obj: unknown): obj is IAgentSessionsModel;
 export declare function countUnreadSessions(sessions: IAgentSession[]): number;
@@ -155,6 +156,14 @@ export declare class AgentSessionsModel extends Disposable implements IAgentSess
     private toAgentSession;
     private static readonly UNREAD_MARKER;
     private readonly sessionStates;
+    /**
+     * Resolve the state entry for a session, honoring a one-way migration from
+     * {@link IAgentSessionData.legacyResource} when no entry yet exists for the
+     * session's current resource. Adopts the legacy entry forward (copies it onto
+     * the current resource key and removes the legacy entry). Returns undefined if
+     * neither a current nor a legacy entry exists.
+     */
+    private resolveStateEntry;
     private isArchived;
     private setArchived;
     private isPinned;

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

@@ -25,7 +25,7 @@ import { IChatEntitlementService } from '../../../../services/chat/common/chatEn
 import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.service.js';
 import { Extensions } from '../../../../services/output/common/output.js';
 import { IOutputService } from '../../../../services/output/common/output.service.js';
-import { ChatSessionStatus, isSessionInProgressStatus } from '../../common/chatSessionsService.js';
+import { isAgentHostTarget, ChatSessionStatus, isSessionInProgressStatus } from '../../common/chatSessionsService.js';
 import { IChatSessionsService } from '../../common/chatSessionsService.service.js';
 import { getChatSessionType } from '../../common/model/chatUri.js';
 import { IChatWidgetService } from '../chat.service.js';
@@ -65,6 +65,9 @@ function getAgentChangesSummary(changes) {
 function isLocalAgentSessionItem(session) {
     return session.providerType === AgentSessionProviders.Local;
 }
+function isAgentHostAgentSessionItem(session) {
+    return isAgentHostTarget(session.providerType);
+}
 function isAgentSession(obj) {
     const session = obj;
     return URI.isUri(session?.resource) && typeof session.isArchived === "function" && typeof session.setArchived === "function" && typeof session.isPinned === "function" && typeof session.setPinned === "function" && typeof session.isRead === "function" && typeof session.isMarkedUnread === "function" && typeof session.setRead === "function";
@@ -102,7 +105,7 @@ function isMarshalledAgentSessionContext(thing) {
     return false;
 }
 const agentSessionsOutputChannelId = "agentSessionsOutput";
-const agentSessionsOutputChannelLabel = ( localize(5306, "Agent Sessions"));
+const agentSessionsOutputChannelLabel = ( localize(5373, "Agent Sessions"));
 function statusToString(status) {
     switch (status) {
     case ChatSessionStatus.Failed:
@@ -461,7 +464,8 @@ let AgentSessionsModel = class AgentSessionsModel extends Disposable {
                     archived: session.archived,
                     timing: session.timing,
                     changes: normalizedChanges,
-                    metadata: session.metadata
+                    metadata: session.metadata,
+                    legacyResource: session.legacyResource
                 }));
             }
         }
@@ -490,8 +494,30 @@ let AgentSessionsModel = class AgentSessionsModel extends Disposable {
     static {
         this.UNREAD_MARKER = -1;
     }
+    resolveStateEntry(session) {
+        const own = this.sessionStates.get(session.resource);
+        if (own !== undefined) {
+            return own;
+        }
+        const legacy = session.legacyResource;
+        if (!legacy) {
+            return undefined;
+        }
+        if (legacy.scheme !== session.resource.scheme || ( legacy.toString()) === ( session.resource.toString())) {
+            return undefined;
+        }
+        const prev = this.sessionStates.get(legacy);
+        if (prev === undefined) {
+            return undefined;
+        }
+        this.sessionStates.set(session.resource, {
+            ...prev
+        });
+        this.sessionStates.delete(legacy);
+        return this.sessionStates.get(session.resource);
+    }
     isArchived(session) {
-        return this.sessionStates.get(session.resource)?.archived ?? Boolean(session.archived);
+        return this.resolveStateEntry(session)?.archived ?? Boolean(session.archived);
     }
     setArchived(session, archived) {
         if (archived) {
@@ -500,7 +526,7 @@ let AgentSessionsModel = class AgentSessionsModel extends Disposable {
         if (archived === this.isArchived(session)) {
             return;
         }
-        const state = this.sessionStates.get(session.resource) ?? {};
+        const state = this.resolveStateEntry(session) ?? {};
         this.sessionStates.set(session.resource, {
             ...state,
             archived
@@ -512,13 +538,13 @@ let AgentSessionsModel = class AgentSessionsModel extends Disposable {
         this._onDidChangeSessions.fire();
     }
     isPinned(session) {
-        return this.sessionStates.get(session.resource)?.pinned ?? false;
+        return this.resolveStateEntry(session)?.pinned ?? false;
     }
     setPinned(session, pinned) {
         if (pinned === this.isPinned(session)) {
             return;
         }
-        const state = this.sessionStates.get(session.resource) ?? {};
+        const state = this.resolveStateEntry(session) ?? {};
         this.sessionStates.set(session.resource, {
             ...state,
             pinned
@@ -526,13 +552,13 @@ let AgentSessionsModel = class AgentSessionsModel extends Disposable {
         this._onDidChangeSessions.fire();
     }
     isMarkedUnread(session) {
-        return this.sessionStates.get(session.resource)?.read === AgentSessionsModel_1.UNREAD_MARKER;
+        return this.resolveStateEntry(session)?.read === AgentSessionsModel_1.UNREAD_MARKER;
     }
     isRead(session) {
         if (this.isArchived(session)) {
             return true;
         }
-        const storedReadDate = this.sessionStates.get(session.resource)?.read;
+        const storedReadDate = this.resolveStateEntry(session)?.read;
         if (storedReadDate === AgentSessionsModel_1.UNREAD_MARKER) {
             return false;
         }
@@ -549,7 +575,7 @@ let AgentSessionsModel = class AgentSessionsModel extends Disposable {
         return session.timing.lastRequestEnded ?? session.timing.created;
     }
     setRead(session, read, skipEvent) {
-        const state = this.sessionStates.get(session.resource) ?? {};
+        const state = this.resolveStateEntry(session) ?? {};
         let newRead;
         if (read) {
             newRead = Math.max(Date.now(), this.sessionTimeForReadStateTracking(session));
@@ -616,7 +642,8 @@ let AgentSessionsCache = class AgentSessionsCache {
             archived: session.archived,
             timing: session.timing,
             changes: session.changes,
-            metadata: session.metadata
+            metadata: session.metadata,
+            legacyResource: session.legacyResource?.toString()
         })));
         this.storageService.store(
             AgentSessionsCache_1.SESSIONS_STORAGE_KEY,
@@ -654,7 +681,8 @@ let AgentSessionsCache = class AgentSessionsCache {
                     insertions: change.insertions,
                     deletions: change.deletions
                 }))) : session.changes,
-                metadata: session.metadata
+                metadata: session.metadata,
+                legacyResource: session.legacyResource ? ( URI.parse(session.legacyResource)) : undefined
             })));
         } catch {
             return [];
@@ -695,4 +723,4 @@ let AgentSessionsCache = class AgentSessionsCache {
 };
 AgentSessionsCache = AgentSessionsCache_1 = ( __decorate([( __param(0, IStorageService))], AgentSessionsCache));
 
-export { AgentSessionSection, ChatSessionStatus as AgentSessionStatus, AgentSessionsModel, getAgentChangesSummary, hasValidDiff, isAgentSession, isAgentSessionSection, isAgentSessionShowLess, isAgentSessionShowMore, isAgentSessionsModel, isLocalAgentSessionItem, isMarshalledAgentSessionContext, isSessionInProgressStatus };
+export { AgentSessionSection, ChatSessionStatus as AgentSessionStatus, AgentSessionsModel, getAgentChangesSummary, hasValidDiff, isAgentHostAgentSessionItem, isAgentSession, isAgentSessionSection, isAgentSessionShowLess, isAgentSessionShowMore, isAgentSessionsModel, isLocalAgentSessionItem, isMarshalledAgentSessionContext, isSessionInProgressStatus };

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

@@ -1,5 +1,6 @@
 import { Event } from "../../../../../base/common/event.js";
 import { IMatch } from "../../../../../base/common/filters.js";
+import { Disposable, IDisposable } from "../../../../../base/common/lifecycle.js";
 import { ResourceMap } from "../../../../../base/common/map.js";
 import { ThemeIcon } from "../../../../../base/common/themables.js";
 import { URI } from "../../../../../base/common/uri.js";
@@ -7,14 +8,12 @@ import { ExtensionIdentifier } from "../../../../../platform/extensions/common/e
 import { IFileService } from "../../../../../platform/files/common/files.service.js";
 import { ILabelService } from "../../../../../platform/label/common/label.service.js";
 import { IProductService } from "../../../../../platform/product/common/productService.service.js";
-import { IWorkspaceContextService } from "../../../../../platform/workspace/common/workspace.service.js";
 import { IPathService } from "../../../../services/path/common/pathService.service.js";
 import { IAICustomizationWorkspaceService } from "../../common/aiCustomizationWorkspaceService.service.js";
-import { ICustomizationSyncProvider, ICustomizationItem, ICustomizationItemProvider } from "../../common/customizationHarnessService.js";
-import { IAgentPluginService } from "../../common/plugins/agentPluginService.service.js";
+import { ICustomizationItem, ICustomizationItemProvider } from "../../common/customizationHarnessService.js";
 import { PromptsType } from "../../common/promptSyntax/promptTypes.js";
 import { IPromptsService } from "../../common/promptSyntax/service/promptsService.service.js";
-import { type AICustomizationPromptsStorage } from "./aiCustomizationManagement.js";
+import { type AICustomizationSource } from "./aiCustomizationManagement.js";
 /**
  * Represents an AI customization item in the list widget.
  */
@@ -24,11 +23,11 @@ export interface IAICustomizationListItem {
     readonly name: string;
     readonly filename: string;
     readonly description?: string;
-    /** Storage origin. Set by core when items come from promptsService; omitted for external provider items. */
-    readonly storage?: AICustomizationPromptsStorage;
+    /** Storage or provider origin. All items, including those from external providers, must provide a source. */
+    readonly source: AICustomizationSource;
     readonly promptType: PromptsType;
     readonly disabled: boolean;
-    /** When set, overrides `storage` for display grouping purposes. */
+    /** When set, overrides `source` for display grouping purposes. */
     readonly groupKey?: string;
     /** URI of the parent plugin, when this item comes from an installed plugin. */
     readonly pluginUri?: URI;
@@ -61,9 +60,11 @@ export interface IAICustomizationListItem {
  * Item sources fetch provider-shaped customization rows, normalize them into
  * the browser-only list item shape, and add view-only overlays such as sync state.
  */
-export interface IAICustomizationItemSource {
-    readonly onDidChange: Event<void>;
-    fetchItems(promptType: PromptsType): Promise<IAICustomizationListItem[]>;
+export interface IAICustomizationItemSource extends IDisposable {
+    readonly sessionResource: URI;
+    readonly onDidAICustomizationItemsChange: Event<void>;
+    fetchProviderItems(): Promise<readonly ICustomizationItem[]>;
+    fetchAICustomizationItems(promptType: PromptsType): Promise<IAICustomizationListItem[]>;
 }
 /**
  * Returns true if the given extension identifier matches the default
@@ -85,33 +86,29 @@ export declare function expandHookFileItems(hookFileItems: readonly ICustomizati
  * Converts provider-shaped customization rows into the rich list model used by the management UI.
  */
 export declare class AICustomizationItemNormalizer {
-    private readonly workspaceContextService;
-    private readonly workspaceService;
     private readonly labelService;
-    private readonly agentPluginService;
     private readonly productService;
-    constructor(workspaceContextService: IWorkspaceContextService, workspaceService: IAICustomizationWorkspaceService, labelService: ILabelService, agentPluginService: IAgentPluginService, productService: IProductService);
+    constructor(labelService: ILabelService, productService: IProductService);
     normalizeItems(items: readonly ICustomizationItem[], promptType: PromptsType): IAICustomizationListItem[];
     normalizeItem(item: ICustomizationItem, promptType: PromptsType, uriUseCounts?: ResourceMap<number>): IAICustomizationListItem;
     private inferStorageAndGroup;
 }
 /**
- * Unified item source that fetches items from a provider (extension-contributed
- * or the promptsService adapter), normalizes them into list items, and optionally
- * blends in local syncable items when a sync provider is present.
+ * Item source backed by a session-scoped customization item provider.
  */
-export declare class ProviderCustomizationItemSource implements IAICustomizationItemSource {
+export declare class ItemProviderItemSource extends Disposable implements IAICustomizationItemSource {
+    readonly sessionResource: URI;
     private readonly itemProvider;
-    private readonly syncProvider;
     private readonly promptsService;
     private readonly workspaceService;
     private readonly fileService;
     private readonly pathService;
     private readonly itemNormalizer;
-    readonly onDidChange: Event<void>;
-    constructor(itemProvider: ICustomizationItemProvider | undefined, syncProvider: ICustomizationSyncProvider | undefined, promptsService: IPromptsService, workspaceService: IAICustomizationWorkspaceService, fileService: IFileService, pathService: IPathService, itemNormalizer: AICustomizationItemNormalizer);
-    fetchItems(promptType: PromptsType): Promise<IAICustomizationListItem[]>;
-    private fetchItemsFromProvider;
+    readonly onDidAICustomizationItemsChange: Event<void>;
+    private cachedPromise;
+    constructor(sessionResource: URI, itemProvider: ICustomizationItemProvider, promptsService: IPromptsService, workspaceService: IAICustomizationWorkspaceService, fileService: IFileService, pathService: IPathService, itemNormalizer: AICustomizationItemNormalizer);
+    fetchProviderItems(): Promise<readonly ICustomizationItem[]>;
+    fetchAICustomizationItems(promptType: PromptsType): Promise<IAICustomizationListItem[]>;
     /**
      * Merges built-in skills (bundled with the app under `vs/sessions/skills/`)
      * into the provider's items. The provider may re-discover the bundled
@@ -125,5 +122,14 @@ export declare class ProviderCustomizationItemSource implements IAICustomization
      */
     private mergeBuiltinSkills;
     private addSkillDescriptionFallbacks;
-    private fetchLocalSyncableItems;
+}
+export declare class PureItemProviderItemSource extends Disposable implements IAICustomizationItemSource {
+    readonly sessionResource: URI;
+    private readonly itemProvider;
+    private readonly itemNormalizer;
+    readonly onDidAICustomizationItemsChange: Event<void>;
+    private cachedPromise;
+    constructor(sessionResource: URI, itemProvider: ICustomizationItemProvider, itemNormalizer: AICustomizationItemNormalizer);
+    fetchProviderItems(): Promise<readonly ICustomizationItem[]>;
+    fetchAICustomizationItems(promptType: PromptsType): Promise<IAICustomizationListItem[]>;
 }

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

@@ -1,5 +1,4 @@
 import { IObservable } from "../../../../../base/common/observable.js";
-import { ICustomizationItemProvider } from "../../common/customizationHarnessService.js";
 import { ItemsModelSection } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationItemsModel";
 import { IAICustomizationListItem, IAICustomizationItemSource } from "./aiCustomizationItemSource.js";
 export declare const IAICustomizationItemsModel: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IAICustomizationItemsModel>;
@@ -7,7 +6,7 @@ export declare const IAICustomizationItemsModel: import("../../../../../platform
 * Single source of truth for the items rendered by the AI Customizations
 * editor and observed by sidebar surfaces (counts/badges).
 *
-* The model owns the per-active-harness `ProviderCustomizationItemSource`
+* The model owns the per-active-harness item source
 * cache and exposes the unfiltered, normalized list of items per section.
 * Both the editor and any sidebar surface read from these observables so
 * there is exactly one discovery path for customizations.
@@ -20,7 +19,7 @@ export interface IAICustomizationItemsModel {
     */
     getItems(section: ItemsModelSection): IObservable<readonly IAICustomizationListItem[]>;
     /**
-    * Returns the live `ProviderCustomizationItemSource` for the active harness.
+    * Returns the live item source for the active harness.
     * Editor consumers may need this to access provider-level affordances
     * (e.g. debug reporting). The returned source is reused across the
     * lifetime of the active descriptor.
@@ -37,11 +36,6 @@ export interface IAICustomizationItemsModel {
     */
     getPluginCount(): IObservable<number>;
     /**
-    * The fallback item provider used when the active descriptor has neither
-    * an `itemProvider` nor a `syncProvider`. Exposed for the debug report.
-    */
-    getPromptsServiceItemProvider(): ICustomizationItemProvider;
-    /**
     * Resolves once the most recent fetch for `section` has settled. Useful for
     * tests / fixtures that need rendered output to reflect at least one fetch.
     * Calling this also marks the section as observed (i.e. starts a fetch if

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

@@ -3,7 +3,7 @@ import { AICustomizationManagementSection } from "../../common/aiCustomizationWo
 import { PromptsType } from "../../common/promptSyntax/promptTypes.js";
 import { MenuId } from "../../../../../platform/actions/common/actions.js";
 export { AICustomizationManagementSection } from "../../common/aiCustomizationWorkspaceService.js";
-export type { AICustomizationPromptsStorage } from "../../common/aiCustomizationWorkspaceService.js";
+export type { AICustomizationSource } from "../../common/aiCustomizationWorkspaceService.js";
 export { BUILTIN_STORAGE } from "../../common/aiCustomizationWorkspaceService.js";
 export declare function sectionToPromptType(section: AICustomizationManagementSection): PromptsType;
 /**

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

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

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

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

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

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

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

@@ -0,0 +1,12 @@
+import { CancellationToken } from "../../../../base/common/cancellation.js";
+export declare const IChatGoalSummaryService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatGoalSummaryService>;
+export interface IChatGoalSummaryService {
+    readonly _serviceBrand: undefined;
+    /**
+    * Returns a short (one-phrase) summary of the user's prompt suitable for display
+    * as a "Goal: <summary>" banner above the chat input. Returns `undefined` when
+    * no model is available, the model declines to summarize, or the summary cannot
+    * be produced.
+    */
+    summarize(prompt: string, token: CancellationToken): Promise<string | undefined>;
+}

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

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

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

@@ -8,6 +8,17 @@ import { ILogService } from "../../../../platform/log/common/log.service.js";
  * @returns A promise that resolves to the UInt8Array string of the resized image.
  */
 export declare function resizeImage(data: Uint8Array | string, mimeType?: string): Promise<Uint8Array>;
+/**
+ * Memoized variant of {@link createImageThumbnail}. Repeated calls with the same
+ * {@link cacheKey} (and matching size/byte length) reuse the previously generated
+ * thumbnail instead of decoding and resizing the original image again.
+ * @param cacheKey A stable identifier for the source image (e.g. the attachment id).
+ * @param data The image bytes.
+ * @param maxSize The maximum width or height of the thumbnail, in pixels.
+ * @param targetWindow The window whose document is used to decode and resize the image.
+ * @returns A promise that resolves to a {@link Blob} of the thumbnail, or `undefined` on failure.
+ */
+export declare function getOrCreateImageThumbnail(cacheKey: string, data: Uint8Array, maxSize: number, targetWindow: Window): Promise<Blob | undefined>;
 export declare function convertStringToUInt8Array(data: string): Uint8Array;
 export declare function convertUint8ArrayToString(data: Uint8Array): string;
 export declare function createFileForMedia(fileService: IFileService, imagesFolder: URI, dataTransfer: Uint8Array, mimeType: string): Promise<URI | undefined>;

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

@@ -1,5 +1,7 @@
 
+import { raceTimeout } from '../../../../base/common/async.js';
 import { decodeBase64, VSBuffer } from '../../../../base/common/buffer.js';
+import { LRUCache } from '../../../../base/common/map.js';
 import { createElement } from '../../../../base/browser/dom.js';
 import { joinPath } from '../../../../base/common/resources.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
@@ -64,6 +66,59 @@ async function resizeImage(data, mimeType) {
         };
     }));
 }
+function createImageThumbnail(data, maxSize, targetWindow) {
+    return ( new Promise(resolve => {
+        const blob = ( new Blob([data]));
+        const img = targetWindow.document.createElement("img");
+        const url = URL.createObjectURL(blob);
+        img.src = url;
+        img.onload = () => {
+            URL.revokeObjectURL(url);
+            const {
+                width,
+                height
+            } = img;
+            const scaleFactor = Math.min(1, maxSize / Math.max(width, height));
+            const targetWidth = Math.max(1, Math.round(width * scaleFactor));
+            const targetHeight = Math.max(1, Math.round(height * scaleFactor));
+            const canvas = targetWindow.document.createElement("canvas");
+            canvas.width = targetWidth;
+            canvas.height = targetHeight;
+            const ctx = canvas.getContext("2d");
+            if (!ctx) {
+                resolve(undefined);
+                return;
+            }
+            ctx.drawImage(img, 0, 0, targetWidth, targetHeight);
+            const outputMimeType = data.length >= 3 && data[0] === 0xFF && data[1] === 0xD8 && data[2] === 0xFF ? "image/jpeg" : "image/png";
+            canvas.toBlob(thumbnail => resolve(thumbnail ?? undefined), outputMimeType);
+        };
+        img.onerror = () => {
+            URL.revokeObjectURL(url);
+            resolve(undefined);
+        };
+    }));
+}
+const thumbnailCache = ( new LRUCache(50));
+const THUMBNAIL_DECODE_TIMEOUT_MS = 10_000;
+function getOrCreateImageThumbnail(cacheKey, data, maxSize, targetWindow) {
+    const key = `${cacheKey}:${maxSize}:${data.byteLength}`;
+    const cached = thumbnailCache.get(key);
+    if (cached) {
+        return cached;
+    }
+    const thumbnail = raceTimeout(
+        createImageThumbnail(data, maxSize, targetWindow),
+        THUMBNAIL_DECODE_TIMEOUT_MS
+    ).then(blob => {
+        if (!blob && thumbnailCache.peek(key) === thumbnail) {
+            thumbnailCache.delete(key);
+        }
+        return blob;
+    });
+    thumbnailCache.set(key, thumbnail);
+    return thumbnail;
+}
 function convertStringToUInt8Array(data) {
     const base64Data = data.includes(",") ? data.split(",")[1] : data;
     if (isValidBase64(base64Data)) {
@@ -133,4 +188,4 @@ async function imageToHash(data) {
     return ( hashArray.map(b => ( b.toString(16)).padStart(2, "0"))).join("");
 }
 
-export { cleanupOldImages, convertStringToUInt8Array, createFileForMedia, imageToHash, resizeImage };
+export { cleanupOldImages, convertStringToUInt8Array, createFileForMedia, getOrCreateImageThumbnail, imageToHash, resizeImage };

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

@@ -27,20 +27,26 @@ function getInProgressSessionDescription(chatModel) {
             description = part.message;
         } else if (part.kind === "toolInvocation") {
             const toolInvocation = part;
+            if (IChatToolInvocation.isEffectivelyHidden(toolInvocation)) {
+                continue;
+            }
             const state = toolInvocation.state.get();
             description = toolInvocation.generatedTitle || toolInvocation.pastTenseMessage || toolInvocation.invocationMessage;
             if (state.type === IChatToolInvocation.StateKind.WaitingForConfirmation) {
                 const confirmationTitle = state.confirmationMessages?.title;
                 const titleMessage = confirmationTitle && (typeof confirmationTitle === "string" ? confirmationTitle : confirmationTitle.value);
                 const descriptionValue = typeof description === "string" ? description : description.value;
-                description = titleMessage ?? ( localize(6560, "Waiting for confirmation: {0}", descriptionValue));
+                description = titleMessage ?? ( localize(6674, "Waiting for confirmation: {0}", descriptionValue));
             }
         } else if (part.kind === "toolInvocationSerialized") {
+            if (IChatToolInvocation.isEffectivelyHidden(part)) {
+                continue;
+            }
             description = part.invocationMessage;
         } else if (part.kind === "progressMessage") {
             description = part.content;
         } else if (part.kind === "thinking") {
-            description = ( localize(6561, "Thinking..."));
+            description = ( localize(6675, "Thinking..."));
         }
     }
     return description ? renderAsPlaintext(description, {

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

@@ -151,6 +151,8 @@ export declare class ChatSessionsService extends Disposable implements IChatSess
     supportsDelegationForSessionType(chatSessionType: string): boolean;
     sessionSupportsFork(sessionResource: URI): boolean;
     forkChatSession(sessionResource: URI, request: IChatSessionRequestHistoryItem | undefined, token: CancellationToken): Promise<IChatSessionItem>;
+    sessionSupportsRename(sessionResource: URI): boolean;
+    renameChatSession(sessionResource: URI, title: string, token: CancellationToken): Promise<void>;
     getContentProviderSchemes(): string[];
 }
 export declare enum ChatSessionPosition {