abyss-cli 0.1.6__tar.gz → 2.0.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (184) hide show
  1. {abyss_cli-0.1.6/src/abyss_cli.egg-info → abyss_cli-2.0.1}/PKG-INFO +2 -1
  2. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/pyproject.toml +5 -7
  3. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/__init__.py +1 -1
  4. abyss_cli-2.0.1/src/abyss/_globals.py +65 -0
  5. abyss_cli-2.0.1/src/abyss/agent_loop.py +522 -0
  6. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/ansi_menu.py +778 -712
  7. abyss_cli-2.0.1/src/abyss/api_client.py +283 -0
  8. abyss_cli-2.0.1/src/abyss/commands/ai_analysis.py +194 -0
  9. abyss_cli-2.0.1/src/abyss/commands/compact.py +42 -0
  10. abyss_cli-2.0.1/src/abyss/commands/cron.py +162 -0
  11. abyss_cli-2.0.1/src/abyss/commands/diff.py +134 -0
  12. abyss_cli-2.0.1/src/abyss/commands/git.py +183 -0
  13. abyss_cli-2.0.1/src/abyss/commands/info.py +246 -0
  14. abyss_cli-2.0.1/src/abyss/commands/knowledge.py +211 -0
  15. abyss_cli-2.0.1/src/abyss/commands/logs.py +272 -0
  16. abyss_cli-2.0.1/src/abyss/commands/retry.py +82 -0
  17. abyss_cli-2.0.1/src/abyss/commands/undo.py +102 -0
  18. abyss_cli-2.0.1/src/abyss/concurrency/__init__.py +15 -0
  19. abyss_cli-2.0.1/src/abyss/concurrency/abort.py +225 -0
  20. abyss_cli-2.0.1/src/abyss/config/__init__.py +22 -0
  21. abyss_cli-0.1.6/src/abyss/config.py → abyss_cli-2.0.1/src/abyss/config/legacy.py +158 -148
  22. abyss_cli-2.0.1/src/abyss/context/__init__.py +2 -0
  23. abyss_cli-2.0.1/src/abyss/context/attachment_resolver.py +211 -0
  24. abyss_cli-2.0.1/src/abyss/context/project_context.py +434 -0
  25. abyss_cli-2.0.1/src/abyss/context/snip.py +98 -0
  26. abyss_cli-2.0.1/src/abyss/context_engine.py +434 -0
  27. abyss_cli-2.0.1/src/abyss/curator.py +497 -0
  28. abyss_cli-2.0.1/src/abyss/extension_context.py +89 -0
  29. abyss_cli-2.0.1/src/abyss/history/__init__.py +31 -0
  30. abyss_cli-2.0.1/src/abyss/history/file_history.py +525 -0
  31. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/interrupt.py +66 -53
  32. abyss_cli-2.0.1/src/abyss/knowledge/__init__.py +14 -0
  33. abyss_cli-2.0.1/src/abyss/knowledge/curator.py +338 -0
  34. abyss_cli-2.0.1/src/abyss/knowledge/loader.py +257 -0
  35. abyss_cli-2.0.1/src/abyss/llm/__init__.py +17 -0
  36. abyss_cli-2.0.1/src/abyss/llm/resilience.py +416 -0
  37. abyss_cli-2.0.1/src/abyss/llm/thinking_budget.py +188 -0
  38. abyss_cli-2.0.1/src/abyss/logger.py +604 -0
  39. abyss_cli-2.0.1/src/abyss/main.py +1898 -0
  40. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/mcp/manager.py +1 -1
  41. abyss_cli-2.0.1/src/abyss/memory/__init__.py +24 -0
  42. abyss_cli-2.0.1/src/abyss/memory/bm25.py +256 -0
  43. abyss_cli-2.0.1/src/abyss/memory/reranker.py +204 -0
  44. abyss_cli-2.0.1/src/abyss/memory/store.py +199 -0
  45. abyss_cli-2.0.1/src/abyss/prompts/__init__.py +97 -0
  46. abyss_cli-2.0.1/src/abyss/prompts/system_prompt.md +126 -0
  47. abyss_cli-2.0.1/src/abyss/runtime/host.py +242 -0
  48. abyss_cli-2.0.1/src/abyss/security/__init__.py +5 -0
  49. abyss_cli-2.0.1/src/abyss/security/path_security.py +376 -0
  50. abyss_cli-2.0.1/src/abyss/security/sensitive_filter.py +181 -0
  51. abyss_cli-2.0.1/src/abyss/security/tool_safety_guard.py +419 -0
  52. abyss_cli-2.0.1/src/abyss/session.py +281 -0
  53. abyss_cli-2.0.1/src/abyss/subagent/protocol.py +198 -0
  54. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/subagent/runner.py +89 -32
  55. abyss_cli-2.0.1/src/abyss/tools/base.py +172 -0
  56. abyss_cli-2.0.1/src/abyss/tools/cron_service.py +286 -0
  57. abyss_cli-2.0.1/src/abyss/tools/file_cache.py +150 -0
  58. abyss_cli-2.0.1/src/abyss/tools/file_edit.py +70 -0
  59. abyss_cli-2.0.1/src/abyss/tools/file_io.py +284 -0
  60. abyss_cli-2.0.1/src/abyss/tools/file_read.py +113 -0
  61. abyss_cli-2.0.1/src/abyss/tools/file_write.py +60 -0
  62. abyss_cli-2.0.1/src/abyss/tools/knowledge_fetch.py +73 -0
  63. abyss_cli-2.0.1/src/abyss/tools/knowledge_save.py +250 -0
  64. abyss_cli-2.0.1/src/abyss/tools/memory_save.py +97 -0
  65. abyss_cli-2.0.1/src/abyss/tools/memory_search.py +135 -0
  66. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/tools/registry.py +48 -11
  67. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/tools/shell_exec.py +114 -1
  68. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/tools/spawn_subagents.py +7 -1
  69. abyss_cli-2.0.1/src/abyss/tools/todo_write.py +143 -0
  70. abyss_cli-2.0.1/src/abyss/tools/tracking.py +215 -0
  71. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/tools/web_fetch.py +4 -1
  72. abyss_cli-2.0.1/src/abyss/vcs/__init__.py +17 -0
  73. abyss_cli-2.0.1/src/abyss/vcs/commit_attribution.py +317 -0
  74. {abyss_cli-0.1.6 → abyss_cli-2.0.1/src/abyss_cli.egg-info}/PKG-INFO +2 -1
  75. abyss_cli-2.0.1/src/abyss_cli.egg-info/SOURCES.txt +165 -0
  76. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss_cli.egg-info/requires.txt +1 -0
  77. abyss_cli-2.0.1/tests/test_abort_controller.py +388 -0
  78. abyss_cli-2.0.1/tests/test_agent_loop.py +292 -0
  79. abyss_cli-2.0.1/tests/test_ansi_menu.py +144 -0
  80. abyss_cli-2.0.1/tests/test_api_413_recovery.py +302 -0
  81. abyss_cli-2.0.1/tests/test_api_circuit_breaker.py +527 -0
  82. abyss_cli-2.0.1/tests/test_api_client_stream_timeout.py +83 -0
  83. abyss_cli-2.0.1/tests/test_api_connection_error_diag.py +133 -0
  84. abyss_cli-2.0.1/tests/test_atomic_file_writer.py +287 -0
  85. abyss_cli-2.0.1/tests/test_attachment_resolver.py +331 -0
  86. abyss_cli-2.0.1/tests/test_bm25_engine.py +191 -0
  87. abyss_cli-2.0.1/tests/test_coerce.py +155 -0
  88. abyss_cli-2.0.1/tests/test_command_ai_analysis.py +155 -0
  89. abyss_cli-2.0.1/tests/test_command_compact.py +131 -0
  90. abyss_cli-2.0.1/tests/test_command_diff.py +158 -0
  91. abyss_cli-2.0.1/tests/test_command_git.py +174 -0
  92. abyss_cli-2.0.1/tests/test_command_info.py +188 -0
  93. abyss_cli-2.0.1/tests/test_command_retry.py +192 -0
  94. abyss_cli-2.0.1/tests/test_command_undo.py +185 -0
  95. abyss_cli-2.0.1/tests/test_commit_attribution.py +192 -0
  96. abyss_cli-2.0.1/tests/test_compact_effectiveness_validator.py +280 -0
  97. abyss_cli-2.0.1/tests/test_consume_stream_visual.py +180 -0
  98. abyss_cli-2.0.1/tests/test_context_engine.py +175 -0
  99. abyss_cli-2.0.1/tests/test_cron_service.py +278 -0
  100. abyss_cli-2.0.1/tests/test_curator.py +239 -0
  101. abyss_cli-2.0.1/tests/test_curator_daemon.py +70 -0
  102. abyss_cli-2.0.1/tests/test_dynamic_project_context.py +158 -0
  103. abyss_cli-2.0.1/tests/test_encoding_detector.py +218 -0
  104. abyss_cli-2.0.1/tests/test_extension_context.py +136 -0
  105. abyss_cli-2.0.1/tests/test_file_history.py +270 -0
  106. abyss_cli-2.0.1/tests/test_file_state_cache.py +305 -0
  107. abyss_cli-2.0.1/tests/test_globals.py +35 -0
  108. abyss_cli-2.0.1/tests/test_host_knowledge.py +327 -0
  109. abyss_cli-2.0.1/tests/test_ime_first_char.py +103 -0
  110. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/tests/test_interrupt.py +73 -71
  111. abyss_cli-2.0.1/tests/test_knowledge_commands.py +174 -0
  112. abyss_cli-2.0.1/tests/test_knowledge_curator.py +340 -0
  113. abyss_cli-2.0.1/tests/test_knowledge_interactive.py +179 -0
  114. abyss_cli-2.0.1/tests/test_knowledge_loader.py +617 -0
  115. abyss_cli-2.0.1/tests/test_knowledge_tools.py +385 -0
  116. abyss_cli-2.0.1/tests/test_memory_store.py +189 -0
  117. abyss_cli-2.0.1/tests/test_memory_tools.py +240 -0
  118. abyss_cli-2.0.1/tests/test_path_security_service.py +271 -0
  119. abyss_cli-2.0.1/tests/test_print_resumed_messages.py +159 -0
  120. abyss_cli-2.0.1/tests/test_project_context.py +347 -0
  121. abyss_cli-2.0.1/tests/test_protected_paths.py +179 -0
  122. abyss_cli-2.0.1/tests/test_reasoning_overwrite.py +315 -0
  123. abyss_cli-2.0.1/tests/test_redo.py +277 -0
  124. abyss_cli-2.0.1/tests/test_registry_sources.py +72 -0
  125. abyss_cli-2.0.1/tests/test_self_correction_integration.py +265 -0
  126. abyss_cli-2.0.1/tests/test_self_correction_loop.py +184 -0
  127. abyss_cli-2.0.1/tests/test_sensitive_data_filter.py +239 -0
  128. abyss_cli-2.0.1/tests/test_session_integrity.py +307 -0
  129. abyss_cli-2.0.1/tests/test_session_menu_name_parse.py +46 -0
  130. abyss_cli-2.0.1/tests/test_session_resume_repair.py +279 -0
  131. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/tests/test_shell_exec.py +100 -0
  132. abyss_cli-2.0.1/tests/test_shell_exec_suicide.py +131 -0
  133. abyss_cli-2.0.1/tests/test_snip.py +280 -0
  134. abyss_cli-2.0.1/tests/test_structured_logger.py +615 -0
  135. abyss_cli-2.0.1/tests/test_subagent_protocol.py +148 -0
  136. abyss_cli-2.0.1/tests/test_thinking_budget.py +223 -0
  137. abyss_cli-2.0.1/tests/test_todo_state_injection.py +181 -0
  138. abyss_cli-2.0.1/tests/test_todo_write_str_coercion.py +50 -0
  139. abyss_cli-2.0.1/tests/test_token_counter.py +205 -0
  140. abyss_cli-2.0.1/tests/test_tool_call_tracker.py +398 -0
  141. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/tests/test_tool_calls_spinner.py +5 -5
  142. abyss_cli-2.0.1/tests/test_tool_param_coercion.py +223 -0
  143. abyss_cli-2.0.1/tests/test_tool_safety_guard.py +434 -0
  144. abyss_cli-2.0.1/tests/test_tool_source.py +69 -0
  145. abyss_cli-2.0.1/tests/test_tools_integration.py +412 -0
  146. abyss_cli-0.1.6/src/abyss/api_client.py +0 -123
  147. abyss_cli-0.1.6/src/abyss/extensions/__init__.py +0 -21
  148. abyss_cli-0.1.6/src/abyss/extensions/cli.py +0 -160
  149. abyss_cli-0.1.6/src/abyss/extensions/installer.py +0 -452
  150. abyss_cli-0.1.6/src/abyss/extensions/registry.py +0 -119
  151. abyss_cli-0.1.6/src/abyss/extensions/url_parser.py +0 -86
  152. abyss_cli-0.1.6/src/abyss/logger.py +0 -218
  153. abyss_cli-0.1.6/src/abyss/main.py +0 -1123
  154. abyss_cli-0.1.6/src/abyss/prompts/__init__.py +0 -35
  155. abyss_cli-0.1.6/src/abyss/prompts/system_prompt.md +0 -68
  156. abyss_cli-0.1.6/src/abyss/runtime/host.py +0 -180
  157. abyss_cli-0.1.6/src/abyss/session.py +0 -154
  158. abyss_cli-0.1.6/src/abyss/tools/base.py +0 -45
  159. abyss_cli-0.1.6/src/abyss/tools/file_edit.py +0 -48
  160. abyss_cli-0.1.6/src/abyss/tools/file_read.py +0 -54
  161. abyss_cli-0.1.6/src/abyss/tools/file_write.py +0 -44
  162. abyss_cli-0.1.6/src/abyss_cli.egg-info/SOURCES.txt +0 -54
  163. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/MANIFEST.in +0 -0
  164. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/setup.cfg +0 -0
  165. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/commands/__init__.py +0 -0
  166. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/commands/slash.py +0 -0
  167. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/hooks/__init__.py +0 -0
  168. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/hooks/runner.py +0 -0
  169. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/mcp/__init__.py +0 -0
  170. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/prompts/methodologies.py +0 -0
  171. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/runtime/__init__.py +0 -0
  172. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/skills/__init__.py +0 -0
  173. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/skills/loader.py +0 -0
  174. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/subagent/__init__.py +0 -0
  175. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/tools/__init__.py +0 -0
  176. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss/tools/web_search.py +0 -0
  177. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss_cli.egg-info/dependency_links.txt +0 -0
  178. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss_cli.egg-info/entry_points.txt +0 -0
  179. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/src/abyss_cli.egg-info/top_level.txt +0 -0
  180. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/test/test_custom_cmd_completion.py +0 -0
  181. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/test/test_init_dirs.py +0 -0
  182. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/tests/test_ansi_menu_cjk.py +0 -0
  183. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/tests/test_file_spinner.py +0 -0
  184. {abyss_cli-0.1.6 → abyss_cli-2.0.1}/tests/test_mcp_manager.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: abyss-cli
