jarvis-ai-assistant 0.7.8__py3-none-any.whl → 1.0.2__py3-none-any.whl

jarvis/jarvis_agent/agent_manager.py

@@ -1,16 +1,18 @@
 # -*- coding: utf-8 -*-
 """Agent管理器模块，负责Agent的初始化和任务执行"""
-from typing import Optional, Callable
+
+from typing import Callable
+from typing import Optional
 
 import typer
 
-from jarvis.jarvis_agent import (
-    Agent,
-    get_multiline_input,
-    origin_agent_system_prompt,
-)
+from jarvis.jarvis_agent import Agent
+from jarvis.jarvis_agent import get_multiline_input
+from jarvis.jarvis_agent import origin_agent_system_prompt
 from jarvis.jarvis_agent.task_manager import TaskManager
-from jarvis.jarvis_utils.config import is_non_interactive, is_skip_predefined_tasks
+from jarvis.jarvis_utils.config import is_non_interactive
+from jarvis.jarvis_utils.config import is_skip_predefined_tasks
+from jarvis.jarvis_utils.output import PrettyOutput
 
 
 class AgentManager:
@@ -44,7 +46,7 @@ class AgentManager:
         if self.tool_group:
             from jarvis.jarvis_utils.config import set_config
 
-            set_config("JARVIS_TOOL_GROUP", self.tool_group)
+            set_config("tool_group", self.tool_group)
 
         self.agent = Agent(
             system_prompt=origin_agent_system_prompt,
@@ -60,9 +62,9 @@ class AgentManager:
         # 尝试恢复会话
         if self.restore_session:
             if self.agent.restore_session():
-                print("✅ 会话已成功恢复。")
+                PrettyOutput.auto_print("✅ 会话已成功恢复。")
             else:
-                print("⚠️ 无法恢复会话。")
+                PrettyOutput.auto_print("⚠️ 无法恢复会话。")
 
         return self.agent
 
@@ -77,11 +79,16 @@ class AgentManager:
             raise typer.Exit(code=0)
 
         # 处理预定义任务（非交互模式下跳过；支持配置跳过加载；命令行指定任务时跳过）
-        if not is_non_interactive() and not is_skip_predefined_tasks() and not task_content and self.agent.first:
+        if (
+            not is_non_interactive()
+            and not is_skip_predefined_tasks()
+            and not task_content
+            and self.agent.first
+        ):
             task_manager = TaskManager()
             tasks = task_manager.load_tasks()
             if tasks and (selected_task := task_manager.select_task(tasks)):
-                print(f"ℹ️ 开始执行任务: \n{selected_task}")
+                PrettyOutput.auto_print(f"ℹ️ 开始执行任务: \n{selected_task}")
                 self.agent.run(selected_task)
                 raise typer.Exit(code=0)
 

jarvis/jarvis_agent/builtin_input_handler.py

@@ -1,9 +1,32 @@
 # -*- coding: utf-8 -*-
 import re
 import sys
-from typing import Any, Tuple
+from typing import Any
+from typing import Tuple
 
 from jarvis.jarvis_utils.config import get_replace_map
+from jarvis.jarvis_utils.output import PrettyOutput
+
+
+def _get_rule_content(rule_name: str) -> str | None:
+    """获取规则内容
+
+    参数:
+        rule_name: 规则名称
+
+    返回:
+        str | None: 规则内容，如果未找到则返回 None
+    """
+    try:
+        import os
+
+        from jarvis.jarvis_code_agent.code_agent_rules import RulesManager
+
+        # 使用当前工作目录作为root_dir
+        rules_manager = RulesManager(root_dir=os.getcwd())
+        return rules_manager.get_named_rule(rule_name)
+    except ImportError:
+        return None
 
 
 def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
@@ -26,11 +49,19 @@ def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
     if not special_tags:
         return user_input, False
 
+    # 检查是否包含Pin标记（需要最后处理）
+    has_pin = "Pin" in special_tags
+
     # 获取替换映射表
     replace_map = get_replace_map()
-    # 处理每个标记
+    processed_tag = set()
+    add_on_prompt = ""
+
+    # 处理所有非Pin标记
+    modified_input = user_input
+
     for tag in special_tags:
-        # 优先处理特殊标记
+        # 优先处理会立即返回的特殊标记（不包含Pin）
         if tag == "Summary":
             summary = agent._summarize_and_clear_history()
             memory_tags_prompt = agent.memory_manager.prepare_memory_tags_prompt()
@@ -55,14 +86,19 @@ def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
             return "", True
         elif tag == "SaveSession":
             if agent.save_session():
-                print("✅ 会话已成功保存。正在退出...")
+                PrettyOutput.auto_print("✅ 会话已成功保存。正在退出...")
                 sys.exit(0)
             else:
-                print("❌ 保存会话失败。")
+                PrettyOutput.auto_print("❌ 保存会话失败。")
             return "", True
-
-        processed_tag = set()
-        add_on_prompt = ""
+        elif tag == "Quiet":
+            agent.set_non_interactive(True)
+            PrettyOutput.auto_print("🔇 已切换到静默模式（非交互模式）")
+            modified_input = modified_input.replace("'<Quiet>'", "")
+            continue
+        elif tag == "Pin":
+            # Pin标记最后处理，跳过此处
+            continue
 
         # 处理普通替换标记
         if tag in replace_map:
@@ -72,13 +108,45 @@ def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
                 and replace_map[tag]["append"]
                 and tag not in processed_tag
             ):
