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

jarvis/jarvis_rag/retriever.py

@@ -1,15 +1,21 @@
+import hashlib
+import json
 import os
 import pickle
-import json
-import hashlib
-from typing import Any, Dict, List, Optional, cast
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import cast
 
 import chromadb
 from langchain.docstore.document import Document
 from langchain.text_splitter import RecursiveCharacterTextSplitter
-from rank_bm25 import BM25Okapi  # type: ignore
+from rank_bm25 import BM25Okapi
+
+from jarvis.jarvis_utils.output import PrettyOutput
 
-from .embedding_manager import EmbeddingManager
+from .embedding_interface import EmbeddingInterface
 
 
 class ChromaRetriever:
@@ -20,7 +26,7 @@ class ChromaRetriever:
 
     def __init__(
         self,
-        embedding_manager: EmbeddingManager,
+        embedding_manager: EmbeddingInterface,
         db_path: str,
         collection_name: str = "jarvis_rag_collection",
     ):
@@ -28,7 +34,7 @@ class ChromaRetriever:
         初始化ChromaRetriever。
 
         参数:
-            embedding_manager: EmbeddingManager的实例。
+            embedding_manager: EmbeddingInterface的实例（可以是本地或在线模型）。
             db_path: ChromaDB持久化存储的文件路径。
             collection_name: ChromaDB中集合的名称。
         """
@@ -41,7 +47,7 @@ class ChromaRetriever:
         self.collection = self.client.get_or_create_collection(
             name=self.collection_name
         )
-        print(
+        PrettyOutput.auto_print(
             f"✅ ChromaDB 客户端已在 '{db_path}' 初始化，集合为 '{collection_name}'。"
         )
 
@@ -56,26 +62,24 @@ class ChromaRetriever:
     def _load_or_initialize_bm25(self):
         """从磁盘加载BM25索引或初始化一个新索引。"""
         if os.path.exists(self.bm25_index_path):
-            print("ℹ️ 正在加载现有的 BM25 索引...")
+            PrettyOutput.auto_print("ℹ️ 正在加载现有的 BM25 索引...")
             with open(self.bm25_index_path, "rb") as f:
                 data = pickle.load(f)
                 self.bm25_corpus = data["corpus"]
                 self.bm25_index = BM25Okapi(self.bm25_corpus)
-            print("✅ BM25 索引加载成功。")
+            PrettyOutput.auto_print("✅ BM25 索引加载成功。")
         else:
-            print(
-                "⚠️ 未找到 BM25 索引，将初始化一个新的。"
-            )
+            PrettyOutput.auto_print("⚠️ 未找到 BM25 索引，将初始化一个新的。")
             self.bm25_corpus = []
             self.bm25_index = None
 
     def _save_bm25_index(self):
         """将BM25索引保存到磁盘。"""
         if self.bm25_index:
-            print("ℹ️ 正在保存 BM25 索引...")
+            PrettyOutput.auto_print("ℹ️ 正在保存 BM25 索引...")
             with open(self.bm25_index_path, "wb") as f:
                 pickle.dump({"corpus": self.bm25_corpus, "index": self.bm25_index}, f)
-            print("✅ BM25 索引保存成功。")
+            PrettyOutput.auto_print("✅ BM25 索引保存成功。")
 
     def _load_manifest(self) -> Dict[str, Dict[str, Any]]:
         """加载已索引文件清单，用于变更检测。"""
@@ -84,7 +88,7 @@ class ChromaRetriever:
                 with open(self.manifest_path, "r", encoding="utf-8") as f:
                     data = json.load(f)
                 if isinstance(data, dict):
-                    return data  # type: ignore[return-value]
+                    return data
             except Exception:
                 pass
         return {}
@@ -95,7 +99,7 @@ class ChromaRetriever:
             with open(self.manifest_path, "w", encoding="utf-8") as f:
                 json.dump(manifest, f, ensure_ascii=False, indent=2)
         except Exception as e:
-            print(f"⚠️ 保存索引清单失败: {e}")
+            PrettyOutput.auto_print(f"⚠️ 保存索引清单失败: {e}")
 
     def _compute_md5(
         self, file_path: str, chunk_size: int = 1024 * 1024
@@ -128,15 +132,13 @@ class ChromaRetriever:
                     md5sum = self._compute_md5(src)
                     if md5sum:
                         entry["md5"] = md5sum
-                    manifest[src] = entry  # type: ignore[dict-item]
+                    manifest[src] = entry
                     updated += 1
             except Exception:
                 continue
         if updated > 0:
             self._save_manifest(manifest)
-            print(
-                f"ℹ️ 已更新索引清单，记录 {updated} 个源文件状态。"
-            )
+            PrettyOutput.auto_print(f"ℹ️ 已更新索引清单，记录 {updated} 个源文件状态。")
 
     def _detect_changed_or_deleted(self) -> Dict[str, List[str]]:
         """检测已记录的源文件是否发生变化或被删除。"""
@@ -201,8 +203,8 @@ class ChromaRetriever:
         lines.append(
             "提示：请使用 'jarvis-rag add <路径>' 重新索引相关文件，以更新向量库与BM25索引。"
         )
-        joined_lines = '\n'.join(lines)
-        print(f"⚠️ {joined_lines}")
+        joined_lines = "\n".join(lines)
+        PrettyOutput.auto_print(f"⚠️ {joined_lines}")
 
     def detect_index_changes(self) -> Dict[str, List[str]]:
         """
