fix: show save dialog when creating new files (issue 6309)

core/index.d.ts

@@ -1395,6 +1395,7 @@ export interface ApplyToFilePayload {
   text: string;
   toolCallId?: string;
   isSearchAndReplace?: boolean;
+  showSaveDialog?: boolean;
 }
 
 export interface RangeInFileWithContents {

extensions/vscode/src/extension/VsCodeMessenger.ts

@@ -15,6 +15,7 @@ import {
   WEBVIEW_TO_CORE_PASS_THROUGH,
 } from "core/protocol/passThrough";
 import { stripImages } from "core/util/messageContent";
+import * as path from "path";
 import * as vscode from "vscode";
 
 import { ApplyManager } from "../apply";
@@ -132,6 +133,46 @@ export class VsCodeMessenger {
     });
 
     this.onWebview("applyToFile", async ({ data }) => {
+      // Check if we should show save dialog for new file creation
+      if (data.showSaveDialog) {
+        // Extract filename from the suggested filepath if available
+        let defaultUri: vscode.Uri | undefined;
+        if (data.filepath) {
+          const filename = path.basename(data.filepath);
+          const workspaceFolder = vscode.workspace.workspaceFolders?.[0];
+          if (workspaceFolder) {
+            // Try to use the suggested directory structure if it exists
+            const suggestedDir = path.dirname(data.filepath);
+            if (suggestedDir && suggestedDir !== '.') {
+              defaultUri = vscode.Uri.joinPath(workspaceFolder.uri, suggestedDir, filename);
+            } else {
+              defaultUri = vscode.Uri.joinPath(workspaceFolder.uri, filename);
+            }
+          }
+        } else {
+          defaultUri = vscode.workspace.workspaceFolders?.[0]?.uri;
+        }
+
+        const uri = await vscode.window.showSaveDialog({
+          defaultUri,
+          saveLabel: "Create File",
+          title: "Choose location for new file",
+        });
+
+        if (!uri) {
+          // User cancelled
+          await webviewProtocol.request("updateApplyState", {
+            streamId: data.streamId,
+            status: "closed",
+            toolCallId: data.toolCallId,
+          });
+          return;
+        }
+
+        // Update the filepath with the user's choice
+        data.filepath = uri.fsPath;
+      }
+
       const [verticalDiffManager, configHandler] = await Promise.all([
         verticalDiffManagerPromise,
         configHandlerPromise,

gui/src/components/StyledMarkdownPreview/StepContainerPreToolbar/index.tsx

@@ -150,7 +150,11 @@ export function StepContainerPreToolbar({
 
   async function onClickApply() {
     const fileUri = await getFileUriToApplyTo();
-    if (!fileUri) {
+
+    // Check if we're creating a new file (when fileExists is false or when we don't have a specific file)
+    const isCreatingNewFile = !fileExists && relativeFilepath;
+
+    if (!fileUri && !isCreatingNewFile) {
       void ideMessenger.ide.showToast(
         "error",
         "Could not resolve filepath to apply changes",
@@ -163,12 +167,15 @@ export function StepContainerPreToolbar({
       streamId: codeBlockStreamId,
       filepath: fileUri,
       text: codeBlockContent,
+      showSaveDialog: !!isCreatingNewFile,
+      toolCallId: forceToolCallId,
     });
 
-    setAppliedFileUri(fileUri);
-    void refreshFileExists();
+    if (fileUri) {
+      setAppliedFileUri(fileUri);
+      void refreshFileExists();
+    }
   }
-
   function onClickInsertAtCursor() {
     ideMessenger.post("insertAtCursor", { text: codeBlockContent });
   }