langchain-agentx-cli 0.3.0__tar.gz → 0.3.2__tar.gz

{langchain_agentx_cli-0.3.0 → langchain_agentx_cli-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-agentx-cli
-Version: 0.3.0
+Version: 0.3.2
 Summary: Terminal CLI/TUI for AgentX: migrate Claude Code Ink UI, backed by langchain-agentx-python SDK.
 Author: GoodMood2008
 License: Apache-2.0
@@ -22,7 +22,7 @@ Classifier: Topic :: Software Development
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: langchain-agentx-python<0.6.0,>=0.4.3
+Requires-Dist: langchain-agentx-python<0.6.0,>=0.4.5
 Requires-Dist: click>=8.1
 Requires-Dist: textual>=0.79.0
 Provides-Extra: dev

{langchain_agentx_cli-0.3.0 → langchain_agentx_cli-0.3.2}/langchain_agentx_cli/__init__.py

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

{langchain_agentx_cli-0.3.0 → langchain_agentx_cli-0.3.2}/langchain_agentx_cli/app.py

@@ -10,6 +10,7 @@ app.py — Textual ReplApp 容器。
 
 from __future__ import annotations
 
+import asyncio
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -36,6 +37,10 @@ from langchain_agentx_cli.widgets.messages import UserMessage
 
 if TYPE_CHECKING:
     from langchain_agentx import AgentSession
+    from langchain_agentx.tool_runtime.resolvers import (
+        AgentSessionPermissionResolver,
+        PermissionRequest,
+    )
 
 _CANCEL_HINT = "已取消当前生成。再次按 Ctrl+C 退出。"
 _EXIT_HINT = "再次按 Ctrl+C 退出。"
@@ -64,11 +69,15 @@ class ReplApp(App[None]):
         self,
         launch_config: ReplLaunchConfig,
         session: AgentSession | None = None,
+        permission_queue: asyncio.Queue[PermissionRequest] | None = None,
+        permission_resolver: AgentSessionPermissionResolver | None = None,
         debug: bool = False,
     ) -> None:
         super().__init__()
         self._launch_config = launch_config
         self._session = session
+        self._permission_queue = permission_queue
+        self._permission_resolver = permission_resolver
         self._bridge: SessionBridge | None = None
         self._exit_armed = False
         self.command_registry = CommandRegistry()
@@ -109,7 +118,15 @@ class ReplApp(App[None]):
         self.theme_manager = ThemeManager(self)
         self.theme_manager.setup(initial=initial_setting)
         if self._session is not None:
-            self._bridge = SessionBridge(self, self._session)
+            # 方案 A: 传入预先创建的 permission_queue 和 permission_resolver
+            if self._permission_queue is None or self._permission_resolver is None:
+                raise RuntimeError("permission_queue 和 permission_resolver 必须由 open_agent_session 提供")
+            self._bridge = SessionBridge(
+                self,
+                self._session,
+                permission_queue=self._permission_queue,
+                permission_resolver=self._permission_resolver,
+            )
             register_sdk_commands(self.command_registry, self._session)
             self._bridge.permission_consumer.start()
         self.push_screen(ReplScreen())

{langchain_agentx_cli-0.3.0 → langchain_agentx_cli-0.3.2}/langchain_agentx_cli/bridge/session_bridge.py

@@ -29,7 +29,6 @@ from langchain_agentx_cli.observation import debug, info
 from langchain_agentx_cli.tui.permissions import (
     PermissionQueueConsumer,
     SessionPermissionCache,
-    inject_permission_resolver,
 )
 from langchain_agentx_cli.tui.permissions.config import DEFAULT_PERMISSION_TIMEOUT_SECONDS
 from langchain_agentx_cli.tui.permissions.dialog import DialogPermissionDecisionPort
@@ -89,22 +88,26 @@ class _TurnSegmentState:
 class SessionBridge:
     """TUI 与 SDK 之间的桥接层（消费 LangchainAgentEvent）。"""
 
-    def __init__(self, app: ReplApp, session: AgentSession) -> None:
+    def __init__(
+        self,
+        app: ReplApp,
+        session: AgentSession,
+        *,
+        permission_queue: asyncio.Queue[PermissionRequest],
+        permission_resolver: AgentSessionPermissionResolver,
+    ) -> None:
         self._app = app
         self._screen_messenger = app.screen_messenger
         self._session = session
         self._adapter = LangGraphToLangchainAgentEventAdapter(config=dict(MVP_ADAPTER_CONFIG))
         self._current_worker: Any = None
         self._seg = _TurnSegmentState()
