klaude-code 1.2.30__tar.gz → 1.4.0__tar.gz

{klaude_code-1.2.30 → klaude_code-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: klaude-code
-Version: 1.2.30
+Version: 1.4.0
 Summary: Minimal code agent CLI
 Requires-Dist: anthropic>=0.66.0
 Requires-Dist: chardet>=5.2.0
@@ -12,7 +12,6 @@ Requires-Dist: pillow>=12.0.0
 Requires-Dist: prompt-toolkit>=3.0.52
 Requires-Dist: pydantic>=2.11.7
 Requires-Dist: pyyaml>=6.0.2
-Requires-Dist: questionary>=2.1.1
 Requires-Dist: rich>=14.1.0
 Requires-Dist: trafilatura>=2.0.0
 Requires-Dist: typer>=0.17.3

{klaude_code-1.2.30 → klaude_code-1.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "klaude-code"
-version = "1.2.30"
+version = "1.4.0"
 description = "Minimal code agent CLI"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -19,7 +19,6 @@ dependencies = [
     "prompt-toolkit>=3.0.52",
     "pydantic>=2.11.7",
     "pyyaml>=6.0.2",
-    "questionary>=2.1.1",
     "rich>=14.1.0",
     "trafilatura>=2.0.0",
     "typer>=0.17.3",

{klaude_code-1.2.30 → klaude_code-1.4.0}/src/klaude_code/cli/runtime.py

@@ -273,7 +273,7 @@ async def run_interactive(init_config: AppInitConfig, session_id: str | None = N
             display.wrapped_display.renderer.stop_bottom_live()
 
     # Pass the pre-detected theme to avoid redundant TTY queries.
-    # Querying the terminal background again after questionary's interactive selection
+    # Querying the terminal background again after an interactive selection
     # can interfere with prompt_toolkit's terminal state and break history navigation.
     is_light_background: bool | None = None
     if components.theme == "light":
@@ -352,7 +352,7 @@ async def run_interactive(init_config: AppInitConfig, session_id: str | None = N
                 op.UserInputOperation(input=user_input, session_id=active_session_id)
             )
             # If it's an interactive command (e.g., /model), avoid starting the ESC monitor
-            # to prevent TTY conflicts with interactive prompts (questionary/prompt_toolkit).
+            # to prevent TTY conflicts with interactive prompt_toolkit UIs.
             if has_interactive_command(user_input.text):
                 await components.executor.wait_for(submission_id)
             else:

{klaude_code-1.2.30 → klaude_code-1.4.0}/src/klaude_code/cli/session_cmd.py

@@ -7,8 +7,11 @@ from klaude_code.trace import log
 
 
 def _session_confirm(sessions: list[Session.SessionMetaBrief], message: str) -> bool:
-    """Show session list and confirm deletion using questionary."""
-    import questionary
+    """Show session list and confirm deletion using prompt_toolkit."""
+
+    from prompt_toolkit.styles import Style
+
+    from klaude_code.ui.terminal.selector import SelectItem, select_one
 
     def _fmt(ts: float) -> str:
         try:
@@ -24,14 +27,26 @@ def _session_confirm(sessions: list[Session.SessionMetaBrief], message: str) ->
             first_msg += "..."
         log(f"  {_fmt(s.updated_at)}  {msg_count_display:>3} msgs  {first_msg}")
 
-    return (
-        questionary.confirm(
-            message,
-            default=False,
-            style=questionary.Style([("question", "bold")]),
-        ).ask()
-        or False
+    items: list[SelectItem[bool]] = [
+        SelectItem(title=[("class:text", "No\n")], value=False, search_text="No"),
+        SelectItem(title=[("class:text", "Yes\n")], value=True, search_text="Yes"),
+    ]
+
+    result = select_one(
+        message=message,
+        items=items,
+        pointer="→",
+        style=Style(
+            [
+                ("question", "bold"),
+                ("pointer", "ansigreen"),
+                ("highlighted", "ansigreen"),
+                ("text", ""),
+            ]
+        ),
+        use_search_filter=False,
     )
+    return bool(result)
 
 
 def session_clean(

{klaude_code-1.2.30 → klaude_code-1.4.0}/src/klaude_code/command/model_cmd.py

@@ -1,38 +1,43 @@
 import asyncio
 
-import questionary
+from prompt_toolkit.styles import Style
 
 from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.config.select_model import select_model_from_config
 from klaude_code.protocol import commands, events, model, op
+from klaude_code.ui.terminal.selector import SelectItem, select_one
 
-SELECT_STYLE = questionary.Style(
+SELECT_STYLE = Style(
     [
         ("instruction", "ansibrightblack"),
-        ("pointer", "ansicyan"),
-        ("highlighted", "ansicyan"),
+        ("pointer", "ansigreen"),
+        ("highlighted", "ansigreen"),
         ("text", "ansibrightblack"),
+        ("question", ""),
     ]
 )
 
 
 def _confirm_change_default_model_sync(selected_model: str) -> bool:
-    choices: list[questionary.Choice] = [
-        questionary.Choice(title="No (session only)", value=False),
-        questionary.Choice(title="Yes (save as default)", value=True),
+    items: list[SelectItem[bool]] = [
+        SelectItem(title=[("class:text", "No  (session only)\n")], value=False, search_text="No"),
+        SelectItem(
+            title=[("class:text", "Yes (save as default main_model in ~/.klaude/klaude-config.yaml)\n")],
+            value=True,
+            search_text="Yes",
+        ),
     ]
 
     try:
         # Add a blank line between the model selector and this confirmation prompt.
-        questionary.print("")
-        result = questionary.select(
-            message=f"Save '{selected_model}' as default model (main_model)?",
-            choices=choices,
+        print("")
+        result = select_one(
+            message=f"Save '{selected_model}' as default model?",
+            items=items,
             pointer="→",
-            instruction="Use arrow keys to move, Enter to select",
-            use_jk_keys=False,
             style=SELECT_STYLE,
-        ).ask()
+            use_search_filter=False,
+        )
     except KeyboardInterrupt:
         return False
 

{klaude_code-1.2.30 → klaude_code-1.4.0}/src/klaude_code/command/thinking_cmd.py

@@ -1,9 +1,10 @@
 import asyncio
 
-import questionary
+from prompt_toolkit.styles import Style
 
 from klaude_code.command.command_abc import Agent, CommandABC, CommandResult
 from klaude_code.protocol import commands, events, llm_param, model
+from klaude_code.ui.terminal.selector import SelectItem, select_one
 
 # Thinking level options for different protocols
 RESPONSES_LEVELS = ["low", "medium", "high"]
@@ -118,12 +119,13 @@ def format_current_thinking(config: llm_param.LLMConfigParameter) -> str:
     return "unknown protocol"
 
 
-SELECT_STYLE = questionary.Style(
+SELECT_STYLE = Style(
     [
         ("instruction", "ansibrightblack"),
-        ("pointer", "ansicyan"),
-        ("highlighted", "ansicyan"),
+        ("pointer", "ansigreen"),
+        ("highlighted", "ansigreen"),
         ("text", "ansibrightblack"),
+        ("question", ""),
     ]
 )
 
@@ -131,17 +133,18 @@ SELECT_STYLE = questionary.Style(
 def _select_responses_thinking_sync(model_name: str | None) -> llm_param.Thinking | None:
     """Select thinking level for responses/codex protocol (sync version)."""
     levels = _get_levels_for_responses(model_name)
-    choices: list[questionary.Choice] = [questionary.Choice(title=level, value=level) for level in levels]
+    items: list[SelectItem[str]] = [
+        SelectItem(title=[("class:text", level + "\n")], value=level, search_text=level) for level in levels
+    ]
 
     try:
-        result = questionary.select(
+        result = select_one(
             message="Select reasoning effort:",
-            choices=choices,
+            items=items,
             pointer="→",
-            instruction="Use arrow keys to move, Enter to select",
-            use_jk_keys=False,
             style=SELECT_STYLE,
-        ).ask()
+            use_search_filter=False,
+        )
 
         if result is None:
             return None
@@ -152,22 +155,24 @@ def _select_responses_thinking_sync(model_name: str | None) -> llm_param.Thinkin
 
 def _select_anthropic_thinking_sync() -> llm_param.Thinking | None:
     """Select thinking level for anthropic/openai_compatible protocol (sync version)."""
-    choices: list[questionary.Choice] = [
-        questionary.Choice(title=label, value=tokens) for label, tokens in ANTHROPIC_LEVELS
+    items: list[SelectItem[int]] = [
+        SelectItem(title=[("class:text", label + "\n")], value=tokens or 0, search_text=label)
+        for label, tokens in ANTHROPIC_LEVELS
     ]
 
     try:
-        result = questionary.select(
+        result = select_one(
             message="Select thinking level:",
-            choices=choices,
+            items=items,
             pointer="→",
-            instruction="Use arrow keys to move, Enter to select",
-            use_jk_keys=False,
             style=SELECT_STYLE,
-        ).ask()
-        if not result:
+            use_search_filter=False,
+        )
+        if result is None:
+            return None
+        if result == 0:
             return llm_param.Thinking(type="disabled", budget_tokens=0)
-        return llm_param.Thinking(type="enabled", budget_tokens=result or 0)
+        return llm_param.Thinking(type="enabled", budget_tokens=result)
     except KeyboardInterrupt:
         return None
 

{klaude_code-1.2.30 → klaude_code-1.4.0}/src/klaude_code/config/select_model.py

@@ -108,60 +108,70 @@ def select_model_from_config(preferred: str | None = None) -> str | None:
         return None
 
     try:
-        import questionary
+        from prompt_toolkit.styles import Style
 
-        choices: list[questionary.Choice] = []
+        from klaude_code.ui.terminal.selector import SelectItem, select_one
 
         max_model_name_length = max(len(m.model_name) for m in filtered_models)
 
-        # Build model_id with thinking suffix as a single unit
-        def build_model_id_with_thinking(m: ModelEntry) -> str:
-            model_id = m.model_params.model or "N/A"
+        def _thinking_info(m: ModelEntry) -> str:
             thinking = m.model_params.thinking
-            if thinking:
-                if thinking.reasoning_effort:
-                    return f"{model_id} ({thinking.reasoning_effort})"
-                elif thinking.budget_tokens:
-                    return f"{model_id} (think {thinking.budget_tokens})"
-            return model_id
-
-        model_id_with_thinking = {m.model_name: build_model_id_with_thinking(m) for m in filtered_models}
-        max_model_id_length = max(len(v) for v in model_id_with_thinking.values())
-
+            if not thinking:
+                return ""
+            if thinking.reasoning_effort:
+                return f"reasoning effort {thinking.reasoning_effort}"
+            if thinking.budget_tokens:
+                return f"thinking budget {thinking.budget_tokens}"
+            return "thinking (configured)"
+
+        items: list[SelectItem[str]] = []
         for m in filtered_models:
-            star = "★ " if m.model_name == config.main_model else "  "
-            model_id_str = model_id_with_thinking[m.model_name]
-            title = f"{star}{m.model_name:<{max_model_name_length}}   →  {model_id_str:<{max_model_id_length}} @ {m.provider}"
-            choices.append(questionary.Choice(title=title, value=m.model_name))
+            model_id = m.model_params.model or "N/A"
+            first_line_prefix = f"{m.model_name:<{max_model_name_length}}  → "
+            thinking_info = _thinking_info(m)
+            meta_parts = [m.provider]
+            if thinking_info:
+                meta_parts.append(thinking_info)
+            if m.model_params.verbosity:
+                meta_parts.append(f"verbosity {m.model_params.verbosity}")
+            meta_line = "   " + " · ".join(meta_parts)
+            title = [
+                ("class:msg", first_line_prefix),
+                ("class:msg bold", f"{model_id}\n"),
+                ("class:meta", f"{meta_line}\n\n"),
+            ]
+            search_text = f"{m.model_name} {model_id} {m.provider}"
+            items.append(SelectItem(title=title, value=m.model_name, search_text=search_text))
 
         try:
             message = f"Select a model (filtered by '{preferred}'):" if preferred else "Select a model:"
-            result = questionary.select(
+            result = select_one(
                 message=message,
-                choices=choices,
+                items=items,
                 pointer="→",
-                instruction="↑↓ to move • Enter to select",
-                use_jk_keys=False,
                 use_search_filter=True,
-                style=questionary.Style(
+                initial_value=config.main_model,
+                style=Style(
                     [
-                        ("instruction", "ansibrightblack"),
-                        ("pointer", "ansicyan"),
-                        ("highlighted", "ansicyan"),
+                        ("pointer", "ansigreen"),
+                        ("highlighted", "ansigreen"),
+                        ("msg", ""),
+                        ("meta", "fg:ansibrightblack"),
                         ("text", "ansibrightblack"),
+                        ("question", ""),
+                        ("search_prefix", "ansibrightblack"),
                         # search filter colors at the bottom
                         ("search_success", "noinherit fg:ansigreen"),
                         ("search_none", "noinherit fg:ansired"),
-                        ("question-mark", "fg:ansigreen"),
                     ]
                 ),
-            ).ask()
+            )
             if isinstance(result, str) and result in names:
                 return result
         except KeyboardInterrupt:
             return None
     except Exception as e:
-        log((f"Failed to use questionary for model selection: {e}", "yellow"))
+        log((f"Failed to use prompt_toolkit for model selection: {e}", "yellow"))
         # Never return an unvalidated model name here.
         # If we can't interactively select, fall back to a known configured model.
         if isinstance(preferred, str) and preferred in names:

{klaude_code-1.2.30 → klaude_code-1.4.0}/src/klaude_code/core/tool/__init__.py

@@ -1,6 +1,7 @@
 from .file.apply_patch import DiffError, process_patch
 from .file.apply_patch_tool import ApplyPatchTool
 from .file.edit_tool import EditTool
+from .file.move_tool import MoveTool
 from .file.read_tool import ReadTool
 from .file.write_tool import WriteTool
 from .report_back_tool import ReportBackTool
@@ -35,6 +36,7 @@ __all__ = [
     "EditTool",
     "FileTracker",
     "MermaidTool",
+    "MoveTool",
     "ReadTool",
     "ReportBackTool",
     "SafetyCheckResult",

klaude_code-1.4.0/src/klaude_code/core/tool/file/move_tool.md

@@ -0,0 +1,41 @@
+Moves a range of lines from one file to another.
+
+Usage:
+- Cuts lines from `start_line` to `end_line` (inclusive, 1-indexed) from the source file
+- Pastes them into the target file at `insert_line` (inserted before that line)
+- Both files must have been read first using the Read tool
+- To create a new target file, set `insert_line` to 1 and ensure target file does not exist
+- For same-file moves, line numbers refer to the original file state before any changes
+- Use this tool when refactoring code into separate modules to avoid passing large code blocks twice
+- To move files or directories, use the Bash tool with `mv` command instead
+
+Return format:
+The tool returns context snippets showing the state after the operation:
+
+1. Source file context (after cut): Shows 3 lines before and after the cut location
+2. Target file context (after insert): Shows 3 lines before the inserted content, the inserted content itself, and 3 lines after
+
+Example output:
+```
+Cut 8 lines from /path/source.py (lines 9-16) and pasted into /path/target.py (updated) at line 10.
+
+Source file context (after cut):
+     6	    return value
+     7	
+     8	
+  -------- cut here --------
+     9	class NextClass:
+    10	    pass
+    11	
+
+Target file context (after insert):
+     7	    return {}
+     8	
+     9	
+  -------- inserted --------
+    10	class MovedClass:
+    ...
+    17	        return result
+  -------- end --------
+    18	# Next section
+```