@codingame/monaco-vscode-chat-service-override 31.0.0 → 32.0.0

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

@@ -0,0 +1,171 @@
+
+import { raceCancellation } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { assertType } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
+import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { waitForState } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utilsCancellation';
+
+async function reviewEdits(accessor, editor, stream, token, applyCodeBlockSuggestionId) {
+    if (!editor.hasModel()) {
+        return false;
+    }
+    const chatService = accessor.get(IChatService);
+    const uri = editor.getModel().uri;
+    const chatModelRef = chatService.startNewLocalSession(ChatAgentLocation.EditorInline);
+    const chatModel = chatModelRef.object;
+    chatModel.startEditingSession(true);
+    const store = ( new DisposableStore());
+    store.add(chatModelRef);
+    const chatRequest = chatModel?.addRequest({
+        text: "",
+        parts: []
+    }, {
+        variables: []
+    }, 0, {
+        kind: undefined,
+        modeId: "applyCodeBlock",
+        modeInstructions: undefined,
+        isBuiltin: true,
+        applyCodeBlockSuggestionId
+    });
+    assertType(chatRequest.response);
+    chatRequest.response.updateContent({
+        kind: "textEdit",
+        uri,
+        edits: [],
+        done: false
+    });
+    for await (const chunk of stream) {
+        if (token.isCancellationRequested) {
+            chatRequest.response.cancel();
+            break;
+        }
+        chatRequest.response.updateContent({
+            kind: "textEdit",
+            uri,
+            edits: chunk,
+            done: false
+        });
+    }
+    chatRequest.response.updateContent({
+        kind: "textEdit",
+        uri,
+        edits: [],
+        done: true
+    });
+    if (!token.isCancellationRequested) {
+        chatRequest.response.complete();
+    }
+    const isSettled = derived(r => {
+        const entry = chatModel.editingSession?.readEntry(uri, r);
+        if (!entry) {
+            return false;
+        }
+        const state = entry.state.read(r);
+        return state === ModifiedFileEntryState.Accepted || state === ModifiedFileEntryState.Rejected;
+    });
+    const whenDecided = waitForState(isSettled, Boolean);
+    await raceCancellation(whenDecided, token);
+    store.dispose();
+    return true;
+}
+async function reviewNotebookEdits(accessor, uri, stream, token) {
+    const chatService = accessor.get(IChatService);
+    const notebookService = accessor.get(INotebookService);
+    const isNotebook = notebookService.hasSupportedNotebooks(uri);
+    const chatModelRef = chatService.startNewLocalSession(ChatAgentLocation.EditorInline);
+    const chatModel = chatModelRef.object;
+    chatModel.startEditingSession(true);
+    const store = ( new DisposableStore());
+    store.add(chatModelRef);
+    const chatRequest = chatModel?.addRequest({
+        text: "",
+        parts: []
+    }, {
+        variables: []
+    }, 0);
+    assertType(chatRequest.response);
+    if (isNotebook) {
+        chatRequest.response.updateContent({
+            kind: "notebookEdit",
+            uri,
+            edits: [],
+            done: false
+        });
+    } else {
+        chatRequest.response.updateContent({
+            kind: "textEdit",
+            uri,
+            edits: [],
+            done: false
+        });
+    }
+    for await (const chunk of stream) {
+        if (token.isCancellationRequested) {
+            chatRequest.response.cancel();
+            break;
+        }
+        if (chunk.every(isCellEditOperation)) {
+            chatRequest.response.updateContent({
+                kind: "notebookEdit",
+                uri,
+                edits: chunk,
+                done: false
+            });
+        } else {
+            chatRequest.response.updateContent({
+                kind: "textEdit",
+                uri: chunk[0],
+                edits: chunk[1],
+                done: false
+            });
+        }
+    }
+    if (isNotebook) {
+        chatRequest.response.updateContent({
+            kind: "notebookEdit",
+            uri,
+            edits: [],
+            done: true
+        });
+    } else {
+        chatRequest.response.updateContent({
+            kind: "textEdit",
+            uri,
+            edits: [],
+            done: true
+        });
+    }
+    if (!token.isCancellationRequested) {
+        chatRequest.response.complete();
+    }
+    const isSettled = derived(r => {
+        const entry = chatModel.editingSession?.readEntry(uri, r);
+        if (!entry) {
+            return false;
+        }
+        const state = entry.state.read(r);
+        return state === ModifiedFileEntryState.Accepted || state === ModifiedFileEntryState.Rejected;
+    });
+    const whenDecided = waitForState(isSettled, Boolean);
+    await raceCancellation(whenDecided, token);
+    store.dispose();
+    return true;
+}
+function isCellEditOperation(edit) {
+    if (URI.isUri(edit)) {
+        return false;
+    }
+    if (Array.isArray(edit)) {
+        return false;
+    }
+    return true;
+}
+
+export { reviewEdits, reviewNotebookEdits };

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

