langchain-agentx-python 2.1.8__tar.gz → 2.1.9__tar.gz

{langchain-agentx-python-2.1.8/langchain_agentx_python.egg-info → langchain-agentx-python-2.1.9}/PKG-INFO

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

{langchain-agentx-python-2.1.8 → langchain-agentx-python-2.1.9}/langchain_agentx/__init__.py

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

{langchain-agentx-python-2.1.8 → langchain-agentx-python-2.1.9}/langchain_agentx/tool_runtime/adapter.py

@@ -653,10 +653,15 @@ class LangChainAdapter:
 
     @staticmethod
     def _envelope_to_event_artifact_dict(env: ToolResultEnvelope) -> dict[str, Any]:
+        from langchain_agentx.tool_runtime.cancel_projection import (
+            resolve_artifact_terminal_state,
+        )
+
         raw = asdict(env)
         raw["schema_version"] = "2"
         result = LangChainAdapter._json_safe_value(raw)
-        result["terminal_state"] = "completed"
+        meta = result.get("meta") if isinstance(result.get("meta"), dict) else {}
+        result["terminal_state"] = resolve_artifact_terminal_state(meta=meta)
         # B1/C3 方案 B：blocks/hints/artifacts 同时落 meta.envelope_extensions，
         # CLI Bridge 只消费 meta/display/payload，不扩字段面。
         extensions: dict[str, Any] = {}

langchain-agentx-python-2.1.9/langchain_agentx/tool_runtime/cancel_projection.py

@@ -0,0 +1,85 @@
+"""
+tool_runtime/cancel_projection.py — 工具取消投影（层 C · D-TR）
+
+职责：判定取消窄条件，解析 artifact ``terminal_state`` 与 model payload 双轨哨兵。
+链路位置：``AgentRuntimeTool.present`` → adapter/pipeline ``envelope → artifact``。
+对照 CC：``CANCEL_MESSAGE`` / ``INTERRUPT_MESSAGE_FOR_TOOL_USE``；设计 D-TR-1…4。
+当前裁剪：不扩 ``ToolResultEnvelope.status``；禁止仅凭散文含 cancel 推断。
+"""
+
+from __future__ import annotations
+
+from typing import Any, Literal, Mapping
+
+from langchain_agentx.loop.exit.reason_codes import (
+    TERMINAL_REASON_ABORTED_STREAMING,
+    TERMINAL_REASON_ABORTED_TOOLS,
+    TERMINAL_REASON_HOOK_STOPPED,
+)
+from langchain_agentx.tool_runtime.messages import (
+    CANCEL_MESSAGE,
+    INTERRUPT_MESSAGE_FOR_TOOL_USE,
+)
+
+CANCEL_ERROR_KINDS = frozenset({"aborted", "user_cancelled", "cancelled"})
+
+ABORT_LIKE_TERMINAL_REASONS = frozenset(
+    {
+        TERMINAL_REASON_ABORTED_STREAMING,
+        TERMINAL_REASON_ABORTED_TOOLS,
+        TERMINAL_REASON_HOOK_STOPPED,
+    }
+)
+
+
+def is_cancel_projection(
+    *,
+    source_status: str | None = None,
+    error_kind: str | None = None,
+    terminal_reason: str | None = None,
+) -> bool:
+    """D-TR-3：满足其一即视为用户取消投影（窄条件）。"""
+    if source_status == "interrupted":
+        return True
+    if error_kind in CANCEL_ERROR_KINDS:
+        return True
+    if terminal_reason in ABORT_LIKE_TERMINAL_REASONS:
+        return True
+    return False
+
+
+def resolve_cancel_model_payload(*, error_kind: str | None) -> str:
+    """D-TR-4：Stop 轨 ``user_cancelled`` → CANCEL；其余取消 → INTERRUPT_FOR_TOOL_USE。"""
+    if error_kind == "user_cancelled":
+        return CANCEL_MESSAGE
+    return INTERRUPT_MESSAGE_FOR_TOOL_USE
+
+
+def resolve_artifact_terminal_state(
+    *,
+    meta: Mapping[str, Any] | None = None,
+    terminal_reason: str | None = None,
+) -> Literal["completed", "cancelled"]:
+    """adapter/pipeline 共用：取消 → ``cancelled``，否则 ``completed``。"""
+    m = meta if isinstance(meta, Mapping) else {}
+    reason = terminal_reason if terminal_reason is not None else m.get("terminal_reason")
+    kind = m.get("error_kind")
+    source = m.get("source_status")
+    if is_cancel_projection(
+        source_status=str(source) if source is not None else None,
+        error_kind=str(kind) if kind is not None else None,
+        terminal_reason=str(reason) if reason is not None else None,
+    ):
+        return "cancelled"
+    return "completed"
+
+
+__all__ = [
+    "ABORT_LIKE_TERMINAL_REASONS",
+    "CANCEL_ERROR_KINDS",
+    "CANCEL_MESSAGE",
+    "INTERRUPT_MESSAGE_FOR_TOOL_USE",
+    "is_cancel_projection",
+    "resolve_artifact_terminal_state",
+    "resolve_cancel_model_payload",
+]

