langchain-agentx-python 2.2.6__py3-none-any.whl → 2.2.7__py3-none-any.whl

langchain_agentx/__init__.py

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

langchain_agentx/tool_runtime/outer_permission_resolver.py

@@ -10,7 +10,7 @@ outer_permission_resolver.py — 段 6 outer 裁决（GAP-3）
     PermissionOrchestrator._resolve_outer
 
 当前裁剪范围：
-    不调用 L3 UI；AskUserQuestion gather 仍由 pipeline 特例处理。
+    不调用 L3 UI；AskUserQuestion gather ask 经 RUI 保留后由 pipeline L3 处理。
 """
 
 from __future__ import annotations

langchain_agentx/tool_runtime/pipeline.py

@@ -31,8 +31,10 @@ runtime/pipeline.py — 工具执行管道与输出大小管控
         IdenticalCallMemo；命中则直接返回带 Hint 的 ToolResultEnvelope（不执行 invoke），
         作为“软提示防重复”策略的执行层硬约束替代。
 
-    AskUserQuestion：
-        `truncate_if_needed` 之后发 `ask_user_question_completed`（`_emit_post_invoke_analytics`）。
+    AskUserQuestion（CC L3）：
+        无 answers 时 L1 ask → 进 ``_handle_l3_ask``（不再 pending envelope 短路）；
+        handler 经 ``updated_input`` 注入 answers[+annotations] 后唯一 invoke；
+        `truncate_if_needed` 之后发 `ask_user_question_completed`。
 """
 
 from __future__ import annotations
@@ -77,7 +79,9 @@ from .denial_tracking_bridge import (
     record_l3_response,
     suppression_observability_events,
 )
