Merge branch 'upstream-development'

Author: pol-rivero

app/src/lib/feature-flag.ts

@@ -103,19 +103,14 @@ export const enableCommitMessageGeneration = (account: Account) => {
 }
 
 export const enableCopilotSdkCommitMessageGeneration = (account: Account) => {
-  return enableBetaFeatures()
-  // IMPORTANT: Leaving this here for now. When the feature is enabled in prod,
-  // we will rely on the `desktop_enable_copilot_sdk_commit_message_generation`
-  // feature flag to control the rollout, but we want to be able to enable it in
-  // beta and other non-production builds regardless of the feature flag.
-  // Remember to also update build.ts to get Copilot bundled in the production
-  // build when this happens.
-  // return (
-  //   enableBetaFeatures() &&
-  //   (account.features ?? []).includes(
-  //     'desktop_enable_copilot_sdk_commit_message_generation'
-  //   )
-  // )
+  // Enabled for all users in beta and development channels, and for users with
+  // the feature flag enabled in production.
+  return (
+    enableBetaFeatures() ||
+    (account.features ?? []).includes(
+      'desktop_enable_copilot_sdk_commit_message_generation'
+    )
+  )
 }
 
 /** Should we enable Copilot-powered merge conflict resolution? */

app/src/lib/stores/app-store.ts

@@ -242,6 +242,7 @@ import {
   listWorktrees,
   getMainWorktreePath,
   removeWorktree,
+  moveWorktree,
   getCommitRangeDiff,
   getCommitRangeChangedFiles,
   updateRemoteHEAD,
@@ -257,7 +258,6 @@ import {
   IConfigValueOrigin,
   unstageAll,
   git,
-  moveWorktree,
 } from '../git'
 import {
   installGlobalLFSFilters,
@@ -3140,13 +3140,30 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.updateMenuLabelsForSelectedRepository()
   }
 
+  /**
+   * Determine whether the worktree dropdown is currently shown in the toolbar.
+   *
+   * This mirrors the render condition in `App.renderWorktreeToolbarButton`: the
+   * dropdown is shown when worktree support is enabled and either the selected
+   * repository has at least one linked worktree (i.e. more than just the main
+   * worktree) or the worktree foldout is currently open (which lets the user
+   * create their first worktree from the toolbar).
+   */
   private isWorktreeDropdownVisible(): boolean {
+    if (!enableWorktreeSupport() || !this.showWorktrees) {
+      return false
+    }
+
+    if (this.currentFoldout?.type === FoldoutType.Worktree) {
+      return true
+    }
+
     const repository = this.selectedRepository
     const worktreeCount =
       repository instanceof Repository
         ? this.repositoryStateCache.get(repository).worktrees.length
         : 0
-    return enableWorktreeSupport() && this.showWorktrees && worktreeCount > 1
+    return worktreeCount > 1
   }
 
   /**
@@ -3206,8 +3223,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.stashedFilesWidth = constrain(this.stashedFilesWidth, 100, filesMax)
 
     // Allocate worktree first (highest priority), then branch, then
-    // push-pull. Each subsequent allocation uses the clamped value of the
-    // previous to prevent the total from exceeding the available space.
+    // push-pull. The foldouts are laid out in this order, so the width
+    // constraints should follow the same order. Each subsequent allocation
+    // uses the clamped value of the previous to prevent the total from
+    // exceeding the available space.
     const worktreeDropdownMax =
       available - defaultBranchDropdownWidth - defaultPushPullButtonWidth
     this.worktreeDropdownWidth = constrain(
@@ -5081,6 +5100,14 @@ export class AppStore extends TypedBaseStore<IAppState> {
   /** This shouldn't be called directly. See `Dispatcher`. */
   public async _showFoldout(foldout: Foldout): Promise<void> {
     this.currentFoldout = foldout
+
+    // Showing the worktree foldout makes the worktree dropdown visible even
+    // when there are no linked worktrees, so the toolbar width allocation has
+    // to be recalculated to reserve space for it.
+    if (foldout.type === FoldoutType.Worktree) {
+      this.updateResizableConstraints()
+    }
+
     this.emitUpdate()
 
     // If the user is opening the repository list and we haven't yet
@@ -5101,7 +5128,14 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return
     }
 
+    const wasWorktreeFoldout = this.currentFoldout.type === FoldoutType.Worktree
+
     this.currentFoldout = null
+
+    if (wasWorktreeFoldout) {
+      this.updateResizableConstraints()
+    }
+
     this.emitUpdate()
   }
 
@@ -5115,7 +5149,14 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return
     }
 
+    const wasWorktreeFoldout = this.currentFoldout.type === FoldoutType.Worktree
+
     this.currentFoldout = null
+
+    if (wasWorktreeFoldout) {
+      this.updateResizableConstraints()
+    }
+
     this.emitUpdate()
   }
 
@@ -6999,6 +7040,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
         throw new Error('Could not find main worktree')
       }
 
+      // Switch to the main worktree before deleting the current one since the
+      // current worktree path will be deleted after the switch. Use the
+      // resulting repository (with the updated path) for the subsequent
+      // remove and refresh calls.
       repository = await this._switchWorktree(repository, main)
     }
 
@@ -7014,23 +7059,41 @@ export class AppStore extends TypedBaseStore<IAppState> {
         error: e,
         originalWorktree,
       })
