jarvis-ai-assistant 0.3.18__py3-none-any.whl → 0.3.20__py3-none-any.whl

jarvis/jarvis_utils/input.py

@@ -9,7 +9,10 @@
 - 用于输入控制的自定义键绑定
 """
 import os
+import sys
+import base64
 from typing import Iterable, List
+import wcwidth
 
 from colorama import Fore
 from colorama import Style as ColoramaStyle
@@ -26,6 +29,8 @@ from prompt_toolkit.document import Document
 from prompt_toolkit.formatted_text import FormattedText
 from prompt_toolkit.history import FileHistory
 from prompt_toolkit.key_binding import KeyBindings
+from prompt_toolkit.enums import DEFAULT_BUFFER
+from prompt_toolkit.filters import has_focus
 from prompt_toolkit.layout.containers import Window
 from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.layout.layout import Layout
@@ -39,10 +44,63 @@ from jarvis.jarvis_utils.tag import ot
 
 # Sentinel value to indicate that Ctrl+O was pressed
 CTRL_O_SENTINEL = "__CTRL_O_PRESSED__"
+# Sentinel prefix to indicate that Ctrl+F (fzf) inserted content should prefill next prompt
+FZF_INSERT_SENTINEL_PREFIX = "__FZF_INSERT__::"
+# Sentinel to request running fzf outside the prompt and then prefill next prompt
+FZF_REQUEST_SENTINEL_PREFIX = "__FZF_REQUEST__::"
 
 # Persistent hint marker for multiline input (shown only once across runs)
 _MULTILINE_HINT_MARK_FILE = os.path.join(get_data_dir(), "multiline_enter_hint_shown")
 
+def _display_width(s: str) -> int:
+    """Calculate printable width of a string in terminal columns (handles wide chars)."""
+    try:
+        w = 0
+        for ch in s:
+            cw = wcwidth.wcwidth(ch)
+            if cw is None or cw < 0:
+                # Fallback for unknown width chars (e.g. emoji on some terminals)
+                cw = 1
+            w += cw
+        return w
+    except Exception:
+        return len(s)
+
+def _calc_prompt_rows(prev_text: str) -> int:
+    """
+    Estimate how many terminal rows the previous prompt occupied.
+    Considers prompt prefix and soft-wrapping across terminal columns.
+    """
+    try:
+        cols = os.get_terminal_size().columns
+    except Exception:
+        cols = 80
+    prefix = "👤 > "
+    prefix_w = _display_width(prefix)
+
+    if prev_text is None:
+        return 1
+
+    lines = prev_text.splitlines()
+    if not lines:
+        lines = [""]
+    # If the text ends with a newline, there is a visible empty line at the end.
+    if prev_text.endswith("\n"):
+        lines.append("")
+    total_rows = 0
+    for i, line in enumerate(lines):
+        lw = _display_width(line)
+        if i == 0:
+            width = prefix_w + lw
+        else:
+            width = lw
+        rows = max(1, (width + cols - 1) // cols)
+        total_rows += rows
+    return max(1, total_rows)
+
+
+
+
 
 def _multiline_hint_already_shown() -> bool:
     """Check if the multiline Enter hint has been shown before (persisted)."""
@@ -68,8 +126,9 @@ def get_single_line_input(tip: str, default: str = "") -> str:
     获取支持历史记录的单行输入。
     """
     session: PromptSession = PromptSession(history=None)
-    style = PromptStyle.from_dict({"prompt": "ansicyan"})
-    return session.prompt(f"{tip}", default=default, style=style)
+    style = PromptStyle.from_dict({"prompt": "ansicyan", "bottom-toolbar": "fg:#888888"})
+    prompt = FormattedText([("class:prompt", f"👤 > {tip}")])
+    return session.prompt(prompt, default=default, style=style)
 
 
 def get_choice(tip: str, choices: List[str]) -> str:
@@ -289,14 +348,14 @@ def _show_history_and_copy():
         PrettyOutput.print("没有可复制的消息", OutputType.INFO)
         return
 
-    print("\n" + "=" * 20 + " 消息历史记录 " + "=" * 20)
+    PrettyOutput.print("\n" + "=" * 20 + " 消息历史记录 " + "=" * 20, OutputType.INFO)
     for i, msg in enumerate(history):
         cleaned_msg = msg.replace("\n", r"\n")
         display_msg = (
             (cleaned_msg[:70] + "...") if len(cleaned_msg) > 70 else cleaned_msg
         )
-        print(f"  {i + 1}: {display_msg.strip()}")
-    print("=" * 58 + "\n")
+        PrettyOutput.print(f"  {i + 1}: {display_msg.strip()}", OutputType.INFO)
+    PrettyOutput.print("=" * 58 + "\n", OutputType.INFO)
 
     while True:
         try:
@@ -305,11 +364,11 @@ def _show_history_and_copy():
 
             if not choice_str:  # User pressed Enter
                 if not history:
-                    print("没有历史记录可供选择。")
+                    PrettyOutput.print("没有历史记录可供选择。", OutputType.INFO)
                     break
                 choice = len(history) - 1
             elif choice_str.lower() == "c":
-                print("已取消")
+                PrettyOutput.print("已取消", OutputType.INFO)
                 break
             else:
                 choice = int(choice_str) - 1
@@ -322,23 +381,23 @@ def _show_history_and_copy():
                 )
                 break
             else:
-                print("无效的序号，请重试。")
+                PrettyOutput.print("无效的序号，请重试。", OutputType.WARNING)
         except ValueError:
-            print("无效的输入，请输入数字。")
+            PrettyOutput.print("无效的输入，请输入数字。", OutputType.WARNING)
         except (KeyboardInterrupt, EOFError):
-            print("\n操作取消")
+            PrettyOutput.print("\n操作取消", OutputType.INFO)
             break
 
 
-def _get_multiline_input_internal(tip: str) -> str:
+def _get_multiline_input_internal(tip: str, preset: str | None = None, preset_cursor: int | None = None) -> str:
     """
     Internal function to get multiline input using prompt_toolkit.
     Returns a sentinel value if Ctrl+O is pressed.
     """
     bindings = KeyBindings()
 
-    # Show a one-time hint on the first Enter press in this invocation
-    first_enter_hint_shown = False
+    # Show a one-time hint on the first Enter press in this invocation (disabled; using inlay toolbar instead)
+    first_enter_hint_shown = True
 
     @bindings.add("enter")
     def _(event):
@@ -347,8 +406,9 @@ def _get_multiline_input_internal(tip: str) -> str:
             first_enter_hint_shown = True
 
             def _show_notice():
