langchain-agentx-python 0.4.3__tar.gz → 0.4.5__tar.gz

{langchain-agentx-python-0.4.3/langchain_agentx_python.egg-info → langchain-agentx-python-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-agentx-python
-Version: 0.4.3
+Version: 0.4.5
 Summary: LangChain/LangGraph-based agent utilities for CodeBaseX.
 Author-email: GoodMood2008 <GoodMood2008@users.noreply.github.com>
 License:                                  Apache License

{langchain-agentx-python-0.4.3 → langchain-agentx-python-0.4.5}/langchain_agentx/__init__.py

@@ -11,7 +11,7 @@ from langchain_agentx import create_loop_agent
 ```
 """
 
-__version__ = "0.4.3"
+__version__ = "0.4.5"
 
 from .loop import (  # noqa: F401
     create_loop_agent,

{langchain-agentx-python-0.4.3 → langchain-agentx-python-0.4.5}/langchain_agentx/loop/graph/factory.py

@@ -1305,11 +1305,18 @@ class LoopGraphBuilder:
             debug=self._debug,
             name=self._name,
         )
-        compiled = compiled.with_config(config)
+        # Consolidate all configurable keys to avoid with_config overwrite bug
+        # (RunnableBinding.with_config does shallow merge, so second "configurable" replaces first)
         configurable_dict: dict[str, Any] = {"loop_config": self._loop_config}
         if self._raw_capabilities is not None:
             configurable_dict["capabilities"] = self._raw_capabilities
-        compiled = compiled.with_config({"configurable": configurable_dict})
+        if "configurable" in config:
+            # Merge existing configurable keys (e.g., tool_loader, session_store)
+            configurable_dict = {**config["configurable"], **configurable_dict}
+            # Remove from original config to avoid duplication
+            config = {k: v for k, v in config.items() if k != "configurable"}
+        config["configurable"] = configurable_dict
+        compiled = compiled.with_config(config)
         if self._trace_tool_callback_handler is not None:
             compiled = compiled.with_config({"callbacks": [self._trace_tool_callback_handler]})
         self._wrap_compiled_ainvoke_with_trace_failure_fallback(compiled)

{langchain-agentx-python-0.4.3 → langchain-agentx-python-0.4.5}/langchain_agentx/task_runtime/integrations/tool_use_summary_provider.py

@@ -122,10 +122,7 @@ class ToolUseSummaryProvider:
             if not tool_name:
                 continue
             if event_type in {"tool-result", "TOOL_RESULT"}:
-                # ingest_from_opencode_events：消费外部/历史 opencode 风格 JSON，字段可能仍带
-                # output 而无 summary；SDK 内部 TOOL_RESULT 已平铺 summary/payload/display。
-                # 仅在此入口保留 output 降级；SDK 直连应传 summary。
-                summary = data.get("summary") or data.get("output") or ""
+                summary = data.get("summary") or ""
                 self.record_tool_result(
                     scope=scope,
                     tool_name=tool_name,

{langchain-agentx-python-0.4.3 → langchain-agentx-python-0.4.5}/langchain_agentx/tool_runtime/loader.py

@@ -112,7 +112,7 @@ class ToolRuntimeLoader:
         from langchain_agentx.tools.bash import BashRuntimeTool
         from langchain_agentx.tools.glob import GlobRuntimeTool
         from langchain_agentx.tools.grep import GrepRuntimeTool
-        from langchain_agentx.tools.edit import BatchEditRuntimeTool, EditRuntimeTool
+        from langchain_agentx.tools.edit import EditRuntimeTool
         from langchain_agentx.tools.read import ReadRuntimeTool
         from langchain_agentx.tools.ripgrep_plugin_exclusions import PluginCacheGlobExclusions
         from langchain_agentx.tools.task_list.tool import TaskListRuntimeTool
@@ -136,7 +136,6 @@ class ToolRuntimeLoader:
         self.register(ReadRuntimeTool(state_bridge=shared_bridge))
         self.register(WriteRuntimeTool(state_bridge=shared_bridge))
         self.register(EditRuntimeTool(state_bridge=shared_bridge))
-        self.register(BatchEditRuntimeTool(state_bridge=shared_bridge))
         self.register(
             GrepRuntimeTool(
                 workspace_root=str(wr),

{langchain-agentx-python-0.4.3 → langchain-agentx-python-0.4.5}/langchain_agentx/tools/__init__.py

@@ -15,7 +15,7 @@ from .glob import GlobRuntimeTool
 from .grep import GrepRuntimeTool
 from .read import ReadRuntimeTool
 from .skill import SkillRuntimeTool
-from .edit import BatchEditRuntimeTool, EditRuntimeTool
+from .edit import EditRuntimeTool
 from .user_message import UserMessageTool
 from .write import WriteRuntimeTool
 
@@ -28,7 +28,6 @@ __all__ = [
     "SkillRuntimeTool",
     "WriteRuntimeTool",
     "EditRuntimeTool",
-    "BatchEditRuntimeTool",
     "UserMessageTool",
 ]
 

langchain-agentx-python-0.4.5/langchain_agentx/tools/edit/__init__.py

@@ -0,0 +1,10 @@
+"""
+tools/edit — EditRuntimeTool（CC FileEditTool 对齐）
+
+需 ToolStateBridge + 先 Read。
+"""
+from __future__ import annotations
+
+from .tool import EditRuntimeTool
+
+__all__ = ["EditRuntimeTool"]

{langchain-agentx-python-0.4.3 → langchain-agentx-python-0.4.5}/langchain_agentx/tools/edit/limits.py

@@ -2,13 +2,10 @@
 tools/edit/limits.py — EditRuntimeTool 上限配置
 
 职责：
-    与 Read 对齐的 stat 前文件大小上限（256KB）；供 Phase 3 validate 使用。
+    与 Read 对齐的 stat 前文件大小上限（256KB）；供 validate 使用。
 
 链路位置：
     EditStringValidator、prompt.get_prompt() 数值说明。
-
-当前裁剪范围：
-    max_file_size；v2 Phase 3：max_batch_edits（单次 ``batch_edit`` 条数上限）。
 """
 
 from __future__ import annotations
@@ -18,14 +15,10 @@ import os
 DEFAULT_MAX_FILE_SIZE_BYTES = int(
     os.getenv("EDIT_TOOL_MAX_FILE_SIZE_BYTES", str(256 * 1024))
 )
-"""与 Read 一致：整文件编辑前 stat 拒绝过大文件（edit-tool-migration §1.4）。"""
-
-DEFAULT_MAX_BATCH_EDITS = int(os.getenv("EDIT_TOOL_MAX_BATCH_EDITS", "64"))
-"""单次 ``batch_edit`` 允许的 ``edits`` 条数上限（edit-tool-migration-v2 §3）。"""
+"""与 Read 一致：整文件编辑前 stat 拒绝过大文件。"""
 
 
 def get_edit_limits() -> dict[str, int]:
     return {
         "max_file_size": DEFAULT_MAX_FILE_SIZE_BYTES,
-        "max_batch_edits": DEFAULT_MAX_BATCH_EDITS,
     }

{langchain-agentx-python-0.4.3 → langchain-agentx-python-0.4.5}/langchain_agentx/tools/edit/models.py

@@ -2,15 +2,14 @@
 tools/edit/models.py — EditRuntimeTool 输入 / 输出模型
 
 职责：
-    Pydantic 契约；对应 CC FileEditTool types.ts 与 edit-tool-migration §2.3、§3.4.4。
+    Pydantic 契约；对应 CC FileEditTool types.ts。
 
 链路位置：
     EditRuntimeTool.input_model / output_model；validate_input / invoke 返回值。
 
 当前裁剪范围：
     v2：可选 ``include_diff`` / 输出 ``diff``（unified）。
-    v3：``EditToolOutput.git_diff``；``diff`` 在含 diff 时为 **git 优先** 否则 unified（见设计 v3 §2.1）。
-    v2 Phase 3：``BatchEditInput`` / ``BatchEditOutput`` / ``BatchEditOperation``。
+    v3：``EditToolOutput.git_diff``；``diff`` 在含 diff 时为 **git 优先** 否则 unified。
 """
 
 from __future__ import annotations
@@ -35,7 +34,7 @@ class EditToolInput(BaseModel):
 
 
 class EditToolOutput(BaseModel):
-    """v1 简化输出（edit-tool-migration §2.3）。"""
+    """v1 简化输出。"""
 
     file_path: str
     old_string: str
@@ -60,44 +59,3 @@ class EditToolOutput(BaseModel):
             "May reflect other uncommitted changes on that path, not only this edit."
         ),
     )
-
-
-class BatchEditOperation(BaseModel):
-    """单条批量替换（edit-tool-migration-v2 §2.1 功能 3）。"""
-
-    old_string: str = Field(..., description="Exact text to replace (may match after quote normalization).")
-    new_string: str = Field(..., description="Replacement text.")
-    replace_all: bool = Field(
-        False,
-        description="If true, replace every occurrence of old_string for this step.",
-    )
-
-
-class BatchEditInput(BaseModel):
-    """批量编辑输入：同一文件上顺序应用多条替换，原子写回。"""
-
-    file_path: str = Field(..., description="Absolute path to the file to edit.")
-    edits: list[BatchEditOperation] = Field(
-        ...,
-        min_length=1,
-        description="Ordered edits applied in memory then written once.",
-    )
-    include_diff: bool = Field(
-        False,
-        description="If true, include combined unified diff in tool result meta (v2).",
-    )
-
-
-class BatchEditOutput(BaseModel):
-    """批量编辑输出。"""
-
-    file_path: str
-    total_replaced: int = Field(..., description="Sum of replaced_count over all edits.")
-    results: list[EditToolOutput] = Field(
-        default_factory=list,
-        description="Per-edit outcomes (old_string is the effective substring used).",
-    )
-    combined_diff: str | None = Field(
-        None,
-        description="Unified diff original → final when include_diff was true.",
-    )

{langchain-agentx-python-0.4.3 → langchain-agentx-python-0.4.5}/langchain_agentx/tools/edit/prompt.py

@@ -8,7 +8,7 @@ tools/edit/prompt.py — EditRuntimeTool 工具名与描述
     EditRuntimeTool.name / description；后续与 get_prompt() 对齐设计 §2.4。
 
 当前裁剪范围：
-    与 CC ``getEditToolDescription`` / 设计 §2.4 对齐；v2/v3：``include_diff``（git 优先与语义）、``batch_edit``。
+    与 CC ``getEditToolDescription`` / 设计 §2.4 对齐；v2/v3：``include_diff``（git 优先与语义）。
 """
 
 from __future__ import annotations
@@ -19,12 +19,6 @@ TOOL_NAME = "edit"
 DESCRIPTION = "Performs exact string replacements in files."
 """简短描述（bind_tools 列表）；与 CC 首句一致。"""
 
-BATCH_TOOL_NAME = "batch_edit"
-"""批量编辑工具名（edit-tool-migration-v2）。"""
-
-BATCH_DESCRIPTION = "Applies multiple string edits to one file atomically."
-"""``batch_edit`` 简短描述（bind_tools）。"""
-
 
 def get_prompt() -> str:
     """完整使用说明；与 edit-tool-migration §2.4 / CC ``getDefaultEditDescription`` 对齐。"""
@@ -58,8 +52,4 @@ Usage:
   this edit only (truncated if large). Payload remains the replace count.
 - Smart quotes: if old_string does not match literally, the tool may match an equivalent
   substring in the file (curly vs straight quotes) and replace that exact file text.
-- Tool ``batch_edit``: same read-before-edit and path rules as ``edit``; supply ``edits`` as a
-  list of dicts (keys: old_string, new_string, optional replace_all). All edits apply in order in memory, then one
-  write; any failure leaves the file unchanged. Optional include_diff adds a combined unified
-  diff in meta.
 """

{langchain-agentx-python-0.4.3 → langchain-agentx-python-0.4.5}/langchain_agentx/tools/edit/validator.py

@@ -1,17 +1,14 @@
 """
-tools/edit/validator.py — EditStringValidator / BatchEditValidator
+tools/edit/validator.py — EditStringValidator
 
 职责：
     ``EditStringValidator``：单次 edit 业务校验（edit-tool-migration §3.4.2）。
-    ``BatchEditValidator``：批量路径 / edits 非空 / 条数上限 / must-read / 大小 / staleness；
-    **不**做逐条 ``old_string`` 存在性与唯一性（invoke 内对**当前**内容检查，edit-tool-migration-v2 §3.2）。
 
 链路位置：
-    ``EditRuntimeTool.validate_input`` / ``BatchEditRuntimeTool.validate_input``。
+    ``EditRuntimeTool.validate_input``。
 
 当前裁剪范围：
     Phase 2：引号由 ``QuoteNormalizer``；非空文件禁止 ``old_string==''`` 的 edit 条。
-    Phase 3：批量校验不含跨 edit 冲突推断。
     v3 Phase 4：``SettingsValidator`` 在 quote / 唯一性之后、staleness 之前；仅单次 ``edit``。
 """
 
@@ -25,7 +22,7 @@ from langchain_agentx.tool_runtime.models import ToolExecutionContext, Validatio
 
 from .backend import apply_edit_to_content
 from .limits import get_edit_limits
-from .models import BatchEditInput, EditToolInput
+from .models import EditToolInput
 from .quote_normalizer import QuoteNormalizer
 from .settings_validator import SettingsValidator
 
@@ -172,100 +169,3 @@ class EditStringValidator:
         if matches == 0:
             return ValidationResult(ok=False, message="old_string not found in file.")
         return ValidationResult(ok=True)
-
-
-class BatchEditValidator:
-    """批量编辑输入校验（edit-tool-migration-v2 §3.2 BatchEditValidator）。"""
-
-    def __init__(
-        self,
-        *,
-        state_bridge: Any | None = None,
-        staleness_checker: Any | None = None,
-    ) -> None:
-        self._state_bridge = state_bridge
-        self._staleness_checker = staleness_checker
-
-    def validate(
-        self,
-        data: dict[str, Any],
-        ctx: ToolExecutionContext,
-    ) -> ValidationResult:
-        try:
-            inp = BatchEditInput.model_validate(data)
-        except Exception as exc:
-            return ValidationResult(ok=False, message=str(exc))
-
-        limits = get_edit_limits()
-        max_batch = limits["max_batch_edits"]
-        if len(inp.edits) > max_batch:
-            return ValidationResult(
-                ok=False,
-                message=f"Too many edits ({len(inp.edits)}), max {max_batch}.",
-            )
-
-        for i, op in enumerate(inp.edits):
-            if op.old_string == op.new_string:
-                return ValidationResult(
-                    ok=False,
-                    message=f"edit[{i}]: old_string and new_string must differ.",
-                )
-
-        fp = inp.file_path
-        if not fp or not str(fp).strip():
-            return ValidationResult(ok=False, message="file_path cannot be empty")
-
-        if not os.path.isabs(fp):
-            return ValidationResult(ok=False, message="file_path must be an absolute path")
-
-        if not os.path.exists(fp):
-            return ValidationResult(ok=False, message=f"File does not exist: {fp}")
-
-        if not os.path.isfile(fp):
-            return ValidationResult(ok=False, message=f"Not a file: {fp}")
-
-        if self._state_bridge is None:
-            return ValidationResult(
-                ok=False,
-                message="BatchEditRuntimeTool requires ToolStateBridge (session state).",
-            )
-
-        if not self._state_bridge.has_been_read(ctx, fp):
-            return ValidationResult(
-                ok=False,
-                message="File has not been read yet. Read it first before writing to it.",
-            )
-
-        try:
-            file_size = os.path.getsize(fp)
-        except OSError as exc:
-            return ValidationResult(ok=False, message=str(exc))
-
-        if file_size > limits["max_file_size"]:
-            return ValidationResult(
-                ok=False,
-                message=(
-                    f"File too large ({file_size} bytes, max {limits['max_file_size']} bytes)"
-                ),
-            )
-
-        if file_size > 0:
-            for i, op in enumerate(inp.edits):
-                if op.old_string == "":
-                    return ValidationResult(
-                        ok=False,
-                        message=(
-                            f"edit[{i}]: empty old_string is only valid when the file is empty."
-                        ),
-                    )
-
-        if self._staleness_checker is None:
-            return ValidationResult(
-                ok=False,
-                message="BatchEditRuntimeTool requires StalenessChecker (state_bridge).",
-            )
-        sr = self._staleness_checker.check(fp, ctx)
-        if not sr.ok:
-            return sr
-
-        return ValidationResult(ok=True)

{langchain-agentx-python-0.4.3 → langchain-agentx-python-0.4.5}/langchain_agentx/tools/glob/tool.py

@@ -286,13 +286,7 @@ class GlobRuntimeTool(RuntimeTool):
                 status="ok",
                 tool_name=self.name,
                 summary=summary,
-                payload={
-                    "filenames": [],
-                    "num_files": 0,
-                    "truncated": result.truncated,
-                    "total_matches": result.total_matches,
-                    "offset": result.offset,
-                },
+                payload=summary,
                 meta=meta,
             )
 
@@ -326,16 +320,21 @@ class GlobRuntimeTool(RuntimeTool):
         result: Any,
         ctx: ToolExecutionContext,
     ) -> dict[str, Any] | None:
-        """out-of-band：匹配计数摘要（对位 CC GlobTool UI）。"""
+        """out-of-band：匹配文件列表（对齐 CC GlobTool UI + extractSearchText）。
+
+        CC Output: {filenames: string[], durationMs, numFiles, truncated}
+        CC extractSearchText: filenames.join('\\n')
+        """
         _ = data, ctx
         if not isinstance(result, GlobToolOutput):
             return None
         return {
-            "num_files": result.num_files,
             "pattern": result.pattern,
             "duration_ms": result.duration_ms,
+            "num_files": result.num_files,
             "truncated": result.truncated,
-            "total_matches": result.total_matches,
+            # 对齐 CC：提供完整文件列表（CC UI 可展示所有匹配文件）
+            "filenames": result.filenames,
         }
 
     def _to_relative(self, path: str) -> str:

{langchain-agentx-python-0.4.3 → langchain-agentx-python-0.4.5}/langchain_agentx/tools/grep/tool.py

@@ -480,15 +480,29 @@ class GrepRuntimeTool(RuntimeTool):
         result: Any,
         ctx: ToolExecutionContext,
     ) -> dict[str, Any] | None:
-        """out-of-band：搜索统计摘要（对位 CC GrepTool UI）。"""
+        """out-of-band：搜索结果（对齐 CC GrepTool UI + extractSearchText）。
+
+        CC extractSearchText: content 模式返回完整 content（匹配行），
+        files_with_matches/count 模式返回 filenames.join('\\n')。
+        """
         _ = data, ctx
         if not isinstance(result, GrepToolOutput):
             return None
-        return {
+        display: dict[str, Any] = {
             "mode": result.mode.value,
-            "num_matches": result.num_matches,
-            "num_files": result.num_files,
             "pattern": result.pattern,
             "duration_ms": result.duration_ms,
             "truncated": result.truncated,
+            # 基本统计：所有模式都提供
+            "num_files": result.num_files,
+            "num_matches": result.num_matches,
         }
+        # 对齐 CC：content 模式提供匹配内容，count 模式提供计数内容
+        if result.mode == GrepOutputMode.content:
+            display["content"] = result.content
+            display["num_lines"] = result.num_lines
+        elif result.mode == GrepOutputMode.count:
+            display["count_content"] = result.count_content
+        # filenames: 所有模式都提供（CC extractSearchText 的备用数据源）
+        display["filenames"] = result.filenames
+        return display

{langchain-agentx-python-0.4.3 → langchain-agentx-python-0.4.5/langchain_agentx_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-agentx-python
-Version: 0.4.3
+Version: 0.4.5
 Summary: LangChain/LangGraph-based agent utilities for CodeBaseX.
 Author-email: GoodMood2008 <GoodMood2008@users.noreply.github.com>
 License:                                  Apache License

{langchain-agentx-python-0.4.3 → langchain-agentx-python-0.4.5}/langchain_agentx_python.egg-info/SOURCES.txt

@@ -323,7 +323,6 @@ langchain_agentx/tools/bash/tool.py
 langchain_agentx/tools/bash/windows_shell_quoting.py
 langchain_agentx/tools/edit/__init__.py
 langchain_agentx/tools/edit/backend.py
-langchain_agentx/tools/edit/batch_tool.py
 langchain_agentx/tools/edit/diff_generator.py
 langchain_agentx/tools/edit/git_diff_generator.py
 langchain_agentx/tools/edit/limits.py

{langchain-agentx-python-0.4.3 → langchain-agentx-python-0.4.5}/pyproject.toml

@@ -4,7 +4,7 @@
 
  [project]
  name = "langchain-agentx-python"
- version = "0.4.3"
+ version = "0.4.5"
  description = "LangChain/LangGraph-based agent utilities for CodeBaseX."
  readme = "README.md"
  requires-python = ">=3.11"

langchain-agentx-python-0.4.3/langchain_agentx/tools/edit/__init__.py

@@ -1,12 +0,0 @@
-"""
-tools/edit — EditRuntimeTool / BatchEditRuntimeTool（CC FileEditTool + v2 批量）
-
-v2：Phase 1–2 单次 edit；Phase 3 ``batch_edit``；需 ``ToolStateBridge`` + 先 Read。
-"""
-
-from __future__ import annotations
-
-from .batch_tool import BatchEditRuntimeTool
-from .tool import EditRuntimeTool
-
-__all__ = ["EditRuntimeTool", "BatchEditRuntimeTool"]