[Patch agent] Preselect automatic workspace even if not connected

Bug: 399560823
Change-Id: Ie9ebc904cc49d0fd24cc6d3492ad948125be72f2
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6440431
Reviewed-by: Alex Rudenko <[email protected]>
Commit-Queue: Wolfgang Beyer <[email protected]>

Author: wolfib

config/gni/devtools_grd_files.gni

@@ -148,6 +148,8 @@ grd_files_release_sources = [
   "front_end/Images/flex-wrap.svg",
   "front_end/Images/flow.svg",
   "front_end/Images/fold-more.svg",
+  "front_end/Images/folder-asterisk.svg",
+  "front_end/Images/folder-off.svg",
   "front_end/Images/folder.svg",
   "front_end/Images/frame-crossed.svg",
   "front_end/Images/frame-icon.svg",

config/gni/devtools_image_files.gni

@@ -150,6 +150,8 @@ devtools_svg_sources = [
   "flex-wrap.svg",
   "flow.svg",
   "fold-more.svg",
+  "folder-asterisk.svg",
+  "folder-off.svg",
   "folder.svg",
   "frame-crossed.svg",
   "frame-icon.svg",

front_end/Images/src/folder-asterisk.svg

@@ -204,12 +204,12 @@ Files:
         },
       });
       const {view} = await createPatchWidget();
