feat(conversation): Group settings into General, Tools, and Reasoning; support reasoning in edit block

- Add General group (max tokens, temperature, top P, stream mode)
- Add Tools group (web search) before General
- Add Reasoning group (mode, adaptive, budget, effort, show blocks)
- Hide groups when model/engine does not support them
- Edit block: load/save reasoning and content via format_response_for_display
  and split_reasoning_and_content_from_display
- Edit block: refresh response when "Show reasoning blocks" checkbox changes

Author: AAClause

basilisk/conversation/content_utils.py

@@ -8,6 +8,10 @@
 END_REASONING = "</think>"
 
 _THINK_BLOCK_PATTERN = re.compile(r"```think\s*\n(.*?)\n```\s*", re.DOTALL)
+_REASONING_BLOCK_PATTERN = re.compile(
+	rf"{re.escape(START_BLOCK_REASONING)}\s*\n(.*?)\n{re.escape(END_REASONING)}\s*",
+	re.DOTALL,
+)
 
 
 def split_reasoning_and_content(text: str) -> tuple[str | None, str]:
@@ -30,3 +34,36 @@ def split_reasoning_and_content(text: str) -> tuple[str | None, str]:
 	reasoning = match.group(1).strip()
 	content = (_THINK_BLOCK_PATTERN.sub("", text) or "").strip()
 	return reasoning or None, content
+
+
+def format_response_for_display(
+	reasoning: str | None, content: str, show_reasoning: bool
+) -> str:
+	"""Format response for display (reasoning + content or content only)."""
+	if show_reasoning and reasoning:
+		return f"{START_BLOCK_REASONING}\n{reasoning}\n{END_REASONING}\n\n{content}"
+	return content
+
+
+def split_reasoning_and_content_from_display(
+	text: str,
+) -> tuple[str | None, str]:
+	"""Split display text (<think>...</think> format) into reasoning and content.
+
+	Used when parsing user-edited response text (e.g. in edit block dialog).
+
+	Args:
+		text: Display text that may contain <think>...</think> block.
+
+	Returns:
+		Tuple of (reasoning, content). If no block, returns (None, text).
+	"""
+	if not text:
+		return None, text or ""
+	# Try <think> format first, then legacy ```think
+	match = _REASONING_BLOCK_PATTERN.search(text)
+	if not match:
+		return split_reasoning_and_content(text)
+	reasoning = match.group(1).strip()
+	content = (_REASONING_BLOCK_PATTERN.sub("", text) or "").strip()
+	return reasoning or None, content

basilisk/presenters/edit_block_presenter.py

@@ -13,6 +13,10 @@
 
 import basilisk.config as config
 from basilisk.completion_handler import CompletionHandler
