auto-coder 0.1.306__py3-none-any.whl → 0.1.307__py3-none-any.whl

{auto_coder-0.1.306.dist-info → auto_coder-0.1.307.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.306
+Version: 0.1.307
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.306.dist-info → auto_coder-0.1.307.dist-info}/RECORD

@@ -1,10 +1,10 @@
 autocoder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/auto_coder.py,sha256=4NyaafKENW-yRRoaIQbbVac8CLRXQQ_0WFUmxpuIdf8,66047
+autocoder/auto_coder.py,sha256=ifhdnd39tOIDu_4LdYTxjVCnwmpDoOC90RRwD8bhIKU,65983
 autocoder/auto_coder_lang.py,sha256=Rtupq6N3_HT7JRhDKdgCBcwRaiAnyCOR_Gsp4jUomrI,3229
 autocoder/auto_coder_rag.py,sha256=5TtAfbEBwyt-cB4WcI8eQ1G3AuKij0056wFYRViDhLs,34036
 autocoder/auto_coder_rag_client_mcp.py,sha256=QRxUbjc6A8UmDMQ8lXgZkjgqtq3lgKYeatJbDY6rSo0,6270
 autocoder/auto_coder_rag_mcp.py,sha256=-RrjNwFaS2e5v8XDIrKR-zlUNUE8UBaeOtojffBrvJo,8521
-autocoder/auto_coder_runner.py,sha256=bJKALThUBFKCmX-BB3Cjh9go9HRMnh9yZdKHZz8fAoc,104751
+autocoder/auto_coder_runner.py,sha256=bvd1UXYzVT2L-I2ZCkdxy9Ap8P2Q6F2JD-F7QLvaIPc,106545
 autocoder/auto_coder_server.py,sha256=E3Z829TPSooRSNhuh3_x9yaZi0f5G0Lm0ntoZhjGaoQ,20576
 autocoder/benchmark.py,sha256=Ypomkdzd1T3GE6dRICY3Hj547dZ6_inqJbBJIp5QMco,4423
 autocoder/chat_auto_coder.py,sha256=Cp5_m3pCxEDcRrVG1uojTfD8xecdl9FvYtD948TvLsg,25223
@@ -14,13 +14,13 @@ autocoder/command_parser.py,sha256=fx1g9E6GaM273lGTcJqaFQ-hoksS_Ik2glBMnVltPCE,1
 autocoder/lang.py,sha256=U6AjVV8Rs1uLyjFCZ8sT6WWuNUxMBqkXXIOs4S120uk,14511
 autocoder/models.py,sha256=AyoZ-Pzy0oyYUmWCxOIRiOImsqboSfRET7LO9-UOuxI,11172
 autocoder/run_context.py,sha256=IUfSO6_gp2Wt1blFWAmOpN0b0nDrTTk4LmtCYUBIoro,1643
-autocoder/version.py,sha256=XqstJG2NUtLXeLrUSdvICbSPFolVEqrCnUeMEAadQlM,23
+autocoder/version.py,sha256=SL-SjrRE3j5Bdry_MqdGwfa7ZysXlPPGduCZPe8eo98,23
 autocoder/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/agent/auto_demand_organizer.py,sha256=NWSAEsEk94vT3lGjfo25kKLMwYdPcpy9e-i21txPasQ,6942
-autocoder/agent/auto_filegroup.py,sha256=CW7bqp0FW1GIEMnl-blyAc2UGT7O9Mom0q66ITz1ckM,6635
+autocoder/agent/auto_demand_organizer.py,sha256=URAq0gSEiHeV_W4zwhOI_83kHz0Ryfj1gcfh5jwCv_w,6501
+autocoder/agent/auto_filegroup.py,sha256=pBsAkBcpFTff-9L5OwI8xhf2xPKpl-aZwz-skF2B6dc,6296
 autocoder/agent/auto_guess_query.py,sha256=rDSdhpPHcOGE5MuDXvIrhCXAPR4ARS1LqpyoLsx2Jhw,11374
-autocoder/agent/auto_learn_from_commit.py,sha256=ssttfsB4Xxjez6bVz1Y1NQlkX8PwpDjUeIhMUitIW0g,11526
-autocoder/agent/auto_review_commit.py,sha256=PGlP_-dSWcT4sqMCaBpNAm7JHNrDYjJorwlO4mBbobo,13323
+autocoder/agent/auto_learn_from_commit.py,sha256=edD4GQJyO2qvVnTKyldeswWoNeKe1Aaua6ieJzlGlFI,10662
+autocoder/agent/auto_review_commit.py,sha256=mHi26sU4gJAsutqJyLyXfg7DfNZJNt-H7_2a-a8pLEQ,10563
 autocoder/agent/auto_tool.py,sha256=DBzip-P_T6ZtT2eHexPcusmKYD0h7ufzp7TLwXAY10E,11554
 autocoder/agent/coder.py,sha256=x6bdJwDuETGg9ebQnYlUWCxCtQcDGg73LtI6McpWslQ,72034
 autocoder/agent/designer.py,sha256=EpRbzO58Xym3GrnppIT1Z8ZFAlnNfgzHbIzZ3PX-Yv8,27037
@@ -28,13 +28,13 @@ autocoder/agent/planner.py,sha256=SZTSZHxHzDmuWZo3K5fs79RwvJLWurg-nbJRRNbX65o,91
 autocoder/agent/project_reader.py,sha256=tWLaPoLw1gI6kO_NzivQj28KbobU2ceOLuppHMbfGl8,18234
 autocoder/chat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/commands/auto_command.py,sha256=mreV3kJTo1QwaM7kWY9kfol569pQTb8EHFq53B6BugI,62501
+autocoder/commands/auto_command.py,sha256=fZ4TNU4YA9qdoVHmZX0rb6sV_N-DEcgSLaC5s3PGSHA,64200
 autocoder/commands/auto_web.py,sha256=Cc0eb6JN3SvFy3GD_lpSLvIqj7F1eFDTcwg1t-zDcKg,39024
 autocoder/commands/tools.py,sha256=uSPyEcx6o1upuw6clHdL4yeqoXbywnvCxAPo2mt5rJk,28117
 autocoder/common/JupyterClient.py,sha256=O-wi6pXeAEYhAY24kDa0BINrLYvKS6rKyWe98pDClS0,2816
 autocoder/common/ShellClient.py,sha256=fM1q8t_XMSbLBl2zkCNC2J9xuyKN3eXzGm6hHhqL2WY,2286
-autocoder/common/__init__.py,sha256=S8edUoKW4EV5L7kKfZ6MSuEI-hLwop1PKJa-parNhg0,14026
-autocoder/common/action_yml_file_manager.py,sha256=q0QBlptWtR9DhqguMBZJfHmmTP9fVGjI5DdDer29sis,16109
+autocoder/common/__init__.py,sha256=sIbE0Gm30MkCmZ9ClQeKx1Hw-vjdcVF65hO5TschS1Y,14070
+autocoder/common/action_yml_file_manager.py,sha256=w-422xnvOfhf3MFxNLCZuAEUDa8RrYX12ngHs-fsH0k,17358
 autocoder/common/anything2images.py,sha256=0ILBbWzY02M-CiWB-vzuomb_J1hVdxRcenAfIrAXq9M,25283
 autocoder/common/anything2img.py,sha256=iZQmg8srXlD7N5uGl5b_ONKJMBjYoW8kPmokkG6ISF0,10118
 autocoder/common/audio.py,sha256=Kn9nWKQddWnUrAz0a_ZUgjcu4VUU_IcZBigT7n3N3qc,7439
