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

jarvis/jarvis_utils/input.py

@@ -48,10 +48,13 @@ CTRL_O_SENTINEL = "__CTRL_O_PRESSED__"
 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__::"
+# Sentinel to request running fzf outside the prompt for all-files mode (exclude .git)
+FZF_REQUEST_ALL_SENTINEL_PREFIX = "__FZF_REQUEST_ALL__::"
 
 # 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:
@@ -66,6 +69,7 @@ def _display_width(s: str) -> int:
     except Exception:
         return len(s)
 
+
 def _calc_prompt_rows(prev_text: str) -> int:
     """
     Estimate how many terminal rows the previous prompt occupied.
@@ -99,9 +103,6 @@ def _calc_prompt_rows(prev_text: str) -> int:
     return max(1, total_rows)
 
 
-
-
-
 def _multiline_hint_already_shown() -> bool:
     """Check if the multiline Enter hint has been shown before (persisted)."""
     try:
@@ -126,7 +127,9 @@ def get_single_line_input(tip: str, default: str = "") -> str:
     获取支持历史记录的单行输入。
     """
     session: PromptSession = PromptSession(history=None)
-    style = PromptStyle.from_dict({"prompt": "ansicyan", "bottom-toolbar": "fg:#888888"})
+    style = PromptStyle.from_dict(
+        {"prompt": "ansicyan", "bottom-toolbar": "fg:#888888"}
+    )
     prompt = FormattedText([("class:prompt", f"👤 > {tip}")])
     return session.prompt(prompt, default=default, style=style)
 
@@ -237,24 +240,36 @@ class FileCompleter(Completer):
         self.max_suggestions = 10
         self.min_score = 10
         self.replace_map = get_replace_map()
+        # Caches for file lists to avoid repeated expensive scans
+        self._git_files_cache = None
+        self._all_files_cache = None
+        self._max_walk_files = 10000
 
     def get_completions(
         self, document: Document, _: CompleteEvent
     ) -> Iterable[Completion]:
         text = document.text_before_cursor
         cursor_pos = document.cursor_position
-        at_positions = [i for i, char in enumerate(text) if char == "@"]
-        if not at_positions:
+
+        # Support both '@' (git files) and '#' (all files excluding .git)
+        sym_positions = [(i, ch) for i, ch in enumerate(text) if ch in ("@", "#")]
+        if not sym_positions:
             return
-        current_at_pos = at_positions[-1]
-        if cursor_pos <= current_at_pos:
+        current_pos = None
+        current_sym = None
+        for i, ch in sym_positions:
+            if i < cursor_pos:
+                current_pos = i
+                current_sym = ch
+        if current_pos is None:
             return
-        text_after_at = text[current_at_pos + 1 : cursor_pos]
-        if " " in text_after_at:
+
+        text_after = text[current_pos + 1 : cursor_pos]
+        if " " in text_after:
             return
 
-        file_path = text_after_at.strip()
-        replace_length = len(text_after_at) + 1
+        token = text_after.strip()
+        replace_length = len(text_after) + 1
 
         all_completions = []
         all_completions.extend(
@@ -270,29 +285,50 @@ class FileCompleter(Completer):
             ]
         )
 
+        # File path candidates
         try:
-            import subprocess
+            if current_sym == "@":
+                import subprocess
 
