langchain-agentx-cli 0.2.1__tar.gz → 0.2.2__tar.gz

{langchain_agentx_cli-0.2.1 → langchain_agentx_cli-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langchain-agentx-cli
-Version: 0.2.1
+Version: 0.2.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.4.0,>=0.3.4
+Requires-Dist: langchain-agentx-python<0.4.0,>=0.3.7
 Requires-Dist: click>=8.1
 Requires-Dist: textual>=0.79.0
 Provides-Extra: dev

{langchain_agentx_cli-0.2.1 → langchain_agentx_cli-0.2.2}/langchain_agentx_cli/__init__.py

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

{langchain_agentx_cli-0.2.1 → langchain_agentx_cli-0.2.2}/langchain_agentx_cli/app.py

@@ -10,6 +10,7 @@ app.py — Textual ReplApp 容器。
 
 from __future__ import annotations
 
+from pathlib import Path
 from typing import TYPE_CHECKING
 
 from textual import on
@@ -55,12 +56,15 @@ class ReplApp(App[None]):
             show=False,
             priority=True,
         ),
+        # 对齐 CC: Ctrl+O 切换 Transcript 模式
+        Binding("ctrl+o", "toggle_transcript", "Transcript", show=False, priority=True),
     ]
 
     def __init__(
         self,
         launch_config: ReplLaunchConfig,
         session: AgentSession | None = None,
+        debug: bool = False,
     ) -> None:
         super().__init__()
         self._launch_config = launch_config
@@ -74,6 +78,7 @@ class ReplApp(App[None]):
         self._screen_messenger = ReplScreenMessenger(self)
         # Phase 3: 加载用户偏好（供 MessageListWidget 和工具 Widget 使用）
         self.preferences: AppUserPreferences = AppPreferencesStore().load()
+        self._debug = debug
 
     @property
     def screen_messenger(self) -> ReplScreenMessenger:
@@ -92,6 +97,13 @@ class ReplApp(App[None]):
         return self._bridge
 
     def on_mount(self) -> None:
+        # DEBUG: 启用观测日志
+        if self._debug:
+            from langchain_agentx_cli.observation import observer
+
+            observer.enable(self.workspace_root)
+            observer.info("[APP] ReplApp mounted, workspace=%s", self.workspace_root)
+
         prefs = AppPreferencesStore().load()
         initial_setting = self._launch_config.theme or prefs.theme
         self.theme_manager = ThemeManager(self)
@@ -149,3 +161,21 @@ class ReplApp(App[None]):
         if self._bridge is not None:
             self._bridge.cancel_stream()
         self.exit(0)
+
+    def action_toggle_transcript(self) -> None:
+        """切换 Transcript 模式（对齐 CC Ctrl+O）。"""
+        screen = self.screen
+        if isinstance(screen, ReplScreen):
+            message_list = screen._message_list()
+            if message_list is not None:
+                from langchain_agentx_cli.observation import info
+                old_mode = message_list.display_mode
+                message_list.toggle_transcript_mode()
+                new_mode = message_list.display_mode
+                info("[APP] transcript toggled: %s → %s", old_mode, new_mode)
+
+                # 显示通知
+                if new_mode.value == "transcript":
+                    self.notify("Transcript 模式已启用（显示所有内容）", severity="information", timeout=3)
+                else:
+                    self.notify("已返回 Normal 模式", severity="information", timeout=2)

{langchain_agentx_cli-0.2.1 → langchain_agentx_cli-0.2.2}/langchain_agentx_cli/bridge/session_bridge.py

@@ -18,12 +18,14 @@ from __future__ import annotations
 
 import asyncio
 from collections.abc import Callable
+from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any
 
 from langchain_agentx.tool_runtime.resolvers import (
     AgentSessionPermissionResolver,
     PermissionRequest,
 )
