langchain-agentx-cli 0.4.2__tar.gz → 0.4.5__tar.gz

{langchain-agentx-cli-0.4.2 → langchain-agentx-cli-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-agentx-cli
-Version: 0.4.2
+Version: 0.4.5
 Summary: Terminal CLI/TUI for AgentX: migrate Claude Code Ink UI, backed by langchain-agentx-python SDK.
 Author: GoodMood2008
 License: Apache-2.0
@@ -62,7 +62,7 @@ agentx-code                                    # Start in current directory
 agentx-code --workspace-root /path/to/project  # Specify workspace
 agentx-code --model claude-sonnet-4-20250514  # Specify model
 agentx-code --provider claude | openai        # Choose provider
-agentx-code -p                                # Skip permission prompts
+agentx-code --dangerously-skip-permissions    # Skip permission prompts (CC-aligned)
 agentx-code --show-config                     # Print merged config
 ```
 

{langchain-agentx-cli-0.4.2 → langchain-agentx-cli-0.4.5}/README.md

@@ -36,7 +36,7 @@ agentx-code                                    # Start in current directory
 agentx-code --workspace-root /path/to/project  # Specify workspace
 agentx-code --model claude-sonnet-4-20250514  # Specify model
 agentx-code --provider claude | openai        # Choose provider
-agentx-code -p                                # Skip permission prompts
+agentx-code --dangerously-skip-permissions    # Skip permission prompts (CC-aligned)
 agentx-code --show-config                     # Print merged config
 ```
 

{langchain-agentx-cli-0.4.2 → langchain-agentx-cli-0.4.5}/langchain_agentx_cli/__init__.py

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

{langchain-agentx-cli-0.4.2 → langchain-agentx-cli-0.4.5}/langchain_agentx_cli/bridge/cli_l3_user_ui_queue.py

@@ -13,7 +13,6 @@ cli_l3_user_ui_queue.py — SDK L3 user_ui 与 CLI 内联权限 Widget 桥接。
 
 from __future__ import annotations
 
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 from langchain_agentx.tool_runtime.prompt.types import (
@@ -28,13 +27,6 @@ from langchain_agentx_cli.bridge.permission_response_builder import (
     PermissionResponseBuilder,
 )
 from langchain_agentx_cli.tui.permissions.models import PermissionDecision
-from langchain_agentx_cli.tui.permissions.persistent_rules import (
-    PermissionBehavior,
-    PermissionDestination,
-    PermissionRule,
-    load_permission_rules,
-    save_permission_rules,
-)
 from langchain_agentx_cli.tui.permissions.router import permission_request_for_tool
 
 if TYPE_CHECKING:
@@ -62,13 +54,20 @@ class CliL3UserUiQueue:
                 message=decision_reason.to_llm_message(request.tool_name),
             )
 
+        tool_name, pattern = self._cache_key_for(request)
+        if self._cache_hit(bridge.permission_cache, tool_name, pattern):
+            return PromptResponse(
+                behavior="allow",
+                decision_source=PromptDecisionSource.USER_UI,
+            )
+
         from langchain_agentx_cli.tui.permissions.dialog import DialogPermissionDecisionPort
 
         port = DialogPermissionDecisionPort(self._app)
         decision, grant_dir = await port.resolve_prompt(request, bridge.permission_cache)
 
         if decision is PermissionDecision.ALLOW_SESSION:
-            self._apply_session_allow(request, decision)
+            bridge.permission_cache.add(tool_name, pattern)
 
         return self._builder.build(
             decision,
@@ -76,39 +75,24 @@ class CliL3UserUiQueue:
             grant_directory=grant_dir,
         )
 
-    def _apply_session_allow(
-        self, request: PromptRequest, decision: PermissionDecision
-    ) -> None:
-        del decision
-        bridge = self._app.bridge
-        if bridge is None:
-            return
-        cache = bridge.permission_cache
+    def _cache_key_for(self, request: PromptRequest) -> tuple[str, str | None]:
+        """统一构造 cache key，确保读写两侧 pattern 严格一致。
+
+        Why: 读写若各自构造 perm_req，参数漂移会导致 ALLOW_SESSION 写入后命中失败。
+        """
         perm_req = permission_request_for_tool(
             request.tool_name,
             request.ask_prompt or request.ask_decision.ask_prompt,
             ask_decision=request.ask_decision,
             workspace_root=str(self._app.workspace_root),
         )
-        pattern = perm_req.extract_pattern()
-        cache.add(request.tool_name, pattern)
-        if not pattern:
-            return
-        lc = self._app.launch_config
-        storage = load_permission_rules(
-            workspace_root=lc.workspace_root,
-            agent_home=lc.agent_home,
-        )
-        storage.add(
-            PermissionRule(
-                tool_name=request.tool_name,
-                rule_content=pattern,
-                behavior=PermissionBehavior.ALLOW,
-                destination=PermissionDestination.LOCAL,
-            )
-        )
-        save_permission_rules(
-            storage,
-            workspace_root=lc.workspace_root,
-            agent_home=lc.agent_home,
-        )
+        return request.tool_name, perm_req.extract_pattern()
+
+    @staticmethod
+    def _cache_hit(cache, tool_name: str, pattern: str | None) -> bool:
+        """两步命中（对齐 consumer._is_cached）：精确 pattern → 工具级 wildcard。"""
+        if cache.check(tool_name, pattern):
+            return True
+        if pattern is not None and cache.check(tool_name):
+            return True
+        return False

{langchain-agentx-cli-0.4.2 → langchain-agentx-cli-0.4.5}/langchain_agentx_cli/bridge/permission_response_builder.py

@@ -55,7 +55,10 @@ class PermissionResponseBuilder:
             )
 
         updates: tuple[PermissionUpdate, ...] = ()