-        # 对齐 CC: 集中式权限队列状态管理
-        self._permission_queue: asyncio.Queue[PermissionRequest] = asyncio.Queue()
+        # 方案 A: 接收预先创建的 queue 和 resolver（由 open_agent_session 传入）
+        self._permission_queue = permission_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,
-        )
-        inject_permission_resolver(session, self._permission_resolver)
+        self._permission_resolver = permission_resolver
+        # 不再需要 inject_permission_resolver，SDK 在编译时已使用传入的 resolver
         self._permission_consumer = PermissionQueueConsumer(
             queue=self._permission_queue,
             cache=self._permission_cache,

{langchain_agentx_cli-0.3.0 → langchain_agentx_cli-0.3.2}/langchain_agentx_cli/cli.py

@@ -76,7 +76,7 @@ class CliEntry:
             return 0
 
         try:
-            session = asyncio.run(
+            session, permission_queue, permission_resolver = asyncio.run(
                 open_agent_session(
                     launch_config,
                     cli_provider=provider,
@@ -89,7 +89,13 @@ class CliEntry:
             return 2
 
         try:
-            return self._run_tui(launch_config, session, debug=debug)
+            return self._run_tui(
+                launch_config,
+                session,
+                permission_queue=permission_queue,
+                permission_resolver=permission_resolver,
+                debug=debug,
+            )
         finally:
             asyncio.run(close_agent_session(session))
 
@@ -140,9 +146,20 @@ class CliEntry:
         return mode_map.get(mode.lower(), ".langchain_agentx")
 
     def _run_tui(
-        self, launch_config: ReplLaunchConfig, session, debug: bool = False  # noqa: ANN001
+        self,
+        launch_config: ReplLaunchConfig,
+        session,  # noqa: ANN001
+        permission_queue,  # noqa: ANN001
+        permission_resolver,  # noqa: ANN001
+        debug: bool = False,
     ) -> int:
-        app = ReplApp(launch_config=launch_config, session=session, debug=debug)
+        app = ReplApp(
+            launch_config=launch_config,
+            session=session,
+            permission_queue=permission_queue,
+            permission_resolver=permission_resolver,
+            debug=debug,
+        )
         app.run()
         return 0
 

langchain_agentx_cli-0.3.2/langchain_agentx_cli/commands/builtin/compact.py

@@ -0,0 +1,74 @@
+"""builtin/compact.py — /compact 命令（调用 SDK compact_context）。"""
+
+from __future__ import annotations
+
+from langchain_agentx_cli.commands.registry import Command, CommandContext
+from langchain_agentx_cli.widgets.message_events import (
+    CompactFinished,
+    CompactProgressUpdate,
+    CompactStarted,
+)
+
+_SESSION_REQUIRED = "错误：会话未建立，无法压缩上下文"
+
+
+async def handle_compact(ctx: CommandContext) -> str:
+    if ctx.bridge is None or not ctx.bridge.is_session_ready():
+        return _SESSION_REQUIRED
+
+    # 对齐 CC：支持可选的自定义总结指令参数
+    custom_instructions = ctx.args.strip() if ctx.args else None
+
+    # 通知 TUI 开始 compact（mount 进度条 widget）
+    ctx.app.post_message(CompactStarted())
+
+    def on_progress(p) -> None:  # noqa: ANN001
+        """SDK 回调：向 TUI 发送进度更新。"""
+        ctx.app.post_message(
+            CompactProgressUpdate(percent=p.percent, detail=p.detail)
+        )
+
+    # 如果有自定义指令，设置到 CompactionSettings
+    if custom_instructions:
+        from langchain_agentx.loop.context.settings import (
+            CompactionSettings,
+            set_active_compaction_settings,
+            get_active_compaction_settings,
+        )
+        current = get_active_compaction_settings()
+        # 创建新的 settings，只替换 compact_custom_instructions
+        updated = CompactionSettings(
+            **{**current.__dict__, 'compact_custom_instructions': custom_instructions}
+        )
+        set_active_compaction_settings(updated)
+
+    try:
+        before, after = await ctx.bridge.session.compact_context(
+            progress_callback=on_progress
+        )
+    finally:
+        # 恢复原始设置（即使出错也要恢复）
+        if custom_instructions:
+            from langchain_agentx.loop.context.settings import set_active_compaction_settings, get_active_compaction_settings
+            current = get_active_compaction_settings()
+            updated = CompactionSettings(
+                **{**current.__dict__, 'compact_custom_instructions': None}
+            )
+            set_active_compaction_settings(updated)
+
+    # 通知 TUI 结束（移除进度条，显示结果）
+    ctx.app.post_message(CompactFinished(before=before, after=after))
+
+    pct = int(round(after / before * 100)) if before > 0 else 0
+    result = f"[信息] 已压缩：{before} tokens → {after} tokens ({pct}%)"
+    if custom_instructions:
+        result += f"\n[使用自定义指令: {custom_instructions}]"
+    return result
+
+
+def make_compact_command() -> Command:
+    return Command(
+        name="compact",
+        description="压缩当前会话上下文。可选: /compact [自定义总结指令]",
+        handler=handle_compact,
+    )

{langchain_agentx_cli-0.3.0 → langchain_agentx_cli-0.3.2}/langchain_agentx_cli/session_factory.py

@@ -13,6 +13,7 @@ session_factory.py — AgentSession 创建与生命周期。
 
 from __future__ import annotations
 
+import asyncio
 from typing import TYPE_CHECKING
 
 from langchain_agentx_cli.bootstrap import CliEnvironmentError
@@ -27,6 +28,10 @@ if TYPE_CHECKING:
     from langchain_core.language_models.chat_models import BaseChatModel
 
     from langchain_agentx import AgentSession
+    from langchain_agentx.tool_runtime.resolvers import (
+        AgentSessionPermissionResolver,
+        PermissionRequest,
+    )
 
     from langchain_agentx_cli.config import ReplLaunchConfig
 
@@ -64,9 +69,15 @@ async def open_agent_session(
     cli_model: str | None = None,
     enable_git_snapshot: bool | None = None,
     include_default_session_context: bool = True,
-) -> AgentSession:
-    """创建并进入 AgentSession（构建 graph、SESSION_START hook）。"""
+) -> tuple[AgentSession, asyncio.Queue[PermissionRequest], AgentSessionPermissionResolver]:
+    """创建并进入 AgentSession（构建 graph、SESSION_START hook）。
+
+    返回: (session, permission_queue, permission_resolver)
+        permission_queue 和 permission_resolver 由调用方传递给 SessionBridge。
+    """
     from langchain_agentx import create_agent_session
+    from langchain_agentx.tool_runtime.resolvers import AgentSessionPermissionResolver
+    from langchain_agentx_cli.tui.permissions.config import DEFAULT_PERMISSION_TIMEOUT_SECONDS
 
     cfg = resolve_llm_config(cli_provider=cli_provider, cli_model=cli_model)
     llm = build_chat_model(cfg)
@@ -82,18 +93,29 @@ async def open_agent_session(
         skip_permissions=launch_config.skip_permissions,
     )
 
+    # 方案 A: 在 session 创建前创建 permission_resolver，通过 loop_kwargs 传入
+    permission_queue: asyncio.Queue[PermissionRequest] = asyncio.Queue()
+    permission_resolver = AgentSessionPermissionResolver(
+        request_queue=permission_queue,
+        timeout=DEFAULT_PERMISSION_TIMEOUT_SECONDS,
+    )
+
+    loop_kwargs = build_session_loop_kwargs(
+        workspace_root=launch_config.workspace_root,
+        model=cfg.model,
+        provider=cfg.provider,
+        enable_git_snapshot=enable_git_snapshot,
+        include_default_session_context=include_default_session_context,
+    )
+    # 注入 permission_resolver 到 loop_kwargs
+    loop_kwargs["permission_resolver"] = permission_resolver
+
     session = create_agent_session(
         llm,
         workspace_root=launch_config.workspace_root,
         agent_home=launch_config.agent_home,
         loader=loader,
-        **build_session_loop_kwargs(
-            workspace_root=launch_config.workspace_root,
-            model=cfg.model,
-            provider=cfg.provider,
-            enable_git_snapshot=enable_git_snapshot,
-            include_default_session_context=include_default_session_context,
-        ),
+        **loop_kwargs,
     )
     try:
         await session.__aenter__()
@@ -103,7 +125,7 @@ async def open_agent_session(
         raise CliEnvironmentError(
             f"无法创建 AgentSession（provider={cfg.provider!r}, model={cfg.model!r}）：{exc}"
         ) from exc
-    return session
+    return session, permission_queue, permission_resolver
 
 
 async def close_agent_session(session: AgentSession) -> None:

{langchain_agentx_cli-0.3.0 → langchain_agentx_cli-0.3.2}/langchain_agentx_cli/tools/registry.py

@@ -20,7 +20,7 @@ from langchain_agentx.tool_runtime.state_bridge import ToolStateBridge
 from langchain_agentx.tools.agent import AgentRuntimeTool
 from langchain_agentx.tools.ask_user_question import AskUserQuestionTool
 from langchain_agentx.tools.bash import BashRuntimeTool
-from langchain_agentx.tools.edit import BatchEditRuntimeTool, EditRuntimeTool
+from langchain_agentx.tools.edit import EditRuntimeTool
 from langchain_agentx.tools.glob import GlobRuntimeTool
 from langchain_agentx.tools.grep import GrepRuntimeTool
 from langchain_agentx.tools.read import ReadRuntimeTool
@@ -87,7 +87,6 @@ class CliToolRegistry:
         self._loader.register(ReadRuntimeTool(state_bridge=bridge))
         self._loader.register(WriteRuntimeTool(state_bridge=bridge))
         self._loader.register(EditRuntimeTool(state_bridge=bridge))
-        self._loader.register(BatchEditRuntimeTool(state_bridge=bridge))
         self._loader.register(BashRuntimeTool(state_bridge=bridge))
 
     def _register_search_tools(self) -> None:

{langchain_agentx_cli-0.3.0 → langchain_agentx_cli-0.3.2}/langchain_agentx_cli/tui/permissions/__init__.py

@@ -6,7 +6,7 @@ tui/permissions — 权限确认子系统（Queue + Future）。
     集成 ConfirmQueue 状态管理（对齐 CC）。
 
 链路位置：
-    SessionBridge 创建 Queue/Resolver → PermissionQueueConsumer → SDK Future。
+    open_agent_session 创建 Queue/Resolver → SessionBridge → PermissionQueueConsumer → SDK Future。
 """
 
 from langchain_agentx_cli.tui.permissions.cache import SessionPermissionCache
@@ -19,7 +19,6 @@ from langchain_agentx_cli.tui.permissions.consumer import (
 from langchain_agentx_cli.tui.permissions.dialog import (
     DialogPermissionDecisionPort,
 )
-from langchain_agentx_cli.tui.permissions.inject import inject_permission_resolver
 from langchain_agentx_cli.tui.permissions.models import PermissionDecision
 from langchain_agentx_cli.tui.permissions.presenters import (
     PermissionPresentation,
@@ -38,6 +37,5 @@ __all__ = [
     "PermissionQueueConsumer",
     "QueuedPermission",
     "SessionPermissionCache",
-    "inject_permission_resolver",
     "permission_presenter_for_tool",
 ]

{langchain_agentx_cli-0.3.0 → langchain_agentx_cli-0.3.2}/langchain_agentx_cli/tui/permissions/presenters/base.py

@@ -65,4 +65,5 @@ class PermissionPresenter:
         return None
 
     def _default_prompt(self) -> str:
-        return "Do you want to proceed?"
+        # 对齐 CC：默认 prompt 为空，由 InlinePermissionWidget 添加 "Do you want to proceed?"
+        return ""

{langchain_agentx_cli-0.3.0 → langchain_agentx_cli-0.3.2}/langchain_agentx_cli/tui/permissions/presenters/bash.py

@@ -63,13 +63,46 @@ class BashPermissionPresenter(PermissionPresenter):
         self._command = extract_bash_command(self._prompt) or self._prompt
 
     def title(self) -> str:
-        return "权限确认: Bash 命令"
+        # 对齐 CC：PermissionDialog title="Bash command"
+        return "Bash command"
 
     def format_body(self) -> str:
+        # 对齐 CC：命令 + 描述分行显示（带缩进）
         command = self._command
         if not command:
             return super().format_body()
-        return f"Do you want to run the following command?\n\n  $ {command}"
+
+        # 从 prompt 提取描述（如果有）
+        description = self._extract_description()
+
+        # 对齐 CC：命令显示在中间，带缩进
+        lines = [f"  {command}"]
+        if description:
+            lines.append(f"  {description}")
+        return "\n".join(lines)
+
+    def _extract_description(self) -> str | None:
+        """从 prompt 提取描述（如果有）。
+
+        对齐 CC：bash 工具的 description 来自命令用途说明，
+        如 "Search for langchain_agentx_python directory"。
+        """
+        prompt = self._prompt.strip()
+        if not prompt:
+            return None
+
+        # 尝试提取描述（prompt 中除去命令外的部分）
+        command = self._command
+        if command and command in prompt:
+            # 移除命令部分，获取剩余描述
+            remaining = prompt.replace(command, "", 1).strip()
+            # 移除常见的 prompt 前缀
+            for prefix in ["command:", "cmd:", "bash:", "$", ">"]:
+                if remaining.lower().startswith(prefix.lower()):
+                    remaining = remaining[len(prefix):].strip()
+            if remaining and len(remaining) < 200:
+                return remaining
+        return None
 
     def warning_message(self) -> str | None:
         if not self.is_risky():

{langchain_agentx_cli-0.3.0 → langchain_agentx_cli-0.3.2}/langchain_agentx_cli/widgets/message_list.py

@@ -376,10 +376,18 @@ class MessageListWidget(ScrollableContainer):
 
         修复：使用 call_after_refresh 确保Widget完全mount后再转移焦点，
         避免与Textual渲染循环的竞态条件。
+        对齐 CC：设置工具进度消息为 "Waiting for permission…"
         """
         # 先清理旧的 pending widget（使用引用，不依赖 ID）
         self.hide_permission_pending()
 
+        # 对齐 CC：在最近启动的工具上显示 "Waiting for permission…"
+        if self._active_tools:
+            # 获取最近启动的工具（最后一个添加的）
+            latest_tool = next(reversed(self._active_tools.values()), None)
+            if latest_tool and hasattr(latest_tool, "set_progress_text"):
+                latest_tool.set_progress_text("Waiting for permission…")
+
         self.mount(widget)
         self._pending_permission = widget
         self._scroll_to_end(force=True)
@@ -400,6 +408,12 @@ class MessageListWidget(ScrollableContainer):
                 self._pending_permission.remove()
             self._pending_permission = None
 
+        # 对齐 CC：清除工具进度消息（权限处理后继续运行或完成）
+        if self._active_tools:
+            for tool in self._active_tools.values():
+                if hasattr(tool, "set_progress_text"):
+                    tool.set_progress_text(None)
+
     def handle_assistant_chunk(self, chunk: AssistantMessageChunk) -> None:
         # DEBUG: 追踪消息块处理
         info(
@@ -522,6 +536,9 @@ class MessageListWidget(ScrollableContainer):
             verbose=self._verbose,
             parent_tool_use_id=event.parent_tool_use_id,
         )
+        # 对齐 CC：显示 "Running…" 进度消息
+        if hasattr(widget, "set_progress_text"):
+            widget.set_progress_text("Running…")
         self._mount_keeping_spinner_below(widget)
         # 跟踪运行中的工具（支持同名工具多次调用，追加后缀）
         key = event.tool_name

{langchain_agentx_cli-0.3.0 → langchain_agentx_cli-0.3.2}/langchain_agentx_cli/widgets/permission_inline.py

@@ -34,10 +34,11 @@ class _DecisionMade(Message):
         super().__init__()
 
 
+# 对齐 CC：编号选项标签
 _OPTIONS = [
-    (PermissionDecision.ALLOW_ONCE, "Yes"),
-    (PermissionDecision.ALLOW_SESSION, "Yes, don't ask again this session"),
-    (PermissionDecision.DENY, "No"),
+    (PermissionDecision.ALLOW_ONCE, "Yes"),  # 1. Yes
+    (PermissionDecision.ALLOW_SESSION, "Yes, and don't ask again this session"),  # 2. Yes, and don't ask again...
+    (PermissionDecision.DENY, "No"),  # 3. No
 ]
 
 
@@ -48,6 +49,7 @@ class InlinePermissionWidget(Widget):
     - 使用 PermissionKeybindings 处理键盘事件
     - autoFocus 行为
     - 视觉反馈（focus 样式）
+    - 无边框设计（CC 不使用边框包裹权限对话框）
     """
 
     can_focus = True
@@ -60,17 +62,6 @@ class InlinePermissionWidget(Widget):
         height: auto;
         margin: 1 0;
         padding: 1 2;
-        border: round $warning;
-        background: $surface;
-    }
-    InlinePermissionWidget.-risky {
-        border: round $error;
-    }
-    InlinePermissionWidget:focus {
-        border: round $accent;
-    }
-    InlinePermissionWidget.-risky:focus {
-        border: round $error;
     }
     """
 
@@ -91,30 +82,37 @@ class InlinePermissionWidget(Widget):
         p = self._presentation
         lines: list[str] = []
 
-        # Title
-        color = "$error" if p.is_risky else "$accent"
-        lines.append(f"[bold {color}]{escape(p.title)}[/]")
+        # 对齐 CC：标题使用加粗，但不高亮颜色
+        lines.append(f"[bold]{escape(p.title)}[/]")
 
-        # Body
-        lines.append(f"  {escape(p.body)}")
+        # 对齐 CC：空行分隔
+        lines.append("")
+
+        # Body - 对齐 CC：命令和描述已由 presenter 格式化
+        if p.body:
+            lines.append(f"{escape(p.body)}")
+
+        # 对齐 CC：空行分隔
+        lines.append("")
 
-        # Warning
-        if p.warning:
-            lines.append(f"  [bold $error]⚠ {escape(p.warning)}[/]")
+        # 对齐 CC："Do you want to proceed?" 问题
+        lines.append(" Do you want to proceed?")
 
+        # 对齐 CC：空行分隔
         lines.append("")
 
-        # Options
+        # 对齐 CC：编号选项（1. Yes, 2. Yes..., 3. No）
         for i, (_, label) in enumerate(_OPTIONS):
+            num = i + 1
             if i == self.selected_index:
-                lines.append(f"  [bold]> {label}[/]")
+                lines.append(f" ❯ {num}. {label}")
             else:
-                lines.append(f"    {label}")
+                lines.append(f"   {num}. {label}")
 
-        # Hint - 使用 keybindings 的帮助文本（对齐 CC）
+        # 对齐 CC：底部快捷键提示
         lines.append("")
         help_text = self._keybindings.get_help_text()
-        lines.append(f"[dim]  {help_text}[/]")
+        lines.append(f"[dim] {help_text}[/]")
 
         return "\n".join(lines)
 

{langchain_agentx_cli-0.3.0 → langchain_agentx_cli-0.3.2}/langchain_agentx_cli/widgets/permission_keybindings.py

@@ -151,22 +151,12 @@ class PermissionKeybindings:
         return [b for b in self._bindings.values() if b.visible]
 
     def get_help_text(self) -> str:
-        """获取帮助文本（对齐 CC 快捷键提示）。"""
-        visible = self.get_visible_bindings()
-        parts = []
-        for binding in visible:
-            if binding.key == "enter":
-                parts.append("Enter confirm")
-            elif binding.key == "up":
-                parts.append("↑↓ select")
-            elif binding.decision is PermissionDecision.ALLOW_ONCE:
-                parts.append("Y allow")
-            elif binding.decision is PermissionDecision.ALLOW_SESSION:
-                parts.append("S session")
-            elif binding.decision is PermissionDecision.DENY:
-                if binding.key == "escape":
-                    parts.append("N/Esc deny")
-        return " · ".join(parts)
+        """获取帮助文本（对齐 CC 快捷键提示）。
+
+        CC 格式: "Esc to cancel · Tab to amend · ctrl+e to explain"
+        """
+        # 对齐 CC：简化的快捷键提示
+        return "Esc to cancel · Enter to confirm"
 
 
 def setup_permission_keybindings(widget: InlinePermissionWidget) -> PermissionKeybindings:

{langchain_agentx_cli-0.3.0 → langchain_agentx_cli-0.3.2}/langchain_agentx_cli/widgets/tools/agent/widget.py

@@ -46,6 +46,8 @@ class AgentToolWidget(BaseToolWidget):
         display: dict[str, Any] | None = None,
         **kwargs: Any,
     ) -> None:
+        # 对齐 CC：Agent 工具启动时显示 "In progress…" 进度消息
+        self._agent_started = False
         super().__init__(
             tool_name,
             tool_input,
@@ -56,6 +58,22 @@ class AgentToolWidget(BaseToolWidget):
             display=display,
             **kwargs,
         )
+        # 对齐 CC：设置 Agent 专属进度消息
+        if self._is_running:
+            self._update_agent_progress()
+
+    def _update_agent_progress(self) -> None:
+        """更新 Agent 运行时进度消息（对齐 CC）。"""
+        d = self._display
+        tool_count = d.get("total_steps")
+        if tool_count is not None:
+            # 对齐 CC：In progress… · N tool uses
+            suffix = "use" if tool_count == 1 else "uses"
+            progress = f"In progress… · {tool_count} tool {suffix}"
+            self.set_progress_text(progress)
+        else:
+            # 默认进度消息
+            self.set_progress_text("In progress…")
 
     def format_title(
         self,