+from langchain_agentx_cli.observation import debug, info
 from langchain_agentx_cli.tui.permissions import (
     PermissionQueueConsumer,
     SessionPermissionCache,
@@ -70,6 +72,16 @@ MVP_ADAPTER_CONFIG: dict[str, bool] = {
 _LLM_FAILED_PREFIX = "[LLM request failed]"
 
 
+@dataclass
+class _TurnSegmentState:
+    """一个 compaction 段内的流式状态；在 turn 开始和 COMPACT_END 时整体重置。"""
+
+    streamed_text: bool = False
+
+    def reset(self) -> None:
+        self.streamed_text = False
+
+
 class SessionBridge:
     """TUI 与 SDK 之间的桥接层（消费 LangchainAgentEvent）。"""
 
@@ -79,7 +91,7 @@ class SessionBridge:
         self._session = session
         self._adapter = LangGraphToLangchainAgentEventAdapter(config=dict(MVP_ADAPTER_CONFIG))
         self._current_worker: Any = None
-        self._streamed_text = False
+        self._seg = _TurnSegmentState()
         # 对齐 CC: 集中式权限队列状态管理
         self._permission_queue: asyncio.Queue[PermissionRequest] = asyncio.Queue()
         self._permission_cache = SessionPermissionCache()
@@ -111,12 +123,15 @@ class SessionBridge:
 
     async def _stream_turn(self, user_input: str) -> None:
         self._adapter._reset_state()
-        self._streamed_text = False
+        self._seg.reset()
         raw_events = self._session.stream_loop_events(user_input)
         try:
             async for event in self._adapter.adapt(raw_events):
                 self._dispatch_event(event)
+        except (KeyboardInterrupt, SystemExit):
+            raise
         except Exception as exc:
+            debug("stream_turn error", exc_info=True)
             self._post_ui(ErrorMessageOccurred(error=str(exc)))
         finally:
             self._post_ui(TurnInProgress(in_progress=False))
@@ -124,6 +139,12 @@ class SessionBridge:
 
     def _dispatch_event(self, event: LangchainAgentEvent) -> None:
         data = event.data or {}
+        # DEBUG: 追踪所有事件
+        info(
+            "[BRIDGE] event=%s data_keys=%s",
+            event.event_type,
+            list(data.keys()) if data else [],
+        )
         match event.event_type:
             case LangchainAgentEventType.TEXT_START:
                 self._post_ui(
@@ -131,8 +152,9 @@ class SessionBridge:
                 )
             case LangchainAgentEventType.TEXT_DELTA:
                 delta = str(data.get("text", ""))
+                info("[BRIDGE] TEXT_DELTA len=%d first50=%r", len(delta), delta[:50])
                 if delta:
-                    self._streamed_text = True
+                    self._seg.streamed_text = True
                 self._post_ui(
                     AssistantMessageChunk(
                         delta=delta,
@@ -140,6 +162,7 @@ class SessionBridge:
                     )
                 )
             case LangchainAgentEventType.TEXT_END:
+                info("[BRIDGE] TEXT_END — finalizing assistant")
                 self._post_ui(
                     AssistantMessageChunk(delta="", is_complete=True)
                 )
@@ -191,9 +214,16 @@ 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())
+                self._seg.reset()
+                compact_type = data.get("compact_type", "autocompact")  # 向后兼容
+                tokens_freed = data.get("tokens_freed") or 0
+                info("[BRIDGE] COMPACT_END type=%s tokens=%s", compact_type, tokens_freed)
+                # 只显示 autocompact（LLM 摘要），忽略 microcompact（工具清理）
+                if compact_type == "autocompact":
+                    self._post_ui(ContextCompactedMessage())
             case LangchainAgentEventType.COMPACT_START:
-                self._post_ui(ContextCompactingMessage())
+                info("[BRIDGE] COMPACT_START — compacting...")
+                pass
             case _:
                 pass
 
@@ -205,7 +235,7 @@ class SessionBridge:
         if text.startswith(_LLM_FAILED_PREFIX):
             self._post_ui(ErrorMessageOccurred(error=text))
             return
-        if not self._streamed_text:
+        if not self._seg.streamed_text:
             self._post_ui(
                 AssistantMessageChunk(delta=text, is_complete=True)
             )

{langchain_agentx_cli-0.2.1 → langchain_agentx_cli-0.2.2}/langchain_agentx_cli/cli.py

@@ -50,6 +50,7 @@ class CliEntry:
         show_config: bool,
         enable_git_snapshot: bool | None,
         skip_permissions: bool = False,
+        debug: bool = False,
     ) -> int:
         # Mode 到 agent_home 的映射（优先级高于 --agent-home）
         if mode:
@@ -88,7 +89,7 @@ class CliEntry:
             return 2
 
         try:
-            return self._run_tui(launch_config, session)
+            return self._run_tui(launch_config, session, debug=debug)
         finally:
             asyncio.run(close_agent_session(session))
 
@@ -138,8 +139,10 @@ class CliEntry:
         }
         return mode_map.get(mode.lower(), ".langchain_agentx")
 
-    def _run_tui(self, launch_config: ReplLaunchConfig, session) -> int:  # noqa: ANN001
-        app = ReplApp(launch_config=launch_config, session=session)
+    def _run_tui(
+        self, launch_config: ReplLaunchConfig, session, debug: bool = False  # noqa: ANN001
+    ) -> int:
+        app = ReplApp(launch_config=launch_config, session=session, debug=debug)
         app.run()
         return 0
 
@@ -203,6 +206,13 @@ _CONFIG_PATH = user_config_path()
     default=False,
     help="跳过工具权限确认（对齐 CC --dangerously-skip-permissions）",
 )
+@click.option(
+    "--debug",
+    "-d",
+    is_flag=True,
+    default=False,
+    help="启用观察日志（写入 workspace/log/agentx-{pid}.log）",
+)
 def main(
     workspace_root: Path | None,
     mode: str | None,
@@ -212,6 +222,7 @@ def main(
     show_config: bool,
     enable_git_snapshot: bool | None,
     skip_permissions: bool,
+    debug: bool,
 ) -> None:
     """langchain-agentx 终端 REPL（MVP）。"""
     code = CliEntry().run(
@@ -223,5 +234,6 @@ def main(
         show_config=show_config,
         enable_git_snapshot=enable_git_snapshot,
         skip_permissions=skip_permissions,
+        debug=debug,
     )
     raise SystemExit(code)

langchain_agentx_cli-0.2.2/langchain_agentx_cli/observation/__init__.py

@@ -0,0 +1,44 @@
+"""
+observation — 统一日志观测模块。
+
+提供启用/禁用控制的日志接口，默认禁用（零开销）。
+
+使用方式：
+    from langchain_agentx_cli.observation import observer, info
+
+    # 模块直接调用
+    info("[MODULE] some_event value=%s", value)
+
+    # 或使用 observer 实例
+    observer.info("[MODULE] some_event value=%s", value)
+"""
+
+from langchain_agentx_cli.observation.observer import (
+    Observer,
+    critical,
+    debug,
+    disable,
+    enable,
+    error,
+    get_observer,
+    info,
+    is_enabled,
+    warning,
+)
+
+# 全局 observer 实例（常用别名）
+observer = get_observer()
+
+__all__ = [
+    "Observer",
+    "observer",
+    "get_observer",
+    "enable",
+    "disable",
+    "is_enabled",
+    "debug",
+    "info",
+    "warning",
+    "error",
+    "critical",
+]

langchain_agentx_cli-0.2.2/langchain_agentx_cli/observation/config.py

@@ -0,0 +1,35 @@
+"""
+observation/config.py — 日志配置常量。
+"""
+
+from __future__ import annotations
+
+import os
+from pathlib import Path
+
+# 日志文件名模板
+LOG_FILENAME_TEMPLATE = "agentx-{pid}.log"
+
+# 默认日志格式
+LOG_FORMAT = "%(asctime)s %(name)s %(levelname)s %(message)s"
+LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
+
+# 默认日志级别
+DEFAULT_LOG_LEVEL = "INFO"
+
+# 日志目录名（相对 workspace root）
+LOG_DIR_NAME = "log"
+
+
+def get_log_dir(workspace_root: Path | None) -> Path:
+    """获取日志目录路径。"""
+    if workspace_root:
+        return workspace_root / LOG_DIR_NAME
+    # 回退到临时目录（无 workspace 时）
+    return Path(os.getenv("TMPDIR", "/tmp")) / "agentx-logs"
+
+
+def get_log_path(workspace_root: Path | None) -> Path:
+    """获取日志文件完整路径。"""
+    log_dir = get_log_dir(workspace_root)
+    return log_dir / LOG_FILENAME_TEMPLATE.format(pid=os.getpid())

langchain_agentx_cli-0.2.2/langchain_agentx_cli/observation/observer.py

@@ -0,0 +1,173 @@
+"""
+observation/observer.py — 观测器（单例）。
+
+提供统一的日志接口，支持启用/禁用切换。禁用时所有操作为 no-op。
+"""
+
+from __future__ import annotations
+
+import logging
+from pathlib import Path
+from typing import Final
+
+from langchain_agentx_cli.observation.config import (
+    DEFAULT_LOG_LEVEL,
+    LOG_DATE_FORMAT,
+    LOG_FORMAT,
+    get_log_path,
+)
+
+
+class _NullHandler(logging.Handler):
+    """零开销的空 Handler，用于禁用状态。"""
+
+    def emit(self, record: logging.LogRecord) -> None:
+        pass
+
+
+class Observer:
+    """
+    观测器：统一的日志入口。
+
+    单例模式，通过 get_instance() 获取实例。
+
+    禁用状态：所有 log 方法为 no-op（零开销）。
+    启用状态：日志写入 workspace/log/agentx-{pid}.log
+    """
+
+    _instance: Final[Observer] = None  # type: ignore[assignment]
+
+    def __new__(cls) -> "Observer":
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+            cls._instance._initialized = False
+        return cls._instance
+
+    def __init__(self) -> None:
+        if self._initialized:
+            return
+        self._initialized = True
+
+        self._enabled: bool = False
+        self._logger: logging.Logger | None = None
+        self._null_handler = _NullHandler()
+
+    def enable(self, workspace_root: Path, level: str = DEFAULT_LOG_LEVEL) -> None:
+        """
+        启用观测日志。
+
+        Args:
+            workspace_root: 工作区根目录，日志写入 workspace_root/log/
+            level: 日志级别（DEBUG/INFO/WARNING/ERROR/CRITICAL）
+        """
+        if self._enabled:
+            return
+
+        log_path = get_log_path(workspace_root)
+        log_path.parent.mkdir(parents=True, exist_ok=True)
+
+        self._logger = logging.getLogger("agentx")
+        self._logger.setLevel(getattr(logging, level.upper(), logging.INFO))
+        self._logger.handlers.clear()
+
+        handler = logging.FileHandler(log_path, encoding="utf-8")
+        handler.setFormatter(logging.Formatter(LOG_FORMAT, LOG_DATE_FORMAT))
+        self._logger.addHandler(handler)
+
+        self._enabled = True
+        self.info("[OBSERVER] enabled log_file=%s", log_path)
+
+    def disable(self) -> None:
+        """关闭观测日志，后续调用变为 no-op。"""
+        if not self._enabled:
+            return
+
+        self.info("[OBSERVER] disabling")
+        self._enabled = False
+
+        if self._logger:
+            for handler in self._logger.handlers[:]:
+                handler.close()
+                self._logger.removeHandler(handler)
+        self._logger = None
+
+    @property
+    def is_enabled(self) -> bool:
+        """是否已启用。"""
+        return self._enabled
+
+    def _log(self, level: int, msg: str, *args, **kwargs) -> None:
+        """内部日志方法。"""
+        if not self._enabled or self._logger is None:
+            return
+        self._logger.log(level, msg, *args, **kwargs)
+
+    def debug(self, msg: str, *args, **kwargs) -> None:
+        """记录 DEBUG 级别日志。"""
+        self._log(logging.DEBUG, msg, *args, **kwargs)
+
+    def info(self, msg: str, *args, **kwargs) -> None:
+        """记录 INFO 级别日志。"""
+        self._log(logging.INFO, msg, *args, **kwargs)
+
+    def warning(self, msg: str, *args, **kwargs) -> None:
+        """记录 WARNING 级别日志。"""
+        self._log(logging.WARNING, msg, *args, **kwargs)
+
+    def error(self, msg: str, *args, **kwargs) -> None:
+        """记录 ERROR 级别日志。"""
+        self._log(logging.ERROR, msg, *args, **kwargs)
+
+    def critical(self, msg: str, *args, **kwargs) -> None:
+        """记录 CRITICAL 级别日志。"""
+        self._log(logging.CRITICAL, msg, *args, **kwargs)
+
+
+# 全局单例实例
+_observer: Observer = Observer()
+
+
+def get_observer() -> Observer:
+    """获取观测器单例实例。"""
+    return _observer
+
+
+# 模块级便捷函数，直接调用单例方法
+def enable(workspace_root: Path, level: str = DEFAULT_LOG_LEVEL) -> None:
+    """启用观测日志。"""
+    _observer.enable(workspace_root, level)
+
+
+def disable() -> None:
+    """关闭观测日志。"""
+    _observer.disable()
+
+
+def is_enabled() -> bool:
+    """是否已启用。"""
+    return _observer.is_enabled
+
+
+def debug(msg: str, *args, **kwargs) -> None:
+    """记录 DEBUG 级别日志。"""
+    _observer.debug(msg, *args, **kwargs)
+
+
+def info(msg: str, *args, **kwargs) -> None:
+    """记录 INFO 级别日志。"""
+    _observer.info(msg, *args, **kwargs)
+
+
+def warning(msg: str, *args, **kwargs) -> None:
+    """记录 WARNING 级别日志。"""
+    _observer.warning(msg, *args, **kwargs)
+
+
+def error(msg: str, *args, **kwargs) -> None:
+    """记录 ERROR 级别日志。"""
+    _observer.error(msg, *args, **kwargs)
+
+
+def critical(msg: str, *args, **kwargs) -> None:
+    """记录 CRITICAL 级别日志。"""
+    _observer.critical(msg, *args, **kwargs)

{langchain_agentx_cli-0.2.1 → langchain_agentx_cli-0.2.2}/langchain_agentx_cli/screens/repl.py

@@ -88,9 +88,6 @@ class ReplScreen(Screen):
         self._message_list().show_welcome(launch_config)
         # Phase 3: 传递用户偏好配置给 MessageListWidget
         if hasattr(app, "preferences"):
-            self._message_list().set_show_suppressed_text(
-                app.preferences.show_suppressed_text
-            )
             # 对齐 CC：传递 verbose 模式（控制 thinking 内容显示）
             self._message_list().set_verbose(app.preferences.verbose)
         input_area = self.query_one("#input-area", InputAreaWidget)

{langchain_agentx_cli-0.2.1 → langchain_agentx_cli-0.2.2}/langchain_agentx_cli/tui/permissions/consumer.py

@@ -23,7 +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
+from langchain_agentx_cli.tui.permissions.queue import ConfirmQueue, QueuedPermission
 
 if TYPE_CHECKING:
     from langchain_agentx_cli.app import ReplApp
@@ -38,6 +38,7 @@ class PermissionDecisionPort(Protocol):
         self,
         request: PermissionRequest,
         cache: SessionPermissionCache,
+        queued: QueuedPermission | None = None,
     ) -> PermissionDecision:
         """返回用户对本次权限请求的决策。"""
 
@@ -49,8 +50,9 @@ class NoDialogPermissionDecisionPort:
         self,
         request: PermissionRequest,
         cache: SessionPermissionCache,
+        queued: QueuedPermission | None = None,
     ) -> PermissionDecision:
-        del request, cache
+        del request, cache, queued
         logger.debug("permission request denied (no dialog)")
         return PermissionDecision.DENY