@codingame/monaco-vscode-api 24.3.0 → 25.0.1

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

@@ -1,7 +1,5 @@
+import { URI } from "../../../../../base/common/uri.js";
 import { ThemeIcon } from "../../../../../base/common/themables.js";
-import { ServicesAccessor } from "../../../../../editor/browser/editorExtensions.js";
-export declare const AGENT_SESSIONS_VIEW_CONTAINER_ID = "workbench.viewContainer.agentSessions";
-export declare const AGENT_SESSIONS_VIEW_ID = "workbench.view.agentSessions";
 export declare enum AgentSessionProviders {
     Local = "local",
     Background = "copilotcli",
@@ -9,7 +7,6 @@ export declare enum AgentSessionProviders {
 }
 export declare function getAgentSessionProviderName(provider: AgentSessionProviders): string;
 export declare function getAgentSessionProviderIcon(provider: AgentSessionProviders): ThemeIcon;
-export declare function openAgentSessionsView(accessor: ServicesAccessor): void;
 export declare enum AgentSessionsViewerOrientation {
     Stacked = 1,
     SideBySide = 2
@@ -21,5 +18,10 @@ export declare enum AgentSessionsViewerPosition {
 export interface IAgentSessionsControl {
     refresh(): void;
     openFind(): void;
+    reveal(sessionResource: URI): void;
 }
 export declare const agentSessionReadIndicatorForeground: string;
+export declare const agentSessionSelectedBadgeBorder: string;
+export declare const agentSessionSelectedUnfocusedBadgeBorder: string;
+export declare const AGENT_SESSION_RENAME_ACTION_ID = "agentSession.rename";
+export declare const AGENT_SESSION_DELETE_ACTION_ID = "agentSession.delete";

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

@@ -2,24 +2,18 @@
 import { localize } from '../../../../../nls.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import '../../common/chatSessionsService.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.service.js';
-import { LEGACY_AGENT_SESSIONS_VIEW_ID } from '../../common/constants.js';
-import { ChatViewId } from '../chat.js';
 import { registerColor, transparent } from '../../../../../platform/theme/common/colorUtils.js';
 import { foreground } from '../../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../../platform/theme/common/colors/chartsColors.js';
 import '../../../../../platform/theme/common/colors/editorColors.js';
 import '../../../../../platform/theme/common/colors/inputColors.js';
-import '../../../../../platform/theme/common/colors/listColors.js';
+import { listActiveSelectionForeground } from '../../../../../platform/theme/common/colors/listColors.js';
 import '../../../../../platform/theme/common/colors/menuColors.js';
 import '../../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../platform/theme/common/colors/searchColors.js';
 
-const AGENT_SESSIONS_VIEW_CONTAINER_ID = 'workbench.viewContainer.agentSessions';
-const AGENT_SESSIONS_VIEW_ID = 'workbench.view.agentSessions';
 var AgentSessionProviders;
 (function (AgentSessionProviders) {
     AgentSessionProviders["Local"] = "local";
@@ -29,11 +23,11 @@ var AgentSessionProviders;
 function getAgentSessionProviderName(provider) {
     switch (provider) {
         case AgentSessionProviders.Local:
-            return localize(4835, "Local");
+            return localize(4849, "Local");
         case AgentSessionProviders.Background:
-            return localize(4836, "Background");
+            return localize(4850, "Background");
         case AgentSessionProviders.Cloud:
-            return localize(4837, "Cloud");
+            return localize(4851, "Cloud");
     }
 }
 function getAgentSessionProviderIcon(provider) {
@@ -41,25 +35,11 @@ function getAgentSessionProviderIcon(provider) {
         case AgentSessionProviders.Local:
             return Codicon.vm;
         case AgentSessionProviders.Background:
-            return Codicon.collection;
+            return Codicon.worktree;
         case AgentSessionProviders.Cloud:
             return Codicon.cloud;
     }
 }
-function openAgentSessionsView(accessor) {
-    const viewService = accessor.get(IViewsService);
-    const configurationService = accessor.get(IConfigurationService);
-    const viewLocation = configurationService.getValue('chat.agentSessionsViewLocation');
-    if (viewLocation === 'single-view') {
-        viewService.openView(AGENT_SESSIONS_VIEW_ID, true);
-    }
-    else if (viewLocation === 'view') {
-        viewService.openViewContainer(LEGACY_AGENT_SESSIONS_VIEW_ID, true);
-    }
-    else {
-        viewService.openView(ChatViewId, true);
-    }
-}
 var AgentSessionsViewerOrientation;
 (function (AgentSessionsViewerOrientation) {
     AgentSessionsViewerOrientation[AgentSessionsViewerOrientation["Stacked"] = 1] = "Stacked";
@@ -70,6 +50,13 @@ var AgentSessionsViewerPosition;
     AgentSessionsViewerPosition[AgentSessionsViewerPosition["Left"] = 1] = "Left";
     AgentSessionsViewerPosition[AgentSessionsViewerPosition["Right"] = 2] = "Right";
 })(AgentSessionsViewerPosition || (AgentSessionsViewerPosition = {}));
-registerColor('agentSessionReadIndicator.foreground', { dark: ( transparent(foreground, 0.15)), light: ( transparent(foreground, 0.15)), hcDark: null, hcLight: null }, ( localize(4838, "Foreground color for the read indicator in an agent session.")));
+registerColor('agentSessionReadIndicator.foreground', { dark: ( transparent(foreground, 0.15)), light: ( transparent(foreground, 0.15)), hcDark: null, hcLight: null }, ( localize(4852, "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(4853, "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(
+    4854,
+    "Border color for the badges in selected agent session items when the view is unfocused."
+)));
+const AGENT_SESSION_RENAME_ACTION_ID = 'agentSession.rename';
+const AGENT_SESSION_DELETE_ACTION_ID = 'agentSession.delete';
 
-export { AGENT_SESSIONS_VIEW_CONTAINER_ID, AGENT_SESSIONS_VIEW_ID, AgentSessionProviders, AgentSessionsViewerOrientation, AgentSessionsViewerPosition, getAgentSessionProviderIcon, getAgentSessionProviderName, openAgentSessionsView };
+export { AGENT_SESSION_DELETE_ACTION_ID, AGENT_SESSION_RENAME_ACTION_ID, AgentSessionProviders, AgentSessionsViewerOrientation, AgentSessionsViewerPosition, getAgentSessionProviderIcon, getAgentSessionProviderName };

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

@@ -1,14 +1,17 @@
 import { Event } from "../../../../../base/common/event.js";
 import { IMarkdownString } from "../../../../../base/common/htmlContent.js";
 import { Disposable } from "../../../../../base/common/lifecycle.js";
+import { MarshalledId } from "../../../../../base/common/marshallingIds.js";
 import { ThemeIcon } from "../../../../../base/common/themables.js";
 import { URI } from "../../../../../base/common/uri.js";
 import { IInstantiationService } from "../../../../../platform/instantiation/common/instantiation.js";
 import { ILogService } from "../../../../../platform/log/common/log.service.js";
 import { IStorageService } from "../../../../../platform/storage/common/storage.service.js";
 import { ILifecycleService } from "../../../../services/lifecycle/common/lifecycle.service.js";
-import { ChatSessionStatus, IChatSessionFileChange } from "../../common/chatSessionsService.js";
+import { ChatSessionStatus as AgentSessionStatus, IChatSessionItem } from "../../common/chatSessionsService.js";
 import { IChatSessionsService } from "../../common/chatSessionsService.service.js";
+export { ChatSessionStatus as AgentSessionStatus } from "../../common/chatSessionsService.js";
+export { isSessionInProgressStatus } from "../../common/chatSessionsService.js";
 export interface IAgentSessionsModel {
     readonly onWillResolve: Event<void>;
     readonly onDidResolve: Event<void>;
@@ -17,26 +20,21 @@ export interface IAgentSessionsModel {
     getSession(resource: URI): IAgentSession | undefined;
     resolve(provider: string | string[] | undefined): Promise<void>;
 }
-interface IAgentSessionData {
+interface IAgentSessionData extends Omit<IChatSessionItem, "archived" | "iconPath"> {
     readonly providerType: string;
     readonly providerLabel: string;
     readonly resource: URI;
-    readonly status: ChatSessionStatus;
+    readonly status: AgentSessionStatus;
     readonly tooltip?: string | IMarkdownString;
     readonly label: string;
     readonly description?: string | IMarkdownString;
+    readonly badge?: string | IMarkdownString;
     readonly icon: ThemeIcon;
-    readonly timing: {
-        readonly startTime: number;
-        readonly endTime?: number;
+    readonly timing: IChatSessionItem["timing"] & {
         readonly inProgressTime?: number;
         readonly finishedOrFailedTime?: number;
     };
-    readonly changes?: readonly IChatSessionFileChange[] | {
-        readonly files: number;
-        readonly insertions: number;
-        readonly deletions: number;
-    };
+    readonly changes?: IChatSessionItem["changes"];
 }
 /**
  * Checks if the provided changes object represents valid diff information.
@@ -46,9 +44,9 @@ export declare function hasValidDiff(changes: IAgentSession["changes"]): boolean
  * Gets a summary of agent session changes, converting from array format to object format if needed.
  */
 export declare function getAgentChangesSummary(changes: IAgentSession["changes"]): {
-    readonly files: number;
-    readonly insertions: number;
-    readonly deletions: number;
+    files: number;
+    insertions: number;
+    deletions: number;
 } | undefined;
 export interface IAgentSession extends IAgentSessionData {
     isArchived(): boolean;
@@ -57,8 +55,27 @@ export interface IAgentSession extends IAgentSessionData {
     setRead(read: boolean): void;
 }
 export declare function isLocalAgentSessionItem(session: IAgentSession): boolean;
-export declare function isAgentSession(obj: IAgentSessionsModel | IAgentSession): obj is IAgentSession;
-export declare function isAgentSessionsModel(obj: IAgentSessionsModel | IAgentSession): obj is IAgentSessionsModel;
+export declare function isAgentSession(obj: unknown): obj is IAgentSession;
+export declare function isAgentSessionsModel(obj: unknown): obj is IAgentSessionsModel;
+export declare enum AgentSessionSection {
+    InProgress = "inProgress",
+    Today = "today",
+    Yesterday = "yesterday",
+    Week = "week",
+    Older = "older",
+    Archived = "archived"
+}
+export interface IAgentSessionSection {
+    readonly section: AgentSessionSection;
+    readonly label: string;
+    readonly sessions: IAgentSession[];
+}
+export declare function isAgentSessionSection(obj: IAgentSessionsModel | IAgentSession | IAgentSessionSection): obj is IAgentSessionSection;
+export interface IMarshalledAgentSessionContext {
+    readonly $mid: MarshalledId.AgentSessionContext;
+    readonly session: IAgentSession;
+}
+export declare function isMarshalledAgentSessionContext(thing: unknown): thing is IMarshalledAgentSessionContext;
 export declare class AgentSessionsModel extends Disposable implements IAgentSessionsModel {
     private readonly chatSessionsService;
     private readonly lifecycleService;
@@ -90,4 +107,3 @@ export declare class AgentSessionsModel extends Disposable implements IAgentSess
     private isRead;
     private setRead;
 }
-export {};

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

@@ -5,6 +5,7 @@ import { Codicon } from '../../../../../base/common/codicons.js';
 import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../../base/common/map.js';
+import { MarshalledId } from '../../../../../base/common/marshallingIds.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
@@ -12,7 +13,7 @@ import { ILogService } from '../../../../../platform/log/common/log.service.js';
 import { StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../../platform/storage/common/storage.service.js';
 import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.service.js';
-import { localChatSessionType, ChatSessionStatus } from '../../common/chatSessionsService.js';
+import { ChatSessionStatus, isSessionInProgressStatus } from '../../common/chatSessionsService.js';
 import { IChatSessionsService } from '../../common/chatSessionsService.service.js';
 import { AgentSessionProviders, getAgentSessionProviderName, getAgentSessionProviderIcon } from './agentSessions.js';
 
@@ -42,15 +43,35 @@ function getAgentChangesSummary(changes) {
     return { files: changes.length, insertions, deletions };
 }
 function isLocalAgentSessionItem(session) {
-    return session.providerType === localChatSessionType;
+    return session.providerType === AgentSessionProviders.Local;
 }
 function isAgentSession(obj) {
     const session = obj;
-    return URI.isUri(session?.resource);
+    return URI.isUri(session?.resource) && typeof session.setArchived === 'function' && typeof session.setRead === 'function';
 }
 function isAgentSessionsModel(obj) {
     const sessionsModel = obj;
-    return Array.isArray(sessionsModel?.sessions);
+    return Array.isArray(sessionsModel?.sessions) && typeof sessionsModel?.getSession === 'function';
+}
+var AgentSessionSection;
+(function (AgentSessionSection) {
+    AgentSessionSection["InProgress"] = "inProgress";
+    AgentSessionSection["Today"] = "today";
+    AgentSessionSection["Yesterday"] = "yesterday";
+    AgentSessionSection["Week"] = "week";
+    AgentSessionSection["Older"] = "older";
+    AgentSessionSection["Archived"] = "archived";
+})(AgentSessionSection || (AgentSessionSection = {}));
+function isAgentSessionSection(obj) {
+    const candidate = obj;
+    return typeof candidate.section === 'string' && Array.isArray(candidate.sessions);
+}
+function isMarshalledAgentSessionContext(thing) {
+    if (typeof thing === 'object' && thing !== null) {
+        const candidate = thing;
+        return candidate.$mid === MarshalledId.AgentSessionContext && typeof candidate.session === 'object' && candidate.session !== null;
+    }
+    return false;
 }
 let AgentSessionsModel = class AgentSessionsModel extends Disposable {
     static { AgentSessionsModel_1 = this; }
@@ -117,6 +138,7 @@ let AgentSessionsModel = class AgentSessionsModel extends Disposable {
     async doResolve(token) {
         const providersToResolve = Array.from(this.providersToResolve);
         this.providersToResolve.clear();
+        this.logService.trace(`[agent sessions] Resolving agent sessions for providers: ${( providersToResolve.map(p => p ?? 'all')).join(', ')}`);
         const mapSessionContributionToType = ( new Map());
         for (const contribution of this.chatSessionsService.getAllChatSessionContributions()) {
             mapSessionContributionToType.set(contribution.type, contribution);
@@ -130,6 +152,7 @@ let AgentSessionsModel = class AgentSessionsModel extends Disposable {
             let providerSessions;
             try {
                 providerSessions = await provider.provideChatSessionItems(token);
+                this.logService.trace(`[agent sessions] Resolved ${providerSessions.length} agent sessions for provider ${provider.chatSessionType}`);
             }
             catch (error) {
                 this.logService.error(`Failed to resolve sessions for provider ${provider.chatSessionType}`, error);
@@ -167,12 +190,12 @@ let AgentSessionsModel = class AgentSessionsModel extends Disposable {
                 if (!state) {
                     this.mapSessionToState.set(session.resource, {
                         status,
-                        inProgressTime: this.chatSessionsService.isChatSessionInProgressStatus(status) ? Date.now() : undefined,
+                        inProgressTime: isSessionInProgressStatus(status) ? Date.now() : undefined,
                     });
                 }
                 else if (status !== state.status) {
-                    inProgressTime = this.chatSessionsService.isChatSessionInProgressStatus(status) ? Date.now() : state.inProgressTime;
-                    finishedOrFailedTime = !this.chatSessionsService.isChatSessionInProgressStatus(status) ? Date.now() : state.finishedOrFailedTime;
+                    inProgressTime = isSessionInProgressStatus(status) ? Date.now() : state.inProgressTime;
+                    finishedOrFailedTime = !isSessionInProgressStatus(status) ? Date.now() : state.finishedOrFailedTime;
                     this.mapSessionToState.set(session.resource, {
                         status,
                         inProgressTime,
@@ -201,6 +224,7 @@ let AgentSessionsModel = class AgentSessionsModel extends Disposable {
                     label: session.label,
                     description: session.description,
                     icon,
+                    badge: session.badge,
                     tooltip: session.tooltip,
                     status,
                     archived: session.archived,
@@ -215,6 +239,7 @@ let AgentSessionsModel = class AgentSessionsModel extends Disposable {
             }
         }
         this._sessions = sessions;
+        this.logService.trace(`[agent sessions] Total resolved agent sessions:`, Array.from(( this._sessions.values())));
         for (const [resource] of this.mapSessionToState) {
             if (!( sessions.has(resource))) {
                 this.mapSessionToState.delete(resource);
@@ -279,10 +304,11 @@ let AgentSessionsCache = class AgentSessionsCache {
         const serialized = ( sessions.map(session => ({
             providerType: session.providerType,
             providerLabel: session.providerLabel,
-            resource: session.resource.toJSON(),
+            resource: ( session.resource.toString()),
             icon: session.icon.id,
             label: session.label,
             description: session.description,
+            badge: session.badge,
             tooltip: session.tooltip,
             status: session.status,
             archived: session.archived,
@@ -304,10 +330,11 @@ let AgentSessionsCache = class AgentSessionsCache {
             return ( cached.map(session => ({
                 providerType: session.providerType,
                 providerLabel: session.providerLabel,
-                resource: URI.revive(session.resource),
+                resource: typeof session.resource === 'string' ? ( URI.parse(session.resource)) : URI.revive(session.resource),
                 icon: ThemeIcon.fromId(session.icon),
                 label: session.label,
                 description: session.description,
+                badge: session.badge,
                 tooltip: session.tooltip,
                 status: session.status,
                 archived: session.archived,
@@ -329,7 +356,7 @@ let AgentSessionsCache = class AgentSessionsCache {
     }
     saveSessionStates(states) {
         const serialized = ( Array.from(states.entries()).map(([resource, state]) => ({
-            resource: resource.toJSON(),
+            resource: ( resource.toString()),
             archived: state.archived,
             read: state.read
         })));
@@ -344,7 +371,7 @@ let AgentSessionsCache = class AgentSessionsCache {
         try {
             const cached = JSON.parse(statesCache);
             for (const entry of cached) {
-                states.set(URI.revive(entry.resource), {
+                states.set(typeof entry.resource === 'string' ? ( URI.parse(entry.resource)) : URI.revive(entry.resource), {
                     archived: entry.archived,
                     read: entry.read
                 });
@@ -359,4 +386,4 @@ AgentSessionsCache = AgentSessionsCache_1 = ( __decorate([
     ( __param(0, IStorageService))
 ], AgentSessionsCache));
 
-export { AgentSessionsModel, getAgentChangesSummary, hasValidDiff, isAgentSession, isAgentSessionsModel, isLocalAgentSessionItem };
+export { AgentSessionSection, ChatSessionStatus as AgentSessionStatus, AgentSessionsModel, getAgentChangesSummary, hasValidDiff, isAgentSession, isAgentSessionSection, isAgentSessionsModel, isLocalAgentSessionItem, isMarshalledAgentSessionContext, isSessionInProgressStatus };

package/vscode/src/vs/workbench/contrib/chat/browser/{chatAttachmentResolveService.service.d.ts → attachments/chatAttachmentResolveService.service.d.ts}

@@ -1,11 +1,11 @@
-import { VSBuffer } from "../../../../base/common/buffer.js";
-import { URI } from "../../../../base/common/uri.js";
-import { IDraggedResourceEditorInput, MarkerTransferData, DocumentSymbolTransferData, NotebookCellOutputTransferData } from "../../../../platform/dnd/browser/dnd.js";
-import { EditorInput } from "../../../common/editor/editorInput.js";
-import { SCMHistoryItemTransferData } from "../../scm/browser/scmHistoryChatContext.js";
-import { IChatRequestVariableEntry, IDiagnosticVariableEntry, ISymbolVariableEntry, ISCMHistoryItemVariableEntry } from "../common/chatVariableEntries.js";
-import { ImageTransferData } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/browser/chatAttachmentResolveService";
-export declare const IChatAttachmentResolveService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatAttachmentResolveService>;
+import { VSBuffer } from "../../../../../base/common/buffer.js";
+import { URI } from "../../../../../base/common/uri.js";
+import { IDraggedResourceEditorInput, MarkerTransferData, DocumentSymbolTransferData, NotebookCellOutputTransferData } from "../../../../../platform/dnd/browser/dnd.js";
+import { EditorInput } from "../../../../common/editor/editorInput.js";
+import { SCMHistoryItemTransferData } from "../../../scm/browser/scmHistoryChatContext.js";
+import { IChatRequestVariableEntry, IDiagnosticVariableEntry, ISymbolVariableEntry, ISCMHistoryItemVariableEntry } from "../../common/attachments/chatVariableEntries.js";
+import { ImageTransferData } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentResolveService";
+export declare const IChatAttachmentResolveService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatAttachmentResolveService>;
 export interface IChatAttachmentResolveService {
     _serviceBrand: undefined;
     resolveEditorAttachContext(editor: EditorInput | IDraggedResourceEditorInput): Promise<IChatRequestVariableEntry | undefined>;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatAttachmentResolveService.service.js → attachments/chatAttachmentResolveService.service.js}

@@ -1,5 +1,5 @@
 
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
 
 const IChatAttachmentResolveService = ( createDecorator('IChatAttachmentResolveService'));
 

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContextPickService.d.ts → attachments/chatContextPickService.d.ts}

@@ -1,10 +1,10 @@
-import { CancellationToken } from "../../../../base/common/cancellation.js";
-import { IDisposable } from "../../../../base/common/lifecycle.js";
-import { IObservable } from "../../../../base/common/observable.js";
-import { ThemeIcon } from "../../../../base/common/themables.js";
-import { IQuickItem, IQuickPickSeparator } from "../../../../platform/quickinput/common/quickInput.js";
-import { IChatRequestVariableEntry } from "../common/chatVariableEntries.js";
-import { IChatWidget } from "./chat.js";
+import { CancellationToken } from "../../../../../base/common/cancellation.js";
+import { IDisposable } from "../../../../../base/common/lifecycle.js";
+import { IObservable } from "../../../../../base/common/observable.js";
+import { ThemeIcon } from "../../../../../base/common/themables.js";
+import { IQuickItem, IQuickPickSeparator } from "../../../../../platform/quickinput/common/quickInput.js";
+import { IChatRequestVariableEntry } from "../../common/attachments/chatVariableEntries.js";
+import { IChatWidget } from "../chat.js";
 import { IChatContextPickService } from "./chatContextPickService.service.js";
 export interface IChatContextPickerPickItem extends Partial<IQuickItem> {
     label: string;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContextPickService.js → attachments/chatContextPickService.js}

@@ -1,11 +1,11 @@
 
-import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import { toDisposable } from '../../../../base/common/lifecycle.js';
-import '../../../../base/common/observableInternal/index.js';
-import { compare } from '../../../../base/common/strings.js';
-import { isObject } from '../../../../base/common/types.js';
-import { derived } from '../../../../base/common/observableInternal/observables/derived.js';
-import { ObservablePromise } from '../../../../base/common/observableInternal/utils/promise.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { toDisposable } from '../../../../../base/common/lifecycle.js';
+import '../../../../../base/common/observableInternal/index.js';
+import { compare } from '../../../../../base/common/strings.js';
+import { isObject } from '../../../../../base/common/types.js';
+import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { ObservablePromise } from '../../../../../base/common/observableInternal/utils/promise.js';
 
 function isChatContextPickerPickItem(item) {
     return isObject(item) && typeof item.asAttachment === 'function';

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContextPickService.service.d.ts → attachments/chatContextPickService.service.d.ts}

@@ -1,4 +1,4 @@
-import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { IDisposable } from "../../../../../base/common/lifecycle.js";
 import { IChatContextValueItem, IChatContextPickerItem } from "./chatContextPickService.js";
 export interface IChatContextPickService {
     _serviceBrand: undefined;
@@ -10,4 +10,4 @@ export interface IChatContextPickService {
     */
     registerChatContextItem(item: IChatContextValueItem | IChatContextPickerItem): IDisposable;
 }
-export declare const IChatContextPickService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatContextPickService>;
+export declare const IChatContextPickService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatContextPickService>;

package/vscode/src/vs/workbench/contrib/chat/browser/{chatContextPickService.service.js → attachments/chatContextPickService.service.js}

@@ -1,5 +1,5 @@
 
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
 
 const IChatContextPickService = ( createDecorator('IContextPickService'));
 

package/vscode/src/vs/workbench/contrib/chat/browser/{contrib → attachments}/chatDynamicVariables.d.ts

@@ -4,9 +4,9 @@ import { Command } from "../../../../../editor/common/languages.js";
 import { Action2 } from "../../../../../platform/actions/common/actions.js";
 import { ServicesAccessor } from "../../../../../platform/instantiation/common/instantiation.js";
 import { ILabelService } from "../../../../../platform/label/common/label.service.js";
-import { IChatRequestVariableValue, IDynamicVariable } from "../../common/chatVariables.js";
+import { IChatRequestVariableValue, IDynamicVariable } from "../../common/attachments/chatVariables.js";
 import { IChatWidget } from "../chat.js";
-import { IChatWidgetContrib } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
+import { IChatWidgetContrib } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget";
 export declare const dynamicVariableDecorationType = "chat-dynamic-variable";
 export declare class ChatDynamicVariableModel extends Disposable implements IChatWidgetContrib {
     private readonly widget;

package/vscode/src/vs/workbench/contrib/chat/browser/{contrib → attachments}/chatDynamicVariables.js

@@ -9,7 +9,7 @@ import { isLocation } from '../../../../../editor/common/languages.js';
 import { Action2, registerAction2 } from '../../../../../platform/actions/common/actions.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.service.js';
 import { ILabelService } from '../../../../../platform/label/common/label.service.js';
-import { addDynamicVariableActionId } from './chatDynamicVariablesConstant.js';
+import { addDynamicVariableActionId } from '../widget/input/editor/chatDynamicVariablesConstant.js';
 
 var ChatDynamicVariableModel_1;
 const dynamicVariableDecorationType = 'chat-dynamic-variable';

package/vscode/src/vs/workbench/contrib/chat/browser/{contrib/screenshot.d.ts → attachments/chatScreenshotContext.d.ts}

@@ -1,4 +1,4 @@
 import { VSBuffer } from "../../../../../base/common/buffer.js";
-import { IChatRequestVariableEntry } from "../../common/chatVariableEntries.js";
+import { IChatRequestVariableEntry } from "../../common/attachments/chatVariableEntries.js";
 export declare const ScreenshotVariableId = "screenshot-focused-window";
 export declare function convertBufferToScreenshotVariable(buffer: VSBuffer): IChatRequestVariableEntry;

package/vscode/src/vs/workbench/contrib/chat/browser/{contrib/screenshot.js → attachments/chatScreenshotContext.js}

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

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

@@ -6,17 +6,17 @@ import { Selection } from "../../../../editor/common/core/selection.js";
 import { EditDeltaInfo } from "../../../../editor/common/textModelEditSource.js";
 import { MenuId } from "../../../../platform/actions/common/actions.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
-import { IChatAgentAttachmentCapabilities, IChatAgentCommand, IChatAgentData } from "../common/chatAgents.js";
-import { IChatResponseModel, IChatModelInputState } from "../common/chatModel.js";
+import { IChatAgentAttachmentCapabilities, IChatAgentCommand, IChatAgentData } from "../common/participants/chatAgents.js";
+import { IChatResponseModel, IChatModelInputState } from "../common/model/chatModel.js";
 import { IChatMode } from "../common/chatModes.js";
-import { IParsedChatRequest } from "../common/chatParserTypes.js";
-import { IChatLocationData, IChatSendRequestOptions } from "../common/chatService.js";
-import { IChatRequestViewModel, IChatResponseViewModel, IChatViewModel } from "../common/chatViewModel.js";
+import { IParsedChatRequest } from "../common/requestParser/chatParserTypes.js";
+import { IChatLocationData, IChatSendRequestOptions } from "../common/chatService/chatService.js";
+import { IChatRequestViewModel, IChatResponseViewModel, IChatViewModel } from "../common/model/chatViewModel.js";
 import { ChatAgentLocation, ChatModeKind } from "../common/constants.js";
-import { ChatAttachmentModel } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatAttachmentModel";
-import { ChatInputPart } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart";
-import { IChatWidgetContrib } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
-import { ICodeBlockActionContext } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart";
+import { ChatAttachmentModel } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/attachments/chatAttachmentModel";
+import { ChatInputPart } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputPart";
+import { IChatWidgetContrib } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget";
+import { ICodeBlockActionContext } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/codeBlockPart";
 export declare const ChatViewPaneTarget: unique symbol;
 export interface IQuickChatOpenOptions {
     /**
@@ -109,10 +109,15 @@ export interface IChatAcceptInputOptions {
     noCommandDetection?: boolean;
     isVoiceInput?: boolean;
     enableImplicitContext?: boolean;
+    storeToHistory?: boolean;
+}
+export interface IChatWidgetViewModelChangeEvent {
+    readonly previousSessionResource: URI | undefined;
+    readonly currentSessionResource: URI | undefined;
 }
 export interface IChatWidget {
     readonly domNode: HTMLElement;
-    readonly onDidChangeViewModel: Event<void>;
+    readonly onDidChangeViewModel: Event<IChatWidgetViewModelChangeEvent>;
     readonly onDidAcceptInput: Event<void>;
     readonly onDidHide: Event<void>;
     readonly onDidShow: Event<void>;

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

@@ -1,5 +1,5 @@
 
-import { CHAT_PROVIDER_ID } from '../common/chatParticipantContribTypes.js';
+import { CHAT_PROVIDER_ID } from '../common/participants/chatParticipantContribTypes.js';
 
 const ChatViewPaneTarget = Symbol('ChatViewPaneTarget');
 function isIChatViewViewContext(context) {

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

@@ -2,12 +2,12 @@ import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
 import { PreferredGroup } from "../../../services/editor/common/editorService.js";
-import { IChatElicitationRequest } from "../common/chatService.js";
-import { IChatResponseViewModel } from "../common/chatViewModel.js";
+import { IChatElicitationRequest } from "../common/chatService/chatService.js";
 import { ChatAgentLocation } from "../common/constants.js";
+import { IChatResponseViewModel } from "../common/model/chatViewModel.js";
 import { IChatWidget, ChatViewPaneTarget, type IQuickChatOpenOptions, type ICodeBlockActionContextProvider } from "./chat.js";
-import { IChatEditorOptions } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/browser/chatEditor";
-import { ChatWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatWidget";
+import { ChatWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatWidget";
+import { IChatEditorOptions } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditor";
 export declare const IChatWidgetService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatWidgetService>;
 export interface IChatWidgetService {
     readonly _serviceBrand: undefined;
@@ -21,6 +21,10 @@ export interface IChatWidgetService {
     readonly lastFocusedWidget: IChatWidget | undefined;
     readonly onDidAddWidget: Event<IChatWidget>;
     /**
+    * Fires when a chat session is no longer open in any chat widget.
+    */
+    readonly onDidBackgroundSession: Event<URI>;
+    /**
     * Reveals the widget, focusing its input unless `preserveFocus` is true.
     */
     reveal(widget: IChatWidget, preserveFocus?: boolean): Promise<boolean>;
@@ -57,9 +61,9 @@ export interface IQuickChatService {
 export declare const IChatAccessibilityService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatAccessibilityService>;
 export interface IChatAccessibilityService {
     readonly _serviceBrand: undefined;
-    acceptRequest(): number;
-    disposeRequest(requestId: number): void;
-    acceptResponse(widget: ChatWidget, container: HTMLElement, response: IChatResponseViewModel | string | undefined, requestId: number, isVoiceInput?: boolean): void;
+    acceptRequest(uri: URI): void;
+    disposeRequest(requestId: URI): void;
+    acceptResponse(widget: ChatWidget, container: HTMLElement, response: IChatResponseViewModel | string | undefined, requestId: URI | undefined, isVoiceInput?: boolean): void;
     acceptElicitation(message: IChatElicitationRequest): void;
 }
 export declare const IChatCodeBlockContextProviderService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatCodeBlockContextProviderService>;

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

@@ -5,8 +5,8 @@ import { IInstantiationService } from "../../../../../platform/instantiation/com
 import { IWorkbenchContribution } from "../../../../common/contributions.js";
 import { IEditorGroupsService } from "../../../../services/editor/common/editorGroupsService.service.js";
 import { IInlineChatSessionService } from "../../../inlineChat/browser/inlineChatSessionService.service.js";
-import { IChatEditingSession, IModifiedFileEntry } from "../../common/chatEditingService.js";
-import { IChatEditingService } from "../../common/chatEditingService.service.js";
+import { IChatEditingSession, IModifiedFileEntry } from "../../common/editing/chatEditingService.js";
+import { IChatEditingService } from "../../common/editing/chatEditingService.service.js";
 export declare const ctxIsGlobalEditingSession: RawContextKey<boolean>;
 export declare const ctxHasEditorModification: RawContextKey<boolean>;
 export declare const ctxIsCurrentlyBeingModified: RawContextKey<boolean>;