langchain-agentx-python 2.2.1__py3-none-any.whl → 2.2.3__py3-none-any.whl

langchain_agentx/__init__.py

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

langchain_agentx/observability/events/agent_event_projector.py

@@ -51,6 +51,12 @@ from langchain_agentx.observability.events.agent_defaults import DEFAULT_AGENT_T
 from langchain_agentx.observability.events.subagent_window_text_guard import (
     SubagentWindowTextGuard,
 )
+from langchain_agentx.observability.events.compact_event_gate import (
+    beneficial_light_stage_names,
+    extract_compaction_meta_from_chain_end_data,
+    is_user_visible_compact,
+    light_only_with_benefit,
+)
 from langchain_agentx.observability.events.tool_call_id_resolver import (
     ToolCallIdResolver,
 )
@@ -121,8 +127,7 @@ class LangchainAgentEventType(Enum):
     FINISH_STEP = "finish-step"
     HOOK_PROGRESS = "hook-progress"
     HOOK_FINISHED = "hook-finished"
-    COMPACT_START = "compact-start"
-    COMPACT_END = "compact-end"
+    COMPACT_BOUNDARY = "compact-boundary"
     MEMORY_SAVED = "memory-saved"
     SUBAGENT_START = "subagent-start"
     SUBAGENT_END = "subagent-end"
@@ -396,12 +401,7 @@ class AgentEventProjector:
                 step_index=self.state.step_index or None,
             )
 
-        if self.enable_compact_events and self._is_compact_node(name):
-            yield self._event(
-                event_type=LangchainAgentEventType.COMPACT_START,
-                data={},
-                step_index=self.state.step_index or None,
-            )
+        # D-CMP-EVT：不在 start 发 compact（CC 无 start/end；事后单边界）
 
     def _build_loop_observation_payload(self) -> Dict[str, Any]:
         snap = self.state.last_loop_snapshot or {}
@@ -752,7 +752,6 @@ class AgentEventProjector:
             result["tokens_freed"] = meta.get("tokens_freed_sum")
 
             stages = meta.get("stages")
-            autocompact_found = False
             microcompact_found = False
 
             if isinstance(stages, list):
@@ -761,7 +760,6 @@ class AgentEventProjector:
                         name = s.get("name")
                         extra = s.get("extra") or {}
                         if name == "autocompact":
-                            autocompact_found = True
                             result["autocompact_mode"] = extra.get("autocompact_mode")
                             result["folded_messages"] = extra.get("folded_messages")
                             result["messages_summarized"] = extra.get("folded_messages")
@@ -782,10 +780,12 @@ class AgentEventProjector:
                                 break
 
                 if "compact_type" not in result:
-                    if autocompact_found or not microcompact_found:
+                    mode = result.get("autocompact_mode")
+                    if isinstance(mode, str) and mode:
                         result["compact_type"] = "autocompact"
-                    else:
+                    elif microcompact_found:
                         result["compact_type"] = "microcompact"
+                    # 不再用「stages 出现过 autocompact 名」回落为 autocompact（假阳性）
 
         if "summary" not in result:
             messages = output.get("messages")
@@ -848,13 +848,30 @@ class AgentEventProjector:
                 step_index=self.state.step_index or None,
             )
 
-        if self.enable_compact_events and self._is_compact_node(name):
-            compact_data = self._extract_compact_summary(data)
-            yield self._event(
-                event_type=LangchainAgentEventType.COMPACT_END,
-                data=compact_data,
-                step_index=self.state.step_index or None,
-            )
+        if self._is_compact_node(name):
+            meta = extract_compaction_meta_from_chain_end_data(data)
+            if is_user_visible_compact(meta):
+                if self.enable_compact_events:
+                    compact_data = self._extract_compact_summary(data)
+                    if "trigger" not in compact_data:
+                        compact_data["trigger"] = "auto"
+                    yield self._event(
+                        event_type=LangchainAgentEventType.COMPACT_BOUNDARY,
+                        data=compact_data,
+                        step_index=self.state.step_index or None,
+                    )
+            elif light_only_with_benefit(meta):
+                # D-CMP-EVT-7：对齐 CC logForDebugging；不受 enable_compact_events 关闭影响
+                freed = None
+                if isinstance(meta, dict):
+                    freed = meta.get("tokens_freed_sum")
+                stages = beneficial_light_stage_names(meta)
+                logger.debug(
+                    "compact light-only: tokens_freed_sum=%s stages=%s "
+                    "(no public compact-boundary; align CC logForDebugging)",
+                    freed,
+                    stages or None,
+                )
 
         if name == self.state.graph_name:
             if self.enable_reasoning_events and self.state.is_reasoning_active:

langchain_agentx/observability/events/compact_event_gate.py