-                user_input = user_input.replace(f"'<{tag}>'", "")
+                modified_input = modified_input.replace(f"'<{tag}>'", "")
                 add_on_prompt += replace_map[tag]["template"] + "\n"
             else:
-                user_input = user_input.replace(
+                modified_input = modified_input.replace(
                     f"'<{tag}>'", replace_map[tag]["template"]
                 )
+        elif tag.startswith("rule:"):
+            # 处理 rule:xxx 格式的规则标记
+            rule_name = tag[5:]  # 去掉 "rule:" 前缀
+            rule_content = _get_rule_content(rule_name)
+            if rule_content:
+                # 记录运行时加载的规则到CodeAgent
+                try:
+                    if agent is not None and hasattr(agent, "add_runtime_rule"):
+                        agent.add_runtime_rule(rule_name)
+                except Exception:
+                    # 静默处理任何错误，不影响正常功能
+                    pass
+
+                separator = "\n" + "=" * 50 + "\n"
+                modified_input = modified_input.replace(
+                    f"'<{tag}>'", f"<rule>\n{rule_content}\n</rule>{separator}"
+                )
+
+    # 最后处理Pin标记
+    if has_pin:
+        # 移除所有Pin标记后的处理内容，追加到pin_content
+        processed_content = modified_input.replace("'<Pin>'", "").strip()
+        if processed_content:
+            if agent.pin_content:
+                agent.pin_content += "\n" + processed_content
+            else:
+                agent.pin_content = processed_content
+            PrettyOutput.auto_print(f"📌 已固定内容: {processed_content[:50]}...")
 
+        # 返回处理后的内容（移除了Pin标记）
         agent.set_addon_prompt(add_on_prompt)
+        return processed_content, False
 
-    return user_input, False
+    # 设置附加提示词
+    agent.set_addon_prompt(add_on_prompt)
+    return modified_input, False

jarvis/jarvis_agent/config_editor.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 """配置编辑器模块，负责配置文件的编辑功能"""
+
 import os
 import platform
 import shutil
@@ -9,6 +10,8 @@ from typing import Optional
 
 import typer
 
+from jarvis.jarvis_utils.output import PrettyOutput
+
 
 class ConfigEditor:
     """配置文件编辑器"""
@@ -45,8 +48,10 @@ class ConfigEditor:
                 )
                 raise typer.Exit(code=0)
             except (subprocess.CalledProcessError, FileNotFoundError) as e:
-                print(f"❌ Failed to open editor: {e}")
+                PrettyOutput.auto_print(f"❌ Failed to open editor: {e}")
                 raise typer.Exit(code=1)
         else:
-            print("❌ No suitable editor found. Please install one of: vim, nano, emacs, code")
+            PrettyOutput.auto_print(
+                "❌ No suitable editor found. Please install one of: vim, nano, emacs, code"
+            )
             raise typer.Exit(code=1)

jarvis/jarvis_agent/event_bus.py

@@ -8,8 +8,13 @@
 - 不引入额外依赖，便于在 Agent 中渐进集成
 - 支持优先级排序，优先级数字越小，执行越早
 """
+
 from collections import defaultdict
-from typing import Callable, DefaultDict, List, Any, Tuple
+from typing import Any
+from typing import Callable
+from typing import DefaultDict
+from typing import List
+from typing import Tuple
 
 
 class EventBus:
@@ -18,7 +23,7 @@ class EventBus:
     - subscribe(event, callback, priority=100): 订阅事件，支持优先级
     - emit(event, **kwargs): 广播事件，按优先级顺序执行回调
     - unsubscribe(event, callback): 取消订阅
-    
+
     优先级说明：
     - 数字越小，优先级越高，执行越早
     - 默认优先级为 100（中等优先级）
@@ -29,18 +34,24 @@ class EventBus:
     def __init__(self) -> None:
         # 存储 (priority, order, callback) 元组列表，按优先级和注册顺序排序
         # order 用于相同优先级时保持注册顺序
-        self._listeners: DefaultDict[str, List[Tuple[int, int, Callable[..., None]]]] = defaultdict(list)
+        self._listeners: DefaultDict[
+            str, List[Tuple[int, int, Callable[..., None]]]
+        ] = defaultdict(list)
         # 注册顺序计数器（每个事件独立计数）
         self._order_counter: DefaultDict[str, int] = defaultdict(int)
         # 缓存排序后的回调列表，避免每次emit都排序
-        self._sorted_cache: DefaultDict[str, List[Callable[..., None]]] = defaultdict(list)
+        self._sorted_cache: DefaultDict[str, List[Callable[..., None]]] = defaultdict(
+            list
+        )
         # 标记是否需要重新排序
         self._dirty: DefaultDict[str, bool] = defaultdict(lambda: False)
 
-    def subscribe(self, event: str, callback: Callable[..., None], priority: int = 100) -> None:
+    def subscribe(
+        self, event: str, callback: Callable[..., None], priority: int = 100
+    ) -> None:
         """
         订阅事件。