{langchain-agentx-python-2.1.8 → langchain-agentx-python-2.1.9}/langchain_agentx/tool_runtime/pipeline.py

@@ -684,7 +684,12 @@ class ToolExecutorPipeline:
 
         artifact = json_safe(asdict(envelope))
         artifact["schema_version"] = "2"
-        artifact["terminal_state"] = "completed"
+        from langchain_agentx.tool_runtime.cancel_projection import (
+            resolve_artifact_terminal_state,
+        )
+
+        meta = artifact.get("meta") if isinstance(artifact.get("meta"), dict) else {}
+        artifact["terminal_state"] = resolve_artifact_terminal_state(meta=meta)
 
         # display 可选（CC renderToolResultMessage?）；无 Output 跳过；抛错不炸 pipeline
         if (

{langchain-agentx-python-2.1.8 → langchain-agentx-python-2.1.9}/langchain_agentx/tools/agent/tool.py

@@ -17,6 +17,10 @@ import logging
 from typing import Any, Literal
 
 from langchain_agentx.tool_runtime.base import RuntimeTool
+from langchain_agentx.tool_runtime.cancel_projection import (
+    is_cancel_projection,
+    resolve_cancel_model_payload,
+)
 from langchain_agentx.tool_runtime.models import (
     AuthorizationDecision,
     L1PermissionResult,
@@ -355,7 +359,14 @@ class AgentRuntimeTool(RuntimeTool):
                 },
             )
         if out.status == "error":
-            payload = out.error_message or (out.errors[0] if out.errors else "Subagent execution failed")
+            if is_cancel_projection(
+                error_kind=out.error_kind,
+                terminal_reason=out.terminal_reason,
+            ):
+                return self._present_cancelled(inp, out, source_status="error")
+            payload = out.error_message or (
+                out.errors[0] if out.errors else "Subagent execution failed"
+            )
             return ToolResultEnvelope(
                 status="error",
                 tool_name=self.name,
@@ -368,16 +379,31 @@ class AgentRuntimeTool(RuntimeTool):
                     **_agent_termination_meta(out),
                 },
             )
+        # interrupted（及未知非 completed/async）→ 取消投影（D-TR-3/4）
+        return self._present_cancelled(inp, out, source_status="interrupted")
+
+    def _present_cancelled(
+        self,
+        inp: AgentToolInput,
+        out: AgentToolOutput,
+        *,
+        source_status: str,
+    ) -> ToolResultEnvelope:
+        """层 C：取消双轨 payload；Envelope.status 仍为 error（D-TR-2）。"""
+        error_kind = out.error_kind or "aborted"
+        term = _agent_termination_meta(out)
+        term["error_kind"] = error_kind
         return ToolResultEnvelope(
             status="error",
             tool_name=self.name,
             summary=f"Agent({inp.subagent_type}) interrupted",
-            payload=out.content or "Subagent execution interrupted",
+            payload=resolve_cancel_model_payload(error_kind=error_kind),
             meta={
                 "agent_id": out.agent_id,
                 "terminal_reason": out.terminal_reason,
                 "mode": self._mode,
-                **_agent_termination_meta(out),
+                "source_status": source_status,
+                **term,
             },
         )
 

{langchain-agentx-python-2.1.8 → langchain-agentx-python-2.1.9/langchain_agentx_python.egg-info}/PKG-INFO

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

{langchain-agentx-python-2.1.8 → langchain-agentx-python-2.1.9}/langchain_agentx_python.egg-info/SOURCES.txt

@@ -396,6 +396,7 @@ langchain_agentx/tool_runtime/accept_edits_fast_path.py
 langchain_agentx/tool_runtime/adapter.py
 langchain_agentx/tool_runtime/agent_home_bypass.py
 langchain_agentx/tool_runtime/base.py
+langchain_agentx/tool_runtime/cancel_projection.py
 langchain_agentx/tool_runtime/capabilities.py
 langchain_agentx/tool_runtime/classifier_denial_bridge.py
 langchain_agentx/tool_runtime/classifier_denial_limit.py

{langchain-agentx-python-2.1.8 → langchain-agentx-python-2.1.9}/pyproject.toml

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