@@ -44,15 +44,15 @@ autocoder/common/buildin_tokenizer.py,sha256=L7d5t39ZFvUd6EoMPXUhYK1toD0FHlRH1jt
 autocoder/common/chunk_validation.py,sha256=BrR_ZWavW8IANuueEE7hS8NFAwEvm8TX34WnPx_1hs8,3030
 autocoder/common/cleaner.py,sha256=NU72i8C6o9m0vXExab7nao5bstBUsfJFcj11cXa9l4U,1089
 autocoder/common/code_auto_execute.py,sha256=4KXGmiGObr_B1d6tzV9dwS6MifCSc3Gm4j2d6ildBXQ,6867
-autocoder/common/code_auto_generate.py,sha256=lAuvMggASauLsWmynQxDcb0B0N1BZukrk2hwHVviwNk,17206
-autocoder/common/code_auto_generate_diff.py,sha256=KqmOq5BsmM18t4ZPc5o1WfmXabfL9fNhCw2x_mRVHm4,23073
-autocoder/common/code_auto_generate_editblock.py,sha256=rY-zqQ8qSgcui8FDsOXdcwqVZeTSPxI3LejKNkFkXIc,24966
-autocoder/common/code_auto_generate_strict_diff.py,sha256=Jz234Nk9G-e7wLojvWiwfLTEpWvJigo9GnEUXK-kCyE,21968
-autocoder/common/code_auto_merge.py,sha256=VWUWxubvbd1eF0ToupCGHP3uHD4wHUhQFOmeSLdCYYo,9941
-autocoder/common/code_auto_merge_diff.py,sha256=xg79LqyuEsuT2SVKGbYGTisIi1NUtSHXwSwazP315uM,19251
-autocoder/common/code_auto_merge_editblock.py,sha256=5m0q1047Ew02gINbB7ZHujW2D21R5st8RB2MenXq1I4,21745
-autocoder/common/code_auto_merge_strict_diff.py,sha256=VbpK-jB-58I0rxYGogcOTBkRYDnfaWVlDWF6GwGhhcg,13189
-autocoder/common/code_modification_ranker.py,sha256=i_ycikE9pE83vtb3oMGK8TLWMWkjzADxuzR-Zop7WLI,13246
+autocoder/common/code_auto_generate.py,sha256=mxCPG-RC36q5POPMozPytjJcK0ExUeyau7b9ZWWScps,17228
+autocoder/common/code_auto_generate_diff.py,sha256=lddReDQzJts25x55YDbFWJBJ_n9OzsLkyQ-cc1DFw1M,23095
+autocoder/common/code_auto_generate_editblock.py,sha256=YfXuSYogJ5YoHTsx6LN5pPskZPop-noNViiDSRACOYU,24988
+autocoder/common/code_auto_generate_strict_diff.py,sha256=cKCcDfVADSbkwPMWmHGhRjzKutieEw80NjFjwZbFudw,21990
+autocoder/common/code_auto_merge.py,sha256=WaU-T-ZVn3QDaA_SrdkHciUPKDcTfVa-IbhHKBYEv5w,9961
+autocoder/common/code_auto_merge_diff.py,sha256=DcljWrtlejq2cb9Gj-jBjvUQzRbCE2uMNGg8SBOhEnk,19271
+autocoder/common/code_auto_merge_editblock.py,sha256=pLgs1HsS4mRkO2cm7T18u4w8T3PjSMxqNbJZ4LHnnWI,21765
+autocoder/common/code_auto_merge_strict_diff.py,sha256=C35pFxhkgypsm50VDAFOBAT6YXMtzKTvIpEUH1GjZZg,13209
+autocoder/common/code_modification_ranker.py,sha256=Ld3wtjV10zW7lN_L3bKEsvi7RvAleB8r1DD9eLmVnx4,13462
 autocoder/common/command_completer.py,sha256=jBFi8Y1xWmMcxwdDz6Gs7r8ADFPb7eRr9egWU0vLxLo,35787
 autocoder/common/command_generator.py,sha256=YwB_E818vx0fQDOpLD61GivsSgLnrIoxKrY22ka49JU,2797
 autocoder/common/command_templates.py,sha256=WAixVjue5QmCFAD13K4ElfcOEjdeGr8tFb0atDAbEoo,8658
@@ -63,7 +63,7 @@ autocoder/common/const.py,sha256=eTjhjh4Aj4CUzviJ81jaf3Y5cwqsLATySn2wJxaS6RQ,291
 autocoder/common/context_pruner.py,sha256=HlU5BmxpCX7uVTJUsTFLlXvkwcOQuidI9uCKZaFxh6s,19874
 autocoder/common/conversation_pruner.py,sha256=pzmrQEa7pFzA66eYSS_h7VqP6ZwUABeooDQzm0PGu0A,5770
 autocoder/common/files.py,sha256=nPiKcnUcYZbSUn3TskKeTVnAxCJRtuehPuB_5d2imX8,4618
-autocoder/common/git_utils.py,sha256=d2J5APFIw2LxxRHN8UMY3qwiLeYA1WIf74IO72t0Rbc,26587
+autocoder/common/git_utils.py,sha256=yxV-eYYwsncNpVs07Nk61506FFpG2REC43l6ppFCYWM,27081
 autocoder/common/global_cancel.py,sha256=TyjYQPESwo04D1BOTmC9hH7IbkKDDM-b2zPacEHGIQ8,3264
 autocoder/common/image_to_page.py,sha256=yWiTJQ49Lm3j0FngiJhQ9u7qayqE_bOGb8Rk0TmSWx0,14123
 autocoder/common/index_import_export.py,sha256=h758AYY1df6JMTKUXYmMkSgxItfymDt82XT7O-ygEuw,4565
@@ -82,7 +82,7 @@ autocoder/common/search.py,sha256=245iPFgWhMldoUK3CqCP89ltaxZiNPK73evoG6Fp1h8,16
 autocoder/common/search_replace.py,sha256=GphFkc57Hb673CAwmbiocqTbw8vrV7TrZxtOhD0332g,22147
 autocoder/common/shells.py,sha256=elminFpNosnV0hsEUcsugDxlGO8NfH96uah-8bkaBvA,19929
 autocoder/common/stats_panel.py,sha256=wGl9O45pjVVDxhNumLv4_NfLYSlUP_18Tw4hcJSjw50,4596
-autocoder/common/stream_out_type.py,sha256=3caVTArt1mjKMxl-W3bMhBxqtXdr2SgPjOCroNJAWy8,265
+autocoder/common/stream_out_type.py,sha256=uNHRg-1my6CxcPzQM6pACrYpTZbxOenVT8aLxnruv2w,333
 autocoder/common/sys_prompt.py,sha256=JlexfjZt554faqbgkCmzOJqYUzDHfbnxly5ugFfHfEE,26403
 autocoder/common/text.py,sha256=KGRQq314GHBmY4MWG8ossRoQi1_DTotvhxchpn78c-k,1003
 autocoder/common/types.py,sha256=PXTETrsTvhLE49jqAeUKGySvxBN9pjeyCgRHLDYdd9U,664
@@ -117,7 +117,7 @@ autocoder/index/filter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 autocoder/index/filter/normal_filter.py,sha256=MI-8xdXCrniaxYCHVTLkq5tafvcUiauD3LN0b3ymRXI,8361
 autocoder/index/filter/quick_filter.py,sha256=ozESEgy506FQ5ecjOumyo4D_KMrterB1QLmnVtiyOiM,43264
 autocoder/memory/__init__.py,sha256=5FeGvsesRViYL4BkFiHw9SdlyHeWlqALpTyqOpfnBRw,179
