@codingame/monaco-vscode-api 37.6.1 → 38.0.1

package/vscode/src/vs/sessions/contrib/changes/browser/createPullRequestWidget.js

@@ -58,7 +58,7 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         const headingLabel = this._register(( new IconLabel(append(heading, $("h2", {
             id: `${id}-heading`
         })))));
-        const headingText = ( localize(3478, "Create pull request"));
+        const headingText = ( localize(3897, "Create pull request"));
         headingLabel.setLabel(headingText, undefined, {
             title: headingText
         });
@@ -74,7 +74,7 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         this.baseBranch = this._register(( new IconLabel(this.branches)));
         append(this.branches, renderIcon(Codicon.arrowLeft)).setAttribute("aria-hidden", "true");
         this.sourceBranch = this._register(( new IconLabel(this.branches)));
-        this.branchesLoading = append(header, $(".create-pr-branches-loading", undefined, ( localize(3479, "Loading branch information..."))));
+        this.branchesLoading = append(header, $(".create-pr-branches-loading", undefined, ( localize(3898, "Loading branch information..."))));
         this.updateRepository(options.branchName, options.baseBranchName);
         const body = $(".create-pr-body");
         this.scrollable = this._register(( new DomScrollableElement(body, {
@@ -86,11 +86,11 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         const titleField = append(body, $(".create-pr-field"));
         const titleLabel = append(titleField, $("label.create-pr-label.create-pr-field-label", {
             for: `${id}-title`
-        }, ( localize(3480, "Title"))));
+        }, ( localize(3899, "Title"))));
         this.titleLoading = append(titleLabel, renderIcon(loadingIcon));
         this.titleLoading.setAttribute("aria-hidden", "true");
         this.titleInput = this._register(( new InputBox(titleField, undefined, {
-            placeholder: ( localize(3481, "Summarize your changes")),
+            placeholder: ( localize(3900, "Summarize your changes")),
             inputBoxStyles: defaultInputBoxStyles
         })));
         this.titleInput.inputElement.id = `${id}-title`;
@@ -99,11 +99,11 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         const descriptionField = append(body, $(".create-pr-field.create-pr-description-field"));
         const descriptionLabel = append(descriptionField, $("label.create-pr-label.create-pr-field-label", {
             for: `${id}-description`
-        }, ( localize(3482, "Description"))));
+        }, ( localize(3901, "Description"))));
         this.descriptionLoading = append(descriptionLabel, renderIcon(loadingIcon));
         this.descriptionLoading.setAttribute("aria-hidden", "true");
         this.descriptionInput = this._register(( new InputBox(descriptionField, undefined, {
-            placeholder: ( localize(3483, "Describe what changed and how it was tested")),
+            placeholder: ( localize(3902, "Describe what changed and how it was tested")),
             flexibleHeight: true,
             flexibleMaxHeight: 180,
             inputBoxStyles: defaultInputBoxStyles
@@ -122,15 +122,15 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
             secondary: true,
             small: true
         })));
-        this.retryButton.label = ( localize(3484, "Retry"));
+        this.retryButton.label = ( localize(3903, "Retry"));
         this.retryButton.element.hidden = true;
         this._register(this.retryButton.onDidClick(() => this.prepare()));
         const draftRow = append(body, $(".create-pr-draft"));
-        this.draftCheckbox = this._register(( new Checkbox(( localize(3485, "Create as Draft")), options.initialDraft ?? options.preferences?.draft ?? false, defaultCheckboxStyles)));
+        this.draftCheckbox = this._register(( new Checkbox(( localize(3904, "Create as Draft")), options.initialDraft ?? options.preferences?.draft ?? false, defaultCheckboxStyles)));
         draftRow.appendChild(this.draftCheckbox.domNode);
         const draftText = append(draftRow, $(".create-pr-option-text"));
-        append(draftText, $("span.create-pr-label", undefined, ( localize(3485, "Create as Draft"))));
-        const draftHint = ( localize(3486, "Keep the pull request in draft until it is ready for review."));
+        append(draftText, $("span.create-pr-label", undefined, ( localize(3904, "Create as Draft"))));
+        const draftHint = ( localize(3905, "Keep the pull request in draft until it is ready for review."));
         append(draftText, $("span", {
             id: `${id}-draft-hint`,
             hidden: true
@@ -156,10 +156,10 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
             this.updateMergeOptions();
         }));
         const mergeField = append(body, $(".create-pr-field"));
