deepy-cli 0.1.9__tar.gz → 0.1.11__tar.gz

{deepy_cli-0.1.9 → deepy_cli-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: deepy-cli
-Version: 0.1.9
+Version: 0.1.11
 Summary: Deepy - Vibe coding for DeepSeek models in your terminal
 Keywords: deepseek,coding-agent,terminal,cli,agents
 Author: kirineko
@@ -238,5 +238,5 @@ assets live outside the package directory and are not included in the wheel.
 
 ## Release Status
 
-Deepy `0.1.9` is released through GitHub and PyPI. Standalone binaries and npm
+Deepy `0.1.11` is released through GitHub and PyPI. Standalone binaries and npm
 wrappers can be added later, but the primary distribution is the Python CLI.

{deepy_cli-0.1.9 → deepy_cli-0.1.11}/README.md

@@ -210,5 +210,5 @@ assets live outside the package directory and are not included in the wheel.
 
 ## Release Status
 
-Deepy `0.1.9` is released through GitHub and PyPI. Standalone binaries and npm
+Deepy `0.1.11` is released through GitHub and PyPI. Standalone binaries and npm
 wrappers can be added later, but the primary distribution is the Python CLI.

{deepy_cli-0.1.9 → deepy_cli-0.1.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "deepy-cli"
-version = "0.1.9"
+version = "0.1.11"
 description = "Deepy - Vibe coding for DeepSeek models in your terminal"
 readme = "README.md"
 authors = [

{deepy_cli-0.1.9 → deepy_cli-0.1.11}/src/deepy/__init__.py

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

deepy_cli-0.1.11/src/deepy/data/tools/AskUserQuestion.md

@@ -0,0 +1,18 @@
+## AskUserQuestion
+
+当澄清信息会明显影响结果时，使用此工具暂停执行并询问用户：意图不明确、
+范围不清楚、用户偏好会影响实现、存在多个实现路线或高影响取舍、下一步需要
+用户批准或决策。
+
+如果用户使用中文提问，问题、选项和说明也优先使用中文；否则匹配用户的语言。
+若用户使用中文，visible thinking/reasoning 也必须使用中文，除非用户明确要求其他语言。
+通常一次只问一个关键问题。若你推荐某个选项，把它放在第一位并在 label 末尾
+标注 `(Recommended)` 或中文等价表达。不要为了低影响细节提问；可以合理假设时
+继续推进并简短说明假设。
+
+Args: `questions` (non-empty array). Each question needs `question` and non-empty `options`;
+each option needs `label` and may include `description`. Use `multiSelect=true` only when
+multiple choices are allowed.
+
+Returns standard JSON with `awaitUserResponse=true`, `metadata.kind="ask_user_question"`,
+and normalized questions.

{deepy_cli-0.1.9 → deepy_cli-0.1.11}/src/deepy/data/tools/edit.md

@@ -11,3 +11,7 @@ The file must be read first. Stale files are rejected. Repeated matches are reje
 `replace_all` is true; candidate snippets can be reused with `snippet_id`. If exact text is
 missing, simple over-escaping may be corrected or closest-match metadata returned. Success
 includes diff metadata.
+
+After repeated `old_string not found` failures, re-read the file. If you know the complete
+intended content, switch to the managed whole-file replacement path instead of deleting
+the file or recreating it through shell commands.

{deepy_cli-0.1.9 → deepy_cli-0.1.11}/src/deepy/data/tools/modify.md

@@ -15,3 +15,8 @@ Args for existing files: `file_path`, `old_string`, `new_string`, optional
 Existing files must be read before editing. Stale edits are rejected. Repeated matches
 are rejected unless `replace_all` is true; candidate snippets can be reused with
 `snippet_id`. Success includes diff metadata.
+
+If several `old_string` attempts fail and you know the complete desired file content,
+re-read the file and use the managed whole-file replacement path. Do not delete the file
+and recreate it with shell commands or here-strings; that bypasses Deepy's encoding,
+newline, and stale-write protections, especially on Windows.

{deepy_cli-0.1.9 → deepy_cli-0.1.11}/src/deepy/data/tools/write.md

@@ -10,3 +10,7 @@ Args: `path`, `content` (complete file content).
 
 Existing files must be read first. If rejected for unread state, read and usually switch
 to `edit` unless a full rewrite was requested. Stale writes are rejected. Success includes diff.
+
+Use this managed path for intentional whole-file replacement when exact edit matching
+keeps failing and the complete final content is known. Do not delete and recreate files
+with shell commands or here-strings, especially for Unicode text on Windows.

{deepy_cli-0.1.9 → deepy_cli-0.1.11}/src/deepy/prompts/system.py

@@ -47,6 +47,7 @@ Core rules:
 - Use `modify` for file changes: `content` only creates new files; existing files use `old_string`/`new_string`.
 - After project generators create scaffold files, read and edit the generated block instead of replacing the file.
 - Run shell commands using the Runtime context's command dialect and path style: `powershell` -> PowerShell with Windows paths; `cmd` -> cmd; `posix` -> POSIX shell.
+- Match visible thinking/reasoning language to the user's latest natural language. If the user asks in Chinese, you MUST write visible thinking/reasoning in Chinese unless they explicitly request another language. Do not switch visible thinking/reasoning to English for Chinese requests.
 - Ask when clarification would materially improve the result: ambiguous intent, unclear scope,
   user preferences, high-impact trade-offs, or required approval. For low-impact details,
   proceed with a reasonable assumption and state it briefly.

{deepy_cli-0.1.9 → deepy_cli-0.1.11}/src/deepy/tools/agents.py

@@ -61,8 +61,11 @@ def build_function_tools(runtime: ToolRuntime) -> list[object]:
         FunctionTool(
             name="AskUserQuestion",
             description=(
-                "When the task has ambiguities or multiple implementation approaches, use this tool "
-                "to pause execution and ask the user a question to get clarification or make a decision."
+                "当用户意图、范围、偏好、实现路线、高影响取舍或必要批准会明显影响结果时，"
+                "use this tool to pause and ask a concise question. Match the user's language; "
+                "for Chinese requests, ask in Chinese. If one option is recommended, list it first "
+                "and mark it as recommended. Do not ask for low-impact details when a reasonable "
+                "assumption can keep progress moving."
             ),
             params_json_schema=ASK_USER_QUESTION_SCHEMA,
             on_invoke_tool=invoke_ask_user_question,

{deepy_cli-0.1.9 → deepy_cli-0.1.11}/src/deepy/tools/builtin.py

@@ -8,6 +8,7 @@ import re
 import signal
 import shutil
 import subprocess
+import sys
 import tempfile
 import time
 import urllib.parse
@@ -1161,6 +1162,7 @@ def _format_web_fetch_output(
 class ToolRuntime:
     cwd: Path
     settings: Settings
+    platform_name: str = field(default_factory=lambda: sys.platform)
     file_state: FileState = field(default_factory=FileState)
     running_processes: dict[str, dict[str, str]] = field(default_factory=dict)
     web_search_calls: int = 0
@@ -1305,13 +1307,22 @@ class ToolRuntime:
         target = _resolve_in_cwd(self.cwd, path)
         ok, error = self.file_state.check_writable(target, require_read=True)
         if not ok:
-            return ToolResult.error_result(name, error or "File is not writable.").to_json()
+            metadata = _stale_write_recovery_metadata(target, error)
+            return ToolResult.error_result(
+                name,
+                error or "File is not writable.",
+                metadata=metadata,
+            ).to_json()
         text_content, repair_metadata, content_error = _coerce_write_content(target, content)
         if content_error is not None:
             return ToolResult.error_result(name, content_error).to_json()
         existing_metadata = _read_text_metadata(target) if target.exists() else None
         old_content = existing_metadata.content if existing_metadata is not None else ""
-        encoding = existing_metadata.encoding if existing_metadata is not None else "utf8"
+        encoding = (
+            existing_metadata.encoding
+            if existing_metadata is not None
+            else _default_new_text_encoding(text_content, platform_name=self.platform_name)
+        )
         line_endings = _detect_line_endings(old_content or text_content)
         normalized_content = _normalize_line_endings(text_content, line_endings)
         target.parent.mkdir(parents=True, exist_ok=True)
@@ -1858,8 +1869,33 @@ def _python_text_encoding(encoding: str) -> str:
     return "utf8"
 
 
+def _default_new_text_encoding(content: str, *, platform_name: str | None = None) -> str:
+    resolved_platform = platform_name or sys.platform
+    if resolved_platform.startswith("win") and _contains_non_ascii(content):
+        return "utf8-sig"
+    return "utf8"
+
+
+def _contains_non_ascii(text: str) -> bool:
+    return any(ord(char) > 0x7F for char in text)
+
+
 def _write_text_with_encoding(path: Path, content: str, encoding: str) -> None:
-    path.write_text(content, encoding=_python_text_encoding(encoding))
+    path.write_bytes(content.encode(_python_text_encoding(encoding)))
+
+
+def _stale_write_recovery_metadata(path: Path, error: str | None) -> dict[str, object]:
+    if error != "File changed since it was read: it no longer exists.":
+        return {}
+    return {
+        "path": str(path),
+        "recovery": (
+            "The file was deleted after Deepy read it. Re-read the path or use a "
+            "managed full-file replacement before deletion; do not recreate Unicode "
+            "files through shell here-strings."
+        ),
+        "recovery_kind": "stale_deleted_file",
+    }
 
 
 def _coerce_write_content(path: Path, content: object) -> tuple[str, dict[str, object], str | None]:

{deepy_cli-0.1.9 → deepy_cli-0.1.11}/src/deepy/ui/ask_user_question.py

@@ -40,6 +40,7 @@ class AskUserQuestionOptionEntry:
 def build_options(question: AskUserQuestionItem | None) -> list[AskUserQuestionOptionEntry]:
     if question is None:
         return []
+    custom_label, custom_description = _custom_answer_text(question.question)
     return [
         *[
             AskUserQuestionOptionEntry(
@@ -49,7 +50,12 @@ def build_options(question: AskUserQuestionItem | None) -> list[AskUserQuestionO
             )
             for option in question.options
         ],
-        AskUserQuestionOptionEntry(label="Other / custom answer", value=OTHER_VALUE, is_other=True),
+        AskUserQuestionOptionEntry(
+            label=custom_label,
+            value=OTHER_VALUE,
+            description=custom_description,
+            is_other=True,
+        ),
     ]
 
 
@@ -177,6 +183,16 @@ def _stripped_string(value: Any) -> str:
     return value.strip() if isinstance(value, str) else ""
 
 
+def _custom_answer_text(question: str) -> tuple[str, str]:
+    if _contains_cjk(question):
+        return "自定义回答", "输入自己的答案。"
+    return "Custom answer", "Type your own answer."
+
+
+def _contains_cjk(value: str) -> bool:
+    return any("\u4e00" <= char <= "\u9fff" for char in value)
+
+
 def _escape_answer_part(value: str) -> str:
     normalized = " ".join(value.split())
     return normalized.replace("\\", "\\\\").replace('"', '\\"')

{deepy_cli-0.1.9 → deepy_cli-0.1.11}/src/deepy/ui/message_view.py

@@ -25,6 +25,16 @@ MAX_DIFF_LINES = 80
 MAX_SYNTAX_SAMPLE_CHARS = 4_000
 MAX_SYNTAX_SAMPLE_LINES = 80
 DIFF_PREVIEW_TOOLS = {"edit", "write"}
+TOOL_DISPLAY_LABELS = {
+    "AskUserQuestion": "AskUserQuestion",
+    "WebFetch": "WebFetch",
+    "WebSearch": "WebSearch",
+    "edit": "Modify",
+    "modify": "Modify",
+    "write": "Write",
+    "read": "Read",
+    "shell": "Shell",
+}
 ROLE_TITLES = {
     "user": "You",
     "assistant": "Deepy",
@@ -88,7 +98,9 @@ def parse_tool_output(output: str) -> ToolOutputView:
     await_user_response = bool(payload.get("awaitUserResponse"))
 
     detail = (error or path or _first_nonempty_line(text_output) or "").strip()
-    summary = f"{name} {status}" + (f" - {_truncate(detail)}" if detail else "")
+    summary = f"{format_tool_display_label(name)} {status}" + (
+        f" - {_truncate(detail)}" if detail else ""
+    )
     return ToolOutputView(
         name=name,
         ok=ok_value,
@@ -119,7 +131,7 @@ def format_tool_call_summary(
         {"name": tool_name, "arguments": arguments or ""},
         project_root=project_root,
     )
-    return f"{tool_name} {snippet}".strip()
+    return f"{format_tool_display_label(tool_name)} {snippet}".strip()
 
 
 def format_tool_progress_summary(
@@ -127,11 +139,24 @@ def format_tool_progress_summary(
     output: str,
 ) -> str:
     view = parse_tool_output(output)
-    base = call_summary.strip() or view.name
+    base = call_summary.strip() or format_tool_display_label(view.name)
     detail = _tool_progress_detail(view)
     return f"{base}  {view.status}" + (f" - {detail}" if detail else "")
 
 
+def format_tool_display_name(name: str) -> str:
+    if name in TOOL_DISPLAY_LABELS:
+        return TOOL_DISPLAY_LABELS[name]
+    stripped = name.strip()
+    if not stripped:
+        return "Tool"
+    return _display_title(stripped)
+
+
+def format_tool_display_label(name: str) -> str:
+    return f"[{format_tool_display_name(name)}]"
+
+
 def tool_diff_preview(output: str, *, max_lines: int = MAX_DIFF_LINES) -> str | None:
     view = parse_tool_output(output)
     diff = _tool_diff_text(view)
@@ -165,9 +190,8 @@ def render_tool_diff_preview(
     if not preview.lines:
         return None
     syntax = _diff_preview_syntax(preview, palette)
-    label = "Wrote" if view.name.lower() == "write" else "Edited"
     return Group(
-        render_diff_preview_header(preview, label=label, palette=palette),
+        render_diff_preview_header(preview, tool_name=view.name, palette=palette),
         *(render_diff_preview_line(line, palette=palette, width=width, syntax=syntax) for line in preview.lines),
     )
 
@@ -185,14 +209,15 @@ def parse_diff_preview_view(diff_preview: str, *, path: str | None = None) -> Di
 def render_diff_preview_header(
     preview: DiffPreview,
     *,
-    label: str,
+    tool_name: str,
     palette: UiPalette | None = None,
 ) -> Text:
     palette = palette or DARK_PALETTE
+    label = format_tool_display_label(tool_name)
     if preview.path:
         label = f"{label} {preview.path}"
     label = f"{label} (+{preview.added} -{preview.removed})"
-    return Text(f"• {label}", style=f"bold {palette.info}")
+    return _tool_label_line(label, style=palette.info, bullet=True)
 
 
 def render_diff_preview_line(
@@ -431,13 +456,33 @@ def render_tool_output(
 ) -> Group:
     palette = palette or DARK_PALETTE
     view = parse_tool_output(output)
-    parts: list[Any] = [Text(view.summary, style=status_style(view.ok, palette))]
+    parts: list[Any] = [_render_tool_summary(view, palette)]
+    shell_output = render_shell_output_block(output, palette=palette)
+    if shell_output:
+        parts.append(shell_output)
     diff = render_tool_diff_preview(output, palette=palette, width=width)
     if diff:
         parts.append(diff)
     return Group(*parts)
 
 
+def render_shell_output_block(
+    output: str,
+    *,
+    palette: UiPalette | None = None,
+) -> Panel | None:
+    palette = palette or DARK_PALETTE
+    view = parse_tool_output(output)
+    if view.name != "shell" or not view.output:
+        return None
+    return Panel(
+        Text(view.output.rstrip("\n"), style=palette.markdown_code_block),
+        title=format_tool_display_label("shell"),
+        border_style=palette.tool,
+        expand=False,
+    )
+
+
 def render_message(
     message: dict[str, Any],
     *,
@@ -471,6 +516,31 @@ def _tool_diff_text(view: ToolOutputView) -> str | None:
     return view.diff_preview or view.diff
 
 
+def _render_tool_summary(view: ToolOutputView, palette: UiPalette) -> Text:
+    style = status_style(view.ok, palette)
+    label = format_tool_display_label(view.name)
+    if not view.summary.startswith(label):
+        return Text(view.summary, style=style)
+    return _tool_label_line(view.summary, style=style)
+
+
+def _tool_label_line(text: str, *, style: str, bullet: bool = False) -> Text:
+    label_match = re.match(r"(\[[^\]]+\])(\s?.*)", text, flags=re.DOTALL)
+    if not label_match:
+        return Text(text, style=style)
+    label, detail = label_match.groups()
+    parts = []
+    if bullet:
+        parts.append(("• ", style))
+    parts.extend(
+        [
+            (label, f"bold underline {style}"),
+            (detail, style),
+        ]
+    )
+    return Text.assemble(*parts)
+
+
 def _parse_hunk_header(line: str) -> tuple[int, int] | None:
     match = re.match(r"@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@", line)
     if not match:
@@ -621,6 +691,13 @@ def _string_or_none(value: Any) -> str | None:
     return None
 
 
+def _display_title(value: str) -> str:
+    parts = [part for part in re.split(r"[_\-\s]+", value) if part]
+    if not parts:
+        return "Tool"
+    return "".join(part[:1].upper() + part[1:] for part in parts)
+
+
 def _first_nonempty_line(value: str) -> str | None:
     for line in value.splitlines():
         stripped = line.strip()

{deepy_cli-0.1.9 → deepy_cli-0.1.11}/src/deepy/ui/prompt_input.py

@@ -24,7 +24,8 @@ DEFAULT_PROMPT_HISTORY = Path.home() / ".deepy" / "prompt-history.txt"
 CTRL_D_EXIT_CONFIRM_SIGNAL = "\0deepy:ctrl-d-exit-confirm\0"
 PROMPT_TOOLBAR_BACKGROUND = "#161821"
 PROMPT_TOOLBAR_FOREGROUND = "#a6adc8"
-PROMPT_TOOLBAR_HELP = "Enter send · Shift+Enter newline · / commands · Esc interrupt · Ctrl+D twice exit"
+PROMPT_TOOLBAR_HELP = "Shift+Enter newline · Ctrl+D twice exit"
+WINDOWS_PROMPT_TOOLBAR_HELP = "Ctrl+J newline · Ctrl+D twice exit"
 PROMPT_MESSAGE: AnyFormattedText = [("class:prompt", "> ")]
 PROMPT_PLACEHOLDER: AnyFormattedText = [("class:placeholder", "Type your message...")]
 PROMPT_TOOLBAR: AnyFormattedText = [("class:toolbar.help", PROMPT_TOOLBAR_HELP)]
@@ -33,8 +34,6 @@ SHIFT_ENTER_SEQUENCES = (
     "\x1b[27;2;13~",  # xterm modified-key format.
     "\x1b[13;2u",  # Kitty/fixterms CSI-u format, used by modern terminals.
 )
-_WINDOWS_SHIFT_ENTER_PATCH_ATTR = "_deepy_shift_enter_patched"
-_WINDOWS_SHIFT_ENTER_VT100_PATCH_ATTR = "_deepy_shift_enter_vt100_patched"
 
 
 @dataclass(frozen=True)
@@ -111,138 +110,20 @@ def install_shift_enter_key_sequence_overrides() -> None:
     prefix_cache = getattr(vt100_parser, "_IS_PREFIX_OF_LONGER_MATCH_CACHE", None)
     if hasattr(prefix_cache, "clear"):
         prefix_cache.clear()
-    install_windows_shift_enter_key_sequence_override()
 
 
-def install_windows_shift_enter_key_sequence_override(
-    *,
-    platform_name: str | None = None,
-    console_input_reader_cls: type | None = None,
-    vt100_console_input_reader_cls: type | None = None,
-    event_types: object | None = None,
-    key_event_record_cls: type | None = None,
-) -> bool:
+def is_windows_newline_fallback_enabled(platform_name: str | None = None) -> bool:
     resolved_platform = platform_name or sys.platform
-    if not resolved_platform.startswith("win"):
-        return False
-    if console_input_reader_cls is None and vt100_console_input_reader_cls is None:
-        try:
-            from prompt_toolkit.input import win32
-        except (AssertionError, ImportError):
-            return False
-        console_input_reader_cls = win32.ConsoleInputReader
-        vt100_console_input_reader_cls = getattr(win32, "Vt100ConsoleInputReader", None)
-        if event_types is None:
-            event_types = getattr(win32, "EventTypes", None)
-        if key_event_record_cls is None:
-            key_event_record_cls = getattr(win32, "KEY_EVENT_RECORD", None)
-    patched = False
-    if console_input_reader_cls is not None:
-        patched = _patch_windows_console_input_reader(console_input_reader_cls) or patched
-    if vt100_console_input_reader_cls is not None:
-        patched = (
-            _patch_windows_vt100_console_input_reader(
-                vt100_console_input_reader_cls,
-                event_types=event_types,
-                key_event_record_cls=key_event_record_cls,
-            )
-            or patched
-        )
-    return patched
-
-
-def _patch_windows_console_input_reader(console_input_reader_cls: type) -> bool:
-    if getattr(console_input_reader_cls, _WINDOWS_SHIFT_ENTER_PATCH_ATTR, False):
-        return True
-
-    from prompt_toolkit.key_binding.key_processor import KeyPress
-
-    original_handler = console_input_reader_cls._event_to_key_presses
-    shift_pressed = getattr(console_input_reader_cls, "SHIFT_PRESSED", 0x0010)
-
-    def patched_event_to_key_presses(self, ev):
-        key_presses = original_handler(self, ev)
-        if _is_windows_shift_enter_key_press(ev, key_presses, shift_pressed=shift_pressed):
-            return [KeyPress(Keys.Escape, ""), key_presses[0]]
-        return key_presses
-
-    setattr(
-        console_input_reader_cls,
-        "_deepy_original_event_to_key_presses",
-        original_handler,
-    )
-    console_input_reader_cls._event_to_key_presses = patched_event_to_key_presses
-    setattr(console_input_reader_cls, _WINDOWS_SHIFT_ENTER_PATCH_ATTR, True)
-    return True
+    return resolved_platform.startswith("win")
 
 
-def _patch_windows_vt100_console_input_reader(
-    vt100_console_input_reader_cls: type,
-    *,
-    event_types: object | None,
-    key_event_record_cls: type | None,
-) -> bool:
-    if event_types is None or key_event_record_cls is None:
-        return False
-    if getattr(vt100_console_input_reader_cls, _WINDOWS_SHIFT_ENTER_VT100_PATCH_ATTR, False):
-        return True
-
-    original_get_keys = vt100_console_input_reader_cls._get_keys
-    shift_pressed = getattr(vt100_console_input_reader_cls, "SHIFT_PRESSED", 0x0010)
-
-    def patched_get_keys(self, read, input_records):
-        for index in range(read.value):
-            input_record = input_records[index]
-            if input_record.EventType not in event_types:
-                continue
-            event_name = event_types[input_record.EventType]
-            event = getattr(input_record.Event, event_name)
-            if not isinstance(event, key_event_record_cls) or not event.KeyDown:
-                continue
-            if _is_windows_shift_enter_event(event, shift_pressed=shift_pressed):
-                yield SHIFT_ENTER_SEQUENCES[0]
-                continue
-            u_char = event.uChar.UnicodeChar
-            if u_char != "\x00":
-                yield u_char
-
-    setattr(
-        vt100_console_input_reader_cls,
-        "_deepy_original_get_keys",
-        original_get_keys,
+def prompt_toolbar(platform_name: str | None = None) -> AnyFormattedText:
+    help_text = (
+        WINDOWS_PROMPT_TOOLBAR_HELP
+        if is_windows_newline_fallback_enabled(platform_name)
+        else PROMPT_TOOLBAR_HELP
     )
-    vt100_console_input_reader_cls._get_keys = patched_get_keys
-    setattr(vt100_console_input_reader_cls, _WINDOWS_SHIFT_ENTER_VT100_PATCH_ATTR, True)
-    return True
-
-
-def _is_windows_shift_enter_key_press(
-    ev,
-    key_presses: list,
-    *,
-    shift_pressed: int,
-) -> bool:
-    if not key_presses or len(key_presses) != 1:
-        return False
-    control_key_state = getattr(ev, "ControlKeyState", 0)
-    if not control_key_state & shift_pressed:
-        return False
-    key = getattr(key_presses[0], "key", None)
-    return key in {Keys.ControlM, Keys.ControlJ, Keys.Enter}
-
-
-def _is_windows_shift_enter_event(ev, *, shift_pressed: int) -> bool:
-    control_key_state = getattr(ev, "ControlKeyState", 0)
-    if not control_key_state & shift_pressed:
-        return False
-    u_char = getattr(getattr(ev, "uChar", None), "UnicodeChar", "")
-    virtual_key_code = getattr(ev, "VirtualKeyCode", None)
-    return u_char in {"\r", "\n"} or virtual_key_code == 13
-
-
-def is_windows_newline_fallback_enabled(platform_name: str | None = None) -> bool:
-    resolved_platform = platform_name or sys.platform
-    return resolved_platform.startswith("win")
+    return [("class:toolbar.help", help_text)]
 
 
 def prompt_for_input(
@@ -254,15 +135,21 @@ def prompt_for_input(
     return session.prompt(
         prompt_message,
         placeholder=PROMPT_PLACEHOLDER,
-        bottom_toolbar=PROMPT_TOOLBAR if bottom_toolbar is None else bottom_toolbar,
+        bottom_toolbar=prompt_toolbar() if bottom_toolbar is None else bottom_toolbar,
     ).strip()
 
 
-def build_prompt_toolbar(context_status: str = "") -> AnyFormattedText:
+def build_prompt_toolbar(
+    context_status: str = "",
+    *,
+    platform_name: str | None = None,
+) -> AnyFormattedText:
     if not context_status:
-        return PROMPT_TOOLBAR
+        return prompt_toolbar(platform_name)
     return [
         ("class:toolbar.context", context_status),
+        ("class:toolbar.separator", " · "),
+        *prompt_toolbar(platform_name),
     ]
 
 

{deepy_cli-0.1.9 → deepy_cli-0.1.11}/src/deepy/ui/terminal.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import asyncio
 import contextlib
 import os
+import re
 import select
 import threading
 import time
@@ -61,9 +62,11 @@ from deepy.ui.ask_user_question import normalize_questions
 from deepy.ui.exit_summary import build_exit_summary_text
 from deepy.ui.message_view import (
     build_thinking_summary,
+    format_tool_display_label,
     format_tool_call_summary,
     format_tool_progress_summary,
     parse_tool_output,
+    render_shell_output_block,
     render_tool_diff_preview,
 )
 from deepy.ui.markdown import render_markdown
@@ -442,8 +445,8 @@ class TerminalStreamRenderer:
         )
         self.status_detail = ""
         self.pending_tool_calls: dict[str, ToolCallDisplay] = {}
-        self.reasoning_text = ""
-        self.reasoning_flushed = False
+        self.reasoning_started = False
+        self.reasoning_buffer = ""
 
     def __call__(self, event: DeepyStreamEvent) -> None:
         _print_stream_event(
@@ -456,11 +459,19 @@ class TerminalStreamRenderer:
         )
 
     def add_reasoning(self, text: str) -> None:
-        if self.reasoning_flushed:
-            self.reasoning_text = ""
-            self.reasoning_flushed = False
-        self.reasoning_text += text
-        summary = build_thinking_summary(self.reasoning_text)
+        if not text:
+            return
+        if not self.reasoning_started:
+            self.console.print(
+                Text.assemble(
+                    ("• ", self.palette.muted),
+                    (format_tool_display_label("Thinking"), f"bold {self.palette.muted}"),
+                ),
+            )
+            self.reasoning_started = True
+        self.reasoning_buffer += text
+        self._print_stable_reasoning()
+        summary = build_thinking_summary(self.reasoning_buffer or text)
         if self.status is not None and summary:
             self.update_status(f"Thinking {summary}")
 
@@ -481,19 +492,17 @@ class TerminalStreamRenderer:
             )
 
     def flush(self) -> None:
-        if self.reasoning_flushed:
-            return
-        summary = build_thinking_summary(self.reasoning_text)
-        if not summary:
-            return
-        self.console.print(
-            Text.assemble(
-                ("• ", self.palette.muted),
-                ("Thinking  ", f"bold {self.palette.muted}"),
-                (summary, self.palette.muted),
-            )
+        self._print_stable_reasoning(force=True)
+        self.reasoning_started = False
+        self.reasoning_buffer = ""
+
+    def _print_stable_reasoning(self, *, force: bool = False) -> None:
+        text, self.reasoning_buffer = _split_stable_reasoning_text(
+            self.reasoning_buffer,
+            force=force,
         )
-        self.reasoning_flushed = True
+        if text:
+            self.console.print(Text(text.rstrip("\n"), style=self.palette.muted))
 
 
 def _handle_slash_command(
@@ -1516,9 +1525,12 @@ def _print_stream_event(
         view = parse_tool_output(event.text)
         call_id = _string_payload(event.payload.get("call_id"))
         call = pending_tool_calls.pop(call_id, None) if pending_tool_calls is not None else None
-        call_summary = call.summary if call is not None else view.name
+        call_summary = call.summary if call is not None else ""
         summary = format_tool_progress_summary(call_summary, event.text)
         console.print(_status_line(summary, status_style(view.ok, palette)))
+        shell_output = render_shell_output_block(event.text, palette=palette)
+        if shell_output:
+            console.print(shell_output)
         diff = render_tool_diff_preview(event.text, palette=palette, width=console.width)
         if diff:
             console.print(diff)
@@ -1536,8 +1548,30 @@ def _string_payload(value: object) -> str:
     return value if isinstance(value, str) else ""
 
 
+_REASONING_BUFFER_TARGET_CHARS = 180
+
+
+def _split_stable_reasoning_text(text: str, *, force: bool = False) -> tuple[str, str]:
+    if force:
+        return text, ""
+    newline_index = text.rfind("\n")
+    if newline_index >= 0:
+        return text[: newline_index + 1], text[newline_index + 1 :]
+    if len(text) >= _REASONING_BUFFER_TARGET_CHARS:
+        return text, ""
+    return "", text
+
+
 def _status_line(text: str, style: str) -> Text:
-    return Text.assemble(("• ", style), (text, f"bold {style}"))
+    label_match = re.match(r"(\[[^\]]+\])(\s?.*)", text, flags=re.DOTALL)
+    if label_match:
+        label, detail = label_match.groups()
+        return Text.assemble(
+            ("• ", style),
+            (label, f"bold underline {style}"),
+            (detail, style),
+        )
+    return Text.assemble(("• ", style), (text, style))
 
 
 def _collect_pending_question_response(
@@ -1569,13 +1603,20 @@ def _prompt_for_question(
         detail = f" - {option.description}" if option.description else ""
         console.print(f"{index}. {option.label}{detail}")
     prompt = (
-        "Answer numbers separated by commas, text, or empty to decline"
+        "Answer numbers separated by commas, custom text, or empty to decline"
         if question.multi_select
-        else "Answer number, text, or empty to decline"
+        else "Answer number, custom text, or empty to decline"
     )
     raw_answer = input_func(prompt).strip()
     if not raw_answer:
         return None
+    direct_option = None if question.multi_select else _option_from_token(options, raw_answer)
+    if direct_option is not None and direct_option.is_other:
+        custom_answer = input_func(_custom_answer_prompt(direct_option)).strip()
+        return build_answer_for_question(question, direct_option, [], custom_answer)
+    if question.multi_select and _multi_select_needs_custom_text(options, raw_answer):
+        custom_answer = input_func(_custom_answer_prompt(options[-1])).strip()
+        raw_answer = f"{raw_answer}, {custom_answer}" if custom_answer else raw_answer
     return _answer_question_from_text(question, raw_answer)
 
 
@@ -1606,6 +1647,26 @@ def _answer_question_from_text(question: AskUserQuestionItem, raw_answer: str) -
     return build_answer_for_question(question, option, [], other_text)
 
 
+def _multi_select_needs_custom_text(
+    options: list[AskUserQuestionOptionEntry],
+    raw_answer: str,
+) -> bool:
+    tokens = [part.strip() for part in raw_answer.split(",") if part.strip()]
+    saw_other = False
+    saw_custom_text = False
+    for token in tokens:
+        option = _option_from_token(options, token)
+        if option is not None and option.is_other:
+            saw_other = True
+        elif option is None:
+            saw_custom_text = True
+    return saw_other and not saw_custom_text
+
+
+def _custom_answer_prompt(option: AskUserQuestionOptionEntry) -> str:
+    return "自定义回答" if option.label.startswith("自定义") else "Custom answer"
+
+
 def _option_from_token(
     options: list[AskUserQuestionOptionEntry],
     token: str,

deepy_cli-0.1.9/src/deepy/data/tools/AskUserQuestion.md

@@ -1,12 +0,0 @@
-## AskUserQuestion
-
-Ask the user when clarification would materially improve the result: ambiguous intent,
-unclear scope, user preferences, high-impact trade-offs, or required approval. Do not
-ask for low-impact details when a reasonable assumption can keep progress moving.
-
-Args: `questions` (non-empty array). Each question needs `question` and non-empty `options`;
-each option needs `label` and may include `description`. Use `multiSelect=true` only when
-multiple choices are allowed.
-
-Returns standard JSON with `awaitUserResponse=true`, `metadata.kind="ask_user_question"`,
-and normalized questions.