-autocoder/memory/active_context_manager.py,sha256=yf_AiA8TUt7A7Tlg5TAlLm5iv9Jd86pOQrhXjOQsXT0,27111
+autocoder/memory/active_context_manager.py,sha256=7f7DznnLXbXH6yptN8rOSSJcre0bSJ2dU9mM9L6bvno,27106
 autocoder/memory/active_package.py,sha256=CyfqZSgNucE5mGQH5JGHTE8lTU0KjFGkW2YN8vl9SoI,17480
 autocoder/memory/async_processor.py,sha256=htHzLGupw9IHQAEdLe2AEaALZSItPi3AltDt8FMTRHk,4643
 autocoder/memory/directory_mapper.py,sha256=BXHblOdRpeZb7URDECALp9uN5oi91KmkW9g_UaWFuZY,2513
@@ -198,9 +198,9 @@ autocoder/utils/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/chat_stream_out.py,sha256=xuBeWD0YOckqRo8JB1WkVIMOYH6c24m7JfV4svBfPDo,15113
 autocoder/utils/chat_auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_coder-0.1.306.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-auto_coder-0.1.306.dist-info/METADATA,sha256=dRRK97KSeiakq3KrfZwTZbUUAzwCb24dqfbcnA-OiGE,2721
-auto_coder-0.1.306.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder-0.1.306.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
-auto_coder-0.1.306.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
-auto_coder-0.1.306.dist-info/RECORD,,
+auto_coder-0.1.307.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+auto_coder-0.1.307.dist-info/METADATA,sha256=3zdlrR3qOtRYS5giLuNFcXbUERBGTgE4hKVtz3CgZ7I,2721
+auto_coder-0.1.307.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+auto_coder-0.1.307.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
+auto_coder-0.1.307.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
+auto_coder-0.1.307.dist-info/RECORD,,

autocoder/agent/auto_demand_organizer.py

@@ -6,6 +6,8 @@ import byzerllm
 import pydantic
 import git
 
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
+
 
 class DemandItem(pydantic.BaseModel):
     """单个需求项"""
@@ -44,6 +46,7 @@ class AutoDemandOrganizer:
             file_size_limit: 最多分析多少历史任务
         """
         self.project_dir = project_dir
+        self.action_file_manager = ActionYmlFileManager(project_dir)
         self.actions_dir = os.path.join(project_dir, "actions")
         self.llm = llm
         self.file_size_limit = file_size_limit
@@ -162,26 +165,16 @@ class AutoDemandOrganizer:
 
             if query and urls:
                 commit_diff = ""
-                if not self.skip_diff:
-                    # 计算文件的MD5用于匹配commit
-                    import hashlib
-                    file_md5 = hashlib.md5(open(yaml_path, 'rb').read()).hexdigest()
-                    response_id = f"auto_coder_{yaml_file}_{file_md5}"
-                    # 查找对应的commit                   
-                    try:
-                        for commit in repo.iter_commits():
-                            if response_id in commit.message:
-                                if commit.parents:
-                                    parent = commit.parents[0]
-                                    commit_diff = repo.git.diff(
-                                        parent.hexsha, commit.hexsha)
-                                else:
-                                    commit_diff = repo.git.show(commit.hexsha)
-                                break
-                    except git.exc.GitCommandError as e:
-                        logger.error(f"Git命令执行错误: {str(e)}")
-                    except Exception as e:
-                        logger.error(f"获取commit diff时出错: {str(e)}")
+                if not self.skip_diff:                                    
+                    commit_id = self.action_file_manager.get_commit_id_from_file(yaml_file)
+                    commit = repo.commit(commit_id)
+                    if commit:
+                        if commit.parents:
+                            parent = commit.parents[0]
+                            commit_diff = repo.git.diff(
+                                parent.hexsha, commit.hexsha)
+                        else:
+                            commit_diff = repo.git.show(commit.hexsha)
 
                 querie_with_urls_and_diffs.append((query, urls, commit_diff))
 

autocoder/agent/auto_filegroup.py

@@ -4,6 +4,7 @@ import yaml
 from loguru import logger
 import byzerllm
 import pydantic
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 
 
 class FileGroup(pydantic.BaseModel):
@@ -40,6 +41,7 @@ class AutoFileGroup:
             actions_dir: 包含YAML文件的目录
         """
         self.project_dir = project_dir
+        self.action_manager = ActionYmlFileManager(project_dir)
         self.actions_dir = os.path.join(project_dir, "actions")
         self.llm = llm
         self.file_size_limit = file_size_limit
@@ -152,23 +154,15 @@ class AutoFileGroup:
                 commit_diff = ""
                 if not self.skip_diff:
                     # 计算文件的MD5用于匹配commit
-                    file_md5 = hashlib.md5(open(yaml_path, 'rb').read()).hexdigest()
-                    response_id = f"auto_coder_{yaml_file}_{file_md5}"
+                    commit_id = self.action_manager.get_commit_id_from_file(yaml_file)
+                    commit = repo.commit(commit_id)                
                     # 查找对应的commit                   
-                    try:
-                        for commit in repo.iter_commits():
-                            if response_id in commit.message:
-                                if commit.parents:
-                                    parent = commit.parents[0]
-                                    commit_diff = repo.git.diff(
-                                        parent.hexsha, commit.hexsha)
-                                else:
-                                    commit_diff = repo.git.show(commit.hexsha)
-                                break
-                    except git.exc.GitCommandError as e:
-                        logger.error(f"Git命令执行错误: {str(e)}")
-                    except Exception as e:
-                        logger.error(f"获取commit diff时出错: {str(e)}")
+                    if commit and commit.parents:
+                        parent = commit.parents[0]
+                        commit_diff = repo.git.diff(
+                            parent.hexsha, commit.hexsha)
+                    else:
+                        commit_diff = repo.git.show(commit.hexsha)                    
 
                 querie_with_urls_and_diffs.append((query, urls, commit_diff))
 

autocoder/agent/auto_learn_from_commit.py

@@ -121,40 +121,30 @@ class AutoLearnFromCommit:
             if not self.skip_diff:
                 # 使用 ActionManager 获取 commit ID
                 commit_id = self.action_manager.get_commit_id_from_file(action_file)
-                if commit_id:
-                    try:
-                        for commit in repo.iter_commits():
-                            if commit_id in commit.message:
-                                if commit.parents:
-                                    parent = commit.parents[0]
-                                    # 获取所有文件的前后内容
-                                    for diff_item in parent.diff(commit):
-                                        file_path = diff_item.a_path if diff_item.a_path else diff_item.b_path
-                                        
-                                        # 获取变更前内容
-                                        before_content = None
-                                        try:
-                                            if diff_item.a_blob:
-                                                before_content = repo.git.show(f"{parent.hexsha}:{file_path}")
-                                        except git.exc.GitCommandError:
-                                            pass  # 文件可能是新增的
+                commit = repo.commit(commit_id)                
+                if commit and commit.parents:
+                    parent = commit.parents[0]
+                    # 获取所有文件的前后内容
+                    for diff_item in parent.diff(commit):
+                        file_path = diff_item.a_path if diff_item.a_path else diff_item.b_path
+                        
+                        # 获取变更前内容
+                        before_content = None
+                        try:
+                            if diff_item.a_blob:
+                                before_content = repo.git.show(f"{parent.hexsha}:{file_path}")
+                        except git.exc.GitCommandError:
+                            pass  # 文件可能是新增的
 