-        
+
         参数:
             event: 事件名称
             callback: 回调函数
@@ -60,7 +71,7 @@ class EventBus:
     def unsubscribe(self, event: str, callback: Callable[..., None]) -> None:
         """
         取消订阅事件。
-        
+
         参数:
             event: 事件名称
             callback: 要取消的回调函数
@@ -78,33 +89,33 @@ class EventBus:
     def _get_sorted_callbacks(self, event: str) -> List[Callable[..., None]]:
         """
         获取排序后的回调列表（带缓存）。
-        
+
         参数:
             event: 事件名称
-            
+
         返回:
             按优先级排序的回调函数列表（相同优先级时按注册顺序）
         """
         # 如果缓存有效，直接返回
         if not self._dirty[event] and event in self._sorted_cache:
             return self._sorted_cache[event]
-        
+
         # 按优先级排序（数字越小优先级越高），相同优先级时按注册顺序（order）
         listeners = self._listeners[event]
         sorted_listeners = sorted(listeners, key=lambda x: (x[0], x[1]))
         callbacks = [cb for _, _, cb in sorted_listeners]
-        
+
         # 更新缓存
         self._sorted_cache[event] = callbacks
         self._dirty[event] = False
-        
+
         return callbacks
 
     def emit(self, event: str, **payload: Any) -> None:
         """
         广播事件。回调中的异常将被捕获并忽略，以保证主流程稳定。
         回调按优先级顺序执行（优先级数字越小，执行越早）。
-        
+
         参数:
             event: 事件名称
             **payload: 事件负载数据

jarvis/jarvis_agent/events.py

@@ -7,7 +7,10 @@
 - 提供事件负载的类型提示，便于静态检查与后续文档化
 - 本文件仅提供常量与类型定义，不改变现有行为
 """
-from typing import Any, TypedDict, List
+
+from typing import Any
+from typing import List
+from typing import TypedDict
 
 # 事件主题常量
 BEFORE_TOOL_CALL = "before_tool_call"
@@ -44,12 +47,14 @@ class BeforeToolCallEvent(TypedDict, total=False):
     agent: Any
     current_response: str
 
+
 class AfterToolCallEvent(TypedDict, total=False):
     agent: Any
     current_response: str
     need_return: bool
     tool_prompt: str
 
+
 # 任务生命周期
 class TaskStartedEvent(TypedDict, total=False):
     agent: Any
@@ -57,11 +62,13 @@ class TaskStartedEvent(TypedDict, total=False):
     description: str
     user_input: str
 
+
 class TaskCompletedEvent(TypedDict, total=False):
     agent: Any
     auto_completed: bool
     need_summary: bool
 
+
 # 总结阶段
 class BeforeSummaryEvent(TypedDict, total=False):
     agent: Any
@@ -69,10 +76,12 @@ class BeforeSummaryEvent(TypedDict, total=False):
     auto_completed: bool
     need_summary: bool
 
+
 class AfterSummaryEvent(TypedDict, total=False):
     agent: Any
     summary: str
 
+
 # 附加提示
 class BeforeAddonPromptEvent(TypedDict, total=False):
     agent: Any
@@ -80,35 +89,42 @@ class BeforeAddonPromptEvent(TypedDict, total=False):
     current_message: str
     has_session_addon: bool
 
+
 class AfterAddonPromptEvent(TypedDict, total=False):
     agent: Any
     need_complete: bool
     addon_text: str
     final_message: str
 
+
 # 历史清理
 class BeforeHistoryClearEvent(TypedDict, total=False):
     agent: Any
 
+
 class AfterHistoryClearEvent(TypedDict, total=False):
     agent: Any
 
+
 # 模型调用
 class BeforeModelCallEvent(TypedDict, total=False):
     agent: Any
     message: str
 
+
 class AfterModelCallEvent(TypedDict, total=False):
     agent: Any
     message: str
     response: str
 
+
 # 中断
 class InterruptTriggeredEvent(TypedDict, total=False):
     agent: Any
     current_response: str
     user_input: str
 
+
 # 工具筛选
 class BeforeToolFilterEvent(TypedDict, total=False):
     agent: Any
@@ -116,6 +132,7 @@ class BeforeToolFilterEvent(TypedDict, total=False):
     total_tools: int
     threshold: int
 
+
 class ToolFilteredEvent(TypedDict, total=False):
     agent: Any
     task: str
@@ -123,6 +140,7 @@ class ToolFilteredEvent(TypedDict, total=False):
     total_tools: int
     threshold: int
 
+
 __all__ = [
     "BEFORE_TOOL_CALL",
     "AFTER_TOOL_CALL",