3
- Version: 0.1.6
3
+ Version: 2.0.1
4
4
  Summary: 终端AI开发助手
5
5
  Author: Abyss Team
6
6
  Requires-Python: >=3.9
@@ -10,3 +10,4 @@ Requires-Dist: prompt-toolkit>=3.0.0
10
10
  Requires-Dist: ddgs>=9.0.0
11
11
  Requires-Dist: httpx>=0.20.0
12
12
  Requires-Dist: mcp>=1.0.0
13
+ Requires-Dist: tiktoken>=0.5.0
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "abyss-cli"
7
- version = "0.1.6"
7
+ version = "2.0.1"
8
8
  description = "终端AI开发助手"
9
9
  authors = [{name = "Abyss Team"}]
10
10
  requires-python = ">=3.9"
@@ -15,6 +15,7 @@ dependencies = [
15
15
  "ddgs>=9.0.0",
16
16
  "httpx>=0.20.0",
17
17
  "mcp>=1.0.0",
18
+ "tiktoken>=0.5.0",
18
19
  ]
19
20
 
20
21
  [project.scripts]
@@ -22,13 +23,10 @@ abyss = "abyss.main:cli"
22
23
 
23
24
  [tool.setuptools]
24
25
  package-dir = {"" = "src"}
25
- packages = [
26
- "abyss", "abyss.tools", "abyss.prompts",
27
- "abyss.commands", "abyss.extensions",
28
- "abyss.hooks", "abyss.mcp", "abyss.skills",
29
- "abyss.subagent", "abyss.runtime",
30
- ]
31
26
  include-package-data = true
