langchain-agentx-python 2.1.8__py3-none-any.whl → 2.1.9__py3-none-any.whl

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/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/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/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/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.dist-info → langchain_agentx_python-2.1.9.dist-info}/METADATA

@@ -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.dist-info → langchain_agentx_python-2.1.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-langchain_agentx/__init__.py,sha256=iaK-DqPxtzz5knw2dgWAe35lnhEew_tnIYPGYiYgpFc,1614
+langchain_agentx/__init__.py,sha256=Ap7xVSHcnVF6vuJw2G3SKTcI2QDzn2JSGQZSj-zuHjY,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
@@ -390,9 +390,10 @@ langchain_agentx/task_runtime/tasks/trace_cleanup/executor.py,sha256=qez3WnzBTag
 langchain_agentx/task_runtime/tasks/trace_cleanup/scheduler.py,sha256=lqWlCqucs26fhr4M9LfgY8I0xuNDxwSLkre6XjAJDhA,6877
 langchain_agentx/tool_runtime/__init__.py,sha256=C4ZrS6UWSL65ErfNWMvBuZBnht6ZuGb0PBXwA0Xke74,5144
 langchain_agentx/tool_runtime/accept_edits_fast_path.py,sha256=UMCOF9Ws7hx3pcYvL-Kq7vzIAGvOGdEfx69ccUDXT-k,2281
-langchain_agentx/tool_runtime/adapter.py,sha256=vl2o9aTx4wb2-1KIn41gOtqArbw9hFbowIny5PZFriE,33608
+langchain_agentx/tool_runtime/adapter.py,sha256=rM-Y2zSZ--N-TIvx1HtI1J7ralPU0w4jJuX3bBvIVxM,33847
 langchain_agentx/tool_runtime/agent_home_bypass.py,sha256=na9xQPgJ02qA3YiJ1F8jN0Uv4uBDPzqRk3lfPPE089g,8010
 langchain_agentx/tool_runtime/base.py,sha256=Ez9W42DsaiZcWDDO8UfRKv3E7_Z6WBcABkwdAi6qTK8,21390
+langchain_agentx/tool_runtime/cancel_projection.py,sha256=81_Bvg8ZiuPdl1usePt7ykXFuO6Sg7UXogYQBX6aysQ,2788
 langchain_agentx/tool_runtime/capabilities.py,sha256=KHwu5KLqrpPKLOTwHhnvIIs9MTmQYeuS2hAFmI_Nsy8,3837
 langchain_agentx/tool_runtime/classifier_denial_bridge.py,sha256=Wv40rYc5U3Mn7G3H7sUWrcG78HyLKnrRXvv7Yv9wI5U,2743
 langchain_agentx/tool_runtime/classifier_denial_limit.py,sha256=RVLELUNO346_0ssg46bap52TRTp1dVzCOqdfjpuOpek,3793
@@ -420,7 +421,7 @@ langchain_agentx/tool_runtime/permission_rules.py,sha256=ev6-Hm3N8YtbJO3SLGpoGMU
 langchain_agentx/tool_runtime/permission_settings_loader.py,sha256=Xu6dso0ghh4pb7Puf8nj20nXxjGeQvL4kIGycavwG_o,5624
 langchain_agentx/tool_runtime/permission_settings_sync.py,sha256=g6TvjWwa7D0kw5rDznPsoMv7xylESPOyWA2vZW4HDm0,4590
 langchain_agentx/tool_runtime/permission_snapshot.py,sha256=xFoi9fIcZjSw_zrIoyglneM-vJsDOLCEjiVoazr5Ack,1947
-langchain_agentx/tool_runtime/pipeline.py,sha256=gdpYiv3_TT68insZm--5LWcbEdVzGbJLDFdWThe2Xhw,54041
+langchain_agentx/tool_runtime/pipeline.py,sha256=b4ZlEMH5i3_rqWjPx3g7BD6Yv2hvk-R6qgKFgo-b3eU,54284
 langchain_agentx/tool_runtime/policy.py,sha256=PLk_-5wu69_Gjqig0pj71brcu6VfLvGSIHsAUHOiYIQ,30068
 langchain_agentx/tool_runtime/policy_decorator.py,sha256=XWbgh_TRlPJ-J-RFo1FKjIN_n_Z9rtLTfSwBQoyLTTg,2264
 langchain_agentx/tool_runtime/process_loader.py,sha256=1YMn6ntnpdbIHJbO7wF1xuz7gNKYxK0UJAOxq96dZX4,6166
@@ -506,7 +507,7 @@ langchain_agentx/tools/agent/models.py,sha256=jPxah6JgPt0UlZVyrAQxQeZmVUDOBV7xyl
 langchain_agentx/tools/agent/prompt.py,sha256=QQA40AfA5sEIl_LG7kn7UlUKFBOzsHSs_M8c5n-p7YU,8093
 langchain_agentx/tools/agent/prompt_scope.py,sha256=xQup3hosuN0B6TFq7jYV5SE6gzZNwR6BOQ552dfef5I,2677
 langchain_agentx/tools/agent/scope.py,sha256=6F2ZJgSvt-gFeciyKIQxaIiW5PBW9zUeTj3P0uxqrrg,6324
-langchain_agentx/tools/agent/tool.py,sha256=X2_o5QdoaDnyQV09k_taTpbMJUbia68WV3GIFOONb_w,17006
+langchain_agentx/tools/agent/tool.py,sha256=h6yw2vDsla6teu47D5drOlVOn0KO_e973n_aih24qSU,17972
 langchain_agentx/tools/agent/built_in/__init__.py,sha256=4YUHj8nUcUOvJW9p158W_t_RBoQt8Uh7eTt0idnCTE4,657
 langchain_agentx/tools/agent/built_in/agentx_guide.py,sha256=Wz4791lK_URpAGtKWceEMvJlD_cu79KfmNQka5yXeUs,2719
 langchain_agentx/tools/agent/built_in/explore.py,sha256=H5757yjmudceFVaMN0O4YDH267DKfFPMSxGR83waNkk,3504
@@ -758,8 +759,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.1.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-langchain_agentx_python-2.1.8.dist-info/METADATA,sha256=chtimG16eeuexFZekvTk3_0LzlcYUQjBgcvD1VHMr3Y,24250
-langchain_agentx_python-2.1.8.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
-langchain_agentx_python-2.1.8.dist-info/top_level.txt,sha256=Ge284pniNt8xea0OLk2o9o32GqVpDhOYk20fwE-0xxA,17
-langchain_agentx_python-2.1.8.dist-info/RECORD,,
+langchain_agentx_python-2.1.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+langchain_agentx_python-2.1.9.dist-info/METADATA,sha256=6jvj-EwhulXBUBtaJgpJEaiyiFDPgxUnU7nX6dvS6Zk,24250
+langchain_agentx_python-2.1.9.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
+langchain_agentx_python-2.1.9.dist-info/top_level.txt,sha256=Ge284pniNt8xea0OLk2o9o32GqVpDhOYk20fwE-0xxA,17
+langchain_agentx_python-2.1.9.dist-info/RECORD,,