jarvis-ai-assistant 0.3.19__tar.gz → 0.3.20__tar.gz

{jarvis_ai_assistant-0.3.19/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.19
+Version: 0.3.20
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.3.19 → jarvis_ai_assistant-0.3.20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.19"
+version = "0.3.20"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.3.19 → jarvis_ai_assistant-0.3.20}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.19",
+    version="0.3.20",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.3.19 → jarvis_ai_assistant-0.3.20}/src/jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.3.19"
+__version__ = "0.3.20"

{jarvis_ai_assistant-0.3.19 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_agent/__init__.py

@@ -223,6 +223,7 @@ class Agent:
         use_analysis: Optional[bool] = None,
         force_save_memory: Optional[bool] = None,
         files: Optional[List[str]] = None,
+        confirm_callback: Optional[Callable[[str, bool], bool]] = None,
     ):
         """初始化Jarvis Agent实例
 
@@ -241,6 +242,7 @@ class Agent:
             use_methodology: 是否使用方法论
             use_analysis: 是否使用任务分析
             force_save_memory: 是否强制保存记忆
+            confirm_callback: 用户确认回调函数，签名为 (tip: str, default: bool) -> bool；默认使用CLI的user_confirm
         """
         # 基础属性初始化
         self.files = files or []
@@ -254,6 +256,11 @@ class Agent:
         self.user_data: Dict[str, Any] = {}
         self.after_tool_call_cb: Optional[Callable[[Agent], None]] = None
 
+        # 用户确认回调：默认使用 CLI 的 user_confirm，可由外部注入以支持 TUI/GUI
+        self.user_confirm: Callable[[str, bool], bool] = (
+            confirm_callback or user_confirm  # type: ignore[assignment]
+        )
+
         # 初始化模型和会话
         self._init_model(llm_type, model_group)
         self._init_session()
@@ -811,7 +818,7 @@ class Agent:
             return self._complete_task(auto_completed=False)
 
         if any(handler.can_handle(current_response) for handler in self.output_handler):
-            if user_confirm("检测到有工具调用，是否继续处理工具调用？", True):
+            if self.user_confirm("检测到有工具调用，是否继续处理工具调用？", True):
                 self.session.prompt = f"被用户中断，用户补充信息为：{user_input}\n\n用户同意继续工具调用。"
                 return None  # 继续执行工具调用
             else:
@@ -905,7 +912,7 @@ class Agent:
             f"并且存在3个以上标签重叠的记忆。\n"
             f"是否立即整理记忆库以优化性能和相关性？"
         )
