deepy-cli 0.2.25__tar.gz → 0.2.27__tar.gz

{deepy_cli-0.2.25 → deepy_cli-0.2.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: deepy-cli
-Version: 0.2.25
+Version: 0.2.27
 Summary: Deepy - Vibe coding for DeepSeek models in your terminal
 Keywords: deepseek,coding-agent,terminal,cli,agents
 Author: kirineko
@@ -21,7 +21,7 @@ Requires-Dist: prompt-toolkit>=3.0,<4
 Requires-Dist: regex>=2026.5.9
 Requires-Dist: pyyaml>=6.0,<7
 Requires-Dist: rich>=14.2,<15
-Requires-Dist: textual>=8.2,<9
+Requires-Dist: textual>=8.2.7,<9
 Requires-Dist: tiktoken>=0.9,<1
 Requires-Dist: tomli-w>=1
 Requires-Python: >=3.12
@@ -162,24 +162,35 @@ for direct local commands.
 
 ![Deepy web research workflow](asset/websearch.webp)
 
-## Stable UI And Experimental TUI
+## Classic UI And Modern UI
 
-The default `deepy` command starts the stable Rich/prompt-toolkit terminal UI.
-The opt-in Textual interface is available with:
+Deepy has two peer terminal interfaces. Classic UI is the Rich/prompt-toolkit
+terminal UI, and Modern UI is the Textual terminal UI. The default `deepy`
+command starts the UI saved in `ui.interface`; missing config defaults to
+Classic UI with the dark theme. The compatibility command below still starts
+Modern UI directly:
 
 ```bash
 deepy tui
 ```
 
-The TUI has a scrollable transcript, live thinking blocks, richer tool output
-blocks, slash-command and `@file` suggestions, status/help screens, and a
-Deepy-owned diff view. It remains experimental and may change between releases.
-
-![Deepy Textual TUI](asset/deepy-tui.webp)
+Modern UI has a compact scrollable transcript, lightweight status line,
+Textual-native composer, live assistant/tool activity states, compact tool
+summary rows, slash-command and `@file` suggestions, inline audit/model/theme
+choices, status/help screens, and a Deepy-owned diff view. Use `/ui` in either
+interface to change the default UI for the next `deepy` startup.
 
 `/status` shows session/project usage, context-window pressure, and DeepSeek
-balance in one panel. Exiting the TUI prints the same compact session summary
-as the stable terminal UI.
+balance in one panel. Exiting Modern UI prints the same compact session summary
+as Classic UI. Prompt text, image attachments, generated input
+suggestions, slash suggestions, and file suggestions are separate composer
+states, so UI-only attachment labels are not written into the editable prompt
+buffer. Attached images appear in an attachment row with prompt-local keyboard
+shortcuts: press Down to enter attachment selection, Left/Right to choose,
+Backspace to remove, and Up to return to normal input. The shared `dark` /
+`light` setting maps to curated
+Textual themes in Modern UI, with `dark` defaulting to `tokyo-night`; Modern UI can
+also save a Textual-only `ui.textual_theme` override from `/theme`.
 
 See [docs/deepy-ui-and-tui.md](docs/deepy-ui-and-tui.md) for the full feature
 comparison and current limitations.
@@ -263,7 +274,7 @@ MCP inheritance, and troubleshooting.
 | Tutorial videos | [docs/tutorial-videos.md](docs/tutorial-videos.md) | [docs/tutorial-videos.zh-CN.md](docs/tutorial-videos.zh-CN.md) |
 | MCP setup and troubleshooting | [docs/mcp.md](docs/mcp.md) | [docs/mcp.zh-CN.md](docs/mcp.zh-CN.md) |
 | Subagents and custom subagents | [docs/subagents.md](docs/subagents.md) | [docs/subagents.zh-CN.md](docs/subagents.zh-CN.md) |
-| Stable UI versus experimental TUI | [docs/deepy-ui-and-tui.md](docs/deepy-ui-and-tui.md) | [docs/deepy-ui-and-tui.zh-CN.md](docs/deepy-ui-and-tui.zh-CN.md) |
+| Classic UI and Modern UI | [docs/deepy-ui-and-tui.md](docs/deepy-ui-and-tui.md) | [docs/deepy-ui-and-tui.zh-CN.md](docs/deepy-ui-and-tui.zh-CN.md) |
 
 ## Command Reference
 
@@ -301,6 +312,7 @@ Inside the interactive terminal:
 /<name> [request]       Invoke a Skill directly
 /init                   Create or update project AGENTS.md
 /theme                  Show or change terminal UI theme
+/ui                     Show or change Classic/Modern UI
 /ps                     Show managed background shell tasks
 /stop                   Choose background shell tasks to stop
 ```
@@ -331,6 +343,7 @@ compact_preserve_recent_messages = 2
 mode = "yolo" # normal, auto, or yolo
 
 [ui]
+interface = "classic" # classic or modern
 theme = "dark" # dark or light
 ```
 

{deepy_cli-0.2.25 → deepy_cli-0.2.27}/README.md

@@ -130,24 +130,35 @@ for direct local commands.
 
 ![Deepy web research workflow](asset/websearch.webp)
 
-## Stable UI And Experimental TUI
+## Classic UI And Modern UI
 
-The default `deepy` command starts the stable Rich/prompt-toolkit terminal UI.
-The opt-in Textual interface is available with:
+Deepy has two peer terminal interfaces. Classic UI is the Rich/prompt-toolkit
+terminal UI, and Modern UI is the Textual terminal UI. The default `deepy`
+command starts the UI saved in `ui.interface`; missing config defaults to
+Classic UI with the dark theme. The compatibility command below still starts
+Modern UI directly:
 
 ```bash
 deepy tui
 ```
 
-The TUI has a scrollable transcript, live thinking blocks, richer tool output
-blocks, slash-command and `@file` suggestions, status/help screens, and a
-Deepy-owned diff view. It remains experimental and may change between releases.
-
-![Deepy Textual TUI](asset/deepy-tui.webp)
+Modern UI has a compact scrollable transcript, lightweight status line,
+Textual-native composer, live assistant/tool activity states, compact tool
+summary rows, slash-command and `@file` suggestions, inline audit/model/theme
+choices, status/help screens, and a Deepy-owned diff view. Use `/ui` in either
+interface to change the default UI for the next `deepy` startup.
 
 `/status` shows session/project usage, context-window pressure, and DeepSeek
-balance in one panel. Exiting the TUI prints the same compact session summary
-as the stable terminal UI.
+balance in one panel. Exiting Modern UI prints the same compact session summary
+as Classic UI. Prompt text, image attachments, generated input
+suggestions, slash suggestions, and file suggestions are separate composer
+states, so UI-only attachment labels are not written into the editable prompt
+buffer. Attached images appear in an attachment row with prompt-local keyboard
+shortcuts: press Down to enter attachment selection, Left/Right to choose,
+Backspace to remove, and Up to return to normal input. The shared `dark` /
+`light` setting maps to curated
+Textual themes in Modern UI, with `dark` defaulting to `tokyo-night`; Modern UI can
+also save a Textual-only `ui.textual_theme` override from `/theme`.
 
 See [docs/deepy-ui-and-tui.md](docs/deepy-ui-and-tui.md) for the full feature
 comparison and current limitations.
@@ -231,7 +242,7 @@ MCP inheritance, and troubleshooting.
 | Tutorial videos | [docs/tutorial-videos.md](docs/tutorial-videos.md) | [docs/tutorial-videos.zh-CN.md](docs/tutorial-videos.zh-CN.md) |
 | MCP setup and troubleshooting | [docs/mcp.md](docs/mcp.md) | [docs/mcp.zh-CN.md](docs/mcp.zh-CN.md) |
 | Subagents and custom subagents | [docs/subagents.md](docs/subagents.md) | [docs/subagents.zh-CN.md](docs/subagents.zh-CN.md) |
-| Stable UI versus experimental TUI | [docs/deepy-ui-and-tui.md](docs/deepy-ui-and-tui.md) | [docs/deepy-ui-and-tui.zh-CN.md](docs/deepy-ui-and-tui.zh-CN.md) |
+| Classic UI and Modern UI | [docs/deepy-ui-and-tui.md](docs/deepy-ui-and-tui.md) | [docs/deepy-ui-and-tui.zh-CN.md](docs/deepy-ui-and-tui.zh-CN.md) |
 
 ## Command Reference
 
@@ -269,6 +280,7 @@ Inside the interactive terminal:
 /<name> [request]       Invoke a Skill directly
 /init                   Create or update project AGENTS.md
 /theme                  Show or change terminal UI theme
+/ui                     Show or change Classic/Modern UI
 /ps                     Show managed background shell tasks
 /stop                   Choose background shell tasks to stop
 ```
@@ -299,6 +311,7 @@ compact_preserve_recent_messages = 2
 mode = "yolo" # normal, auto, or yolo
 
 [ui]
+interface = "classic" # classic or modern
 theme = "dark" # dark or light
 ```
 

{deepy_cli-0.2.25 → deepy_cli-0.2.27}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "deepy-cli"
-version = "0.2.25"
+version = "0.2.27"
 description = "Deepy - Vibe coding for DeepSeek models in your terminal"
 readme = "README.md"
 authors = [
@@ -27,7 +27,7 @@ dependencies = [
     "regex>=2026.5.9",
     "pyyaml>=6.0,<7",
     "rich>=14.2,<15",
-    "textual>=8.2,<9",
+    "textual>=8.2.7,<9",
     "tiktoken>=0.9,<1",
     "tomli-w>=1",
 ]

{deepy_cli-0.2.25 → deepy_cli-0.2.27}/src/deepy/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-__version__ = "0.2.25"
+__version__ = "0.2.27"
 
 
 def main() -> None:

{deepy_cli-0.2.25 → deepy_cli-0.2.27}/src/deepy/audit.py

@@ -136,9 +136,11 @@ class PendingApproval:
     name: str
     tool_name: str
     arguments: str
+    call_id: str = ""
     agent_name: str = ""
     action_kind: str = "tool"
     server_name: str = ""
+    preflight: Mapping[str, Any] | None = None
 
 
 @dataclass(frozen=True)

{deepy_cli-0.2.25 → deepy_cli-0.2.27}/src/deepy/cli.py

@@ -22,14 +22,18 @@ from .config import (
     provider_info_for,
     settings_to_toml_dict,
     thinking_modes_for_provider,
+    ui_setup_from_selection,
+    ui_setup_number,
     ui_theme_from_selection,
     ui_theme_number,
     update_config_theme,
+    update_config_ui_choice,
     write_config,
 )
 from .config.settings import DEFAULT_UI_THEME, UI_THEMES
 from .errors import format_error_display
 from .llm.cache_context import format_cache_usage
+from .llm.multimodal import redact_image_data_urls
 from .llm.provider import build_provider_bundle
 from .llm.runner import DEFAULT_MAX_TURNS, run_prompt_once
 from .sessions import DeepySession, list_session_entries
@@ -85,7 +89,7 @@ def _build_parser() -> argparse.ArgumentParser:
     run_parser.add_argument("--session", help="Resume an existing session id.")
     run_parser.add_argument("--skill", action="append", default=[], help="Load a skill by name.")
 
-    subparsers.add_parser("tui", help="Start the experimental Textual TUI.")
+    subparsers.add_parser("tui", help="Start the Modern UI.")
 
     sessions_parser = subparsers.add_parser("sessions", help="Inspect project sessions.")
     sessions_sub = sessions_parser.add_subparsers(dest="sessions_command", required=True)
@@ -130,6 +134,7 @@ def _cmd_config_init(args: argparse.Namespace) -> int:
         base_url=args.base_url,
         thinking_mode=args.thinking,
         theme=args.theme,
+        interface="classic",
     )
     print(f"Wrote {config_path}")
     return 0
@@ -169,7 +174,10 @@ def _run_config_setup(config_path: Path) -> None:
     )
     base_url = _prompt_config_value("Base URL", default=base_default)
     thinking_mode = _prompt_thinking_mode_value(provider, default=existing.model.reasoning_mode)
