@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/media/chatPetAchievements.css

@@ -0,0 +1,236 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.chat-pet-achievements-editor,
+.chat-pet-achievements-widget {
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+}
+
+.chat-pet-achievements-content {
+	box-sizing: border-box;
+	min-width: 0;
+	padding: var(--vscode-spacing-size240);
+}
+
+.chat-pet-achievements-inner {
+	max-width: 900px;
+	margin: 0 auto;
+}
+
+.chat-pet-achievements-inner h1,
+.chat-pet-achievements-inner h2,
+.chat-pet-achievements-inner h3,
+.chat-pet-achievements-inner p {
+	margin-top: 0;
+}
+
+.chat-pet-achievements-inner h1 {
+	margin-bottom: var(--vscode-spacing-size80);
+	font-size: var(--vscode-fontSize-heading2);
+	font-weight: var(--vscode-fontWeight-semiBold);
+}
+
+.chat-pet-achievements-intro {
+	margin-bottom: var(--vscode-spacing-size240);
+	color: var(--vscode-descriptionForeground);
+}
+
+.chat-pet-achievements-collection-header h2 {
+	margin-bottom: var(--vscode-spacing-size120);
+	font-size: var(--vscode-fontSize-heading3);
+	font-weight: var(--vscode-fontWeight-semiBold);
+}
+
+.chat-pet-achievements-collection-header {
+	display: flex;
+	align-items: baseline;
+	justify-content: space-between;
+	gap: var(--vscode-spacing-size120);
+}
+
+.chat-pet-achievements-count {
+	color: var(--vscode-descriptionForeground);
+	white-space: nowrap;
+}
+
+.chat-pet-achievements-list {
+	display: grid;
+	grid-template-columns: repeat(3, minmax(0, 1fr));
+	gap: var(--vscode-spacing-size160);
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+.chat-pet-achievements-widget.narrow .chat-pet-achievements-content {
+	padding: var(--vscode-spacing-size160) var(--vscode-spacing-size120);
+}
+
+.chat-pet-achievements-widget.narrow .chat-pet-achievements-list {
+	grid-template-columns: minmax(0, 1fr);
+}
+
+.chat-pet-achievement-card.monaco-button {
+	box-sizing: border-box;
+	display: block;
+	position: relative;
+	height: 100%;
+	min-width: 0;
+	padding: var(--vscode-spacing-size160);
+	border: var(--vscode-strokeThickness) solid var(--vscode-editorWidget-border);
+	border-radius: var(--vscode-cornerRadius-medium);
+	background: var(--vscode-editorWidget-background);
+	color: var(--vscode-foreground);
+	font-size: var(--vscode-fontSize-label1);
+	font-weight: var(--vscode-fontWeight-regular);
+	line-height: 1.4;
+	text-align: left;
+	white-space: normal;
+}
+
+.chat-pet-achievement-card.chat-pet-achievement-roadmap {
+	box-sizing: border-box;
+	height: 100%;
+	min-width: 0;
+	padding: var(--vscode-spacing-size160);
+	border: var(--vscode-strokeThickness) dashed var(--vscode-editorWidget-border);
+	border-radius: var(--vscode-cornerRadius-medium);
+	background: var(--vscode-editorWidget-background);
+	color: var(--vscode-foreground);
+}
+
+.chat-pet-achievement-roadmap-preview {
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 96px;
+	height: 96px;
+	margin: 0 auto var(--vscode-spacing-size120);
+	border: var(--vscode-strokeThickness) dashed var(--vscode-editorWidget-border);
+	border-radius: var(--vscode-cornerRadius-medium);
+	background: var(--vscode-editor-background);
+	color: var(--vscode-descriptionForeground);
+	font-size: var(--vscode-fontSize-heading2);
+	font-weight: var(--vscode-fontWeight-semiBold);
+	letter-spacing: 0.08em;
+}
+
+.chat-pet-achievement-roadmap-list {
+	margin: 0;
+	padding-left: var(--vscode-spacing-size200);
+	color: var(--vscode-descriptionForeground);
+}
+
+.chat-pet-achievement-roadmap-list li + li {
+	margin-top: var(--vscode-spacing-size40);
+}
+
+.chat-pet-achievements-experimental {
+	margin: var(--vscode-spacing-size200) 0 0;
+	color: var(--vscode-descriptionForeground);
+	font-size: var(--vscode-fontSize-body2);
+}
+
+.chat-pet-achievement-new-badge {
+	position: absolute;
+	z-index: 1;
+	top: var(--vscode-spacing-size100);
+	right: var(--vscode-spacing-size100);
+	padding: var(--vscode-spacing-size20) var(--vscode-spacing-size60);
+	border: var(--vscode-strokeThickness) solid var(--vscode-badge-background);
+	border-radius: var(--vscode-cornerRadius-circle);
+	background: var(--vscode-badge-background);
+	color: var(--vscode-badge-foreground);
+	font-size: var(--vscode-fontSize-label3);
+	font-weight: var(--vscode-fontWeight-semiBold);
+	line-height: 1;
+}
+
+.chat-pet-achievement-new-badge.hidden {
+	display: none;
+}
+
+.chat-pet-achievement-card.monaco-button:not(.locked):hover {
+	border-color: var(--vscode-focusBorder);
+	background: var(--vscode-list-hoverBackground);
+}
+
+.chat-pet-achievement-card.monaco-button:focus {
+	outline: none;
+}
+
+.chat-pet-achievement-card.monaco-button:focus-visible {
+	outline: var(--vscode-strokeThickness) solid var(--vscode-focusBorder);
+	outline-offset: calc(-1 * var(--vscode-strokeThickness));
+}
+
+.chat-pet-achievement-card.monaco-button.wearing {
+	border-color: var(--vscode-focusBorder);
+}
+
+.chat-pet-achievement-card.monaco-button.locked {
+	filter: grayscale(1);
+	opacity: 0.5;
+}
+
+.chat-pet-achievement-previews {
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: center;
+	gap: var(--vscode-spacing-size80);
+	margin-bottom: var(--vscode-spacing-size120);
+}
+
+.chat-pet-achievement-preview {
+	display: block;
+	width: 96px;
+	height: 96px;
+	border: var(--vscode-strokeThickness) solid var(--vscode-editorWidget-border);
+	border-radius: var(--vscode-cornerRadius-medium);
+	background: var(--vscode-editor-background);
+	image-rendering: pixelated;
+}
+
+.chat-pet-achievement-card-content {
+	min-width: 0;
+}
+
+.chat-pet-achievement-card h3 {
+	margin-bottom: var(--vscode-spacing-size40);
+	overflow-wrap: anywhere;
+	font-size: var(--vscode-fontSize-heading3);
+	font-weight: var(--vscode-fontWeight-semiBold);
+}
+
+.chat-pet-achievement-state {
+	display: inline-block;
+	margin-bottom: var(--vscode-spacing-size100);
+	color: var(--vscode-descriptionForeground);
+	font-size: var(--vscode-fontSize-label1);
+	font-weight: var(--vscode-fontWeight-semiBold);
+}
+
+.chat-pet-achievement-description,
+.chat-pet-achievement-reward {
+	margin-bottom: var(--vscode-spacing-size80);
+	overflow-wrap: anywhere;
+}
+
+.chat-pet-achievement-description,
+.chat-pet-achievement-reward {
+	color: var(--vscode-descriptionForeground);
+}
+
+.hc-black .chat-pet-achievement-card,
+.hc-light .chat-pet-achievement-card,
+.hc-black .chat-pet-achievement-preview,
+.hc-light .chat-pet-achievement-preview,
+.hc-black .chat-pet-achievement-roadmap-preview,
+.hc-light .chat-pet-achievement-roadmap-preview {
+	border-color: var(--vscode-contrastBorder);
+}

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

@@ -33,7 +33,7 @@ PlanAgentDefaultModel = ( __decorate([( __param(0, ILanguageModelsService)), ( _
 registerWorkbenchContribution2(
     PlanAgentDefaultModel.ID,
     PlanAgentDefaultModel,
-    WorkbenchPhase.BlockRestore
+    WorkbenchPhase.AfterRestored
 );
 
 export { PlanAgentDefaultModel };

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

@@ -0,0 +1,9 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
+import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
+export declare class PlanReviewFeedbackEditorOverlay extends Disposable implements IWorkbenchContribution {
+    static readonly ID = "chat.planReviewFeedback.editorOverlay";
+    constructor(editorGroupsService: IEditorGroupsService, instantiationService: IInstantiationService, environmentService: IWorkbenchEnvironmentService);
+}

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

@@ -0,0 +1,260 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable, toDisposable, DisposableMap, combinedDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { MenuId, Action2, registerAction2, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
+import { EditorGroupView } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorGroupView';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import { AgentEditorCommentsOverlayWidget } from '../../../../services/agentEditorComments/browser/agentEditorCommentsOverlayWidget.js';
+import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
+import { resolveCommandsContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { IPlanReviewFeedbackService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/planReviewFeedback/planReviewFeedbackService.service';
+import { createElement } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
+import { observableSignalFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableSignalFromEvent';
+
+const PlanReviewFeedbackEditorMenu = MenuId.for("planReviewFeedback.editorContent");
+const hasPlanReviewFeedback = ( new RawContextKey("planReviewFeedback.hasFeedback", false));
+const submitPlanReviewFeedbackActionId = "planReviewFeedback.action.submit";
+const navigatePreviousPlanReviewFeedbackActionId = "planReviewFeedback.action.navigatePrevious";
+const navigateNextPlanReviewFeedbackActionId = "planReviewFeedback.action.navigateNext";
+const clearAllPlanReviewFeedbackActionId = "planReviewFeedback.action.clearAll";
+const navigationBearingFakeActionId = "planReviewFeedback.navigation.bearings";
+function getPlanReviewResource(input, feedbackService) {
+    const resources = EditorResourceAccessor.getOriginalUri(input, {
+        supportSideBySide: SideBySideEditor.BOTH
+    });
+    if (!resources) {
+        return undefined;
+    }
+    if (URI.isUri(resources)) {
+        return feedbackService.isActivePlanReview(resources) ? resources : undefined;
+    }
+    return [resources.secondary, resources.primary].find(resource => resource && feedbackService.isActivePlanReview(resource));
+}
+function getPlanReviewFromContext(accessor, args) {
+    const editorService = accessor.get(IEditorService);
+    const editorGroupsService = accessor.get(IEditorGroupsService);
+    const resolvedContext = resolveCommandsContext(args, editorService, editorGroupsService, accessor.get(IListService));
+    const groupedEditor = resolvedContext.groupedEditors[0];
+    const group = groupedEditor?.group;
+    const input = groupedEditor?.editors[0] ?? group?.activeEditor;
+    const resource = getPlanReviewResource(input, accessor.get(IPlanReviewFeedbackService));
+    return group && resource ? {
+        resource,
+        group
+    } : undefined;
+}
+class SubmitPlanReviewFeedbackAction extends Action2 {
+    constructor() {
+        super({
+            id: submitPlanReviewFeedbackActionId,
+            title: ( localize2(8669, "Submit Feedback")),
+            shortTitle: ( localize2(8670, "Submit")),
+            icon: Codicon.send,
+            category: CHAT_CATEGORY,
+            precondition: ChatContextKeys.enabled,
+            menu: {
+                id: PlanReviewFeedbackEditorMenu,
+                group: "a_submit",
+                order: 0,
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, hasPlanReviewFeedback))
+            }
+        });
+    }
+    async run(accessor, ...args) {
+        const review = getPlanReviewFromContext(accessor, args);
+        if (!review) {
+            return false;
+        }
+        return accessor.get(IPlanReviewFeedbackService).submitAllFeedback(review.resource);
+    }
+}
+class NavigatePlanReviewFeedbackAction extends Action2 {
+    constructor(_next) {
+        super({
+            id: _next ? navigateNextPlanReviewFeedbackActionId : navigatePreviousPlanReviewFeedbackActionId,
+            title: _next ? ( localize2(8671, "Go to Next Feedback Comment")) : ( localize2(8672, "Go to Previous Feedback Comment")),
+            icon: _next ? Codicon.arrowDown : Codicon.arrowUp,
+            category: CHAT_CATEGORY,
+            f1: true,
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, hasPlanReviewFeedback)),
+            menu: {
+                id: PlanReviewFeedbackEditorMenu,
+                group: "navigate",
+                order: _next ? 2 : 1,
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, hasPlanReviewFeedback))
+            }
+        });
+        this._next = _next;
+    }
+    async run(accessor, ...args) {
+        const review = getPlanReviewFromContext(accessor, args);
+        if (!review) {
+            return;
+        }
+        const item = accessor.get(IPlanReviewFeedbackService).getNextFeedback(review.resource, this._next);
+        if (item) {
+            await accessor.get(IEditorService).openEditor({
+                resource: item.resource,
+                options: {
+                    revealIfOpened: true,
+                    selection: {
+                        startLineNumber: item.line,
+                        startColumn: item.column
+                    }
+                }
+            }, review.group);
+        }
+    }
+}
+class ClearAllPlanReviewFeedbackAction extends Action2 {
+    constructor() {
+        super({
+            id: clearAllPlanReviewFeedbackActionId,
+            title: ( localize2(8673, "Clear")),
+            tooltip: ( localize2(8674, "Clear All Feedback")),
+            icon: Codicon.clearAll,
+            category: CHAT_CATEGORY,
+            f1: true,
+            precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, hasPlanReviewFeedback)),
+            menu: {
+                id: PlanReviewFeedbackEditorMenu,
+                group: "a_submit",
+                order: 1,
+                when: ( ContextKeyExpr.and(ChatContextKeys.enabled, hasPlanReviewFeedback))
+            }
+        });
+    }
+    run(accessor, ...args) {
+        const review = getPlanReviewFromContext(accessor, args);
+        if (review) {
+            accessor.get(IPlanReviewFeedbackService).clearFeedback(review.resource);
+        }
+    }
+}
+let PlanReviewFeedbackOverlayController = class PlanReviewFeedbackOverlayController extends Disposable {
+    constructor(container, group, feedbackService, instantiationService, contextKeyService) {
+        super();
+        const domNode = createElement("div");
+        domNode.classList.add("plan-review-feedback-editor-overlay");
+        domNode.style.position = "absolute";
+        domNode.style.bottom = "24px";
+        domNode.style.right = "24px";
+        domNode.style.zIndex = "100";
+        this._register(toDisposable(() => domNode.remove()));
+        const widget = this._register(instantiationService.createInstance(AgentEditorCommentsOverlayWidget, {
+            menuId: PlanReviewFeedbackEditorMenu,
+            submitActionId: submitPlanReviewFeedbackActionId,
+            previousActionId: navigatePreviousPlanReviewFeedbackActionId,
+            nextActionId: navigateNextPlanReviewFeedbackActionId,
+            navigationBearingActionId: navigationBearingFakeActionId,
+            telemetrySource: "planReviewFeedback.overlayToolbar"
+        }));
+        domNode.appendChild(widget.getDomNode());
+        const hasFeedbackContext = hasPlanReviewFeedback.bindTo(contextKeyService);
+        const activeSignal = observableSignalFromEvent(this, Event.any(
+            group.onDidActiveEditorChange,
+            group.onDidModelChange,
+            feedbackService.onDidChangeFeedback,
+            feedbackService.onDidChangeNavigation,
+            feedbackService.onDidChangeRegistrations
+        ));
+        this._register(autorun(reader => {
+            activeSignal.read(reader);
+            const resource = getPlanReviewResource(group.activeEditorPane?.input, feedbackService);
+            const count = resource ? feedbackService.getFeedback(resource).length : 0;
+            hasFeedbackContext.set(count > 0);
+            if (!resource || count === 0) {
+                widget.hide();
+                domNode.remove();
+                return;
+            }
+            widget.show(feedbackService.getNavigationBearing(resource), count, group);
+            if (!container.contains(domNode)) {
+                container.appendChild(domNode);
+            }
+        }));
+    }
+};
+PlanReviewFeedbackOverlayController = ( __decorate([( __param(2, IPlanReviewFeedbackService)), ( __param(3, IInstantiationService)), ( __param(4, IContextKeyService))], PlanReviewFeedbackOverlayController));
+let PlanReviewFeedbackEditorOverlay = class PlanReviewFeedbackEditorOverlay extends Disposable {
+    static {
+        this.ID = "chat.planReviewFeedback.editorOverlay";
+    }
+    constructor(editorGroupsService, instantiationService, environmentService) {
+        super();
+        if (environmentService.isSessionsWindow) {
+            return;
+        }
+        const editorGroups = observableFromEvent(
+            this,
+            Event.any(editorGroupsService.onDidAddGroup, editorGroupsService.onDidRemoveGroup),
+            () => editorGroupsService.groups
+        );
+        const overlays = this._register(( new DisposableMap()));
+        this._register(autorun(reader => {
+            const groups = editorGroups.read(reader);
+            const toDelete = ( new Set(( overlays.keys())));
+            for (const group of groups) {
+                if (!(group instanceof EditorGroupView)) {
+                    continue;
+                }
+                toDelete.delete(group);
+                if (!( overlays.has(group))) {
+                    const scopedInstantiationService = instantiationService.createChild(( new ServiceCollection([IContextKeyService, group.scopedContextKeyService])));
+                    const controller = scopedInstantiationService.createInstance(PlanReviewFeedbackOverlayController, group.element, group);
+                    overlays.set(group, combinedDisposable(controller, scopedInstantiationService));
+                }
+            }
+            for (const group of toDelete) {
+                overlays.deleteAndDispose(group);
+            }
+        }));
+    }
+};
+PlanReviewFeedbackEditorOverlay = ( __decorate([( __param(0, IEditorGroupsService)), ( __param(1, IInstantiationService)), ( __param(2, IWorkbenchEnvironmentService))], PlanReviewFeedbackEditorOverlay));
+registerAction2(SubmitPlanReviewFeedbackAction);
+registerAction2(class extends NavigatePlanReviewFeedbackAction {
+    constructor() {
+        super(false);
+    }
+});
+registerAction2(class extends NavigatePlanReviewFeedbackAction {
+    constructor() {
+        super(true);
+    }
+});
+registerAction2(ClearAllPlanReviewFeedbackAction);
+MenuRegistry.appendMenuItem(PlanReviewFeedbackEditorMenu, {
+    command: {
+        id: navigationBearingFakeActionId,
+        title: ( localize(8675, "Navigation Status")),
+        precondition: ( ContextKeyExpr.false())
+    },
+    group: "navigate",
+    order: -1,
+    when: ( ContextKeyExpr.and(ChatContextKeys.enabled, hasPlanReviewFeedback))
+});
+registerWorkbenchContribution2(
+    PlanReviewFeedbackEditorOverlay.ID,
+    PlanReviewFeedbackEditorOverlay,
+    WorkbenchPhase.AfterRestored
+);
+
+export { PlanReviewFeedbackEditorOverlay };

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

@@ -1,16 +1,31 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IChatPlanReviewResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IChatPlanApprovalAction } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { IRange } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
+import { IAgentEditorComment, IAgentEditorCommentsProvider } from "@codingame/monaco-vscode-comments-service-override/vscode/vs/workbench/services/agentEditorComments/common/agentEditorComments";
+import { IAgentEditorCommentsBridge } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/agentEditorComments/common/agentEditorComments.service";
 import { IPlanReviewFeedbackService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/planReviewFeedback/planReviewFeedbackService.service";
 export interface IPlanReviewFeedbackItem {
     readonly id: string;
+    readonly resource: URI;
+    readonly range: IRange;
     readonly line: number;
     readonly column: number;
     readonly text: string;
 }
-export declare class PlanReviewFeedbackService extends Disposable implements IPlanReviewFeedbackService {
+export interface IPlanReviewFeedbackRegistration {
+    readonly sessionResource: URI;
+    readonly actions: readonly IChatPlanApprovalAction[];
+    readonly hasOverallFeedback: () => boolean;
+    readonly submitFeedback: () => Promise<boolean>;
+    readonly submitAction: (action: IChatPlanApprovalAction) => Promise<void>;
+    readonly reject: () => Promise<void>;
+}
+export declare class PlanReviewFeedbackService extends Disposable implements IPlanReviewFeedbackService, IAgentEditorCommentsProvider {
+    private readonly _commentsBridge;
     readonly _serviceBrand: undefined;
+    readonly priority = 0;
     private readonly _registrations;
     private readonly _onDidChangeFeedback;
     readonly onDidChangeFeedback: Event<URI>;
@@ -18,9 +33,21 @@ export declare class PlanReviewFeedbackService extends Disposable implements IPl
     readonly onDidChangeNavigation: Event<URI>;
     private readonly _onDidChangeRegistrations;
     readonly onDidChangeRegistrations: Event<void>;
-    registerPlanReview(planUri: URI, onSubmit: (result: IChatPlanReviewResult) => void): IDisposable;
+    private readonly _onDidChangePlanReviewScope;
+    readonly onDidChangePlanReviewScope: Event<{
+        readonly planUri: URI;
+        readonly sessionResource: URI;
+        readonly active: boolean;
+    }>;
+    readonly onDidChangeComments: Event<void>;
+    readonly onDidRevealComment: Event<any>;
+    constructor(_commentsBridge: IAgentEditorCommentsBridge);
+    registerPlanReview(planUri: URI, review: IPlanReviewFeedbackRegistration): IDisposable;
     isActivePlanReview(uri: URI): boolean;
+    getPlanReview(uri: URI): IPlanReviewFeedbackRegistration | undefined;
+    notifyFeedbackChanged(planUri: URI): void;
     addFeedback(planUri: URI, line: number, column: number, text: string): string;
+    private _addFeedback;
     removeFeedback(planUri: URI, feedbackId: string): void;
     updateFeedback(planUri: URI, feedbackId: string, newText: string): void;
     getFeedback(planUri: URI): readonly IPlanReviewFeedbackItem[];
@@ -31,6 +58,13 @@ export declare class PlanReviewFeedbackService extends Disposable implements IPl
         totalCount: number;
     };
     setNavigationAnchor(planUri: URI, itemId: string | undefined): void;
-    submitAllFeedback(planUri: URI): void;
-    private _formatFeedback;
+    submitAllFeedback(planUri: URI): Promise<boolean>;
+    submitPlanAction(planUri: URI, action: IChatPlanApprovalAction): Promise<void>;
+    rejectPlan(planUri: URI): Promise<void>;
+    acceptsComments(resource: URI): boolean;
+    getComments(resource: URI): readonly IAgentEditorComment[];
+    getCommentIds(resource: URI): readonly string[];
+    addComment(resource: URI, range: IRange, body: string): void;
+    deleteComment(resource: URI, id: string): void;
+    private _getRegistration;
 }