-                                        # 获取变更后内容
-                                        after_content = None
-                                        try:
-                                            if diff_item.b_blob:
-                                                after_content = repo.git.show(f"{commit.hexsha}:{file_path}")
-                                        except git.exc.GitCommandError:
-                                            pass  # 文件可能被删除
+                        # 获取变更后内容
+                        after_content = None
+                        try:
+                            if diff_item.b_blob:
+                                after_content = repo.git.show(f"{commit.hexsha}:{file_path}")
+                        except git.exc.GitCommandError:
+                            pass  # 文件可能被删除
 
-                                        changes[file_path] = (before_content, after_content)
-                                break
-                    except git.exc.GitCommandError as e:
-                        printer = Printer()
-                        printer.print_in_terminal("git_command_error", style="red", error=str(e))
-                    except Exception as e:
-                        printer = Printer()
-                        printer.print_in_terminal("get_commit_changes_error", style="red", error=str(e))
+                        changes[file_path] = (before_content, after_content)
 
             querie_with_urls_and_changes.append((query, urls, changes))
 

autocoder/agent/auto_review_commit.py

@@ -9,6 +9,7 @@ from autocoder.common.printer import Printer
 from autocoder.common import AutoCoderArgs
 from autocoder.common.utils_code_auto_generate import stream_chat_with_continue
 import hashlib
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 
 
 def load_yaml_config(yaml_file: str) -> Dict:
@@ -41,6 +42,7 @@ class AutoReviewCommit:
         self.llm = llm        
         self.skip_diff = skip_diff
         self.console = console or Console()
+        self.action_yml_manager = ActionYmlFileManager(source_dir=args.source_dir)
 
     @byzerllm.prompt()
     def review(self, querie_with_urls_and_changes: List[Tuple[str, List[str], Dict[str, Tuple[str, str]]]], query: str) -> Generator[str,None,None]:
@@ -141,66 +143,16 @@ class AutoReviewCommit:
             action_files = sorted(action_files, key=get_seq)
             action_files.reverse()   
         
+        if not action_files:
+            return []
+            
         action_file = action_files[0]
-
         querie_with_urls_and_changes = []
-        repo = git.Repo(self.project_dir)
-
-        # 收集所有query、urls和对应的文件变化
-        for yaml_file in [action_file]:
-            yaml_path = os.path.join(self.actions_dir, yaml_file)
-            config = load_yaml_config(yaml_path)
 
-            if not config:
-                continue
-
-            query = config.get('query', '')
-            urls = config.get('urls', [])
-
-            if query:
-                changes = {}
-                if not self.skip_diff:
-                    # 计算文件的MD5用于匹配commit   
-                    with open(yaml_path, 'r', encoding='utf-8') as f:
-                        yaml_content = f.read()                 
-                        file_md5 = hashlib.md5(yaml_content.encode("utf-8")).hexdigest()
-                    response_id = f"auto_coder_{yaml_file}_{file_md5}"
-                    # 查找对应的commit                   
-                    try:
-                        for commit in repo.iter_commits():
-                            if response_id in commit.message:
-                                if commit.parents:
-                                    parent = commit.parents[0]
-                                    # 获取所有文件的前后内容
-                                    for diff_item in parent.diff(commit):
-                                        file_path = diff_item.a_path if diff_item.a_path else diff_item.b_path
-                                        
-                                        # 获取变更前内容
-                                        before_content = None
-                                        try:
-                                            if diff_item.a_blob:
-                                                before_content = repo.git.show(f"{parent.hexsha}:{file_path}")
-                                        except git.exc.GitCommandError:
-                                            pass  # 文件可能是新增的
-
-                                        # 获取变更后内容
-                                        after_content = None
-                                        try:
-                                            if diff_item.b_blob:
-                                                after_content = repo.git.show(f"{commit.hexsha}:{file_path}")
-                                        except git.exc.GitCommandError:
-                                            pass  # 文件可能被删除
-
-                                        changes[file_path] = (before_content, after_content)
-                                break
-                    except git.exc.GitCommandError as e:
-                        printer = Printer()
-                        printer.print_in_terminal("git_command_error", style="red", error=str(e))
-                    except Exception as e:
-                        printer = Printer()
-                        printer.print_in_terminal("get_commit_changes_error", style="red", error=str(e))
-
-                querie_with_urls_and_changes.append((query, urls, changes))
+        # 使用ActionYmlFileManager获取提交变更
+        changes = self.action_yml_manager.get_commit_changes(action_file)
+        if changes:
+            querie_with_urls_and_changes = changes
 
         return querie_with_urls_and_changes
     
@@ -289,14 +241,11 @@ class AutoReviewCommit:
         printer = Printer()
         commit_file_name = None
         if commit_id:
+            # 利用ActionYmlFileManager获取文件名
             repo = git.Repo(self.project_dir)
             commit = repo.commit(commit_id)
-            # auto_coder_000000001926_chat_action.yml_88614d5bd4046a068786c252fbc39c13
-            msg = commit.message
-            commit_file_info = msg.split("_")[0]
-            if commit_file_info.startswith("auto_coder_"):
-                commit_file_name = "_".join(msg.split("_",)[0:-1]) 
-
+            commit_file_name = self.action_yml_manager.get_file_name_from_commit_msg(commit.message)
+            
             if not commit_file_name:
                 raise ValueError(printer.get_message_from_key_with_format("no_commit_file_name",commit_id=commit_id))
         

autocoder/auto_coder.py

@@ -27,7 +27,6 @@ from autocoder.utils.rest import HttpDoc
 from byzerllm.apps.byzer_storage.env import get_latest_byzer_retrieval_lib
 from autocoder.command_args import parse_args
 from autocoder.rag.api_server import serve, ServerArgs
-from autocoder.utils import open_yaml_file_in_editor, get_last_yaml_file
 from autocoder.utils.request_queue import (
     request_queue,
     RequestValue,
@@ -120,12 +119,10 @@ def main(input_args: Optional[List[str]] = None):
     #     args.request_id = str(uuid.uuid4())
 
     if raw_args.command == "revert":
-        repo_path = args.source_dir
-
         file_name = os.path.basename(args.file)
-        revert_result = git_utils.revert_changes(
-            repo_path, f"auto_coder_{file_name}"
-        )
+        action_file_manager = ActionYmlFileManager(source_dir=args.source_dir)
+        revert_result = action_file_manager.revert_file(file_name)
+        
         if revert_result:
             print(f"Successfully reverted changes for {args.file}")
         else:

autocoder/auto_coder_runner.py

@@ -17,6 +17,7 @@ from contextlib import contextmanager
 from typing import List, Dict, Any, Optional
 from autocoder.common import AutoCoderArgs
 from pydantic import BaseModel
+from autocoder.common.action_yml_file_manager import ActionYmlFileManager
 from autocoder.common.result_manager import ResultManager
 from autocoder.version import __version__
 from autocoder.auto_coder import main as auto_coder_main
@@ -695,9 +696,7 @@ def revert():
         
         if "Successfully reverted changes" in s:
             result_manager.append(content=s, meta={"action": "revert","success":False, "input":{                
-            }})
-                        
-            os.remove(file_path)
+            }})                                    
         else:
             result_manager.append(content=s, meta={"action": "revert","success":False, "input":{                
             }})
@@ -1428,12 +1427,33 @@ def commit(query: str):
             with open(os.path.join(execute_file), "w",encoding="utf-8") as f:
                 f.write(yaml_content)
 
