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

jarvis/jarvis_utils/input.py

@@ -363,9 +363,51 @@ 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"
@@ -482,7 +524,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."""
 
@@ -663,6 +705,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
         )

jarvis/jarvis_utils/methodology.py

@@ -54,25 +54,31 @@ def _load_all_methodologies() -> Dict[str, str]:
     # 如果配置了中心方法论仓库，将其添加到加载路径
     central_repo = get_central_methodology_repo()
     if central_repo:
-        # 中心方法论仓库存储在数据目录下的特定位置
-        central_repo_path = os.path.join(get_data_dir(), "central_methodology_repo")
-        methodology_dirs.append(central_repo_path)
-
-        # 确保中心方法论仓库被克隆/更新
-        if not os.path.exists(central_repo_path):
-            try:
-                import subprocess
-
-                PrettyOutput.print(
-                    f"正在克隆中心方法论仓库: {central_repo}", OutputType.INFO
-                )
-                subprocess.run(
-                    ["git", "clone", central_repo, central_repo_path], check=True
-                )
-            except Exception as e:
-                PrettyOutput.print(
-                    f"克隆中心方法论仓库失败: {str(e)}", OutputType.ERROR
-                )
+        # 支持本地目录路径或Git仓库URL
+        expanded = os.path.expanduser(os.path.expandvars(central_repo))
+        if os.path.isdir(expanded):
+            # 直接使用本地目录（支持Git仓库的子目录）
+            methodology_dirs.append(expanded)
+        else:
+            # 中心方法论仓库存储在数据目录下的特定位置
+            central_repo_path = os.path.join(get_data_dir(), "central_methodology_repo")
+            methodology_dirs.append(central_repo_path)
+
+            # 确保中心方法论仓库被克隆/更新
+            if not os.path.exists(central_repo_path):
+                try:
+                    import subprocess
+
+                    PrettyOutput.print(
+                        f"正在克隆中心方法论仓库: {central_repo}", OutputType.INFO
+                    )
+                    subprocess.run(
+                        ["git", "clone", central_repo, central_repo_path], check=True
+                    )
+                except Exception as e:
+                    PrettyOutput.print(
+                        f"克隆中心方法论仓库失败: {str(e)}", OutputType.ERROR
+                    )
 
     # --- 全局每日更新检查 ---
     daily_check_git_updates(methodology_dirs, "methodologies")