langchain-agentx-python 1.2.2__py3-none-any.whl → 1.2.5__py3-none-any.whl

langchain_agentx/__init__.py

@@ -1,64 +1,64 @@
-"""
-LangChain-based agent utilities for CodeBaseX.
-
-This package provides:
-- LangChain-AgentX LangGraph agent factory (`loop`)
-
-Typical usage:
-
-```python
-from langchain_agentx import create_loop_agent
-```
-"""
-
-__version__ = "1.2.2"
-
-from .loop import (  # noqa: F401
-    create_loop_agent,
-)
-
-from .loop.hook import (  # noqa: F401
-    ATTACHMENT_HOOK_BLOCKING_ERROR,
-    ATTACHMENT_HOOK_CANCELLED,
-    ATTACHMENT_HOOK_NON_BLOCKING_ERROR,
-    ATTACHMENT_HOOK_STOPPED_CONTINUATION,
-    ATTACHMENT_HOOK_SUCCESS,
-)
-from .observability import (  # noqa: F401
-    EventAdapterState,
-    LangchainAgentEvent,
-    LangchainAgentEventType,
-    LangGraphToLangchainAgentEventAdapter,
-    TraceCollector,
-    TraceSession,
-    TraceSpan,
-)
-from .provider import CompatibleChatOpenAI  # noqa: F401
-from .session import AgentSession, create_agent_session  # noqa: F401
-from .health import HealthCheck, HealthReport, PreflightResult, preflight, sdk_health  # noqa: F401
-from .workflow import BaseWorkflow  # noqa: F401
-
-__all__ = [
-    "ATTACHMENT_HOOK_BLOCKING_ERROR",
-    "ATTACHMENT_HOOK_CANCELLED",
-    "ATTACHMENT_HOOK_NON_BLOCKING_ERROR",
-    "ATTACHMENT_HOOK_STOPPED_CONTINUATION",
-    "ATTACHMENT_HOOK_SUCCESS",
-    "create_loop_agent",
-    "create_agent_session",
-    "AgentSession",
-    "BaseWorkflow",
-    "EventAdapterState",
-    "LangchainAgentEvent",
-    "LangchainAgentEventType",
-    "LangGraphToLangchainAgentEventAdapter",
-    "TraceCollector",
-    "TraceSession",
-    "TraceSpan",
-    "CompatibleChatOpenAI",
-    "HealthCheck",
-    "HealthReport",
-    "PreflightResult",
-    "preflight",
-    "sdk_health",
-]
+"""
+LangChain-based agent utilities for CodeBaseX.
+
+This package provides:
+- LangChain-AgentX LangGraph agent factory (`loop`)
+
+Typical usage:
+
+```python
+from langchain_agentx import create_loop_agent
+```
+"""
+
+__version__ = "1.2.5"
+
+from .loop import (  # noqa: F401
+    create_loop_agent,
+)
+
+from .loop.hook import (  # noqa: F401
+    ATTACHMENT_HOOK_BLOCKING_ERROR,
+    ATTACHMENT_HOOK_CANCELLED,
+    ATTACHMENT_HOOK_NON_BLOCKING_ERROR,
+    ATTACHMENT_HOOK_STOPPED_CONTINUATION,
+    ATTACHMENT_HOOK_SUCCESS,
+)
+from .observability import (  # noqa: F401
+    EventAdapterState,
+    LangchainAgentEvent,
+    LangchainAgentEventType,
+    LangGraphToLangchainAgentEventAdapter,
+    TraceCollector,
+    TraceSession,
+    TraceSpan,
+)
+from .provider import CompatibleChatOpenAI  # noqa: F401
+from .session import AgentSession, create_agent_session  # noqa: F401
+from .health import HealthCheck, HealthReport, PreflightResult, preflight, sdk_health  # noqa: F401
+from .workflow import BaseWorkflow  # noqa: F401
+
+__all__ = [
+    "ATTACHMENT_HOOK_BLOCKING_ERROR",
+    "ATTACHMENT_HOOK_CANCELLED",
+    "ATTACHMENT_HOOK_NON_BLOCKING_ERROR",
+    "ATTACHMENT_HOOK_STOPPED_CONTINUATION",
+    "ATTACHMENT_HOOK_SUCCESS",
+    "create_loop_agent",
+    "create_agent_session",
+    "AgentSession",
+    "BaseWorkflow",
+    "EventAdapterState",
+    "LangchainAgentEvent",
+    "LangchainAgentEventType",
+    "LangGraphToLangchainAgentEventAdapter",
+    "TraceCollector",
+    "TraceSession",
+    "TraceSpan",
+    "CompatibleChatOpenAI",
+    "HealthCheck",
+    "HealthReport",
+    "PreflightResult",
+    "preflight",
+    "sdk_health",
+]