-            file_content = open(execute_file).read()
-            md5 = hashlib.md5(file_content.encode("utf-8")).hexdigest()
+            args.file = execute_file             
+            
             file_name = os.path.basename(execute_file)
             commit_result = git_utils.commit_changes(
                 ".", f"{commit_message}\nauto_coder_{file_name}"
             )
+
+            printer = Printer()
+
+            action_yml_file_manager = ActionYmlFileManager(args.source_dir)
+            action_file_name = os.path.basename(args.file)
+            add_updated_urls = []
+            commit_result.changed_files
+            for file in commit_result.changed_files:
+                add_updated_urls.append(os.path.join(args.source_dir, file))
+
+            args.add_updated_urls = add_updated_urls
+            update_yaml_success = action_yml_file_manager.update_yaml_field(action_file_name, "add_updated_urls", add_updated_urls)
+            if not update_yaml_success:                        
+                printer.print_in_terminal("yaml_save_error", style="red", yaml_file=action_file_name)  
+                        
+            if args.enable_active_context:                
+                active_context_manager = ActiveContextManager(llm, args.source_dir)
+                task_id = active_context_manager.process_changes(args)
+                printer.print_in_terminal("active_context_background_task", 
+                                             style="blue",
+                                             task_id=task_id)
             git_utils.print_commit_info(commit_result=commit_result)
             if commit_message:
                 printer.print_in_terminal("commit_message", style="green", model_name=target_model, message=commit_message)                
@@ -1800,17 +1820,29 @@ def active_context(query: str):
     if len(commands_infos) > 0:
         if "list" in commands_infos:
             command = "list"
+        if "run" in commands_infos:
+            command = "run"
     
     args = get_final_config()
+    printer = Printer()
     # 获取LLM实例    
     llm = get_single_llm(args.model,product_mode=args.product_mode)
+    action_file_manager = ActionYmlFileManager(args.source_dir)
     
     # 获取配置和参数
     
     
-    # 获取ActiveContextManager单例
-    active_context_manager = ActiveContextManager(llm, args)
-    
+    active_context_manager = ActiveContextManager(llm, args.source_dir)
+    if command == "run":
+        file_name = commands_infos["run"]["args"][-1]
+        args.file = action_file_manager.get_full_path_by_file_name(file_name)        
+        ## 因为更新了args.file
+        active_context_manager = ActiveContextManager(llm, args.source_dir)
+        task_id = active_context_manager.process_changes(args)
+        printer.print_in_terminal("active_context_background_task", 
+                                        style="blue",
+                                        task_id=task_id)
+
     # 处理不同的命令
     if command == "list":
         # 获取所有任务

autocoder/commands/auto_command.py

@@ -213,6 +213,8 @@ class CommandAutoTuner:
     @byzerllm.prompt()
     def _analyze(self, request: AutoCommandRequest) -> str:
         """
+        你是 auto-coder.chat 软件，帮助用户完成编程方面的需求。我们的目标是根据用户输入和当前上下文，组合多个函数来完成用户的需求。
+
         ## 当前用户环境信息如下:
         <os_info>
         操作系统: {{ env_info.os_name }} {{ env_info.os_version }}
@@ -234,10 +236,11 @@ class CommandAutoTuner:
         {%- endif %}   
         </os_info>
 
-        我们的目标是根据用户输入和当前上下文，组合多个函数来完成用户的需求。
-
+        当前项目根目录：
+        {{ current_project }}
+    
         {% if current_files %}
-        ## 当前活跃区文件列表：
+        ## 当前用户手动添加关注的文件列表：
         <current_files>
         {% for file in current_files %}
         - {{ file }}
@@ -246,7 +249,7 @@ class CommandAutoTuner:
         {% endif %}
 
 
-        ## 当前用户的配置选项如下:
+        ## 这是用户对你的配置        
         <current_conf>
         {{ current_conf }}
         </current_conf>
@@ -260,6 +263,24 @@ class CommandAutoTuner:
         ## 函数组合说明：        
         {{ command_combination_readme }}
 
+        ## active-context 项目追踪文档系统
+        
+        在 {{ current_project }}/.auto-coder/active-context 下,我们提供了对该项目每个文件目录的追踪。
+        具体逻辑为：假设我们在当前项目有 ./src/package1/py1.py, 那么相应的在 .auto-coder/active-context 会有一个 ./src/package1 目录,
+        该目录下可能会有一个 active-context.md 文件，该文件记录了该目录下所有文件相关信息，可以帮你更好的理解这个目录下的文档，你可以通过 read_files 函数来读取
+        这个文件。注意，这个文件不一定存在。如果读取失败也是正常的。
+
+        ## 变更记录文档系统
+
+        在 {{ current_project }}/actions 目录下，会有格式类似 000000001201_chat_action.yml 的文件，该文件记录了最近10次对话，
+        你可以通过 read_files 函数来读取这些文件，从而更好的理解用户的需求。
+
+        下面是一些字段的简单介绍
+        - query: 用户需求
+        - urls： 用户提供的上下文文件列表
+        - dynamic_urls： auto-coder.chat 自动感知的一些文件列表
+        - add_updated_urls: 这次需求发生变更的文件列表        
+        
         {% if conversation_history %}
         ## 历史对话:
         <conversation_history>
@@ -314,7 +335,8 @@ class CommandAutoTuner:
             "conversation_safe_zone_tokens": self.args.conversation_prune_safe_zone_tokens,
             "os_distribution": shells.get_os_distribution(),
             "current_user": shells.get_current_username(),
-            "command_combination_readme": self._command_combination_readme.prompt()
+            "command_combination_readme": self._command_combination_readme.prompt(),
+            "current_project": os.path.abspath(self.args.source_dir)
         }
 
     @byzerllm.prompt()
@@ -337,8 +359,10 @@ class CommandAutoTuner:
         尽可通过了解项目后，多用 @文件和@@符号，这样 chat 函数可以更清晰的理解你关注的代码，文档和意图。
 
         ### 调用 coding 函数应该注意的事项
-        调用 coding 函数的时候，尽可能多的 @文件和@@符号，让需求更加清晰明了，建议多描述具体怎么完成对应的需求。
-        对于代码需求设计，尽可能使用 chat 函数。如果成功执行了 coding 函数， 最好再调用一次 chat("/review /commit")，方便总结这次代码变更。
+        调用 coding 函数的之前，你需要尽可能先了解用户需求，了解项目状态，包括读取 active_context 文件来了解项目。
+        然后清晰的描述自己的需求，完整的实现步骤，以及尽可能对@文件和@@符号需要参考以及修改的文件和符号。
+        对于比较复杂的需求，你还可以使用 chat 函数来进行讨论，从而获取一些有用的信息。
+        如果成功执行了 coding 函数， 最好再调用一次 chat("/review /commit")，方便总结这次代码变更。
         注意，review 完后，需要询问用户是否要做啥调整不，如果用户说不用，那么就停止。否则根据意图进行后续操作。
 
         ### 关于对话大小的问题

autocoder/common/__init__.py

@@ -416,6 +416,8 @@ class AutoCoderArgs(pydantic.BaseModel):
 
     generate_max_rounds: Optional[int] = 5
 
+    revert_commit_id: Optional[str] = None
+
     class Config:
         protected_namespaces = ()
 

autocoder/common/action_yml_file_manager.py

@@ -4,8 +4,10 @@ import hashlib
 import git
 from typing import List, Dict, Tuple, Optional, Union, Any
 from loguru import logger
+from autocoder.common.git_utils import get_repo
 from autocoder.common.printer import Printer
 import byzerllm
+from autocoder.common import git_utils
 
 class ActionYmlFileManager:
     """
