jarvis-ai-assistant 0.3.32__tar.gz → 0.3.33__tar.gz

{jarvis_ai_assistant-0.3.32/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.32
+Version: 0.3.33
 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.32 → jarvis_ai_assistant-0.3.33}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.32"
+version = "0.3.33"
 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.32 → jarvis_ai_assistant-0.3.33}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.32",
+    version="0.3.33",
     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.32 → jarvis_ai_assistant-0.3.33}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/agent_manager.py

@@ -12,6 +12,7 @@ from jarvis.jarvis_agent import (
     origin_agent_system_prompt,
 )
 from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
+from jarvis.jarvis_agent.file_context_handler import file_context_handler
 from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
 from jarvis.jarvis_agent.task_manager import TaskManager
 from jarvis.jarvis_tools.registry import ToolRegistry
@@ -46,7 +47,11 @@ class AgentManager:
         self.agent = Agent(
             system_prompt=origin_agent_system_prompt,
             model_group=self.model_group,
-            input_handler=[shell_input_handler, builtin_input_handler],
+            input_handler=[
+                shell_input_handler,
+                file_context_handler,
+                builtin_input_handler,
+            ],
             output_handler=[ToolRegistry()],  # type: ignore
             need_summary=False,
             use_methodology=self.use_methodology,

jarvis_ai_assistant-0.3.33/src/jarvis/jarvis_agent/file_context_handler.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+import re
+import os
+from typing import Any, Tuple
+
+from jarvis.jarvis_tools.read_code import ReadCodeTool
+
+
+def is_text_file(filepath: str) -> bool:
+    """
+    Check if a file is a text file.
+    """
+    try:
+        with open(filepath, "r", encoding="utf-8") as f:
+            f.read(1024)  # Try to read a small chunk
+        return True
+    except (UnicodeDecodeError, IOError):
+        return False
+
+
+def count_lines(filepath: str) -> int:
+    """
+    Count the number of lines in a file.
+    """
+    try:
+        with open(filepath, "r", encoding="utf-8", errors="ignore") as f:
+            return sum(1 for _ in f)
+    except IOError:
+        return 0
+
+
+def file_context_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
+    """
+    Extracts file paths from the input, reads their content if they are valid text files
+    and appends the content to the input.
+
+    Args:
+        user_input: The user's input string.
+        agent_: The agent instance.
+
+    Returns:
+        A tuple containing the modified user input and a boolean indicating if
+        further processing should be skipped.
+    """
+    # Regex to find paths in single quotes
+    file_paths = re.findall(r"'([^']+)'", user_input)
+
+    if not file_paths:
+        return user_input, False
+
+    added_context = ""
+    read_code_tool = ReadCodeTool()
+
+    for path in file_paths:
+        if os.path.isfile(path) and is_text_file(path):
+            line_count = count_lines(path)
+            if line_count > 0:
+                # Use ReadCodeTool to get formatted content
+                result = read_code_tool._handle_single_file(path)
+                if result["success"]:
+                    # Remove the file path from the original input to avoid redundancy
+                    user_input = user_input.replace(f"'{path}'", "")
+                    # Append the full, formatted output from the tool, which includes headers and line numbers
+                    added_context += "\n" + result["stdout"]
+
+    if added_context:
+        user_input = user_input.strip() + added_context
+
+    return user_input, False

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/jarvis.py

@@ -215,18 +215,37 @@ def handle_backup_option(backup: bool) -> bool:
     return True
 
 
-def handle_restore_option(restore_path: Optional[str]) -> bool:
+def handle_restore_option(restore_path: Optional[str], config_file: Optional[str]) -> bool:
     """处理数据恢复选项，返回是否已处理并需提前结束。"""
     if not restore_path:
         return False
 
-    restore_file = Path(restore_path)
+    restore_file = Path(os.path.expanduser(os.path.expandvars(restore_path)))
+    # 兼容 ~ 与环境变量，避免用户输入未展开路径导致找不到文件
     if not restore_file.is_file():
-        PrettyOutput.print(f"指定的恢复文件不存在: {restore_path}", OutputType.ERROR)
+        PrettyOutput.print(f"指定的恢复文件不存在: {restore_file}", OutputType.ERROR)
         return True
 
-    init_env("", config_file=None)
-    data_dir = Path(get_data_dir())
+    # 在恢复数据时不要触发完整环境初始化，避免引导流程或网络请求
+    # 优先从配置文件解析 JARVIS_DATA_PATH，否则回退到默认数据目录
+    data_dir_str: Optional[str] = None
+    try:
+        if config_file:
+            cfg_path = Path(os.path.expanduser(os.path.expandvars(config_file)))
+            if cfg_path.is_file():
+                with open(cfg_path, "r", encoding="utf-8", errors="ignore") as cf:
+                    cfg_data = yaml.safe_load(cf) or {}
+                if isinstance(cfg_data, dict):
+                    val = cfg_data.get("JARVIS_DATA_PATH")
+                    if isinstance(val, str) and val.strip():
+                        data_dir_str = val.strip()
+    except Exception:
+        data_dir_str = None
+
+    if not data_dir_str:
+        data_dir_str = get_data_dir()
+
+    data_dir = Path(os.path.expanduser(os.path.expandvars(str(data_dir_str))))
 
     if data_dir.exists():
         if not user_confirm(
@@ -443,6 +462,20 @@ def handle_builtin_config_selector(
                         )
 
             if options:
+                # Add a default option to skip selection
+                options.insert(
+                    0,
+                    {
+                        "category": "skip",
+                        "cmd": "",
+                        "file": "",
+                        "name": "跳过选择 (使用默认通用代理)",
+                        "desc": "直接按回车或ESC也可跳过",
+                        "details": "",
+                        "roles_count": 0,
+                    },
+                )
+
                 PrettyOutput.section("可用的内置配置", OutputType.SUCCESS)
                 # 使用 rich Table 呈现
                 table = Table(show_header=True, header_style="bold magenta")
@@ -511,35 +544,44 @@ def handle_builtin_config_selector(
                 if choice_index != -1:
                     try:
                         sel = options[choice_index]
-                        args: List[str] = []
-
-                        if sel["category"] == "agent":
-                            # jarvis-agent 支持 -f/--config（全局配置）与 -c/--agent-definition
-                            args = [str(sel["cmd"]), "-c", str(sel["file"])]
-                            if model_group:
-                                args += ["-g", str(model_group)]
-                            if config_file:
-                                args += ["-f", str(config_file)]
-                            if task:
-                                args += ["--task", str(task)]
-
-                        elif sel["category"] == "multi_agent":
-                            # jarvis-multi-agent 需要 -c/--config，用户输入通过 -i/--input 传递
-                            args = [str(sel["cmd"]), "-c", str(sel["file"])]
-                            if task:
-                                args += ["-i", str(task)]
-
-                        elif sel["category"] == "roles":
-                            # jarvis-platform-manager role 子命令，支持 -c/-t/-g
-                            args = [str(sel["cmd"]), "role", "-c", str(sel["file"])]
-                            if model_group:
-                                args += ["-g", str(model_group)]
-
-                        if args:
-                            PrettyOutput.print(
-                                f"正在启动: {' '.join(args)}", OutputType.INFO
-                            )
-                            os.execvp(args[0], args)
+                        # If the "skip" option is chosen, do nothing and proceed to default agent
+                        if sel["category"] == "skip":
+                            pass
+                        else:
+                            args: List[str] = []
+
+                            if sel["category"] == "agent":
+                                # jarvis-agent 支持 -f/--config（全局配置）与 -c/--agent-definition
+                                args = [str(sel["cmd"]), "-c", str(sel["file"])]
+                                if model_group:
+                                    args += ["-g", str(model_group)]
+                                if config_file:
+                                    args += ["-f", str(config_file)]
+                                if task:
+                                    args += ["--task", str(task)]
+
+                            elif sel["category"] == "multi_agent":
+                                # jarvis-multi-agent 需要 -c/--config，用户输入通过 -i/--input 传递
+                                args = [str(sel["cmd"]), "-c", str(sel["file"])]
+                                if task:
+                                    args += ["-i", str(task)]
+
+                            elif sel["category"] == "roles":
+                                # jarvis-platform-manager role 子命令，支持 -c/-t/-g
+                                args = [
+                                    str(sel["cmd"]),
+                                    "role",
+                                    "-c",
+                                    str(sel["file"]),
+                                ]
+                                if model_group:
+                                    args += ["-g", str(model_group)]
+
+                            if args:
+                                PrettyOutput.print(
+                                    f"正在启动: {' '.join(args)}", OutputType.INFO
+                                )
+                                os.execvp(args[0], args)
                     except Exception:
                         # 任何异常都不影响默认流程
                         pass
@@ -609,7 +651,7 @@ def run_cli(
         return
 
     # 处理数据恢复
-    if handle_restore_option(restore_data):
+    if handle_restore_option(restore_data, config_file):
         return
 
     # 处理配置文件编辑

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/run_loop.py

@@ -7,6 +7,7 @@ AgentRunLoop: 承载 Agent 的主运行循环逻辑。
 - 暂不变更外部调用入口，后续在 Agent._main_loop 中委派到该类
 - 保持与现有异常处理、工具调用、用户交互完全一致
 """
+import os
 from enum import Enum
 from typing import Any, TYPE_CHECKING
 
@@ -22,6 +23,8 @@ if TYPE_CHECKING:
 class AgentRunLoop:
     def __init__(self, agent: "Agent") -> None:
         self.agent = agent
+        self.conversation_rounds = 0
+        self.tool_reminder_rounds = int(os.environ.get("JARVIS_TOOL_REMINDER_ROUNDS", 20))
 
     def run(self) -> Any:
         """主运行循环（委派到传入的 agent 实例的方法与属性）"""
@@ -29,6 +32,12 @@ class AgentRunLoop:
 
         while True:
             try:
+                self.conversation_rounds += 1
+                if self.conversation_rounds % self.tool_reminder_rounds == 0:
+                    self.agent.session.addon_prompt = join_prompts(
+                        [self.agent.session.addon_prompt, self.agent.get_tool_usage_prompt()]
+                    )
+
                 ag = self.agent
 
                 # 更新输入处理器标志

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -14,6 +14,7 @@ import typer
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_agent.events import AFTER_TOOL_CALL
 from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
+from jarvis.jarvis_agent.file_context_handler import file_context_handler
 from jarvis.jarvis_agent.edit_file_handler import EditFileHandler
 from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
 from jarvis.jarvis_code_agent.lint import get_lint_tools
@@ -89,7 +90,11 @@ class CodeAgent:
             auto_complete=False,
             output_handler=[tool_registry, EditFileHandler()],  # type: ignore
             model_group=model_group,
-            input_handler=[shell_input_handler, builtin_input_handler],
+            input_handler=[
+                shell_input_handler,
+                file_context_handler,
+                builtin_input_handler,
+            ],
             need_summary=need_summary,
             use_methodology=False,  # 禁用方法论
             use_analysis=False,  # 禁用分析

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_data/config_schema.json

@@ -312,6 +312,11 @@
       "description": "是否启用立即中断：在对话迭代中检测到中断信号时立即返回",
       "default": false
     },
+    "JARVIS_SAVE_SESSION_HISTORY": {
+      "type": "boolean",
+      "description": "是否保存会话记录",
+      "default": false
+    },
     "JARVIS_GIT_CHECK_MODE": {
       "type": "string",
       "enum": ["strict", "warn"],

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_multi_agent/__init__.py

@@ -154,9 +154,30 @@ content: |2
                 PrettyOutput.print(f"未知消息类型: {type(msg)}", OutputType.WARNING)
                 break
 
+            # Generate a brief summary via direct model call to avoid run-loop recursion
+            try:
+                # 参照 Agent.generate_summary 的实现思路：基于当前 session.prompt 追加请求提示，直接调用底层模型
+                multi_agent_summary_prompt = """
+请基于当前会话，为即将发送给其他智能体的协作交接写一段摘要，包含：
+- 已完成的主要工作与产出
+- 关键决策及其理由
+- 已知的约束/风险/边界条件
+- 未解决的问题与待澄清点
+- 下一步建议与对目标智能体的具体请求
+要求：
+- 仅输出纯文本，不包含任何指令或工具调用
+- 使用简洁的要点式表述
+""".strip()
+                summary_any: Any = agent.model.chat_until_success(  # type: ignore[attr-defined]
+                    f"{agent.session.prompt}\n{multi_agent_summary_prompt}"
+                )
+                summary_text = summary_any.strip() if isinstance(summary_any, str) else ""
+            except Exception:
+                summary_text = ""
             prompt = f"""
 Please handle this message:
 from: {last_agent_name}
+summary_of_sender_work: {summary_text}
 content: {msg['content']}
 """
             to_agent_name = msg.get("to")

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_platform/base.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 import re
+import os
+from datetime import datetime
 from abc import ABC, abstractmethod
 from types import TracebackType
 from typing import Dict, Generator, List, Optional, Tuple, Type
@@ -17,6 +19,8 @@ from jarvis.jarvis_utils.config import (
     get_pretty_output,
     is_print_prompt,
     is_immediate_abort,
+    is_save_session_history,
+    get_data_dir,
 )
 from jarvis.jarvis_utils.embedding import split_text_into_chunks
 from jarvis.jarvis_utils.globals import set_in_chat, get_interrupt, console
@@ -34,6 +38,7 @@ class BasePlatform(ABC):
         self.web = False  # 添加web属性，默认false
         self._saved = False
         self.model_group: Optional[str] = None
+        self._session_history_file: Optional[str] = None
 
     def __enter__(self) -> Self:
         """Enter context manager"""
@@ -57,6 +62,7 @@ class BasePlatform(ABC):
     def reset(self):
         """Reset model"""
         self.delete_chat()
+        self._session_history_file = None
 
     @abstractmethod
     def chat(self, message: str) -> Generator[str, None, None]:
@@ -135,6 +141,7 @@ class BasePlatform(ABC):
                                 if first_chunk:
                                     break
                         except StopIteration:
+                            self._append_session_history(message, "")
                             return ""
 
                     text_content = Text(overflow="fold")
@@ -200,6 +207,7 @@ class BasePlatform(ABC):
                                 live.update(panel)
 
                             if is_immediate_abort() and get_interrupt():
+                                self._append_session_history(message, response)
                                 return response  # Return the partial response immediately
 
                         # Ensure any remaining content in the buffer is displayed
@@ -225,6 +233,7 @@ class BasePlatform(ABC):
                         console.print(s, end="")
                         response += s
                         if is_immediate_abort() and get_interrupt():
+                            self._append_session_history(message, response)
                             return response
                     console.print()
                     end_time = time.time()
@@ -234,6 +243,7 @@ class BasePlatform(ABC):
                 for s in self.chat(message):
                     response += s
                     if is_immediate_abort() and get_interrupt():
+                        self._append_session_history(message, response)
                         return response
         # Keep original think tag handling
         response = re.sub(
@@ -242,6 +252,8 @@ class BasePlatform(ABC):
         response = re.sub(
             ot("thinking") + r".*?" + ct("thinking"), "", response, flags=re.DOTALL
         )
+        # Save session history (input and full response)
+        self._append_session_history(message, response)
         return response
 
     def chat_until_success(self, message: str) -> str:
@@ -346,6 +358,51 @@ class BasePlatform(ABC):
         """Set web flag"""
         self.web = web
 
+    def _append_session_history(self, user_input: str, model_output: str) -> None:
+        """
+        Append the user input and model output to a session history file if enabled.
+        The file name is generated on first save and reused until reset.
+        """
+        try:
+            if not is_save_session_history():
+                return
+
+            if self._session_history_file is None:
+                # Ensure data directory exists
+                data_dir = get_data_dir()
+                os.makedirs(data_dir, exist_ok=True)
+
+                # Build a safe filename including platform, model and timestamp
+                try:
+                    platform_name = type(self).platform_name()
+                except Exception:
+                    platform_name = "unknown_platform"
+
+                try:
+                    model_name = self.name()
+                except Exception:
+                    model_name = "unknown_model"
+
+                safe_platform = re.sub(r"[^\w\-\.]+", "_", str(platform_name))
+                safe_model = re.sub(r"[^\w\-\.]+", "_", str(model_name))
+                ts = datetime.now().strftime("%Y%m%d_%H%M%S")
+
+                self._session_history_file = os.path.join(
+                    data_dir, f"session_history_{safe_platform}_{safe_model}_{ts}.log"
+                )
+
+            # Append record
+            with open(self._session_history_file, "a", encoding="utf-8", errors="ignore") as f:
+                ts_line = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                f.write(f"===== {ts_line} =====\n")
+                f.write("USER:\n")
+                f.write(f"{user_input}\n")
+                f.write("\nASSISTANT:\n")
+                f.write(f"{model_output}\n\n")
+        except Exception:
+            # Do not break chat flow if writing history fails
+            pass
+
     @abstractmethod
     def support_web(self) -> bool:
         """Check if platform supports web functionality"""

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/read_webpage.py

@@ -58,7 +58,8 @@ class WebpageTool:
 2. 包含网页标题
 3. 根据用户需求提供准确、完整的信息"""
                         response = model.chat_until_success(prompt)  # type: ignore
-                        return {"success": True, "stdout": response, "stderr": ""}
+                        if response and response.strip():
+                            return {"success": True, "stdout": response, "stderr": ""}
 
             # 2) 然后尝试使用默认平台（normal）的 web 能力
             model = PlatformRegistry().get_normal_platform()
@@ -73,7 +74,8 @@ class WebpageTool:
 2. 包含网页标题
 3. 根据用户需求提供准确、完整的信息"""
                 response = model.chat_until_success(prompt)  # type: ignore
-                return {"success": True, "stdout": response, "stderr": ""}
+                if response and response.strip():
+                    return {"success": True, "stdout": response, "stderr": ""}
 
             # 3) 回退：使用 requests 抓取网页，再用模型分析
 

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/search_web.py

@@ -147,11 +147,13 @@ class SearchWebTool:
                 if model.support_web():
                     model.set_web(True)
                     model.set_suppress_output(False)
-                    return {
-                        "stdout": model.chat_until_success(query),
-                        "stderr": "",
-                        "success": True,
-                    }
+                    response = model.chat_until_success(query)
+                    if response and response.strip():
+                        return {
+                            "stdout": response,
+                            "stderr": "",
+                            "success": True,
+                        }
 
         # 否则使用现有的模型选择流程
         if agent.model.support_web():
@@ -161,11 +163,13 @@ class SearchWebTool:
             model.set_model_name(agent.model.name())
             model.set_web(True)
             model.set_suppress_output(False)
-            return {
-                "stdout": model.chat_until_success(query),
-                "stderr": "",
-                "success": True,
-            }
+            response = model.chat_until_success(query)
+            if response and response.strip():
+                return {
+                    "stdout": response,
+                    "stderr": "",
+                    "success": True,
+                }
 
         return self._search_with_ddgs(query, agent)
 

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/config.py

@@ -730,6 +730,16 @@ def is_enable_builtin_config_selector() -> bool:
     )
 
 
+def is_save_session_history() -> bool:
+    """
+    是否保存会话记录。
+
+    返回:
+        bool: 如果要保存会话记录则返回True, 默认为False
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_SAVE_SESSION_HISTORY", False) is True
+
+
 def is_immediate_abort() -> bool:
     """
     是否启用立即中断：当在对话过程中检测到用户中断信号时，立即停止输出并返回。

{jarvis_ai_assistant-0.3.32 → jarvis_ai_assistant-0.3.33/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.32
+Version: 0.3.33
 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.32 → jarvis_ai_assistant-0.3.33}/src/jarvis_ai_assistant.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ src/jarvis/jarvis_agent/config_editor.py
 src/jarvis/jarvis_agent/edit_file_handler.py
 src/jarvis/jarvis_agent/event_bus.py
 src/jarvis/jarvis_agent/events.py
+src/jarvis/jarvis_agent/file_context_handler.py
 src/jarvis/jarvis_agent/file_methodology_manager.py
 src/jarvis/jarvis_agent/jarvis.py
 src/jarvis/jarvis_agent/main.py