jarvis-ai-assistant 0.3.30__py3-none-any.whl → 0.7.6__py3-none-any.whl

jarvis/jarvis_utils/input.py

@@ -13,7 +13,6 @@ import sys
 import base64
 from typing import Iterable, List, Optional
 import wcwidth
-
 from colorama import Fore
 from colorama import Style as ColoramaStyle
 from fuzzywuzzy import process
@@ -35,11 +34,9 @@ from prompt_toolkit.layout.containers import Window
 from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.layout.layout import Layout
 from prompt_toolkit.styles import Style as PromptStyle
-
 from jarvis.jarvis_utils.clipboard import copy_to_clipboard
 from jarvis.jarvis_utils.config import get_data_dir, get_replace_map
 from jarvis.jarvis_utils.globals import get_message_history
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ot
 
 # Sentinel value to indicate that Ctrl+O was pressed
@@ -54,9 +51,8 @@ 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:
         w = 0
         for ch in s:
@@ -69,11 +65,10 @@ 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.
-    Considers prompt prefix and soft-wrapping across terminal columns.
+    估算上一个提示占用了多少终端行数。
+    考虑提示前缀和跨终端列的软换行。
     """
     try:
         cols = os.get_terminal_size().columns
@@ -102,17 +97,15 @@ def _calc_prompt_rows(prev_text: str) -> int:
         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)."""
+    """检查是否已显示过多行输入提示(持久化存储)。"""
     try:
         return os.path.exists(_MULTILINE_HINT_MARK_FILE)
     except Exception:
         return False
 
-
 def _mark_multiline_hint_shown() -> None:
-    """Persist that the multiline Enter hint has been shown."""
+    """持久化存储多行输入提示已显示的状态。"""
     try:
         os.makedirs(os.path.dirname(_MULTILINE_HINT_MARK_FILE), exist_ok=True)
         with open(_MULTILINE_HINT_MARK_FILE, "w", encoding="utf-8") as f:
@@ -121,7 +114,6 @@ def _mark_multiline_hint_shown() -> None:
         # Non-critical persistence failure; ignore to avoid breaking input flow
         pass
 
-
 def get_single_line_input(tip: str, default: str = "") -> str:
     """
     获取支持历史记录的单行输入。
@@ -133,7 +125,6 @@ def get_single_line_input(tip: str, default: str = "") -> str:
     prompt = FormattedText([("class:prompt", f"👤 > {tip}")])
     return session.prompt(prompt, default=default, style=style)
 
-
 def get_choice(tip: str, choices: List[str]) -> str:
     """
     提供一个可滚动的选择列表供用户选择。
@@ -229,7 +220,6 @@ def get_choice(tip: str, choices: List[str]) -> str:
     except (KeyboardInterrupt, EOFError):
         return ""
 
-
 class FileCompleter(Completer):
     """
     带有模糊匹配的文件路径自定义补全器。
@@ -363,25 +353,63 @@ class FileCompleter(Completer):
         return tag
 
 
+# ---------------------
+# 公共判定辅助函数（按当前Agent优先）
+# ---------------------
+def _get_current_agent_for_input():
+    try:
+        import jarvis.jarvis_utils.globals as g
+        current_name = getattr(g, "current_agent_name", "")
+        if current_name:
+            return g.get_agent(current_name)
+    except Exception:
+        pass
+    return None
+def _is_non_interactive_for_current_agent() -> bool:
+    try:
+        from jarvis.jarvis_utils.config import is_non_interactive
+        ag = _get_current_agent_for_input()
+        try:
+            return bool(getattr(ag, "non_interactive", False)) if ag else bool(is_non_interactive())
+        except Exception:
+            return bool(is_non_interactive())
+    except Exception:
+        return False
+def _is_auto_complete_for_current_agent() -> bool:
+    try:
+        from jarvis.jarvis_utils.config import GLOBAL_CONFIG_DATA
+        ag = _get_current_agent_for_input()
+        if ag is not None and hasattr(ag, "auto_complete"):
+            try:
+                return bool(getattr(ag, "auto_complete", False))
+            except Exception:
+                pass
+        env_v = os.getenv("JARVIS_AUTO_COMPLETE")
+        if env_v is not None:
+            return str(env_v).strip().lower() in ("1", "true", "yes", "on")
+        return bool(GLOBAL_CONFIG_DATA.get("JARVIS_AUTO_COMPLETE", False))
+    except Exception:
+        return False
 def user_confirm(tip: str, default: bool = True) -> bool:
-    """提示用户确认是/否问题"""
+    """提示用户确认是/否问题（按当前Agent优先判断非交互）"""
     try:
+        if _is_non_interactive_for_current_agent():
+            return default
         suffix = "[Y/n]" if default else "[y/N]"
         ret = get_single_line_input(f"{tip} {suffix}: ")
         return default if ret == "" else ret.lower() == "y"
     except KeyboardInterrupt:
         return False
 
-
 def _show_history_and_copy():
     """