langchain_agentx/command/prompt_shell.py

@@ -1,123 +1,123 @@
-"""
-command/prompt_shell.py — Prompt 内嵌 shell 命令执行（CC executeShellCommandsInPrompt 对齐）。
-
-职责：
-    解析并执行 prompt 中的 !`command` 占位，将输出内联替换；执行前走路由权限检查。
-
-链路位置：
-    由 command/builtin/commit* 在展开 prompt 前调用。
-"""
-
-from __future__ import annotations
-
-import re
-from collections.abc import Callable, Sequence
-from pathlib import Path
-from typing import Protocol
-
-from langchain_agentx.tool_runtime.models import ToolExecutionContext
-from langchain_agentx.tool_runtime.permission_context import set_command_bash_allow_rules
-from langchain_agentx.tool_runtime.session_store import AgentSessionStore
-from langchain_agentx.utils.subprocess_text import TextSubprocessRunner, default_text_subprocess_runner
-
-_INLINE_PATTERN = re.compile(r"!`([^`]+)`")
-
-
-class PromptShellPermissionError(RuntimeError):
-    """prompt 内嵌 shell 命令未通过 Bash 权限检查。"""
-
-
-class _ShellRunner(Protocol):
-    def run_text(
-        self,
-        argv: list[str],
-        *,
-        cwd: str | Path | None = None,
-        timeout_sec: float | None = None,
-    ) -> tuple[int, str, str]: ...
-
-
-def _default_runner_call(
-    runner: TextSubprocessRunner,
-    command: str,
-    *,
-    cwd: str | Path | None,
-) -> tuple[int, str, str]:
-    completed = runner.run(
-        ["bash", "-lc", command],
-        cwd=cwd,
-        timeout=30.0,
-        capture_output=True,
-    )
-    stdout = completed.stdout or ""
-    stderr = completed.stderr or ""
-    if completed.returncode != 0 and not stdout.strip():
-        return completed.returncode, "", stderr.strip() or f"exit {completed.returncode}"
-    return completed.returncode, stdout, stderr
-
-
-def _assert_prompt_shell_permission(
-    command: str,
-    *,
-    bash_allow_rules: Sequence[str] | None,
-    cwd: str | Path | None,
-) -> None:
-    from langchain_agentx.tools.bash.tool import BashRuntimeTool
-
-    store = AgentSessionStore("prompt-shell")
-    if bash_allow_rules:
-        set_command_bash_allow_rules(store, bash_allow_rules)
-    workspace_root = str(cwd) if cwd is not None else None
-    ctx = ToolExecutionContext(
-        tool_name="Bash",
-        tool_call_id="prompt-shell",
-        input_args={"command": command},
-        state={},
-        session_store=store,
-        workspace_root=workspace_root,
-        cwd=workspace_root,
-    )
-    l1 = BashRuntimeTool().run_l1_permission_check({"command": command}, ctx)
-    if l1.outcome == "deny":
-        message = (l1.decision.message if l1.decision else None) or "Permission denied"
-        raise PromptShellPermissionError(
-            f'Shell command permission check failed for "!`{command}`": {message}',
-        )
-
-
-async def execute_shell_commands_in_prompt(
-    text: str,
-    *,
-    cwd: str | Path | None = None,
-    runner: TextSubprocessRunner | None = None,
-    shell_runner: Callable[[str], tuple[int, str, str]] | None = None,
-    bash_allow_rules: Sequence[str] | None = None,
-    check_permissions: bool = True,
-) -> str:
-    """将 text 中所有 !`command` 替换为命令 stdout（失败时内联 stderr/exit）。"""
-    if "!`" not in text:
-        return text
-
-    text_runner = runner or default_text_subprocess_runner()
-    result = text
-
-    for match in list(_INLINE_PATTERN.finditer(text)):
-        command = match.group(1).strip()
-        if not command:
-            continue
-        if check_permissions and shell_runner is None:
-            _assert_prompt_shell_permission(
-                command,
-                bash_allow_rules=bash_allow_rules,
-                cwd=cwd,
-            )
-        if shell_runner is not None:
-            _code, stdout, stderr = shell_runner(command)
-        else:
-            _code, stdout, stderr = _default_runner_call(text_runner, command, cwd=cwd)
-        replacement = stdout.strip() if stdout.strip() else stderr.strip()
-        if not replacement:
-            replacement = "(no output)"
-        result = result.replace(match.group(0), replacement, 1)
-
-    return result
+"""
+command/prompt_shell.py — Prompt 内嵌 shell 命令执行（CC executeShellCommandsInPrompt 对齐）。
+
+职责：
+    解析并执行 prompt 中的 !`command` 占位，将输出内联替换；执行前走路由权限检查。
+
+链路位置：
+    由 command/builtin/commit* 在展开 prompt 前调用。
+"""
+
+from __future__ import annotations
+
+import re
+from collections.abc import Callable, Sequence
+from pathlib import Path
+from typing import Protocol
+
+from langchain_agentx.tool_runtime.models import ToolExecutionContext
+from langchain_agentx.tool_runtime.permission_context import set_command_bash_allow_rules
+from langchain_agentx.tool_runtime.session_store import AgentSessionStore
+from langchain_agentx.utils.subprocess_text import TextSubprocessRunner, default_text_subprocess_runner
+
+_INLINE_PATTERN = re.compile(r"!`([^`]+)`")
+
+
+class PromptShellPermissionError(RuntimeError):
+    """prompt 内嵌 shell 命令未通过 Bash 权限检查。"""
+
+
+class _ShellRunner(Protocol):
+    def run_text(
+        self,
+        argv: list[str],
+        *,
+        cwd: str | Path | None = None,
+        timeout_sec: float | None = None,
+    ) -> tuple[int, str, str]: ...
+
+
+def _default_runner_call(
+    runner: TextSubprocessRunner,
+    command: str,
+    *,
+    cwd: str | Path | None,
+) -> tuple[int, str, str]:
+    completed = runner.run(
+        ["bash", "-lc", command],
+        cwd=cwd,
+        timeout=30.0,
+        capture_output=True,
+    )
+    stdout = completed.stdout or ""
+    stderr = completed.stderr or ""
+    if completed.returncode != 0 and not stdout.strip():
+        return completed.returncode, "", stderr.strip() or f"exit {completed.returncode}"
+    return completed.returncode, stdout, stderr
+
+
+def _assert_prompt_shell_permission(
+    command: str,
+    *,
+    bash_allow_rules: Sequence[str] | None,
+    cwd: str | Path | None,
+) -> None:
+    from langchain_agentx.tools.bash.tool import BashRuntimeTool
+
+    store = AgentSessionStore("prompt-shell")
+    if bash_allow_rules:
+        set_command_bash_allow_rules(store, bash_allow_rules)
+    workspace_root = str(cwd) if cwd is not None else None
+    ctx = ToolExecutionContext(
+        tool_name="Bash",
+        tool_call_id="prompt-shell",
+        input_args={"command": command},
+        state={},
+        session_store=store,
+        workspace_root=workspace_root,
+        cwd=workspace_root,
+    )
+    l1 = BashRuntimeTool().run_l1_permission_check({"command": command}, ctx)
+    if l1.outcome == "deny":
+        message = (l1.decision.message if l1.decision else None) or "Permission denied"
+        raise PromptShellPermissionError(
+            f'Shell command permission check failed for "!`{command}`": {message}',
+        )
+
+
+async def execute_shell_commands_in_prompt(
+    text: str,
+    *,
+    cwd: str | Path | None = None,
+    runner: TextSubprocessRunner | None = None,
+    shell_runner: Callable[[str], tuple[int, str, str]] | None = None,
+    bash_allow_rules: Sequence[str] | None = None,
+    check_permissions: bool = True,
+) -> str:
+    """将 text 中所有 !`command` 替换为命令 stdout（失败时内联 stderr/exit）。"""
+    if "!`" not in text:
+        return text
+
+    text_runner = runner or default_text_subprocess_runner()
+    result = text
+
+    for match in list(_INLINE_PATTERN.finditer(text)):
+        command = match.group(1).strip()
+        if not command:
+            continue
+        if check_permissions and shell_runner is None:
+            _assert_prompt_shell_permission(
+                command,
+                bash_allow_rules=bash_allow_rules,
+                cwd=cwd,
+            )
+        if shell_runner is not None:
+            _code, stdout, stderr = shell_runner(command)
+        else:
+            _code, stdout, stderr = _default_runner_call(text_runner, command, cwd=cwd)
+        replacement = stdout.strip() if stdout.strip() else stderr.strip()
+        if not replacement:
+            replacement = "(no output)"
+        result = result.replace(match.group(0), replacement, 1)
+
+    return result