+      return
     }
 
     await this._refreshWorktrees(repository)
     this.statsStore.increment('worktreeDeletedCount')
   }
 
+  /** This shouldn't be called directly. See 'Dispatcher'. */
   public async _moveWorktree(
     repository: Repository,
     worktreePath: string,
     newPath: string
   ): Promise<void> {
     await moveWorktree(repository, worktreePath, newPath)
-    const result = await this.repositoriesStore.switchWorktree(
-      repository,
-      newPath
-    )
-    await this._refreshWorktrees(result.repository)
+
+    // If the worktree being renamed is the currently selected one, switch to
+    // its new path so that the subsequent refresh (and any further git calls)
+    // operate on the renamed directory rather than the now non-existing one.
+    if (repository.path === worktreePath) {
+      const result = await this.repositoriesStore.switchWorktree(
+        repository,
+        newPath
+      )
+
+      // Renaming changes the repository's path and therefore its hash, which
+      // is the key used by the state cache. Carry the existing state over to
+      // the new identity so we don't reset the UI (e.g. a typed commit
+      // message) just because the worktree was renamed.
+      this.repositoryStateCache.transferState(repository, result.repository)
+
+      await this._selectRepository(result.repository)
+      await this._refreshWorktrees(result.repository)
+    } else {
+      await this._refreshWorktrees(repository)
+    }
   }
 
   public _setWorktreeDropdownWidth(width: number): Promise<void> {

app/src/lib/stores/repository-state-cache.ts

@@ -285,6 +285,29 @@ export class RepositoryStateCache {
     })
   }
 
+  /**
+   * Move the entire cached state for a repository from one identity to another.
+   *
+   * This is used when a worktree is renamed: the repository's path (and
+   * therefore its hash) changes, but it still refers to the same working
+   * directory, so all of the existing in-memory state (working directory
+   * changes, commit message, history, etc.) should be carried over to the new
+   * identity rather than reset to its initial values.
+   */
+  public transferState(source: Repository, target: Repository) {
+    if (source.hash === target.hash) {
+      return
+    }
+
+    const sourceState = this.repositoryState.get(source.hash)
+    if (sourceState === undefined) {
+      return
+    }
+
+    this.repositoryState.set(target.hash, sourceState)
+    this.repositoryState.delete(source.hash)
+  }
+
   private sendPullRequestStateNotExistsException() {
     sendNonFatalException(
       'PullRequestState',

app/src/ui/dispatcher/dispatcher.ts

@@ -1181,6 +1181,28 @@ export class Dispatcher {
       .catch(e => this.postError(e))
   }
 
+  /**
+   * Rename (move) a worktree to a new path and keep the worktree list in sync.
+   * If the worktree being renamed is the currently selected one, the repository
+   * is switched to its new path.
+   *
+   * Returns a value indicating whether the rename succeeded. On failure the
+   * error is surfaced to the user via `postError`.
+   */
+  public async moveWorktree(
+    repository: Repository,
+    worktreePath: string,
+    newPath: string
+  ): Promise<boolean> {
+    return this.appStore
+      ._moveWorktree(repository, worktreePath, newPath)
+      .then(() => true)
+      .catch(e => {
+        this.postError(e)
+        return false
+      })
+  }
+
   /**
    * Delete a worktree. If the worktree being deleted is the currently selected
    * one, the repository is switched to the main worktree first.
@@ -1195,16 +1217,6 @@ export class Dispatcher {
       .catch(e => this.postError(e))
   }
 
-  public async moveWorktree(
-    repository: Repository,
-    worktreePath: string,
-    newPath: string
-  ): Promise<void> {
-    await this.appStore
-      ._moveWorktree(repository, worktreePath, newPath)
-      .catch(e => this.postError(e))
-  }
-
   /**
    * Request deletion of a worktree, showing a confirmation dialog if the
    * user's preferences require it.

app/src/ui/preferences/preferences.tsx

@@ -426,8 +426,8 @@ export class Preferences extends React.Component<
         onDismissed={this.onCancel}
         onSubmit={this.onSave}
       >
+        {this.renderDisallowedCharactersError()}
         <div className="preferences-container">
-          {this.renderDisallowedCharactersError()}
           <TabBar
             onTabClicked={this.onTabClicked}
             selectedIndex={this.tabToVisualIndex(this.state.selectedIndex)}

app/src/ui/worktrees/rename-worktree-dialog.tsx

@@ -43,17 +43,17 @@ export class RenameWorktreeDialog extends React.Component<
 
     this.setState({ renaming: true })
 
-    try {
-      await this.props.dispatcher.moveWorktree(
-        repository,
-        worktreePath,
-        newPath
-      )
-    } finally {
-      this.setState({ renaming: false })
-    }
+    const success = await this.props.dispatcher.moveWorktree(
+      repository,
+      worktreePath,
+      newPath
+    )
 
-    onDismissed()
+    this.setState({ renaming: false })
+
+    if (success) {
+      onDismissed()
+    }
   }
 
   public render() {

app/styles/ui/_worktrees.scss

@@ -71,7 +71,7 @@
 }
 
 #add-worktree {
-  width: 450px;
+  width: 500px;
 
   .autocompletion-popup {
     width: 350px;