-    Displays message history and handles copying to clipboard.
-    This function uses standard I/O and is safe to call outside a prompt session.
+    显示消息历史记录并处理复制到剪贴板。
+    此函数使用标准I/O，可在提示会话之外安全调用。
     """
 
     history = get_message_history()
     if not history:
-        PrettyOutput.print("没有可复制的消息", OutputType.INFO)
+        print("ℹ️ 没有可复制的消息")
         return
 
     # 为避免 PrettyOutput 在循环中为每行加框，先拼接后统一打印
@@ -393,8 +421,8 @@ def _show_history_and_copy():
             (cleaned_msg[:70] + "...") if len(cleaned_msg) > 70 else cleaned_msg
         )
         lines.append(f"  {i + 1}: {display_msg.strip()}")
-    lines.append("=" * 58 + "\n")
-    PrettyOutput.print("\n".join(lines), OutputType.INFO)
+        lines.append("=" * 58 + "\n")
+    print("ℹ️ " + "\n".join(lines))
 
     while True:
         try:
@@ -403,11 +431,11 @@ def _show_history_and_copy():
 
             if not choice_str:  # User pressed Enter
                 if not history:
-                    PrettyOutput.print("没有历史记录可供选择。", OutputType.INFO)
+                    print("ℹ️ 没有历史记录可供选择。")
                     break
                 choice = len(history) - 1
             elif choice_str.lower() == "c":
-                PrettyOutput.print("已取消", OutputType.INFO)
+                print("ℹ️ 已取消")
                 break
             else:
                 choice = int(choice_str) - 1
@@ -415,19 +443,16 @@ def _show_history_and_copy():
             if 0 <= choice < len(history):
                 selected_msg = history[choice]
                 copy_to_clipboard(selected_msg)
-                PrettyOutput.print(
-                    f"已复制消息: {selected_msg[:70]}...", OutputType.SUCCESS
-                )
+                print(f"✅ 已复制消息: {selected_msg[:70]}...")
                 break
             else:
-                PrettyOutput.print("无效的序号，请重试。", OutputType.WARNING)
+                print("⚠️ 无效的序号，请重试。")
         except ValueError:
-            PrettyOutput.print("无效的输入，请输入数字。", OutputType.WARNING)
+            print("⚠️ 无效的输入，请输入数字。")
         except (KeyboardInterrupt, EOFError):
-            PrettyOutput.print("\n操作取消", OutputType.INFO)
+            print("\nℹ️ 操作取消")
             break
 
-
 def _get_multiline_input_internal(
     tip: str, preset: Optional[str] = None, preset_cursor: Optional[int] = None
 ) -> str:
@@ -447,10 +472,7 @@ def _get_multiline_input_internal(
             first_enter_hint_shown = True
 
             def _show_notice():
-                PrettyOutput.print(
-                    "提示：当前支持多行输入。输入完成请使用 Ctrl+J 确认；Enter 仅用于换行。",
-                    OutputType.INFO,
-                )
+                print("ℹ️ 提示：当前支持多行输入。输入完成请使用 Ctrl+J 确认；Enter 仅用于换行。")
                 try:
                     input("按回车继续...")
                 except Exception:
@@ -482,7 +504,7 @@ def _get_multiline_input_internal(
         """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))
