jarvis-ai-assistant 0.2.1__tar.gz → 0.2.2__tar.gz

jarvis_ai_assistant-0.2.2/PKG-INFO

@@ -0,0 +1,228 @@
+Metadata-Version: 2.4
+Name: jarvis-ai-assistant
+Version: 0.2.2
+Summary: Jarvis: An AI assistant that uses tools to interact with the system
+Home-page: https://github.com/skyfireitdiy/Jarvis
+Author: skyfire
+Author-email: skyfire <skyfireitdiy@hotmail.com>
+License: MIT License
+        
+        Copyright (c) 2025 skyfire
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+Project-URL: Homepage, https://github.com/skyfireitdiy/Jarvis
+Keywords: jarvis,ai,assistant,tools,automation
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: requests==2.32.3
+Requires-Dist: colorama==0.4.6
+Requires-Dist: prompt_toolkit==3.0.50
+Requires-Dist: pygments==2.19.1
+Requires-Dist: fuzzywuzzy==0.18.0
+Requires-Dist: fastapi==0.115.12
+Requires-Dist: uvicorn==0.33.0
+Requires-Dist: rich==14.0.0
+Requires-Dist: python-Levenshtein==0.25.1
+Requires-Dist: tiktoken==0.7.0
+Requires-Dist: pillow==10.2.0
+Requires-Dist: openai==1.78.1
+Requires-Dist: tabulate==0.9.0
+Requires-Dist: pyte==0.8.2
+Requires-Dist: pyyaml>=5.3.1
+Requires-Dist: ddgs==9.0.2
+Requires-Dist: lxml==6.0.0
+Requires-Dist: markdownify>=1.1.0
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Requires-Dist: isort; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: build; extra == "dev"
+Requires-Dist: twine; extra == "dev"
+Provides-Extra: rag
+Requires-Dist: langchain; extra == "rag"
+Requires-Dist: langchain-community; extra == "rag"
+Requires-Dist: langchain-huggingface; extra == "rag"
+Requires-Dist: chromadb; extra == "rag"
+Requires-Dist: diskcache; extra == "rag"
+Requires-Dist: sentence-transformers==2.7.0; extra == "rag"
+Requires-Dist: torch>=2.6; extra == "rag"
+Requires-Dist: typer; extra == "rag"
+Requires-Dist: unstructured[md]; extra == "rag"
+Requires-Dist: rank-bm25; extra == "rag"
+Dynamic: author
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-python
+
+# 🤖 Jarvis AI 助手
+<p align="center">
+  <img src="docs/images/jarvis-logo.png" alt="Jarvis Logo" width="200"/>
+</p>
+<div align="center">
+
+[![Python 3.8+](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/downloads/)[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
+*您的智能开发和系统交互助手*
+
+[快速开始](#quick-start) • [核心功能](#core-features) • [配置说明](#configuration) • [Jarvis Book](#jarvis-book) • [技术细节](docs/technical_documentation.md) • [Wiki文档](https://deepwiki.com/skyfireitdiy/Jarvis) • [贡献指南](#contributing) • [许可证](#license)
+</div>
+
+---
+
+## 🚀 快速开始 <a id="quick-start"></a>
+
+### 系统要求
+- **Linux**: 完全支持。
+- **Windows**: 未经充分测试，建议在 [WSL](https://docs.microsoft.com/en-us/windows/wsl/install) 中使用。
+
+### 安装
+
+#### 一键安装 (推荐)
+只需一行命令即可完成所有安装和配置：
+```bash
+bash -c "$(curl -fsSL https://raw.githubusercontent.com/skyfireitdiy/Jarvis/main/scripts/install.sh)"
+```
+> 该脚本会自动检测Python环境、克隆项目、安装依赖并设置好路径。
+
+#### 手动安装
+```bash
+git clone https://github.com/skyfireitdiy/Jarvis
+cd Jarvis
+pip3 install -e .
+```
+或者从PyPI安装 (可能不是最新版):
+```bash
+pip3 install jarvis-ai-assistant
+```
+
+### 基本使用
+Jarvis 包含一系列专注于不同任务的工具。以下是主要命令及其快捷方式：
+
+| 命令 | 快捷方式 | 功能描述 |
+|------|----------|----------|
+| `jarvis` | `jvs` | 通用AI代理，适用于多种任务 |
+| `jarvis-code-agent` | `jca` | 专注于代码分析、修改和生成的代码代理 |
+| `jarvis-git-commit` | `jgc` | 自动化分析代码变更并生成规范的Git提交信息 |
+| `jarvis-platform-manager` | `jpm` | 管理和测试不同的大语言模型平台 |
+| `jarvis-rag` | `jrg` | 构建和查询本地化的RAG知识库 |
+| `jarvis-smart-shell` | `jss` | 实验性的智能Shell功能 |
+
+更多详细用法和参数，请查阅我们的 [**Wiki 文档**](https://deepwiki.com/skyfireitdiy/Jarvis)。
+
+---
+
+## 🌟 核心功能 <a id="core-features"></a>
+
+- **🆓 零成本接入**: 无缝集成腾讯元宝、Kimi等优质模型，无需支付API费用。
+- **🛠️ 工具驱动**: 内置丰富工具集，涵盖脚本执行、代码开发、网页搜索、终端操作等。
+- **🤖 人机协作**: 支持实时交互，用户可随时介入指导，确保AI行为符合预期。
+- **🔌 高度可扩展**: 支持自定义工具、模型平台和MCP，轻松打造个性化工作流。
+- **🧠 RAG 增强**: 内置RAG功能，可将本地文档作为知识库，实现精准问答。
+
+### 视频演示
+- [使用`jca`为Jarvis快速扩展功能](https://www.bilibili.com/video/BV1TCgLzvE6Q/)
+- [10分钟搭建aarch64容器化Rust开发环境](https://www.bilibili.com/video/BV1K3ghzkEzZ/)
+- [`jarvis-code-agent` 功能演示](https://www.bilibili.com/video/BV1KugbzKE6U/)
+
+---
+
+## ⚙️ 配置说明 <a id="configuration"></a>
+
+Jarvis 的主要配置文件位于 `~/.jarvis/config.yaml`。您可以在此文件中配置模型、平台和其他行为。
+
+**基本配置示例 (腾讯元宝):**
+```yaml
+# ~/.jarvis/config.yaml
+
+# 使用的模型平台
+JARVIS_PLATFORM: yuanbao
+JARVIS_MODEL: deep_seek_v3
+
+# 用于“思考”步骤的模型，通常选择能力更强的模型
+JARVIS_THINKING_PLATFORM: yuanbao
+JARVIS_THINKING_MODEL: deep_seek
+
+# 平台所需的环境变量
+ENV:
+  YUANBAO_COOKIES: "在此处粘贴您的元宝Cookies"
+```
+
+Jarvis 支持多种平台，包括 **Kimi**, **通义千问**, **OpenAI** 等。详细的配置选项、模型组设置以及所有可用参数，请参阅 [**配置文档**](https://deepwiki.com/skyfireitdiy/Jarvis)。
+
+---
+
+## 🛠️ 扩展开发 <a id="extensions"></a>
+
+Jarvis 被设计为高度可扩展的框架。您可以轻松地：
+- **添加新工具**: 在 `~/.jarvis/tools/` 目录下创建新的工具实现。
+- **集成新LLM平台**: 在 `~/.jarvis/platforms/` 目录下添加新的平台适配器。
+- **定义MCP**: 通过配置文件集成外部或自定义的命令协议。
+
+有关扩展开发的详细指南和[**技术细节**](docs/technical_documentation.md)，请访问我们的 [**开发者文档**](https://deepwiki.com/skyfireitdiy/Jarvis)。
+
+---
+
+## 📖 Jarvis Book <a id="jarvis-book"></a>
+
+欢迎阅读 Jarvis 的官方文档，这本开源书籍旨在为您提供从入门到精通的全方位指南。
+
+- **[第一章：项目介绍](docs/jarvis_book/1.项目介绍.md)**
+- **[第二章：快速开始](docs/jarvis_book/2.快速开始.md)**
+- **[第三章：核心概念与架构](docs/jarvis_book/3.核心概念与架构.md)**
+- **[第四章：使用指南](docs/jarvis_book/4.使用指南.md)**
+- **[第五章：工具开发](docs/jarvis_book/5.工具开发.md)**
+- **[第六章：高级主题](docs/jarvis_book/6.高级主题.md)**
+- **[第七章：参与贡献](docs/jarvis_book/7.参与贡献.md)**
+- **[第八章：常见问题](docs/jarvis_book/8.常见问题.md)**
+- **[第九章：附录](docs/jarvis_book/9.附录.md)**
+
+---
+
+## 🤝 贡献指南 <a id="contributing"></a>
+
+我们欢迎任何形式的贡献！
+1. Fork 本仓库
+2. 创建您的特性分支 (`git checkout -b feature/AmazingFeature`)
+3. 提交您的更改 (`git commit -m 'Add some AmazingFeature'`)
+4. 推送到分支 (`git push origin feature/AmazingFeature`)
+5. 开启一个 Pull Request
+
+---
+
+## 📄 许可证 <a id="license"></a>
+
+本项目采用 MIT 许可证 - 详见 [LICENSE](LICENSE) 文件。
+
+---
+<div align="center">
+由 Jarvis 团队用 ❤️ 制作
+</div>
+
+![Jarvis技术支持群](docs/images/wechat.png)

jarvis_ai_assistant-0.2.2/README.md

@@ -0,0 +1,145 @@
+# 🤖 Jarvis AI 助手
+<p align="center">
+  <img src="docs/images/jarvis-logo.png" alt="Jarvis Logo" width="200"/>
+</p>
+<div align="center">
+
+[![Python 3.8+](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/downloads/)[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
+*您的智能开发和系统交互助手*
+
+[快速开始](#quick-start) • [核心功能](#core-features) • [配置说明](#configuration) • [Jarvis Book](#jarvis-book) • [技术细节](docs/technical_documentation.md) • [Wiki文档](https://deepwiki.com/skyfireitdiy/Jarvis) • [贡献指南](#contributing) • [许可证](#license)
+</div>
+
+---
+
+## 🚀 快速开始 <a id="quick-start"></a>
+
+### 系统要求
+- **Linux**: 完全支持。
+- **Windows**: 未经充分测试，建议在 [WSL](https://docs.microsoft.com/en-us/windows/wsl/install) 中使用。
+
+### 安装
+
+#### 一键安装 (推荐)
+只需一行命令即可完成所有安装和配置：
+```bash
+bash -c "$(curl -fsSL https://raw.githubusercontent.com/skyfireitdiy/Jarvis/main/scripts/install.sh)"
+```
+> 该脚本会自动检测Python环境、克隆项目、安装依赖并设置好路径。
+
+#### 手动安装
+```bash
+git clone https://github.com/skyfireitdiy/Jarvis
+cd Jarvis
+pip3 install -e .
+```
+或者从PyPI安装 (可能不是最新版):
+```bash
+pip3 install jarvis-ai-assistant
+```
+
+### 基本使用
+Jarvis 包含一系列专注于不同任务的工具。以下是主要命令及其快捷方式：
+
+| 命令 | 快捷方式 | 功能描述 |
+|------|----------|----------|
+| `jarvis` | `jvs` | 通用AI代理，适用于多种任务 |
+| `jarvis-code-agent` | `jca` | 专注于代码分析、修改和生成的代码代理 |
+| `jarvis-git-commit` | `jgc` | 自动化分析代码变更并生成规范的Git提交信息 |
+| `jarvis-platform-manager` | `jpm` | 管理和测试不同的大语言模型平台 |
+| `jarvis-rag` | `jrg` | 构建和查询本地化的RAG知识库 |
+| `jarvis-smart-shell` | `jss` | 实验性的智能Shell功能 |
+
+更多详细用法和参数，请查阅我们的 [**Wiki 文档**](https://deepwiki.com/skyfireitdiy/Jarvis)。
+
+---
+
+## 🌟 核心功能 <a id="core-features"></a>
+
+- **🆓 零成本接入**: 无缝集成腾讯元宝、Kimi等优质模型，无需支付API费用。
+- **🛠️ 工具驱动**: 内置丰富工具集，涵盖脚本执行、代码开发、网页搜索、终端操作等。
+- **🤖 人机协作**: 支持实时交互，用户可随时介入指导，确保AI行为符合预期。
+- **🔌 高度可扩展**: 支持自定义工具、模型平台和MCP，轻松打造个性化工作流。
+- **🧠 RAG 增强**: 内置RAG功能，可将本地文档作为知识库，实现精准问答。
+
+### 视频演示
+- [使用`jca`为Jarvis快速扩展功能](https://www.bilibili.com/video/BV1TCgLzvE6Q/)
+- [10分钟搭建aarch64容器化Rust开发环境](https://www.bilibili.com/video/BV1K3ghzkEzZ/)
+- [`jarvis-code-agent` 功能演示](https://www.bilibili.com/video/BV1KugbzKE6U/)
+
+---
+
+## ⚙️ 配置说明 <a id="configuration"></a>
+
+Jarvis 的主要配置文件位于 `~/.jarvis/config.yaml`。您可以在此文件中配置模型、平台和其他行为。
+
+**基本配置示例 (腾讯元宝):**
+```yaml
+# ~/.jarvis/config.yaml
+
+# 使用的模型平台
+JARVIS_PLATFORM: yuanbao
+JARVIS_MODEL: deep_seek_v3
+
+# 用于“思考”步骤的模型，通常选择能力更强的模型
+JARVIS_THINKING_PLATFORM: yuanbao
+JARVIS_THINKING_MODEL: deep_seek
+
+# 平台所需的环境变量
+ENV:
+  YUANBAO_COOKIES: "在此处粘贴您的元宝Cookies"
+```
+
+Jarvis 支持多种平台，包括 **Kimi**, **通义千问**, **OpenAI** 等。详细的配置选项、模型组设置以及所有可用参数，请参阅 [**配置文档**](https://deepwiki.com/skyfireitdiy/Jarvis)。
+
+---
+
+## 🛠️ 扩展开发 <a id="extensions"></a>
+
+Jarvis 被设计为高度可扩展的框架。您可以轻松地：
+- **添加新工具**: 在 `~/.jarvis/tools/` 目录下创建新的工具实现。
+- **集成新LLM平台**: 在 `~/.jarvis/platforms/` 目录下添加新的平台适配器。
+- **定义MCP**: 通过配置文件集成外部或自定义的命令协议。
+
+有关扩展开发的详细指南和[**技术细节**](docs/technical_documentation.md)，请访问我们的 [**开发者文档**](https://deepwiki.com/skyfireitdiy/Jarvis)。
+
+---
+
+## 📖 Jarvis Book <a id="jarvis-book"></a>
+
+欢迎阅读 Jarvis 的官方文档，这本开源书籍旨在为您提供从入门到精通的全方位指南。
+
+- **[第一章：项目介绍](docs/jarvis_book/1.项目介绍.md)**
+- **[第二章：快速开始](docs/jarvis_book/2.快速开始.md)**
+- **[第三章：核心概念与架构](docs/jarvis_book/3.核心概念与架构.md)**
+- **[第四章：使用指南](docs/jarvis_book/4.使用指南.md)**
+- **[第五章：工具开发](docs/jarvis_book/5.工具开发.md)**
+- **[第六章：高级主题](docs/jarvis_book/6.高级主题.md)**
+- **[第七章：参与贡献](docs/jarvis_book/7.参与贡献.md)**
+- **[第八章：常见问题](docs/jarvis_book/8.常见问题.md)**
+- **[第九章：附录](docs/jarvis_book/9.附录.md)**
+
+---
+
+## 🤝 贡献指南 <a id="contributing"></a>
+
+我们欢迎任何形式的贡献！
+1. Fork 本仓库
+2. 创建您的特性分支 (`git checkout -b feature/AmazingFeature`)
+3. 提交您的更改 (`git commit -m 'Add some AmazingFeature'`)
+4. 推送到分支 (`git push origin feature/AmazingFeature`)
+5. 开启一个 Pull Request
+
+---
+
+## 📄 许可证 <a id="license"></a>
+
+本项目采用 MIT 许可证 - 详见 [LICENSE](LICENSE) 文件。
+
+---
+<div align="center">
+由 Jarvis 团队用 ❤️ 制作
+</div>
+
+![Jarvis技术支持群](docs/images/wechat.png)

{jarvis_ai_assistant-0.2.1 → jarvis_ai_assistant-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.2.1"
+version = "0.2.2"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -36,7 +36,6 @@ dependencies = [
     "openai==1.78.1",
     "tabulate==0.9.0",
     "pyte==0.8.2",
-    "httpx>=0.28.1",
     "pyyaml>=5.3.1",
     "ddgs==9.0.2",
     "lxml==6.0.0",
@@ -83,8 +82,6 @@ jarvis-agent = "jarvis.jarvis_agent.main:main"
 ja = "jarvis.jarvis_agent.main:main"
 jarvis-tool = "jarvis.jarvis_tools.cli.main:main"
 jt = "jarvis.jarvis_tools.cli.main:main"
-jarvis-git-details = "jarvis.jarvis_git_details.main:main"
-jgd = "jarvis.jarvis_git_details.main:main"
 jarvis-methodology = "jarvis.jarvis_methodology.main:main"
 jm = "jarvis.jarvis_methodology.main:main"
 jarvis-rag = "jarvis.jarvis_rag.cli:main"

{jarvis_ai_assistant-0.2.1 → jarvis_ai_assistant-0.2.2}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.2.1",
+    version="0.2.2",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -31,7 +31,6 @@ setup(
         "openai==1.78.1",
         "tabulate==0.9.0",
         "pyte==0.8.2",
-        "httpx>=0.28.1",
         "pyyaml>=5.3.1",
         "ddgs==9.0.2",
         "lxml==6.0.0",
@@ -74,8 +73,6 @@ setup(
             "ja=jarvis.jarvis_agent.main:main",
             "jarvis-tool=jarvis.jarvis_tools.cli.main:main",
             "jt=jarvis.jarvis_tools.cli.main:main",
-            "jarvis-git-details=jarvis.jarvis_git_details.main:main",
-            "jgd=jarvis.jarvis_git_details.main:main",
             "jarvis-methodology=jarvis.jarvis_methodology.main:main",
             "jm=jarvis.jarvis_methodology.main:main",
             "jarvis-rag=jarvis.jarvis_rag.cli:main",

{jarvis_ai_assistant-0.2.1 → jarvis_ai_assistant-0.2.2}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.2.1 → jarvis_ai_assistant-0.2.2}/src/jarvis/jarvis_agent/jarvis.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import argparse
 import os
 import shutil
 import subprocess
@@ -7,6 +6,7 @@ import sys
 from pathlib import Path
 from typing import Dict, Optional
 
+import typer
 import yaml  # type: ignore
 from prompt_toolkit import prompt  # type: ignore
 
@@ -24,6 +24,8 @@ from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.config import get_data_dir
 from jarvis.jarvis_utils.utils import init_env
 
+app = typer.Typer(help="Jarvis AI assistant")
+
 
 def _load_tasks() -> Dict[str, str]:
     """Load tasks from .jarvis files in user home and current directory."""
@@ -109,48 +111,14 @@ def _select_task(tasks: Dict[str, str]) -> str:
             PrettyOutput.print(f"选择任务失败: {str(val_err)}", OutputType.ERROR)
 
 
-def _parse_args() -> argparse.Namespace:
-    """Parse command line arguments."""
-    parser = argparse.ArgumentParser(description="Jarvis AI assistant")
-    parser.add_argument(
-        "--llm_type",
-        type=str,
-        default="normal",
-        choices=["normal", "thinking"],
-        help="LLM type to use",
-    )
-    parser.add_argument(
-        "-t",
-        "--task",
-        type=str,
-        help="Directly input task content from command line",
-    )
-    parser.add_argument(
-        "--model_group",
-        type=str,
-        help="Model group to use, overriding config",
-    )
-    parser.add_argument("-f", "--config", type=str, help="Path to custom config file")
-    parser.add_argument(
-        "--restore-session",
-        action="store_true",
-        help="Restore session from .jarvis/saved_session.json",
-        default=False,
-    )
-    parser.add_argument(
-        "-e", "--edit", action="store_true", help="Edit the configuration file"
-    )
-    return parser.parse_args()
-
-
-def _handle_edit_mode(args: argparse.Namespace) -> None:
+def _handle_edit_mode(edit: bool, config_file: Optional[str]) -> None:
     """If edit flag is set, open config file in editor and exit."""
-    if not args.edit:
+    if not edit:
         return
 
     config_file_path = (
-        Path(args.config)
-        if args.config
+        Path(config_file)
+        if config_file
         else Path(os.path.expanduser("~/.jarvis/config.yaml"))
     )
     editors = ["nvim", "vim", "vi"]
@@ -159,30 +127,32 @@ def _handle_edit_mode(args: argparse.Namespace) -> None:
     if editor:
         try:
             subprocess.run([editor, str(config_file_path)], check=True)
-            sys.exit(0)
+            raise typer.Exit(code=0)
         except (subprocess.CalledProcessError, FileNotFoundError) as e:
             PrettyOutput.print(f"Failed to open editor: {e}", OutputType.ERROR)
-            sys.exit(1)
+            raise typer.Exit(code=1)
     else:
         PrettyOutput.print(
             "No suitable editor found (nvim, vim, vi).", OutputType.ERROR
         )
-        sys.exit(1)
+        raise typer.Exit(code=1)
 
 
-def _initialize_agent(args: argparse.Namespace) -> Agent:
+def _initialize_agent(
+    llm_type: str, model_group: Optional[str], restore_session: bool
+) -> Agent:
     """Initialize the agent and restore session if requested."""
     agent = Agent(
         system_prompt=origin_agent_system_prompt,
-        llm_type=args.llm_type,
-        model_group=args.model_group,
+        llm_type=llm_type,
+        model_group=model_group,
         input_handler=[shell_input_handler, builtin_input_handler],
         output_handler=[ToolRegistry()],  # type: ignore
         need_summary=False,
     )
 
     # 尝试恢复会话
-    if args.restore_session:
+    if restore_session:
         if agent.restore_session():
             PrettyOutput.print("会话已成功恢复。", OutputType.SUCCESS)
         else:
@@ -195,36 +165,68 @@ def _get_and_run_task(agent: Agent, task_content: Optional[str] = None) -> None:
     # 优先处理命令行直接传入的任务
     if task_content:
         agent.run(task_content)
-        sys.exit(0)
+        raise typer.Exit(code=0)
 
     if agent.first:
         tasks = _load_tasks()
         if tasks and (selected_task := _select_task(tasks)):
             PrettyOutput.print(f"开始执行任务: \n{selected_task}", OutputType.INFO)
             agent.run(selected_task)
-            sys.exit(0)
+            raise typer.Exit(code=0)
 
     user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
     if user_input:
         agent.run(user_input)
-    sys.exit(0)
+    raise typer.Exit(code=0)
 
 
-def main() -> None:
-    """Main function for Jarvis AI assistant."""
-    args = _parse_args()
-    _handle_edit_mode(args)
+@app.callback(invoke_without_command=True)
+def run_cli(
+    ctx: typer.Context,
+    llm_type: str = typer.Option(
+        "normal",
+        "--llm_type",
+        help="LLM type to use, choices are 'normal' and 'thinking'",
+    ),
+    task: Optional[str] = typer.Option(
+        None, "-t", "--task", help="Directly input task content from command line"
+    ),
+    model_group: Optional[str] = typer.Option(
+        None, "--model_group", help="Model group to use, overriding config"
+    ),
+    config_file: Optional[str] = typer.Option(
+        None, "-f", "--config", help="Path to custom config file"
+    ),
+    restore_session: bool = typer.Option(
+        False,
+        "--restore-session",
+        help="Restore session from .jarvis/saved_session.json",
+    ),
+    edit: bool = typer.Option(
+        False, "-e", "--edit", help="Edit the configuration file"
+    ),
+) -> None:
+    """Jarvis AI assistant command-line interface."""
+    if ctx.invoked_subcommand is not None:
+        return
+        
+    _handle_edit_mode(edit, config_file)
 
-    init_env(
-        "欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=args.config
-    )
+    init_env("欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=config_file)
 
     try:
-        agent = _initialize_agent(args)
-        _get_and_run_task(agent, args.task)
+        agent = _initialize_agent(llm_type, model_group, restore_session)
+        _get_and_run_task(agent, task)
+    except typer.Exit:
+        raise
     except Exception as err:  # pylint: disable=broad-except
         PrettyOutput.print(f"初始化错误: {str(err)}", OutputType.ERROR)
-        sys.exit(1)
+        raise typer.Exit(code=1)
+
+
+def main() -> None:
+    """Application entry point."""
+    app()
 
 
 if __name__ == "__main__":