+from .messages import INTERRUPT_MESSAGE_FOR_TOOL_USE
 from .prompt import (
+    DecisionReasonType,
     HeadlessPromptHandler,
     LegacyResolverPromptHandler,
     PermissionUpdate,
@@ -126,41 +130,6 @@ def _as_run_result(
 _ASK_USER_QUESTION_TOOL_NAME = "AskUserQuestion"
 
 
-def _try_envelope_pending_user_questions_gather(
-    *,
-    tool: RuntimeTool,
-    auth: AuthorizationDecision,
-    headless: bool,
-) -> ToolResultEnvelope | None:
-    """
-    AskUserQuestion：run_l1 / evaluate_permission 以 behavior=ask + metadata.gather_tool 表达「待 UI 收集答案」。
-    在 sync/async pipeline 中于默认 ask→blocked 之前短路，返回 ok envelope（payload 含 questions）。
-    """
-    md = auth.metadata or {}
-    if md.get("gather_tool") != tool.name:
-        return None
-    if headless:
-        return blocked_envelope(
-            tool.name,
-            "AskUserQuestion requires interactive mode.",
-            policy_id="ask_user_question_headless",
-        )
-    return ToolResultEnvelope(
-        status="ok",
-        tool_name=tool.name,
-        summary=auth.ask_prompt or auth.message or "Answer questions?",
-        payload={
-            "pending_user_questions": True,
-            "questions": md.get("questions"),
-        },
-        meta={
-            "gather_tool": tool.name,
-            "permission": "pending_user_questions",
-            "policy_id": auth.policy_id,
-        },
-    )
-
-
 def _emit_ask_user_question_analytics(
     *,
     tool: RuntimeTool,
@@ -173,9 +142,6 @@ def _emit_ask_user_question_analytics(
         return
     if envelope.status != "ok":
         return
-    meta_out = envelope.meta or {}
-    if meta_out.get("permission") == "pending_user_questions":
-        return
     collector = ctx.trace_collector
     session_id = ctx.trace_emit_session_id
     if collector is None or not isinstance(session_id, str) or not session_id.strip():
@@ -763,26 +729,6 @@ class ToolExecutorPipeline:
             )
             return _as_run_result(env, parsed_input=parsed_data, ctx=ctx)
         if auth.behavior == "ask":
-            gather = _try_envelope_pending_user_questions_gather(
-                tool=tool, auth=auth, headless=self._headless
-            )
-            if gather is not None:
-                self._attach_runtime_observability(
-                    gather,
-                    ctx=ctx,
-                    events=[
-                        {
-                            "event": "permission_checked",
-                            "behavior": "pending_user_questions",
-                            "policy_id": auth.policy_id,
-                        },
-                    ],
-                    decision_trace=(auth.metadata or {}).get("decision_trace"),
-                )
-                final_g = self._output_manager.truncate_if_needed(
-                    gather, tool, ctx.tool_call_id
-                )
-                return _as_run_result(final_g, parsed_input=parsed_data, ctx=ctx)
             logger.warning(
                 "tool permission requires ask tool=%s headless=%s policy_id=%s",
                 tool.name,
@@ -960,26 +906,6 @@ class ToolExecutorPipeline:
             )
             return _as_run_result(env, parsed_input=parsed_data, ctx=ctx)
         if auth.behavior == "ask":
-            gather = _try_envelope_pending_user_questions_gather(
-                tool=tool, auth=auth, headless=self._headless
-            )
-            if gather is not None:
-                self._attach_runtime_observability(
-                    gather,
-                    ctx=ctx,
-                    events=[
-                        {
-                            "event": "permission_checked",
-                            "behavior": "pending_user_questions",
-                            "policy_id": auth.policy_id,
-                        },
-                    ],
-                    decision_trace=(auth.metadata or {}).get("decision_trace"),
-                )
-                final_g = self._output_manager.truncate_if_needed(
-                    gather, tool, ctx.tool_call_id
-                )
-                return _as_run_result(final_g, parsed_input=parsed_data, ctx=ctx)
             logger.warning(
                 "tool permission requires ask tool=%s headless=%s policy_id=%s",
                 tool.name,
@@ -1125,6 +1051,12 @@ class ToolExecutorPipeline:
         ctx: ToolExecutionContext,
         auth: AuthorizationDecision,
     ) -> PromptRequest:
+        md = auth.metadata or {}
+        is_gather = md.get("gather_tool") == tool.name
+        questions = md.get("questions") if is_gather else None
+        if is_gather and questions is None:
+            raw_q = parsed_data.get("questions")
+            questions = raw_q if isinstance(raw_q, list) else None
         return PromptRequest(
             tool_name=tool.name,
             input_data=parsed_data,
@@ -1135,6 +1067,8 @@ class ToolExecutorPipeline:
             suggestions=self._suggestions_from_auth(auth),
             headless=False,
             session_headless=self._headless,
+            interaction_kind="gather" if is_gather else "permission",
+            questions=questions if isinstance(questions, list) else None,
         )
 
     def _maybe_suppress_l3_ask(
@@ -1319,21 +1253,51 @@ class ToolExecutorPipeline:
             )
 
         if resp.behavior == "deny":
+            reason = resp.decision_reason
+            is_cancel = (
+                reason is not None and reason.type == DecisionReasonType.USER_ABORT
+            )
+            is_gather = (auth.metadata or {}).get("gather_tool") == tool.name
+            if is_cancel:
+                msg = resp.message or resp.reason or INTERRUPT_MESSAGE_FOR_TOOL_USE
+                behavior_evt = "ask_cancelled_by_user"
+                extra_meta = {
+                    "l3_outcome": "cancel",
+                    "source_status": "interrupted",
+                    "error_kind": "aborted",
+                }
+            else:
+                if is_gather:
+                    msg = (
+                        resp.message
+                        or resp.reason
+                        or "User declined to answer questions."
+                    )
+                else:
+                    msg = (
+                        resp.message
+                        or resp.reason
+                        or auth.ask_prompt
+                        or "User rejected the operation."
+                    )
+                behavior_evt = "ask_rejected_by_resolver"
+                extra_meta = {"l3_outcome": "decline"}
             env = attach_permission_tool_input(
                 blocked_envelope(
                     tool.name,
-                    resp.message or resp.reason or auth.ask_prompt or "User rejected the operation.",
+                    msg,
                     policy_id=auth.policy_id,
                 ),
                 parsed_data,
             )
+            env.meta = {**(env.meta or {}), **extra_meta}
             attach_denial_tracking_meta(env, tool, ctx, auth)
             self._attach_runtime_observability(
                 env,
                 ctx=ctx,
                 events=[
                     self._permission_checked_event(
-                        "ask_rejected_by_resolver",
+                        behavior_evt,
                         auth.policy_id,
                         parsed_data,
                         decision_source=resp.decision_source.value,

langchain_agentx/tool_runtime/prompt/__init__.py

@@ -16,6 +16,7 @@ from .race import HitlRaceCoordinator, PromptBranch, PromptClassifier
 from .types import (
     DecisionReason,
     DecisionReasonType,
+    InteractionKind,
     PermissionUpdate,
     PromptDecisionSource,
     PromptRequest,
@@ -26,6 +27,7 @@ __all__ = [
     "PermissionPromptHandler",
     "DecisionReason",
     "DecisionReasonType",
+    "InteractionKind",
     "PermissionUpdate",
     "PromptDecisionSource",
     "PromptRequest",

langchain_agentx/tool_runtime/prompt/types.py

@@ -4,12 +4,15 @@ prompt/types.py — L3 HITL 数据契约
 职责：
     PromptRequest / PromptResponse 与 PermissionUpdate、PromptDecisionSource。
     L2 ask 决策打包为 PromptRequest，L3 产出二态 PromptResponse。
+    AskUser gather：interaction_kind=gather；updated_input 可含 answers[+annotations]。
 
 链路位置：
-    ToolExecutorPipeline ask 分支 → PermissionPromptHandler.handle（Phase 3 接线）。
+    ToolExecutorPipeline ask 分支 → PermissionPromptHandler.handle。
 
 当前裁剪：
-    PermissionUpdate 为 CC addRules/replaceRules 等的最小 Python 镜像；持久化由 Phase 3 接入。
+    PermissionUpdate 为 CC addRules/replaceRules 等的最小 Python 镜像。
+    A2：cancel=USER_ABORT / decline=USER_REJECT；reject_with_feedback=P1。
+    A3：图片 contentBlocks 旁路未建模。
 """
 
 from __future__ import annotations
@@ -28,6 +31,8 @@ from .messages import (
 )
 from ..messages import REJECT_MESSAGE, SUBAGENT_REJECT_MESSAGE
 
+InteractionKind = Literal["gather", "permission"]
+
 
 class PromptDecisionSource(StrEnum):
     """L3 决议来源，对齐 CC decisionReason.type。"""
@@ -108,11 +113,19 @@ class PromptRequest:
     display_label: str | None = None
     """UI 短摘要；来自 tool.summary_for_ui_call()。None 时 L3 fallback tool_name。"""
     suggestions: tuple[PermissionUpdate, ...] = field(default_factory=tuple)
+    interaction_kind: InteractionKind = "permission"
+    """permission=Allow/Deny；gather=AskUser Q→A（对 CC AskUserQuestionPermissionRequest）。"""
+    questions: list[Any] | None = None
+    """gather 时的问题列表（常来自 auth.metadata.questions）；permission 为 None。"""
 
 
 @dataclass(frozen=True)
 class PromptResponse:
-    """L3 → Pipeline 出参；behavior 仅 allow/deny。"""
+    """L3 → Pipeline 出参；behavior 仅 allow/deny。
+
+    allow 时 ``updated_input`` 可含 answers 与可选 annotations（A1）。
+    deny 时用 ``decision_reason.type`` 区分 cancel（USER_ABORT）与 decline（USER_REJECT）（A2 MVP）。
+    """
 
     behavior: Literal["allow", "deny"]
     decision_source: PromptDecisionSource

langchain_agentx/tools/ask_user_question/tool.py

@@ -2,13 +2,16 @@
 tools/ask_user_question/tool.py — AskUserQuestionTool
 
 职责：
-    CC AskUserQuestion 对齐：normalize → validate → permissions（含待答两跳）→ invoke → present。
+    CC AskUserQuestion 对齐：normalize → validate → L1 ask（无 answers）→
+    L3 注入 answers[+annotations] → invoke → present。
 
 链路位置：
-    ToolRuntimeLoader.register_default_tools；pipeline 对 gather_tool 短路返回 pending envelope。
+    ToolRuntimeLoader.register_default_tools；pipeline 对 gather ask 走
+    ``_handle_l3_ask``（不再 pending envelope 短路）。
 
 当前裁剪范围：
-    v3：preview HTML 校验（ctx.question_preview_format）、annotations、present 摘要；渠道禁用集合对齐 CC。
+    v3：preview HTML 校验、annotations、present 摘要；渠道禁用集合对齐 CC。
+    A3 图片 contentBlocks 旁路未做。
 """
 
 from __future__ import annotations
@@ -40,7 +43,7 @@ from .prompt import (
 )
 from .validators import QuestionValidator
 
-# AuthorizationDecision.metadata：pipeline 识别待答短路（值须等于 RuntimeTool.name）
+# AuthorizationDecision.metadata：L3 PromptRequest.interaction_kind=gather 识别键
 GATHER_TOOL_META_KEY = "gather_tool"
 
 # CC isEnabled：Telegram/Discord 等无 TUI 渠道

{langchain_agentx_python-2.2.6.dist-info → langchain_agentx_python-2.2.7.dist-info}/METADATA

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

{langchain_agentx_python-2.2.6.dist-info → langchain_agentx_python-2.2.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-langchain_agentx/__init__.py,sha256=w5E568-acwfUArEGRc1Fs10Ni10VOEs-jLn4UGZVjeE,1614
+langchain_agentx/__init__.py,sha256=u163iBLScsjUuLfV2YYL3tProAOl3aRQEK1lyYmWoJA,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
@@ -411,7 +411,7 @@ langchain_agentx/tool_runtime/loop_loader.py,sha256=C_4T9XxlDmKaTzGv4MO6mJuR-rd6
 langchain_agentx/tool_runtime/loop_runtime_context.py,sha256=HBZMdtKD7MpU8o7JmURFZGPTfxr2aFFlFF2nBZR_n8s,3613
 langchain_agentx/tool_runtime/messages.py,sha256=Fp-ZiLAbOQAQa8uIv-owE8PXtWyhpYSXxtzy3PVbKSw,3631
 langchain_agentx/tool_runtime/models.py,sha256=cO9EgLKPXiktHl_xXtBwLQrCo6mj4tbT4WoPmuFLE0w,20345
-langchain_agentx/tool_runtime/outer_permission_resolver.py,sha256=t6vq1f6K0EYZFAlEBV-Ic2hoGB3miVZWqvrZOQv-Z0A,4169
+langchain_agentx/tool_runtime/outer_permission_resolver.py,sha256=8uKS148DXxt5SfDIHmbRwee4FchKdlquUZbfWeyNRXw,4184
 langchain_agentx/tool_runtime/override.py,sha256=D8TRftoeWzqlTuWCGUxNkFY7XzWx_d5oxI_ltNibqPA,10258
 langchain_agentx/tool_runtime/path_safety.py,sha256=dUrl2SObKmRDwdm9k8veO_Eh0iXw0LPLAMZJGxeKnTE,8548
 langchain_agentx/tool_runtime/permission_context.py,sha256=ReVV2kjVWAPTsPaYXxRB-dICqualEvi2zzwF8NX_Wkk,6229
@@ -422,7 +422,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=b4ZlEMH5i3_rqWjPx3g7BD6Yv2hvk-R6qgKFgo-b3eU,54284
+langchain_agentx/tool_runtime/pipeline.py,sha256=cNC8FzeBtfNo8I02wXsaBbbpwxbVXu67eRnr_OfEU3Y,53104
 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
@@ -475,7 +475,7 @@ langchain_agentx/tool_runtime/execution/appliers/stubs.py,sha256=B4FaJX63uXpOcKR
 langchain_agentx/tool_runtime/progress/__init__.py,sha256=iMp-7s8G9_fELXJLPY1sWqpHYqpvtmUyNU3KinJgc5w,727
 langchain_agentx/tool_runtime/progress/event.py,sha256=tM-lvqhs6435pjVW4BjP9vb2Ryuuvwo6CmtybVD8juk,2711
 langchain_agentx/tool_runtime/progress/sampler.py,sha256=FqJWaYAIBj4xC40qHVkG1MrHHwirZ5rd-I5vnmgmGh8,5362
-langchain_agentx/tool_runtime/prompt/__init__.py,sha256=8tQkXdQTjJqgkbJTCCpN1Z_k_wrLNiUoWwluYU8Te4w,1123
+langchain_agentx/tool_runtime/prompt/__init__.py,sha256=bLtNsq8iDMvF9tkwLpBKTJ9Y6iWAfdvsqhOz_u5UvvM,1167
 langchain_agentx/tool_runtime/prompt/_abort.py,sha256=z9LFN6e067ptsfR571liagkHiQnauoksfMbpoRUIXfo,1568
 langchain_agentx/tool_runtime/prompt/cli_interactive.py,sha256=3_Uyzu5FeOOCNOC7SvrZr7qalGaCxMbqpiGTyCeZscw,5898
 langchain_agentx/tool_runtime/prompt/handler.py,sha256=t7TQkBiyPESf6uTBDikmu2iZVPmUmsqH7dO-NZypzdQ,570
@@ -484,7 +484,7 @@ langchain_agentx/tool_runtime/prompt/legacy_resolver_adapter.py,sha256=wFMSSaJrO
 langchain_agentx/tool_runtime/prompt/messages.py,sha256=IYkQPRSHTW87pZ6u31phWX45ooAG0cqn3OnZ4UyJPOU,1569
 langchain_agentx/tool_runtime/prompt/race.py,sha256=kNNHxP1CLI3ysVx8T0i8UM_ya190837bSngJYhEsTP4,11326
 langchain_agentx/tool_runtime/prompt/session_mode.py,sha256=kt_8BxPzoBQmeGbZBvl2ih6n_--4NDjTgK0D2kMryV4,2714
-langchain_agentx/tool_runtime/prompt/types.py,sha256=vfokexTdun0pjTlteA4CSb1fX94p0GDdkwCsXeTenlM,4618
+langchain_agentx/tool_runtime/prompt/types.py,sha256=mvPk6HSxKlngihpRnNut1VDbmKsAejHxCKvihzXIREA,5334
 langchain_agentx/tool_runtime/resolvers/__init__.py,sha256=3nr1ouLHAF1O17Zfg1yKrZ5qAezDwRdVSWKN0lu-Iik,818
 langchain_agentx/tool_runtime/resolvers/agent_session.py,sha256=ZcQga1itCTX2TgNoIaCfVzV20w7nQjSkgDYRU4AWHto,3855
 langchain_agentx/tool_runtime/resolvers/background.py,sha256=gSdkP2GiPVr7eV00LRKoeQVgU4eUjbpKgmbNIHAeyUI,869
@@ -524,7 +524,7 @@ langchain_agentx/tools/ask_user_question/constants.py,sha256=vK5QraZBBVj7woW1TF0
 langchain_agentx/tools/ask_user_question/html_preview.py,sha256=OwNpsH9qm8iJ-TTbzkMFvG49T4-oNJXJXH4OZ8r55wc,3913
 langchain_agentx/tools/ask_user_question/models.py,sha256=uLc2UK_v8iMFEL1Zk0mUOBYdcg2HfbaLdH68o8kr7GE,3376
 langchain_agentx/tools/ask_user_question/prompt.py,sha256=0RdVuUeNzQBzPeVrLcbiBqh1uizFgUANvaKOZpVy_qg,2803
-langchain_agentx/tools/ask_user_question/tool.py,sha256=KGIjeLD9J_3RR-C3fGpOsuqjULmuobohG0F2ie8i8UI,13405
+langchain_agentx/tools/ask_user_question/tool.py,sha256=DgU7OBAqrJBb77ewQ76okoUFJxTThAiN6PRMPa8_FvU,13467
 langchain_agentx/tools/ask_user_question/validators.py,sha256=gUYuuKJNrExWGvhFlmhqqSU8ax7s4EhXMvTEjapHeiY,5974
 langchain_agentx/tools/bash/__init__.py,sha256=molPHFDylE2wWG_aQx7fb0ciAx3wWpdXzIixTZV5ne4,214
 langchain_agentx/tools/bash/ast_security.py,sha256=6DFd_TwT986dbGkKT3UnDIZioBdmi8mbJcYSI-XEtdM,22444
@@ -761,8 +761,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.2.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-langchain_agentx_python-2.2.6.dist-info/METADATA,sha256=aFUHiJcRrYfmX1zz5EcopI4JNyrKygDP2OeT6HlaEPg,24250
-langchain_agentx_python-2.2.6.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
-langchain_agentx_python-2.2.6.dist-info/top_level.txt,sha256=Ge284pniNt8xea0OLk2o9o32GqVpDhOYk20fwE-0xxA,17
-langchain_agentx_python-2.2.6.dist-info/RECORD,,
+langchain_agentx_python-2.2.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+langchain_agentx_python-2.2.7.dist-info/METADATA,sha256=hqm9pkU7FcAv244Gd1gPQyI1-A81Xf3uWQmi9YZq-Wg,24250
+langchain_agentx_python-2.2.7.dist-info/WHEEL,sha256=51RkbunBAw4BWsgaQWTpPhg4Diwp3c9P5iaLk67Hdtg,92
+langchain_agentx_python-2.2.7.dist-info/top_level.txt,sha256=Ge284pniNt8xea0OLk2o9o32GqVpDhOYk20fwE-0xxA,17
+langchain_agentx_python-2.2.7.dist-info/RECORD,,