-        if user_confirm(prompt, default=True):
+        if self.user_confirm(prompt, True):
             PrettyOutput.print(
                 f"正在开始整理 '{scope_name}' ({memory_type}) 记忆库...",
                 OutputType.INFO,

{jarvis_ai_assistant-0.3.19 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_agent/config_editor.py

@@ -40,7 +40,7 @@ class ConfigEditor:
 
         if editor:
             try:
-                subprocess.run([editor, str(config_file_path)], check=True)
+                subprocess.run([editor, str(config_file_path)], check=True, shell=(platform.system() == "Windows"))
                 raise typer.Exit(code=0)
             except (subprocess.CalledProcessError, FileNotFoundError) as e:
                 PrettyOutput.print(f"Failed to open editor: {e}", OutputType.ERROR)

{jarvis_ai_assistant-0.3.19 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_agent/shell_input_handler.py

@@ -11,9 +11,24 @@ def shell_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
     if len(cmdline) == 0:
         return user_input, False
     else:
-        script = "\n".join([c[1:] for c in cmdline])
+        marker = "# JARVIS-NOCONFIRM"
+
+        def _clean(line: str) -> str:
+            s = line[1:]  # remove leading '!'
+            # strip no-confirm marker if present
+            idx = s.find(marker)
+            if idx != -1:
+                s = s[:idx]
+            return s.rstrip()
+
+        # Build script while stripping the no-confirm marker from each line
+        script = "\n".join([_clean(c) for c in cmdline])
         PrettyOutput.print(script, OutputType.CODE, lang="bash")
-        if user_confirm(f"是否要执行以上shell脚本？", default=True):
+
+        # If any line contains the no-confirm marker, skip the pre-execution confirmation
+        no_confirm = any(marker in c for c in cmdline)
+
+        if no_confirm or user_confirm(f"是否要执行以上shell脚本？", default=True):
             from jarvis.jarvis_tools.registry import ToolRegistry
 
             output = ToolRegistry().handle_tool_calls(

{jarvis_ai_assistant-0.3.19 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_platform/ai8.py

@@ -50,10 +50,6 @@ class AI8Model(BasePlatform):
         }
 
         self.model_name = os.getenv("JARVIS_MODEL") or "deepseek-chat"
-        if self.model_name not in self.get_available_models():
-            PrettyOutput.print(
-                f"警告: 选择的模型 {self.model_name} 不在可用列表中", OutputType.WARNING
-            )
 
     def set_model_name(self, model_name: str):
         """Set model name"""

{jarvis_ai_assistant-0.3.19 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_platform_manager/service.py

@@ -108,7 +108,7 @@ def start_service(
             OutputType.INFO,
         )
 
-    PrettyOutput.print("Available platforms:", OutputType.INFO)
+
 
     # Platform and model cache
     platform_instances: Dict[str, Any] = {}
@@ -178,7 +178,7 @@ def start_service(
                                 }
                             )
             except Exception as exc:
-                print(f"Error getting models for {default_platform}: {str(exc)}")
+                PrettyOutput.print(f"Error getting models for {default_platform}: {str(exc)}", OutputType.ERROR)
 
         # Return model list
         return {"object": "list", "data": model_list}

{jarvis_ai_assistant-0.3.19 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_smart_shell/main.py

@@ -24,7 +24,7 @@ Example:
 
 def execute_command(command: str, should_run: bool) -> None:
     """Print command without execution"""
-    print(command)
+    PrettyOutput.print(command, OutputType.CODE, lang="bash")
     if should_run:
         os.system(command)
 

{jarvis_ai_assistant-0.3.19 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_stats/cli.py

@@ -16,6 +16,7 @@ from pathlib import Path
 from .stats import StatsManager
 from jarvis.jarvis_utils.utils import init_env
 from jarvis.jarvis_utils.config import get_data_dir
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 app = typer.Typer(help="Jarvis 统计模块命令行工具")
 console = Console()
@@ -291,7 +292,7 @@ def export(
 
     if output == "json":
         # JSON格式输出
-        print(json.dumps(data, indent=2, ensure_ascii=False))
+        PrettyOutput.print(json.dumps(data, indent=2, ensure_ascii=False), OutputType.CODE, lang="json")
     else:
         # CSV格式输出
         records = data.get("records", [])

{jarvis_ai_assistant-0.3.19 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_stats/stats.py

@@ -9,6 +9,7 @@ from typing import Dict, List, Optional, Union, Any
 
 from jarvis.jarvis_stats.storage import StatsStorage
 from jarvis.jarvis_stats.visualizer import StatsVisualizer
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class StatsManager:
@@ -307,7 +308,6 @@ class StatsManager:
         """
         storage = StatsManager._get_storage()
         storage.delete_old_data(days_to_keep)
-        print(f"已清理 {days_to_keep} 天前的数据")
 
     @staticmethod
     def remove_metric(metric_name: str) -> bool:
@@ -440,7 +440,7 @@ class StatsManager:
         )
 
         if not aggregated:
-            print(f"没有找到指标 '{metric_name}' 的数据")
+            PrettyOutput.print(f"没有找到指标 '{metric_name}' 的数据", OutputType.WARNING)
             return
 
         # 获取指标信息
@@ -474,7 +474,7 @@ class StatsManager:
             show_values=True,
         )
 
-        print(chart)
+        PrettyOutput.print(chart, OutputType.CODE, lang="text")
 
         # 显示时间范围
         from rich.panel import Panel
@@ -550,7 +550,7 @@ class StatsManager:
         )
 
         if not aggregated:
-            print(f"没有找到指标 '{metric_name}' 的数据")
+            PrettyOutput.print(f"没有找到指标 '{metric_name}' 的数据", OutputType.WARNING)
             return
 
         # 获取指标信息
@@ -560,7 +560,7 @@ class StatsManager:
         # 显示汇总
         summary = visualizer.show_summary(aggregated, metric_name, unit, tags)
         if summary:  # 如果返回了内容才打印（兼容性）
-            print(summary)
+            PrettyOutput.print(summary, OutputType.INFO)
 
         # 显示时间范围
         from rich.panel import Panel

{jarvis_ai_assistant-0.3.19 → jarvis_ai_assistant-0.3.20}/src/jarvis/jarvis_utils/clipboard.py

@@ -12,7 +12,7 @@ def copy_to_clipboard(text: str) -> None:
         text: 要复制的文本
     """
     PrettyOutput.print("--- 剪贴板内容开始 ---", OutputType.INFO)
-    PrettyOutput.print(text, OutputType.CODE, lang="text")
+    print(text)
     PrettyOutput.print("--- 剪贴板内容结束 ---", OutputType.INFO)
 
     system = platform.system()

{jarvis_ai_assistant-0.3.19 → jarvis_ai_assistant-0.3.20}/src/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
@@ -41,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)."""
@@ -71,7 +127,7 @@ 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"})
-    prompt = FormattedText([("class:prompt", f"👤 ❯ {tip}")])
+    prompt = FormattedText([("class:prompt", f"👤 > {tip}")])
     return session.prompt(prompt, default=default, style=style)
 
 
@@ -333,7 +389,7 @@ def _show_history_and_copy():
             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.
@@ -385,6 +441,64 @@ def _get_multiline_input_internal(tip: str) -> str:
         """Handle Ctrl+O by exiting the prompt and returning the sentinel value."""
         event.app.exit(result=CTRL_O_SENTINEL)
 
+    @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",
@@ -414,11 +528,17 @@ def _get_multiline_input_internal(tip: str) -> str:
                 ("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(
         history=FileHistory(os.path.join(history_dir, "multiline_input_history")),
@@ -431,14 +551,26 @@ def _get_multiline_input_internal(tip: str) -> str:
     )
 
     # Tip is shown in bottom toolbar; avoid extra print
-    prompt = FormattedText([("class:prompt", "👤 ❯ ")])
+    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,
+            pre_run=_pre_run,
             bottom_toolbar=_bottom_toolbar,
+            default=(preset or ""),
         ).strip()
     except (KeyboardInterrupt, EOFError):
         return ""
@@ -453,14 +585,128 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
         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 and print_on_empty:
-                PrettyOutput.print("\n输入已取消", OutputType.INFO)
+                PrettyOutput.print("输入已取消", OutputType.INFO)
             return user_input