langchain-agentx-cli 0.1.4__tar.gz → 0.2.0__tar.gz

{langchain_agentx_cli-0.1.4 → langchain_agentx_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-agentx-cli
-Version: 0.1.4
+Version: 0.2.0
 Summary: Terminal CLI/TUI for AgentX: migrate Claude Code Ink UI, backed by langchain-agentx-python SDK.
 Author: GoodMood2008
 License: Apache-2.0

{langchain_agentx_cli-0.1.4 → langchain_agentx_cli-0.2.0}/langchain_agentx_cli/__init__.py

@@ -1,3 +1,3 @@
 """langchain_agentx_cli：依托 langchain_agentx_python SDK 的终端 CLI/TUI（CC Ink 迁移）。"""
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"

{langchain_agentx_cli-0.1.4 → langchain_agentx_cli-0.2.0}/langchain_agentx_cli/app.py

@@ -123,7 +123,9 @@ class ReplApp(App[None]):
         self._exit_armed = False
 
     def action_cancel_stream(self) -> None:
-        if try_copy_message_selection(self) is not None:
+        result = try_copy_message_selection(self)
+        if result is not None:
+            # 有选区被复制（无论成功与否），不执行后续操作
             return
         # Dismiss inline permission widget if active
         try:

{langchain_agentx_cli-0.1.4 → langchain_agentx_cli-0.2.0}/langchain_agentx_cli/bridge/session_bridge.py

@@ -8,7 +8,7 @@ bridge/session_bridge.py — SessionBridge（SDK 事件 → Textual Message）
 链路位置：
     ReplApp → SessionBridge → AgentSession.stream_loop_events
     → LangGraphToLangchainAgentEventAdapter.adapt()；
-    权限：AgentSessionPermissionResolver ← PermissionQueueConsumer。
+    权限：AgentSessionPermissionResolver ← PermissionQueueConsumer ← ConfirmQueue。
 
 当前裁剪范围：
     不解析 LangGraph 原始事件名；Resolver 超时 300s（见 tui/permissions/config.py）。
@@ -31,6 +31,7 @@ from langchain_agentx_cli.tui.permissions import (
 )
 from langchain_agentx_cli.tui.permissions.config import DEFAULT_PERMISSION_TIMEOUT_SECONDS
 from langchain_agentx_cli.tui.permissions.dialog import DialogPermissionDecisionPort
+from langchain_agentx_cli.tui.permissions.queue import ConfirmQueue
 
 from langchain_agentx import (
     LangGraphToLangchainAgentEventAdapter,
@@ -41,6 +42,7 @@ from langchain_agentx import (
 from langchain_agentx_cli.widgets.messages import (
     AssistantMessageChunk,
     ContextCompactedMessage,
+    ContextCompactingMessage,
     ErrorMessageOccurred,
     ThinkingContentDelta,
     ThinkingEnded,
@@ -78,8 +80,10 @@ class SessionBridge:
         self._adapter = LangGraphToLangchainAgentEventAdapter(config=dict(MVP_ADAPTER_CONFIG))
         self._current_worker: Any = None
         self._streamed_text = False
+        # 对齐 CC: 集中式权限队列状态管理
         self._permission_queue: asyncio.Queue[PermissionRequest] = asyncio.Queue()
         self._permission_cache = SessionPermissionCache()
+        self._confirm_queue = ConfirmQueue(max_size=10)  # 对齐 CC confirmQueue
         self._permission_resolver = AgentSessionPermissionResolver(
             request_queue=self._permission_queue,
             timeout=DEFAULT_PERMISSION_TIMEOUT_SECONDS,
@@ -88,6 +92,7 @@ class SessionBridge:
         self._permission_consumer = PermissionQueueConsumer(
             queue=self._permission_queue,
             cache=self._permission_cache,
+            confirm_queue=self._confirm_queue,  # 传入 confirm_queue
             app=app,
             decision_port=DialogPermissionDecisionPort(app),
         )
@@ -186,12 +191,9 @@ class SessionBridge:
                 self._emit_finish_answer(str(data.get("answer", "")))
                 self._post_ui(TurnInProgress(in_progress=False))
             case LangchainAgentEventType.COMPACT_END:
-                self._post_ui(
-                    ContextCompactedMessage(
-                        summary=str(data.get("summary", "")),
-                        tokens_freed=int(data.get("tokens_freed", 0)),
-                    )
-                )
+                self._post_ui(ContextCompactedMessage())
+            case LangchainAgentEventType.COMPACT_START:
+                self._post_ui(ContextCompactingMessage())
             case _:
                 pass
 
@@ -226,6 +228,11 @@ class SessionBridge:
     def permission_cache(self) -> SessionPermissionCache:
         return self._permission_cache
 
+    @property
+    def confirm_queue(self) -> ConfirmQueue:
+        """对齐 CC: confirmQueue 状态访问。"""
+        return self._confirm_queue
+
     @property
     def permission_resolver(self) -> AgentSessionPermissionResolver:
         return self._permission_resolver

{langchain_agentx_cli-0.1.4 → langchain_agentx_cli-0.2.0}/langchain_agentx_cli/cli.py

@@ -17,8 +17,8 @@ from pathlib import Path
 
 import click
 
-# 过滤 LangGraph 的 PendingDeprecationWarning（避免污染启动画面）
-warnings.filterwarnings("ignore", category=DeprecationWarning, module="langgraph")
+# 过滤 LangGraph 的 allowed_objects 警告（避免污染启动画面）
+warnings.filterwarnings("ignore", message=".*allowed_objects.*")
 
 from langchain_agentx_cli.app import ReplApp
 from langchain_agentx_cli.bootstrap import CliEnvironmentError, EnvironmentChecker

{langchain_agentx_cli-0.1.4 → langchain_agentx_cli-0.2.0}/langchain_agentx_cli/screens/repl.py

@@ -29,6 +29,7 @@ from langchain_agentx_cli.widgets.message_list import MessageListWidget
 from langchain_agentx_cli.widgets.messages import (
     AssistantMessageChunk,
     ContextCompactedMessage,
+    ContextCompactingMessage,
     ErrorMessageOccurred,
     InfoMessage,
     PermissionPendingHidden,
@@ -130,13 +131,17 @@ class ReplScreen(Screen):
         self._message_list().append_info(content)
 
     def _copy_message_selection_if_any(self) -> bool:
-        copied = try_copy_message_selection(self.app)
-        if copied is None:
+        result = try_copy_message_selection(self.app)
+        if result is None:
             return False
+        copied, failure_reason = result
+        # 根据是否失败选择不同的 severity 和 timeout
+        severity = "warning" if failure_reason else "information"
+        timeout = 5 if failure_reason else 2
         self.notify(
-            format_copied_toast(len(copied)),
-            severity="information",
-            timeout=2,
+            format_copied_toast(len(copied), failure_reason),
+            severity=severity,
+            timeout=timeout,
         )
         return True
 
@@ -236,12 +241,13 @@ class ReplScreen(Screen):
     def on_spinner_completion(self, event: SpinnerCompletion) -> None:
         self._message_list().append_spinner_status(event.content)
 
+    @on(ContextCompactingMessage)
+    def on_context_compacting(self, _event: ContextCompactingMessage) -> None:
+        self._message_list().spinner_enter_compacting()
+
     @on(ContextCompactedMessage)
-    def on_context_compacted(self, event: ContextCompactedMessage) -> None:
-        self._message_list().append_context_compacted(
-            summary=event.summary,
-            tokens_freed=event.tokens_freed,
-        )
+    def on_context_compacted(self, _event: ContextCompactedMessage) -> None:
+        self._message_list().append_context_compacted()
 
     @on(ThinkingStarted)
     def on_thinking_started(self, _event: ThinkingStarted) -> None:
@@ -265,10 +271,16 @@ class ReplScreen(Screen):
 
     @on(PermissionPendingHidden)
     def on_permission_pending_hidden(self, _event: PermissionPendingHidden) -> None:
+        """权限确认隐藏后的清理。
+
+        修复：不立即抢回焦点，让用户自然操作或由下一个UI元素控制焦点。
+        如果输入区当前无焦点且无其他元素有焦点，再考虑恢复输入区焦点。
+        """
         self._message_list().hide_permission_pending()
         input_area = self.query_one("#input-area", InputAreaWidget)
         input_area.set_permission_pending(False)
-        input_area.focus()
+        # 不立即抢回焦点，避免打断用户交互流
+        # 焦点会在自然状态下返回到输入区（用户按键时）
 
     # D10: Compact 进度条事件处理
 

{langchain_agentx_cli-0.1.4 → langchain_agentx_cli-0.2.0}/langchain_agentx_cli/theme/themes.py

@@ -39,6 +39,10 @@ def _build_rgb_theme(
     palette: dict[str, str],
     dark: bool,
 ) -> Theme:
+    variables = {
+        "screen-selection-background": "#264F78" if dark else "#B4D5FF",
+        "screen-selection-foreground": rgb_to_hex(palette["text"]),
+    }
     return Theme(
         name=name,
         primary=rgb_to_hex(palette["claude"]),
@@ -52,6 +56,7 @@ def _build_rgb_theme(
         surface=rgb_to_hex(palette["userMessageBackground"]),
         panel=rgb_to_hex(palette["panel"]),
         dark=dark,
+        variables=variables,
     )
 
 

{langchain_agentx_cli-0.1.4 → langchain_agentx_cli-0.2.0}/langchain_agentx_cli/tui/clipboard.py

@@ -51,10 +51,11 @@ def _wrap_for_multiplexer(sequence: str) -> str:
 
 
 def _write_osc52_to_tty(sequence: str) -> bool:
-    """直接写入 TTY fd，绕过 Textual 的 stdout 接管。
+    """直接写入终端 fd，对齐 CC 写 stdout 的行为。
 
-    Textual 在 alternate screen 模式下接管了 stdout，OSC 52 序列会被吞掉。
-    /dev/tty 始终指向控制终端，不经过 stdout 重定向。
+    CC (Ink) 通过 process.stdout.write(raw) 发送 OSC 52。
+    Textual 接管了 sys.stdout 但底层 fd 1 仍连接终端。
+    直接用 os.write(1, ...) 绕过 Python IO 层。
 
     Args:
         sequence: OSC 52 序列（已包装 tmux/screen）
@@ -62,23 +63,31 @@ def _write_osc52_to_tty(sequence: str) -> bool:
     Returns:
         是否成功写入
     """
-    # 优先尝试打开 /dev/tty（始终指向控制终端）
+    encoded = sequence.encode("utf-8")
+
+    # 对齐 CC：写 stdout fd（网页终端通常只监听 stdout）
+    try:
+        os.write(1, encoded)
+        return True
+    except OSError:
+        pass
+
+    # 回退：/dev/tty
     try:
         fd = os.open("/dev/tty", os.O_WRONLY)
         try:
-            os.write(fd, sequence.encode("utf-8"))
+            os.write(fd, encoded)
             return True
         finally:
             os.close(fd)
     except OSError:
         pass
 
-    # 回退：尝试 stderr（Textual 通常不接管 stderr）
+    # 最后回退：stderr
     try:
-        sys.stderr.write(sequence)
-        sys.stderr.flush()
+        os.write(2, encoded)
         return True
-    except Exception:
+    except OSError:
         return False
 
 
@@ -172,7 +181,7 @@ def _copy_native(text: str) -> bool:
     return False
 
 
-def copy_text(text: str) -> bool:
+def copy_text(text: str) -> tuple[bool, str | None]:
     """
     复制文本到剪贴板（对齐 CC setClipboard）。
 
@@ -184,10 +193,10 @@ def copy_text(text: str) -> bool:
         text: 要复制的文本
 
     Returns:
-        是否成功执行了复制操作（注意：OSC 52 无法验证是否成功）
+        (是否成功, 失败原因描述) - 成功时第二个值为 None
     """
     if not text:
-        return False
+        return False, "无文本内容"
 
     # 1. 优先尝试 native copy（fire-and-forget）
     native_ok = _copy_native(text)
@@ -199,4 +208,29 @@ def copy_text(text: str) -> bool:
 
     # 直接写入 TTY，绕过 Textual 的 stdout 接管
     osc52_ok = _write_osc52_to_tty(wrapped_seq)
-    return osc52_ok or native_ok
+
+    if osc52_ok or native_ok:
+        return True, None
+
+    # 诊断失败原因
+    reasons = []
+    if platform.system().lower() == "linux":
+        if os.environ.get("SSH_CONNECTION"):
+            reasons.append("SSH 环境无法使用 xclip/xsel")
+        elif not (os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY")):
+            reasons.append("无 DISPLAY/WAYLAND_DISPLAY 环境变量")
+        else:
+            cmd = _detect_linux_copy_command()
+            if cmd:
+                reasons.append(f"{cmd} 存在但调用失败")
+            else:
+                reasons.append("未安装 xclip/wl-copy/xsel（sudo yum install xclip）")
+
+    if os.environ.get("TMUX"):
+        reasons.append("tmux 环境可能不支持 OSC 52")
+    elif os.environ.get("STY"):
+        reasons.append("screen 环境可能不支持 OSC 52")
+    else:
+        reasons.append("终端可能不支持 OSC 52")
+
+    return False, "，".join(reasons)

{langchain_agentx_cli-0.1.4 → langchain_agentx_cli-0.2.0}/langchain_agentx_cli/tui/message_selection.py

@@ -46,8 +46,8 @@ def message_list_has_selection(screen: Screen) -> bool:
     return any(selection_in_message_list(w) for w in selections if w.is_attached)
 
 
-def try_copy_message_selection(app: App) -> str | None:
-    """若消息区有选区则复制到剪贴板，返回已复制文本。"""
+def try_copy_message_selection(app: App) -> tuple[str, str | None] | None:
+    """若消息区有选区则复制到剪贴板，返回 (已复制文本, 失败原因)。"""
     try:
         screen = app.screen
     except ScreenStackError:
@@ -58,11 +58,12 @@ def try_copy_message_selection(app: App) -> str | None:
     if not selected or not selected.strip():
         return None
 
-    # 使用 CC 策略：native copy + OSC 52（直接写入 stdout）
-    copy_text(selected)
+    # 对齐 CC：OSC 52 写 stdout + native copy 双重保险
+    ok, reason = copy_text(selected)
+    return (selected, reason)
 
-    return selected
 
-
-def format_copied_toast(char_count: int) -> str:
+def format_copied_toast(char_count: int, failure_reason: str | None = None) -> str:
+    if failure_reason:
+        return f"复制失败：{failure_reason}（{char_count} 个字符）"
     return f"已复制 {char_count} 个字符到剪贴板"

{langchain_agentx_cli-0.1.4 → langchain_agentx_cli-0.2.0}/langchain_agentx_cli/tui/permissions/__init__.py

@@ -3,6 +3,7 @@ tui/permissions — 权限确认子系统（Queue + Future）。
 
 职责：
     消费 SDK AgentSessionPermissionResolver 队列，会话缓存，驱动用户确认（内联 Widget）。
+    集成 ConfirmQueue 状态管理（对齐 CC）。
 
 链路位置：
     SessionBridge 创建 Queue/Resolver → PermissionQueueConsumer → SDK Future。
@@ -24,15 +25,18 @@ from langchain_agentx_cli.tui.permissions.presenters import (
     PermissionPresentation,
     permission_presenter_for_tool,
 )
+from langchain_agentx_cli.tui.permissions.queue import ConfirmQueue, QueuedPermission
 
 __all__ = [
     "DEFAULT_PERMISSION_TIMEOUT_SECONDS",
+    "ConfirmQueue",
     "DialogPermissionDecisionPort",
     "NoDialogPermissionDecisionPort",
     "PermissionDecision",
     "PermissionDecisionPort",
     "PermissionPresentation",
     "PermissionQueueConsumer",
+    "QueuedPermission",
     "SessionPermissionCache",
     "inject_permission_resolver",
     "permission_presenter_for_tool",

langchain_agentx_cli-0.2.0/langchain_agentx_cli/tui/permissions/component_manager.py

@@ -0,0 +1,148 @@
+"""
+tui/permissions/component_manager.py — 权限组件生命周期管理（对齐 CC）。
+
+职责：
+    管理权限 Widget 的挂载、卸载和焦点转移。
+    确保组件完全准备好后再显示，对齐 CC 的 Portal 和 autoFocus 行为。
+
+链路位置：
+    ConfirmQueue → PermissionComponentManager → MessageListWidget。
+
+对齐 CC:
+    - useEffect 自动处理焦点
+    - Portal 组件的挂载时机
+    - 组件卸载时的清理
+"""
+
+from __future__ import annotations
+
+import asyncio
+import logging
+from typing import TYPE_CHECKING, Callable
+
+from textual.timer import Timer
+
+if TYPE_CHECKING:
+    from langchain_agentx_cli.tui.permissions.queue import ConfirmQueue, QueuedPermission
+    from langchain_agentx_cli.widgets.message_list import MessageListWidget
+    from langchain_agentx_cli.widgets.permission_inline import InlinePermissionWidget
+
+logger = logging.getLogger(__name__)
+
+
+class PermissionComponentManager:
+    """权限组件生命周期管理器（对齐 CC 组件管理）。
+
+    CC 对照:
+        useEffect(() => {
+            if (confirm && ref.current) {
+                ref.current.focus();
+            }
+        }, [confirm]);
+
+    提供类似功能:
+        - mount_widget() - 挂载并聚焦
+        - unmount_widget() - 卸载并清理
+        - ensure_focused() - 确保获得焦点
+    """
+
+    def __init__(self, queue: ConfirmQueue, message_list: MessageListWidget) -> None:
+        self._queue = queue
+        self._message_list = message_list
+        self._focus_retry_timer: Timer | None = None
+        self._max_focus_retries = 5
+
+    async def mount_and_focus(
+        self,
+        queued: QueuedPermission,
+        widget: InlinePermissionWidget,
+    ) -> bool:
+        """挂载 Widget 并确保获得焦点（对齐 CC autoFocus）。
+
+        返回是否成功挂载并获得焦点。
+        """
+        # 先挂载 widget
+        self._message_list.mount(widget)
+        queued.widget = widget
+        self._queue.set_active(queued.queue_id, widget)
+
+        # 滚动到底部
+        self._message_list._scroll_to_end(force=True)
+
+        # 尝试获取焦点
+        return await self._ensure_widget_focused(widget, retry=True)
+
+    async def _ensure_widget_focused(
+        self,
+        widget: InlinePermissionWidget,
+        retry: bool = False,
+    ) -> bool:
+        """确保 Widget 获得焦点（支持重试）。"""
+        retries = 0
+        max_retries = self._max_focus_retries if retry else 1
+
+        while retries < max_retries:
+            # 检查 widget 是否仍然 attached
+            if not widget.is_attached:
+                logger.warning("Widget detached, cannot focus")
+                return False
+
+            # 尝试获取焦点
+            widget.focus()
+
+            # 等待一帧让焦点状态更新
+            await asyncio.sleep(0.01)
+
+            # 验证是否成功获得焦点
+            if widget.has_focus:
+                logger.debug(f"Widget {widget.id} gained focus (attempt {retries + 1})")
+                return True
+
+            retries += 1
+            if retries < max_retries:
+                await asyncio.sleep(0.05)  # 短暂延迟后重试
+
+        logger.warning(f"Widget {widget.id} failed to gain focus after {max_retries} attempts")
+        return False
+
+    def unmount(self, queue_id: str) -> None:
+        """卸载 Widget 并清理。"""
+        queued = self._queue._queue.get(queue_id)
+        if queued is None:
+            return
+
+        if queued.widget is not None:
+            if queued.widget.is_attached:
+                # 先 dismiss future
+                queued.widget.dismiss_externally()
+                # 再移除 widget
+                queued.widget.remove()
+            queued.widget = None
+
+        self._queue.remove(queue_id)
+
+    def unmount_all(self) -> None:
+        """卸载所有 Widget。"""
+        for queue_id in list(self._queue._queue.keys()):
+            self.unmount(queue_id)
+
+    def get_focused_widget(self) -> InlinePermissionWidget | None:
+        """获取当前有焦点的权限 Widget。"""
+        active = self._queue.get_active()
+        if active and active.widget and active.widget.has_focus:
+            return active.widget
+        return None
+
+    def cleanup(self) -> None:
+        """清理所有资源。"""
+        self.unmount_all()
+        if self._focus_retry_timer:
+            self._focus_retry_timer.stop()
+
+
+def create_component_manager(
+    queue: ConfirmQueue,
+    message_list: MessageListWidget,
+) -> PermissionComponentManager:
+    """创建组件管理器（工厂函数）。"""
+    return PermissionComponentManager(queue, message_list)

{langchain_agentx_cli-0.1.4 → langchain_agentx_cli-0.2.0}/langchain_agentx_cli/tui/permissions/consumer.py

@@ -3,6 +3,7 @@ tui/permissions/consumer.py — SDK 权限队列消费者。
 
 职责：
     后台消费 PermissionRequest 队列，查缓存、委托决策端口、resolve Future。
+    集成 ConfirmQueue 状态管理（对齐 CC）。
 
 链路位置：
     ReplApp.on_mount 启动 → PermissionQueueConsumer → SDK AgentSessionPermissionResolver。
@@ -22,6 +23,7 @@ from langchain_agentx.tool_runtime.resolvers import PermissionRequest
 from langchain_agentx_cli.tui.permissions.cache import SessionPermissionCache
 from langchain_agentx_cli.tui.permissions.models import PermissionDecision
 from langchain_agentx_cli.tui.permissions.presenters import permission_presenter_for_tool
+from langchain_agentx_cli.tui.permissions.queue import ConfirmQueue
 
 if TYPE_CHECKING:
     from langchain_agentx_cli.app import ReplApp
@@ -54,7 +56,10 @@ class NoDialogPermissionDecisionPort:
 
 
 class PermissionQueueConsumer:
-    """消费 SDK 权限队列，resolve PermissionRequest.future。"""
+    """消费 SDK 权限队列，resolve PermissionRequest.future。
+
+    对齐 CC: 集成 ConfirmQueue 状态管理。
+    """
 
     def __init__(
         self,
@@ -63,11 +68,13 @@ class PermissionQueueConsumer:
         app: ReplApp,
         *,
         decision_port: PermissionDecisionPort | None = None,
+        confirm_queue: ConfirmQueue | None = None,
     ) -> None:
         self._queue = queue
         self._cache = cache
         self._app = app
         self._decision_port = decision_port or NoDialogPermissionDecisionPort()
+        self._confirm_queue = confirm_queue  # 对齐 CC confirmQueue
         self._worker: Any = None
 
     def start(self) -> None:
@@ -116,12 +123,29 @@ class PermissionQueueConsumer:
         return self._cache.check(request.tool_name)
 
     async def _handle_request(self, request: PermissionRequest) -> None:
+        """处理权限请求（对齐 CC confirmQueue 流程）。"""
+        queued = None
         try:
+            # 检查缓存
             if self._is_cached(request):
                 self._resolve_future(request, True)
                 return
 
-            decision = await self._decision_port.resolve(request, self._cache)
+            # 添加到 confirm_queue（对齐 CC addConfirm）
+            if self._confirm_queue is not None:
+                queued = await self._confirm_queue.add(request)
+                logger.debug(
+                    f"Added to confirm_queue: {request.tool_name} (id={queued.queue_id})"
+                )
+
+            # 委托给决策端口
+            decision = await self._decision_port.resolve(
+                request,
+                self._cache,
+                queued,  # 传递 queued 信息
+            )
+
+            # 处理决策
             if decision is PermissionDecision.ALLOW_SESSION:
                 presenter = permission_presenter_for_tool(
                     request.tool_name,
@@ -129,11 +153,11 @@ class PermissionQueueConsumer:
                 )
                 self._cache.add(request.tool_name, presenter.extract_pattern())
                 self._resolve_future(request, True)
-                return
-            if decision is PermissionDecision.ALLOW_ONCE:
+            elif decision is PermissionDecision.ALLOW_ONCE:
                 self._resolve_future(request, True)
-                return
-            self._resolve_future(request, False)
+            else:
+                self._resolve_future(request, False)
+
         except asyncio.CancelledError:
             self._resolve_future(request, False)
             raise
@@ -143,6 +167,10 @@ class PermissionQueueConsumer:
                 request.tool_name,
             )
             self._resolve_future(request, False)
+        finally:
+            # 从 confirm_queue 移除（对齐 CC removeConfirm）
+            if self._confirm_queue is not None and queued is not None:
+                self._confirm_queue.remove(queued.queue_id)
 
     @staticmethod
     def _resolve_future(request: PermissionRequest, allowed: bool) -> None:

{langchain_agentx_cli-0.1.4 → langchain_agentx_cli-0.2.0}/langchain_agentx_cli/tui/permissions/dialog.py

@@ -3,6 +3,7 @@ tui/permissions/dialog.py — 内联权限确认决策端口。
 
 职责：
     在消息流中 mount InlinePermissionWidget，收集用户决策。
+    集成 ConfirmQueue 状态管理（对齐 CC）。
 
 链路位置：
     DialogPermissionDecisionPort → InlinePermissionWidget → Consumer resolve Future。
@@ -20,6 +21,7 @@ from langchain_agentx_cli.tui.permissions.cache import SessionPermissionCache
 from langchain_agentx_cli.tui.permissions.models import PermissionDecision
 from langchain_agentx_cli.tui.permissions.presenters import permission_presenter_for_tool
 from langchain_agentx_cli.tui.permissions.presenters.base import PermissionPresentation
+from langchain_agentx_cli.tui.permissions.queue import QueuedPermission
 from langchain_agentx_cli.widgets.messages import PermissionPendingHidden, PermissionPendingShown
 
 if TYPE_CHECKING:
@@ -46,6 +48,7 @@ class DialogPermissionDecisionPort:
         self,
         request: PermissionRequest,
         cache: SessionPermissionCache,
+        queued: QueuedPermission | None = None,  # 新增：对齐 CC confirmQueue
     ) -> PermissionDecision:
         del cache
         presentation = permission_presenter_for_tool(
@@ -53,9 +56,9 @@ class DialogPermissionDecisionPort:
             request.ask_prompt,
         ).present()
 
-        self._post_pending(request, presentation)
+        self._post_pending(request, presentation, queued)
         try:
-            return await self._resolve_inline(request, presentation)
+            return await self._resolve_inline(request, presentation, queued)
         except asyncio.CancelledError:
             return PermissionDecision.DENY
         except Exception:
@@ -68,6 +71,7 @@ class DialogPermissionDecisionPort:
         self,
         request: PermissionRequest,
         presentation: PermissionPresentation,
+        queued: QueuedPermission | None = None,
     ) -> PermissionDecision:
         """Mount inline widget，与 SDK Future 竞态。"""
         from langchain_agentx_cli.widgets.permission_inline import InlinePermissionWidget
@@ -120,6 +124,7 @@ class DialogPermissionDecisionPort:
         self,
         request: PermissionRequest,
         presentation: PermissionPresentation,
+        queued: QueuedPermission | None = None,
     ) -> None:
         pass  # Pending shown is posted with widget in _resolve_inline