langchain-agentx-python 0.6.2__tar.gz → 0.6.3__tar.gz

{langchain-agentx-python-0.6.2 → langchain-agentx-python-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langchain-agentx-python
-Version: 0.6.2
+Version: 0.6.3
 Summary: LangChain/LangGraph-based agent utilities for CodeBaseX.
 Author-email: GoodMood2008 <GoodMood2008@users.noreply.github.com>
 License:                                  Apache License

{langchain-agentx-python-0.6.2 → langchain-agentx-python-0.6.3}/langchain_agentx/__init__.py

@@ -11,7 +11,7 @@ from langchain_agentx import create_loop_agent
 ```
 """
 
-__version__ = "0.6.2"
+__version__ = "0.6.3"
 
 from .loop import (  # noqa: F401
     create_loop_agent,

{langchain-agentx-python-0.6.2 → langchain-agentx-python-0.6.3}/langchain_agentx/loop/config/__init__.py

@@ -1,5 +1,5 @@
 from .agent_config import build_agent_config, merge_run_config
-from .agent_loop_config import AgentLoopConfig
+from .loop_config import AgentLoopConfig
 from .model_context_resolver import ModelContextResolver
 from .token_estimator import TokenEstimator
 from .runtime_settings import (

{langchain-agentx-python-0.6.2 → langchain-agentx-python-0.6.3}/langchain_agentx/loop/config/loop_config.py

@@ -1,4 +1,4 @@
-"""loop_config.py — Agent Loop 配置数据结构（Phase 1 双轨上线）
+"""loop_config.py — Agent Loop 配置数据结构（config-first 模式）
 
 职责：
     定义 AgentLoopConfig（数据控制面）和 LoopServices（资源控制面），
@@ -12,24 +12,22 @@ CC 对照：
     ToolUseContext.options（控制面）的组合。
 
 当前裁剪范围：
-    Phase 1 双轨上线：新旧签名共存，legacy_kwargs 转换函数兼容。
+    Phase 3 已完成：config-first 模式为唯一入口，legacy kwargs 已删除。
     本文件包含嵌套子结构定义，暂不引入 LoopDeps（等触发条件满足）。
-
-Phase 1 后续：
-    Phase 2 迁移期：旧 kwargs 升 DeprecationWarning
-    Phase 3 终态：删除 legacy 转换层
 """
 
 from __future__ import annotations
 
-from dataclasses import dataclass, field
-from typing import Any, Callable
+from dataclasses import dataclass, field, replace
+from pathlib import Path
+from typing import Any, Callable, Sequence
 
 from langchain_core.messages import SystemMessage
 from langchain_core.language_models.chat_models import BaseChatModel
 
 from langchain_agentx.loop.prompt import SystemPromptSection
 from langchain_agentx.provider.model_profile import ModelProfile, ModelProfileRegistry
+from langchain_agentx.task_runtime import QueuePriority
 
 
 # ============================================================================
@@ -58,7 +56,7 @@ class WorkspaceConfig:
 
     CC 对照：无直接对应，SDK 特化的边界控制。
     """
-    workspace_root: str | None = None
+    workspace_root: str | Path | None = None
     agent_home: str = ".langchain_agentx"
     read_roots: tuple[str, ...] = ()
     write_roots: tuple[str, ...] = ()
@@ -118,8 +116,8 @@ class AgentLoopConfig:
     # -----------------------------------------------------------------------
     # 标识
     # -----------------------------------------------------------------------
-    session_id: str = ""
-    conversation_session_id: str = ""
+    session_id: str | None = None
+    conversation_session_id: str | None = None
     agent_id: str | None = None
     name: str | None = None
     container_type: str | None = None
@@ -138,7 +136,7 @@ class AgentLoopConfig:
     # 运行模式
     # -----------------------------------------------------------------------
     debug: bool = False
-    headless: bool = False
+    headless: bool | None = None
     permission_mode: str = "default"
     network_access_allowed: bool = True
     enable_session_memory: bool = False
@@ -148,7 +146,7 @@ class AgentLoopConfig:
     # -----------------------------------------------------------------------
     # 任务规则
     # -----------------------------------------------------------------------
-    task_notification_max_priority: Any = "NEXT"  # QueuePriority
+    task_notification_max_priority: QueuePriority = QueuePriority.NEXT
     managed_rules: str | None = None
 
     # -----------------------------------------------------------------------
@@ -166,6 +164,48 @@ class AgentLoopConfig:
     trace: TraceConfig = field(default_factory=TraceConfig)
     subagent: SubagentLinkage = field(default_factory=SubagentLinkage)
 
+    # -----------------------------------------------------------------------
+    # 便捷构造器
+    # -----------------------------------------------------------------------
+
+    @classmethod
+    def simple(
+        cls,
+        *,
+        system_prompt: str | SystemMessage | None = None,
+        max_steps: int | None = None,
+        workspace_root: str | Path | None = None,
+        agent_home: str = ".langchain_agentx",
+        read_roots: tuple[str, ...] = (),
+        write_roots: tuple[str, ...] = (),
+        **flat_overrides: Any,
+    ) -> "AgentLoopConfig":
+        """便捷构造：覆盖最常见的 5-6 个字段，其它走默认。
+
+        Args:
+            system_prompt: 系统提示词
+            max_steps: 最大步数
+            workspace_root: 工作区根目录
+            agent_home: agent_home 目录
+            read_roots: 只读根目录
+            write_roots: 只写根目录
+            **flat_overrides: 其他字段直接透传到 AgentLoopConfig
+
+        Returns:
+            配置好的 AgentLoopConfig 实例
+        """
+        return cls(
+            max_steps=max_steps,
+            prompt=PromptConfig(system=system_prompt),
+            workspace=WorkspaceConfig(
+                workspace_root=workspace_root,
+                agent_home=agent_home,
+                read_roots=read_roots,
+                write_roots=write_roots,
+            ),
+            **flat_overrides,
+        )
+
 
 # ============================================================================
 # LoopServices — 资源控制面（全 optional）
@@ -199,7 +239,7 @@ class LoopServices:
     trace_collector: Any = None  # TraceCollector
 
     # 外部队列与活跃文件
-    queued_command_providers: tuple[Any, ...] = ()
+    queued_command_providers: Sequence[Any] = field(default_factory=tuple)
     active_files_getter: Callable[[], list[str]] | None = None
 
 

{langchain-agentx-python-0.6.2 → langchain-agentx-python-0.6.3}/langchain_agentx/loop/config/model_context_resolver.py

@@ -19,7 +19,7 @@ from typing import Any
 
 from langchain_agentx.provider.model_profile import ModelProfileRegistry
 
-from .agent_loop_config import AgentLoopConfig
+from .loop_config import AgentLoopConfig
 
 
 class ModelContextResolver:

{langchain-agentx-python-0.6.2 → langchain-agentx-python-0.6.3}/langchain_agentx/loop/graph/factory.py

@@ -99,7 +99,6 @@ from ..prompt import SystemPromptSection, build_effective_system_prompt
 from ..prompt.session_context import get_default_session_context_sections
 from ...tools.agent.prompt import build_explore_plan_guidance
 from ..config import ModelContextResolver
-from ..config.agent_loop_config import AgentLoopConfig as LegacyAgentLoopConfig
 from ..config.loop_config import (
     AgentLoopConfig,
     LoopServices,
@@ -126,147 +125,6 @@ DYNAMIC_TOOL_ERROR_TEMPLATE = (
 # ═══════════════════════════════════════════════════════════════════════════════
 
 
-def _legacy_kwargs_to_config_services(
-    model: str | BaseChatModel,
-    *,
-    system_prompt: str | SystemMessage | None = None,
-    override_system_prompt: str | None = None,
-    append_system_prompt: str | None = None,
-    dynamic_sections: "Sequence[SystemPromptSection] | None" = None,
-    response_format: Any = None,
-    fallback_model: "BaseChatModel | None" = None,
-    enable_tool_call_degradation_fix: bool = True,
-    session_id: str | None = None,
-    session_store: "AgentSessionStore | None" = None,
-    loader: "ToolRuntimeLoader | None" = None,
-    prompt_handler: Any = None,
-    permission_resolver: Any = None,
-    state_schema: type | None = None,
-    context_schema: type | None = None,
-    debug: bool = False,
-    name: str | None = None,
-    max_steps: int | None = None,
-    max_turns: int | None = None,
-    is_subagent: bool = False,
-    subagent_type: str | None = None,
-    container_type: str | None = None,
-    enable_trace: bool = True,
-    trace_collector: TraceCollector | None = None,
-    parent_run_id: str | None = None,
-    parent_tool_call_id: str | None = None,
-    parent_conversation_session_id: str | None = None,
-    trace_visibility: str | None = None,
-    task_runtime: TaskRuntime | None = None,
-    task_notification_max_priority: Any = "NEXT",
-    queued_command_providers: "Sequence[Any]" = (),
-    managed_rules: str | None = None,
-    active_files_getter: "Callable[[], list[str]] | None" = None,
-    workspace_root: str | Path | None = None,
-    read_roots: "list[str | Path] | None" = None,
-    write_roots: "list[str | Path] | None" = None,
-    agent_home: str = ".langchain_agentx",
-    workspace_trust_accepted: bool | None = None,
-    raw_hooks: "HookRegistry | None" = None,
-    enable_session_memory: bool = False,
-    capabilities: "RuntimeCapabilities | None" = None,
-    enable_git_snapshot: bool | None = None,
-    include_default_session_context: bool = True,
-    enable_dynamic_root_grant: bool = False,
-    headless: bool | None = None,
-) -> tuple[AgentLoopConfig, LoopServices, type | None, type | None]:
-    """将 legacy kwargs 转换为 config + services 双对象。
-
-    Phase 1 双轨上线：本函数负责兼容旧 44 kwargs 调用方式。
-    未来 Phase 3 将删除此函数。
-
-    Returns:
-        (AgentLoopConfig, LoopServices, state_schema, context_schema)
-    """
-    # 动态 sections 转为 tuple
-    dynamic_sections_tuple = tuple(dynamic_sections or [])
-
-    # read_roots / write_roots 转为 tuple
-    read_roots_tuple = tuple(str(p) for p in read_roots) if read_roots else ()
-    write_roots_tuple = tuple(str(p) for p in write_roots) if write_roots else ()
-
-    # queued_command_providers 转为 tuple
-    queued_providers_tuple = tuple(queued_command_providers) if queued_command_providers else ()
-
-    # 构造嵌套子结构
-    prompt_config = PromptConfig(
-        system=system_prompt,
-        override_system=override_system_prompt,
-        append_system=append_system_prompt,
-        dynamic_sections=dynamic_sections_tuple,
-    )
-
-    workspace_config = WorkspaceConfig(
-        workspace_root=str(workspace_root) if workspace_root else None,
-        agent_home=agent_home,
-        read_roots=read_roots_tuple,
-        write_roots=write_roots_tuple,
-        workspace_trust_accepted=workspace_trust_accepted,
-        enable_dynamic_root_grant=enable_dynamic_root_grant,
-    )
-
-    trace_config = TraceConfig(
-        enabled=enable_trace,
-        visibility=trace_visibility,
-        parent_run_id=parent_run_id,
-        parent_tool_call_id=parent_tool_call_id,
-        parent_conversation_session_id=parent_conversation_session_id,
-    )
-
-    subagent_config = SubagentLinkage(
-        is_subagent=is_subagent,
-        subagent_type=subagent_type,
-        agent_depth=0,  # 将在 _resolve_session_headless() 中从父继承
-        parent_agent_id=None,  # 将在子代理派生时设置
-    )
-
-    # 构造 AgentLoopConfig
-    config = AgentLoopConfig(
-        model=model,
-        fallback_model=fallback_model,
-        response_format=response_format,
-        enable_tool_call_degradation_fix=enable_tool_call_degradation_fix,
-        session_id=session_id or "",
-        conversation_session_id=parent_conversation_session_id or "",
-        agent_id=None,
-        name=name,
-        container_type=container_type,
-        max_steps=max_steps,
-        max_turns=max_turns,
-        debug=debug,
-        headless=headless if headless is not None else False,
-        permission_mode="default",
-        network_access_allowed=True,
-        enable_session_memory=enable_session_memory,
-        enable_git_snapshot=enable_git_snapshot,
-        include_default_session_context=include_default_session_context,
-        task_notification_max_priority=task_notification_max_priority,
-        managed_rules=managed_rules,
-        prompt=prompt_config,
-        workspace=workspace_config,
-        trace=trace_config,
-        subagent=subagent_config,
-    )
-
-    # 构造 LoopServices
-    services = LoopServices(
-        loader=loader,
-        prompt_handler=prompt_handler,
-        permission_resolver=permission_resolver,
-        capabilities=capabilities,
-        session_store=session_store,
-        hooks=raw_hooks,
-        task_runtime=task_runtime,
-        trace_collector=trace_collector,
-        queued_command_providers=queued_providers_tuple,
-        active_files_getter=active_files_getter,
-    )
-
-    return config, services, state_schema, context_schema
 
 
 def _resolve_model_conflict(
@@ -332,15 +190,36 @@ def _sanity_check_config(
         )
 
 
-def _convert_to_legacy_config(config: AgentLoopConfig) -> LegacyAgentLoopConfig:
-    """将新的 AgentLoopConfig 转换为旧的 LegacyAgentLoopConfig。
+class _FlatLoopConfig:
+    """扁平化的 LoopConfig，支持属性访问（兼容 getattr）。
 
-    用于 Phase 1 双轨兼容：下游代码（如 ModelContextResolver、configurable 注入）
-    仍期望旧的 mutable dataclass。
+    下游代码使用 getattr(loop_config, "key", default) 访问配置，
+    因此不能用普通 dict。本类提供属性访问接口。
 
-    TODO Phase 3: 删除本函数，下游直接使用新的 AgentLoopConfig。
+    __getattr__ 对缺失字段返回 None，与 legacy dataclass 行为对齐。
     """
-    return LegacyAgentLoopConfig(
+
+    def __init__(self, **kwargs: Any) -> None:
+        self._data = kwargs
+
+    def __getattr__(self, name: str) -> Any:
+        # 返回 None 而非抛出异常，与 legacy dataclass 行为对齐
+        return self._data.get(name)
+
+    def get(self, key: str, default: Any = None) -> Any:
+        return self._data.get(key, default)
+
+    def __contains__(self, key: str) -> bool:
+        return key in self._data
+
+
+def _flatten_config_for_runtime(config: AgentLoopConfig) -> _FlatLoopConfig:
+    """将嵌套的 AgentLoopConfig 扁平化为运行时兼容的对象。
+
+    下游代码期望扁平结构（如 workspace_root、trace_enabled），但新 config 使用嵌套结构。
+    本函数创建一个扁平视图，支持属性访问以兼容 getattr()。
+    """
+    return _FlatLoopConfig(
         model=config.model,
         fallback_model=config.fallback_model,
         max_steps=config.max_steps,
@@ -351,12 +230,9 @@ def _convert_to_legacy_config(config: AgentLoopConfig) -> LegacyAgentLoopConfig:
         available_tools=[],  # 由 _prepare_for_model_nodes 填充
         network_access_allowed=config.network_access_allowed,
         permission_mode=config.permission_mode,
-        permission_resolver=None,  # 使用 prompt_handler 替代
-        prompt_handler=None,  # 由 services 提供
         workspace_root=config.workspace.workspace_root,
         agent_home=config.workspace.agent_home,
         cwd=None,  # 由 boundary_view.resolve_cwd() 动态计算
-        boundary=None,  # 由 _resolve_workspace_config 设置
         enable_dynamic_root_grant=config.workspace.enable_dynamic_root_grant,
         session_id=config.session_id,
         conversation_session_id=config.conversation_session_id,
@@ -545,16 +421,7 @@ class LoopGraphBuilder:
             )
 
         # 使用已有的 config（frozen，不可修改），但需要添加运行时计算的值
-        # 注意：AgentLoopConfig 是 frozen，所以不能直接修改字段
         # 运行时需要的额外值存储在 self._* 字段中
-        self._loop_config_runtime = {
-            "available_tools": self._available_tools,
-            "permission_resolver": self._services.permission_resolver,
-            "prompt_handler": self._services.prompt_handler,
-            "boundary": self._workspace_boundary,
-            "trace_enabled": self._config.trace.enabled,
-            "headless_runtime": self._resolve_session_headless(),
-        }
 
         self._compaction_settings = self._build_compaction_settings()
         self._loop_context_compaction = default_loop_context_compaction().with_default_pipeline(
@@ -1534,9 +1401,15 @@ class LoopGraphBuilder:
         )
         # Consolidate all configurable keys to avoid with_config overwrite bug
         # (RunnableBinding.with_config does shallow merge, so second "configurable" replaces first)
-        # Phase 1: 转换为旧 AgentLoopConfig 以保持下游兼容性
+        # 将嵌套的 AgentLoopConfig 扁平化以兼容下游代码
+        flat_config = _flatten_config_for_runtime(self._config)
+        # P1 #4: 注入 boundary 和 available_tools 到 flat_config
+        flat_config._data["boundary"] = self._workspace_boundary
+        flat_config._data["available_tools"] = self._available_tools
         configurable_dict: dict[str, Any] = {
-            "loop_config": _convert_to_legacy_config(self._config)
+            "loop_config": flat_config,
+            "permission_resolver": self._services.permission_resolver,
+            "prompt_handler": self._services.prompt_handler,
         }
         if self._services.capabilities is not None:
             configurable_dict["capabilities"] = self._services.capabilities
@@ -1580,184 +1453,31 @@ class LoopGraphBuilder:
 def create_loop_agent(
     model: str | BaseChatModel,
     *,
-    # Phase 1 新增：config + services 双对象入参
     config: "AgentLoopConfig | None" = None,
     services: "LoopServices | None" = None,
-    # Phase 1 兼容：保留 legacy kwargs（44 个）
-    # Prompt 配置
-    system_prompt: str | SystemMessage | None = None,
-    override_system_prompt: str | None = None,
-    append_system_prompt: str | None = None,
-    dynamic_sections: Sequence[SystemPromptSection] = (),
-    # Model 配置
-    response_format: ResponseFormat[ResponseT] | type[ResponseT] | dict[str, Any] | None = None,
-    fallback_model: BaseChatModel | None = None,
-    enable_tool_call_degradation_fix: bool = True,
-    # Session / Runtime 配置
-    session_id: str | None = None,
-    session_store: "AgentSessionStore | None" = None,
-    loader: "ToolRuntimeLoader | None" = None,
-    prompt_handler: Any | None = None,
-    permission_resolver: Any | None = None,
-    # Graph / Runtime 基础配置
     state_schema: type[AgentState[ResponseT]] | None = None,
     context_schema: type[ContextT] | None = None,
-    debug: bool = False,
-    name: str | None = None,
-    # LangChain AgentX 特有参数
-    max_steps: int | None = None,
-    max_turns: int | None = None,
-    is_subagent: bool = False,
-    subagent_type: str | None = None,
-    container_type: str | None = None,
-    # Observability
-    enable_trace: bool = True,
-    trace_collector: TraceCollector | None = None,
-    parent_run_id: str | None = None,
-    parent_tool_call_id: str | None = None,
-    parent_conversation_session_id: str | None = None,
-    trace_visibility: str | None = None,
-    # Task Runtime / Provider
-    task_runtime: TaskRuntime | None = None,
-    task_notification_max_priority: QueuePriority = QueuePriority.NEXT,
-    queued_command_providers: Sequence[QueuedCommandProvider] = (),
-    managed_rules: str | None = None,
-    active_files_getter: "Callable[[], list[str]] | None" = None,
-    workspace_root: str | Path | None = None,
-    read_roots: list[str | Path] | None = None,
-    write_roots: list[str | Path] | None = None,
-    agent_home: str = ".langchain_agentx",
-    workspace_trust_accepted: bool | None = None,
-    hooks: "HookRegistry | None" = None,
-    enable_session_memory: bool = False,
-    capabilities: "RuntimeCapabilities | None" = None,
-    enable_git_snapshot: bool | None = None,
-    include_default_session_context: bool = True,
-    enable_dynamic_root_grant: bool = False,
-    headless: bool | None = None,
 ) -> CompiledStateGraph[
     AgentState[ResponseT], ContextT, _InputAgentState, _OutputAgentState[ResponseT]
 ]:
     """创建 LangChain AgentX agent loop。
 
-    Phase 1 双轨上线：
-        - 新调用方式：config=AgentLoopConfig(...), services=LoopServices(...)
-        - 旧调用方式：保持 44 kwargs 兼容（静默，无 warning）
+    Phase 3 终态：config-first 模式为唯一入口。
 
     Args:
         model: 模型 id 字符串或 BaseChatModel 实例。
             可与 config.model 协调（双源规则见 _resolve_model_conflict）。
         config: AgentLoopConfig 数据控制面。未填用全默认。
-        services: LoopServices 资源控制面。所有字段 optional。
-        **kwargs: 旧 44 kwargs（Phase 1 兼容，Phase 3 删除）。
+        services: LoopServices 资源控制面。未填用全默认。
+        state_schema: 可选的自定义状态 schema。
+        context_schema: 可选的自定义上下文 schema。
 
     Returns:
         CompiledStateGraph: 编译后的 agent 图。
     """
-    # 检测是否使用旧 kwargs（任意一个非默认值）
-    has_legacy_kwargs = any(
-        v is not None
-        for v in [
-            system_prompt,
-            override_system_prompt,
-            append_system_prompt,
-            response_format,
-            fallback_model,
-            session_id,
-            session_store,
-            loader,
-            prompt_handler,
-            permission_resolver,
-            debug,
-            name,
-            max_steps,
-            max_turns,
-            is_subagent,
-            subagent_type,
-            container_type,
-            enable_trace,
-            trace_collector,
-            parent_run_id,
-            parent_tool_call_id,
-            parent_conversation_session_id,
-            trace_visibility,
-            task_runtime,
-            managed_rules,
-            active_files_getter,
-            workspace_root,
-            read_roots,
-            write_roots,
-            workspace_trust_accepted,
-            hooks,
-            enable_session_memory,
-            capabilities,
-            enable_git_snapshot,
-            include_default_session_context,
-            enable_dynamic_root_grant,
-            headless,
-        ]
-    ) or dynamic_sections or queued_command_providers or task_notification_max_priority != "NEXT"
-
-    if has_legacy_kwargs:
-        # Phase 1：使用 legacy kwargs 转换函数
-        cfg, svcs, st_schema, ctx_schema = _legacy_kwargs_to_config_services(
-            model,
-            system_prompt=system_prompt,
-            override_system_prompt=override_system_prompt,
-            append_system_prompt=append_system_prompt,
-            dynamic_sections=dynamic_sections,
-            response_format=response_format,
-            fallback_model=fallback_model,
-            enable_tool_call_degradation_fix=enable_tool_call_degradation_fix,
-            session_id=session_id,
-            session_store=session_store,
-            loader=loader,
-            prompt_handler=prompt_handler,
-            permission_resolver=permission_resolver,
-            state_schema=state_schema,
-            context_schema=context_schema,
-            debug=debug,
-            name=name,
-            max_steps=max_steps,
-            max_turns=max_turns,
-            is_subagent=is_subagent,
-            subagent_type=subagent_type,
-            container_type=container_type,
-            enable_trace=enable_trace,
-            trace_collector=trace_collector,
-            parent_run_id=parent_run_id,
-            parent_tool_call_id=parent_tool_call_id,
-            parent_conversation_session_id=parent_conversation_session_id,
-            trace_visibility=trace_visibility,
-            task_runtime=task_runtime,
-            task_notification_max_priority=task_notification_max_priority,
-            queued_command_providers=queued_command_providers,
-            managed_rules=managed_rules,
-            active_files_getter=active_files_getter,
-            workspace_root=workspace_root,
-            read_roots=read_roots,
-            write_roots=write_roots,
-            agent_home=agent_home,
-            workspace_trust_accepted=workspace_trust_accepted,
-            raw_hooks=hooks,
-            enable_session_memory=enable_session_memory,
-            capabilities=capabilities,
-            enable_git_snapshot=enable_git_snapshot,
-            include_default_session_context=include_default_session_context,
-            enable_dynamic_root_grant=enable_dynamic_root_grant,
-            headless=headless,
-        )
-        # 使用显式 state_schema/context_schema（如果有）
-        if state_schema is not None:
-            st_schema = state_schema
-        if context_schema is not None:
-            ctx_schema = context_schema
-    else:
-        # Phase 1：使用新的 config + services
-        cfg = config if config is not None else AgentLoopConfig()
-        svcs = services if services is not None else LoopServices()
-        st_schema = state_schema
-        ctx_schema = context_schema
+    # 使用 config + services（未填时用默认值）
+    cfg = config if config is not None else AgentLoopConfig()
+    svcs = services if services is not None else LoopServices()
 
     # model 双源协调
     resolved_model = _resolve_model_conflict(model, cfg.model)
@@ -1773,13 +1493,13 @@ def create_loop_agent(
     builder = LoopGraphBuilder(
         config=cfg,
         services=svcs,
-        state_schema=st_schema,
-        context_schema=ctx_schema,
+        state_schema=state_schema,
+        context_schema=context_schema,
     )
     tool_node = builder._build_tool_node()
     model_node = builder._build_model_nodes(tool_node)
     state_schemas: set[type] = set()
-    base_state = st_schema if st_schema is not None else AgentState
+    base_state = state_schema if state_schema is not None else AgentState
     state_schemas.add(base_state)
     state_schemas.add(LoopAgentStateFields)
     resolved_state_schema = _resolve_schema(state_schemas, "StateSchema", None)

{langchain-agentx-python-0.6.2 → langchain-agentx-python-0.6.3}/langchain_agentx/loop/runtime/context_factory.py

@@ -15,8 +15,14 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
 from langchain_agentx.workspace import resolve_agent_workspace_config
+from langchain_agentx.loop.config.loop_config import (
+    AgentLoopConfig,
+    WorkspaceConfig,
+    TraceConfig,
+    SubagentLinkage,
+)
 
-from .context import AgentLoopConfig, SubagentContextOverrides
+from .context import SubagentContextOverrides
 
 if TYPE_CHECKING:
     from langchain_agentx.tool_runtime.models import ToolExecutionContext
@@ -91,17 +97,24 @@ class RuntimeContextFactory:
             else getattr(parent_ctx, "cwd", None)
         )
 
+        # 构建嵌套子结构 (Phase 3: 新的 frozen AgentLoopConfig)
         return AgentLoopConfig(
             model=resolved_model,
             session_id=getattr(parent_ctx, "session_id", "") or "",
             agent_id=agent_id,
-            parent_agent_id=getattr(parent_ctx, "agent_id", None),
             agent_depth=(parent_ctx.agent_depth or 0) + 1,
             max_steps=resolved_max_steps,
-            available_tools=resolved_tools,
             permission_mode=resolved_permission,
-            workspace_root=workspace_cfg.workspace_root,
-            agent_home=workspace_cfg.agent_home,
-            cwd=resolved_cwd,
-            trace_enabled=bool(getattr(parent_ctx, "trace_enabled", True)),
+            # 注意: available_tools 在新 config 中不是字段，由 _flatten_config_for_runtime 注入
+            workspace=WorkspaceConfig(
+                workspace_root=workspace_cfg.workspace_root,
+                agent_home=workspace_cfg.agent_home,
+            ),
+            trace=TraceConfig(
+                enabled=bool(getattr(parent_ctx, "trace_enabled", True)),
+            ),
+            subagent=SubagentLinkage(
+                is_subagent=True,
+                parent_agent_id=getattr(parent_ctx, "agent_id", None),
+            ),
         )