-            result = subprocess.run(
-                ["git", "ls-files"],
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-                text=True,
-            )
-            if result.returncode == 0:
-                all_completions.extend(
-                    [
-                        (path, "File")
-                        for path in result.stdout.splitlines()
-                        if path.strip()
-                    ]
-                )
+                if self._git_files_cache is None:
+                    result = subprocess.run(
+                        ["git", "ls-files"],
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        text=True,
+                    )
+                    if result.returncode == 0:
+                        self._git_files_cache = [
+                            p for p in result.stdout.splitlines() if p.strip()
+                        ]
+                    else:
+                        self._git_files_cache = []
+                paths = self._git_files_cache or []
+            else:
+                import os as _os
+
+                if self._all_files_cache is None:
+                    files: list[str] = []
+                    for root, dirs, fnames in _os.walk(".", followlinks=False):
+                        # Exclude .git directory
+                        dirs[:] = [d for d in dirs if d != ".git"]
+                        for name in fnames:
+                            files.append(
+                                _os.path.relpath(_os.path.join(root, name), ".")
+                            )
+                            if len(files) > self._max_walk_files:
+                                break
+                        if len(files) > self._max_walk_files:
+                            break
+                    self._all_files_cache = files
+                paths = self._all_files_cache or []
+            all_completions.extend([(path, "File") for path in paths])
         except Exception:
             pass
 
-        if file_path:
+        if token:
             scored_items = process.extract(
-                file_path,
+                token,
                 [item[0] for item in all_completions],
                 limit=self.max_suggestions,
             )
@@ -300,20 +336,20 @@ class FileCompleter(Completer):
                 (item[0], item[1]) for item in scored_items if item[1] > self.min_score
             ]
             completion_map = {item[0]: item[1] for item in all_completions}
-            for text, score in scored_items:
-                display_text = f"{text} ({score}%)" if score < 100 else text
+            for t, score in scored_items:
+                display_text = f"{t} ({score}%)" if score < 100 else t
                 yield Completion(
-                    text=f"'{text}'",
+                    text=f"'{t}'",
                     start_position=-replace_length,
                     display=display_text,
-                    display_meta=completion_map.get(text, ""),
+                    display_meta=completion_map.get(t, ""),
                 )
         else:
-            for text, desc in all_completions[: self.max_suggestions]:
+            for t, desc in all_completions[: self.max_suggestions]:
                 yield Completion(
-                    text=f"'{text}'",
+                    text=f"'{t}'",
                     start_position=-replace_length,
-                    display=text,
+                    display=t,
                     display_meta=desc,
                 )
 
@@ -389,7 +425,9 @@ def _show_history_and_copy():
             break
 
 