-      assert.isUndefined(view.input.projectName);
+      assert.strictEqual(view.input.projectName, '');
     });
 
     it('does not select a workspace project if setting does not exist', async () => {
       const {view} = await createPatchWidget();
-      assert.isUndefined(view.input.projectName);
+      assert.strictEqual(view.input.projectName, '');
     });
 
     it('selects a workspace project matching the setting', async () => {
@@ -225,7 +225,7 @@ Files:
 
       Workspace.Workspace.WorkspaceImpl.instance().removeProject(project);
       const input = await view.nextInput;
-      assert.isUndefined(input.projectName);
+      assert.strictEqual(input.projectName, '');
     });
 
     it('selection is triggered by applyToWorkspace click if no workspace is (pre-)selected', async () => {
@@ -237,7 +237,7 @@ Files:
       const {view, widget} =
           await createPatchWidget({aidaClient: mockAidaClient([[{explanation: 'suggested patch'}]])});
       widget.changeSummary = 'body { background-color: red; }';
-      assert.isUndefined(view.input.projectName);
+      assert.strictEqual(view.input.projectName, '');
 
       // Simulate clicking the "Apply to workspace" button
       view.input.onApplyToWorkspace();

front_end/Images/src/folder-off.svg

@@ -144,14 +144,34 @@ export enum PatchSuggestionState {
   ERROR = 'error',
 }
 
+enum SelectedProjectType {
+  /**
+   * No project selected
+   */
+  NONE = 'none',
+  /**
+   * The selected project is not an automatic workspace project
+   */
+  REGULAR = 'regular',
+  /**
+   * The selected project is a disconnected automatic workspace project
+   */
+  AUTOMATIC_DISCONNECTED = 'automaticDisconncted',
+  /**
+   * The selected project is a connected automatic workspace project
+   */
+  AUTOMATIC_CONNECTED = 'automaticConnected',
+}
+
 export interface ViewInput {
   workspaceDiff: WorkspaceDiff.WorkspaceDiff.WorkspaceDiffImpl;
   patchSuggestionState: PatchSuggestionState;
   changeSummary?: string;
   sources?: string;
-  projectName?: string;
-  savedToDisk?: boolean;
+  projectName: string;
   projectPath: Platform.DevToolsPath.RawPathString;
+  projectType: SelectedProjectType;
+  savedToDisk?: boolean;
   applyToWorkspaceTooltipText: Platform.UIString.LocalizedString;
   onLearnMoreTooltipClick: () => void;
   onApplyToWorkspace: () => void;
@@ -318,12 +338,13 @@ export class PatchWidget extends UI.Widget.Widget {
           `;
         }
 
+        const iconName = input.projectType === SelectedProjectType.AUTOMATIC_DISCONNECTED ? 'folder-off' : input.projectType === SelectedProjectType.AUTOMATIC_CONNECTED ? 'folder-asterisk' : 'folder';
         return html`
         <div class="footer">
           ${input.projectName ? html`
             <div class="change-workspace">
               <div class="selected-folder">
-                <devtools-icon .name=${'folder'}></devtools-icon> <span class="folder-name" title=${input.projectPath}>${input.projectName}</span>
+                <devtools-icon .name=${iconName}></devtools-icon> <span class="folder-name" title=${input.projectPath}>${input.projectName}</span>
               </div>
               ${input.onChangeWorkspaceClick ? html`
                 <devtools-button
@@ -346,7 +367,7 @@ export class PatchWidget extends UI.Widget.Widget {
                 </span>
               </div>
             ` : html`
-              <devtools-button
+                <devtools-button
                 @click=${input.onApplyToWorkspace}
                 .jslogContext=${'stage-to-workspace'}
                 .variant=${Buttons.Button.Variant.OUTLINED}>
@@ -412,22 +433,48 @@ export class PatchWidget extends UI.Widget.Widget {
     void UI.ViewManager.ViewManager.instance().showView('chrome-ai');
   }
 
-  override performUpdate(): void {
-    const projectName = this.#project ? Common.ParsedURL.ParsedURL.encodedPathToRawPathString(
-                                            this.#project.displayName() as Platform.DevToolsPath.EncodedPathString) :
-                                        undefined;
-    const projectPath = this.#project ?
-        Common.ParsedURL.ParsedURL.urlToRawPathString(
-            this.#project.id() as Platform.DevToolsPath.UrlString, Host.Platform.isWin()) :
-        Platform.DevToolsPath.EmptyRawPathString;
+  #getDisplayedProject(): {projectName: string, projectPath: Platform.DevToolsPath.RawPathString} {
+    if (this.#project) {
+      return {
+        projectName: Common.ParsedURL.ParsedURL.encodedPathToRawPathString(
+            this.#project.displayName() as Platform.DevToolsPath.EncodedPathString),
+        projectPath: Common.ParsedURL.ParsedURL.urlToRawPathString(
+            this.#project.id() as Platform.DevToolsPath.UrlString, Host.Platform.isWin()),
+      };
+    }
+    if (this.#automaticFileSystem) {
+      return {
+        projectName: Common.ParsedURL.ParsedURL.extractName(this.#automaticFileSystem.root),
+        projectPath: this.#automaticFileSystem.root,
+      };
+    }
+    return {
+      projectName: '',
+      projectPath: Platform.DevToolsPath.EmptyRawPathString,
+    };
+  }
+
+  #shouldShowChangeButton(): boolean {
     const automaticFileSystemProject =
         this.#automaticFileSystem ? this.#workspace.projectForFileSystemRoot(this.#automaticFileSystem.root) : null;
-    const projects = this.#workspace.projectsForType(Workspace.Workspace.projectTypes.FileSystem)
-                         .filter(
-                             project => project instanceof Persistence.FileSystemWorkspaceBinding.FileSystem &&
-                                 project.fileSystem().type() ===
-                                     Persistence.PlatformFileSystem.PlatformFileSystemType.WORKSPACE_PROJECT);
-    const showChangeButton = projects.length > 1 || this.#project !== automaticFileSystemProject;
+    const regularProjects = this.#workspace.projectsForType(Workspace.Workspace.projectTypes.FileSystem)
+                                .filter(
+                                    project => project instanceof Persistence.FileSystemWorkspaceBinding.FileSystem &&
+                                        project.fileSystem().type() ===
+                                            Persistence.PlatformFileSystem.PlatformFileSystemType.WORKSPACE_PROJECT)
+                                .filter(project => project !== automaticFileSystemProject);
+    return regularProjects.length > 0;
+  }
+
+  #getSelectedProjectType(projectPath: Platform.DevToolsPath.RawPathString): SelectedProjectType {
+    if (this.#automaticFileSystem && this.#automaticFileSystem.root === projectPath) {
+      return this.#project ? SelectedProjectType.AUTOMATIC_CONNECTED : SelectedProjectType.AUTOMATIC_DISCONNECTED;
+    }
+    return this.#project ? SelectedProjectType.NONE : SelectedProjectType.REGULAR;
+  }
+
+  override performUpdate(): void {
+    const {projectName, projectPath} = this.#getDisplayedProject();
 
     this.#view(
         {
@@ -437,6 +484,7 @@ export class PatchWidget extends UI.Widget.Widget {
           sources: this.#patchSources,
           projectName,
           projectPath,
+          projectType: this.#getSelectedProjectType(projectPath),
           savedToDisk: this.#savedToDisk,
           applyToWorkspaceTooltipText: this.#noLogging ?
               lockedString(UIStringsNotTranslate.applyToWorkspaceTooltipNoLogging) :
@@ -448,8 +496,9 @@ export class PatchWidget extends UI.Widget.Widget {
           },
           onDiscard: this.#onDiscard.bind(this),
           onSaveAll: this.#onSaveAll.bind(this),
-          onChangeWorkspaceClick: showChangeButton ? this.#showSelectWorkspaceDialog.bind(this, {applyPatch: false}) :
-                                                     undefined,
+          onChangeWorkspaceClick: this.#shouldShowChangeButton() ?
+              this.#showSelectWorkspaceDialog.bind(this, {applyPatch: false}) :
+              undefined,
         },
         this.#viewOutput, this.contentElement);
   }
@@ -459,6 +508,7 @@ export class PatchWidget extends UI.Widget.Widget {
     this.#selectDefaultProject();
 
     if (isAiAssistancePatchingEnabled()) {
+      this.#workspace.addEventListener(Workspace.Workspace.Events.ProjectAdded, this.#onProjectAdded, this);
       this.#workspace.addEventListener(Workspace.Workspace.Events.ProjectRemoved, this.#onProjectRemoved, this);
 
       // @ts-expect-error temporary global function for local testing.
@@ -470,6 +520,7 @@ export class PatchWidget extends UI.Widget.Widget {
 
   override willHide(): void {
     if (isAiAssistancePatchingEnabled()) {
+      this.#workspace.removeEventListener(Workspace.Workspace.Events.ProjectAdded, this.#onProjectAdded, this);
       this.#workspace.removeEventListener(Workspace.Workspace.Events.ProjectRemoved, this.#onProjectRemoved, this);
     }
   }
@@ -531,6 +582,12 @@ export class PatchWidget extends UI.Widget.Widget {
     this.requestUpdate();
   }
 
+  #onProjectAdded(): void {
+    if (this.#project === undefined) {
+      this.#selectDefaultProject();
+    }
+  }
+
   #onProjectRemoved(): void {
     if (this.#project && !this.#workspace.project(this.#project.id())) {
       this.#projectIdSetting.set('');

front_end/panels/ai_assistance/PatchWidget.test.ts

@@ -17,6 +17,9 @@ export const knownContextValues = new Set([
   '-epub-word-break',
   '-epub-writing-mode',
   '-moz-box-direction',
+  'automatic-workspace-folders',
+  'connect-workspace',
+  'stage-to-workspace',
   '-moz-box-orient',
   '-moz-box-sizing',
   '-moz-osx-font-smoothing',