@@ -224,7 +226,7 @@ class ChromaRetriever:
                 removed += 1
         if removed > 0:
             self._save_manifest(manifest)
-            print(
+            PrettyOutput.auto_print(
                 f"ℹ️ 已从索引清单中移除 {removed} 个已删除的源文件记录。"
             )
 
@@ -249,12 +251,12 @@ class ChromaRetriever:
         delete_errors: List[str] = []
         for src in deleted:
             try:
-                self.collection.delete(where={"source": src})  # type: ignore[arg-type]
+                self.collection.delete(where={"source": src})
             except Exception as e:
                 delete_errors.append(f"删除源 '{src}' 时出错: {e}")
         if delete_errors:
-            joined_errors = '\n'.join(delete_errors)
-            print(f"⚠️ {joined_errors}")
+            joined_errors = "\n".join(delete_errors)
+            PrettyOutput.auto_print(f"⚠️ {joined_errors}")
 
         # 再处理变更（重建）
         docs_to_add: List[Document] = []
@@ -263,7 +265,7 @@ class ChromaRetriever:
             try:
                 # 删除旧条目
                 try:
-                    self.collection.delete(where={"source": src})  # type: ignore[arg-type]
+                    self.collection.delete(where={"source": src})
                 except Exception:
                     pass
                 # 读取源文件内容（作为单文档载入，由 add_documents 进行拆分与嵌入）
@@ -275,15 +277,15 @@ class ChromaRetriever:
             except Exception as e:
                 rebuild_errors.append(f"重建源 '{src}' 内容时出错: {e}")
         if rebuild_errors:
-            joined_errors = '\n'.join(rebuild_errors)
-            print(f"⚠️ {joined_errors}")
+            joined_errors = "\n".join(rebuild_errors)
+            PrettyOutput.auto_print(f"⚠️ {joined_errors}")
 
         if docs_to_add:
             try:
                 # 复用现有拆分与嵌入逻辑
                 self.add_documents(docs_to_add)
             except Exception as e:
-                print(f"❌ 添加变更文档到索引时出错: {e}")
+                PrettyOutput.auto_print(f"❌ 添加变更文档到索引时出错: {e}")
 
         # 重建BM25索引，确保删除后的语料被清理
         try:
@@ -293,7 +295,7 @@ class ChromaRetriever:
             self.bm25_index = BM25Okapi(self.bm25_corpus) if self.bm25_corpus else None
             self._save_bm25_index()
         except Exception as e:
-            print(f"⚠️ 重建BM25索引失败: {e}")
+            PrettyOutput.auto_print(f"⚠️ 重建BM25索引失败: {e}")
 
         # 更新manifest：变更文件更新状态；删除文件从清单中移除
         try:
@@ -302,24 +304,41 @@ class ChromaRetriever:
             if deleted:
                 self._remove_sources_from_manifest(deleted)
         except Exception as e:
-            print(f"⚠️ 更新索引清单时出错: {e}")
+            PrettyOutput.auto_print(f"⚠️ 更新索引清单时出错: {e}")
 
-        print(
+        PrettyOutput.auto_print(
             f"✅ 索引已更新：变更 {len(changed)} 个，删除 {len(deleted)} 个。"
         )
 
     def add_documents(
-        self, documents: List[Document], chunk_size=1000, chunk_overlap=100
+        self, documents: List[Document], chunk_size=None, chunk_overlap=100
     ):
         """
         将文档拆分、嵌入，并添加到ChromaDB和BM25索引中。
+
+        参数:
+            documents: 要添加的文档列表
+            chunk_size: 块大小（字符数）。如果为None，将从embedding_manager的max_length自动计算。
+            chunk_overlap: 块之间的重叠大小（字符数）
         """
+        # 如果没有指定chunk_size，尝试从embedding_manager获取max_length
+        if chunk_size is None:
+            # 尝试从embedding_manager获取max_length
+            max_length = getattr(self.embedding_manager, "max_length", None)
+            if max_length:
+                # 将token数转换为字符数（粗略估算：1 token ≈ 4 字符）
+                # 留一些余量，使用80%的max_length
+                chunk_size = int(max_length * 4 * 0.8)
+            else:
+                # 默认值
+                chunk_size = 1000
+
         text_splitter = RecursiveCharacterTextSplitter(
             chunk_size=chunk_size, chunk_overlap=chunk_overlap
         )
         chunks = text_splitter.split_documents(documents)
 
-        print(
+        PrettyOutput.auto_print(
             f"ℹ️ 已将 {len(documents)} 个文档拆分为 {len(chunks)} 个块。"
         )
 
@@ -340,9 +359,7 @@ class ChromaRetriever:
             documents=chunk_texts,
             metadatas=cast(Any, metadatas),
         )
-        print(
-            f"✅ 成功将 {len(chunks)} 个块添加到 ChromaDB 集合中。"
-        )
+        PrettyOutput.auto_print(f"✅ 成功将 {len(chunks)} 个块添加到 ChromaDB 集合中。")
 
         # 更新并保存BM25索引
         tokenized_chunks = [doc.split() for doc in chunk_texts]
@@ -398,7 +415,7 @@ class ChromaRetriever:
                 ]
 
             # 按分数排序并取最高结果
-            bm25_results_with_docs.sort(key=lambda x: x[2], reverse=True)  # type: ignore
+            bm25_results_with_docs.sort(key=lambda x: x[2], reverse=True)
 
             for doc_text, metadata, _ in bm25_results_with_docs[: n_results * 2]:
                 bm25_docs.append(Document(page_content=doc_text, metadata=metadata))
@@ -447,9 +464,7 @@ class ChromaRetriever:
                 for doc_text, metadata in zip(final_documents, final_metadatas):
                     if doc_text is not None and metadata is not None:
                         retrieved_docs.append(
-                            Document(
-                                page_content=cast(str, doc_text), metadata=metadata
-                            )
+                            Document(page_content=doc_text, metadata=metadata)
                         )
 
         return retrieved_docs

jarvis/jarvis_sec/__init__.py

@@ -19,106 +19,33 @@ Jarvis 安全分析套件
 - 模块化重构：将功能拆分为多个模块（prompts, parsers, utils, agents, clustering, analysis, verification, review）
 """
 
-from typing import Dict, List, Optional
+from typing import Dict
+from typing import List
+from typing import Optional
 
-import typer
+from jarvis.jarvis_utils.output import PrettyOutput
 
 from jarvis.jarvis_agent import Agent  # noqa: F401
-from jarvis.jarvis_sec.workflow import direct_scan, run_with_agent
-
-# 导入模块化后的函数（用于触发模块加载）
-from jarvis.jarvis_sec.prompts import (  # noqa: F401
-    build_summary_prompt as _build_summary_prompt,
-    build_verification_summary_prompt as _build_verification_summary_prompt,
-    get_review_system_prompt as _get_review_system_prompt,
-    get_review_summary_prompt as _get_review_summary_prompt,
-    get_cluster_system_prompt as _get_cluster_system_prompt,
-    get_cluster_summary_prompt as _get_cluster_summary_prompt,
-)
-from jarvis.jarvis_sec.parsers import (  # noqa: F401
-    parse_clusters_from_text as _parse_clusters_from_text,
-    try_parse_summary_report as _try_parse_summary_report,
-)
-from jarvis.jarvis_sec.utils import (  # noqa: F401
-    git_restore_if_dirty as _git_restore_if_dirty,
-    get_sec_dir as _get_sec_dir,
+from jarvis.jarvis_sec.utils import (
     initialize_analysis_context as _initialize_analysis_context,
+)
+from jarvis.jarvis_sec.utils import (
     load_or_run_heuristic_scan as _load_or_run_heuristic_scan,
-    compact_candidate as _compact_candidate,
-    prepare_candidates as _prepare_candidates,
-    group_candidates_by_file as _group_candidates_by_file,
-    create_report_writer as _create_report_writer,
-    sig_of as _sig_of,
-    load_processed_gids_from_issues as _load_processed_gids_from_issues,
-    count_issues_from_file as _count_issues_from_file,
-    load_all_issues_from_file as _load_all_issues_from_file,
-    load_processed_gids_from_agent_issues as _load_processed_gids_from_agent_issues,
 )
-from jarvis.jarvis_sec.agents import (  # noqa: F401
-    subscribe_summary_event as _subscribe_summary_event,
-    create_analysis_agent as _create_analysis_agent,
-    create_review_agent as _create_review_agent,
-    create_cluster_agent as _create_cluster_agent,
+from jarvis.jarvis_sec.utils import prepare_candidates as _prepare_candidates
+from jarvis.jarvis_sec.utils import (
+    group_candidates_by_file as _group_candidates_by_file,
 )
-from jarvis.jarvis_sec.clustering import (  # noqa: F401
-    load_existing_clusters as _load_existing_clusters,
-    restore_clusters_from_checkpoint as _restore_clusters_from_checkpoint,
-    create_cluster_snapshot_writer as _create_cluster_snapshot_writer,
-    collect_candidate_gids as _collect_candidate_gids,
-    collect_clustered_gids as _collect_clustered_gids,
-    # supplement_missing_gids_for_clustering已移除，不再需要
-    handle_single_alert_file as _handle_single_alert_file,
-    validate_cluster_format as _validate_cluster_format,
-    extract_classified_gids as _extract_classified_gids,
-    build_cluster_retry_task as _build_cluster_retry_task,
-    build_cluster_error_guidance as _build_cluster_error_guidance,
-    run_cluster_agent_direct_model as _run_cluster_agent_direct_model,
-    validate_cluster_result as _validate_cluster_result,
-    check_cluster_completeness as _check_cluster_completeness,
-    run_cluster_agent_with_retry as _run_cluster_agent_with_retry,
-    process_cluster_results as _process_cluster_results,
-    supplement_missing_gids as _supplement_missing_gids,
-    build_cluster_task as _build_cluster_task,
-    extract_input_gids as _extract_input_gids,
-    build_gid_to_item_mapping as _build_gid_to_item_mapping,
-    process_cluster_chunk as _process_cluster_chunk,
-    filter_pending_items as _filter_pending_items,
-    process_file_clustering as _process_file_clustering,
-    # check_and_supplement_missing_gids已移除，完整性检查已移至process_clustering_phase中
-    initialize_clustering_context as _initialize_clustering_context,
-    check_unclustered_gids as _check_unclustered_gids,
-    execute_clustering_for_files as _execute_clustering_for_files,
-    record_clustering_completion as _record_clustering_completion,
-    fallback_to_file_based_batches as _fallback_to_file_based_batches,
+from jarvis.jarvis_sec.utils import create_report_writer as _create_report_writer
+from jarvis.jarvis_sec.clustering import (
     process_clustering_phase as _process_clustering_phase,
 )
-from jarvis.jarvis_sec.review import (  # noqa: F401
-    build_review_task as _build_review_task,
-    process_review_batch_items as _process_review_batch_items,
-    reinstated_candidates_to_cluster_batches as _reinstated_candidates_to_cluster_batches,
-    process_review_phase as _process_review_phase,
-    build_gid_to_review_mapping as _build_gid_to_review_mapping,
-    process_review_batch as _process_review_batch,
-    run_review_agent_with_retry as _run_review_agent_with_retry,
-    is_valid_review_item as _is_valid_review_item,
-)
-from jarvis.jarvis_sec.analysis import (  # noqa: F401
-    build_analysis_task_context as _build_analysis_task_context,
-    build_validation_error_guidance as _build_validation_error_guidance,
-    run_analysis_agent_with_retry as _run_analysis_agent_with_retry,
-    expand_and_filter_analysis_results as _expand_and_filter_analysis_results,
-    valid_items as _valid_items,
-)
-from jarvis.jarvis_sec.verification import (  # noqa: F401
-    build_gid_to_verification_mapping as _build_gid_to_verification_mapping,
-    merge_verified_items as _merge_verified_items,
-    merge_verified_items_without_verification as _merge_verified_items_without_verification,
-    process_verification_batch as _process_verification_batch,
-    is_valid_verification_item as _is_valid_verification_item,
-    run_verification_agent_with_retry as _run_verification_agent_with_retry,
+from jarvis.jarvis_sec.verification import (
     process_verification_phase as _process_verification_phase,
 )
 
+from jarvis.jarvis_sec.workflow import direct_scan
+from jarvis.jarvis_sec.workflow import run_with_agent
 
 # 注：当前版本不使用 MultiAgent 编排，已移除默认多智能体配置与创建函数。
 # 请使用 run_security_analysis（单Agent逐条验证）或 workflow.direct_scan + format_markdown_report（直扫基线）。
@@ -126,13 +53,6 @@ from jarvis.jarvis_sec.verification import (  # noqa: F401
 # 本文件中保留了这些函数的别名导入，以便向后兼容。
 
 
-
-
-
-
-
-
-
 def run_security_analysis(
     entry_path: str,
     languages: Optional[List[str]] = None,
@@ -150,7 +70,7 @@ def run_security_analysis(
     改进：
     - 即使在 agent 模式下，也先进行本地正则/启发式直扫，生成候选问题；
       然后将候选问题拆分为子任务，交由多Agent进行深入分析与聚合。
-    
+
     注意：此函数会在发生异常时更新状态文件为 error 状态。
 
     参数：
@@ -174,13 +94,24 @@ def run_security_analysis(
 
     # 状态管理器（不再使用 status.json，使用空对象）
     class DummyStatusManager:
-        def update_pre_scan(self, **kwargs): pass
-        def update_clustering(self, **kwargs): pass
-        def update_review(self, **kwargs): pass
-        def update_verification(self, **kwargs): pass
-        def mark_completed(self, **kwargs): pass
-        def mark_error(self, **kwargs): pass
-    
+        def update_pre_scan(self, **kwargs):
+            pass
+
+        def update_clustering(self, **kwargs):
+            pass
+
+        def update_review(self, **kwargs):
+            pass
+
+        def update_verification(self, **kwargs):
+            pass
+
+        def mark_completed(self, **kwargs):
+            pass
+
+        def mark_error(self, **kwargs):
+            pass
+
     status_mgr = DummyStatusManager()
 
     # 初始化分析上下文
@@ -195,37 +126,45 @@ def run_security_analysis(
 
     # 2) 将候选问题精简为子任务清单，控制上下文长度
     compact_candidates = _prepare_candidates(candidates)
-    
+
     # 3) 保存候选到新的 candidates.jsonl 文件（包含gid）
-    from jarvis.jarvis_sec.file_manager import save_candidates, get_candidates_file
+    from jarvis.jarvis_sec.file_manager import get_candidates_file
+    from jarvis.jarvis_sec.file_manager import save_candidates
+
     try:
         save_candidates(sec_dir, compact_candidates)
-        _progress_append({
-            "event": "candidates_saved",
-            "path": str(get_candidates_file(sec_dir)),
-            "issues_count": len(compact_candidates),
-        })
+        _progress_append(
+            {
+                "event": "candidates_saved",
+                "path": str(get_candidates_file(sec_dir)),
+                "issues_count": len(compact_candidates),
+            }
+        )
     except Exception:
         pass
-    
+
     # 记录批次选择信息（可选，用于日志）
     try:
         groups = _group_candidates_by_file(compact_candidates)
         if groups:
             selected_file, items = max(groups.items(), key=lambda kv: len(kv[1]))
             try:
-                typer.secho(f"[jarvis-sec] 批次选择: 文件={selected_file} 数量={len(items)}", fg=typer.colors.BLUE)
+                PrettyOutput.auto_print(
+                    f"[jarvis-sec] 批次选择: 文件={selected_file} 数量={len(items)}"
+                )
             except Exception:
                 pass
-            _progress_append({
-                "event": "batch_selection",
-                "selected_file": selected_file,
-                "selected_count": len(items),
-                "total_in_file": len(items),
-            })
+            _progress_append(
+                {
+                    "event": "batch_selection",
+                    "selected_file": selected_file,
+                    "selected_count": len(items),
+                    "total_in_file": len(items),
+                }
+            )
     except Exception:
         pass
-    
+
     # 创建报告写入函数
     _append_report = _create_report_writer(sec_dir, report_file)
 
@@ -256,12 +195,13 @@ def run_security_analysis(
         enable_verification=enable_verification,
         force_save_memory=force_save_memory,
     )
-    
+
     # 5) 使用统一聚合器生成最终报告（JSON + Markdown）
     try:
         from jarvis.jarvis_sec.report import build_json_and_markdown
+
         result = build_json_and_markdown(
-            all_issues,
+            all_issues,  # type: ignore[arg-type]
             scanned_root=summary.get("scanned_root"),
             scanned_files=summary.get("scanned_files"),
             meta=meta_records or None,
@@ -270,36 +210,21 @@ def run_security_analysis(
         # 标记分析完成
         status_mgr.mark_completed(
             total_issues=len(all_issues),
-            message=f"安全分析完成，共发现 {len(all_issues)} 个问题"
+            message=f"安全分析完成，共发现 {len(all_issues)} 个问题",
         )
         return result
     except Exception as e:
         # 发生错误时更新状态
         error_msg = str(e)
-        status_mgr.mark_error(
-            error_message=error_msg,
-            error_type=type(e).__name__
-        )
+        status_mgr.mark_error(error_message=error_msg, error_type=type(e).__name__)
         raise
     finally:
-        # 清理LSP客户端资源，防止文件句柄泄露
-        try:
-            from jarvis.jarvis_tools.lsp_client import LSPClientTool
-            LSPClientTool.cleanup_all_clients()
-        except Exception:
-            pass  # 清理失败不影响主流程
-
-
-
-
-
-
+        # 清理资源
+        pass
 
 
 __all__ = [
-    
     "run_security_analysis",
-
     "direct_scan",
     "run_with_agent",
-]
+]

jarvis/jarvis_sec/agents.py

@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
 """Agent创建和订阅模块"""
 
-from typing import Dict, Optional
+from typing import Dict
+from typing import Optional
+
 from jarvis.jarvis_agent import Agent
+from jarvis.jarvis_sec.prompts import build_summary_prompt
+from jarvis.jarvis_sec.prompts import get_cluster_summary_prompt
+from jarvis.jarvis_sec.prompts import get_cluster_system_prompt
+from jarvis.jarvis_sec.prompts import get_review_summary_prompt
+from jarvis.jarvis_sec.prompts import get_review_system_prompt
 from jarvis.jarvis_tools.registry import ToolRegistry
-from jarvis.jarvis_sec.prompts import (
-    build_summary_prompt,
-    get_review_system_prompt,
-    get_review_summary_prompt,
-    get_cluster_system_prompt,
-    get_cluster_summary_prompt,
-)
+from jarvis.jarvis_utils.tag import ot
 
 
 def subscribe_summary_event(agent: Agent) -> Dict[str, str]:
@@ -19,14 +20,16 @@ def subscribe_summary_event(agent: Agent) -> Dict[str, str]:
     try:
         from jarvis.jarvis_agent.events import AFTER_SUMMARY as _AFTER_SUMMARY
     except Exception:
-        _AFTER_SUMMARY = None
-    
+        _AFTER_SUMMARY = None  # type: ignore
+
     if _AFTER_SUMMARY:
+
         def _on_after_summary(**kwargs):
             try:
                 summary_container["text"] = str(kwargs.get("summary", "") or "")
             except Exception:
                 summary_container["text"] = ""
+
         try:
             agent.event_bus.subscribe(_AFTER_SUMMARY, _on_after_summary)
         except Exception:
@@ -34,9 +37,11 @@ def subscribe_summary_event(agent: Agent) -> Dict[str, str]:
     return summary_container
 
 
-def create_analysis_agent(task_id: str, llm_group: Optional[str], force_save_memory: bool = False) -> Agent:
+def create_analysis_agent(
+    task_id: str, llm_group: Optional[str], force_save_memory: bool = False
+) -> Agent:
     """创建分析Agent"""
-    system_prompt = """
+    system_prompt = f"""
 # 单Agent安全分析约束
 - 你的核心任务是评估代码的安全问题，目标：针对本候选问题进行证据核实、风险评估与修复建议补充，查找漏洞触发路径，确认在某些条件下会触发；以此来判断是否是漏洞。
 - **必须进行调用路径推导**：
@@ -64,9 +69,9 @@ def create_analysis_agent(task_id: str, llm_group: Optional[str], force_save_mem
   - 如果有必要，使用 save_memory 工具保存每个函数的分析要点，使用函数名作为 tag（例如：函数名、文件名等）。
   - 记忆内容示例：某个函数的指针已经判空、某个函数已有输入校验、某个函数的调用路径分析结果等。
   - 这样可以避免重复分析，提高效率，并保持分析的一致性。
-- 完成对本批次候选问题的判断后，主输出仅打印结束符 <!!!COMPLETE!!!> ，不需要汇总结果。
+- 完成对本批次候选问题的判断后，主输出仅打印结束符 {ot("!!!COMPLETE!!!")}，不要输出其他任何内容。任务总结将会在后面的交互中被询问。
 """.strip()
-    
+
     agent_kwargs: Dict = dict(
         system_prompt=system_prompt,
         name=task_id,
@@ -93,7 +98,7 @@ def create_review_agent(
     """创建复核Agent"""
     review_system_prompt = get_review_system_prompt()
     review_summary_prompt = get_review_summary_prompt()
-    
+
     review_task_id = f"JARVIS-SEC-Review-Batch-{current_review_num}"
     review_agent_kwargs: Dict = dict(
         system_prompt=review_system_prompt,
@@ -122,7 +127,7 @@ def create_cluster_agent(
     """创建聚类Agent"""
     cluster_system_prompt = get_cluster_system_prompt()
     cluster_summary_prompt = get_cluster_summary_prompt()
-    
+
     agent_kwargs_cluster: Dict = dict(
         system_prompt=cluster_system_prompt,
         name=f"JARVIS-SEC-Cluster::{file}::batch{chunk_idx}",
@@ -140,4 +145,3 @@ def create_cluster_agent(
     if llm_group:
         agent_kwargs_cluster["model_group"] = llm_group
     return Agent(**agent_kwargs_cluster)
-