langchain_agentx/loop/config/loop_config.py

@@ -43,11 +43,13 @@ class PromptConfig:
         - QueryParams.systemPrompt → system
         - options.customSystemPrompt → override_system
         - options.appendSystemPrompt → append_system
+        - options.thinkingConfig → thinking_generation_enabled
     """
     system: str | SystemMessage | None = None
     override_system: str | None = None
     append_system: str | None = None
     dynamic_sections: tuple[SystemPromptSection, ...] = ()
+    thinking_generation_enabled: bool = True  # 是否启用 request-side thinking 生成（对齐 CC thinkingConfig）
 
 
 @dataclass(frozen=True)

langchain_agentx/loop/config/thinking_config.py

@@ -0,0 +1,105 @@
+"""loop/config/thinking_config.py — Thinking 生成配置
+
+职责：
+    定义 ThinkingConfig 数据类，根据 subagent mode (plain/fork/coordinate)
+    决定是否启用 thinking 功能。
+
+链路位置：
+    SubagentOrchestrator → ThinkingConfig.from_subagent_mode() →
+    SubagentContext.thinking_generation_enabled → AgentLoopConfig
+
+当前裁剪范围：
+    v1 基础实现：mode 驱动启用/禁用；预留父配置覆盖路径。
+
+CC 对齐：
+    - runAgent.ts:682-683: plain mode 默认 { type: 'disabled' }
+    - fork mode 继承父配置或默认启用
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any, Literal
+
+
+@dataclass(frozen=True)
+class ThinkingConfig:
+    """Thinking 生成配置（对齐 CC thinkingConfig）。
+
+    Attributes:
+        enabled: 是否启用 thinking
+        type: Thinking 类型（预留，对齐 CC { type: 'enabled' | 'disabled' }）
+        budget_tokens: Thinking token 预算（预留）
+    """
+    enabled: bool = True
+    type: Literal["enabled", "disabled", "auto"] = "auto"
+    budget_tokens: int | None = None
+
+    @classmethod
+    def disabled(cls) -> "ThinkingConfig":
+        """返回禁用配置（对齐 CC { type: 'disabled' }）。"""
+        return cls(enabled=False, type="disabled")
+
+    @classmethod
+    def enabled_config(cls) -> "ThinkingConfig":
+        """返回启用配置（对齐 CC { type: 'enabled' }）。"""
+        return cls(enabled=True, type="enabled")
+
+    @classmethod
+    def from_subagent_mode(
+        cls,
+        mode: str,
+        parent_thinking_config: Any | None = None,
+        *,
+        parent_thinking_enabled: bool | None = None,
+    ) -> "ThinkingConfig":
+        """根据 subagent mode 决定是否启用 thinking。
+
+        CC 对齐规则：
+        - plain mode: 禁用 thinking（除非父配置显式启用）
+        - fork mode: 继承父 thinking_enabled / thinkingConfig（对齐 runAgent useExactTools）
+        - coordinate mode: 同 fork，继承父配置
+
+        Args:
+            mode: Subagent 模式 ("plain" | "fork" | "coordinate")
+            parent_thinking_config: 父 ThinkingConfig 或 dict（优先于 mode 规则）
+            parent_thinking_enabled: 父 ToolExecutionContext.thinking_generation_enabled（fork/coordinate 继承）
+
+        Returns:
+            ThinkingConfig 实例
+        """
+        # 优先级 1：父显式 thinkingConfig
+        if parent_thinking_config is not None:
+            if isinstance(parent_thinking_config, dict):
+                parent_enabled = parent_thinking_config.get("enabled", True)
+                parent_type = parent_thinking_config.get("type", "auto")
+                return cls(
+                    enabled=parent_enabled,
+                    type=parent_type if parent_type in ("enabled", "disabled", "auto") else "auto",
+                )
+            elif isinstance(parent_thinking_config, ThinkingConfig):
+                return parent_thinking_config
+
+        # 优先级 2：mode 规则
+        if mode == "plain":
+            return cls.disabled()
+
+        # fork / coordinate：继承父 loop thinking_enabled（CC fork inherit）
+        if parent_thinking_enabled is not None:
+            enabled = bool(parent_thinking_enabled)
+            return cls(
+                enabled=enabled,
+                type="enabled" if enabled else "disabled",
+            )
+
+        return cls.enabled_config()
+
+    def to_dict(self) -> dict[str, Any]:
+        """转换为字典（传递给 Provider）。"""
+        return {
+            "enabled": self.enabled,
+            "type": self.type,
+        }
+
+
+__all__ = ["ThinkingConfig"]