+from basilisk.conversation.content_utils import (
+	format_response_for_display,
+	split_reasoning_and_content_from_display,
+)
 from basilisk.conversation.conversation_model import (
 	Conversation,
 	Message,
@@ -204,7 +208,11 @@ def save_block(self) -> bool:
 
 		# Update response if present
 		if self.block.response:
-			self.block.response.content = self.view.response_txt.GetValue()
+			text = self.view.response_txt.GetValue()
+			reasoning, content = split_reasoning_and_content_from_display(text)
+			self.block.response = self.block.response.model_copy(
+				update={"reasoning": reasoning, "content": content}
+			)
 
 		self.block.updated_at = datetime.now()
 		if self.service is not None:
@@ -266,7 +274,12 @@ def _on_non_stream_finish(
 			system_message: Optional system message used for this completion.
 		"""
 		self.block.response = new_block.response
-		self.view.response_txt.SetValue(new_block.response.content)
+		reasoning = getattr(new_block.response, "reasoning", None)
+		content = new_block.response.content
+		display = format_response_for_display(
+			reasoning, content, self.view.get_effective_show_reasoning_blocks()
+		)
+		self.view.response_txt.SetValue(display)
 		audio_data = getattr(new_block.response, "audio_data", None)
 		if audio_data:
 			from basilisk.audio_utils import play_audio_from_base64

basilisk/views/base_conversation.py

@@ -447,12 +447,77 @@ def create_stream_widget(self):
 		)
 		self.stream_mode.SetValue(True)
 
+	def create_general_group(self):
+		"""Create grouped general settings (max tokens, temperature, top P, stream, web search).
+
+		Returns a StaticBoxSizer containing all general widgets. Add to layout
+		after model list. Visibility controlled by update_parameter_controls_visibility.
+		"""
+		# Translators: Group label for general model settings
+		box = wx.StaticBox(self, label=_("General"))
+		sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
+		self.create_max_tokens_widget()
+		sizer.Add(self.max_tokens_spin_label, 0, wx.ALL, 2)
+		sizer.Add(self.max_tokens_spin_ctrl, 0, wx.ALL | wx.EXPAND, 2)
+		self.create_temperature_widget()
+		sizer.Add(self.temperature_spinner_label, 0, wx.ALL, 2)
+		sizer.Add(self.temperature_spinner, 0, wx.ALL | wx.EXPAND, 2)
+		self.create_top_p_widget()
+		sizer.Add(self.top_p_spinner_label, 0, wx.ALL, 2)
+		sizer.Add(self.top_p_spinner, 0, wx.ALL | wx.EXPAND, 2)
+		self.create_stream_widget()
+		sizer.Add(self.stream_mode, 0, wx.ALL, 2)
+
+		self.general_group_box = box
+		self.general_group_sizer = sizer
+		return sizer
+
+	def create_tools_group(self):
+		"""Create grouped tool settings (web search, etc.).
+
+		Returns a StaticBoxSizer containing tool widgets. Add to layout after
+		general group. Visibility controlled by update_parameter_controls_visibility.
+		"""
+		# Translators: Group label for model tools (web search, etc.)
+		box = wx.StaticBox(self, label=_("Tools"))
+		sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
+		self.create_web_search_widget()
+		sizer.Add(self.web_search_mode, 0, wx.ALL, 2)
+
+		self.tools_group_box = box
+		self.tools_group_sizer = sizer
+		return sizer
+
 	def get_effective_show_reasoning_blocks(self) -> bool:
 		"""Effective value: per-tab override if set, else default from config."""
 		if self._show_reasoning_blocks_override is not None:
 			return self._show_reasoning_blocks_override
 		return config.conf().conversation.show_reasoning_blocks
 
+	def create_reasoning_group(self):
+		"""Create grouped reasoning settings (mode, adaptive, budget, effort, display).
+
+		Returns a StaticBoxSizer containing all reasoning widgets. Add to
+		layout after model list. Visibility of sub-widgets controlled by
+		update_parameter_controls_visibility; show_reasoning_blocks is always visible.
+		"""
+		# Translators: Group label for reasoning/thinking settings
+		box = wx.StaticBox(self, label=_("Reasoning"))
+		sizer = wx.StaticBoxSizer(box, wx.VERTICAL)
+		self.create_reasoning_widget()
+		sizer.Add(self.reasoning_mode, 0, wx.ALL, 2)
+		sizer.Add(self.reasoning_adaptive, 0, wx.ALL, 2)
+		sizer.Add(self.reasoning_budget_label, 0, wx.ALL, 2)
+		sizer.Add(self.reasoning_budget_spin, 0, wx.ALL | wx.EXPAND, 2)
+		sizer.Add(self.reasoning_effort_label, 0, wx.ALL, 2)
+		sizer.Add(self.reasoning_effort_choice, 0, wx.ALL | wx.EXPAND, 2)
+		self.create_show_reasoning_blocks_widget()
+		sizer.Add(self.show_reasoning_blocks, 0, wx.ALL, 2)
+
+		self.reasoning_group_box = box
+		self.reasoning_group_sizer = sizer
+		return sizer
+
 	def create_show_reasoning_blocks_widget(self):
 		"""Create checkbox to show/hide reasoning (think) blocks in responses.
 
@@ -678,6 +743,20 @@ def _apply_parameter_visibility_state(
 		self, state: ParameterVisibilityState
 	) -> None:
 		"""Apply visibility state to widgets. Thin view layer."""
+		self._apply_general_visibility(state)
+		self._apply_audio_visibility(state)
+		self._apply_tools_visibility(state)
+		self._apply_reasoning_visibility(state)
+
+	def _apply_general_visibility(
+		self, state: ParameterVisibilityState
+	) -> None:
+		"""Apply general settings group visibility.
+
+		Hides the entire group when no model is selected or advanced mode is off.
+		"""
+		if hasattr(self, "general_group_box"):
+			self.general_group_box.Show(state.stream_visible)
 		for ctrl in (self.temperature_spinner_label, self.temperature_spinner):
 			ctrl.Enable(state.temperature_visible)
 			ctrl.Show(state.temperature_visible)
@@ -690,10 +769,6 @@ def _apply_parameter_visibility_state(
 		self.stream_mode.Enable(state.stream_visible)
 		self.stream_mode.Show(state.stream_visible)
 
-		self._apply_audio_visibility(state)
-		self._apply_web_search_visibility(state)
-		self._apply_reasoning_visibility(state)
-
 	def _apply_audio_visibility(self, state: ParameterVisibilityState) -> None:
 		"""Apply audio output visibility state."""
 		if not hasattr(self, "audio_output_group_box"):
@@ -715,18 +790,24 @@ def _apply_audio_visibility(self, state: ParameterVisibilityState) -> None:
 			idx = voices.index(old_val) if old_val in voices else 0
 			self.audio_voice_choice.SetSelection(idx)
 
-	def _apply_web_search_visibility(
-		self, state: ParameterVisibilityState
-	) -> None:
-		"""Apply web search visibility state."""
+	def _apply_tools_visibility(self, state: ParameterVisibilityState) -> None:
+		"""Apply tools group visibility (web search, etc.)."""
+		if hasattr(self, "tools_group_box"):
+			self.tools_group_box.Show(state.web_search_visible)
 		if hasattr(self, "web_search_mode"):
 			self.web_search_mode.Enable(state.web_search_visible)
 			self.web_search_mode.Show(state.web_search_visible)
 
 	def _apply_reasoning_visibility(
 		self, state: ParameterVisibilityState
 	) -> None:
-		"""Apply reasoning controls visibility state."""
+		"""Apply reasoning controls visibility state.
+
+		Hides the entire reasoning group when no model is selected or the
+		model does not support reasoning (e.g. web search models).
+		"""
+		if hasattr(self, "reasoning_group_box"):
+			self.reasoning_group_box.Show(state.reasoning_mode_visible)
 		if not hasattr(self, "reasoning_mode"):
 			return
 		self.reasoning_mode.Enable(state.reasoning_mode_visible)

basilisk/views/conversation_tab.py

@@ -279,28 +279,12 @@ def init_ui(self):
 		sizer.Add(self.model_list, proportion=0, flag=wx.ALL | wx.EXPAND)
 		self.create_audio_output_group()
 		sizer.Add(self.audio_output_group_sizer, proportion=0, flag=wx.EXPAND)
-		self.create_reasoning_widget()
-		sizer.Add(self.reasoning_mode, proportion=0, flag=wx.EXPAND)
-		sizer.Add(self.reasoning_adaptive, proportion=0, flag=wx.EXPAND)
-		sizer.Add(self.reasoning_budget_label, proportion=0, flag=wx.EXPAND)
-		sizer.Add(self.reasoning_budget_spin, proportion=0, flag=wx.EXPAND)
-		sizer.Add(self.reasoning_effort_label, proportion=0, flag=wx.EXPAND)
-		sizer.Add(self.reasoning_effort_choice, proportion=0, flag=wx.EXPAND)
-		self.create_web_search_widget()
-		sizer.Add(self.web_search_mode, proportion=0, flag=wx.EXPAND)
-		self.create_max_tokens_widget()
-		sizer.Add(self.max_tokens_spin_label, proportion=0, flag=wx.EXPAND)
-		sizer.Add(self.max_tokens_spin_ctrl, proportion=0, flag=wx.EXPAND)
-		self.create_temperature_widget()
-		sizer.Add(self.temperature_spinner_label, proportion=0, flag=wx.EXPAND)
-		sizer.Add(self.temperature_spinner, proportion=0, flag=wx.EXPAND)
-		self.create_top_p_widget()
-		sizer.Add(self.top_p_spinner_label, proportion=0, flag=wx.EXPAND)
-		sizer.Add(self.top_p_spinner, proportion=0, flag=wx.EXPAND)
-		self.create_stream_widget()
-		sizer.Add(self.stream_mode, proportion=0, flag=wx.EXPAND)
-		self.create_show_reasoning_blocks_widget()
-		sizer.Add(self.show_reasoning_blocks, proportion=0, flag=wx.EXPAND)
+		self.create_reasoning_group()
+		sizer.Add(self.reasoning_group_sizer, proportion=0, flag=wx.EXPAND)
+		self.create_tools_group()
+		sizer.Add(self.tools_group_sizer, proportion=0, flag=wx.EXPAND)
+		self.create_general_group()
+		sizer.Add(self.general_group_sizer, proportion=0, flag=wx.EXPAND)
 
 		btn_sizer = wx.BoxSizer(wx.HORIZONTAL)
 

basilisk/views/edit_block_dialog.py

@@ -13,6 +13,7 @@
 import wx
 
 import basilisk.config as config
+from basilisk.conversation.content_utils import format_response_for_display
 from basilisk.conversation.conversation_model import Conversation, SystemMessage
 from basilisk.presenters.edit_block_presenter import EditBlockPresenter
 
@@ -173,83 +174,23 @@ def init_ui(self):
 			border=10,
 		)
 
-		params_sizer = wx.BoxSizer(wx.HORIZONTAL)
-
-		self.create_temperature_widget()
-		temp_sizer = wx.BoxSizer(wx.VERTICAL)
-		temp_sizer.Add(
-			self.temperature_spinner_label, proportion=0, flag=wx.EXPAND
-		)
-		temp_sizer.Add(self.temperature_spinner, proportion=0, flag=wx.EXPAND)
-		params_sizer.Add(
-			temp_sizer, proportion=1, flag=wx.EXPAND | wx.RIGHT, border=10
-		)
-
-		self.create_max_tokens_widget()
-		tokens_sizer = wx.BoxSizer(wx.VERTICAL)
-		tokens_sizer.Add(
-			self.max_tokens_spin_label, proportion=0, flag=wx.EXPAND
-		)
-		tokens_sizer.Add(
-			self.max_tokens_spin_ctrl, proportion=0, flag=wx.EXPAND
-		)
-		params_sizer.Add(
-			tokens_sizer, proportion=1, flag=wx.EXPAND | wx.RIGHT, border=10
-		)
-
-		self.create_top_p_widget()
-		top_p_sizer = wx.BoxSizer(wx.VERTICAL)
-		top_p_sizer.Add(self.top_p_spinner_label, proportion=0, flag=wx.EXPAND)
-		top_p_sizer.Add(self.top_p_spinner, proportion=0, flag=wx.EXPAND)
-		params_sizer.Add(top_p_sizer, proportion=1, flag=wx.EXPAND)
-
-		sizer.Add(
-			params_sizer,
-			proportion=0,
-			flag=wx.EXPAND | wx.TOP | wx.LEFT | wx.RIGHT,
-			border=10,
-		)
-
-		self.create_stream_widget()
-		sizer.Add(
-			self.stream_mode,
-			proportion=0,
-			flag=wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP,
-			border=10,
-		)
-		self.create_reasoning_widget()
-		sizer.Add(
-			self.reasoning_mode,
-			proportion=0,
-			flag=wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP,
-			border=10,
-		)
+		self.create_tools_group()
 		sizer.Add(
-			self.reasoning_adaptive,
+			self.tools_group_sizer,
 			proportion=0,
 			flag=wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP,
 			border=10,
 		)
+		self.create_general_group()
 		sizer.Add(
-			self.reasoning_budget_label,
+			self.general_group_sizer,
 			proportion=0,
 			flag=wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP,
 			border=10,
 		)
+		self.create_reasoning_group()
 		sizer.Add(
-			self.reasoning_budget_spin,
-			proportion=0,
-			flag=wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP,
-			border=10,
-		)
-		sizer.Add(
-			self.reasoning_effort_label,
-			proportion=0,
-			flag=wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP,
-			border=10,
-		)
-		sizer.Add(
-			self.reasoning_effort_choice,
+			self.reasoning_group_sizer,
 			proportion=0,
 			flag=wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP,
 			border=10,
@@ -362,7 +303,12 @@ def load_message_block_data(self):
 		if self.system_message:
 			self.system_prompt_txt.SetValue(self.system_message.content)
 		if self.block.response:
-			self.response_txt.SetValue(self.block.response.content)
+			reasoning = getattr(self.block.response, "reasoning", None)
+			content = self.block.response.content
+			display = format_response_for_display(
+				reasoning, content, self.get_effective_show_reasoning_blocks()
+			)
+			self.response_txt.SetValue(display)
 		self.prompt_panel.prompt_text = self.block.request.content
 
 		if self.block.request.attachments:
@@ -380,6 +326,17 @@ def load_message_block_data(self):
 		self._load_audio_params()
 		self._load_reasoning_params()
 
+	def _on_show_reasoning_blocks_change(self, event: wx.Event | None):
+		"""Refresh response display when show reasoning checkbox toggles."""
+		super()._on_show_reasoning_blocks_change(event)
+		if hasattr(self, "response_txt") and self.block and self.block.response:
+			reasoning = getattr(self.block.response, "reasoning", None)
+			content = self.block.response.content
+			display = format_response_for_display(
+				reasoning, content, self.get_effective_show_reasoning_blocks()
+			)
+			self.response_txt.SetValue(display)
+
 	def on_account_change(self, event):
 		"""Handle account selection changes.