Add feature toggle for single-branch mode

Author: mtsgrd

apps/desktop/src/components/profileSettings/ExperimentalSettings.svelte

@@ -70,6 +70,25 @@
 		{/snippet}
 	</SectionCard>
 
+	<SectionCard labelFor="single-branch" roundedTop={false} orientation="row">
+		{#snippet title()}
+			Single-branch mode
+		{/snippet}
+		{#snippet caption()}
+			Stay in the workspace view when leaving the gitbutler/workspace branch.
+		{/snippet}
+		{#snippet actions()}
+			<Toggle
+				id="rules"
+				checked={$settingsStore?.featureFlags.singleBranch}
+				onclick={() =>
+					settingsService.updateFeatureFlags({
+						singleBranch: !$settingsStore?.featureFlags.singleBranch
+					})}
+			/>
+		{/snippet}
+	</SectionCard>
+
 	{#if $user?.role === 'admin'}
 		<Spacer margin={20} />
 		{#if $settingsStore?.featureFlags.actions}

apps/desktop/src/lib/codegen/messages.ts

@@ -76,8 +76,11 @@ export function formatMessages(events: ClaudeMessage[]): Message[] {
 				if (Array.isArray(content) && content[0]!.type === 'tool_result') {
 					const result = content[0]!;
 					const foundToolCall = toolCalls[result.tool_use_id];
-					if (!foundToolCall || !result.content) throw new Error("Ahh! I can't handle this");
-					if (typeof result.content === 'string') {
+					if (!foundToolCall) {
+						return [];
+					} else if (!result.content) {
+						foundToolCall.result = undefined;
+					} else if (typeof result.content === 'string') {
 						foundToolCall.result = result.content;
 					} else if (result.content[0]!.type === 'text') {
 						foundToolCall.result = result.content[0]!.text;

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

@@ -123,6 +123,8 @@ export type FeatureFlags = {
 	butbot: boolean;
 	/** Enable processing of workspace rules. */
 	rules: boolean;
+	/** Enable single-branch mode. */
+	singleBranch: boolean;
 };
 
 export type Fetch = {

crates/but-settings/assets/defaults.jsonc

@@ -29,7 +29,9 @@
 		/// Enable the usage of the butbot chat.
 		"butbot": false,
 		/// Enable processing of workspace rules.
-		"rules": false
+		"rules": false,
+		/// Enable single branch mode.
+		"singleBranch": false
 	},
 	// Allows for additional "connect-src" hosts to be included. Requires app restart.
 	"extraCsp": {

crates/but-settings/src/api.rs

@@ -19,6 +19,7 @@ pub struct FeatureFlagsUpdate {
     pub actions: Option<bool>,
     pub butbot: Option<bool>,
     pub rules: Option<bool>,
+    pub single_branch: Option<bool>,
 }
 
 /// Mutation, immediately followed by writing everything to disk.
@@ -56,6 +57,7 @@ impl AppSettingsWithDiskSync {
             actions,
             butbot,
             rules,
+            single_branch,
         }: FeatureFlagsUpdate,
     ) -> Result<()> {
         let mut settings = self.get_mut_enforce_save()?;
@@ -71,6 +73,9 @@ impl AppSettingsWithDiskSync {
         if let Some(rules) = rules {
             settings.feature_flags.rules = rules;
         }
+        if let Some(single_branch) = single_branch {
+            settings.feature_flags.single_branch = single_branch;
+        }
         settings.save()
     }
 }

crates/but-settings/src/app_settings.rs

@@ -47,6 +47,8 @@ pub struct FeatureFlags {
     pub butbot: bool,
     /// Enable processing of workspace rules.
     pub rules: bool,
+    /// Enable single branch mode.
+    pub single_branch: bool,
 }
 
 fn default_true() -> bool {

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

@@ -347,6 +347,7 @@ pub mod stacks {
                 actions: false,
                 butbot: false,
                 rules: false,
+                single_branch: false,
             },
             ..AppSettings::default()
         };

crates/but/src/mcp_internal/stack.rs

@@ -36,6 +36,7 @@ pub fn create_stack_with_branch(
             actions: false,
             butbot: false,
             rules: false,
+            single_branch: false,
         },
         ..AppSettings::load_from_default_path_creating()?
     };

crates/but/src/mcp_internal/status.rs

@@ -16,6 +16,7 @@ pub fn project_status(project_dir: &Path) -> anyhow::Result<but_tools::workspace
             actions: false,
             butbot: false,
             rules: false,
+            single_branch: false,
         },
         ..AppSettings::load_from_default_path_creating()?
     };