@@ -0,0 +1,152 @@
+"""
+compact_event_gate.py — compact 公共事件门闩（对齐 CC compact_boundary）
+
+职责：
+    - 从 compaction_pipeline_meta 判定是否用户可见真压缩 / light-only 有收益
+    - 供 agent_event_projector 发射 compact-boundary 或 logger.debug
+
+链路位置：
+    - Layer 3: observability/events 投影门闩（不改 L0 压缩流水线）
+
+当前裁剪范围：
+    - 仅 meta 谓词；不创建 SSE 以外的事件类型
+    - session_memory applied 仅识别显式标记（字段可后续扩展）
+"""
+
+from __future__ import annotations
+
+from typing import Any, Optional
+
+from langchain_agentx.loop.exit.query_source import QuerySource
+
+# 实际折叠上下文的 autocompact_mode（不含仅 skipped）
+APPLIED_AUTOCOMPACT_MODES: frozenset[str] = frozenset(
+    {
+        "llm",
+        "prune",
+        "prune_blocked_llm",
+    }
+)
+
+_LIGHT_STAGE_NAMES: frozenset[str] = frozenset(
+    {
+        "tool_result_budget",
+        "snip",
+        "microcompact",
+        "collapse",
+    }
+)
+
+
+def _as_dict(meta: Any) -> Optional[dict[str, Any]]:
+    return meta if isinstance(meta, dict) else None
+
+
+def _stage_extra(stage: dict[str, Any]) -> dict[str, Any]:
+    extra = stage.get("extra")
+    return extra if isinstance(extra, dict) else {}
+
+
+def _positive_number(value: Any) -> bool:
+    if value is None:
+        return False
+    try:
+        return float(value) > 0
+    except (TypeError, ValueError):
+        return False
+
+
+def is_user_visible_compact(meta: Any) -> bool:
+    """真压缩已应用 → 应对齐 CC 发一条 compact-boundary。
+
+    禁止用 tokens_freed_sum / stages 仅出现 autocompact 名 / compact_type 回落判定。
+    """
+    m = _as_dict(meta)
+    if m is None:
+        return False
+
+    # Session / 手动：L0 现网键（factory session_memory 路径无 stages[]）
+    if m.get("session_memory_compact_applied") is True:
+        return True
+    if m.get("manual_compact_applied") is True:
+        return True
+    if m.get("session_memory_compaction") == "applied":
+        return True
+    if m.get("autocompact_mode") == QuerySource.SESSION_MEMORY:
+        return True
+
+    stages = m.get("stages")
+    if not isinstance(stages, list):
+        return False
+
+    for stage in stages:
+        if not isinstance(stage, dict):
+            continue
+        name = stage.get("name")
+        extra = _stage_extra(stage)
+        if name == "autocompact":
+            mode = extra.get("autocompact_mode")
+            if isinstance(mode, str) and mode in APPLIED_AUTOCOMPACT_MODES:
+                return True
+        if name == QuerySource.SESSION_MEMORY and extra.get("applied") is True:
+            return True
+    return False
+
+
+def light_only_with_benefit(meta: Any) -> bool:
+    """非用户可见，但有轻量 stage（或 sum）释放 token → 应对齐 CC logForDebugging。"""
+    if is_user_visible_compact(meta):
+        return False
+    m = _as_dict(meta)
+    if m is None:
+        return False
+
+    stages = m.get("stages")
+    if isinstance(stages, list):
+        for stage in stages:
+            if not isinstance(stage, dict):
+                continue
+            if _positive_number(stage.get("tokens_freed")):
+                return True
+            # micro 规范化标记但 tokens 估计可能为 0：仍视为有 light 动作时可记
+            name = stage.get("name")
+            extra = _stage_extra(stage)
+            if name == "microcompact" and extra.get("microcompact_normalized"):
+                return True
+
+    return _positive_number(m.get("tokens_freed_sum"))
+
+
+def beneficial_light_stage_names(meta: Any) -> list[str]:
+    """有收益的轻量 stage 名（供 debug 文案）。"""
+    m = _as_dict(meta)
+    if m is None:
+        return []
+    names: list[str] = []
+    stages = m.get("stages")
+    if not isinstance(stages, list):
+        return names
+    for stage in stages:
+        if not isinstance(stage, dict):
+            continue
+        name = stage.get("name")
+        if not isinstance(name, str):
+            continue
+        extra = _stage_extra(stage)
+        freed = _positive_number(stage.get("tokens_freed"))
+        micro = name == "microcompact" and bool(extra.get("microcompact_normalized"))
+        if freed or micro:
+            if name in _LIGHT_STAGE_NAMES or freed or micro:
+                names.append(name)
+    return names
+
+
+def extract_compaction_meta_from_chain_end_data(data: Any) -> Optional[dict[str, Any]]:
+    """从 on_chain_end data 取出 compaction_pipeline_meta。"""
+    if not isinstance(data, dict):
+        return None
+    output = data.get("output")
+    if not isinstance(output, dict):
+        return None
+    meta = output.get("compaction_pipeline_meta")
+    return meta if isinstance(meta, dict) else None