-        if decision is PermissionDecision.ALLOW_AND_GRANT_DIRECTORY:
+        if decision is PermissionDecision.ALLOW_SESSION:
+            # ALLOW_SESSION 应返回 request.suggestions（对齐 CC yes-apply-suggestions）
+            updates = request.suggestions or ()
+        elif decision is PermissionDecision.ALLOW_AND_GRANT_DIRECTORY:
             if grant_directory is None:
                 raise ValueError("ALLOW_AND_GRANT_DIRECTORY requires grant_directory")
             updates = (

{langchain-agentx-cli-0.4.2 → langchain-agentx-cli-0.4.5}/langchain_agentx_cli/cli.py

@@ -114,8 +114,8 @@ class CliEntry:
         if not skip_permissions and not _is_interactive_terminal():
             EnvironmentChecker.emit_error(
                 "Error: agentx-code requires an interactive terminal (TTY).\n"
-                "For non-interactive use, pass -p / --skip-permissions or "
-                "--permission-mode bypassPermissions."
+                "For non-interactive use, pass --skip-permissions / "
+                "--dangerously-skip-permissions or --permission-mode bypassPermissions."
             )
             return 2
 
@@ -300,11 +300,15 @@ _CONFIG_PATH = user_config_path()
     ),
 )
 @click.option(
-    "-p",
     "--skip-permissions",
+    "--dangerously-skip-permissions",
+    "skip_permissions",
     is_flag=True,
     default=False,
-    help="跳过工具权限确认（对齐 CC --dangerously-skip-permissions）",
+    help=(
+        "跳过工具权限确认（对齐 CC --dangerously-skip-permissions；"
+        "推荐使用 --dangerously-skip-permissions 长名以与 CC 完全一致）"
+    ),
 )
 @click.option(
     "--permission-mode",

{langchain-agentx-cli-0.4.2 → langchain-agentx-cli-0.4.5}/langchain_agentx_cli/widgets/message_list.py

@@ -242,6 +242,7 @@ class MessageListWidget(ScrollableContainer):
         # D09: Task 状态管理（用于 TaskPanel）
         self._task_store: TaskStore = TaskStore()
         self._task_panel: TaskPanelWidget | None = None
+        self._show_tasks_panel: bool = True  # 对齐 CC：默认显示任务列表
         # D10: Compact 进度条 Widget
         self._compact_widget: CompactProgressWidget | None = None
         self._scroll_timer: object | None = None
@@ -278,6 +279,7 @@ class MessageListWidget(ScrollableContainer):
         instance._display_mode = DisplayMode.NORMAL
         instance._task_store = TaskStore()
         instance._task_panel = None
+        instance._show_tasks_panel = True
         instance._compact_widget = None
         instance._scroll_timer = None
         instance._workspace_cfg = getattr(config, "workspace_cfg", None)
@@ -430,18 +432,17 @@ class MessageListWidget(ScrollableContainer):
         self._memory_summary_widget = None
         self._collapsed_memory_tool_ids = set()
         info("[ML] turn started, brief flag reset to False")
-        self._turn_spinner = SpinnerWidget()
+        self._turn_spinner = SpinnerWidget(task_store=self._task_store)
 
-        # D09: 如果有 Task，挂载 TaskPanel
-        if self._task_store.tasks:
-            self._task_panel = TaskPanelWidget(self._task_store)
-            self.mount(self._task_panel)
+        # Spinner 开始时移除 TaskPanel（对齐 CC：!showSpinner 时不显示任务）
+        if self._task_panel is not None and self._task_panel.is_attached:
+            self._task_panel.remove()
 
         self.mount(self._turn_spinner)
         self._scroll_to_end()
 
     def finish_turn_spinner(self) -> None:
-        """Turn 结束：移除 Spinner，插入完成行。TaskPanel 保留（D09）。"""
+        """Turn 结束：移除 Spinner，插入完成行。TaskPanel 在 Spinner 后显示（D09）。"""
         if self._turn_spinner is None:
             return
         completion = self._turn_spinner.create_completion_message()
@@ -450,7 +451,9 @@ class MessageListWidget(ScrollableContainer):
         self.append_spinner_status(completion)
         self._show_memory_ops_summary()
         # Phase 3: 显示被抑制的文本（如果启用 verbose 模式）
-        # D09: TaskPanel 不移除，保留显示最终状态
+
+        # D09: Spinner 结束后显示 TaskPanel（对齐 CC）
+        self._ensure_task_panel()
 
     def _show_memory_ops_summary(self) -> None:
         if self._show_memory_tool_widgets():
@@ -537,12 +540,42 @@ class MessageListWidget(ScrollableContainer):
             self.set_display_mode(DisplayMode.BRIEF_ONLY)
 
     def on_key(self, event: events.Key) -> None:
-        """Transcript 模式下 Esc 退回 Normal（对齐 CC screen!=='transcript' 守卫）。"""
+        """Transcript 模式下 Esc 退回 Normal（对齐 CC screen!=='transcript' 守卫）。
+
+        键盘快捷键：
+        - Ctrl+T: 切换任务列表显示（对齐 CC app:toggleTodos）
+        - Esc: Transcript 模式下退回 Normal
+        """
+        # Ctrl+T: 切换任务列表显示（对齐 CC）
+        if event.key == "ctrl+t":
+            event.stop()
+            self._toggle_tasks_panel()
+            return
+
+        # Esc: Transcript 模式下退回 Normal
         if event.key == "escape" and self._display_mode == DisplayMode.TRANSCRIPT:
             event.prevent_default()
             event.stop()
             self.set_display_mode(DisplayMode.NORMAL)
 
+    def _toggle_tasks_panel(self) -> None:
+        """切换任务列表显示（对齐 CC Ctrl+T）。
+
+        行为：
+        - 切换 _show_tasks_panel 状态
+        - 移除或挂载 TaskPanel
+        - 刷新显示
+        """
+        self._show_tasks_panel = not self._show_tasks_panel
+
+        if self._show_tasks_panel:
+            # 显示任务列表
+            self._ensure_task_panel()
+        else:
+            # 隐藏任务列表
+            if self._task_panel is not None and self._task_panel.is_attached:
+                self._task_panel.remove()
+
     def append_spinner_status(self, content: str) -> None:
         """插入 dim 状态行（完成行或 thought for Ns）。"""
         self.mount(_SpinnerStatusLine(content))
@@ -556,7 +589,7 @@ class MessageListWidget(ScrollableContainer):
         则先创建 spinner。
         """
         if self._turn_spinner is None:
-            self._turn_spinner = SpinnerWidget()
+            self._turn_spinner = SpinnerWidget(task_store=self._task_store)
             self.mount(self._turn_spinner)
         self._turn_spinner.enter_thinking_mode()
 
@@ -812,15 +845,29 @@ class MessageListWidget(ScrollableContainer):
         self._scroll_to_end()
 
     def _ensure_task_panel(self) -> None:
-        """确保 TaskPanel 已挂载（D09）。"""
+        """确保 TaskPanel 已挂载（D09）。
+
+        挂载逻辑：
+        - 只在非 spinner 状态时挂载（对齐 CC：!showSpinner 时显示任务）
+        - 只在 _show_tasks_panel 为 True 时挂载（对齐 CC Ctrl+T 切换）
+        - 挂载到容器末尾，确保显示在对话流下方
+        - 如果已有任务，更新显示
+        """
+        # Spinner 运行时不挂载（对齐 CC）
+        if self._turn_spinner is not None:
+            return
+
+        # 用户通过 Ctrl+T 隐藏了任务列表
+        if not self._show_tasks_panel:
+            return
+
+        # 没有任务时不挂载
+        if not self._task_store.tasks:
+            return
+
         if self._task_panel is None or not self._task_panel.is_attached:
             self._task_panel = TaskPanelWidget(self._task_store)
-            if self._turn_spinner is not None:
-                self._turn_spinner.remove()
-                self.mount(self._task_panel)
-                self.mount(self._turn_spinner)
-            else:
-                self.mount(self._task_panel)
+            self.mount(self._task_panel)
             self._scroll_to_end()
 
     def handle_tool_completed(self, event: ToolUseCompleted) -> None:

{langchain-agentx-cli-0.4.2 → langchain-agentx-cli-0.4.5}/langchain_agentx_cli/widgets/spinner.py

@@ -3,6 +3,7 @@ widgets/spinner.py — Spinner 状态行（加载动画 + Turn 完成行）。
 
 职责：
     消息流底部的加载指示器；Turn 结束时生成 past-tense 完成文案。
+    显示正在进行的任务的 activeForm（对齐 CC）。
 
 链路位置：
     ReplScreen ← TurnInProgress / Thinking* Message ← SessionBridge；
@@ -16,9 +17,13 @@ from __future__ import annotations
 
 import random
 import time
+from typing import TYPE_CHECKING
 
 from textual.widgets import Static
 
+if TYPE_CHECKING:
+    from langchain_agentx_cli.state.task_store import TaskStore
+
 # Windows / Linux 帧序列（对齐 CC SpinnerGlyph DEFAULT_CHARACTERS + reverse）
 _BASE_FRAMES = ["·", "✢", "*", "✶", "✻", "✽"]
 SPINNER_FRAMES = _BASE_FRAMES + _BASE_FRAMES[::-1]
@@ -265,7 +270,12 @@ class SpinnerWidget(Static):
     }
     """
 
-    def __init__(self) -> None:
+    def __init__(self, task_store: TaskStore | None = None) -> None:
+        """初始化 Spinner。
+
+        Args:
+            task_store: TaskStore 实例，用于获取正在进行的任务的 activeForm
+        """
         super().__init__("", id="turn-spinner")
         self._frame_index = 0
         self._verb = random.choice(SPINNER_VERBS)
@@ -273,6 +283,8 @@ class SpinnerWidget(Static):
         self._thinking_mode = False
         self._thinking_start_time: float | None = None
         self._start_time = 0.0
+        self._token_count = 0  # 对齐 CC：token 计数
+        self._task_store = task_store  # 对齐 CC：用于获取任务 activeForm
 
     def on_mount(self) -> None:
         self._start_time = time.monotonic()
@@ -291,7 +303,32 @@ class SpinnerWidget(Static):
             dot = "[bold white]●[/]" if blink else "[dim]●[/]"
             text = f"{dot} [dim]thinking[/]"
         else:
-            text = f"[bold]{frame}[/] {self._verb}{ELLIPSIS}"
+            # 对齐 CC：spinner + 任务名称/verb + 状态信息
+            # 优先使用任务的 activeForm，否则使用随机动词
+            display_text = self._verb
+            if self._task_store:
+                # 获取正在进行的任务
+                for task in self._task_store.tasks.values():
+                    if task.status == "in_progress" and task.active_form:
+                        display_text = task.active_form
+                        break
+
+            parts = [f"[bold]{frame}[/] {display_text}{ELLIPSIS}"]
+            status_parts = []
+
+            # 时间（对齐 CC）
+            elapsed = self.elapsed_ms()
+            if elapsed >= 1000:  # 1秒后显示时间
+                status_parts.append(f"{self._format_duration_ms(elapsed)}")
+
+            # Token 计数（对齐 CC）
+            if self._token_count > 0:
+                status_parts.append(f"↓ {self._token_count} tokens")
+
+            if status_parts:
+                parts.append(f" ({' · '.join(status_parts)})")
+
+            text = "".join(parts)
         self.update(text)
 
     def elapsed_ms(self) -> int:
@@ -306,6 +343,34 @@ class SpinnerWidget(Static):
         if not self._thinking_mode:
             self._refresh_label()
 
+    def set_token_count(self, count: int) -> None:
+        """更新 token 计数（对齐 CC）。
+
+        Args:
+            count: 累计 token 数量
+        """
+        self._token_count = count
+        if not self._thinking_mode:
+            self._refresh_label()
+
+    def _format_duration_ms(self, ms: int) -> str:
+        """格式化毫秒为可读时间（对齐 CC formatDuration）。
+
+        Args:
+            ms: 毫秒数
+
+        Returns:
+            格式化的时间字符串，如 "25s", "1m 30s"
+        """
+        seconds = ms // 1000
+        if seconds < 60:
+            return f"{seconds}s"
+        minutes = seconds // 60
+        remaining_seconds = seconds % 60
+        if remaining_seconds > 0:
+            return f"{minutes}m {remaining_seconds}s"
+        return f"{minutes}m"
+
     def enter_thinking_mode(self) -> None:
         if self._thinking_mode:
             return

{langchain-agentx-cli-0.4.2 → langchain-agentx-cli-0.4.5}/langchain_agentx_cli/widgets/task_panel.py

@@ -42,6 +42,7 @@ class TaskPanelWidget(Static):
     - /root/cc0331/src/components/TaskListV2.tsx: getTaskIcon 图标映射（第 220-241 行）
     - /root/cc0331/src/components/TaskListV2.tsx: 截断与隐藏摘要（第 136-186 行）
     - /root/cc0331/src/components/TaskListV2.tsx: 30 秒过期定时器（第 68-85 行）
+    - /root/cc0331/src/components/TaskListV2.tsx: 统计行（第 192-208 行）
     """
 
     # 图标定义（对齐 CC figures）
@@ -49,6 +50,9 @@ class TaskPanelWidget(Static):
     ICON_IN_PROGRESS = "◼"
     ICON_COMPLETED = "✓"
 
+    # 缩进（对齐 CC marginLeft={2}）
+    INDENT = "  "
+
     # 终端列数（用于截断计算）
     _terminal_columns: int = 80
 
@@ -165,6 +169,28 @@ class TaskPanelWidget(Static):
         self._hidden_count = len(hidden)
         return visible, hidden
 
+    def _format_stats_summary(self) -> Text:
+        """格式化任务统计摘要（对齐 CC TaskListV2.tsx:192-208）。
+
+        Returns:
+            Rich Text 对象，如 "5 tasks (2 done, 1 in progress, 2 open)"
+        """
+        tasks = list(self._task_store.tasks.values())
+        if not tasks:
+            return Text()
+
+        completed = sum(1 for t in tasks if t.status == TaskStatus.COMPLETED.value)
+        in_progress = sum(1 for t in tasks if t.status == TaskStatus.IN_PROGRESS.value)
+        pending = sum(1 for t in tasks if t.status == TaskStatus.PENDING.value)
+
+        result = Text()
+        result.append(Text(f"{len(tasks)} tasks ", style="dim"))
+        result.append(Text(f"({completed} done, ", style="dim"))
+        result.append(Text(f"{in_progress} in progress", style="bold dim"))
+        result.append(Text(f", {pending} open)", style="dim"))
+
+        return result
+
     def _format_hidden_summary(self, hidden: list[TaskEntry]) -> str:
         """格式化隐藏 Task 的摘要。
 
@@ -227,9 +253,14 @@ class TaskPanelWidget(Static):
         # 构建 Rich Text
         text = Text()
 
-        # 图标
+        # 图标（对齐 CC：in_progress 图标闪烁）
         icon_text = Text(f"{icon} ")
-        if color:
+        if task.status == TaskStatus.IN_PROGRESS.value:
+            # 正在进行的任务：闪烁效果（对齐 CC）
+            icon_text.stylize("bold blink")
+            if color:
+                icon_text.stylize(color)
+        elif color:
             icon_text.stylize(color)
         text.append(icon_text)
 
@@ -238,7 +269,9 @@ class TaskPanelWidget(Static):
         if task.status == TaskStatus.IN_PROGRESS.value:
             subject.stylize("bold")
         if task.status == TaskStatus.COMPLETED.value:
-            subject.stylize("dim strikethrough")
+            subject.stylize("dim")
+            # 注意：strikethrough 在某些 Rich/Textual 版本中可能有兼容性问题
+            # 对齐 CC 主要通过 dim 颜色和勾号图标表示已完成状态
         elif has_unresolved_blocker:
             subject.stylize("dim")
         text.append(subject)
@@ -279,13 +312,24 @@ class TaskPanelWidget(Static):
 
         # 构建输出
         result = Text()
+
+        # 统计行（对齐 CC isStandalone 模式）
+        stats = self._format_stats_summary()
+        if stats:
+            result.append(Text(self.INDENT))  # 缩进
+            result.append(stats)
+            result.append("\n")
+
+        # 任务列表（每行添加缩进）
         for task in visible:
+            result.append(Text(self.INDENT))  # 缩进
             result.append(self._format_task_line(task))
             result.append("\n")
 
-        # 隐藏摘要
+        # 隐藏摘要（也需要缩进）
         if hidden:
             summary = self._format_hidden_summary(hidden)
+            result.append(Text(self.INDENT))  # 缩进
             result.append(Text(summary, style="dim"))
 
         return result

{langchain-agentx-cli-0.4.2 → langchain-agentx-cli-0.4.5}/langchain_agentx_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-agentx-cli
-Version: 0.4.2
+Version: 0.4.5
 Summary: Terminal CLI/TUI for AgentX: migrate Claude Code Ink UI, backed by langchain-agentx-python SDK.
 Author: GoodMood2008
 License: Apache-2.0
@@ -62,7 +62,7 @@ agentx-code                                    # Start in current directory
 agentx-code --workspace-root /path/to/project  # Specify workspace
 agentx-code --model claude-sonnet-4-20250514  # Specify model
 agentx-code --provider claude | openai        # Choose provider
-agentx-code -p                                # Skip permission prompts
+agentx-code --dangerously-skip-permissions    # Skip permission prompts (CC-aligned)
 agentx-code --show-config                     # Print merged config
 ```
 

{langchain-agentx-cli-0.4.2 → langchain-agentx-cli-0.4.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "langchain-agentx-cli"
-version = "0.4.2"
+version = "0.4.5"
 description = "Terminal CLI/TUI for AgentX: migrate Claude Code Ink UI, backed by langchain-agentx-python SDK."
 readme = "README.md"
 requires-python = ">=3.11"