@@ -44,7 +46,7 @@ class ActionYmlFileManager:
             except Exception as e:
                 logger.error(f"Failed to create actions directory: {e}")
                 return False
-        return True
+        return True    
     
     def get_action_files(self, filter_prefix: Optional[str] = None) -> List[str]:
         """
@@ -183,16 +185,21 @@ class ActionYmlFileManager:
         Returns:
             Dict: YAML 内容，如果加载失败返回空字典
         """
-        yaml_path = os.path.join(self.actions_dir, file_name)
-        
+        yaml_path = os.path.join(self.actions_dir, file_name)        
         try:
             with open(yaml_path, 'r', encoding='utf-8') as f:
                 content = yaml.safe_load(f) or {}
             return content
-        except Exception as e:
+        except Exception as e:            
             self.printer.print_in_terminal("yaml_load_error", style="red", 
                                           yaml_file=yaml_path, error=str(e))
             return {}
+        
+    def get_full_path_by_file_name(self, file_name: str) -> str:
+        """
+        根据文件名获取完整路径
+        """
+        return os.path.join(self.actions_dir, file_name)
     
     def save_yaml_content(self, file_name: str, content: Dict) -> bool:
         """
@@ -232,6 +239,26 @@ class ActionYmlFileManager:
         yaml_content = self.load_yaml_content(file_name)
         yaml_content[field] = value
         return self.save_yaml_content(file_name, yaml_content)
+
+    def get_all_commit_id_from_file(self,file_name:str):
+        '''
+        会包含 revert 信息
+        '''
+        repo = get_repo(self.source_dir)
+        if repo is None:
+            logger.error("Repository is not initialized.")
+            return []
+        
+        commit_hashes = []        
+        for commit in repo.iter_commits():
+            lines = commit.message.strip().split('\n')
+            last_line = lines[-1]            
+            if file_name in last_line or (commit.message.startswith("<revert>") and file_name in commit.message):
+                commit_hash = commit.hexsha
+                commit_hashes.append(commit_hash)
+                
+        return commit_hashes
+
     
     def get_commit_id_from_file(self, file_name: str) -> Optional[str]:
         """
@@ -243,16 +270,19 @@ class ActionYmlFileManager:
         Returns:
             Optional[str]: commit ID，如果计算失败返回 None
         """
-        yaml_path = os.path.join(self.actions_dir, file_name)
-        
-        try:
-            with open(yaml_path, 'r', encoding='utf-8') as f:
-                yaml_content = f.read()
-            file_md5 = hashlib.md5(yaml_content.encode("utf-8")).hexdigest()
-            return f"auto_coder_{file_name}"
-        except Exception as e:
-            logger.error(f"Failed to calculate commit ID: {e}")
+        repo = get_repo(self.source_dir)
+        if repo is None:
+            logger.error("Repository is not initialized.")
             return None
+        
+        commit_hash = None
+        # 这里遍历从最新的commit 开始遍历
+        for commit in repo.iter_commits():
+            last_line = commit.message.strip().split('\n')[-1]
+            if file_name in last_line and not commit.message.startswith("<revert>"):
+                commit_hash = commit.hexsha
+                break
+        return commit_hash
     
     def get_file_name_from_commit_id(self, commit_id: str) -> Optional[str]:
         """
@@ -298,7 +328,7 @@ class ActionYmlFileManager:
             return self.get_file_name_from_commit_id(last_line)
         except Exception as e:
             logger.error(f"Failed to extract file name from commit message: {e}")
-            return None
+            return None            
     
     def get_commit_changes(self, file_name: Optional[str] = None) -> List[Tuple[str, List[str], Dict[str, Tuple[str, str]]]]:
         """
@@ -327,31 +357,30 @@ class ActionYmlFileManager:
         changes = {}
         try:
             repo = git.Repo(self.source_dir)
-            for commit in repo.iter_commits():
-                if commit_id in commit.message:
-                    if commit.parents:
-                        parent = commit.parents[0]
-                        # 获取所有文件的前后内容
-                        for diff_item in parent.diff(commit):
-                            file_path = diff_item.a_path if diff_item.a_path else diff_item.b_path
-                            
-                            # 获取变更前内容
-                            before_content = None
-                            try:
-                                if diff_item.a_blob:
-                                    before_content = repo.git.show(f"{parent.hexsha}:{file_path}")
-                            except git.exc.GitCommandError:
-                                pass  # 文件可能是新增的
+            commit =repo.commit(commit_id)            
+            if commit.parents:
+                parent = commit.parents[0]
+                # 获取所有文件的前后内容
+                for diff_item in parent.diff(commit):
+                    file_path = diff_item.a_path if diff_item.a_path else diff_item.b_path
+                    
+                    # 获取变更前内容
+                    before_content = None
+                    try:
+                        if diff_item.a_blob:
+                            before_content = repo.git.show(f"{parent.hexsha}:{file_path}")
+                    except git.exc.GitCommandError:
+                        pass  # 文件可能是新增的
 
-                            # 获取变更后内容
-                            after_content = None
-                            try:
-                                if diff_item.b_blob:
-                                    after_content = repo.git.show(f"{commit.hexsha}:{file_path}")
-                            except git.exc.GitCommandError:
-                                pass  # 文件可能被删除
+                    # 获取变更后内容
+                    after_content = None
+                    try:
+                        if diff_item.b_blob:
+                            after_content = repo.git.show(f"{commit.hexsha}:{file_path}")
+                    except git.exc.GitCommandError:
+                        pass  # 文件可能被删除
 
-                            changes[file_path] = (before_content, after_content)
+                    changes[file_path] = (before_content, after_content)
                     break
         except git.exc.GitCommandError as e:
             self.printer.print_in_terminal("git_command_error", style="red", error=str(e))
@@ -360,6 +389,15 @@ class ActionYmlFileManager:
         
         return [(query, urls, changes)]
     
+    def revert_file(self, file_name: str) -> bool:
+        revert_result = git_utils.revert_changes(
+            self.source_dir, f"auto_coder_{file_name}"
+        )
+        if revert_result:
+            self.update_yaml_field(file_name, "revert_commit_id", revert_result.get("new_commit_hash"))
+            return True
+        return False
+    
     def parse_history_tasks(self, limit: int = 5) -> List[Dict]:
         """
         解析历史任务信息

autocoder/common/code_auto_generate.py

@@ -211,7 +211,7 @@ class CodeAutoGenerate:
         
         if self.args.enable_active_context:
             # 初始化活动上下文管理器