langchain_agentx/tools/grep/backend.py

@@ -28,6 +28,19 @@ from langchain_agentx.utils.subprocess_text import (
 from .models import GrepOutputMode
 
 
+def resolve_ripgrep_subprocess_cwd(search_path: str) -> str:
+    """subprocess cwd 必须是目录；schema 允许 path 为文件时退到父目录。
+
+    Windows 上相对 glob 需要 cwd≈搜索根目录；但不能把文件路径直接当 cwd
+    （会 NotADirectoryError / Errno 20）。rg 命令行目标仍用原 search_path。
+    """
+    real = os.path.realpath(search_path)
+    if os.path.isfile(real):
+        parent = os.path.dirname(real)
+        return parent if parent else os.sep
+    return real
+
+
 class GrepTimeoutError(ToolRuntimeError):
     def __init__(self, message: str) -> None:
         super().__init__(message, code="GREP_TIMEOUT")
@@ -60,14 +73,16 @@ def run_ripgrep_lines(
     对齐 CC ripgrep.ts：returncode 1 -> []；EAGAIN 时以 -j 1 重试一次。
     供 RipgrepBackend 与 Glob 的 rg --files 列文件共用。
 
-    SDK 补充：``subprocess cwd=search_path``。CC 隐式依赖进程 cwd≈searchDir；
-    编排布局 ``state_root≠repo`` 时须显式设 cwd，否则 Windows 上目录前缀 glob（如 ``alpha/*``）误空。
+    SDK 补充：``subprocess cwd`` 对齐搜索根目录（目录本身，或文件的父目录）。
+    CC 隐式依赖进程 cwd≈searchDir；编排布局 ``state_root≠repo`` 时须显式设 cwd，
+    否则 Windows 上目录前缀 glob（如 ``alpha/*``）误空。
 
     若 ``cancel_event`` 非空，使用可中断子进程路径（``RgSubprocessController``），
     不再走 ``text_runner.run``（便于测试 mock 时仅覆盖无取消路径）。
     """
-    search_cwd = os.path.realpath(search_path)
-    cmd = [rg_path, *args, search_cwd]
+    search_target = os.path.realpath(search_path)
+    search_cwd = resolve_ripgrep_subprocess_cwd(search_path)
+    cmd = [rg_path, *args, search_target]
     if cancel_event is not None:
         if cancel_event.is_set():
             raise GrepCancelledError("ripgrep cancelled before start")
@@ -321,7 +336,7 @@ class RipgrepBackend:
             plugin_glob_exclusions=plugin_glob_exclusions,
         )
         cmd = [self._rg_path, *args, os.path.realpath(search_path)]
-        search_cwd = os.path.realpath(search_path)
+        search_cwd = resolve_ripgrep_subprocess_cwd(search_path)
         if cancel_event is not None and cancel_event.is_set():
             raise GrepCancelledError("ripgrep cancelled before start")
         try:

{langchain_agentx_python-2.2.1.dist-info → langchain_agentx_python-2.2.3.dist-info}/METADATA

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

{langchain_agentx_python-2.2.1.dist-info → langchain_agentx_python-2.2.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-langchain_agentx/__init__.py,sha256=MJpPR7tuUrTR76iSfQUpDD67ydVKB93o5UEY78FBs28,1614
+langchain_agentx/__init__.py,sha256=bMHXxvdlfRUJK-ZT43f2Hgef2tNuOs5bc3mv-F4BQRc,1614
 langchain_agentx/command/__init__.py,sha256=Ej260S5uFQcmEtGZQG_NH7BYjHoStrpBLtGUsBTxyZk,631
 langchain_agentx/command/allowed_tools.py,sha256=TVA0VM8rm98H-QbLK_GRiX5RhEAZFxKawliMi4kk96A,3359
 langchain_agentx/command/context.py,sha256=DIGOGPBw5UGDBm0WNNJlKx1h_9rCRmcdROv4DT61Qug,731
@@ -217,8 +217,9 @@ langchain_agentx/observability/evaluation/checkers/tool_behavior.py,sha256=o1nH8
 langchain_agentx/observability/events/__init__.py,sha256=Zr9Iguf9XsJQLsCJy13YFdBtXHPEnI9aSWXWmA2MisA,1497
 langchain_agentx/observability/events/accumulated_text_scope.py,sha256=M4OvuQTgReF8SFrOmr-M5vyOJpzfvxj_DKD5bVpGb70,3169
 langchain_agentx/observability/events/agent_defaults.py,sha256=gmX0P__lux5xbCb8dtAlVCb3wZ7avaqFleoW4Q5anw4,1187
-langchain_agentx/observability/events/agent_event_projector.py,sha256=eMri832yK_BZbwsB_APwUN9vu66zMpZVxTstChG5l0A,63010
+langchain_agentx/observability/events/agent_event_projector.py,sha256=Rktmy2D3qizCejAChbuOiAa06Tnup2Z6cVNATfrrxkU,63995
 langchain_agentx/observability/events/api_retry_projection.py,sha256=XGb09sNOi6k1ZGW4YqMLBE8GDxNwNMprk62jV9TS9dQ,2433
+langchain_agentx/observability/events/compact_event_gate.py,sha256=50RJemwB1lnQn_NFWOFSgU418ZUR8dbd_v0538PT7zM,4751
 langchain_agentx/observability/events/factory.py,sha256=gqMATIK9tBQzaPWSPhCCSPuCq-WF562ZDTnFUaMm9Qc,1570
 langchain_agentx/observability/events/finish_event_payload_composer.py,sha256=v7MyLNSZ_gR5u5WFxPJu_0MYNDvC9s9gI2iNNt9Vbr4,13189
 langchain_agentx/observability/events/finish_outcome.py,sha256=igoueAwduzuuGDwg6u9AbBB-T2UBiqbUfNoxWCBYc_g,10401
@@ -580,7 +581,7 @@ langchain_agentx/tools/glob/rg_list_backend.py,sha256=gTyFQE0eYHl-7LkSdah76S8bQn
 langchain_agentx/tools/glob/rg_pattern.py,sha256=YOV-1gdxC52vzdAwgz27l7mzPJvVuHqpqeWhiEnWQJs,1377
 langchain_agentx/tools/glob/tool.py,sha256=m746Vl_aI9eFmrXYECkg16zMln9YPVxqjtijPlc5ALA,14868
 langchain_agentx/tools/grep/__init__.py,sha256=AA9qa42Ap9tw6lPQkNgKzYmr4hu44eP93qVdyP-eFNU,162
-langchain_agentx/tools/grep/backend.py,sha256=DSKetuS6Wcta5wrDBVFYSVDLsou0VDXXZyvdFvN1nls,13885
+langchain_agentx/tools/grep/backend.py,sha256=bzwRUJ_aZjs84oIG3l6IAVygGiLDyNsHPePiMaFMo-4,14539
 langchain_agentx/tools/grep/models.py,sha256=6fTSux0COK06weQ7PWYqCGBQx60OaNtqC5q7xKtf5i0,3860
 langchain_agentx/tools/grep/prompt.py,sha256=Euo1NErphk5WHxaKXwJH-1v7joblfwEFWHIYNthKkzo,1336
 langchain_agentx/tools/grep/rg_subprocess_controller.py,sha256=ijMJnKPo7iEDFBz-_YipTiPusrL6OO2XbWxHUuwpMfA,4056
@@ -759,8 +760,8 @@ langchain_agentx/workspace/root_grant_manager.py,sha256=W3gy8HTevbERbXqIgRcjzOXO
 langchain_agentx/workspace/tool_boundary.py,sha256=UDwX6swpSLsx9HNkYuuRRiV5o7ZZG_Bru2Yn0c5kNX8,5724
 langchain_agentx/workspace/validators.py,sha256=tQt-6TOcL8Fw7Ig5ebA9S7vGWh1rby920eFW6x8Tk9E,1439
 langchain_agentx/workspace/view.py,sha256=PGasqTaqhlD03SXXazHuw4RHfV681AIdlsYqL70pEjc,4774
-langchain_agentx_python-2.2.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-langchain_agentx_python-2.2.1.dist-info/METADATA,sha256=UfgeVWTPqOZJ3Nps3E7gtcupQdCo0YhTRY8uLS3uUiM,24250
-langchain_agentx_python-2.2.1.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
-langchain_agentx_python-2.2.1.dist-info/top_level.txt,sha256=Ge284pniNt8xea0OLk2o9o32GqVpDhOYk20fwE-0xxA,17
-langchain_agentx_python-2.2.1.dist-info/RECORD,,
+langchain_agentx_python-2.2.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+langchain_agentx_python-2.2.3.dist-info/METADATA,sha256=VcuvJI240NmP2VxSl2xxXD2BTvpnCLxnkXjg5aHzmQE,24250
+langchain_agentx_python-2.2.3.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
+langchain_agentx_python-2.2.3.dist-info/top_level.txt,sha256=Ge284pniNt8xea0OLk2o9o32GqVpDhOYk20fwE-0xxA,17
+langchain_agentx_python-2.2.3.dist-info/RECORD,,