+    @bindings.add("c-t", filter=has_focus(DEFAULT_BUFFER), eager=True)
     def _(event):
         """Return a shell command like '!bash' for upper input_handler to execute."""
 
@@ -650,7 +672,6 @@ def _get_multiline_input_internal(
     except (KeyboardInterrupt, EOFError):
         return ""
 
-
 def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
     """
     获取带有增强补全和确认功能的多行输入。
@@ -663,6 +684,40 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
     preset: Optional[str] = None
     preset_cursor: Optional[int] = None
     while True:
+        # 基于“当前Agent”精确判断非交互与自动完成，避免多Agent相互干扰
+        if _is_non_interactive_for_current_agent():
+            # 在多Agent系统中，无论是否启用自动完成，均提示可用智能体并建议使用 SEND_MESSAGE 转移控制权
+            hint = ""
+            try:
+                ag = _get_current_agent_for_input()
+                ohs = getattr(ag, "output_handler", [])
+                available_agents: List[str] = []
+                for oh in (ohs or []):
+                    cfgs = getattr(oh, "agents_config", None)
+                    if isinstance(cfgs, list):
+                        for c in cfgs:
+                            try:
+                                name = c.get("name")
+                            except Exception:
+                                name = None
+                            if isinstance(name, str) and name.strip():
+                                available_agents.append(name.strip())
+                if available_agents:
+                    # 去重但保留顺序
+                    seen = set()
+                    ordered = []
+                    for n in available_agents:
+                        if n not in seen:
+                            seen.add(n)
+                            ordered.append(n)
+                    hint = "\n当前可用智能体: " + ", ".join(ordered) + f"\n如需将任务交给其他智能体，请使用 {ot('SEND_MESSAGE')} 块。"
+            except Exception:
+                hint = ""
+            if _is_auto_complete_for_current_agent():
+                base_msg = "我无法与你交互，所有的事情你都自我决策，如果无法决策，就完成任务。输出" + ot("!!!COMPLETE!!!")
+                return base_msg + hint
+            else:
+                return "我无法与你交互，所有的事情你都自我决策" + hint
         user_input = _get_multiline_input_internal(
             tip, preset=preset, preset_cursor=preset_cursor
         )
@@ -695,9 +750,7 @@ 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
-                    )
+                    print("⚠️ 未检测到 fzf，无法打开文件选择器。")
                 else:
                     files = []
                     try:
@@ -726,7 +779,7 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
                                 break
 
                     if not files:
-                        PrettyOutput.print("未找到可选择的文件。", OutputType.INFO)
+                        print("ℹ️ 未找到可选择的文件。")
                     else:
                         try:
                             specials = [
@@ -770,7 +823,7 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
                         if sel:
                             selected_path = sel
             except Exception as e:
-                PrettyOutput.print(f"FZF 执行失败: {e}", OutputType.ERROR)
+                print(f"❌ FZF 执行失败: {e}")
 
             # Compute new text based on selection (or keep original if none)
             if selected_path:
@@ -828,9 +881,7 @@ 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
-                    )
+                    print("⚠️ 未检测到 fzf，无法打开文件选择器。")
                 else:
                     files = []
                     try:
@@ -851,7 +902,7 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
                         files = []
 
                     if not files:
-                        PrettyOutput.print("未找到可选择的文件。", OutputType.INFO)
+                        print("ℹ️ 未找到可选择的文件。")
                     else:
                         try:
                             specials = [
@@ -895,7 +946,7 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
                         if sel:
                             selected_path = sel
             except Exception as e:
-                PrettyOutput.print(f"FZF 执行失败: {e}", OutputType.ERROR)
+                print(f"❌ FZF 执行失败: {e}")
 
             # Compute new text based on selection (or keep original if none)
             if selected_path:
@@ -949,5 +1000,5 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
             continue
         else:
             if not user_input and print_on_empty:
-                PrettyOutput.print("输入已取消", OutputType.INFO)
+                print("ℹ️ 输入已取消")
             return user_input