langchain_agentx/loop/config/ui_display_context.py

@@ -0,0 +1,58 @@
+"""loop/config/ui_display_context.py — UI 展示意图（CLI → SDK seam）
+
+职责：
+    定义宿主（CLI）注入的 transcript / verbose / thinking 展示意图；
+    供 ToolExecutionContext 与 SubagentOrchestrator 读取。
+
+链路位置：
+    RunnableConfig.configurable["ui_display_context"] → LangChainAdapter → ToolExecutionContext
+
+当前裁剪范围：
+    仅数据契约与解析；不做 TUI 渲染（langchain_agentx_cli 职责）。
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any, Mapping
+
+
+@dataclass(frozen=True)
+class UiDisplayContext:
+    """宿主 UI 展示意图（对齐 CC verbose + isTranscriptMode）。"""
+
+    is_transcript_mode: bool = False
+    verbose: bool = False
+    show_thinking: bool | None = None
+
+    @classmethod
+    def from_mapping(cls, raw: Mapping[str, Any] | None) -> UiDisplayContext | None:
+        if not raw or not isinstance(raw, Mapping):
+            return None
+        is_transcript = bool(raw.get("is_transcript_mode", False))
+        verbose = bool(raw.get("verbose", False))
+        show_thinking_raw = raw.get("show_thinking")
+        show_thinking = None if show_thinking_raw is None else bool(show_thinking_raw)
+        return cls(
+            is_transcript_mode=is_transcript,
+            verbose=verbose,
+            show_thinking=show_thinking,
+        )
+
+    @classmethod
+    def from_configurable(cls, configurable: Mapping[str, Any] | None) -> UiDisplayContext | None:
+        if not configurable:
+            return None
+        raw = configurable.get("ui_display_context")
+        if isinstance(raw, UiDisplayContext):
+            return raw
+        if isinstance(raw, Mapping):
+            return cls.from_mapping(raw)
+        return None
+
+    def should_show_thinking_full(self) -> bool:
+        """对齐 CC Message.tsx：verbose || isTranscriptMode 时展示完整 thinking。"""
+        return self.verbose or self.is_transcript_mode
+
+
+__all__ = ["UiDisplayContext"]