32
27
 
28
+ [tool.setuptools.packages.find]
29
+ where = ["src"]
30
+
33
31
  [tool.setuptools.package-data]
34
32
  abyss = ["prompts/system_prompt.md"]
@@ -1,4 +1,4 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  """Abyss - 终端AI开发助手"""
3
- __version__ = "0.1.6"
3
+ __version__ = "2.0.1"
4
4
 
@@ -0,0 +1,65 @@
1
+ # -*- coding: utf-8 -*-
2
+ """
3
+ 懒访问上下文(Lazy Access Context)
4
+
5
+ 借鉴 Hermes Agent 的 _ra() 懒导入模式,将模块级全局变量的访问封装为函数,
6
+ 解决:
7
+ 1. 测试 mock:无需导入整个 main.py,通过 set_context() 注入
8
+ 2. 循环导入:延迟解析引用,避免模块初始化顺序依赖
9
+
10
+ 使用方式:
11
+ from abyss._globals import ctx
12
+
13
+ tool = ctx().registry.get("file_read") # 懒访问 registry
14
+ host = ctx().host # 懒访问 lifecycle host
15
+
16
+ # 测试中:
17
+ ctx.override(registry=mock_reg, host=mock_host)
18
+ """
19
+
20
+ from __future__ import annotations
21
+
22
+ from typing import Any
23
+
24
+
25
+ class _Context:
26
+ """持有 agent 运行时的共享状态。"""
27
+
28
+ def __init__(self):
29
+ self.registry: Any = None
30
+ self.host: Any = None
31
+ self.esc: Any = None
32
+ self.engine: Any = None
33
+ self.curator_daemon: Any = None
34
+
35
+ def is_ready(self) -> bool:
36
+ """registry 是否已初始化。"""
37
+ return self.registry is not None
38
+
39
+
40
+ class _LazyAccessor:
41
+ """懒访问器:返回当前线程的 Context,测试可用 override 替换。"""
42
+
43
+ def __init__(self):
44
+ self._default = _Context()
45
+ self._override: _Context | None = None
46
+
47
+ def __call__(self) -> _Context:
48
+ return self._override or self._default
49
+
50
+ def override(self, **kwargs) -> _Context:
51
+ """用给定属性创建覆盖 context。用于测试注入。"""
52
+ ctx = _Context()
53
+ for k, v in kwargs.items():
54
+ if hasattr(ctx, k):
55
+ setattr(ctx, k, v)
56
+ self._override = ctx
57
+ return ctx
58
+
59
+ def restore(self) -> None:
60
+ """清除覆盖,恢复默认 context。"""
61
+ self._override = None
62
+
63
+
64
+ # 全局单例
65
+ ctx = _LazyAccessor()
@@ -0,0 +1,522 @@
1
+ # -*- coding: utf-8 -*-
2
+ """
3
+ Agent 工具执行循环(从 main.py 提取)
4
+
5
+ 包含 execute_tool、execute_tool_batch、process_tool_calls,
6
+ 是 LLM agent 的工具调用分派和执行循环。display/UI 逻辑留在 main.py 中。
7
+
8
+ 设计借鉴 Hermes Agent 的 agent/tool_executor.py:
9
+ - 函数以显式参数接收依赖(registry、host、esc、engine),而非模块级全局
10
+ - 提取后 main.py 薄包装,加上 display 逻辑
11
+ """
12
+
13
+ import json
14
+ import os
15
+ import inspect
16
+ import time
17
+ from typing import Any, Dict, List, Optional
18
+
19
+ from .tools.registry import (
20
+ get_tc_field,
21
+ merge_tool_calls,
22
+ format_tool_result,
23
+ )
24
+ from .tools.tracking import ToolCallTracker, get_default_tracker
25
+ from .concurrency import AbortError, AbortSignal
26
+ from . import logger
27
+
28
+
29
+ # Phase 8 Tier 2 CG:文件历史事务集成
30
+ # 这些函数在 history 模块通过 threading.local 维护当前事务 id,
31
+ # 仅在 main.py 注入 global service 后才生效,未注入时静默跳过。
32
+ def _record_file_change_if_active(path: str) -> None:
33
+ """若当前线程有活跃事务,记录文件原内容。
34
+
35
+ file_edit/file_write/file_read 工具执行前调用。
36
+ 文件不存在时记录 None(表示新建)。
37
+ """
38
+ try:
39
+ from .history import record_in_current_transaction
40
+ except ImportError:
41
+ return
42
+ try:
43
+ if path and os.path.exists(path):
44
+ try:
45
+ with open(path, "r", encoding="utf-8-sig") as f:
46
+ old_content = f.read()
47
+ except (OSError, UnicodeDecodeError):
48
+ # 二进制文件或读取失败,记录存在但内容为 None
49
+ old_content = None
50
+ else:
51
+ old_content = None
52
+ record_in_current_transaction(path, old_content)
53
+ except Exception:
54
+ # 记录失败不阻塞工具执行
55
+ pass
56
+
57
+
58
+ # 需要记录原文件内容的工具名集合
59
+ _FILE_EDITING_TOOLS = {"file_edit", "file_write"}
60
+
61
+
62
+ class TaskInterrupted(Exception):
63
+ """用户按 Esc 中断当前任务时抛出,主循环捕获后返回提示符。"""
64
+ pass
65
+
66
+
67
+ class SelfCorrectionLoop:
68
+ """工具失败自纠错循环。
69
+
70
+ 借鉴 zhikuncode-main 的 SelfCorrectionLoop,工具执行失败后生成
71
+ 结构化再提示供 LLM 修正参数,最多重试 max_attempts 次。
72
+ 成功后立即停止;达到上限后返回最后失败结果 + 耗尽提示。
73
+ """
74
+
75
+ def __init__(self, max_attempts: int = 3):
76
+ """初始化,指定最大重试次数。"""
77
+ self.max_attempts = max_attempts
78
+ self.attempts = 0
79
+ self._failure_history = [] # 记录每次失败的工具名+原因
80
+
81
+ def should_retry(self, tool_call, result) -> bool:
82
+ """判断是否应该重试:工具失败且未达上限。"""
83
+ if self.attempts >= self.max_attempts:
84
+ return False
85
+ # 判断 result 是否表示失败
86
+ if self._is_failure(result):
87
+ self.attempts += 1
88
+ self._record_failure(tool_call, result)
89
+ return True
90
+ return False
91
+
92
+ def _is_failure(self, result) -> bool:
93
+ """判断工具结果是否为失败。"""
94
+ if isinstance(result, dict):
95
+ return not result.get("success", True)
96
+ return False
97
+
98
+ def _record_failure(self, tool_call, result):
99
+ """记录失败历史供 build_correction_prompt 使用。"""
100
+ tool_name = get_tc_field(tool_call, "function", {})
101
+ tool_name = get_tc_field(tool_name, "name", "unknown")
102
+ error = result.get("error", "未知错误") if isinstance(result, dict) else str(result)
103
+ self._failure_history.append({"tool": tool_name, "error": error})
104
+
105
+ def build_correction_prompt(self, tool_call, result, attempt: int) -> str:
106
+ """生成结构化再提示供 LLM 修正。"""
107
+ func = get_tc_field(tool_call, "function", {})
108
+ tool_name = get_tc_field(func, "name", "unknown")
109
+ error = result.get("error", "未知错误") if isinstance(result, dict) else str(result)
110
+ suggestion = self._get_suggestion(tool_name, error)
111
+ return (f"[自纠错提示 第{attempt}次] 工具 {tool_name} 失败:{error}\n"
112
+ f"建议:{suggestion}")
113
+
114
+ def _get_suggestion(self, tool_name: str, error: str) -> str:
115
+ """根据工具名和错误生成修正建议。"""
116
+ if tool_name == "file_edit":
117
+ return "先 file_read 确认文件内容,再调整 old_string 参数使其精确匹配"
118
+ if tool_name == "shell_exec":
119
+ return "检查命令语法,确认命令存在且参数正确"
120
+ if tool_name == "file_write":
121
+ return "检查路径是否有写入权限,确认父目录存在"
122
+ return "根据错误信息调整参数后重试"
123
+
124
+ def build_exhausted_message(self) -> str:
125
+ """生成重试耗尽提示。"""
126
+ return f"自纠错循环已耗尽 {self.max_attempts} 次重试,放弃修正"
127
+
128
+
129
+ def _extract_missing_param(exc: TypeError, func) -> str:
130
+ """从 TypeError 消息中提取缺失的参数名。找不到时返回空串。
131
+
132
+ Python 的 TypeError 形如:
133
+ "FileEditTool.execute() missing 1 required positional argument: 'path'"
134
+ 对多余参数(unexpected keyword argument)也能识别。
135
+ """
136
+ msg = str(exc)
137
+ if "missing 1 required positional argument:" in msg:
138
+ try:
139
+ return msg.split("argument: '", 1)[1].split("'", 1)[0]
140
+ except IndexError:
141
+ return ""
142
+ if "missing" in msg and "required" in msg:
143
+ try:
144
+ sig = inspect.signature(func)
145
+ required = [
146
+ p.name for p in sig.parameters.values()
147
+ if p.default is inspect.Parameter.empty
148
+ and p.kind in (inspect.Parameter.POSITIONAL_OR_KEYWORD,
149
+ inspect.Parameter.KEYWORD_ONLY)
150
+ ]
151
+ return ", ".join(required)
152
+ except (ValueError, TypeError):
153
+ return ""
154
+ return ""
155
+
156
+
157
+ def execute_tool(
158
+ tool_call,
159
+ registry,
160
+ *,
161
+ host=None,
162
+ esc=None,
163
+ tracker=None,
164
+ signal: Optional[AbortSignal] = None,
165
+ ) -> str:
166
+ """执行单个工具调用,返回给 AI 的结果 JSON 字符串。
167
+
168
+ Args:
169
+ tool_call: OpenAI 格式的 tool_call dict(含 function.name / function.arguments)
170
+ registry: ToolRegistry 实例
171
+ host: 可选 LifecycleHost(提供 pre_tool / post_tool 钩子)
172
+ esc: 可选 EscInterrupt(提供取消检查)
173
+ tracker: 可选 ToolCallTracker(记录调用历史用于终止决策)。
174
+ 默认 None 时使用模块级单例 get_default_tracker()。
175
+ signal: 可选 AbortSignal(Phase 6 AM 引入,层级化中断信号)。
176
+ 若 controller 已被 abort,抛出 TaskInterrupted。与 esc 并行检查,
177
+ 支持主流程 abort 时级联取消子 Agent 工具调用。
178
+
179
+ Returns:
180
+ JSON 字符串,成功时含工具返回数据,失败时含 error 字段。
181
+ """
182
+ func = get_tc_field(tool_call, "function", {})
183
+ name = get_tc_field(func, "name", "")
184
+ args_str = get_tc_field(func, "arguments", "")
185
+ try:
186
+ arguments = json.loads(args_str) if args_str else {}
187
+ except json.JSONDecodeError:
188
+ # 参数解析失败也记录到 tracker(arguments 此时未定义,传空 dict)
189
+ _record_failure(tracker, name, {}, f"参数解析失败: {args_str}", "JSONDecodeError")
190
+ return json.dumps({"success": False, "error": f"参数解析失败: {args_str}"})
191
+
192
+ if name not in registry:
193
+ # 未知工具也记录到 tracker(预期终态,recovery_relevant=False)
194
+ _record_failure(
195
+ tracker, name, arguments, f"未知工具: {name}", "UnknownTool",
196
+ recovery_relevant=False,
197
+ )
198
+ return json.dumps({"success": False, "error": f"未知工具: {name}"})
199
+
200
+ # PreToolUse 钩子:可阻断工具调用
201
+ if host is not None:
202
+ guard = host.pre_tool(name, arguments)
203
+ if guard["block"]:
204
+ err = {"success": False, "error": f"被钩子阻断: {guard.get('reason', '')}"}
205
+ # 钩子阻断是预期终态,recovery_relevant=False
206
+ _record_failure(
207
+ tracker, name, arguments, err.get("error", ""), "HookBlocked",
208
+ recovery_relevant=False,
209
+ )
210
+ return format_tool_result(name, err)
211
+
212
+ # Esc 中断检查点
213
+ if esc is not None and esc.is_cancelled():
214
+ raise TaskInterrupted()
215
+
216
+ # AbortSignal 中断检查点(Phase 6 AM:层级化中断)
217
+ # AbortError 转为 TaskInterrupted,保持调用方处理逻辑统一
218
+ if signal is not None:
219
+ try:
220
+ signal.throw_if_aborted()
221
+ except AbortError:
222
+ raise TaskInterrupted()
223
+
224
+ logger.tool_start(name, args=args_str)
225
+ t0 = time.time()
226
+ tool = registry.get(name)
227
+
228
+ # Phase 8 Tier 2 CG:file_edit/file_write 工具执行前记录原内容
229
+ # 供 /undo 命令批量回退。无活跃事务时静默跳过。
230
+ if name in _FILE_EDITING_TOOLS:
231
+ file_path = arguments.get("path", "")
232
+ if file_path:
233
+ _record_file_change_if_active(file_path)
234
+
235
+ try:
236
+ result = tool.execute(**arguments)
237
+ except TypeError as e:
238
+ missing = _extract_missing_param(e, tool.execute)
239
+ hint = f"(缺失必要参数: {missing})" if missing else ""
240
+ result = {"success": False, "error": f"工具参数不合法: {e} {hint}"}
241
+ _record_failure(
242
+ tracker, name, arguments, result.get("error", ""), "TypeError",
243
+ )
244
+ except Exception as e:
245
+ # 兜底捕获未预期异常,记录到 tracker
246
+ result = {"success": False, "error": f"工具执行异常: {e}"}
247
+ _record_failure(
248
+ tracker, name, arguments, result.get("error", ""), type(e).__name__,
249
+ )
250
+
251
+ elapsed_ms = int((time.time() - t0) * 1000)
252
+ logger.tool_end(name, success=result.get("success", False), duration_ms=elapsed_ms,
253
+ out_len=len(format_tool_result(name, result)))
254
+
255
+ # 成功调用也记录到 tracker
256
+ if result.get("success", False):
257
+ _record_success(tracker, name, arguments)
258
+
259
+ # PostToolUse 钩子
260
+ if host is not None:
261
+ host.post_tool(name, arguments, result)
262
+
263
+ return format_tool_result(name, result)
264
+
265
+
266
+ def _record_success(tracker, tool_name: str, args: dict) -> None:
267
+ """记录成功调用到 tracker(None 时用默认单例)。"""
268
+ if tracker is None:
269
+ tracker = get_default_tracker()
270
+ tracker.record(tool_name, args, success=True)
271
+
272
+
273
+ def _record_failure(
274
+ tracker,
275
+ tool_name: str,
276
+ args: dict,
277
+ error: str,
278
+ error_type: str,
279
+ recovery_relevant: bool = True,
280
+ ) -> None:
281
+ """记录失败调用到 tracker(None 时用默认单例)。"""
282
+ if tracker is None:
283
+ tracker = get_default_tracker()
284
+ tracker.record(
285
+ tool_name=tool_name,
286
+ args=args,
287
+ success=False,
288
+ error=error,
289
+ error_type=error_type,
290
+ recovery_relevant=recovery_relevant,
291
+ )
292
+
293
+
294
+ def execute_tool_batch(
295
+ round_num: int,
296
+ tool_calls: list,
297
+ registry,
298
+ *,
299
+ host=None,
300
+ esc=None,
301
+ tracker=None,
302
+ signal: Optional[AbortSignal] = None,
303
+ ) -> list:
304
+ """执行一批工具调用。返回每个 tool_call 对应的 result JSON 字符串列表。
305
+
306
+ Args:
307
+ round_num: 当前轮次编号(仅用于日志上下文,不在此模块输出 UI)
308
+ tool_calls: tool_call 列表
309
+ registry: ToolRegistry 实例
310
+ host: 可选 LifecycleHost
311
+ esc: 可选 EscInterrupt
312
+ tracker: 可选 ToolCallTracker(透传给 execute_tool)
313
+ signal: 可选 AbortSignal(Phase 6 AM:层级化中断信号,透传给 execute_tool)
314
+ """
315
+ logger.batch_header(round_num, len(tool_calls), 100)
316
+ results = []
317
+ for tc in tool_calls:
318
+ result = execute_tool(
319
+ tc, registry, host=host, esc=esc, tracker=tracker, signal=signal
320
+ )
321
+ results.append(result)
322
+ return results
323
+
324
+
325
+ # 工具调用往返轮数安全网(仅防 AI 死循环,正常任务不会达到)
326
+ MAX_TOOL_ROUNDS = 100
327
+
328
+
329
+ def process_tool_calls(
330
+ session,
331
+ client,
332
+ tools_schemas,
333
+ tool_calls,
334
+ cfg,
335
+ registry,
336
+ *,
337
+ host=None,
338
+ esc=None,
339
+ engine=None,
340
+ stream_handler=None,
341
+ show_reasoning=False,
342
+ execute_tool_batch_fn=None,
343
+ self_correction=None,
344
+ tracker=None,
345
+ signal: Optional[AbortSignal] = None,
346
+ ) -> str:
347
+ """执行工具调用并获取后续回复,支持多轮循环。
348
+
349
+ 首批 = 第 1 轮,for 循环从第 2 轮开始。
350
+
351
+ Args:
352
+ session: Session 实例
353
+ client: API 客户端(需实现 chat(messages, tools, stream, model, ...) 方法)
354
+ tools_schemas: OpenAI tool schema 列表
355
+ tool_calls: 首批 tool_call 列表
356
+ cfg: Config 实例
357
+ registry: ToolRegistry 实例
358
+ host: 可选 LifecycleHost
359
+ esc: 可选 EscInterrupt
360
+ engine: 可选 ContextEngine
361
+ stream_handler: 可选的流处理回调,签名为
362
+ (client, messages, tools, cfg, show_reasoning) -> (content, reasoning, tool_calls, usage)
363
+ 若为 None 则跳过 AI 调用,仅执行首批工具。
364
+ show_reasoning: 是否显示推理过程
365
+ execute_tool_batch_fn: 可选的带UI批次执行回调,签名为
366
+ (round_num, tool_calls) -> list of result JSON strings
367
+ 若为 None 则使用默认无UI版本。
368
+ self_correction: 可选的 SelfCorrectionLoop 实例。工具失败时
369
+ 注入结构化修正提示 user 消息,让 LLM 调整参数重试。
370
+ tracker: 可选 ToolCallTracker。None 时使用模块级单例。
371
+ 用于检测连续失败 / 同错误重复,触发警告注入。
372
+ signal: 可选 AbortSignal(Phase 6 AM:层级化中断信号,透传给 execute_tool_batch)。
373
+ 主流程 abort 时通过此信号级联取消工具调用。
374
+
375
+ Returns:
376
+ 最终文本内容(content),为 "" 表示无文本响应或被中断。
377
+ """
378
+ if tracker is None:
379
+ tracker = get_default_tracker()
380
+ _execute_batch = execute_tool_batch_fn if execute_tool_batch_fn else (
381
+ lambda rn, tcs: execute_tool_batch(
382
+ rn, tcs, registry, host=host, esc=esc, tracker=tracker, signal=signal
383
+ )
384
+ )
385
+
386
+ session.add_assistant(tool_calls=tool_calls)
387
+ max_chars = cfg.get("tool_result_max_chars") or None
388
+
389
+ # 第 1 轮:执行首批 tool_calls
390
+ try:
391
+ results = _execute_batch(1, tool_calls)
392
+ except TaskInterrupted:
393
+ # 工具执行被中断:回滚刚写入的 assistant(tool_calls) 消息,
394
+ # 避免孤儿消息残留导致下一次 API 调用 400。
395
+ session.rollback_last_assistant()
396
+ return ""
397
+ for tc, result in zip(tool_calls, results):
398
+ session.add_tool_result(get_tc_field(tc, "id"), result, max_chars=max_chars)
399
+
400
+ # 自纠错循环:首批工具失败时注入修正提示
401
+ if self_correction is not None:
402
+ _inject_correction_if_failed(session, tool_calls, results, self_correction)
403
+
404
+ # ToolCallTracker:检测连续失败 / 同错误重复,注入警告
405
+ _inject_tracker_warning_if_failed(session, tracker)
406
+
407
+ if stream_handler is None:
408
+ return ""
409
+
410
+ for round_num in range(2, MAX_TOOL_ROUNDS + 1):
411
+ try:
412
+ content_buffer, reasoning_buffer, new_tool_calls, usage_info = stream_handler(
413
+ client,
414
+ session.get_messages_for_api(),
415
+ tools_schemas,
416
+ cfg,
417
+ show_reasoning,
418
+ )
419
+ except TaskInterrupted:
420
+ return ""
421
+ except Exception as e:
422
+ # 此前完全静默,导致工具轮次中的 API 异常无法排查。
423
+ # 补日志:main.py 的 _stream_handler 已捕获并打印用户可见错误,
424
+ # 这里兜底记录未预期的异常路径。
425
+ logger.api_error(f"stream_handler round {round_num}: {e}")
426
+ return ""
427
+
428
+ # 更新上下文引擎
429
+ if engine is not None and usage_info:
430
+ if hasattr(usage_info, 'model_dump'):
431
+ engine.update_from_response(usage_info.model_dump())
432
+ elif isinstance(usage_info, dict):
433
+ engine.update_from_response(usage_info)
434
+
435
+ # PostLLMResponse 钩子
436
+ if host is not None:
437
+ host.post_llm(content_buffer, new_tool_calls)
438
+
439
+ if not content_buffer and not new_tool_calls:
440
+ return ""
441
+
442
+ if new_tool_calls:
443
+ merged_new = merge_tool_calls(new_tool_calls)
444
+ session.add_assistant(
445
+ tool_calls=merged_new,
446
+ reasoning_content=reasoning_buffer if reasoning_buffer else None
447
+ )
448
+ try:
449
+ results = _execute_batch(round_num, merged_new)
450
+ except TaskInterrupted:
451
+ return ""
452
+ for tc, result in zip(merged_new, results):
453
+ session.add_tool_result(
454
+ get_tc_field(tc, "id"), result, max_chars=max_chars
455
+ )
456
+ # 自纠错循环:后续每轮工具失败也注入修正提示
457
+ if self_correction is not None:
458
+ _inject_correction_if_failed(session, merged_new, results, self_correction)
459
+ # ToolCallTracker:每轮后检测警告
460
+ _inject_tracker_warning_if_failed(session, tracker)
461
+ continue
462
+
463
+ session.add_assistant(
464
+ content=content_buffer if content_buffer else None,
465
+ reasoning_content=reasoning_buffer if reasoning_buffer else None
466
+ )
467
+ return content_buffer
468
+
469
+ return ""
470
+
471
+
472
+ def _inject_tracker_warning_if_failed(session, tracker) -> None:
473
+ """检测 ToolCallTracker 状态,若连续失败或同错误重复超阈值则注入警告 user 消息。
474
+
475
+ 阈值:window_all_failed(3) 或 same_error_repeated(3)。
476
+ 每会话最多注入一次,避免重复警告(通过状态标志位判断)。
477
+ """
478
+ if tracker is None:
479
+ return
480
+ # 用 session 实例上的标志位避免重复注入
481
+ if getattr(session, "_tracker_warned", False):
482
+ return
483
+ window_failed = tracker.is_window_all_failed(3)
484
+ same_error = tracker.is_same_error_repeated(3)
485
+ if not (window_failed or same_error):
486
+ return
487
+ status = tracker.get_status()
488
+ parts = ["[ToolCallTracker 警告]"]
489
+ if window_failed:
490
+ parts.append(
491
+ f"最近 3 次工具调用全部失败(连续失败 {status['consecutive_errors']} 次)。"
492
+ )
493
+ if same_error:
494
+ parts.append("相同错误已连续重复 3 次以上。")
495
+ parts.append(
496
+ "建议:① 用 file_read 确认目标状态;② 检查参数与命令是否正确;"
497
+ "③ 若任务无法继续,向用户报告失败原因并请求指导。"
498
+ )
499
+ session.add_user("\n".join(parts))
500
+ session._tracker_warned = True
501
+
502
+
503
+ def _inject_correction_if_failed(session, tool_calls, results, loop) -> None:
504
+ """检测工具失败并注入结构化修正提示 user 消息。
505
+
506
+ 遍历 (tool_call, result_str) 对,解析 result JSON 找出失败项。
507
+ 若 loop.should_retry 返回 True,用 build_correction_prompt 生成提示
508
+ 并 session.add_user 注入,让下一轮 LLM 看到修正建议。
509
+ 达到 max_attempts 上限后不再注入。
510
+ """
511
+ for tc, result_str in zip(tool_calls, results):
512
+ try:
513
+ result_dict = json.loads(result_str) if isinstance(result_str, str) else result_str
514
+ except (json.JSONDecodeError, TypeError):
515
+ continue
516
+ if not isinstance(result_dict, dict):
517
+ continue
518
+ if result_dict.get("success", True):
519
+ continue
520
+ if loop.should_retry(tc, result_dict):
521
+ prompt = loop.build_correction_prompt(tc, result_dict, loop.attempts)
522
+ session.add_user(prompt)