-    theme = _prompt_theme_value(default=existing.ui.theme)
+    interface, theme = _prompt_ui_choice_value(
+        default_interface=existing.ui.interface,
+        default_theme=existing.ui.theme,
+    )
     _write_config(
         config_path,
         api_key=api_key,
@@ -178,6 +186,7 @@ def _run_config_setup(config_path: Path) -> None:
         base_url=base_url,
         thinking_mode=thinking_mode,
         theme=theme,
+        interface=interface,
     )
 
 
@@ -388,6 +397,27 @@ def _prompt_theme_value(*, default: str = DEFAULT_UI_THEME) -> str:
     return ui_theme_from_selection(value, default=default)
 
 
+def _prompt_ui_choice_value(
+    *,
+    default_interface: str = "classic",
+    default_theme: str = DEFAULT_UI_THEME,
+) -> tuple[str, str]:
+    print("UI:")
+    print("1. Classic UI + dark theme  Default terminal UI")
+    print("2. Classic UI + light theme")
+    print("3. Modern UI + dark theme   Textual UI")
+    print("4. Modern UI + light theme  Textual UI")
+    value = _prompt_config_value(
+        "UI number",
+        default=ui_setup_number(default_interface, default_theme),
+    )
+    return ui_setup_from_selection(
+        value,
+        default_interface=default_interface,
+        default_theme=default_theme,
+    )
+
+
 def _write_config(
     config_path: Path,
     *,
@@ -396,6 +426,7 @@ def _write_config(
     model: str,
     base_url: str | None,
     theme: str,
+    interface: str,
     thinking_mode: str | None,
 ) -> None:
     write_config(
@@ -405,6 +436,7 @@ def _write_config(
         model=model,
         base_url=base_url,
         theme=theme,
+        interface=interface,
         thinking_mode=thinking_mode,
     )
 
@@ -614,7 +646,7 @@ def _cmd_sessions(args: argparse.Namespace) -> int:
                     else 0,
                     "cache_break_reason": entry.cache_break_reason if entry is not None else None,
                     "cache_usage": entry.cache_usage if entry is not None else None,
-                    "items": items,
+                    "items": redact_image_data_urls(items),
                 }
             )
         )
