langchain-agentx-python 2.2.5__tar.gz → 2.2.6__tar.gz

{langchain-agentx-python-2.2.5/langchain_agentx_python.egg-info → langchain-agentx-python-2.2.6}/PKG-INFO

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

{langchain-agentx-python-2.2.5 → langchain-agentx-python-2.2.6}/langchain_agentx/__init__.py

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

{langchain-agentx-python-2.2.5 → langchain-agentx-python-2.2.6}/langchain_agentx/tool_runtime/base.py

@@ -176,6 +176,12 @@ class RuntimeTool(ABC):
     is_concurrency_safe: bool = False
     """是否支持并发执行。"""
 
+    requires_user_interaction: bool = False
+    """
+    对齐 CC ``Tool.requiresUserInteraction()``。
+    True 时 bypassPermissions / auto allow 不得吞掉上游 ask（如 AskUser gather）。
+    """
+
     never_truncate: bool = False
     """
     禁止 ToolOutputManager 截断输出。
@@ -272,6 +278,15 @@ class RuntimeTool(ABC):
         _ = data, ctx
         return self.is_concurrency_safe
 
+    def requires_user_interaction_for(
+        self,
+        data: dict[str, Any],
+        ctx: ToolExecutionContext,
+    ) -> bool:
+        """该次调用是否强制用户交互；默认读取类属性（对齐 CC requiresUserInteraction）。"""
+        _ = data, ctx
+        return bool(self.requires_user_interaction)
+
     def resolve_capabilities(
         self,
         data: dict[str, Any],

{langchain-agentx-python-2.2.5 → langchain-agentx-python-2.2.6}/langchain_agentx/tool_runtime/inner_permission_chain.py

@@ -4,12 +4,13 @@ inner_permission_chain.py — CC inner 段 1–5（hasPermissionsToUseToolInner
 职责：
     在 PermissionOrchestrator 内编排 global deny/ask → L1 → mode 短路 → path policy
     → acceptEdits 快路径 → passthrough→ask。
+    RUI（requires_user_interaction）上游 ask 对齐 CC step 1e，不被 bypass 吞掉。
 
 链路位置：
     permission_orchestrator._evaluate_inner / _aevaluate_inner
 
 当前裁剪范围：
-    段 6（auto / L3）不在此模块；auto_mode hook 仍由 aauthorize outer 暂存至 Phase 4。
+    段 6（auto / L3）不在此模块。
 """
 
 from __future__ import annotations
@@ -64,6 +65,9 @@ class InnerPermissionChain:
         seg12 = self._segment_1_2_global(tool_name, data, ctx, tool_flags)
         if seg12 is not None:
             if seg12.behavior == "ask":
+                # CC step 1e：RUI + ask 不被 bypassPermissions 吞掉
+                if tool.requires_user_interaction_for(data, ctx):
+                    return seg12
                 seg4 = self._segment_4_mode_shortcircuit(tool, data, ctx, tool_flags)
                 if seg4 is not None:
                     return seg4
@@ -72,6 +76,10 @@ class InnerPermissionChain:
         l1 = tool.run_l1_permission_check(data, ctx)
         if l1.outcome != "continue":
             if l1.outcome == "ask":
+                if l1.decision is None:
+                    raise ValueError(f"L1 outcome={l1.outcome!r} requires decision")
+                if tool.requires_user_interaction_for(data, ctx):
+                    return l1.decision
                 seg4 = self._segment_4_mode_shortcircuit(tool, data, ctx, tool_flags)
                 if seg4 is not None:
                     return seg4

{langchain-agentx-python-2.2.5 → langchain-agentx-python-2.2.6}/langchain_agentx/tool_runtime/outer_permission_resolver.py

@@ -4,6 +4,7 @@ outer_permission_resolver.py — 段 6 outer 裁决（GAP-3）
 职责：
     inner 产出 ask 后：auto 分类器消化 / headless fail-close deny；非 ask 原样返回。
     classifier 熔断到顶：CLI → ask；headless → ClassifierDenialLimitAbort。
+    RUI 工具的 ask 不被 auto allow 吞掉（对齐 CC requiresUserInteraction）。
 
 链路位置：
     PermissionOrchestrator._resolve_outer
@@ -61,6 +62,8 @@ class OuterPermissionResolver:
         tool_flags = ctx.tool_flags if hasattr(ctx, "tool_flags") else {}
         mode = str(tool_flags.get("permission_mode", "default"))
 
+        inner_ask = decision
+
         if mode == "auto":
             auto_decision = await self._run_auto_mode_hook(tool, data, ctx)
             if auto_decision is not None:
@@ -70,12 +73,18 @@ class OuterPermissionResolver:
                     ctx,
                     headless=headless,
                 )
-                if auto_decision.behavior in ("allow", "deny", "ask"):
+                if (
+                    auto_decision.behavior == "allow"
+                    and tool.requires_user_interaction_for(data, ctx)
+                ):
+                    # CC：忽略 auto allow，保留 ask；继续走下方 headless / 透传
+                    pass
+                elif auto_decision.behavior in ("allow", "deny", "ask"):
                     return auto_decision
 
         if headless:
-            return self._headless_deny(decision)
-        return decision
+            return self._headless_deny(inner_ask)
+        return inner_ask
 
     @staticmethod
     async def _run_auto_mode_hook(

{langchain-agentx-python-2.2.5 → langchain-agentx-python-2.2.6}/langchain_agentx/tools/ask_user_question/tool.py

@@ -84,6 +84,7 @@ class AskUserQuestionTool(RuntimeTool):
     is_read_only: bool = True
     is_destructive: bool = False
     is_concurrency_safe: bool = True
+    requires_user_interaction: bool = True
     never_truncate: bool = False
     dedupe_identical_calls: bool = False
     max_result_size_chars: int = 100_000

{langchain-agentx-python-2.2.5 → langchain-agentx-python-2.2.6}/langchain_agentx/tools/plan_mode/tool.py

@@ -183,6 +183,8 @@ class ExitPlanModeRuntimeTool(_PlanModeRuntimeToolBase):
     description: str = EXIT_PLAN_MODE_DESCRIPTION
     input_model = ExitPlanModeInput
     output_model = ExitPlanModeOutput
+    # 对齐 CC ExitPlanMode.requiresUserInteraction：bypass/auto 不得静默放行确认
+    requires_user_interaction: bool = True
 
     def prompt_for_model(self, ctx: ToolPromptContext) -> str:
         _ = ctx

{langchain-agentx-python-2.2.5 → langchain-agentx-python-2.2.6/langchain_agentx_python.egg-info}/PKG-INFO

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

{langchain-agentx-python-2.2.5 → langchain-agentx-python-2.2.6}/pyproject.toml

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