@@ -8,7 +8,7 @@ import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IEnablementModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement";
-import { IAgentPlugin } from "../common/plugins/agentPluginService.js";
+import { IAgentPlugin } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService";
 import { IPluginInstallService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service";
 import { IMarketplacePluginItem } from "./agentPluginEditor/agentPluginItems.js";
 export declare class InstallPluginAction extends Action {

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

@@ -17,7 +17,7 @@ import { hasKey } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types
 
 let InstallPluginAction = class InstallPluginAction extends Action {
     constructor(item, pluginInstallService) {
-        super("agentPlugin.install", ( localize(5079, "Install")), "extension-action label prominent install", true, () => pluginInstallService.installPlugin({
+        super("agentPlugin.install", ( localize(5140, "Install")), "extension-action label prominent install", true, () => pluginInstallService.installPlugin({
             name: item.name,
             description: item.description,
             version: "",
@@ -33,7 +33,7 @@ let InstallPluginAction = class InstallPluginAction extends Action {
 InstallPluginAction = ( __decorate([( __param(1, IPluginInstallService))], InstallPluginAction));
 class UninstallPluginAction extends Action {
     constructor(plugin) {
-        super("agentPlugin.uninstall", ( localize(5080, "Uninstall")), "extension-action label uninstall", true, () => {
+        super("agentPlugin.uninstall", ( localize(5141, "Uninstall")), "extension-action label uninstall", true, () => {
             plugin.remove();
             return Promise.resolve();
         });
@@ -41,7 +41,7 @@ class UninstallPluginAction extends Action {
 }
 let OpenPluginFolderAction = class OpenPluginFolderAction extends Action {
     constructor(plugin, commandService, openerService) {
-        super("agentPlugin.openFolder", ( localize(5081, "Open Plugin Folder")), undefined, true, async () => {
+        super("agentPlugin.openFolder", ( localize(5142, "Open Plugin Folder")), undefined, true, async () => {
             try {
                 await commandService.executeCommand("revealFileInOS", plugin.uri);
             } catch {
@@ -53,7 +53,7 @@ let OpenPluginFolderAction = class OpenPluginFolderAction extends Action {
 OpenPluginFolderAction = ( __decorate([( __param(1, ICommandService)), ( __param(2, IOpenerService))], OpenPluginFolderAction));
 let OpenPluginReadmeAction = class OpenPluginReadmeAction extends Action {
     constructor(readmeUri, openerService) {
-        super("agentPlugin.openReadme", ( localize(5082, "Open README")), undefined, true, () => openerService.open(readmeUri));
+        super("agentPlugin.openReadme", ( localize(5143, "Open README")), undefined, true, () => openerService.open(readmeUri));
     }
 };
 OpenPluginReadmeAction = ( __decorate([( __param(1, IOpenerService))], OpenPluginReadmeAction));
@@ -168,11 +168,11 @@ class EnablementDropdownActionViewItem extends ActionWithDropdownActionViewItem
 function createEnablePluginDropDown(plugin, enablementModel, workspaceContextService) {
     const key = ( plugin.uri.toString());
     const hasWorkspace = workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY;
-    const enable = ( new EnablementSubAction("agentPlugin.enable", ( localize(5083, "Enable")), "extension-action label prominent", isContributionDisabled(plugin.enablement.get()), () => {
+    const enable = ( new EnablementSubAction("agentPlugin.enable", ( localize(5144, "Enable")), "extension-action label prominent", isContributionDisabled(plugin.enablement.get()), () => {
         enablementModel.setEnabled(key, ContributionEnablementState.EnabledProfile);
         return Promise.resolve();
     }));
-    const enableWorkspace = ( new EnablementSubAction("agentPlugin.enableForWorkspace", ( localize(5084, "Enable (Workspace)")), "extension-action label", isContributionDisabled(plugin.enablement.get()) && hasWorkspace, () => {
+    const enableWorkspace = ( new EnablementSubAction("agentPlugin.enableForWorkspace", ( localize(5145, "Enable (Workspace)")), "extension-action label", isContributionDisabled(plugin.enablement.get()) && hasWorkspace, () => {
         enablementModel.setEnabled(key, ContributionEnablementState.EnabledWorkspace);
         return Promise.resolve();
     }));
@@ -181,11 +181,11 @@ function createEnablePluginDropDown(plugin, enablementModel, workspaceContextSer
 function createDisablePluginDropDown(plugin, enablementModel, workspaceContextService) {
     const key = ( plugin.uri.toString());
     const hasWorkspace = workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY;
-    const disable = ( new EnablementSubAction("agentPlugin.disable", ( localize(5085, "Disable")), "extension-action label disable", isContributionEnabled(plugin.enablement.get()), () => {
+    const disable = ( new EnablementSubAction("agentPlugin.disable", ( localize(5146, "Disable")), "extension-action label disable", isContributionEnabled(plugin.enablement.get()), () => {
         enablementModel.setEnabled(key, ContributionEnablementState.DisabledProfile);
         return Promise.resolve();
     }));
-    const disableWorkspace = ( new EnablementSubAction("agentPlugin.disableForWorkspace", ( localize(5086, "Disable (Workspace)")), "extension-action label disable", isContributionEnabled(plugin.enablement.get()) && hasWorkspace, () => {
+    const disableWorkspace = ( new EnablementSubAction("agentPlugin.disableForWorkspace", ( localize(5147, "Disable (Workspace)")), "extension-action label disable", isContributionEnabled(plugin.enablement.get()) && hasWorkspace, () => {
         enablementModel.setEnabled(key, ContributionEnablementState.DisabledWorkspace);
         return Promise.resolve();
     }));

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

@@ -357,7 +357,7 @@ let AgentPluginEditor = class AgentPluginEditor extends EditorPane {
         this.contentDisposables.add(toDisposable(insert(this.layoutParticipants, {
             layout
         })));
-        return this.openMarkdown(this.pluginReadme.get(), ( localize(5087, "No README available.")), readmeContainer, WebviewIndex.Readme, ( localize(5088, "Readme")), token);
+        return this.openMarkdown(this.pluginReadme.get(), ( localize(5148, "No README available.")), readmeContainer, WebviewIndex.Readme, ( localize(5149, "Readme")), token);
     }
     async openMarkdown(cacheResult, noContentCopy, container, webviewIndex, title, token) {
         try {
@@ -378,7 +378,7 @@ let AgentPluginEditor = class AgentPluginEditor extends EditorPane {
             webview.initialScrollProgress = this.initialScrollProgress.get(webviewIndex) || 0;
             webview.claim(this, this.window, undefined);
             setParentFlowTo(webview.container, container);
-            webview.layoutWebviewOverElement(container);
+            webview.setAnchorElement(container);
             webview.setHtml(body);
             webview.claim(this, this.window, undefined);
             this.contentDisposables.add(webview.onDidFocus(() => this._onDidFocus?.fire()));
@@ -387,7 +387,7 @@ let AgentPluginEditor = class AgentPluginEditor extends EditorPane {
             ));
             const removeLayoutParticipant = insert(this.layoutParticipants, {
                 layout: () => {
-                    webview.layoutWebviewOverElement(container);
+                    webview.setAnchorElement(container);
                 }
             });
             this.contentDisposables.add(toDisposable(removeLayoutParticipant));
@@ -529,7 +529,7 @@ let UpdatePluginEditorAction = class UpdatePluginEditorAction extends Action {
         pluginInstallService,
         pluginMarketplaceService
     ) {
-        super(UpdatePluginEditorAction_1.ID, ( localize(5089, "Update")), "extension-action label prominent install");
+        super(UpdatePluginEditorAction_1.ID, ( localize(5150, "Update")), "extension-action label prominent install");
         this.plugin = plugin;
         this.liveMarketplacePlugin = liveMarketplacePlugin;
         this.pluginInstallService = pluginInstallService;

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

@@ -8,7 +8,7 @@ import { EditorInputCapabilities } from '@codingame/monaco-vscode-api/vscode/vs/
 import { EditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput';
 import { AgentPluginItemKind } from './agentPluginItems.js';
 
-const AgentPluginEditorIcon = registerIcon("agent-plugin-editor-icon", Codicon.extensions, ( localize(5090, "Icon of the Agent Plugin editor.")));
+const AgentPluginEditorIcon = registerIcon("agent-plugin-editor-icon", Codicon.extensions, ( localize(5151, "Icon of the Agent Plugin editor.")));
 function getPluginId(item) {
     if (item.kind === AgentPluginItemKind.Installed) {
         return ( item.plugin.uri.toString());
@@ -39,7 +39,7 @@ class AgentPluginEditorInput extends EditorInput {
         return this._item;
     }
     getName() {
-        return localize(5091, "Plugin: {0}", this._item.name);
+        return localize(5152, "Plugin: {0}", this._item.name);
     }
     getIcon() {
         return AgentPluginEditorIcon;

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

@@ -1,6 +1,6 @@
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import type { IAgentPlugin } from "../../common/plugins/agentPluginService.js";
+import type { IAgentPlugin } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService";
 import type { IMarketplacePlugin, IMarketplaceReference, IPluginSourceDescriptor, MarketplaceType } from "../../common/plugins/pluginMarketplaceService.js";
 export declare enum AgentPluginItemKind {
     Installed = "installed",

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

@@ -1,12 +1,13 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
-import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
+import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
 import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { IUserDataProfileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service";
 import { IEnsureRepositoryOptions, IPullRepositoryOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService";
 import { IAgentPluginRepositoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service";
 import { IMarketplacePlugin, IMarketplaceReference, IPluginSourceDescriptor, MarketplaceType, PluginSourceKind } from "../common/plugins/pluginMarketplaceService.js";
@@ -27,7 +28,7 @@ export declare class AgentPluginRepositoryService implements IAgentPluginReposit
     private readonly _pluginSources;
     private readonly _cloneSequencer;
     private readonly _migrationDone;
-    constructor(_commandService: ICommandService, environmentService: IWorkbenchEnvironmentService, _fileService: IFileService, instantiationService: IInstantiationService, _logService: ILogService, _notificationService: INotificationService, _pluginGit: IPluginGitService, _progressService: IProgressService, _storageService: IStorageService);
+    constructor(_commandService: ICommandService, environmentService: IEnvironmentService, _fileService: IFileService, instantiationService: IInstantiationService, _logService: ILogService, _notificationService: INotificationService, _pluginGit: IPluginGitService, _progressService: IProgressService, _storageService: IStorageService, userDataProfileService: IUserDataProfileService);
     getPluginSource(kind: PluginSourceKind): IPluginSource;
     getRepositoryUri(marketplace: IMarketplaceReference, marketplaceType?: MarketplaceType): URI;
     getPluginInstallUri(plugin: IMarketplacePlugin): URI;

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

@@ -8,7 +8,7 @@ import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marsh
 import { joinPath, isEqual, dirname, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
@@ -18,6 +18,7 @@ import { ProgressLocation } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { PluginSourceKind } from '../common/plugins/pluginMarketplaceService.js';
 import { IPluginGitService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/pluginGitService.service';
 import { RelativePathPluginSource, GitHubPluginSource, GitUrlPluginSource, NpmPluginSource, PipPluginSource } from './pluginSources.js';
@@ -35,7 +36,8 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         _notificationService,
         _pluginGit,
         _progressService,
-        _storageService
+        _storageService,
+        userDataProfileService
     ) {
         this._commandService = _commandService;
         this._fileService = _fileService;
@@ -46,7 +48,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         this._storageService = _storageService;
         this._marketplaceIndex = ( new Lazy(() => this._loadMarketplaceIndex()));
         this._cloneSequencer = ( new SequencerByKey());
-        this.agentPluginsHome = environmentService.agentPluginsHome;
+        this.agentPluginsHome = userDataProfileService.currentProfile.agentPluginsHome;
         const legacyCacheRoot = joinPath(environmentService.cacheHome, "agentPlugins");
         const oldCacheRoot = environmentService.cacheHome.scheme === "file" ? legacyCacheRoot : this.agentPluginsHome;
         this._cacheRoot = this.agentPluginsHome;
@@ -96,7 +98,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             if (marketplace.kind === MarketplaceReferenceKind.LocalFileUri) {
                 throw ( new Error(`Local marketplace repository does not exist: ${repoDir.fsPath}`));
             }
-            const progressTitle = options?.progressTitle ?? ( localize(5092, "Preparing plugin marketplace '{0}'...", marketplace.displayLabel));
+            const progressTitle = options?.progressTitle ?? ( localize(5153, "Preparing plugin marketplace '{0}'...", marketplace.displayLabel));
             const failureLabel = options?.failureLabel ?? marketplace.displayLabel;
             await this._cloneRepository(repoDir, marketplace.cloneUrl, progressTitle, failureLabel);
             this._updateMarketplaceIndex(marketplace, repoDir, options?.marketplaceType);
@@ -121,7 +123,7 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             try {
                 return await this._progressService.withProgress({
                     location: ProgressLocation.Notification,
-                    title: ( localize(5093, "Updating plugin '{0}'...", updateLabel)),
+                    title: ( localize(5154, "Updating plugin '{0}'...", updateLabel)),
                     cancellable: true
                 }, () => this._pluginGit.pull(repoDir, cts.token), () => cts.dispose(true));
             } finally {
@@ -136,13 +138,13 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        5094,
+                        5155,
                         "Failed to update plugin '{0}': {1}",
                         options?.failureLabel ?? updateLabel,
                         err?.message ?? String(err)
                     )),
                     actions: {
-                        primary: [( new Action("showGitOutput", ( localize(5095, "Show Git Output")), undefined, true, () => {
+                        primary: [( new Action("showGitOutput", ( localize(5156, "Show Git Output")), undefined, true, () => {
                             this._commandService.executeCommand("git.showOutput");
                         }))]
                     }
@@ -221,13 +223,13 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    5096,
+                    5157,
                     "Failed to install plugin '{0}': {1}",
                     failureLabel,
                     err?.message ?? String(err)
                 )),
                 actions: {
-                    primary: [( new Action("showGitOutput", ( localize(5095, "Show Git Output")), undefined, true, () => {
+                    primary: [( new Action("showGitOutput", ( localize(5156, "Show Git Output")), undefined, true, () => {
                         this._commandService.executeCommand("git.showOutput");
                     }))]
                 }
@@ -362,6 +364,6 @@ let AgentPluginRepositoryService = class AgentPluginRepositoryService {
         }
     }
 };
-AgentPluginRepositoryService = ( __decorate([( __param(0, ICommandService)), ( __param(1, IWorkbenchEnvironmentService)), ( __param(2, IFileService)), ( __param(3, IInstantiationService)), ( __param(4, ILogService)), ( __param(5, INotificationService)), ( __param(6, IPluginGitService)), ( __param(7, IProgressService)), ( __param(8, IStorageService))], AgentPluginRepositoryService));
+AgentPluginRepositoryService = ( __decorate([( __param(0, ICommandService)), ( __param(1, IEnvironmentService)), ( __param(2, IFileService)), ( __param(3, IInstantiationService)), ( __param(4, ILogService)), ( __param(5, INotificationService)), ( __param(6, IPluginGitService)), ( __param(7, IProgressService)), ( __param(8, IStorageService)), ( __param(9, IUserDataProfileService))], AgentPluginRepositoryService));
 
 export { AgentPluginRepositoryService };

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

@@ -0,0 +1,28 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IAgentHostPermissionService } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostPermissionService.service";
+import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IChatInputNotificationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService.service";
+/**
+ * Bridges {@link IAgentHostPermissionService} to the chat input notification
+ * banner. While there are pending permission requests, the oldest one is
+ * shown above the chat input with three actions:
+ *
+ * - **Deny** — reject the request.
+ * - **Allow** — approve the request and remember it in memory until the
+ *   connection closes or the window is reloaded.
+ * - **Always allow** — approve and persist into `chat.agentHost.localFilePermissions`.
+ */
+export declare class AgentHostPermissionUiContribution extends Disposable implements IWorkbenchContribution {
+    private readonly _permissionService;
+    private readonly _chatInputNotificationService;
+    private readonly _labelService;
+    static readonly ID = "workbench.contrib.agentHostPermissionUi";
+    /** Stable id used in {@link IChatInputNotification} so updates replace in place. */
+    private static readonly NOTIFICATION_ID;
+    private _lastRequestId;
+    constructor(_permissionService: IAgentHostPermissionService, _chatInputNotificationService: IChatInputNotificationService, _labelService: ILabelService);
+    private _render;
+    private _buildNotification;
+    private _resolveHostName;
+}

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

@@ -0,0 +1,99 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { escapeMarkdownSyntaxTokens, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { AgentHostPermissionMode } from '../../../../../../platform/agentHost/common/agentHostPermissionService.js';
+import { IAgentHostPermissionService } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostPermissionService.service';
+import { agentHostAuthority, AGENT_HOST_SCHEME } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostUri';
+import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
+import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
+import { ChatInputNotificationSeverity } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService';
+import { IChatInputNotificationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService.service';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+
+var AgentHostPermissionUiContribution_1;
+const ALLOW_COMMAND = "_agentHost.permission.allow";
+const ALLOW_ALWAYS_COMMAND = "_agentHost.permission.allowAlways";
+const DENY_COMMAND = "_agentHost.permission.deny";
+CommandsRegistry.registerCommand(ALLOW_COMMAND, (accessor, requestId) => {
+    accessor.get(IAgentHostPermissionService).findPending(requestId)?.allow();
+});
+CommandsRegistry.registerCommand(ALLOW_ALWAYS_COMMAND, (accessor, requestId) => {
+    accessor.get(IAgentHostPermissionService).findPending(requestId)?.allowAlways();
+});
+CommandsRegistry.registerCommand(DENY_COMMAND, (accessor, requestId) => {
+    accessor.get(IAgentHostPermissionService).findPending(requestId)?.deny();
+});
+let AgentHostPermissionUiContribution = class AgentHostPermissionUiContribution extends Disposable {
+    static {
+        AgentHostPermissionUiContribution_1 = this;
+    }
+    static {
+        this.ID = "workbench.contrib.agentHostPermissionUi";
+    }
+    static {
+        this.NOTIFICATION_ID = "agentHost.permissionRequest";
+    }
+    constructor(_permissionService, _chatInputNotificationService, _labelService) {
+        super();
+        this._permissionService = _permissionService;
+        this._chatInputNotificationService = _chatInputNotificationService;
+        this._labelService = _labelService;
+        this._register(autorun(reader => {
+            const pending = this._permissionService.allPending.read(reader);
+            this._render(pending);
+        }));
+    }
+    _render(pending) {
+        const next = pending[0];
+        if (!next) {
+            if (this._lastRequestId) {
+                this._chatInputNotificationService.deleteNotification(AgentHostPermissionUiContribution_1.NOTIFICATION_ID);
+                this._lastRequestId = undefined;
+            }
+            return;
+        }
+        this._lastRequestId = next.id;
+        this._chatInputNotificationService.setNotification(this._buildNotification(next, pending.length));
+    }
+    _buildNotification(request, totalPending) {
+        const hostName = escapeMarkdownSyntaxTokens(this._resolveHostName(request.address));
+        const path = request.uri.scheme === Schemas.file ? request.uri.fsPath : ( request.uri.toString());
+        const fence = "`".repeat((path.match(/`+/g)?.reduce((m, s) => Math.max(m, s.length), 0) ?? 0) + 1);
+        const codePath = `${fence}${path}${fence}`;
+        const message = ( new MarkdownString(request.mode === AgentHostPermissionMode.Write ? ( localize(5158, "Remote agent host \"{0}\" wants to write {1}", hostName, codePath)) : ( localize(5159, "Remote agent host \"{0}\" wants to read {1}", hostName, codePath))));
+        const description = totalPending > 1 ? totalPending === 2 ? ( localize(5160, "+1 more request waiting")) : ( localize(5161, "+{0} more requests waiting", totalPending - 1)) : undefined;
+        return {
+            id: AgentHostPermissionUiContribution_1.NOTIFICATION_ID,
+            severity: ChatInputNotificationSeverity.Warning,
+            message,
+            description,
+            actions: [{
+                label: ( localize(5162, "Deny")),
+                commandId: DENY_COMMAND,
+                commandArgs: [request.id]
+            }, {
+                label: ( localize(5163, "Allow")),
+                commandId: ALLOW_COMMAND,
+                commandArgs: [request.id]
+            }, {
+                label: ( localize(5164, "Always Allow")),
+                commandId: ALLOW_ALWAYS_COMMAND,
+                commandArgs: [request.id]
+            }],
+            dismissible: false,
+            autoDismissOnMessage: false
+        };
+    }
+    _resolveHostName(address) {
+        const authority = agentHostAuthority(address);
+        const label = this._labelService.getHostLabel(AGENT_HOST_SCHEME, authority);
+        return label && label !== authority ? label : address;
+    }
+};
+AgentHostPermissionUiContribution = AgentHostPermissionUiContribution_1 = ( __decorate([( __param(0, IAgentHostPermissionService)), ( __param(1, IChatInputNotificationService)), ( __param(2, ILabelService))], AgentHostPermissionUiContribution));
+
+export { AgentHostPermissionUiContribution };

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

@@ -4,6 +4,7 @@ import { IAgentHostSessionWorkingDirectoryResolver } from "@codingame/monaco-vsc
 export declare class AgentHostSessionWorkingDirectoryResolver implements IAgentHostSessionWorkingDirectoryResolver {
     readonly _serviceBrand: undefined;
     private readonly _resolvers;
-    registerResolver(sessionType: string, resolver: (sessionResource: URI) => URI | undefined): IDisposable;
+    registerResolver(sessionType: string, resolver: (sessionResource: URI) => URI | undefined, isNewSession?: (sessionResource: URI) => boolean): IDisposable;
     resolve(sessionResource: URI): URI | undefined;
+    isNewSession(sessionResource: URI): boolean;
 }

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

@@ -7,16 +7,23 @@ class AgentHostSessionWorkingDirectoryResolver {
     constructor() {
         this._resolvers = ( new Map());
     }
-    registerResolver(sessionType, resolver) {
-        this._resolvers.set(sessionType, resolver);
+    registerResolver(sessionType, resolver, isNewSession) {
+        const entry = {
+            resolve: resolver,
+            isNewSession
+        };
+        this._resolvers.set(sessionType, entry);
         return toDisposable(() => {
-            if (this._resolvers.get(sessionType) === resolver) {
+            if (this._resolvers.get(sessionType) === entry) {
                 this._resolvers.delete(sessionType);
             }
         });
     }
     resolve(sessionResource) {
-        return this._resolvers.get(sessionResource.scheme)?.(sessionResource);
+        return this._resolvers.get(sessionResource.scheme)?.resolve(sessionResource);
+    }
+    isNewSession(sessionResource) {
+        return this._resolvers.get(sessionResource.scheme)?.isNewSession?.(sessionResource) ?? false;
     }
 }
 

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

@@ -15,6 +15,7 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monac
 import { registerAction2, MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { FocusAgentSessionsAction, PickAgentSessionAction, ArchiveAllAgentSessionsAction, MarkAllAgentSessionsReadAction, ArchiveAgentSessionSectionAction, UnarchiveAgentSessionSectionAction, MarkAgentSessionSectionReadAction, CollapseAllAgentSessionSectionsAction, ArchiveAgentSessionAction, UnarchiveAgentSessionAction, PinAgentSessionAction, UnpinAgentSessionAction, RenameAgentSessionAction, DeleteAgentSessionAction, DeleteAllLocalSessionsAction, MarkAgentSessionUnreadAction, MarkAgentSessionReadAction, OpenAgentSessionInNewWindowAction, OpenAgentSessionInEditorGroupAction, OpenAgentSessionInNewEditorGroupAction, RefreshAgentSessionsViewerAction, FindAgentSessionInViewerAction, ShowAgentSessionsSidebar, HideAgentSessionsSidebar, ToggleAgentSessionsSidebar, ToggleShowAgentSessionsAction, SetAgentSessionsOrientationStackedAction, SetAgentSessionsOrientationSideBySideAction } from './agentSessionsActions.js';
 import { AGENT_SESSIONS_QUICK_ACCESS_PREFIX, AgentSessionsQuickAccessProvider } from './agentSessionsQuickAccess.js';
+import { AgentHostPermissionUiContribution } from './agentHost/agentHostPermissionUiContribution.js';
 
 registerAction2(FocusAgentSessionsAction);
 registerAction2(PickAgentSessionAction);
@@ -46,7 +47,7 @@ registerAction2(SetAgentSessionsOrientationStackedAction);
 registerAction2(SetAgentSessionsOrientationSideBySideAction);
 MenuRegistry.appendMenuItem(MenuId.AgentSessionsToolbar, {
     submenu: MenuId.AgentSessionsViewerFilterSubMenu,
-    title: ( localize2(5115, "Filter Agent Sessions")),
+    title: ( localize2(5172, "Filter Agent Sessions")),
     group: "navigation",
     order: 3,
     icon: Codicon.filter
@@ -116,9 +117,9 @@ MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleToolbar, {
     prefix: AGENT_SESSIONS_QUICK_ACCESS_PREFIX,
     contextKey: "inAgentSessionsPicker",
     when: ChatContextKeys.enabled,
-    placeholder: ( localize(5116, "Search agent sessions by name")),
+    placeholder: ( localize(5173, "Search agent sessions by name")),
     helpEntries: [{
-        description: ( localize(5117, "Show All Agent Sessions")),
+        description: ( localize(5174, "Show All Agent Sessions")),
         commandId: "workbench.action.chat.history"
     }]
 });
@@ -127,3 +128,8 @@ registerWorkbenchContribution2(
     LocalAgentsSessionsController,
     WorkbenchPhase.AfterRestored
 );
+registerWorkbenchContribution2(
+    AgentHostPermissionUiContribution.ID,
+    AgentHostPermissionUiContribution,
+    WorkbenchPhase.BlockRestore
+);