-                print(
-                    f"{Fore.YELLOW}提示：当前支持多行输入。输入完成请使用 Ctrl+J 确认；Enter 仅用于换行。{ColoramaStyle.RESET_ALL}"
+                PrettyOutput.print(
+                    "提示：当前支持多行输入。输入完成请使用 Ctrl+J 确认；Enter 仅用于换行。",
+                    OutputType.INFO,
                 )
                 try:
                     input("按回车继续...")
@@ -372,16 +432,112 @@ def _get_multiline_input_internal(tip: str) -> str:
         else:
             event.current_buffer.insert_text("\n")
 
-    @bindings.add("c-j")
+    @bindings.add("c-j", filter=has_focus(DEFAULT_BUFFER))
     def _(event):
         event.current_buffer.validate_and_handle()
 
-    @bindings.add("c-o")
+    @bindings.add("c-o", filter=has_focus(DEFAULT_BUFFER))
     def _(event):
         """Handle Ctrl+O by exiting the prompt and returning the sentinel value."""
         event.app.exit(result=CTRL_O_SENTINEL)
 
-    style = PromptStyle.from_dict({"prompt": "ansicyan"})
+    @bindings.add("c-t", filter=has_focus(DEFAULT_BUFFER))
+    def _(event):
+        """Return a shell command like '!bash' for upper input_handler to execute."""
+        def _gen_shell_cmd() -> str:  # type: ignore
+            try:
+                import os
+                import shutil
+
+                if os.name == "nt":
+                    # Prefer PowerShell if available, otherwise fallback to cmd
+                    for name in ("pwsh", "powershell", "cmd"):
+                        if name == "cmd" or shutil.which(name):
+                            return f"!{name}"
+                else:
+                    shell_path = os.environ.get("SHELL", "")
+                    if shell_path:
+                        base = os.path.basename(shell_path)
+                        if base:
+                            return f"!{base}"
+                    for name in ("fish", "zsh", "bash", "sh"):
+                        if shutil.which(name):
+                            return f"!{name}"
+                    return "!bash"
+            except Exception:
+                return "!bash"
+
+        # Append a special marker to indicate no-confirm execution in shell_input_handler
+        event.app.exit(result=_gen_shell_cmd() + " # JARVIS-NOCONFIRM")
+
+
+    @bindings.add("@", filter=has_focus(DEFAULT_BUFFER), eager=True)
+    def _(event):
+        """
+        使用 @ 触发 fzf（当 fzf 存在）；否则仅插入 @ 以启用内置补全
+        逻辑：
+        - 若检测到系统存在 fzf，则先插入 '@'，随后请求外层运行 fzf 并在返回后进行替换/插入
+        - 若不存在 fzf 或发生异常，则直接插入 '@'
+        """
+        try:
+            import shutil
+            buf = event.current_buffer
+            if shutil.which("fzf") is None:
+                buf.insert_text("@")
+                return
+            # 先插入 '@'，以便外层根据最后一个 '@' 进行片段替换
+            buf.insert_text("@")
+            doc = buf.document
+            text = doc.text
+            cursor = doc.cursor_position
+            payload = f"{cursor}:{base64.b64encode(text.encode('utf-8')).decode('ascii')}"
+            event.app.exit(result=FZF_REQUEST_SENTINEL_PREFIX + payload)
+            return
+        except Exception:
+            try:
+                event.current_buffer.insert_text("@")
+            except Exception:
+                pass
+
+    style = PromptStyle.from_dict(
+        {
+            "prompt": "ansibrightmagenta bold",
+            "bottom-toolbar": "bg:#4b145b #ffd6ff bold",
+            "bt.tip": "bold fg:#ff5f87",
+            "bt.sep": "fg:#ffb3de",
+            "bt.key": "bg:#d7005f #ffffff bold",
+            "bt.label": "fg:#ffd6ff",
+        }
+    )
+
+    def _bottom_toolbar():
+        return FormattedText(
+            [
+                ("class:bt.tip", f" {tip} "),
+                ("class:bt.sep", " • "),
+                ("class:bt.label", "快捷键: "),
+                ("class:bt.key", "@"),
+                ("class:bt.label", " 文件补全 "),
+                ("class:bt.sep", " • "),
+                ("class:bt.key", "Tab"),
+                ("class:bt.label", " 选择 "),
+                ("class:bt.sep", " • "),
+                ("class:bt.key", "Ctrl+J"),
+                ("class:bt.label", " 确认 "),
+                ("class:bt.sep", " • "),
+                ("class:bt.key", "Ctrl+O"),
+                ("class:bt.label", " 历史复制 "),
+                ("class:bt.sep", " • "),
+                ("class:bt.key", "@"),
+                ("class:bt.label", " FZF文件 "),
+                ("class:bt.sep", " • "),
+                ("class:bt.key", "Ctrl+T"),
+                ("class:bt.label", " 终端(!SHELL) "),
+                ("class:bt.sep", " • "),
+                ("class:bt.key", "Ctrl+C/D"),
+                ("class:bt.label", " 取消 "),
+            ]
+        )
 
     history_dir = get_data_dir()
     session: PromptSession = PromptSession(
@@ -394,33 +550,163 @@ def _get_multiline_input_internal(tip: str) -> str:
         mouse_support=False,
     )
 
-    print(f"{Fore.GREEN}{tip}{ColoramaStyle.RESET_ALL}")
-    prompt = FormattedText([("class:prompt", ">>> ")])
+    # Tip is shown in bottom toolbar; avoid extra print
+    prompt = FormattedText([("class:prompt", "👤 > ")])
+
+    def _pre_run():
+        try:
+            from prompt_toolkit.application.current import get_app as _ga
+            app = _ga()
+            buf = app.current_buffer
+            if preset is not None and preset_cursor is not None:
+                cp = max(0, min(len(buf.text), preset_cursor))
+                buf.cursor_position = cp
+        except Exception:
+            pass
 
     try:
-        return session.prompt(prompt, style=style, pre_run=lambda: None).strip()
+        return session.prompt(
+            prompt,
+            style=style,
+            pre_run=_pre_run,
+            bottom_toolbar=_bottom_toolbar,
+            default=(preset or ""),
+        ).strip()
     except (KeyboardInterrupt, EOFError):
         return ""
 
 
-def get_multiline_input(tip: str) -> str:
+def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
     """
     获取带有增强补全和确认功能的多行输入。
     此函数处理控制流，允许在不破坏终端状态的情况下处理历史记录复制。
-    """
-    PrettyOutput.section(
-        "用户输入 - 使用 @ 触发文件补全，Tab 选择补全项，Ctrl+J 确认，Ctrl+O 从历史记录中选择消息复制，按 Ctrl+C/D 取消输入",
-        OutputType.USER,
-    )
 
+    参数:
+        tip: 提示文本，将显示在底部工具栏中
+        print_on_empty: 当输入为空字符串时，是否打印“输入已取消”提示。默认打印。
+    """
+    preset: str | None = None
+    preset_cursor: int | None = None
     while True:
-        user_input = _get_multiline_input_internal(tip)
+        user_input = _get_multiline_input_internal(tip, preset=preset, preset_cursor=preset_cursor)
 
         if user_input == CTRL_O_SENTINEL:
             _show_history_and_copy()
             tip = "请继续输入（或按Ctrl+J确认）:"
             continue
+        elif isinstance(user_input, str) and user_input.startswith(FZF_REQUEST_SENTINEL_PREFIX):
+            # Handle fzf request outside the prompt, then prefill new text.
+            try:
+                payload = user_input[len(FZF_REQUEST_SENTINEL_PREFIX) :]
+                sep_index = payload.find(":")
+                cursor = int(payload[:sep_index])
+                text = base64.b64decode(payload[sep_index + 1 :].encode("ascii")).decode("utf-8")
+            except Exception:
+                # Malformed payload; just continue without change.
+                preset = None
+                tip = "FZF 预填失败，继续输入:"
+                continue
+
+            # Run fzf to get a file selection synchronously (outside prompt)
+            selected_path = ""
+            try:
+                import shutil
+                import subprocess
+
+                if shutil.which("fzf") is None:
+                    PrettyOutput.print("未检测到 fzf，无法打开文件选择器。", OutputType.WARNING)
+                else:
+                    files: list[str] = []
+                    try:
+                        r = subprocess.run(
+                            ["git", "ls-files"],
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.PIPE,
+                            text=True,
+                        )
+                        if r.returncode == 0:
+                            files = [line for line in r.stdout.splitlines() if line.strip()]
+                    except Exception:
+                        files = []
+
+                    if not files:
+                        import os as _os
+                        for root, _, fnames in _os.walk(".", followlinks=False):
+                            for name in fnames:
+                                files.append(_os.path.relpath(_os.path.join(root, name), "."))
+                            if len(files) > 10000:
+                                break
+
+                    if not files:
+                        PrettyOutput.print("未找到可选择的文件。", OutputType.INFO)
+                    else:
+                        try:
+                            specials = [ot("Summary"), ot("Clear"), ot("ToolUsage"), ot("ReloadConfig"), ot("SaveSession")]
+                        except Exception:
+                            specials = []
+                        items = [s for s in specials if isinstance(s, str) and s.strip()] + files
+                        proc = subprocess.run(
+                            ["fzf", "--prompt", "Files> ", "--height", "40%", "--border"],
+                            input="\n".join(items),
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.PIPE,
+                            text=True,
+                        )
+                        sel = proc.stdout.strip()
+                        if sel:
+                            selected_path = sel
+            except Exception as e:
+                PrettyOutput.print(f"FZF 执行失败: {e}", OutputType.ERROR)
+
+            # Compute new text based on selection (or keep original if none)
+            if selected_path:
+                text_before = text[:cursor]
+                last_at = text_before.rfind("@")
+                if last_at != -1 and " " not in text_before[last_at + 1 :]:
+                    # Replace @... segment
+                    inserted = f"'{selected_path}'"
+                    new_text = text[:last_at] + inserted + text[cursor:]
+                    new_cursor = last_at + len(inserted)
+                else:
+                    # Plain insert
+                    inserted = f"'{selected_path}'"
+                    new_text = text[:cursor] + inserted + text[cursor:]
+                    new_cursor = cursor + len(inserted)
+                preset = new_text
+                preset_cursor = new_cursor
+                tip = "已插入文件，继续编辑或按Ctrl+J确认:"
+            else:
+                # No selection; keep original text and cursor
+                preset = text
+                preset_cursor = cursor
+                tip = "未选择文件或已取消，继续编辑:"
+            # 清除上一条输入行（多行安全），避免多清，保守仅按提示行估算
+            try:
+                rows_total = _calc_prompt_rows(text)
+                for _ in range(rows_total):
+                    sys.stdout.write("\x1b[1A")       # 光标上移一行
+                    sys.stdout.write("\x1b[2K\r")     # 清除整行
+                sys.stdout.flush()
+            except Exception:
+                pass
+            continue
+        elif isinstance(user_input, str) and user_input.startswith(FZF_INSERT_SENTINEL_PREFIX):
+            # 从哨兵载荷中提取新文本，作为下次进入提示的预填内容
+            preset = user_input[len(FZF_INSERT_SENTINEL_PREFIX) :]
+            preset_cursor = len(preset)
+
+            # 清除上一条输入行（多行安全），避免多清，保守仅按提示行估算
+            try:
+                rows_total = _calc_prompt_rows(preset)
+                for _ in range(rows_total):
+                    sys.stdout.write("\x1b[1A")
+                    sys.stdout.write("\x1b[2K\r")
+                sys.stdout.flush()
+            except Exception:
+                pass
+            tip = "已插入文件，继续编辑或按Ctrl+J确认:"
+            continue
         else:
-            if not user_input:
-                PrettyOutput.print("\n输入已取消", OutputType.INFO)
+            if not user_input and print_on_empty:
+                PrettyOutput.print("输入已取消", OutputType.INFO)
             return user_input

jarvis/jarvis_utils/methodology.py

@@ -203,12 +203,12 @@ def load_methodology(
 
     try:
         # 加载所有方法论
-        print(f"📁 加载方法论文件...")
+        PrettyOutput.print("📁 加载方法论文件...", OutputType.INFO)
         methodologies = _load_all_methodologies()
         if not methodologies:
-            print(f"❌ 没有找到方法论文件")
+            PrettyOutput.print("没有找到方法论文件", OutputType.WARNING)
             return ""
-        print(f"✅ 加载方法论文件完成 (共 {len(methodologies)} 个)")
+        PrettyOutput.print(f"加载方法论文件完成 (共 {len(methodologies)} 个)", OutputType.SUCCESS)
 
         if platform_name:
             platform = PlatformRegistry().create_platform(platform_name)