@@ -669,21 +701,35 @@ def _ensure_interactive_settings(args: argparse.Namespace) -> Settings:
             raise SystemExit(1)
         settings = load_settings(args.config)
     if settings.path is not None and not settings.ui.theme_configured:
-        theme = _prompt_theme_value(default=settings.ui.theme)
-        update_config_theme(settings.path, theme)
+        interface, theme = _prompt_ui_choice_value(
+            default_interface=settings.ui.interface,
+            default_theme=settings.ui.theme,
+        )
+        update_config_ui_choice(settings.path, interface=interface, theme=theme)
         settings = load_settings(args.config)
     return settings
 
 
 def _cmd_tui(args: argparse.Namespace) -> int:
     if not sys.stdin.isatty():
-        print("experimental TUI requires a TTY; use `deepy` for the stable terminal UI.", file=sys.stderr)
+        print("Modern UI requires a TTY; use `deepy run` for non-interactive prompts.", file=sys.stderr)
         return 1
     from deepy.tui import run_tui
 
     return run_tui(_ensure_interactive_settings(args), project_root=Path.cwd())
 
 
+def _cmd_interactive(args: argparse.Namespace) -> int:
+    settings = _ensure_interactive_settings(args)
+    if settings.ui.interface == "modern":
+        if not sys.stdin.isatty():
+            raise RuntimeError("Modern UI requires a TTY.")
+        from deepy.tui import run_tui
+
+        return run_tui(settings, project_root=Path.cwd())
+    return run_interactive(settings)
+
+
 def main(argv: Sequence[str] | None = None) -> int:
     parser = _build_parser()
     args = parser.parse_args(argv)
