@codingame/monaco-vscode-katex-common 31.0.1 → 32.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatPlanReviewPart.js

@@ -10,24 +10,37 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import { Disposable, DisposableStore, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore, MutableDisposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ScrollbarVisibility } from '@codingame/monaco-vscode-api/vscode/vs/base/common/scrollable';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+import { CodeEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
+import { ShowLightbulbIconMode } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
+import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
 import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
+import { IPlanReviewFeedbackService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/planReviewFeedback/planReviewFeedbackService.service';
 import { ChatPlanReviewData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatPlanReviewData';
 import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
+import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import * as chatPlanReview from './media/chatPlanReview.css';
 
 registerCss(chatPlanReview);
+const PLAN_REVIEW_EDITING_PATH_PREFIX = "/chat-plan-review";
 let ChatPlanReviewPart = class ChatPlanReviewPart extends Disposable {
     constructor(
         review,
@@ -37,7 +50,14 @@ let ChatPlanReviewPart = class ChatPlanReviewPart extends Disposable {
         _contextMenuService,
         _dialogService,
         _editorService,
-        _hoverService
+        _hoverService,
+        _planReviewFeedbackService,
+        _instantiationService,
+        _textFileService,
+        _modelService,
+        _textModelService,
+        _languageService,
+        _configurationService
     ) {
         super();
         this.review = review;
@@ -47,20 +67,53 @@ let ChatPlanReviewPart = class ChatPlanReviewPart extends Disposable {
         this._dialogService = _dialogService;
         this._editorService = _editorService;
         this._hoverService = _hoverService;
+        this._planReviewFeedbackService = _planReviewFeedbackService;
+        this._instantiationService = _instantiationService;
+        this._textFileService = _textFileService;
+        this._modelService = _modelService;
+        this._textModelService = _textModelService;
+        this._languageService = _languageService;
+        this._configurationService = _configurationService;
         this._onDidChangeHeight = this._register(( new Emitter()));
         this.onDidChangeHeight = this._onDidChangeHeight.event;
         this._buttonStore = this._register(( new DisposableStore()));
+        this._renderedSubmitInlineCount = -1;
         this._messageContentDisposables = this._register(( new MutableDisposable()));
         this._isCollapsed = false;
         this._isExpanded = false;
         this._isSubmitted = false;
         this._isFeedbackMode = false;
+        this._planReviewRegistration = this._register(( new MutableDisposable()));
+        this._commentRowDisposables = this._register(( new DisposableStore()));
+        this._inlineEditorMountId = 0;
+        this._suppressFeedbackModeAutoOpen = false;
+        this._messageEditorDisposables = this._register(( new DisposableStore()));
         this._selectedAction = review.actions.find(a => a.default) ?? review.actions[0];
         if (review instanceof ChatPlanReviewData && typeof review.draftCollapsed === "boolean") {
             this._isCollapsed = review.draftCollapsed;
         }
         const isResponseComplete = isResponseVM(context.element) && context.element.isComplete;
         this._isSubmitted = !!review.isUsed || isResponseComplete;
+        if (review.planUri && review.canProvideFeedback && !this._isSubmitted) {
+            const planUri = URI.revive(review.planUri);
+            const planUriString = ( planUri.toString());
+            const registrationStore = ( new DisposableStore());
+            registrationStore.add(this._planReviewFeedbackService.registerPlanReview(planUri, result => {
+                if (this._isSubmitted) {
+                    return;
+                }
+                this._isSubmitted = true;
+                this._options.onSubmit(result);
+                void this.markUsed();
+            }));
+            registrationStore.add(this._planReviewFeedbackService.onDidChangeFeedback(uri => {
+                const uriString = ( uri.toString());
+                if (uriString === planUriString || uriString === this._editingUri?.toString()) {
+                    this.onInlineFeedbackChanged();
+                }
+            }));
+            this._planReviewRegistration.value = registrationStore;
+        }
         const elements = h(
             ".chat-confirmation-widget-container.chat-plan-review-container@container",
             [h(
@@ -78,7 +131,7 @@ let ChatPlanReviewPart = class ChatPlanReviewPart extends Disposable {
         this.domNode = elements.container;
         this.domNode.id = generateUuid();
         this.domNode.setAttribute("role", "region");
-        this.domNode.setAttribute("aria-label", ( localize(6855, "Plan review: {0}", review.title)));
+        this.domNode.setAttribute("aria-label", ( localize(7102, "Plan review: {0}", review.title)));
         this._titleActionsEl = elements.titleActions;
         this._inlineActionsEl = elements.inlineActions;
         this._footerButtonsEl = elements.footerButtons;
@@ -89,15 +142,23 @@ let ChatPlanReviewPart = class ChatPlanReviewPart extends Disposable {
         }));
         if (review.planUri) {
             const fileName = basename(URI.revive(review.planUri));
-            const editButton = this._register(( new Button(this._titleActionsEl, {
+            const reviewButtonTooltip = review.canProvideFeedback ? ( localize(7103, "Review {0}", fileName)) : ( localize(7104, "Open {0}", fileName));
+            const reviewButton = this._register(( new Button(this._titleActionsEl, {
                 ...defaultButtonStyles,
                 secondary: true,
                 supportIcons: true,
-                title: ( localize(6856, "Edit {0}", fileName))
+                title: reviewButtonTooltip,
+                ariaLabel: reviewButtonTooltip
             })));
-            editButton.element.classList.add("chat-plan-review-title-button", "chat-plan-review-edit");
-            editButton.label = `$(${Codicon.edit.id}) ${( localize(6857, "Edit {0}", fileName))}`;
-            this._register(editButton.onDidClick(() => this.openPlanFile()));
+            reviewButton.element.classList.add("chat-plan-review-title-button", "chat-plan-review-review-button");
+            this._reviewButton = reviewButton;
+            this._register(reviewButton.onDidClick(() => {
+                if (this._isFeedbackMode) {
+                    void this.exitFeedbackMode();
+                } else {
+                    void this.enterReviewMode();
+                }
+            }));
         }
         this._restoreButton = this._register(( new Button(this._titleActionsEl, {
             ...defaultButtonStyles,
@@ -125,16 +186,20 @@ let ChatPlanReviewPart = class ChatPlanReviewPart extends Disposable {
             "chat-plan-review-body-scrollable"
         );
         messageParent.insertBefore(this._messageScrollable.getDomNode(), messageNextSibling);
-        const resizeObserver = this._register(
-            new DisposableResizeObserver(() => this._messageScrollable.scanDomNode())
-        );
-        this._register(resizeObserver.observe(this._messageEl));
+        const resizeObserver = this._register(new DisposableResizeObserver(
+            "ChatPlanReviewPart.messageScrollable",
+            () => this._messageScrollable.scanDomNode()
+        ));
         this._register(resizeObserver.observe(this._messageScrollable.getDomNode()));
         this.renderMarkdown();
         if (review.canProvideFeedback) {
             this.renderFeedback(elements.feedback);
             this._feedbackSection = elements.feedback;
-            hide(elements.feedback);
+            if (review.planUri) {
+                hide(elements.feedback);
+            } else {
+                this.domNode.classList.add("chat-plan-review-textarea-mode");
+            }
         } else {
             hide(elements.feedback);
         }
@@ -148,6 +213,13 @@ let ChatPlanReviewPart = class ChatPlanReviewPart extends Disposable {
         }
         if (this._feedbackTextarea && review instanceof ChatPlanReviewData && review.draftFeedback) {
             this._feedbackTextarea.value = review.draftFeedback;
+            this._feedbackTextarea.style.height = "auto";
+            this._feedbackTextarea.style.height = `${this._feedbackTextarea.scrollHeight}px`;
+        }
+        if (!this._isSubmitted && this.getInlineFeedbackItems().length > 0) {
+            void this.enterFeedbackMode({
+                focus: false
+            });
         }
     }
     hasSameContent(other, _followingContent, _element) {
@@ -165,6 +237,7 @@ let ChatPlanReviewPart = class ChatPlanReviewPart extends Disposable {
     renderMarkdown() {
         clearNode(this._messageEl);
         const store = ( new DisposableStore());
+        this._messageContentDisposables.value = store;
         const rendered = store.add(this._markdownRendererService.render(( new MarkdownString(this.review.content, {
             supportThemeIcons: true,
             isTrusted: false
@@ -172,16 +245,58 @@ let ChatPlanReviewPart = class ChatPlanReviewPart extends Disposable {
             asyncRenderCallback: () => this._messageScrollable.scanDomNode()
         }));
         this._messageEl.append(rendered.element);
-        this._messageContentDisposables.value = store;
         this._messageScrollable.scanDomNode();
     }
     renderFeedback(section) {
         clearNode(section);
-        const label = append(section, $(".chat-plan-review-feedback-label"));
-        label.textContent = ( localize(6858, "Additional feedback"));
+        const header = append(section, $(".chat-plan-review-feedback-header"));
+        const label = append(header, $(".chat-plan-review-feedback-label"));
+        label.textContent = ( localize(7105, "Feedback"));
+        const headerActions = append(header, $(".chat-plan-review-feedback-header-actions"));
+        if (this.review.planUri) {
+            const clearAllLabel = ( localize(7106, "Clear All"));
+            const clearAllButton = this._register(( new Button(headerActions, {
+                ...defaultButtonStyles,
+                secondary: true,
+                supportIcons: true,
+                title: clearAllLabel,
+                ariaLabel: clearAllLabel
+            })));
+            clearAllButton.element.classList.add("chat-plan-review-title-button", "chat-plan-review-feedback-clear-all");
+            clearAllButton.label = clearAllLabel;
+            this._register(clearAllButton.onDidClick(() => this.clearAllInlineFeedback()));
+            this._clearAllButtonEl = clearAllButton.element;
+        }
+        if (this.review.planUri) {
+            const closeButtonLabel = ( localize(7107, "Close"));
+            const closeButton = this._register(( new Button(headerActions, {
+                ...defaultButtonStyles,
+                secondary: true,
+                supportIcons: true,
+                title: closeButtonLabel,
+                ariaLabel: closeButtonLabel
+            })));
+            closeButton.element.classList.add(
+                "chat-plan-review-title-button",
+                "chat-plan-review-title-icon-button",
+                "chat-plan-review-feedback-close"
+            );
+            closeButton.label = `$(${Codicon.close.id})`;
+            this._register(closeButton.onDidClick(() => this.exitFeedbackMode()));
+        }
+        this._commentsListEl = $(".chat-plan-review-comments-list");
+        this._commentsListScrollable = this._register(( new DomScrollableElement(this._commentsListEl, {
+            vertical: ScrollbarVisibility.Auto,
+            horizontal: ScrollbarVisibility.Hidden,
+            consumeMouseWheelIfScrollbarIsNeeded: true
+        })));
+        this._commentsListScrollable.getDomNode().classList.add("chat-plan-review-comments-list-scrollable");
+        append(section, this._commentsListScrollable.getDomNode());
+        hide(this._commentsListScrollable.getDomNode());
+        this.renderCommentsList();
         const textarea = append(section, $("textarea.chat-plan-review-feedback-textarea"));
         textarea.rows = 1;
-        textarea.placeholder = ( localize(6859, "Suggest changes or add instructions..."));
+        textarea.placeholder = ( localize(7108, "Add an overall comment for the agent..."));
         this._feedbackTextarea = textarea;
         const autoResize = () => {
             textarea.style.height = "auto";
@@ -190,37 +305,209 @@ let ChatPlanReviewPart = class ChatPlanReviewPart extends Disposable {
         };
         this._register(addDisposableListener(textarea, EventType.INPUT, () => {
             autoResize();
+            this._messageScrollable.scanDomNode();
             if (this.review instanceof ChatPlanReviewData) {
                 this.review.draftFeedback = textarea.value;
             }
+            this.updateSubmitButtonState();
         }));
-        this._register(addDisposableListener(textarea, EventType.KEY_DOWN, e => {
-            const ev = ( new StandardKeyboardEvent(e));
-            if (ev.keyCode === KeyCode.Enter && !ev.shiftKey) {
-                e.preventDefault();
-                e.stopPropagation();
-                this.submitFeedback();
+        if (this.review.planUri) {
+            this._register(addDisposableListener(textarea, EventType.KEY_DOWN, e => {
+                const ev = ( new StandardKeyboardEvent(e));
+                if (ev.keyCode === KeyCode.Enter && !ev.shiftKey) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    void this.submitFeedback();
+                }
+            }));
+        }
+    }
+    renderCommentsList() {
+        if (!this._commentsListEl) {
+            return;
+        }
+        this._commentRowDisposables.clear();
+        clearNode(this._commentsListEl);
+        const items = this.getInlineFeedbackItems();
+        if (this._clearAllButtonEl) {
+            if (items.length > 0) {
+                show(this._clearAllButtonEl);
+            } else {
+                hide(this._clearAllButtonEl);
             }
-        }));
+        }
+        const scrollableNode = this._commentsListScrollable?.getDomNode();
+        if (items.length === 0) {
+            if (scrollableNode) {
+                hide(scrollableNode);
+            }
+            this._commentsListScrollable?.scanDomNode();
+            return;
+        }
+        if (scrollableNode) {
+            show(scrollableNode);
+        }
+        for (const item of items) {
+            const row = append(this._commentsListEl, $(".chat-plan-review-comment-row"));
+            const rowLabel = ( localize(7109, "Line {0}: {1}", item.line, item.text));
+            const revealButton = append(row, $("button.chat-plan-review-comment-reveal"));
+            revealButton.type = "button";
+            revealButton.setAttribute("aria-label", rowLabel);
+            const lineEl = append(revealButton, $("span.chat-plan-review-comment-line"));
+            lineEl.textContent = ( localize(7110, "Line {0}", item.line));
+            const textEl = append(revealButton, $("span.chat-plan-review-comment-text"));
+            textEl.textContent = item.text;
+            this._commentRowDisposables.add(addDisposableListener(revealButton, EventType.CLICK, () => {
+                this.revealInlineComment(item.id, item.line, item.column);
+            }));
+            const removeLabel = ( localize(7111, "Remove comment on line {0}", item.line));
+            const removeButton = append(row, $("button.chat-plan-review-comment-remove"));
+            removeButton.type = "button";
+            removeButton.setAttribute("aria-label", removeLabel);
+            removeButton.title = removeLabel;
+            removeButton.classList.add(...ThemeIcon.asClassNameArray(Codicon.close));
+            this._commentRowDisposables.add(addDisposableListener(removeButton, EventType.CLICK, e => {
+                e.stopPropagation();
+                this.removeInlineComment(item.id);
+            }));
+        }
+        this._commentsListScrollable?.scanDomNode();
+    }
+    getCommentUri() {
+        if (this._editingUri) {
+            return this._editingUri;
+        }
+        return this.review.planUri ? URI.revive(this.review.planUri) : undefined;
+    }
+    getInlineFeedbackItems() {
+        const editingItems = this._editingUri ? this._planReviewFeedbackService.getFeedback(this._editingUri) : [];
+        const planItems = this.review.planUri ? this._planReviewFeedbackService.getFeedback(URI.revive(this.review.planUri)) : [];
+        return [...editingItems, ...planItems].sort(
+            (first, second) => first.line - second.line || first.column - second.column
+        );
+    }
+    async revealInlineComment(itemId, line, column) {
+        const uri = this.getCommentUri();
+        if (!uri) {
+            return;
+        }
+        this._planReviewFeedbackService.setNavigationAnchor(uri, itemId);
+        if (this._messageEditor) {
+            this._messageEditor.revealLineInCenterIfOutsideViewport(line);
+            this._messageEditor.setPosition({
+                lineNumber: line,
+                column
+            });
+            this._messageEditor.focus();
+            return;
+        }
+        if (this.review.planUri) {
+            await this._editorService.openEditor({
+                resource: URI.revive(this.review.planUri),
+                options: {
+                    selection: {
+                        startLineNumber: line,
+                        startColumn: column
+                    }
+                }
+            });
+        }
+    }
+    removeInlineComment(itemId) {
+        if (this._isSubmitted) {
+            return;
+        }
+        for (const uri of this.getFeedbackUris()) {
+            this._planReviewFeedbackService.removeFeedback(uri, itemId);
+        }
+    }
+    async clearAllInlineFeedback() {
+        if (this._isSubmitted) {
+            return;
+        }
+        const items = this.getInlineFeedbackItems();
+        if (items.length === 0) {
+            return;
+        }
+        const result = await this._dialogService.confirm({
+            type: Severity.Warning,
+            message: ( localize(7112, "Clear {0} inline comment(s)?", items.length)),
+            detail: ( localize(
+                7113,
+                "These comments will be removed from the plan file and not sent to the agent."
+            )),
+            primaryButton: ( localize(7114, "Clear All"))
+        });
+        if (!result.confirmed) {
+            return;
+        }
+        for (const uri of this.getFeedbackUris()) {
+            this._planReviewFeedbackService.clearFeedback(uri);
+        }
+    }
+    getFeedbackUris() {
+        const uris = [];
+        if (this._editingUri) {
+            uris.push(this._editingUri);
+        }
+        if (this.review.planUri) {
+            uris.push(URI.revive(this.review.planUri));
+        }
+        return uris;
+    }
+    onInlineFeedbackChanged() {
+        if (this._isSubmitted) {
+            return;
+        }
+        const items = this.getInlineFeedbackItems();
+        if (items.length > 0 && !this._suppressFeedbackModeAutoOpen && !this._isFeedbackMode && !this._isCollapsed) {
+            void this.enterFeedbackMode({
+                focus: false
+            });
+            return;
+        }
+        this.renderCommentsList();
+        if (this._isFeedbackMode) {
+            this.updateSubmitButtonState();
+        }
+        this._messageScrollable.scanDomNode();
+        this._onDidChangeHeight.fire();
+    }
+    renderCurrentActionButtons() {
+        if (this._isSubmitted) {
+            return;
+        }
+        const target = this._isCollapsed ? this._inlineActionsEl : this._footerButtonsEl;
+        const other = this._isCollapsed ? this._footerButtonsEl : this._inlineActionsEl;
+        clearNode(other);
+        this.renderActionButtons(target, {
+            includeReject: !this._isCollapsed
+        });
     }
     renderActionButtons(container, options) {
         const includeReject = options?.includeReject ?? true;
         this._buttonStore.clear();
+        this._submitButton = undefined;
+        this._renderedSubmitInlineCount = -1;
         clearNode(container);
         if (this._isFeedbackMode) {
+            const inlineCount = this.getInlineFeedbackItems().length;
             const submitButton = ( new Button(container, {
                 ...defaultButtonStyles,
                 supportIcons: true
             }));
-            submitButton.label = ( localize(6860, "Submit"));
+            submitButton.label = this.computeSubmitLabel(inlineCount);
+            submitButton.enabled = this.canSubmitFeedback();
+            this._submitButton = submitButton;
+            this._renderedSubmitInlineCount = inlineCount;
             this._buttonStore.add(submitButton);
-            this._buttonStore.add(submitButton.onDidClick(() => this.submitFeedback()));
+            this._buttonStore.add(submitButton.onDidClick(() => void this.submitFeedback()));
             if (includeReject) {
                 const rejectButton = ( new Button(container, {
                     ...defaultButtonStyles,
                     secondary: true
                 }));
-                rejectButton.label = ( localize(6861, "Reject"));
+                rejectButton.label = ( localize(7115, "Reject"));
                 this._buttonStore.add(rejectButton);
                 this._buttonStore.add(rejectButton.onDidClick(() => this.submitRejection()));
             }
@@ -256,25 +543,37 @@ let ChatPlanReviewPart = class ChatPlanReviewPart extends Disposable {
             approveButton.element.title = primary.description;
         }
         this._buttonStore.add(approveButton.onDidClick(() => this.submitApproval(primary)));
-        if (this.review.canProvideFeedback && includeReject) {
-            const feedbackButton = ( new Button(container, {
-                ...defaultButtonStyles,
-                secondary: true
-            }));
-            feedbackButton.label = ( localize(6862, "Provide Feedback"));
-            this._buttonStore.add(feedbackButton);
-            this._buttonStore.add(feedbackButton.onDidClick(() => this.enterFeedbackMode()));
-        }
         if (includeReject) {
             const rejectButton = ( new Button(container, {
                 ...defaultButtonStyles,
                 secondary: true
             }));
-            rejectButton.label = ( localize(6861, "Reject"));
+            rejectButton.label = ( localize(7115, "Reject"));
             this._buttonStore.add(rejectButton);
             this._buttonStore.add(rejectButton.onDidClick(() => this.submitRejection()));
         }
     }
+    canSubmitFeedback() {
+        const textareaText = this._feedbackTextarea?.value.trim() ?? "";
+        if (textareaText) {
+            return true;
+        }
+        return this.getInlineFeedbackItems().length > 0;
+    }
+    computeSubmitLabel(inlineCount) {
+        return inlineCount > 0 ? ( localize(7116, "Submit Feedback ({0})", inlineCount)) : ( localize(7117, "Submit Feedback"));
+    }
+    updateSubmitButtonState() {
+        if (!this._submitButton || !this._isFeedbackMode) {
+            return;
+        }
+        this._submitButton.enabled = this.canSubmitFeedback();
+        const inlineCount = this.getInlineFeedbackItems().length;
+        if (inlineCount !== this._renderedSubmitInlineCount) {
+            this._submitButton.label = this.computeSubmitLabel(inlineCount);
+            this._renderedSubmitInlineCount = inlineCount;
+        }
+    }
     toggleCollapsed() {
         this._isCollapsed = !this._isCollapsed;
         if (this._isCollapsed) {
@@ -299,41 +598,67 @@ let ChatPlanReviewPart = class ChatPlanReviewPart extends Disposable {
     updateCollapsedPresentation() {
         this.domNode.classList.toggle("chat-plan-review-collapsed", this._isCollapsed);
         this._restoreButton.element.classList.toggle("chat-plan-review-hidden", this._isCollapsed);
-        this._collapseButton.label = this._isCollapsed ? `$(${Codicon.chevronDown.id})` : `$(${Codicon.chevronUp.id})`;
-        const collapseTooltip = this._isCollapsed ? ( localize(6863, "Expand")) : ( localize(6864, "Collapse"));
+        this._collapseButton.label = this._isCollapsed ? `$(${Codicon.chevronUp.id})` : `$(${Codicon.chevronDown.id})`;
+        const collapseTooltip = this._isCollapsed ? ( localize(7118, "Expand")) : ( localize(7119, "Collapse"));
         this._collapseButton.element.setAttribute("aria-label", collapseTooltip);
         this._collapseButton.element.setAttribute("aria-expanded", String(!this._isCollapsed));
         this._collapseButton.setTitle(collapseTooltip);
-        if (!this._isSubmitted) {
-            if (this._isCollapsed && this._isFeedbackMode) {
-                this._isFeedbackMode = false;
-                if (this._feedbackSection) {
-                    hide(this._feedbackSection);
+        if (this._reviewButton) {
+            const isIconOnly = this._isCollapsed;
+            this._reviewButton.element.classList.toggle("chat-plan-review-title-icon-button", isIconOnly);
+            let label;
+            let tooltip;
+            if (isIconOnly) {
+                label = `$(${Codicon.edit.id})`;
+                const fileName = this.review.planUri ? basename(URI.revive(this.review.planUri)) : "";
+                tooltip = this.review.canProvideFeedback ? ( localize(7103, "Review {0}", fileName)) : ( localize(7104, "Open {0}", fileName));
+            } else if (this._isFeedbackMode) {
+                label = ( localize(7120, "Cancel"));
+                tooltip = ( localize(7121, "Exit feedback mode"));
+            } else {
+                const fileName = this.review.planUri ? basename(URI.revive(this.review.planUri)) : "";
+                if (this.review.canProvideFeedback) {
+                    label = ( localize(7122, "Edit or Provide Feedback"));
+                    tooltip = ( localize(7103, "Review {0}", fileName));
+                } else {
+                    label = ( localize(7123, "Open Plan"));
+                    tooltip = ( localize(7104, "Open {0}", fileName));
                 }
             }
-            const target = this._isCollapsed ? this._inlineActionsEl : this._footerButtonsEl;
-            const other = this._isCollapsed ? this._footerButtonsEl : this._inlineActionsEl;
-            clearNode(other);
-            this.renderActionButtons(target, {
-                includeReject: !this._isCollapsed
-            });
+            this._reviewButton.label = label;
+            this._reviewButton.element.setAttribute("aria-label", tooltip);
+            this._reviewButton.setTitle(tooltip);
         }
+        this.renderCurrentActionButtons();
     }
     updateExpandedPresentation() {
         this.domNode.classList.toggle("chat-plan-review-expanded", this._isExpanded && !this._isCollapsed);
         this._restoreButton.label = this._isExpanded ? `$(${Codicon.screenNormal.id})` : `$(${Codicon.screenFull.id})`;
-        const tooltip = this._isExpanded ? ( localize(6865, "Restore Size")) : ( localize(6866, "Expand"));
+        const tooltip = this._isExpanded ? ( localize(7124, "Restore Size")) : ( localize(7125, "Expand"));
         this._restoreButton.element.setAttribute("aria-label", tooltip);
         this._restoreButton.setTitle(tooltip);
         this._messageScrollable.scanDomNode();
+        this._onDidChangeHeight.fire();
     }
-    async openPlanFile() {
-        if (!this.review.planUri) {
+    async enterReviewMode() {
+        if (!this.review.canProvideFeedback || this._isSubmitted) {
+            if (this.review.planUri) {
+                await this._editorService.openEditor({
+                    resource: URI.revive(this.review.planUri)
+                });
+            }
             return;
         }
-        const uri = URI.revive(this.review.planUri);
-        await this._editorService.openEditor({
-            resource: uri
+        if (this._isCollapsed) {
+            this._isCollapsed = false;
+            if (this.review instanceof ChatPlanReviewData) {
+                this.review.draftCollapsed = false;
+            }
+            this.updateCollapsedPresentation();
+            this.updateExpandedPresentation();
+        }
+        await this.enterFeedbackMode({
+            focus: true
         });
     }
     async submitApproval(action) {
@@ -347,64 +672,308 @@ let ChatPlanReviewPart = class ChatPlanReviewPart extends Disposable {
             }
         }
         this._isSubmitted = true;
+        const ridesAlong = !this.review.planUri;
+        const textareaFeedback = ridesAlong ? this._feedbackTextarea?.value.trim() : undefined;
         this._options.onSubmit({
             action: action.label,
-            rejected: false
+            ...(action.id ? {
+                actionId: action.id
+            } : {}),
+            rejected: false,
+            ...(textareaFeedback ? {
+                feedback: textareaFeedback,
+                feedbackOverall: textareaFeedback
+            } : {})
         });
-        this.markUsed();
+        void this.markUsed();
     }
     submitRejection() {
         if (this._isSubmitted) {
             return;
         }
         this._isSubmitted = true;
+        const ridesAlong = !this.review.planUri;
+        const textareaFeedback = ridesAlong ? this._feedbackTextarea?.value.trim() : undefined;
         this._options.onSubmit({
-            rejected: true
+            rejected: true,
+            ...(textareaFeedback ? {
+                feedback: textareaFeedback,
+                feedbackOverall: textareaFeedback
+            } : {})
         });
-        this.markUsed();
+        void this.markUsed();
     }
-    enterFeedbackMode() {
+    async enterFeedbackMode(options) {
+        if (this._isFeedbackMode) {
+            if (options?.focus) {
+                this.focusFeedbackInput();
+            }
+            return;
+        }
         this._isFeedbackMode = true;
         if (this._feedbackSection) {
             show(this._feedbackSection);
         }
-        this.renderActionButtons(this._footerButtonsEl, {
-            includeReject: true
+        this.domNode.classList.add("chat-plan-review-feedback-mode");
+        this.renderCommentsList();
+        this.updateCollapsedPresentation();
+        const mountId = ++this._inlineEditorMountId;
+        if (this.isInlineEditorEnabled()) {
+            await this.mountInlineEditor(mountId);
+        } else if (this.review.planUri) {
+            await this._editorService.openEditor({
+                resource: URI.revive(this.review.planUri)
+            });
+        }
+        if (options?.focus !== false) {
+            this.focusFeedbackInput();
+        }
+        this._messageScrollable.scanDomNode();
+        this._onDidChangeHeight.fire();
+    }
+    async exitFeedbackMode() {
+        if (!this._isFeedbackMode) {
+            return;
+        }
+        this._isFeedbackMode = false;
+        if (this._feedbackSection) {
+            hide(this._feedbackSection);
+        }
+        this.domNode.classList.remove("chat-plan-review-feedback-mode");
+        await this.unmountInlineEditor();
+        this.renderMarkdown();
+        this.updateCollapsedPresentation();
+        this._messageScrollable.scanDomNode();
+        this._onDidChangeHeight.fire();
+    }
+    focusFeedbackInput() {
+        if (this._messageEditor) {
+            this._messageEditor.focus();
+        } else {
+            this._feedbackTextarea?.focus();
+        }
+    }
+    async mountInlineEditor(mountId) {
+        if (!this.canContinueInlineEditorMount(mountId) || !this.review.planUri) {
+            return;
+        }
+        const planUri = URI.revive(this.review.planUri);
+        let initialContent;
+        try {
+            const stat = await this._textFileService.read(planUri);
+            initialContent = stat.value;
+        } catch {
+            return;
+        }
+        if (!this.canContinueInlineEditorMount(mountId)) {
+            return;
+        }
+        const editingUri = ( URI.from({
+            scheme: Schemas.inMemory,
+            path: `${PLAN_REVIEW_EDITING_PATH_PREFIX}/${generateUuid()}/${basename(planUri)}`
+        }));
+        const language = this._languageService.createByFilepathOrFirstLine(planUri);
+        const model = this._modelService.createModel(initialContent, language, editingUri);
+        let pinnedRef;
+        try {
+            pinnedRef = await this._textModelService.createModelReference(editingUri);
+        } catch {}
+        if (!this.canContinueInlineEditorMount(mountId)) {
+            pinnedRef?.dispose();
+            model.dispose();
+            return;
+        }
+        this._messageEditorDisposables.clear();
+        this._messageContentDisposables.clear();
+        clearNode(this._messageEl);
+        this._messageEl.classList.add("chat-plan-review-body-editor");
+        const editorOptions = {
+            wordWrap: "on",
+            lineNumbers: "on",
+            lineNumbersMinChars: 2,
+            glyphMargin: true,
+            folding: false,
+            minimap: {
+                enabled: false
+            },
+            scrollBeyondLastLine: false,
+            overviewRulerLanes: 0,
+            overviewRulerBorder: false,
+            hideCursorInOverviewRuler: true,
+            lineDecorationsWidth: 6,
+            renderLineHighlight: "none",
+            lightbulb: {
+                enabled: ShowLightbulbIconMode.Off
+            },
+            padding: {
+                top: 0,
+                bottom: 0
+            },
+            automaticLayout: true,
+            scrollbar: {
+                vertical: "auto",
+                horizontal: "auto",
+                alwaysConsumeMouseWheel: false
+            }
+        };
+        let editor;
+        try {
+            editor = this._instantiationService.createInstance(CodeEditorWidget, this._messageEl, editorOptions, {
+                isSimpleWidget: false
+            });
+        } catch {
+            pinnedRef?.dispose();
+            model.dispose();
+            this._messageEl.classList.remove("chat-plan-review-body-editor");
+            clearNode(this._messageEl);
+            this.renderMarkdown();
+            return;
+        }
+        this._messageEditorDisposables.add(toDisposable(() => editor.setModel(null)));
+        this._messageEditorDisposables.add(editor);
+        this._messageEditorDisposables.add(model);
+        if (pinnedRef) {
+            this._messageEditorDisposables.add(pinnedRef);
+        }
+        this._editingUri = editingUri;
+        this._initialEditorContent = initialContent;
+        const editingRegistration = this._planReviewFeedbackService.registerPlanReview(editingUri, () => {
+            void this.submitFeedback();
         });
-        this._feedbackTextarea?.focus();
+        this._messageEditorDisposables.add(editingRegistration);
+        this._messageEditorDisposables.add(toDisposable(() => {
+            this._editingUri = undefined;
+        }));
+        try {
+            editor.setModel(model);
+        } catch {
+            this._messageEditorDisposables.clear();
+            this._messageEl.classList.remove("chat-plan-review-body-editor");
+            clearNode(this._messageEl);
+            this.renderMarkdown();
+            return;
+        }
+        this._messageEditor = editor;
+        const preExistingComments = this._planReviewFeedbackService.getFeedback(planUri);
+        if (preExistingComments.length > 0) {
+            for (const item of preExistingComments) {
+                this._planReviewFeedbackService.addFeedback(editingUri, item.line, item.column, item.text);
+            }
+            this._planReviewFeedbackService.clearFeedback(planUri);
+        }
+        this._messageScrollable.scanDomNode();
         this._onDidChangeHeight.fire();
+        editor.focus();
     }
-    submitFeedback() {
+    canContinueInlineEditorMount(mountId) {
+        return this._inlineEditorMountId === mountId && !this._messageEditor && this._isFeedbackMode && !this._isSubmitted && !this._messageEditorDisposables.isDisposed;
+    }
+    isInlineEditorEnabled() {
+        return this._configurationService.getValue(ChatConfiguration.PlanReviewInlineEditorEnabled) !== false;
+    }
+    migrateInlineFeedbackToPlan(editingUri, planUri) {
+        const items = [...this._planReviewFeedbackService.getFeedback(editingUri)];
+        if (items.length === 0) {
+            return;
+        }
+        this._suppressFeedbackModeAutoOpen = true;
+        try {
+            for (const item of items) {
+                this._planReviewFeedbackService.addFeedback(planUri, item.line, item.column, item.text);
+            }
+            this._planReviewFeedbackService.clearFeedback(editingUri);
+        } finally {
+            this._suppressFeedbackModeAutoOpen = false;
+        }
+    }
+    async unmountInlineEditor(options) {
+        this._inlineEditorMountId++;
+        if (!this._messageEditor) {
+            return;
+        }
+        const editor = this._messageEditor;
+        const editingUri = this._editingUri;
+        const model = editingUri ? this._modelService.getModel(editingUri) : undefined;
+        const planUri = this.review.planUri ? URI.revive(this.review.planUri) : undefined;
+        const initialContent = this._initialEditorContent;
+        const text = model && !model.isDisposed() ? model.getValue() : undefined;
+        if (editingUri && planUri) {
+            this.migrateInlineFeedbackToPlan(editingUri, planUri);
+        }
+        this._messageEditor = undefined;
+        this._initialEditorContent = undefined;
+        try {
+            editor.setModel(null);
+        } finally {
+            this._messageEditorDisposables.clear();
+            this._messageEl.classList.remove("chat-plan-review-body-editor");
+            clearNode(this._messageEl);
+        }
+        if (options?.writeBack && text !== undefined && planUri && text !== initialContent) {
+            if (this.review instanceof ChatPlanReviewData) {
+                this.review.content = text;
+            }
+            try {
+                await this._textFileService.write(planUri, text);
+            } catch {}
+        }
+    }
+    async submitFeedback() {
         if (this._isSubmitted) {
             return;
         }
-        const feedback = this._feedbackTextarea?.value.trim();
-        if (!feedback) {
+        const textareaFeedback = this._feedbackTextarea?.value.trim();
+        const editorFeedbackItems = [...this.getInlineFeedbackItems()];
+        if (!textareaFeedback && editorFeedbackItems.length === 0) {
             return;
         }
         this._isSubmitted = true;
+        await this.unmountInlineEditor({
+            writeBack: true
+        });
+        let feedbackInlineMarkdown;
+        if (editorFeedbackItems.length > 0) {
+            const planUri = this.review.planUri ? URI.revive(this.review.planUri) : undefined;
+            const fileName = planUri ? basename(planUri) : "";
+            const heading = fileName ? ( localize(7126, "Inline comments on `{0}`:", fileName)) : ( localize(7127, "Inline comments:"));
+            const bullets = ( editorFeedbackItems.map(item => {
+                const location = item.column > 1 ? ( localize(7128, "Line {0}, Column {1}", item.line, item.column)) : ( localize(7129, "Line {0}", item.line));
+                return `- **${location}:** ${item.text}`;
+            }));
+            feedbackInlineMarkdown = [heading, ...bullets].join("\n");
+        }
+        const sections = [];
+        if (textareaFeedback) {
+            sections.push(textareaFeedback);
+        }
+        if (feedbackInlineMarkdown) {
+            sections.push(feedbackInlineMarkdown);
+        }
+        const feedback = sections.join("\n\n");
         this._options.onSubmit({
             rejected: false,
-            feedback
+            feedback,
+            feedbackOverall: textareaFeedback || undefined,
+            feedbackInlineMarkdown
         });
-        this.markUsed();
+        await this.markUsed();
     }
     async confirmAutopilot() {
         const result = await this._dialogService.prompt({
             type: Severity.Warning,
-            message: ( localize(6867, "Enable Autopilot?")),
+            message: ( localize(7130, "Enable Autopilot?")),
             buttons: [{
-                label: ( localize(6868, "Enable")),
+                label: ( localize(7131, "Enable")),
                 run: () => true
             }, {
-                label: ( localize(6869, "Cancel")),
+                label: ( localize(7132, "Cancel")),
                 run: () => false
             }],
             custom: {
                 icon: Codicon.rocket,
                 markdownDetails: [{
                     markdown: ( new MarkdownString(( localize(
-                        6870,
+                        7133,
                         "Autopilot will auto-approve all tool calls and continue working autonomously until the task is complete. This includes terminal commands, file edits, and external tool calls. The agent will make decisions on your behalf without asking for confirmation.\n\nYou can stop the agent at any time by clicking the stop button. This applies to the current session only."
                     ))))
                 }]
@@ -412,14 +981,23 @@ let ChatPlanReviewPart = class ChatPlanReviewPart extends Disposable {
         });
         return result.result === true;
     }
-    markUsed() {
+    async markUsed() {
         this.domNode.classList.add("chat-plan-review-used");
         this._buttonStore.clear();
+        this._submitButton = undefined;
+        this._renderedSubmitInlineCount = -1;
+        this._planReviewRegistration.clear();
+        if (this._messageEditor) {
+            await this.unmountInlineEditor({
+                writeBack: false
+            });
+            this.renderMarkdown();
+        }
         if (this._feedbackTextarea) {
             this._feedbackTextarea.disabled = true;
         }
     }
 };
-ChatPlanReviewPart = ( __decorate([( __param(3, IMarkdownRendererService)), ( __param(4, IContextMenuService)), ( __param(5, IDialogService)), ( __param(6, IEditorService)), ( __param(7, IHoverService))], ChatPlanReviewPart));
+ChatPlanReviewPart = ( __decorate([( __param(3, IMarkdownRendererService)), ( __param(4, IContextMenuService)), ( __param(5, IDialogService)), ( __param(6, IEditorService)), ( __param(7, IHoverService)), ( __param(8, IPlanReviewFeedbackService)), ( __param(9, IInstantiationService)), ( __param(10, ITextFileService)), ( __param(11, IModelService)), ( __param(12, ITextModelService)), ( __param(13, ILanguageService)), ( __param(14, IConfigurationService))], ChatPlanReviewPart));
 
 export { ChatPlanReviewPart };