-            active_context_manager = ActiveContextManager(self.llm, self.args)
+            active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
             # 获取活动上下文信息
             result = active_context_manager.load_active_contexts_for_files(
                 [source.module_name for source in source_code_list.sources]
@@ -361,7 +361,7 @@ class CodeAutoGenerate:
         
         if self.args.enable_active_context:
             # 初始化活动上下文管理器
-            active_context_manager = ActiveContextManager(self.llm, self.args)
+            active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
             # 获取活动上下文信息
             result = active_context_manager.load_active_contexts_for_files(
                 [source.module_name for source in source_code_list.sources]

autocoder/common/code_auto_generate_diff.py

@@ -331,7 +331,7 @@ class CodeAutoGenerateDiff:
         
         if self.args.enable_active_context:
             # 初始化活动上下文管理器
-            active_context_manager = ActiveContextManager(self.llm, self.args)
+            active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
             # 获取活动上下文信息
             result = active_context_manager.load_active_contexts_for_files(
                 [source.module_name for source in source_code_list.sources]
@@ -508,7 +508,7 @@ class CodeAutoGenerateDiff:
         
         if self.args.enable_active_context:
             # 初始化活动上下文管理器
-            active_context_manager = ActiveContextManager(self.llm, self.args)
+            active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
             # 获取活动上下文信息
             result = active_context_manager.load_active_contexts_for_files(
                 [source.module_name for source in source_code_list.sources]

autocoder/common/code_auto_generate_editblock.py

@@ -432,7 +432,7 @@ class CodeAutoGenerateEditBlock:
 
         source_content = source_code_list.to_str()
 
-        active_context_manager = ActiveContextManager(self.llm, self.args)
+        active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
 
         if self.args.template == "common":
             # 获取包上下文信息
@@ -605,7 +605,7 @@ class CodeAutoGenerateEditBlock:
         
         if self.args.enable_active_context:
             # 初始化活动上下文管理器
-            active_context_manager = ActiveContextManager(self.llm, self.args)
+            active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
             # 获取活动上下文信息
             result = active_context_manager.load_active_contexts_for_files(
                 [source.module_name for source in source_code_list.sources]

autocoder/common/code_auto_generate_strict_diff.py

@@ -301,7 +301,7 @@ class CodeAutoGenerateStrictDiff:
         
         if self.args.enable_active_context:
             # 初始化活动上下文管理器
-            active_context_manager = ActiveContextManager(self.llm, self.args)
+            active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
             # 获取活动上下文信息
             result = active_context_manager.load_active_contexts_for_files(
                 [source.module_name for source in source_code_list.sources]
@@ -480,7 +480,7 @@ class CodeAutoGenerateStrictDiff:
         
         if self.args.enable_active_context:
             # 初始化活动上下文管理器
-            active_context_manager = ActiveContextManager(self.llm, self.args)
+            active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
             # 获取活动上下文信息
             result = active_context_manager.load_active_contexts_for_files(
                 [source.module_name for source in source_code_list.sources]

autocoder/common/code_auto_merge.py

@@ -213,8 +213,8 @@ class CodeAutoMerge:
                 self.printer.print_in_terminal("yaml_save_error", style="red", yaml_file=action_file_name)  
             
             if self.args.enable_active_context:
-                active_context_manager = ActiveContextManager(self.llm, self.args)
-                task_id = active_context_manager.process_changes()
+                active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
+                task_id = active_context_manager.process_changes(self.args)
                 self.printer.print_in_terminal("active_context_background_task", 
                                              style="blue",
                                              task_id=task_id)

autocoder/common/code_auto_merge_diff.py

@@ -596,8 +596,8 @@ class CodeAutoMergeDiff:
                 self.printer.print_in_terminal("yaml_save_error", style="red", yaml_file=action_file_name)    
             
             if self.args.enable_active_context:
-                active_context_manager = ActiveContextManager(self.llm, self.args)
-                task_id = active_context_manager.process_changes()
+                active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
+                task_id = active_context_manager.process_changes(self.args)
                 self.printer.print_in_terminal("active_context_background_task", 
                                              style="blue",
                                              task_id=task_id)

autocoder/common/code_auto_merge_editblock.py

@@ -444,8 +444,8 @@ class CodeAutoMergeEditBlock:
                         self.printer.print_in_terminal("yaml_save_error", style="red", yaml_file=action_file_name)  
 
                     if self.args.enable_active_context:
-                        active_context_manager = ActiveContextManager(self.llm, self.args)
-                        task_id = active_context_manager.process_changes()
+                        active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
+                        task_id = active_context_manager.process_changes(self.args)
                         self.printer.print_in_terminal("active_context_background_task", 
                                                      style="blue",
                                                      task_id=task_id)

autocoder/common/code_auto_merge_strict_diff.py

@@ -303,8 +303,8 @@ class CodeAutoMergeStrictDiff:
                 self.printer.print_in_terminal("yaml_save_error", style="red", yaml_file=action_file_name)  
             
             if self.args.enable_active_context:
-                active_context_manager = ActiveContextManager(self.llm, self.args)
-                active_context_manager.process_changes()
+                active_context_manager = ActiveContextManager(self.llm, self.args.source_dir)
+                active_context_manager.process_changes(self.args)
             
             git_utils.print_commit_info(commit_result=commit_result)
         else:

autocoder/common/code_modification_ranker.py

@@ -13,6 +13,7 @@ from autocoder.utils.llms import get_llm_names, get_model_info
 from autocoder.common.types import CodeGenerateResult, MergeCodeWithoutEffect
 import os
 from autocoder.rag.token_counter import count_tokens
+from autocoder.common.stream_out_type import CodeRankStreamOutType
 
 class RankResult(BaseModel):
     rank_result: List[int]
@@ -211,7 +212,10 @@ class CodeModificationRanker:
                         model_name=model_name,
                         title=self.printer.get_message_from_key_with_format(
                             "rank_code_modification_title", model_name=model_name),
-                        args=self.args
+                        args=self.args,
+                        extra_meta={
+                            "stream_out_type": CodeRankStreamOutType.CODE_RANK.value
+                        }
                     )
                 
                 if last_meta:

autocoder/common/git_utils.py

@@ -1,7 +1,8 @@
 import os
 from git import Repo, GitCommandError
+import git
 from loguru import logger
-from typing import List, Optional, Dict
+from typing import List, Optional, Dict, Any
 from pydantic import BaseModel
 import byzerllm
 from rich.console import Console
@@ -103,68 +104,84 @@ def get_current_branch(repo_path: str) -> str:
     return branch
 
 
-def revert_changes(repo_path: str, message: str) -> bool:
+def revert_changes(repo_path: str, action_file_path: str) -> Optional[Any]:
+    '''
+    file_path 类似： auto_coder_000000002009_chat_action.yml 或者 000000002009_chat_action.yml
+    '''
     repo = get_repo(repo_path)
     if repo is None:
         logger.error("Repository is not initialized.")
         return False
-
+    
+    commit_hash = None
+    # 这里遍历从最新的commit 开始遍历
+    for commit in repo.iter_commits():
+        if action_file_path in commit.message and not commit.message.startswith("<revert>"):
+            commit_hash = commit.hexsha
+            break
+    
+    if commit_hash is None:
+        raise ValueError(f"File {action_file_path} not found in any commit")
+    
+    # 尝试获取指定的提交
     try:
-        # 检查当前工作目录是否有未提交的更改
-        if repo.is_dirty():
-            logger.warning(
-                "Working directory is dirty. please commit or stash your changes before reverting."
-            )
-            return False
-
-        # 通过message定位到commit_hash
-        # --grep 默认只搜索第一行 -F 参数将搜索模式视为固定字符串而非正则表达式
-        commit = repo.git.log("--all", f"--grep={message}", "-F", "--format=%H", "-n", "1")
-        if not commit:
-            logger.warning(f"No commit found with message: {message}")
-            return False
-
-        commit_hash = commit
-
-        # 获取从指定commit到HEAD的所有提交
-        commits = list(repo.iter_commits(f"{commit_hash}..HEAD"))
-
-        if not commits:
-            repo.git.revert(commit, no_edit=True)
-            logger.info(f"Reverted single commit: {commit}")
+        commit = repo.commit(commit_hash)
+    except ValueError:
+        # 如果是短哈希，尝试匹配
+        matching_commits = [c for c in repo.iter_commits() if c.hexsha.startswith(commit_hash)]
+        if not matching_commits:
+            raise ValueError(f"Commit {commit_hash} not found")
+        commit = matching_commits[0]
+    
+    # 检查工作目录是否干净
+    if repo.is_dirty():
+        raise ValueError("Working directory is dirty. please commit or stash your changes before reverting.")
+    
+    try:
+        # 执行 git revert
+        # 使用 -n 选项不自动创建提交，而是让我们手动提交
+        repo.git.revert(commit.hexsha, no_commit=True)
+        
+        # 创建带有信息的 revert 提交
+        revert_message = f"<revert>{commit.message.strip()}\n{commit.hexsha}"
+        new_commit = repo.index.commit(
+            revert_message,
+            author=repo.active_branch.commit.author,
+            committer=repo.active_branch.commit.committer
+        )
+        
+        # 构建新提交的信息
+        stats = new_commit.stats.total
+        new_commit_info = {
+            "new_commit_hash": new_commit.hexsha,
+            "new_commit_short_hash": new_commit.hexsha[:7],
+            "reverted_commit": {
+                "hash": commit.hexsha,
+                "short_hash": commit.hexsha[:7],
+                "message": commit.message.strip()
+            },
+            "stats": {
+                "insertions": stats["insertions"],
+                "deletions": stats["deletions"],
+                "files_changed": stats["files"]
+            }
+        }
+        
+        return new_commit_info
+        
+    except git.GitCommandError as e:
+        # 如果发生 Git 命令错误，尝试恢复工作目录
+        try:
+            repo.git.reset("--hard", "HEAD")
+        except:
+            pass  # 如果恢复失败，继续抛出原始错误
+            
+        if "patch does not apply" in str(e):
+            raise Exception("Cannot revert: patch does not apply (likely due to conflicts)")
         else:
-            # 从最新的提交开始，逐个回滚
-            for commit in reversed(commits):
-                try:
-                    repo.git.revert(commit.hexsha, no_commit=True)
-                    logger.info(f"Reverted changes from commit: {commit.hexsha}")
-                except GitCommandError as e:
-                    logger.error(f"Error reverting commit {commit.hexsha}: {e}")
-                    repo.git.revert("--abort")
-                    return False
-
-            # 提交所有的回滚更改
-            repo.git.commit(message=f"Reverted all changes up to {commit_hash}")
-
-        logger.info(f"Successfully reverted changes up to {commit_hash}")
-
-        ## this is a mark, chat_auto_coder.py need this
-        print(f"Successfully reverted changes", flush=True)
-
-        # # 如果之前有stash，现在应用它
-        # if stashed:
-        #     try:
-        #         repo.git.stash('pop')
-        #         logger.info("Applied stashed changes.")
-        #     except GitCommandError as e:
-        #         logger.error(f"Error applying stashed changes: {e}")
-        #         logger.info("Please manually apply the stashed changes.")
-
-        return True
+            raise Exception(f"Git error during revert: {str(e)}")
 
-    except GitCommandError as e:
-        logger.error(f"Error during revert operation: {e}")
-        return False
+    return None    
 
 
 def revert_change(repo_path: str, message: str) -> bool:

autocoder/common/stream_out_type.py

@@ -9,3 +9,6 @@ class IndexFilterStreamOutType(Enum):
 
 class CodeGenerateStreamOutType(Enum):
     CODE_GENERATE = "code_generate"
+
+class CodeRankStreamOutType(Enum):
+    CODE_RANK = "code_rank"    

autocoder/memory/active_context_manager.py

@@ -89,20 +89,19 @@ class ActiveContextManager:
             cls._instance._is_initialized = False
         return cls._instance
     
-    def __init__(self, llm: byzerllm.ByzerLLM, args: AutoCoderArgs):
+    def __init__(self, llm: byzerllm.ByzerLLM,source_dir:str):
         """
         初始化活动上下文管理器
         
         Args:
-            llm: ByzerLLM实例，用于生成文档内容
-            args: AutoCoderArgs实例，包含配置信息
+            llm: ByzerLLM实例，用于生成文档内容            
         """
         # 如果已经初始化过，则直接返回
         if self._is_initialized:
             return
-        
+        self.source_dir = source_dir
         # 设置日志目录和文件
-        log_dir = os.path.join(args.source_dir, ".auto-coder", "active-context")
+        log_dir = os.path.join(source_dir, ".auto-coder", "active-context")
         os.makedirs(log_dir, exist_ok=True)
         log_file = os.path.join(log_dir, "active.log")
         
@@ -119,12 +118,11 @@ class ActiveContextManager:
         self.logger = global_logger.bind(name="ActiveContextManager")
         self.logger.info(f"初始化 ActiveContextManager，日志输出到 {log_file}")
             
-        self.llm = llm
-        self.args = args
+        self.llm = llm        
         self.directory_mapper = DirectoryMapper()
         self.active_package = ActivePackage(llm)
         self.async_processor = AsyncProcessor()
-        self.yml_manager = ActionYmlFileManager(args.source_dir)
+        self.yml_manager = ActionYmlFileManager(source_dir)
         self.tasks = {}  # 用于跟踪任务状态
         self.printer = Printer()
         
@@ -137,7 +135,7 @@ class ActiveContextManager:
         self.__class__._queue_thread.start()
         
         # 标记为已初始化
-        self._is_initialized = True            
+        self._is_initialized = True                    
     
     def _process_queue(self):
         """
@@ -177,20 +175,22 @@ class ActiveContextManager:
                 with self._queue_lock:
                     self.__class__._is_processing = False
     
-    def process_changes(self, file_name: Optional[str] = None) -> str:
+    def process_changes(self, args:AutoCoderArgs) -> str:
         """
         处理代码变更，创建活动上下文（非阻塞）
         
         Args:
-            file_name: YAML文件名，如果为None则使用args.file
+            args: AutoCoderArgs实例，包含配置信息
         
         Returns:
             str: 任务ID，可用于后续查询任务状态
         """
         try:
             # 使用参数中的文件或者指定的文件
-            file_name = file_name or os.path.basename(self.args.file)
+            if not args.file:
+                raise ValueError("action file is required")            
             
+            file_name = os.path.basename(args.file)
             # 从YAML文件加载数据
             yaml_content = self.yml_manager.load_yaml_content(file_name)
             
@@ -298,7 +298,7 @@ class ActiveContextManager:
             # 1. 映射目录
             self.logger.info("开始映射目录结构...")
             directory_contexts = self.directory_mapper.map_directories(
-                self.args.source_dir, changed_urls, current_urls
+                self.source_dir, changed_urls, current_urls
             )
             self.logger.info(f"目录映射完成，找到 {len(directory_contexts)} 个相关目录")
             
@@ -460,7 +460,7 @@ class ActiveContextManager:
         # 构建日志文件路径
         log_file_path = None
         if 'file_name' in task:
-            log_dir = os.path.join(self.args.source_dir, '.auto-coder', 'active-context', 'logs')
+            log_dir = os.path.join(self.source_dir, '.auto-coder', 'active-context', 'logs')
             log_file_path = os.path.join(log_dir, f'{task_id}.log')
             if not os.path.exists(log_file_path):
                 log_file_path = None
@@ -644,6 +644,6 @@ class ActiveContextManager:
         Returns:
             str: 活动上下文中对应的目录路径
         """
-        relative_path = os.path.relpath(directory_path, self.args.source_dir)
-        return os.path.join(self.args.source_dir, ".auto-coder", "active-context", relative_path)
+        relative_path = os.path.relpath(directory_path, self.source_dir)
+        return os.path.join(self.source_dir, ".auto-coder", "active-context", relative_path)
         

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.306"
+__version__ = "0.1.307"