-        append(mergeField, $(".create-pr-label", undefined, ( localize(3487, "After creation"))));
+        append(mergeField, $(".create-pr-label", undefined, ( localize(3906, "After creation"))));
         this.mergeModeRadio = this._register(( new Radio({
             items: [],
-            ariaLabel: ( localize(3487, "After creation"))
+            ariaLabel: ( localize(3906, "After creation"))
         })));
         mergeField.appendChild(this.mergeModeRadio.domNode);
         this.mergeDescription = append(mergeField, $(".create-pr-hint.create-pr-merge-description", {
@@ -179,7 +179,7 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         }));
         this.agentMergeOptionsSection = append(body, $(".create-pr-field.create-pr-agent-merge", {
             role: "group",
-            "aria-label": ( localize(3488, "Agent Merge configuration for this session"))
+            "aria-label": ( localize(3907, "Agent Merge configuration for this session"))
         }));
         const repairActions = append(this.agentMergeOptionsSection, $(".create-pr-agent-merge-actions"));
         const createRepairCheckbox = (label, description) => {
@@ -215,32 +215,32 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
             return checkbox;
         };
         this.agentMergeCheckboxes = {
-            addressReviews: createRepairCheckbox(( localize(3489, "Address Reviews")), ( localize(
-                3490,
+            addressReviews: createRepairCheckbox(( localize(3908, "Address Reviews")), ( localize(
+                3909,
                 "Agent Merge will automatically ask the agent to address feedback when the pull request has unresolved review comments."
             ))),
-            fixCI: createRepairCheckbox(( localize(3491, "Fix CI Failures")), ( localize(
-                3492,
+            fixCI: createRepairCheckbox(( localize(3910, "Fix CI Failures")), ( localize(
+                3911,
                 "Agent Merge will automatically ask the agent to investigate and fix failures when required CI checks fail."
             ))),
-            resolveConflicts: createRepairCheckbox(( localize(3493, "Resolve Conflicts and Behind Branches")), ( localize(
-                3494,
+            resolveConflicts: createRepairCheckbox(( localize(3912, "Resolve Conflicts and Behind Branches")), ( localize(
+                3913,
                 "Agent Merge will automatically ask the agent to update the source branch when it has merge conflicts or falls behind the base branch."
             )))
         };
         append(
             this.agentMergeOptionsSection,
-            $(".create-pr-label", undefined, ( localize(3495, "Merge Pull Request")))
+            $(".create-pr-label", undefined, ( localize(3914, "Merge Pull Request")))
         );
         this.agentMergePolicyRadio = this._register(( new Radio({
-            ariaLabel: ( localize(3495, "Merge Pull Request")),
+            ariaLabel: ( localize(3914, "Merge Pull Request")),
             items: [{
-                text: ( localize(3496, "Off")),
+                text: ( localize(3915, "Off")),
                 isActive: true
             }, {
-                text: ( localize(3497, "If Unchanged"))
+                text: ( localize(3916, "If Unchanged"))
             }, {
-                text: ( localize(3498, "When Ready"))
+                text: ( localize(3917, "When Ready"))
             }]
         })));
         this.agentMergeOptionsSection.appendChild(this.agentMergePolicyRadio.domNode);
@@ -260,16 +260,16 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         this.mergeMethodSection = append(body, $(".create-pr-field"));
         append(
             this.mergeMethodSection,
-            $(".create-pr-label", undefined, ( localize(3499, "Merge method")))
+            $(".create-pr-label", undefined, ( localize(3918, "Merge method")))
         );
         this.mergeMethodRadio = this._register(( new Radio({
             items: [],
-            ariaLabel: ( localize(3499, "Merge method"))
+            ariaLabel: ( localize(3918, "Merge method"))
         })));
         this.mergeMethodSection.appendChild(this.mergeMethodRadio.domNode);
         this.mergeMethodDescription = append(this.mergeMethodSection, $(".create-pr-hint"));
         this._register(this.mergeMethodRadio.onDidSelect(index => {
-            this.mergeMethod = this.details.mergeMethods[index];
+            this.mergeMethod = this.mergeMethods[index];
             this.preferredMergeMethod = this.mergeMethod;
             this.options.onDidChangePreferences?.({
                 mergeMethod: this.preferredMergeMethod
@@ -281,13 +281,13 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         }));
         this.error.hidden = true;
         const footer = append(this.domNode, $(".create-pr-footer"));
-        append(footer, $(".create-pr-hint", undefined, ( localize(3500, "Uncommitted changes will be committed and your branch pushed."))));
+        append(footer, $(".create-pr-hint", undefined, ( localize(3919, "Uncommitted changes will be committed and your branch pushed."))));
         const buttons = this._register(( new ButtonBar(append(footer, $(".create-pr-buttons")))));
         this.cancelButton = buttons.addButton({
             ...defaultButtonStyles,
             secondary: true
         });
-        this.cancelButton.label = ( localize(3501, "Cancel"));
+        this.cancelButton.label = ( localize(3920, "Cancel"));
         this.createButton = options.sendToChat ? buttons.addButtonWithDropdown({
             ...defaultButtonStyles,
             supportIcons: true,
@@ -298,7 +298,7 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
                     id: `sessions.createPullRequest.${action}`,
                     label: this.actionLabel(action),
                     checked: this.primaryAction === action,
-                    enabled: this.createButton.enabled,
+                    enabled: this.isActionEnabled(action),
                     run: () => this.submit(action)
                 }))
             }
@@ -309,7 +309,7 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         const primaryButton = this.createButton instanceof ButtonWithDropdown ? this.createButton.primaryButton : this.createButton;
         primaryButton.element.classList.add("create-pr-submit");
         if (this.createButton instanceof ButtonWithDropdown) {
-            this.createButton.dropdownButton.setAriaLabel(( localize(3502, "Pull Request Actions")));
+            this.createButton.dropdownButton.setAriaLabel(( localize(3921, "Pull Request Actions")));
         }
         this._register(this.cancelButton.onDidClick(() => options.onCancel()));
         this._register(this.createButton.onDidClick(() => this.submit()));
@@ -328,12 +328,26 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         this._register(
             addDisposableListener(this.domNode, EventType.KEY_DOWN, event => this.onKeyDown(event), true)
         );
+        if (options.initialContent?.title !== undefined) {
+            this.titleInput.value = options.initialContent.title;
+            this.titleEdited = true;
+        }
+        if (options.initialContent?.description !== undefined) {
+            this.descriptionInput.value = options.initialContent.description;
+            this.descriptionEdited = true;
+        }
         this.updateMergeOptions();
         this.ready = this.prepare();
     }
     get isSubmitting() {
         return this.submitting;
     }
+    getFormContent() {
+        return {
+            title: this.titleEdited || this.titleInput.value ? this.titleInput.value : undefined,
+            description: this.descriptionEdited || this.descriptionInput.value ? this.descriptionInput.value : undefined
+        };
+    }
     focus() {
         this.titleInput.focus();
     }
@@ -354,19 +368,19 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         this.branches.hidden = !hasBranches;
         this.branchesLoading.hidden = hasBranches;
         const createsBranch = hasBranches && branchName === baseBranchName;
-        const branchDescription = createsBranch ? ( localize(3503, "A new branch will be created from {0}", baseBranchName)) : ( localize(
-            3504,
+        const branchDescription = createsBranch ? ( localize(3922, "A new branch will be created from {0}", baseBranchName)) : ( localize(
+            3923,
             "Merge source branch {0} into base branch {1}",
             branchName ?? "",
             baseBranchName ?? ""
         ));
         this.branches.setAttribute("aria-label", branchDescription);
         this.baseBranch.setLabel(baseBranchName ?? "", undefined, {
-            title: ( localize(3505, "Base branch: {0}", baseBranchName ?? "")),
+            title: ( localize(3924, "Base branch: {0}", baseBranchName ?? "")),
             extraClasses: ["create-pr-base-branch"]
         });
-        this.sourceBranch.setLabel(createsBranch ? ( localize(3506, "New branch")) : branchName ?? "", undefined, {
-            title: createsBranch ? branchDescription : ( localize(3507, "Source branch: {0}", branchName ?? "")),
+        this.sourceBranch.setLabel(createsBranch ? ( localize(3925, "New branch")) : branchName ?? "", undefined, {
+            title: createsBranch ? branchDescription : ( localize(3926, "Source branch: {0}", branchName ?? "")),
             extraClasses: ["create-pr-source-branch"]
         });
     }
@@ -380,10 +394,10 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         this.updateSubmitButton();
         this.updateMergeOptions();
         if (this.domNode.isConnected) {
-            status(( localize(3508, "Generating pull request title and description.")));
+            status(( localize(3927, "Generating pull request title and description.")));
         }
         try {
-            const details = await this.options.creation.prepare(cancellation.token);
+            const details = await this.options.creation.prepare(cancellation.token, this.options.chat);
             if (this._store.isDisposed || cancellation.token.isCancellationRequested) {
                 return;
             }
@@ -405,19 +419,19 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
             this.updateRepository(details.branchName, details.baseBranchName, details.repository);
             const generationFailed = details.generationError !== undefined;
             this.setGenerationError(generationFailed ? details.generationError ? ( localize(
-                3509,
+                3928,
                 "Could not generate details: {0} Enter your own or retry.",
                 details.generationError
-            )) : ( localize(3510, "Could not generate details. Enter your own or retry.")) : undefined);
+            )) : ( localize(3929, "Could not generate details. Enter your own or retry.")) : undefined);
             if (!generationFailed && this.domNode.isConnected) {
-                status(( localize(3511, "Pull request details are ready.")));
+                status(( localize(3930, "Pull request details are ready.")));
             }
         } catch (error) {
             if (this._store.isDisposed || cancellation.token.isCancellationRequested) {
                 return;
             }
             this.setGenerationError(( localize(
-                3512,
+                3931,
                 "Could not load pull request details: {0} Enter your own or retry.",
                 toErrorMessage(error)
             )));
@@ -446,45 +460,84 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         this.statusText.textContent = message ?? "";
     }
     updateMergeOptions() {
-        const autoMergeAllowed = this.details?.autoMergeAllowed && !this.draftCheckbox.checked && this.details.mergeMethods.length > 0;
+        const focusedRadio = [this.mergeModeRadio, this.mergeMethodRadio].find(radio => radio.domNode.contains(getActiveElement()));
+        const autoMergeAllowed = (this.details?.autoMergeAllowed ?? this.loading) && !this.draftCheckbox.checked && this.mergeMethods.length > 0;
+        const agentMergeAvailable = this.details?.agentMergeAvailable ?? this.loading;
+        const autoMergeUnavailableReason = autoMergeAllowed && !this.loading ? undefined : this.getAutoMergeUnavailableReason();
         this.mergeMode = this.preferredMergeMode;
-        if ((this.mergeMode === "auto" && !autoMergeAllowed) || (this.mergeMode === "agent" && !this.details?.agentMergeAvailable)) {
+        if ((this.mergeMode === "auto" && !autoMergeAllowed) || (this.mergeMode === "agent" && !agentMergeAvailable)) {
             this.mergeMode = "manual";
         }
-        this.mergeModes = this.details?.agentMergeAvailable ? ["manual", "agent", "auto"] : ["manual", "auto"];
+        this.mergeModes = agentMergeAvailable ? ["manual", "agent", "auto"] : ["manual", "auto"];
         const labels = {
-            manual: ( localize(3513, "Merge Manually")),
-            agent: ( localize(3514, "Agent Merge")),
-            auto: ( localize(3515, "Auto-Merge"))
+            manual: ( localize(3932, "Merge Manually")),
+            agent: ( localize(3933, "Agent Merge")),
+            auto: ( localize(3934, "Auto-Merge"))
         };
         this.mergeModeRadio.setItems(this.mergeModes.map(mode => ({
             text: labels[mode],
             ariaLabel: labels[mode],
             isActive: this.mergeMode === mode,
-            disabled: this.loading || this.submitting || (mode === "auto" && !autoMergeAllowed),
-            tooltip: mode === "auto" && !autoMergeAllowed ? this.draftCheckbox.checked ? ( localize(3516, "Mark the pull request ready before enabling GitHub auto-merge.")) : ( localize(3517, "GitHub auto-merge is not available for this repository or session.")) : labels[mode]
+            disabled: this.submitting || (mode === "auto" && !autoMergeAllowed),
+            tooltip: mode === "auto" ? autoMergeUnavailableReason ?? labels[mode] : labels[mode]
         })));
-        const mergeMethods = this.details?.mergeMethods ?? [];
+        if (autoMergeUnavailableReason) {
+            this.mergeModeRadio.optionElements[this.mergeModes.indexOf("auto")].setAttribute("aria-description", autoMergeUnavailableReason);
+        }
+        const mergeMethods = this.mergeMethods;
         this.mergeMethod = this.preferredMergeMethod;
         if (mergeMethods.length > 0 && !mergeMethods.includes(this.mergeMethod)) {
             this.mergeMethod = mergeMethods[0];
         }
         const methodLabels = {
-            SQUASH: ( localize(3518, "Squash")),
-            MERGE: ( localize(3519, "Merge Commit")),
-            REBASE: ( localize(3520, "Rebase"))
+            SQUASH: ( localize(3935, "Squash")),
+            MERGE: ( localize(3936, "Merge Commit")),
+            REBASE: ( localize(3937, "Rebase"))
         };
         this.mergeMethodRadio.setItems(mergeMethods.map(method => ({
             text: methodLabels[method],
             isActive: this.mergeMethod === method,
-            disabled: this.loading || this.submitting
+            disabled: this.submitting
         })));
         this.updateMergeDescription();
+        if (focusedRadio && !this.submitting) {
+            (focusedRadio === this.mergeMethodRadio && this.mergeMethodSection.hidden ? this.mergeModeRadio : focusedRadio).focusActiveItem();
+        }
+    }
+    get mergeMethods() {
+        return this.details?.mergeMethods ?? (this.loading ? ["SQUASH", "MERGE", "REBASE"] : []);
+    }
+    get canConfigureAgentMerge() {
+        return this.details ? !!this.details.agentMergeOptions : this.loading;
+    }
+    getAutoMergeUnavailableReason() {
+        if (this.draftCheckbox.checked) {
+            return localize(3938, "Mark the pull request ready before enabling GitHub auto-merge.");
+        }
+        if (this.loading) {
+            return localize(3939, "Checking GitHub auto-merge availability...");
+        }
+        if (!this.details) {
+            return localize(
+                3940,
+                "Repository merge settings could not be loaded. Check your GitHub access and retry loading the pull request details."
+            );
+        }
+        if (this.details.mergeMethods.length === 0) {
+            return localize(
+                3941,
+                "Repository merge settings could not be loaded or no merge methods are enabled. Check your GitHub access and the repository's Settings > General > Pull Requests."
+            );
+        }
+        return localize(
+            3942,
+            "GitHub auto-merge is disabled for this repository. Ask a repository administrator to enable \"Allow auto-merge\" in the repository's Settings > General > Pull Requests."
+        );
     }
     updateMergeDescription() {
         this.mergeMethodSection.hidden = this.mergeMode !== "auto";
-        this.agentMergeOptionsSection.hidden = this.mergeMode !== "agent" || !this.details?.agentMergeOptions;
-        const agentMergeControlsEnabled = !this.agentMergeOptionsSection.hidden && !this.loading && !this.submitting;
+        this.agentMergeOptionsSection.hidden = this.mergeMode !== "agent" || !this.canConfigureAgentMerge;
+        const agentMergeControlsEnabled = !this.agentMergeOptionsSection.hidden && !this.submitting;
         for (const checkbox of ( Object.values(this.agentMergeCheckboxes))) {
             if (agentMergeControlsEnabled) {
                 checkbox.enable();
@@ -493,35 +546,43 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
             }
         }
         this.agentMergePolicyRadio.setEnabled(agentMergeControlsEnabled);
-        this.mergeDescription.textContent = this.mergeMode === "agent" ? this.details?.agentMergeOptions ? ( localize(
-            3521,
+        this.mergeDescription.textContent = this.mergeMode === "agent" ? this.canConfigureAgentMerge ? ( localize(
+            3943,
             "Applied to this session on submission. Your choices are remembered for future pull requests. Additional agent usage may apply."
         )) : ( localize(
-            3522,
+            3944,
             "Uses the session's existing Agent Merge settings. Update the agent host to configure them here."
         )) : this.mergeMode === "auto" ? ( localize(
-            3523,
+            3945,
             "GitHub merges when required checks and approvals pass. It does not fix failing checks or address reviews."
-        )) : ( localize(3524, "You decide when to merge. No automatic fixes or merging."));
-        const policyDescription = this.agentMergePolicy === "never" ? ( localize(3525, "Leave the pull request open for you to merge.")) : this.agentMergePolicy === "ifUnchanged" ? ( localize(
-            3526,
+        )) : ( localize(3946, "You decide when to merge. No automatic fixes or merging."));
+        const policyDescription = this.agentMergePolicy === "never" ? ( localize(3947, "Leave the pull request open for you to merge.")) : this.agentMergePolicy === "ifUnchanged" ? ( localize(
+            3948,
             "Merge only if Agent Merge made no changes. A repair commit switches merging off."
-        )) : ( localize(3527, "Merge when required checks and approvals pass."));
-        this.agentMergePolicyDescription.textContent = this.draftCheckbox.checked && this.agentMergePolicy !== "never" ? ( localize(3528, "{0} Drafts can be marked ready automatically.", policyDescription)) : policyDescription;
+        )) : ( localize(3949, "Merge when required checks and approvals pass."));
+        this.agentMergePolicyDescription.textContent = this.draftCheckbox.checked && this.agentMergePolicy !== "never" ? ( localize(3950, "{0} Drafts can be marked ready automatically.", policyDescription)) : policyDescription;
         this.updateMergeMethodDescription();
         this.relayout();
     }
     updateMergeMethodDescription() {
-        this.mergeMethodDescription.textContent = this.mergeMethod === "SQUASH" ? ( localize(3529, "Combine all changes into one commit on the base branch.")) : this.mergeMethod === "REBASE" ? ( localize(3530, "Replay each commit on the base branch without a merge commit.")) : ( localize(3531, "Preserve all commits and add a merge commit."));
+        this.mergeMethodDescription.textContent = this.mergeMethod === "SQUASH" ? ( localize(3951, "Combine all changes into one commit on the base branch.")) : this.mergeMethod === "REBASE" ? ( localize(3952, "Replay each commit on the base branch without a merge commit.")) : ( localize(3953, "Preserve all commits and add a merge commit."));
     }
     updateSubmitButton() {
-        this.createButton.enabled = !this.loading && !this.submitting && this.titleInput.value.trim().length > 0;
-        const label = this.submitting ? this.primaryAction === "sendToChat" ? ( localize(3532, "Sending Message...")) : ( localize(3533, "Creating PR...")) : this.actionLabel(this.primaryAction);
+        if (this.createButton instanceof ButtonWithDropdown) {
+            this.createButton.enabled = !this.submitting;
+            this.createButton.primaryButton.enabled = this.isActionEnabled(this.primaryAction);
+        } else {
+            this.createButton.enabled = this.isActionEnabled(this.primaryAction);
+        }
+        const label = this.submitting ? this.primaryAction === "sendToChat" ? ( localize(3954, "Sending Message...")) : ( localize(3955, "Creating PR...")) : this.actionLabel(this.primaryAction);
         this.createButton.label = this.submitting ? `$(loading~spin) ${label}` : label;
         this.createButton.setAriaLabel(label);
     }
+    isActionEnabled(action) {
+        return !this._store.isDisposed && !this.submitting && (action === "sendToChat" ? !!this.options.sendToChat : !this.loading && this.titleInput.value.trim().length > 0);
+    }
     actionLabel(action) {
-        return action === "sendToChat" ? ( localize(3534, "Send Create PR Message")) : ( localize(3535, "Create PR"));
+        return action === "sendToChat" ? ( localize(3956, "Send Create PR Message")) : ( localize(3957, "Create PR"));
     }
     applyAgentMergeOptions(options) {
         for (const action of ( Object.keys(this.agentMergeCheckboxes))) {
@@ -546,9 +607,10 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
     }
     async submit(action = this.primaryAction) {
         const sendToChat = this.options.sendToChat;
-        if (this._store.isDisposed || !this.createButton.enabled || (action === "sendToChat" && !sendToChat)) {
+        if (!this.isActionEnabled(action)) {
             return;
         }
+        const agentMergeOptions = this.details?.agentMergeOptions || (!this.details && this.loading && this.agentMergeOptionsEdited) ? this.getAgentMergeOptions() : undefined;
         this.primaryAction = action;
         this.options.onDidChangePreferences?.({
             ...(sendToChat ? {
@@ -557,8 +619,8 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
             draft: this.draftCheckbox.checked,
             mergeMode: this.preferredMergeMode,
             mergeMethod: this.preferredMergeMethod,
-            ...(this.details?.agentMergeOptions ? {
-                agentMergeOptions: this.getAgentMergeOptions()
+            ...(agentMergeOptions ? {
+                agentMergeOptions
             } : {})
         });
         const previouslyFocused = getActiveElement();
@@ -574,28 +636,32 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         this.updateSubmitButton();
         this.updateMergeOptions();
         const focusAfterDisabling = getActiveElement();
-        const options = {
-            title: this.titleInput.value.trim(),
-            description: this.descriptionInput.value,
+        const chatOptions = {
             ...(this.details?.context ? {
                 expectedContext: this.details.context
             } : {}),
             draft: this.draftCheckbox.checked,
             agentMerge: this.mergeMode === "agent",
-            ...(this.mergeMode === "agent" && this.details?.agentMergeOptions ? {
-                agentMergeOptions: this.getAgentMergeOptions()
+            ...(this.mergeMode === "agent" && agentMergeOptions ? {
+                agentMergeOptions
             } : {}),
             ...(this.mergeMode === "auto" ? {
                 autoMergeMethod: this.mergeMethod
             } : {})
         };
+        const options = {
+            ...chatOptions,
+            title: this.titleInput.value.trim(),
+            description: this.descriptionInput.value
+        };
         let message = undefined;
         let failed = false;
         try {
             if (action === "sendToChat" && sendToChat) {
-                await sendToChat(options);
+                await sendToChat(chatOptions);
             } else {
-                message = await this.options.creation.create(options);
+                this.options.onWillCreate?.();
+                message = await this.options.creation.create(options, this.options.chat);
             }
         } catch (error) {
             failed = true;
@@ -604,10 +670,10 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
                 return;
             }
             this.error.textContent = action === "sendToChat" ? ( localize(
-                3536,
+                3958,
                 "Could not send the create pull request message: {0}",
                 toErrorMessage(error)
-            )) : ( localize(3537, "Could not create the pull request: {0}", toErrorMessage(error)));
+            )) : ( localize(3959, "Could not create the pull request: {0}", toErrorMessage(error)));
             this.error.hidden = false;
             return;
         } finally {
@@ -642,7 +708,7 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         if (key.equals(KeyCode.Escape)) {
             EventHelper.stop(event, true);
             if (!this.submitting) {
-                this.options.onCancel();
+                (this.options.onDismiss ?? this.options.onCancel)();
             }
         } else if (key.equals(KeyMod$1.CtrlCmd | KeyCode.Enter)) {
             EventHelper.stop(event, true);

package/vscode/src/vs/sessions/contrib/changes/browser/media/changesSummaryWidget.css

@@ -5,13 +5,5 @@
 
 .changes-summary-widget {
 	display: inline-flex;
-	gap: 4px;
-
-	.changes-summary-lines-added {
-		color: var(--vscode-chat-linesAddedForeground);
-	}
-
-	.changes-summary-lines-removed {
-		color: var(--vscode-chat-linesRemovedForeground);
-	}
+	gap: var(--vscode-spacing-size40);
 }

package/vscode/src/vs/sessions/contrib/changes/browser/media/sessionChangesEditor.css

@@ -28,7 +28,7 @@
 	color: var(--vscode-chat-linesRemovedForeground);
 }
 
-.changeset-review-action {
+.monaco-action-bar .checkbox-action-item.changeset-review-action {
 	display: flex;
 	align-items: center;
 	height: var(--vscode-spacing-size200);
@@ -150,6 +150,7 @@
 	padding: var(--vscode-spacing-size20) var(--vscode-spacing-size60);
 	background-color: var(--vscode-commandCenter-background);
 	color: var(--vscode-commandCenter-foreground);
+	border: var(--vscode-strokeThickness) solid var(--vscode-toolbar-hoverBackground);
 	border-radius: var(--vscode-cornerRadius-small);
 }
 
@@ -158,7 +159,7 @@
 }
 
 :is(.hc-black, .hc-light) .changes-picker-action-with-summary .action-label {
-	border: var(--vscode-strokeThickness) solid var(--vscode-contrastBorder);
+	border-color: var(--vscode-contrastBorder);
 }
 
 .changes-picker-action-with-summary .action-label:focus-visible {
@@ -174,11 +175,17 @@
 	white-space: nowrap;
 }
 
+.changes-picker-action-rich .changes-picker-label.non-default {
+	font-weight: var(--vscode-fontWeight-semiBold);
+}
+
 .changes-picker-action-rich .changes-picker-summary {
 	display: inline-flex;
 	align-items: center;
 	gap: var(--vscode-spacing-size40);
 	flex: 0 0 auto;
+	font-variant-numeric: tabular-nums;
+	white-space: nowrap;
 }
 
 .changes-picker-action-rich .changes-picker-separator {
@@ -186,14 +193,6 @@
 	flex-shrink: 0;
 }
 
-.changes-picker-action-rich .working-set-lines-added {
-	color: var(--vscode-chat-linesAddedForeground);
-}
-
-.changes-picker-action-rich .working-set-lines-removed {
-	color: var(--vscode-chat-linesRemovedForeground);
-}
-
 .changes-picker-action-rich .action-label > .codicon {
 	font-size: var(--vscode-codiconFontSize-compact) !important;
 	width: auto;

package/vscode/src/vs/sessions/contrib/changes/browser/sessionChangesEditor.d.ts

@@ -24,6 +24,7 @@ import { IChangesViewService } from "../common/changesViewService.service.js";
 import { SessionChangesEditorInput } from "./sessionChangesEditorInput.js";
 import { ISessionChangesService } from "./sessionChangesService.js";
 import { IDiffEditorOptionsService } from "../../editor/common/diffEditorOptionsService.service.js";
+import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
 /**
  * Changes editor for the Agents window: a "Branch Changes" versions dropdown and
  * diff stats header sitting above an embedded multi-diff editor showing the
@@ -35,12 +36,14 @@ export declare class SessionChangesEditor extends AbstractEditorWithViewState<IM
     private readonly layoutService;
     private readonly sessionChangesService;
     private readonly diffEditorOptionsService;
+    private readonly configurationService;
     static readonly ID = "workbench.editor.agentSessions.sessionChanges";
     private widget;
     private viewModel;
+    get hasViewModel(): boolean;
     private bodyContainer;
     get scopedContextKeyService(): IContextKeyService | undefined;
-    private _singlePane;
+    private _desktop;
     private _scopedInstantiationService;
     /** Session whose changes this editor is currently showing (from its input). */
     private readonly _inputSessionResource;
@@ -51,8 +54,11 @@ export declare class SessionChangesEditor extends AbstractEditorWithViewState<IM
     private readonly _scopedChangesObs;
     /** Deferred focus request awaiting the active diff editor to be rendered. */
     private readonly _pendingFocus;
+    private readonly _pendingReveal;
+    /** Defers resolving the multi-diff while the editor part is hidden (desktop detail-only). */
+    private readonly _pendingResolve;
     private readonly _logger;
-    constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService, instantiationService: IInstantiationService, textResourceConfigurationService: ITextResourceConfigurationService, editorService: IEditorService, editorGroupService: IEditorGroupsService, contextKeyService: IContextKeyService, changesViewService: IChangesViewService, layoutService: IAgentWorkbenchLayoutService, sessionChangesService: ISessionChangesService, diffEditorOptionsService: IDiffEditorOptionsService, logService: ILogService);
+    constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService, instantiationService: IInstantiationService, textResourceConfigurationService: ITextResourceConfigurationService, editorService: IEditorService, editorGroupService: IEditorGroupsService, contextKeyService: IContextKeyService, changesViewService: IChangesViewService, layoutService: IAgentWorkbenchLayoutService, sessionChangesService: ISessionChangesService, diffEditorOptionsService: IDiffEditorOptionsService, logService: ILogService, configurationService: IConfigurationService);
     protected createEditor(parent: HTMLElement): void;
     /**
      * Resolves the diff editor and code editor showing the given file, mirroring
@@ -66,10 +72,11 @@ export declare class SessionChangesEditor extends AbstractEditorWithViewState<IM
     getLayoutDebugState(): IObservable<IMultiDiffEditorLayoutDebugState>;
     getControl(): IDiffEditor | undefined;
     resetDiffEditorWidthBasedLayout(): void;
-    /** Creates the classic (non-single-pane) internal header toolbars. */
+    /** Creates the mobile-layout internal header toolbars. */
     private _buildHeaderToolbars;
     get scopedInstantiationService(): IInstantiationService | undefined;
     setInput(input: SessionChangesEditorInput, options: IMultiDiffEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void>;
+    private _resolveInput;
     protected setEditorVisible(visible: boolean): void;
     protected computeEditorViewState(_resource: URI): IMultiDiffEditorViewState | undefined;
     protected tracksEditorViewState(input: EditorInput): boolean;