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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-agentx-python
-Version: 2.1.8
+Version: 2.2.0
 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.2.0}/langchain_agentx/__init__.py

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

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

@@ -35,13 +35,20 @@ for chunk in agent.stream({"messages": [{"role": "user", "content": "Hello"}]}):
 from .graph.factory import (
     create_loop_agent,
 )
-from .loop_abort import LoopAbortSignal, raise_if_cancel_requested
+from .loop_abort import (
+    LoopAbortSignal,
+    abort_signal_for_phase,
+    is_cancel_requested,
+    raise_if_cancel_requested,
+)
 from .config import build_agent_config
 
 __all__ = [
     # 主要接口
     "create_loop_agent",
     "LoopAbortSignal",
+    "abort_signal_for_phase",
+    "is_cancel_requested",
     "raise_if_cancel_requested",
     # 配置助手
     "build_agent_config",

{langchain-agentx-python-2.1.8 → langchain-agentx-python-2.2.0}/langchain_agentx/loop/graph/builtin_loop_control.py

@@ -23,7 +23,12 @@ from ..exit.reason_codes import (
     TERMINAL_REASON_CLASSIFIER_DENIAL_LIMIT,
     TERMINAL_REASON_HOOK_STOPPED,
 )
-from ..loop_abort import LoopAbortSignal, raise_if_cancel_requested
+from ..loop_abort import (
+    LoopAbortSignal,
+    abort_signal_for_phase,
+    is_cancel_requested,
+    raise_if_cancel_requested,
+)
 from ..model.orphan_tool_results import synthetic_tool_messages_for_orphan_tool_calls
 from ...tool_runtime.classifier_denial_limit import ClassifierDenialLimitAbort
 from ...tool_runtime.permission_context import clear_auto_approved_window
@@ -72,7 +77,9 @@ class _LoopBuiltinModelControl:
             raise_if_cancel_requested(phase="model")
             return handler(request)
         except asyncio.CancelledError:
-            raise_if_cancel_requested(phase="model")
+            # D-A′-1：就地 abort；禁止 raise_if_cancel_requested 逃逸
+            if is_cancel_requested():
+                return _model_abort_response(abort_signal_for_phase("model"))
             raise
         except LoopAbortSignal as sig:
             if sig.terminal_reason not in (
@@ -88,7 +95,8 @@ class _LoopBuiltinModelControl:
             raise_if_cancel_requested(phase="model")
             return await handler(request)
         except asyncio.CancelledError:
-            raise_if_cancel_requested(phase="model")
+            if is_cancel_requested():
+                return _model_abort_response(abort_signal_for_phase("model"))
             raise
         except LoopAbortSignal as sig:
             if sig.terminal_reason not in (
@@ -184,7 +192,11 @@ def builtin_sync_tool_wrapper(request: Any, handler: Any) -> Any:
         result = handler(_with_injected_agent_tool_model(request))
         return apply_tool_message_status_to_result(result)
     except asyncio.CancelledError:
-        raise_if_cancel_requested(phase="tools")
+        if is_cancel_requested():
+            return _tool_abort_command(
+                request,
+                terminal_reason=TERMINAL_REASON_ABORTED_TOOLS,
+            )
         raise
     except ClassifierDenialLimitAbort as exc:
         return _tool_abort_command(
@@ -207,7 +219,11 @@ async def builtin_async_tool_wrapper(request: Any, handler: Any) -> Any:
         result = await handler(_with_injected_agent_tool_model(request))
         return apply_tool_message_status_to_result(result)
     except asyncio.CancelledError:
-        raise_if_cancel_requested(phase="tools")
+        if is_cancel_requested():
+            return _tool_abort_command(
+                request,
+                terminal_reason=TERMINAL_REASON_ABORTED_TOOLS,
+            )
         raise
     except ClassifierDenialLimitAbort as exc:
         return _tool_abort_command(

{langchain-agentx-python-2.1.8 → langchain-agentx-python-2.2.0}/langchain_agentx/loop/graph/runtime_tools_node.py

@@ -37,7 +37,7 @@ from ..exit.reason_codes import (
     TERMINAL_REASON_ABORTED_TOOLS,
     TERMINAL_REASON_CLASSIFIER_DENIAL_LIMIT,
 )
-from ..loop_abort import LoopAbortSignal, raise_if_cancel_requested
+from ..loop_abort import LoopAbortSignal, is_cancel_requested, raise_if_cancel_requested
 from .builtin_loop_control import tools_batch_abort_command
 
 
@@ -112,7 +112,11 @@ class RuntimeToolsNode(Runnable):
             tool_messages = self._message_adapter.records_to_graph_messages(records)
             return {"messages": tool_messages}
         except asyncio.CancelledError:
-            raise_if_cancel_requested(phase="tools")
+            if is_cancel_requested():
+                return tools_batch_abort_command(
+                    tool_calls,
+                    terminal_reason=TERMINAL_REASON_ABORTED_TOOLS,
+                )
             raise
         except ClassifierDenialLimitAbort as exc:
             return tools_batch_abort_command(
@@ -147,7 +151,11 @@ class RuntimeToolsNode(Runnable):
             tool_messages = self._message_adapter.records_to_graph_messages(records)
             return {"messages": tool_messages}
         except asyncio.CancelledError:
-            raise_if_cancel_requested(phase="tools")
+            if is_cancel_requested():
+                return tools_batch_abort_command(
+                    tool_calls,
+                    terminal_reason=TERMINAL_REASON_ABORTED_TOOLS,
+                )
             raise
         except ClassifierDenialLimitAbort as exc:
             return tools_batch_abort_command(

{langchain-agentx-python-2.1.8 → langchain-agentx-python-2.2.0}/langchain_agentx/loop/loop_abort.py

@@ -2,6 +2,9 @@
 
 P1（Doc-35 D-ABORT-1）：``raise_if_cancel_requested`` 读 ``RunContext.cancel_requested``，
 真则抛既有 ``LoopAbortSignal``（单轨）；禁止平行 Abort 异常族。
+
+层 A′（2026-07-21）：``except CancelledError`` 路径禁止二次 ``raise_if_cancel_requested``
+逃逸；用 ``is_cancel_requested`` + 就地 abort 响应（见 ``abort_signal_for_phase``）。
 """
 
 from __future__ import annotations
@@ -41,27 +44,44 @@ class LoopAbortSignal(Exception):
         super().__init__(detail or terminal_reason)
 
 
+def is_cancel_requested() -> bool:
+    """当前 RunContext 是否已请求取消（无 context 则为 False）。"""
+    from .run_context import get_run_context
+
+    ctx = get_run_context()
+    return ctx is not None and bool(ctx.cancel_requested)
+
+
+def abort_signal_for_phase(
+    phase: CancelAbortPhase,
+    *,
+    detail: str = "cancel_requested",
+) -> LoopAbortSignal:
+    """构造相位对应的 ``LoopAbortSignal``（不抛出；供 CancelledError 就地收口）。"""
+    if phase == "tools":
+        return LoopAbortSignal(TERMINAL_REASON_ABORTED_TOOLS, detail=detail)
+    return LoopAbortSignal(TERMINAL_REASON_ABORTED_STREAMING, detail=detail)
+
+
 def raise_if_cancel_requested(*, phase: CancelAbortPhase) -> None:
     """若当前 ``RunContext.cancel_requested`` 为真，抛既有 ``LoopAbortSignal``。
 
     对齐 CC ``query.ts`` 读 ``signal.aborted``；SDK 原语为 bool（D-SEM-1），
     退出语义仅走 ``LoopAbortSignal`` → ``builtin_loop_control``（D-ABORT-1）。
     无 RunContext 时 no-op。
-    """
-    from .run_context import get_run_context
 
-    ctx = get_run_context()
-    if ctx is None or not ctx.cancel_requested:
+    **禁止**在 ``except CancelledError`` 内调用本函数再让异常逃逸；该路径应
+    ``is_cancel_requested`` + 就地 abort 响应（D-A′-1）。
+    """
+    if not is_cancel_requested():
         return
-    if phase == "tools":
-        raise LoopAbortSignal(
-            TERMINAL_REASON_ABORTED_TOOLS,
-            detail="cancel_requested",
-        )
-    raise LoopAbortSignal(
-        TERMINAL_REASON_ABORTED_STREAMING,
-        detail="cancel_requested",
-    )
+    raise abort_signal_for_phase(phase)
 
 
-__all__ = ["CancelAbortPhase", "LoopAbortSignal", "raise_if_cancel_requested"]
+__all__ = [
+    "CancelAbortPhase",
+    "LoopAbortSignal",
+    "abort_signal_for_phase",
+    "is_cancel_requested",
+    "raise_if_cancel_requested",
+]

{langchain-agentx-python-2.1.8 → langchain-agentx-python-2.2.0}/langchain_agentx/loop/stream/loop_driver.py

@@ -21,8 +21,12 @@ from typing import Any, AsyncIterator, Literal
 
 from langgraph.errors import GraphRecursionError
 
+from langchain_agentx.loop.loop_abort import LoopAbortSignal, is_cancel_requested
 from ..exit.reason_codes import (
+    TERMINAL_REASON_ABORTED_STREAMING,
+    TERMINAL_REASON_ABORTED_TOOLS,
     TERMINAL_REASON_GRAPH_RUNTIME_ERROR,
+    TERMINAL_REASON_HOOK_STOPPED,
     TERMINAL_REASON_RUNTIME_BUDGET_EXHAUSTED,
     TRANSITION_REACTIVE_COMPACT_RETRY,
 )
@@ -43,6 +47,14 @@ logger = logging.getLogger(__name__)
 # CC `tengu_query_error` 的 SDK trace 等价 event_type
 LOOP_STREAM_DRIVER_ERROR_EVENT = "loop.stream_driver.error"
 
+_ABORT_TERMINAL_REASONS = frozenset(
+    {
+        TERMINAL_REASON_ABORTED_STREAMING,
+        TERMINAL_REASON_ABORTED_TOOLS,
+        TERMINAL_REASON_HOOK_STOPPED,
+    }
+)
+
 
 class LoopStreamDriver:
     def __init__(self) -> None:
@@ -123,9 +135,65 @@ class LoopStreamDriver:
             self._log_missing_root_chain_end_anomaly()
         except asyncio.CancelledError as exc:
             self.result.final_error = exc
+            # 用户 Stop 触发的 Task.cancel：合成 abort closeout（D-A′-3 / I7 区分裸 cancel）
+            if is_cancel_requested() and not self.result.saw_finish_surface:
+                reason = TERMINAL_REASON_ABORTED_STREAMING
+                terminal = build_loop_terminal(
+                    reason=reason,
+                    error_kind="aborted",
+                    step=(self.result.last_loop_snapshot or {}).get("step"),
+                    turn_count=(self.result.last_loop_snapshot or {}).get("turn_count"),
+                    provider_finish_reason=(self.result.last_loop_snapshot or {}).get(
+                        "finish_reason"
+                    ),
+                    errors=[str(exc) or "cancel_requested"],
+                )
+                self.result.terminal = terminal
+                synthetic_output = self._build_synthetic_graph_output(terminal)
+                self.result.graph_output = synthetic_output
+                self.result.saw_finish_surface = True
+                yield build_synthetic_root_chain_end(graph_output=synthetic_output)
             for repair in self._orphan_tool_result_repairs(closeout_kind="cancelled"):
                 yield repair
             raise
+        except LoopAbortSignal as exc:
+            # D-A′-3：同轨 abort closeout；禁止落入 graph_runtime_error
+            self.result.final_error = exc
+            reason = (
+                exc.terminal_reason
+                if exc.terminal_reason in _ABORT_TERMINAL_REASONS
+                else TERMINAL_REASON_ABORTED_STREAMING
+            )
+            logger.info(
+                "LoopStreamDriver graph stream aborted: %s",
+                exc.detail or reason,
+                extra={"loop_stream_driver_abort": {"terminal_reason": reason}},
+            )
+            for repair in self._orphan_tool_result_repairs(closeout_kind="interrupted"):
+                yield repair
+            if not self.result.saw_error_visible_surface:
+                self.result.saw_error_visible_surface = True
+                yield build_synthetic_error_visible_event(
+                    message=str(exc.detail or reason),
+                    error_kind="aborted",
+                )
+            if not self.result.saw_finish_surface:
+                terminal = build_loop_terminal(
+                    reason=reason,
+                    error_kind="aborted",
+                    step=(self.result.last_loop_snapshot or {}).get("step"),
+                    turn_count=(self.result.last_loop_snapshot or {}).get("turn_count"),
+                    provider_finish_reason=(self.result.last_loop_snapshot or {}).get(
+                        "finish_reason"
+                    ),
+                    errors=[str(exc)],
+                )
+                self.result.terminal = terminal
+                synthetic_output = self._build_synthetic_graph_output(terminal)
+                self.result.graph_output = synthetic_output
+                self.result.saw_finish_surface = True
+                yield build_synthetic_root_chain_end(graph_output=synthetic_output)
+            raise
         except GraphRecursionError as exc:
             self.result.final_error = exc
             self._log_catch_error(exc)

{langchain-agentx-python-2.1.8 → langchain-agentx-python-2.2.0}/langchain_agentx/loop/subagent/runner.py

@@ -43,7 +43,12 @@ from langchain_agentx.loop.exit.reason_codes import (
     TERMINAL_REASON_HOOK_STOPPED,
 )
 from langchain_agentx.loop.exit.terminal import apply_terminal_reason_projection, read_terminal_reason
-from langchain_agentx.loop.loop_abort import LoopAbortSignal, raise_if_cancel_requested
+from langchain_agentx.loop.loop_abort import (
+    LoopAbortSignal,
+    abort_signal_for_phase,
+    is_cancel_requested,
+    raise_if_cancel_requested,
+)
 from langchain_agentx.loop.run_context import register_spawned_task
 from langchain_agentx.loop.stream.loop_driver import LoopStreamDriver
 from langchain_agentx.loop.subagent.context import (
@@ -598,7 +603,9 @@ async def _collect_subagent_events(
                     child_run_id=child_run_id,
                 )
     except asyncio.CancelledError:
-        raise_if_cancel_requested(phase="model")
+        # D-A′-1：就地转为 LoopAbortSignal 再抛给 body（勿在 except 内 raise_if 逃逸）
+        if is_cancel_requested():
+            raise abort_signal_for_phase("model") from None
         raise
     except LoopAbortSignal:
         # 上抛给 _run_subagent_body → status=interrupted（勿吞成 completed）

{langchain-agentx-python-2.1.8 → langchain-agentx-python-2.2.0}/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.2.0/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.2.0}/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.2.0}/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.2.0/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.2.0
 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.2.0}/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.2.0}/pyproject.toml

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