langchain-agentx-cli 0.3.5__tar.gz → 0.3.7__tar.gz

{langchain-agentx-cli-0.3.5 → langchain-agentx-cli-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-agentx-cli
-Version: 0.3.5
+Version: 0.3.7
 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.3.5 → langchain-agentx-cli-0.3.7}/langchain_agentx_cli/__init__.py

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

{langchain-agentx-cli-0.3.5 → langchain-agentx-cli-0.3.7}/langchain_agentx_cli/bootstrap.py

@@ -8,7 +8,7 @@ bootstrap.py — CLI 启动前环境检查。
     CliEntry.run() 在创建 ReplApp 之前调用。
 
 当前裁剪范围：
-    不校验 API Key；AgentSession 创建失败由 session_factory 抛出 CliEnvironmentError。
+    不校验 API Key；启动期 quick health 见 tui/bootstrap.py。
 """
 
 from __future__ import annotations
@@ -30,7 +30,7 @@ class EnvironmentChecker:
         except ImportError as exc:
             raise CliEnvironmentError(
                 "无法导入 langchain_agentx。请安装 SDK：\n"
-                '  pip install "langchain-agentx-python>=0.6.1,<0.7.0"\n'
+                '  pip install "langchain-agentx-python>=0.7.0,<0.8.0"\n'
                 "或 editable：pip install -e <langchain_agentx_python 路径>"
             ) from exc
 

{langchain-agentx-cli-0.3.5 → langchain-agentx-cli-0.3.7}/langchain_agentx_cli/bridge/deny_override.py

@@ -131,6 +131,8 @@ def _post_replay_tool_ui(
     meta.setdefault("tool_call_id", tool_call_id)
     display = artifact.get("display") if isinstance(artifact.get("display"), dict) else None
     output = adapter.envelope_to_tool_output(envelope)
+    err_info = artifact.get("error")
+    envelope_error = err_info if isinstance(err_info, dict) else None
     if envelope.status == "error":
         bridge._post_ui(
             ToolUseCompleted(
@@ -144,6 +146,7 @@ def _post_replay_tool_ui(
                 display=display or {},
                 truncated=bool(envelope.truncated),
                 overflow_file=envelope.overflow_file,
+                envelope_error=envelope_error,
             )
         )
         return
@@ -158,6 +161,8 @@ def _post_replay_tool_ui(
             display=display or {},
             truncated=bool(envelope.truncated),
             overflow_file=envelope.overflow_file,
+            envelope_error=envelope_error,
+            error=output if str(envelope.status or "ok") == "error" else None,
         )
     )
 

{langchain-agentx-cli-0.3.5 → langchain-agentx-cli-0.3.7}/langchain_agentx_cli/bridge/session_bridge.py

@@ -216,10 +216,32 @@ class SessionBridge:
             exit_on_error=False,
         )
 
+    async def _stream_events_with_failure_observation(self, user_input: str):
+        """转发 raw on_custom_event 给 L8/L7 sink，再 yield 给事件适配器。"""
+        handlers = getattr(self._session, "_cli_failure_handlers", None)
+        async for raw in self._session.stream_loop_events(user_input):
+            if handlers is not None and raw.get("event") == "on_custom_event":
+                name = str(raw.get("name") or "")
+                if name.startswith("tool.failure."):
+                    await handlers.dispatch_raw_event(raw)
+                    self._refresh_failure_footer()
+            yield raw
+
+    def _refresh_failure_footer(self) -> None:
+        try:
+            screen = self.app.screen
+            from langchain_agentx_cli.screens.repl import ReplScreen
+            from langchain_agentx_cli.widgets.input_area import InputAreaWidget
+
+            if isinstance(screen, ReplScreen):
+                screen.query_one(InputAreaWidget).refresh_auto_status_footer()
+        except Exception:
+            pass
+
     async def _stream_turn(self, user_input: str) -> None:
         self._adapter._reset_state()
         self._seg.reset()
-        raw_events = self._session.stream_loop_events(user_input)
+        raw_events = self._stream_events_with_failure_observation(user_input)
         try:
             async for event in self._adapter.adapt(raw_events):
                 self._dispatch_event(event)
@@ -291,6 +313,7 @@ class SessionBridge:
                     type(data.get("payload")).__name__,
                     bool(data.get("display")),
                 )
+                err_info = data.get("error")
                 self._post_ui(
                     ToolUseCompleted(
                         tool_name=tool_name,
@@ -302,11 +325,18 @@ class SessionBridge:
                         display=data.get("display") if isinstance(data.get("display"), dict) else None,
                         truncated=bool(data.get("truncated", False)),
                         overflow_file=data.get("overflow_file"),
+                        envelope_error=err_info if isinstance(err_info, dict) else None,
+                        error=(
+                            fallback_output
+                            if str(data.get("status", "ok")) == "error"
+                            else None
+                        ),
                     )
                 )
             case LangchainAgentEventType.TOOL_ERROR:
                 tool_name = str(data.get("tool_name", ""))
                 error_text = str(data.get("error", ""))
+                err_info = data.get("error")
                 self._post_ui(
                     ToolUseCompleted(
                         tool_name=tool_name,
@@ -317,6 +347,7 @@ class SessionBridge:
                         status=str(data.get("status", "error")),
                         meta=data.get("meta") if isinstance(data.get("meta"), dict) else None,
                         display=data.get("display") if isinstance(data.get("display"), dict) else None,
+                        envelope_error=err_info if isinstance(err_info, dict) else None,
                     )
                 )
             case LangchainAgentEventType.TOOL_PROGRESS:
@@ -402,6 +433,7 @@ class SessionBridge:
                     parent_tool_use_id,
                     len(str(data.get("summary", ""))),
                 )
+                err_info = data.get("error")
                 self._post_ui(
                     ToolUseCompleted(
                         tool_name=tool_name,
@@ -414,6 +446,12 @@ class SessionBridge:
                         truncated=bool(data.get("truncated", False)),
                         overflow_file=data.get("overflow_file"),
                         parent_tool_use_id=parent_tool_use_id,
+                        envelope_error=err_info if isinstance(err_info, dict) else None,
+                        error=(
+                            fallback_output
+                            if str(data.get("status", "ok")) == "error"
+                            else None
+                        ),
                     )
                 )
             case LangchainAgentEventType.HOOK_PROGRESS:

{langchain-agentx-cli-0.3.5 → langchain-agentx-cli-0.3.7}/langchain_agentx_cli/cli.py

@@ -22,6 +22,8 @@ warnings.filterwarnings("ignore", message=".*allowed_objects.*")
 
 from langchain_agentx_cli.app import ReplApp
 from langchain_agentx_cli.bootstrap import CliEnvironmentError, EnvironmentChecker
+from langchain_agentx_cli.health_report import StartupCheckMode
+from langchain_agentx_cli.tui.bootstrap import apply_startup_health_check
 from langchain_agentx_cli.config import AppPreferencesStore, ReplLaunchConfig
 from langchain_agentx_cli.permissions.mode import normalize_permission_mode
 from langchain_agentx_cli.llm_config import (
@@ -64,6 +66,7 @@ class CliEntry:
         added_read_roots: tuple[Path, ...] = (),
         extra_read_roots: tuple[Path, ...] = (),
         extra_write_roots: tuple[Path, ...] = (),
+        startup_check: StartupCheckMode = "quiet",
     ) -> int:
         # Mode 到 agent_home 的映射（优先级高于 --agent-home）
         if mode:
@@ -84,6 +87,16 @@ class CliEntry:
             EnvironmentChecker.emit_error(str(exc))
             return 2
 
+        if startup_check != "off":
+            try:
+                launch_config = apply_startup_health_check(
+                    launch_config,
+                    startup_check,
+                )
+            except CliEnvironmentError as exc:
+                EnvironmentChecker.emit_error(str(exc))
+                return 2
+
         if show_config:
             cfg = resolve_llm_config(
                 cli_provider=provider,
@@ -330,6 +343,18 @@ _CONFIG_PATH = user_config_path()
     type=click.Path(exists=True, file_okay=False, dir_okay=True, path_type=Path),
     help="额外可写根（须在 workspace 或某个 read root 内，否则启动失败）",
 )
+@click.option(
+    "--check-env",
+    is_flag=True,
+    default=False,
+    help="启动前全量环境检查；失败时退出码 2 且不进入 REPL",
+)
+@click.option(
+    "--no-check-env",
+    is_flag=True,
+    default=False,
+    help="跳过启动期 quick 环境检查",
+)
 def main(
     workspace_root: Path | None,
     mode: str | None,
@@ -344,8 +369,19 @@ def main(
     added_read_roots: tuple[Path, ...],
     extra_read_roots: tuple[Path, ...],
     extra_write_roots: tuple[Path, ...],
+    check_env: bool,
+    no_check_env: bool,
 ) -> None:
     """langchain-agentx 终端 REPL（MVP）。"""
+    if check_env and no_check_env:
+        raise click.UsageError("--check-env 与 --no-check-env 不能同时使用")
+    if no_check_env:
+        startup_check: StartupCheckMode = "off"
+    elif check_env:
+        startup_check = "strict"
+    else:
+        startup_check = "quiet"
+
     code = CliEntry().run(
         workspace_root=workspace_root,
         mode=mode,
@@ -360,5 +396,6 @@ def main(
         added_read_roots=added_read_roots,
         extra_read_roots=extra_read_roots,
         extra_write_roots=extra_write_roots,
+        startup_check=startup_check,
     )
     raise SystemExit(code)

{langchain-agentx-cli-0.3.5 → langchain-agentx-cli-0.3.7}/langchain_agentx_cli/commands/builtin/__init__.py

@@ -10,6 +10,7 @@ from langchain_agentx_cli.commands.builtin.revoke import make_revoke_command
 from langchain_agentx_cli.commands.builtin.roots import make_roots_command
 from langchain_agentx_cli.commands.builtin.clear import make_clear_command
 from langchain_agentx_cli.commands.builtin.compact import make_compact_command
+from langchain_agentx_cli.commands.builtin.doctor import make_doctor_command
 from langchain_agentx_cli.commands.builtin.help import make_help_command
 from langchain_agentx_cli.commands.builtin.model import make_model_command
 from langchain_agentx_cli.commands.builtin.quit import make_quit_command
@@ -20,6 +21,7 @@ from langchain_agentx_cli.commands.registry import CommandRegistry
 def register_builtin_commands(registry: CommandRegistry) -> None:
     for factory in (
         make_help_command,
+        make_doctor_command,
         make_clear_command,
         make_quit_command,
         make_compact_command,

langchain-agentx-cli-0.3.7/langchain_agentx_cli/commands/builtin/doctor.py

@@ -0,0 +1,74 @@
+"""
+commands/builtin/doctor.py — /doctor 环境诊断（L10）。
+
+职责：
+    调用 SDK sdk_health + preflight；合并 CLI 检查；展示 HealthReportView。
+
+链路位置：
+    CommandRegistry；可选 --save 落盘 doctor-{ts}.json。
+
+当前裁剪范围：
+    不重复 SDK 检查逻辑；无 --fix 自动修复。
+"""
+
+from __future__ import annotations
+
+from pathlib import Path
+
+from langchain_agentx_cli.commands.registry import Command, CommandContext
+from langchain_agentx_cli.health_report import build_doctor_report, save_doctor_report
+from langchain_agentx_cli.llm_config import resolve_llm_config
+from langchain_agentx_cli.tui.widgets.health_view import HealthReportView
+
+
+def _parse_doctor_args(args: str) -> dict[str, bool]:
+    tokens = {t.strip().lower() for t in args.split() if t.strip()}
+    return {
+        "save": "--save" in tokens,
+        "preflight_only": "--preflight-only" in tokens,
+    }
+
+
+async def handle_doctor(ctx: CommandContext) -> str | None:
+    flags = _parse_doctor_args(ctx.args)
+    launch = ctx.app.launch_config
+    llm = resolve_llm_config(
+        cli_provider=launch.provider,
+        cli_model=launch.model,
+    )
+    try:
+        report = await build_doctor_report(
+            workspace_root=launch.workspace_root,
+            agent_home=launch.agent_home,
+            provider=launch.provider,
+            model=llm.model,
+            base_url=llm.base_url,
+            preflight_only=flags["preflight_only"],
+        )
+    except ImportError as exc:
+        msg = (
+            "health API 不可用，请升级 SDK：\n"
+            '  pip install -U "langchain-agentx-python>=0.7.0,<0.8.0"\n'
+            f"  ({exc})"
+        )
+        ctx.output(msg)
+        return msg
+
+    ctx.app.push_screen(HealthReportView(report))
+
+    if flags["save"]:
+        path = save_doctor_report(report)
+        note = f"Saved doctor report to {path}"
+        ctx.output(note)
+        return note
+    return None
+
+
+def make_doctor_command() -> Command:
+    return Command(
+        name="doctor",
+        description="环境诊断（SDK + 网络 preflight + CLI 检查）",
+        aliases=["health"],
+        arg_names=["--save", "--preflight-only"],
+        handler=handle_doctor,
+    )

{langchain-agentx-cli-0.3.5 → langchain-agentx-cli-0.3.7}/langchain_agentx_cli/config.py

@@ -167,3 +167,5 @@ class ReplLaunchConfig:
     # 跨库边界（不含 workspace_root；透传 SDK 时再与 workspace_root 合并）
     read_roots: tuple[Path, ...] = field(default_factory=tuple)
     write_roots: tuple[Path, ...] = field(default_factory=tuple)
+    startup_check: str = field(default="quiet")
+    startup_health_report: object | None = field(default=None)