@@ -714,7 +760,7 @@ def main(argv: Sequence[str] | None = None) -> int:
 
     if not sys.stdin.isatty():
         parser.error("interactive mode requires a TTY; use `deepy doctor` or `deepy config show`.")
-    return run_interactive(_ensure_interactive_settings(args))
+    return _cmd_interactive(args)
 
 
 if __name__ == "__main__":

{deepy_cli-0.2.25 → deepy_cli-0.2.27}/src/deepy/config/__init__.py

@@ -6,6 +6,7 @@ from .settings import (
     DEFAULT_BASE_URL,
     DEFAULT_COMPACT_PRESERVE_RECENT_MESSAGES,
     DEFAULT_INPUT_SUGGESTIONS_ENABLED,
+    DEFAULT_UI_INTERFACE,
     DEFAULT_OPENROUTER_BASE_URL,
     DEFAULT_PROVIDER,
     DEFAULT_RESERVED_CONTEXT_TOKENS,
@@ -27,6 +28,9 @@ from .settings import (
     TestShellToolConfig,
     UI_THEME_OPTIONS,
     UI_THEMES,
+    UI_INTERFACE_OPTIONS,
+    UI_INTERFACES,
+    UI_SETUP_OPTIONS,
     UI_VIEW_MODES,
     ToolsConfig,
     UiConfig,
@@ -45,6 +49,7 @@ from .settings import (
     is_valid_thinking_mode,
     is_valid_thinking_mode_for_provider,
     is_valid_ui_theme,
+    is_valid_ui_interface,
     is_valid_ui_view_mode,
     is_valid_reasoning_mode,
     is_valid_config_audit_mode,
@@ -57,8 +62,15 @@ from .settings import (
     update_config_model_settings,
     update_config_audit_mode,
     update_config_input_suggestions_enabled,
+    update_config_textual_theme,
     update_config_theme,
+    update_config_ui_choice,
+    update_config_ui_interface,
     update_config_view_mode,
+    ui_interface_from_selection,
+    ui_interface_number,
+    ui_setup_from_selection,
+    ui_setup_number,
     ui_theme_from_selection,
     ui_theme_number,
     write_config,
@@ -70,6 +82,7 @@ __all__ = [
     "DEFAULT_BASE_URL",
     "DEFAULT_COMPACT_PRESERVE_RECENT_MESSAGES",
     "DEFAULT_INPUT_SUGGESTIONS_ENABLED",
+    "DEFAULT_UI_INTERFACE",
     "DEFAULT_OPENROUTER_BASE_URL",
     "DEFAULT_PROVIDER",
     "DEFAULT_RESERVED_CONTEXT_TOKENS",
@@ -91,6 +104,9 @@ __all__ = [
     "TestShellToolConfig",
     "UI_THEME_OPTIONS",
     "UI_THEMES",
+    "UI_INTERFACE_OPTIONS",
+    "UI_INTERFACES",
+    "UI_SETUP_OPTIONS",
     "UI_VIEW_MODES",
     "ToolsConfig",
     "UiConfig",
@@ -109,6 +125,7 @@ __all__ = [
     "is_valid_thinking_mode",
     "is_valid_thinking_mode_for_provider",
     "is_valid_ui_theme",
+    "is_valid_ui_interface",
     "is_valid_ui_view_mode",
     "is_valid_reasoning_mode",
     "is_valid_config_audit_mode",
@@ -121,8 +138,15 @@ __all__ = [
     "update_config_model_settings",
     "update_config_audit_mode",
     "update_config_input_suggestions_enabled",
+    "update_config_textual_theme",
     "update_config_theme",
+    "update_config_ui_choice",
+    "update_config_ui_interface",
     "update_config_view_mode",
+    "ui_interface_from_selection",
+    "ui_interface_number",
+    "ui_setup_from_selection",
+    "ui_setup_number",
     "ui_theme_from_selection",
     "ui_theme_number",
     "write_config",

{deepy_cli-0.2.25 → deepy_cli-0.2.27}/src/deepy/config/settings.py

@@ -19,6 +19,7 @@ DEFAULT_RESERVED_CONTEXT_TOKENS = 50_000
 DEFAULT_COMPACT_PRESERVE_RECENT_MESSAGES = 2
 DEFAULT_WEB_SEARCH_SEARXNG_URL = "https://s.kirineko.tech/"
 DEFAULT_UI_THEME = "dark"
+DEFAULT_UI_INTERFACE = "classic"
 DEFAULT_MCP_ENABLED = True
 DEFAULT_MCP_CONNECT_TIMEOUT_SECONDS = 10.0
 DEFAULT_MCP_CLEANUP_TIMEOUT_SECONDS = 10.0
@@ -50,6 +51,14 @@ THINKING_MODES = set(DEEPSEEK_REASONING_MODES) | set(SWITCH_ONLY_THINKING_MODES)
 PROVIDERS = {"deepseek", "openrouter", "xiaomi"}
 UI_THEMES = {"dark", "light"}
 UI_THEME_OPTIONS = (("1", "dark"), ("2", "light"))
+UI_INTERFACES = {"classic", "modern"}
+UI_INTERFACE_OPTIONS = (("1", "classic"), ("2", "modern"))
+UI_SETUP_OPTIONS = (
+    ("1", "classic", "dark"),
+    ("2", "classic", "light"),
+    ("3", "modern", "dark"),
+    ("4", "modern", "light"),
+)
 UI_VIEW_MODES = {"concise", "full"}
 
 
@@ -59,6 +68,7 @@ class ModelInfo:
     label: str
     description: str
     supports_thinking: bool = True
+    supports_image_input: bool = False
     default_reasoning_mode: str = "max"
 
 
@@ -102,6 +112,7 @@ OPENROUTER_MODEL_CATALOG = (
         name="xiaomi/mimo-v2.5",
         label="MiMo V2.5",
         description="Xiaomi MiMo V2.5 via OpenRouter.",
+        supports_image_input=True,
         default_reasoning_mode="enabled",
     ),
 )
@@ -116,6 +127,7 @@ XIAOMI_MODEL_CATALOG = (
         name="mimo-v2.5",
         label="MiMo V2.5",
         description="Xiaomi official MiMo V2.5.",
+        supports_image_input=True,
         default_reasoning_mode="enabled",
     ),
 )
@@ -327,6 +339,10 @@ def _as_str(value: Any, default: str = "") -> str:
     return value.strip() if isinstance(value, str) and value.strip() else default
 
 
+def _as_optional_str(value: Any) -> str | None:
+    return value.strip() if isinstance(value, str) and value.strip() else None
+
+
 def _as_string_tuple(value: Any) -> tuple[str, ...]:
     if not isinstance(value, list):
         return ()
@@ -564,13 +580,19 @@ class McpConfig:
 @dataclass(frozen=True)
 class UiConfig:
     theme: str = DEFAULT_UI_THEME
+    interface: str = DEFAULT_UI_INTERFACE
     theme_configured: bool = False
+    textual_theme: str | None = None
     input_suggestions_enabled: bool = DEFAULT_INPUT_SUGGESTIONS_ENABLED
     view_mode: str = DEFAULT_UI_VIEW_MODE
 
     @classmethod
     def from_mapping(cls, raw: Mapping[str, Any]) -> Self:
         theme = raw.get("theme")
+        interface = _as_str(raw.get("interface"), DEFAULT_UI_INTERFACE)
+        if interface not in UI_INTERFACES:
+            interface = DEFAULT_UI_INTERFACE
+        textual_theme = _as_optional_str(raw.get("textual_theme"))
         input_suggestions_enabled = _as_bool(
             raw.get("input_suggestions_enabled"),
             DEFAULT_INPUT_SUGGESTIONS_ENABLED,
@@ -581,18 +603,27 @@ class UiConfig:
         if isinstance(theme, str) and theme.strip() == "auto":
             return cls(
                 theme=DEFAULT_UI_THEME,
+                interface=interface,
                 theme_configured=True,
+                textual_theme=textual_theme,
                 input_suggestions_enabled=input_suggestions_enabled,
                 view_mode=view_mode,
             )
         if isinstance(theme, str) and theme.strip() in UI_THEMES:
             return cls(
                 theme=theme.strip(),
+                interface=interface,
                 theme_configured=True,
+                textual_theme=textual_theme,
                 input_suggestions_enabled=input_suggestions_enabled,
                 view_mode=view_mode,
             )
-        return cls(input_suggestions_enabled=input_suggestions_enabled, view_mode=view_mode)
+        return cls(
+            textual_theme=textual_theme,
+            interface=interface,
+            input_suggestions_enabled=input_suggestions_enabled,
+            view_mode=view_mode,
+        )
 
 
 @dataclass(frozen=True)
@@ -669,6 +700,10 @@ def is_valid_ui_theme(value: str) -> bool:
     return value in UI_THEMES
 
 
+def is_valid_ui_interface(value: str) -> bool:
+    return value in UI_INTERFACES
+
+
 def is_valid_ui_view_mode(value: str) -> bool:
     return value in UI_VIEW_MODES
 
@@ -713,6 +748,52 @@ def ui_theme_from_selection(value: str, *, default: str = DEFAULT_UI_THEME) -> s
     return default if is_valid_ui_theme(default) else DEFAULT_UI_THEME
 
 
+def ui_interface_number(interface: str) -> str:
+    for number, value in UI_INTERFACE_OPTIONS:
+        if value == interface:
+            return number
+    return "1"
+
+
+def ui_interface_from_selection(value: str, *, default: str = DEFAULT_UI_INTERFACE) -> str:
+    normalized = value.strip().lower()
+    if not normalized:
+        return default if is_valid_ui_interface(default) else DEFAULT_UI_INTERFACE
+    if normalized in UI_INTERFACES:
+        return normalized
+    by_number = dict(UI_INTERFACE_OPTIONS)
+    selected = by_number.get(normalized)
+    if selected is not None:
+        return selected
+    return default if is_valid_ui_interface(default) else DEFAULT_UI_INTERFACE
+
+
+def ui_setup_number(interface: str, theme: str) -> str:
+    for number, option_interface, option_theme in UI_SETUP_OPTIONS:
+        if option_interface == interface and option_theme == theme:
+            return number
+    return "1"
+
+
+def ui_setup_from_selection(
+    value: str,
+    *,
+    default_interface: str = DEFAULT_UI_INTERFACE,
+    default_theme: str = DEFAULT_UI_THEME,
+) -> tuple[str, str]:
+    normalized = value.strip().lower()
+    fallback = (
+        default_interface if is_valid_ui_interface(default_interface) else DEFAULT_UI_INTERFACE,
+        default_theme if is_valid_ui_theme(default_theme) else DEFAULT_UI_THEME,
+    )
+    if not normalized:
+        return fallback
+    for number, option_interface, option_theme in UI_SETUP_OPTIONS:
+        if normalized in {number, f"{option_interface}-{option_theme}", f"{option_interface} {option_theme}"}:
+            return option_interface, option_theme
+    return fallback
+
+
 def write_config(
     config_path: Path,
     *,
@@ -721,10 +802,13 @@ def write_config(
     model: str,
     base_url: str | None = None,
     theme: str,
+    interface: str = DEFAULT_UI_INTERFACE,
     thinking_mode: str | None = None,
 ) -> None:
     if not is_valid_ui_theme(theme):
         raise ValueError("UI theme must be one of: dark, light.")
+    if not is_valid_ui_interface(interface):
+        raise ValueError("UI interface must be one of: classic, modern.")
     if not is_supported_provider(provider):
         raise ValueError("Provider must be one of: deepseek, openrouter, xiaomi.")
     provider_info = provider_info_for(provider)
@@ -788,6 +872,7 @@ def write_config(
             },
         },
         "ui": {
+            "interface": interface,
             "theme": theme,
             "input_suggestions_enabled": DEFAULT_INPUT_SUGGESTIONS_ENABLED,
             "view_mode": DEFAULT_UI_VIEW_MODE,
@@ -863,6 +948,54 @@ def update_config_theme(config_path: Path, theme: str) -> None:
     ui = raw.get("ui")
     ui_map = dict(ui) if isinstance(ui, Mapping) else {}
     ui_map["theme"] = theme
+    ui_map.pop("textual_theme", None)
+    raw["ui"] = ui_map
+    _write_private_toml(path, raw)
+
+
+def update_config_ui_interface(config_path: Path, interface: str) -> None:
+    if not is_valid_ui_interface(interface):
+        raise ValueError("UI interface must be one of: classic, modern.")
+    path = config_path.expanduser()
+    if path.suffix == ".json":
+        raise ValueError("Deepy only supports TOML config files; JSON config is not supported.")
+    raw = _read_toml_mapping(path)
+    ui = raw.get("ui")
+    ui_map = dict(ui) if isinstance(ui, Mapping) else {}
+    ui_map["interface"] = interface
+    raw["ui"] = ui_map
+    _write_private_toml(path, raw)
+
+
+def update_config_ui_choice(config_path: Path, *, interface: str, theme: str) -> None:
+    if not is_valid_ui_interface(interface):
+        raise ValueError("UI interface must be one of: classic, modern.")
+    if not is_valid_ui_theme(theme):
+        raise ValueError("UI theme must be one of: dark, light.")
+    path = config_path.expanduser()
+    if path.suffix == ".json":
+        raise ValueError("Deepy only supports TOML config files; JSON config is not supported.")
+    raw = _read_toml_mapping(path)
+    ui = raw.get("ui")
+    ui_map = dict(ui) if isinstance(ui, Mapping) else {}
+    ui_map["interface"] = interface
+    ui_map["theme"] = theme
+    ui_map.pop("textual_theme", None)
+    raw["ui"] = ui_map
+    _write_private_toml(path, raw)
+
+
+def update_config_textual_theme(config_path: Path, textual_theme: str) -> None:
+    theme = textual_theme.strip()
+    if not theme:
+        raise ValueError("Textual theme must not be empty.")
+    path = config_path.expanduser()
+    if path.suffix == ".json":
+        raise ValueError("Deepy only supports TOML config files; JSON config is not supported.")
+    raw = _read_toml_mapping(path)
+    ui = raw.get("ui")
+    ui_map = dict(ui) if isinstance(ui, Mapping) else {}
+    ui_map["textual_theme"] = theme
     raw["ui"] = ui_map
     _write_private_toml(path, raw)