langchain-agentx-python 0.5.0__tar.gz → 0.5.1__tar.gz

{langchain-agentx-python-0.5.0 → langchain-agentx-python-0.5.1}/PKG-INFO

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

{langchain-agentx-python-0.5.0 → langchain-agentx-python-0.5.1}/langchain_agentx/__init__.py

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

{langchain-agentx-python-0.5.0 → langchain-agentx-python-0.5.1}/langchain_agentx/tool_runtime/override.py

@@ -3,23 +3,38 @@ tool_runtime/override.py — deny 决策覆盖（L4 UX seam）
 
 职责：
     记录 policy deny 的 tool_call，供 UI/CLI 展示覆盖横幅；
-    apply_override 更新会话态，实际重试由宿主命令路由触发。
+    apply_override 更新会话态；grant_replay / consume_replay 支持新 id 一次性放行。
 
 链路位置：
-    pipeline deny → enrich_blocked_deny_envelope → AgentSessionStore
+    pipeline Step 4 → consume_replay → allow 短路
+    pipeline deny → enrich_blocked_deny_envelope → request_override
+
+CC 对照：
+    不复用同一 toolUseID 重放（避免 transcript 双 ToolMessage 同 id）；
+    宿主废掉原 deny 行后以新 tool 调用派发，与本仓 new-id replay grant 一致。
 """
 
 from __future__ import annotations
 
+import logging
 import time
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any, Literal
 
 from .models import AuthorizationDecision, ToolExecutionContext, ToolResultEnvelope
+from .permission_decision import (
+    POLICY_ID_DENY_OVERRIDE_CONSUMED,
+    PermissionDecisionType,
+    attach_decision_reason,
+    make_decision_reason,
+)
 
 if TYPE_CHECKING:
+    from .base import RuntimeTool
     from .session_store import AgentSessionStore
 
+logger = logging.getLogger(__name__)
+
 OverrideDecision = Literal["allow", "confirm_deny"]
 OverrideActor = Literal["user", "admin"]
 RecordStatus = Literal["pending", "allow", "confirm_deny"]
@@ -32,6 +47,7 @@ class DenyOverrideRecord:
     tool_call_id: str
     tool_name: str
     original_decision: AuthorizationDecision
+    original_input: dict[str, Any] = field(default_factory=dict)
     override_decision: RecordStatus = "pending"
     override_at: float | None = None
     override_by: OverrideActor | None = None
@@ -47,6 +63,7 @@ class DenyOverrideRecord:
                 "policy_id": orig.policy_id,
                 "metadata": orig.metadata,
             },
+            "original_input": dict(self.original_input),
             "override_decision": self.override_decision,
             "override_at": self.override_at,
             "override_by": self.override_by,
@@ -57,16 +74,23 @@ class DenyOverrideManager:
     """deny 覆盖管理器，绑定 AgentSessionStore。"""
 
     _STORE_KEY = "_deny_overrides"
+    _GRANTS_KEY = "_deny_override_replay_grants"
 
     def __init__(self, session_store: AgentSessionStore) -> None:
         self._store = session_store
         if not hasattr(session_store, self._STORE_KEY):
             setattr(session_store, self._STORE_KEY, {})
+        if not hasattr(session_store, self._GRANTS_KEY):
+            setattr(session_store, self._GRANTS_KEY, {})
 
     def _records(self) -> dict[str, DenyOverrideRecord]:
         raw = getattr(self._store, self._STORE_KEY)
         return raw if isinstance(raw, dict) else {}
 
+    def _grants(self) -> dict[str, str]:
+        raw = getattr(self._store, self._GRANTS_KEY)
+        return raw if isinstance(raw, dict) else {}
+
     def request_override(
         self,
         tool_call_id: str,
@@ -74,6 +98,7 @@ class DenyOverrideManager:
         original_decision: AuthorizationDecision,
         *,
         override_by: OverrideActor = "user",
+        original_input: dict[str, Any] | None = None,
     ) -> DenyOverrideRecord:
         """标记某次 deny 为待覆盖状态，返回记录供 UI 展示。"""
         if not tool_call_id:
@@ -83,6 +108,7 @@ class DenyOverrideManager:
             tool_call_id=tool_call_id,
             tool_name=tool_name,
             original_decision=original_decision,
+            original_input=dict(original_input or {}),
             override_decision="pending",
             override_by=override_by,
         )
@@ -119,15 +145,102 @@ class DenyOverrideManager:
         )
         return True
 
+    def grant_replay(self, original_tool_call_id: str, replay_tool_call_id: str) -> bool:
+        """在 apply_override(original, \"allow\") 之后颁发一次性 replay grant。"""
+        record = self._records().get(original_tool_call_id)
+        if record is None or record.override_decision != "allow":
+            return False
+        self._grants()[replay_tool_call_id] = original_tool_call_id
+        self._store.append_audit(
+            {
+                "event": "deny_override_replay_granted",
+                "ts": time.time(),
+                "original_tool_call_id": original_tool_call_id,
+                "replay_tool_call_id": replay_tool_call_id,
+            }
+        )
+        return True
+
+    def consume_replay(self, tool_call_id: str) -> str | None:
+        """Pipeline 调用：命中 replay grant 时弹出并返回原 tool_call_id。"""
+        original = self._grants().pop(tool_call_id, None)
+        if original is not None:
+            self._store.append_audit(
+                {
+                    "event": "deny_override_replay_consumed",
+                    "ts": time.time(),
+                    "original_tool_call_id": original,
+                    "replay_tool_call_id": tool_call_id,
+                }
+            )
+        return original
+
     def list_pending(self) -> list[DenyOverrideRecord]:
         return [r for r in self._records().values() if r.override_decision == "pending"]
 
 
+def authorization_from_replay_grant(ctx: ToolExecutionContext) -> AuthorizationDecision | None:
+    """Step 4 前消费 replay grant；命中则返回 allow，否则 None。"""
+    if ctx.session_store is None or not ctx.tool_call_id:
+        return None
+    replay_origin = ctx.session_store.deny_overrides.consume_replay(ctx.tool_call_id)
+    if replay_origin is None:
+        return None
+    logger.info(
+        "tool deny override consumed tool=%s replay=%s origin=%s",
+        ctx.tool_name,
+        ctx.tool_call_id,
+        replay_origin,
+    )
+    return attach_decision_reason(
+        AuthorizationDecision(
+            behavior="allow",
+            policy_id=POLICY_ID_DENY_OVERRIDE_CONSUMED,
+        ),
+        make_decision_reason(
+            PermissionDecisionType.OVERRIDE,
+            replayed_from=replay_origin,
+        ),
+    )
+
+
+def resolve_step4_authorization(
+    tool: RuntimeTool,
+    parsed_data: dict[str, Any],
+    ctx: ToolExecutionContext,
+) -> AuthorizationDecision:
+    """同步 Step 4：replay grant 优先，否则 tool.check_permissions。"""
+    granted = authorization_from_replay_grant(ctx)
+    if granted is not None:
+        return granted
+    return tool.check_permissions(parsed_data, ctx)
+
+
+async def resolve_step4_aauthorization(
+    tool: RuntimeTool,
+    parsed_data: dict[str, Any],
+    ctx: ToolExecutionContext,
+) -> AuthorizationDecision:
+    """异步 Step 4：replay grant 优先，否则 aauthorize / check_permissions。"""
+    granted = authorization_from_replay_grant(ctx)
+    if granted is not None:
+        return granted
+    policy = getattr(tool, "_policy", None)
+    if policy is not None and hasattr(policy, "aauthorize"):
+        return await policy.aauthorize(
+            tool_name=tool.name,
+            input_data=parsed_data,
+            ctx=ctx,
+        )
+    return tool.check_permissions(parsed_data, ctx)
+
+
 def enrich_blocked_deny_envelope(
     envelope: ToolResultEnvelope,
     *,
     ctx: ToolExecutionContext,
     auth: AuthorizationDecision,
+    input_data: dict[str, Any] | None = None,
 ) -> ToolResultEnvelope:
     """在 blocked deny envelope 上附加 can_override 并登记待覆盖记录。"""
     tool_call_id = ctx.tool_call_id
@@ -146,6 +259,7 @@ def enrich_blocked_deny_envelope(
             tool_call_id,
             ctx.tool_name,
             auth,
+            original_input=input_data or {},
         )
         meta["deny_override"] = record.to_dict()
 

{langchain-agentx-python-0.5.0 → langchain-agentx-python-0.5.1}/langchain_agentx/tool_runtime/permission_decision.py

@@ -25,6 +25,10 @@ class PermissionDecisionType(str, Enum):
     CLASSIFIER = "classifier"
     HOOK = "hook"
     AUTO_MODE = "auto_mode"
+    OVERRIDE = "override"
+
+
+POLICY_ID_DENY_OVERRIDE_CONSUMED = "deny_override_consumed"
 
 
 # 公开 policy_id 前缀（文档化契约；新代码优先读 metadata["decision_reason"]）
@@ -67,6 +71,11 @@ def attach_decision_reason(
     return decision
 
 
+def is_override_policy_id(policy_id: str | None) -> bool:
+    """replay grant 消费后 Step 4 短路的 policy_id。"""
+    return policy_id == POLICY_ID_DENY_OVERRIDE_CONSUMED
+
+
 def is_auto_mode_policy_id(policy_id: str | None) -> bool:
     """判断 policy_id 是否来自 Auto Mode（稳定契约，非前缀嗅探首选）。"""
     if not policy_id:
@@ -78,6 +87,8 @@ def decision_type_from_policy_id(policy_id: str | None) -> PermissionDecisionTyp
     """从 policy_id 推断 decision_reason.type（向后兼容）。"""
     if not policy_id:
         return None
+    if is_override_policy_id(policy_id):
+        return PermissionDecisionType.OVERRIDE
     if is_auto_mode_policy_id(policy_id):
         return PermissionDecisionType.AUTO_MODE
     if policy_id.startswith(POLICY_ID_PREFIX_ALWAYS_ASK_TOOL):

{langchain-agentx-python-0.5.0 → langchain-agentx-python-0.5.1}/langchain_agentx/tool_runtime/pipeline.py

@@ -58,7 +58,11 @@ from .identical_call_cache import (
     envelope_with_dedup_notice,
 )
 from .models import AuthorizationDecision, ToolExecutionContext, ToolResultEnvelope
-from .override import enrich_blocked_deny_envelope
+from .override import (
+    enrich_blocked_deny_envelope,
+    resolve_step4_aauthorization,
+    resolve_step4_authorization,
+)
 from .prompt import (
     HeadlessPromptHandler,
     LegacyResolverPromptHandler,
@@ -574,7 +578,7 @@ class ToolExecutorPipeline:
             )
 
         # Step 4: check_permissions
-        auth = tool.check_permissions(parsed_data, ctx)
+        auth = resolve_step4_authorization(tool, parsed_data, ctx)
         if auth.behavior == "deny":
             logger.warning("tool permission denied tool=%s policy_id=%s", tool.name, auth.policy_id)
             env = enrich_blocked_deny_envelope(
@@ -585,6 +589,7 @@ class ToolExecutorPipeline:
                 ),
                 ctx=ctx,
                 auth=auth,
+                input_data=parsed_data,
             )
             self._attach_runtime_observability(
                 env,
@@ -728,12 +733,7 @@ class ToolExecutorPipeline:
             )
 
         # Step 4: check_permissions（支持异步 policy）
-        if tool._policy is not None and hasattr(tool._policy, "aauthorize"):
-            auth = await tool._policy.aauthorize(
-                tool_name=tool.name, input_data=parsed_data, ctx=ctx
-            )
-        else:
-            auth = tool.check_permissions(parsed_data, ctx)
+        auth = await resolve_step4_aauthorization(tool, parsed_data, ctx)
 
         if auth.behavior == "deny":
             logger.warning("tool permission denied tool=%s policy_id=%s", tool.name, auth.policy_id)
@@ -745,6 +745,7 @@ class ToolExecutorPipeline:
                 ),
                 ctx=ctx,
                 auth=auth,
+                input_data=parsed_data,
             )
             self._attach_runtime_observability(
                 env,

{langchain-agentx-python-0.5.0 → langchain-agentx-python-0.5.1}/langchain_agentx_python.egg-info/PKG-INFO

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

{langchain-agentx-python-0.5.0 → langchain-agentx-python-0.5.1}/pyproject.toml

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