-def _get_multiline_input_internal(tip: str, preset: str | None = None, preset_cursor: int | None = None) -> 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.
@@ -444,6 +482,7 @@ def _get_multiline_input_internal(tip: str, preset: str | None = None, preset_cu
     @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
@@ -453,24 +492,28 @@ def _get_multiline_input_internal(tip: str, preset: str | None = None, preset_cu
                     # Prefer PowerShell if available, otherwise fallback to cmd
                     for name in ("pwsh", "powershell", "cmd"):
                         if name == "cmd" or shutil.which(name):
-                            return f"!{name}"
+                            if name == "cmd":
+                                # Keep session open with /K and set env for the spawned shell
+                                return "!cmd /K set JARVIS_TERMINAL=1"
+                            else:
+                                # PowerShell or pwsh: set env then remain in session
+                                return f"!{name} -NoExit -Command \"$env:JARVIS_TERMINAL='1'\""
                 else:
                     shell_path = os.environ.get("SHELL", "")
                     if shell_path:
                         base = os.path.basename(shell_path)
                         if base:
-                            return f"!{base}"
+                            return f"!env JARVIS_TERMINAL=1 {base}"
                     for name in ("fish", "zsh", "bash", "sh"):
                         if shutil.which(name):
-                            return f"!{name}"
-                    return "!bash"
+                            return f"!env JARVIS_TERMINAL=1 {name}"
+                    return "!env JARVIS_TERMINAL=1 bash"
             except Exception:
-                return "!bash"
+                return "!env JARVIS_TERMINAL=1 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):
         """
@@ -481,6 +524,7 @@ def _get_multiline_input_internal(tip: str, preset: str | None = None, preset_cu
         """
         try:
             import shutil
+
             buf = event.current_buffer
             if shutil.which("fzf") is None:
                 buf.insert_text("@")
@@ -490,7 +534,9 @@ def _get_multiline_input_internal(tip: str, preset: str | None = None, preset_cu
             doc = buf.document
             text = doc.text
             cursor = doc.cursor_position
-            payload = f"{cursor}:{base64.b64encode(text.encode('utf-8')).decode('ascii')}"
+            payload = (
+                f"{cursor}:{base64.b64encode(text.encode('utf-8')).decode('ascii')}"
+            )
             event.app.exit(result=FZF_REQUEST_SENTINEL_PREFIX + payload)
             return
         except Exception:
@@ -499,6 +545,34 @@ def _get_multiline_input_internal(tip: str, preset: str | None = None, preset_cu
             except Exception:
                 pass
 
+    @bindings.add("#", filter=has_focus(DEFAULT_BUFFER), eager=True)
+    def _(event):
+        """
+        使用 # 触发 fzf（当 fzf 存在），以“全量文件模式”进行选择（排除 .git）；否则仅插入 # 启用内置补全
+        """
+        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_ALL_SENTINEL_PREFIX + payload)
+            return
+        except Exception:
+            try:
+                event.current_buffer.insert_text("#")
+            except Exception:
+                pass
+
     style = PromptStyle.from_dict(
         {
             "prompt": "ansibrightmagenta bold",
@@ -556,6 +630,7 @@ def _get_multiline_input_internal(tip: str, preset: str | None = None, preset_cu
     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:
@@ -588,19 +663,25 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
     preset: str | None = None
     preset_cursor: int | None = None
     while True:
-        user_input = _get_multiline_input_internal(tip, preset=preset, preset_cursor=preset_cursor)
+        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):
+        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")
+                text = base64.b64decode(
+                    payload[sep_index + 1 :].encode("ascii")
+                ).decode("utf-8")
             except Exception:
                 # Malformed payload; just continue without change.
                 preset = None
@@ -614,7 +695,9 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
                 import subprocess
 
                 if shutil.which("fzf") is None:
-                    PrettyOutput.print("未检测到 fzf，无法打开文件选择器。", OutputType.WARNING)
+                    PrettyOutput.print(
+                        "未检测到 fzf，无法打开文件选择器。", OutputType.WARNING
+                    )
                 else:
                     files: list[str] = []
                     try:
@@ -625,15 +708,20 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
                             text=True,
                         )
                         if r.returncode == 0:
-                            files = [line for line in r.stdout.splitlines() if line.strip()]
+                            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), "."))
+                                files.append(
+                                    _os.path.relpath(_os.path.join(root, name), ".")
+                                )
                             if len(files) > 10000:
                                 break
 
@@ -641,12 +729,38 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
                         PrettyOutput.print("未找到可选择的文件。", OutputType.INFO)
                     else:
                         try:
-                            specials = [ot("Summary"), ot("Clear"), ot("ToolUsage"), ot("ReloadConfig"), ot("SaveSession")]
+                            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
+                        try:
+                            replace_map = get_replace_map()
+                            builtin_tags = [
+                                ot(tag)
+                                for tag in replace_map.keys()
+                                if isinstance(tag, str) and tag.strip()
+                            ]
+                        except Exception:
+                            builtin_tags = []
+                        items = (
+                            [s for s in specials if isinstance(s, str) and s.strip()]
+                            + builtin_tags
+                            + files
+                        )
                         proc = subprocess.run(
-                            ["fzf", "--prompt", "Files> ", "--height", "40%", "--border"],
+                            [
+                                "fzf",
+                                "--prompt",
+                                "Files> ",
+                                "--height",
+                                "40%",
+                                "--border",
+                            ],
                             input="\n".join(items),
                             stdout=subprocess.PIPE,
                             stderr=subprocess.PIPE,
@@ -684,13 +798,140 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
             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.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_REQUEST_ALL_SENTINEL_PREFIX
+        ):
+            # Handle fzf request (all-files mode, excluding .git) outside the prompt, then prefill new text.
+            try:
+                payload = user_input[len(FZF_REQUEST_ALL_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) with all files (exclude .git)
+            selected_path = ""
+            try:
+                import shutil
+                import subprocess
+
+                if shutil.which("fzf") is None:
+                    PrettyOutput.print(
+                        "未检测到 fzf，无法打开文件选择器。", OutputType.WARNING
+                    )
+                else:
+                    files: list[str] = []
+                    try:
+                        import os as _os
+
+                        for root, dirs, fnames in _os.walk(".", followlinks=False):
+                            # Exclude .git directories
+                            dirs[:] = [d for d in dirs if d != ".git"]
+                            for name in fnames:
+                                files.append(
+                                    _os.path.relpath(_os.path.join(root, name), ".")
+                                )
+                                if len(files) > 10000:
+                                    break
+                            if len(files) > 10000:
+                                break
+                    except Exception:
+                        files = []
+
+                    if not files:
+                        PrettyOutput.print("未找到可选择的文件。", OutputType.INFO)
+                    else:
+                        try:
+                            specials = [
+                                ot("Summary"),
+                                ot("Clear"),
+                                ot("ToolUsage"),
+                                ot("ReloadConfig"),
+                                ot("SaveSession"),
+                            ]
+                        except Exception:
+                            specials = []
+                        try:
+                            replace_map = get_replace_map()
+                            builtin_tags = [
+                                ot(tag)
+                                for tag in replace_map.keys()
+                                if isinstance(tag, str) and tag.strip()
+                            ]
+                        except Exception:
+                            builtin_tags = []
+                        items = (
+                            [s for s in specials if isinstance(s, str) and s.strip()]
+                            + builtin_tags
+                            + files
+                        )
+                        proc = subprocess.run(
+                            [
+                                "fzf",
+                                "--prompt",
+                                "Files(all)> ",
+                                "--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_hash = text_before.rfind("#")
+                if last_hash != -1 and " " not in text_before[last_hash + 1 :]:
+                    # Replace #... segment
+                    inserted = f"'{selected_path}'"
+                    new_text = text[:last_hash] + inserted + text[cursor:]
+                    new_cursor = last_hash + 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):
+        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)

jarvis/jarvis_utils/methodology.py

@@ -208,7 +208,9 @@ def load_methodology(
         if not methodologies:
             PrettyOutput.print("没有找到方法论文件", OutputType.WARNING)
             return ""
-        PrettyOutput.print(f"加载方法论文件完成 (共 {len(methodologies)} 个)", OutputType.SUCCESS)
+        PrettyOutput.print(
+            f"加载方法论文件完成 (共 {len(methodologies)} 个)", OutputType.SUCCESS
+        )
 
         if platform_name:
             platform = PlatformRegistry().create_platform(platform_name)

jarvis/jarvis_utils/output.py

@@ -20,7 +20,7 @@ from rich.style import Style as RichStyle
 from rich.syntax import Syntax
 from rich.text import Text
 
-from jarvis.jarvis_utils.config import get_pretty_output
+from jarvis.jarvis_utils.config import get_pretty_output, is_print_error_traceback
 from jarvis.jarvis_utils.globals import console, get_agent_list
 from dataclasses import dataclass
 from abc import ABC, abstractmethod
@@ -71,6 +71,7 @@ class OutputEvent:
     - section: 若为章节标题输出，填入标题文本；否则为None
     - context: 额外上下文（预留给TUI/日志等）
     """
+
     text: str
     output_type: OutputType
     timestamp: bool = True
@@ -213,7 +214,9 @@ class ConsoleOutputSink(OutputSink):
             console.print(panel)
         else:
             console.print(content)
-        if event.traceback or event.output_type == OutputType.ERROR:
+        if event.traceback or (
+            event.output_type == OutputType.ERROR and is_print_error_traceback()
+        ):
             try:
                 console.print_exception()
             except Exception as e: