Merge pull request #10282 from Byron/next

V3 apply/unapply: safe checkout

Author: Byron

apps/desktop/cypress/e2e/support/mock/settings.ts

@@ -8,6 +8,7 @@ export const MOCK_TELEMETRY_SETINGS: TelemetrySettings = {
 };
 
 export const MOCK_FEATURE_FLAGS: FeatureFlags = {
+	cv3: false,
 	ws3: false,
 	actions: false,
 	butbot: false,

apps/desktop/src/lib/config/appSettingsV2.ts

@@ -158,6 +158,8 @@ export type TelemetrySettings = {
 };
 
 export type FeatureFlags = {
+	/** Enable everything next-gen checkout */
+	cv3: boolean;
 	/** Enable the usage of the V3 workspace API */
 	ws3: boolean;
 	/** Enable the usage of GitButler Acitions. */

apps/desktop/src/routes/+layout.svelte

@@ -124,6 +124,10 @@
 		'w s 3': () => {
 			settingsService.updateFeatureFlags({ ws3: !$settingsStore?.featureFlags.ws3 });
 		},
+		// Toggle next-gen safe checkout.
+		'c o 3': () => {
+			settingsService.updateFeatureFlags({ cv3: !$settingsStore?.featureFlags.cv3 });
+		},
 		// Show commit graph visualization
 		'd o t': async () => {
 			const projectId = page.params.projectId;

crates/but-claude/src/bridge.rs

@@ -342,7 +342,6 @@ async fn spawn_command(
             .mcp_servers_with_security()
             .exclude(&disabled_mcp_servers),
     )?;
-    dbg!(&mcp_config);
     let mut command = Command::new(claude_executable);
 
     /// Don't create a terminal window on windows.

crates/but-settings/assets/defaults.jsonc

@@ -18,8 +18,10 @@
 		"oauthClientId": "cd51880daa675d9e6452"
 	},
 	"featureFlags": {
-		// Enables the v3 design, as well as the purgatory mode (no uncommitted diff ownership assignments).
+		// Deprecated, was used for the new version of the UI.
 		"v3": false,
+		// Enables the v3 safe checkout.
+		"cv3": false,
 		/// Enable the usage of V3 workspace APIs.
 		"ws3": false,
 		/// Enable undo/redo support.

crates/but-settings/src/api.rs

@@ -15,6 +15,7 @@ pub struct TelemetryUpdate {
 #[serde(rename_all = "camelCase")]
 /// Update request for [`crate::app_settings::FeatureFlags`].
 pub struct FeatureFlagsUpdate {
+    pub cv3: Option<bool>,
     pub ws3: Option<bool>,
     pub actions: Option<bool>,
     pub butbot: Option<bool>,
@@ -65,6 +66,7 @@ impl AppSettingsWithDiskSync {
     pub fn update_feature_flags(
         &self,
         FeatureFlagsUpdate {
+            cv3,
             ws3,
             actions,
             butbot,
@@ -73,6 +75,9 @@ impl AppSettingsWithDiskSync {
         }: FeatureFlagsUpdate,
     ) -> Result<()> {
         let mut settings = self.get_mut_enforce_save()?;
+        if let Some(cv3) = cv3 {
+            settings.feature_flags.cv3 = cv3;
+        }
         if let Some(ws3) = ws3 {
             settings.feature_flags.ws3 = ws3;
         }

crates/but-settings/src/app_settings.rs

@@ -26,6 +26,8 @@ pub struct FeatureFlags {
     /// Enable the usage of V3 workspace APIs.
     #[serde(default = "default_true")]
     pub ws3: bool,
+    /// Turn on the set a v3 version of checkout
+    pub cv3: bool,
     /// Enable undo/redo support.
     ///
     /// ### Progression for implementation

crates/but-testing/src/args.rs

@@ -147,7 +147,7 @@ pub enum Subcommands {
     /// As StackIDs are going away, BranchDetails would be the part that remains.
     StackDetails {
         /// The ID of the stack to list details for.
-        id: StackId,
+        id: Option<StackId>,
     },
     /// Returns detailed
     BranchDetails {

crates/but-testing/src/command/mod.rs

@@ -196,15 +196,19 @@ pub mod stacks {
         }
     }
 
-    pub fn details(id: StackId, current_dir: &Path, v3: bool) -> anyhow::Result<()> {
+    pub fn details(id: Option<StackId>, current_dir: &Path, v3: bool) -> anyhow::Result<()> {
         let project = project_from_path(current_dir)?;
         let ctx = CommandContext::open(&project, AppSettings::default())?;
         let details = if v3 {
             let meta = ref_metadata_toml(ctx.project())?;
             let repo = ctx.gix_repo_for_merging_non_persisting()?;
-            but_workspace::stack_details_v3(id.into(), &repo, &meta)
+            but_workspace::stack_details_v3(id, &repo, &meta)
         } else {
-            but_workspace::stack_details(&project.gb_dir(), id, &ctx)
+            but_workspace::stack_details(
+                &project.gb_dir(),
+                id.context("a StackID is needed for the old implementation")?,
+                &ctx,
+            )
         }?;
         debug_print(details)
     }
@@ -334,6 +338,7 @@ pub mod stacks {
         let app_settings = AppSettings {
             feature_flags: but_settings::app_settings::FeatureFlags {
                 ws3,
+                cv3: false,
                 undo: false,
                 actions: false,
                 butbot: false,