langchain-agentx-python 0.7.5__tar.gz → 0.7.7__tar.gz

{langchain-agentx-python-0.7.5 → langchain-agentx-python-0.7.7}/PKG-INFO

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

{langchain-agentx-python-0.7.5 → langchain-agentx-python-0.7.7}/langchain_agentx/__init__.py

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

{langchain-agentx-python-0.7.5 → langchain-agentx-python-0.7.7}/langchain_agentx/command/context.py

@@ -16,14 +16,14 @@ from __future__ import annotations
 from dataclasses import dataclass, field
 from typing import Any
 
-from ..workspace.config import AgentWorkspaceConfig
+from ..workspace.config import ResolvedAgentStateConfig
 
 
 @dataclass
 class CommandContext:
     session_id: str
     session: Any
-    workspace_cfg: AgentWorkspaceConfig
+    workspace_cfg: ResolvedAgentStateConfig
     hook_engine: Any | None = None
     plugin_loader: Any | None = None
     extra: dict[str, Any] = field(default_factory=dict)

{langchain-agentx-python-0.7.5 → langchain-agentx-python-0.7.7}/langchain_agentx/health/__init__.py

@@ -31,15 +31,25 @@ __all__ = [
 
 def sdk_health(
     workspace_root: str | Path | None = None,
-    agent_home: str | None = None,
+    agent_home_segment: str | None = None,
     *,
     quick: bool = False,
     coordinator: HealthCoordinator | None = None,
 ) -> HealthReport:
-    """运行 L6 健康检查；quick=True 跳过外部命令探测（预算 < 50ms）。"""
+    """运行 L6 健康检查；quick=True 跳过外部命令探测（预算 < 50ms）。
+
+    Args:
+        workspace_root: 工作空间根目录
+        agent_home_segment: agent home 子目录名（如 .claude、.cursor）
+        quick: 快速模式，跳过外部命令探测
+        coordinator: 自定义检查协调器
+
+    Returns:
+        HealthReport: 健康检查报告
+    """
     ctx = HealthCheckContext(
         workspace_root=workspace_root,
-        agent_home=agent_home,
+        agent_home_segment=agent_home_segment,
         quick=quick,
     )
     runner = coordinator or HealthCoordinator()

{langchain-agentx-python-0.7.5 → langchain-agentx-python-0.7.7}/langchain_agentx/health/checks.py

@@ -29,7 +29,7 @@ from langchain_agentx.provider.env import get_env_first
 from langchain_agentx.provider.model_profile import ModelProfileRegistry
 from langchain_agentx.utils.host_platform import HostPlatform, get_host_platform
 from langchain_agentx.utils.rg_executable import default_rg_executable
-from langchain_agentx.workspace import resolve_agent_workspace_config
+from langchain_agentx.workspace import resolve_agent_state_config
 
 from .models import HealthCheck
 
@@ -52,8 +52,9 @@ class CommandLocator(Protocol):
 
 @dataclass
 class HealthCheckContext:
+    """健康检查上下文。"""
     workspace_root: str | Path | None
-    agent_home: str | None
+    agent_home_segment: str | None
     quick: bool
 
 
@@ -186,16 +187,16 @@ class WorkspaceChecker(HealthChecker):
 
     def run(self, ctx: HealthCheckContext) -> HealthCheck:
         try:
-            cfg = resolve_agent_workspace_config(
+            cfg = resolve_agent_state_config(
                 workspace_root=ctx.workspace_root,
-                agent_home=ctx.agent_home,
+                agent_home_segment=ctx.agent_home_segment,
             )
         except Exception as exc:
             return HealthCheck(
                 name="workspace_root",
                 status="fail",
                 detail=str(exc),
-                hint="检查 workspace_root / agent_home 配置",
+                hint="检查 workspace_root / agent_home_segment 配置",
                 category="workspace",
             )
         root = cfg.workspace_root
@@ -228,22 +229,22 @@ class AgentHomeChecker(HealthChecker):
 
     def run(self, ctx: HealthCheckContext) -> HealthCheck:
         try:
-            cfg = resolve_agent_workspace_config(
+            cfg = resolve_agent_state_config(
                 workspace_root=ctx.workspace_root,
-                agent_home=ctx.agent_home,
+                agent_home_segment=ctx.agent_home_segment,
             )
         except Exception as exc:
             return HealthCheck(
-                name="agent_home",
+                name="agent_home_segment",
                 status="fail",
                 detail=str(exc),
-                hint="显式传 agent_home，不要依赖目录扫描",
+                hint="显式传 agent_home_segment，不要依赖目录扫描",
                 category="workspace",
             )
         return HealthCheck(
-            name="agent_home",
+            name="agent_home_segment",
             status="ok",
-            detail=f"{cfg.agent_home} → {cfg.agent_home_dir}",
+            detail=f"{cfg.agent_home_segment} → {cfg.agent_home_dir}",
             category="workspace",
         )
 
@@ -253,9 +254,9 @@ class DatabasePathsChecker(HealthChecker):
 
     def run(self, ctx: HealthCheckContext) -> HealthCheck:
         try:
-            cfg = resolve_agent_workspace_config(
+            cfg = resolve_agent_state_config(
                 workspace_root=ctx.workspace_root,
-                agent_home=ctx.agent_home,
+                agent_home_segment=ctx.agent_home_segment,
             )
         except Exception as exc:
             return HealthCheck(
@@ -420,9 +421,9 @@ class ProviderModelChecker(HealthChecker):
     def run(self, ctx: HealthCheckContext) -> HealthCheck:
         model = get_env_first("LANGCHAIN_AGENTX_MODEL") or "gpt-4o-mini"
         try:
-            cfg = resolve_agent_workspace_config(
+            cfg = resolve_agent_state_config(
                 workspace_root=ctx.workspace_root,
-                agent_home=ctx.agent_home,
+                agent_home_segment=ctx.agent_home_segment,
             )
             registry = ModelProfileRegistry.from_files(agent_home_dir=cfg.agent_home_dir)
         except Exception as exc:
@@ -454,9 +455,9 @@ class ConfigChecker(HealthChecker):
 
     def run(self, ctx: HealthCheckContext) -> HealthCheck:
         try:
-            cfg = resolve_agent_workspace_config(
+            cfg = resolve_agent_state_config(
                 workspace_root=ctx.workspace_root,
-                agent_home=ctx.agent_home,
+                agent_home_segment=ctx.agent_home_segment,
             )
         except Exception as exc:
             return HealthCheck(

{langchain-agentx-python-0.7.5 → langchain-agentx-python-0.7.7}/langchain_agentx/loop/benchmark_frozen_config.py

@@ -24,7 +24,7 @@ from typing import Any
 import pytest
 from langchain_core.language_models.fake_chat_models import FakeListChatModel
 
-from .config.loop_config import AgentLoopConfig, LoopServices, PromptConfig, WorkspaceConfig, TraceConfig, SubagentLinkage
+from .config.loop_config import AgentLoopConfig, LoopServices, PromptConfig, AgentStateConfig, TraceConfig, SubagentLinkage
 from .graph.factory import create_loop_agent
 
 # 性能阈值：wall-clock 差异 < 5%
@@ -63,7 +63,7 @@ class TestFrozenConfigPerformance:
                 model=model,
                 session_id="test-session",
                 prompt=PromptConfig(system="You are helpful"),
-                workspace=WorkspaceConfig(workspace_root="/tmp/test"),
+                workspace=AgentStateConfig(workspace_root="/tmp/test"),
                 trace=TraceConfig(enabled=True),
                 subagent=SubagentLinkage(is_subagent=False),
             )
@@ -141,16 +141,16 @@ class TestFrozenConfigPerformance:
         config = AgentLoopConfig(
             model=model,
             session_id="test-session",
-            workspace=WorkspaceConfig(
+            workspace=AgentStateConfig(
                 workspace_root="/tmp/test",
-                agent_home=".langchain_agentx",
+                agent_home_segment=".langchain_agentx",
             ),
         )
 
         def access_nested() -> None:
             # 模拟热路径中的嵌套访问
             _ = config.workspace.workspace_root
-            _ = config.workspace.agent_home
+            _ = config.workspace.agent_home_segment
             _ = config.prompt.system
             _ = config.trace.enabled
             _ = config.subagent.is_subagent
@@ -351,7 +351,7 @@ class TestFrozenCorrectness:
         model = FakeListChatModel(responses=["ok"])
         config = AgentLoopConfig(
             model=model,
-            workspace=WorkspaceConfig(workspace_root="/tmp"),
+            workspace=AgentStateConfig(workspace_root="/tmp"),
         )
 
         # 尝试修改嵌套结构应抛出异常

{langchain-agentx-python-0.7.5 → langchain-agentx-python-0.7.7}/langchain_agentx/loop/config/__init__.py

@@ -1,5 +1,12 @@
 from .agent_config import build_agent_config, merge_run_config
-from .loop_config import AgentLoopConfig
+from .loop_config import (
+    AgentLoopConfig,
+    AgentStateConfig,
+    LoopServices,
+    PromptConfig,
+    TraceConfig,
+    SubagentLinkage,
+)
 from .model_context_resolver import ModelContextResolver
 from .token_estimator import TokenEstimator
 from .runtime_settings import (
@@ -10,6 +17,11 @@ from .runtime_settings import (
 
 __all__ = [
     "AgentLoopConfig",
+    "AgentStateConfig",
+    "LoopServices",
+    "PromptConfig",
+    "TraceConfig",
+    "SubagentLinkage",
     "ModelContextResolver",
     "TokenEstimator",
     "build_agent_config",

{langchain-agentx-python-0.7.5 → langchain-agentx-python-0.7.7}/langchain_agentx/loop/config/loop_config.py

@@ -51,13 +51,16 @@ class PromptConfig:
 
 
 @dataclass(frozen=True)
-class WorkspaceConfig:
-    """工作区边界配置。
+class AgentStateConfig:
+    """Agent 状态配置（Agent 状态目录落点 / 派生目录视图）。
 
-    CC 对照：无直接对应，SDK 特化的边界控制。
+    表达 "Agent 状态挂载在哪个根下"，而非工具工作区边界。
+    工具边界语义应使用 WorkspaceBoundary / WorkspaceBoundaryView。
+
+    CC 对照：无直接对应，SDK 特化的状态层配置。
     """
     workspace_root: str | Path | None = None
-    agent_home: str = ".langchain_agentx"
+    agent_home_segment: str = ".langchain_agentx"
     read_roots: tuple[str, ...] = ()
     write_roots: tuple[str, ...] = ()
     workspace_trust_accepted: bool | None = None
@@ -180,7 +183,7 @@ class AgentLoopConfig:
     # 嵌套子结构
     # -----------------------------------------------------------------------
     prompt: PromptConfig = field(default_factory=PromptConfig)
-    workspace: WorkspaceConfig = field(default_factory=WorkspaceConfig)
+    workspace: AgentStateConfig = field(default_factory=AgentStateConfig)
     trace: TraceConfig = field(default_factory=TraceConfig)
     subagent: SubagentLinkage = field(default_factory=SubagentLinkage)
 
@@ -195,7 +198,7 @@ class AgentLoopConfig:
         system_prompt: str | SystemMessage | None = None,
         max_steps: int | None = None,
         workspace_root: str | Path | None = None,
-        agent_home: str = ".langchain_agentx",
+        agent_home_segment: str = ".langchain_agentx",
         read_roots: tuple[str, ...] = (),
         write_roots: tuple[str, ...] = (),
         **flat_overrides: Any,
@@ -205,8 +208,8 @@ class AgentLoopConfig:
         Args:
             system_prompt: 系统提示词
             max_steps: 最大步数
-            workspace_root: 工作区根目录
-            agent_home: agent_home 目录
+            workspace_root: 状态挂载的根目录
+            agent_home_segment: agent_home 相对段（非完整路径）
             read_roots: 只读根目录
             write_roots: 只写根目录
             **flat_overrides: 其他字段直接透传到 AgentLoopConfig
@@ -217,9 +220,9 @@ class AgentLoopConfig:
         return cls(
             max_steps=max_steps,
             prompt=PromptConfig(system=system_prompt),
-            workspace=WorkspaceConfig(
+            workspace=AgentStateConfig(
                 workspace_root=workspace_root,
-                agent_home=agent_home,
+                agent_home_segment=agent_home_segment,
                 read_roots=read_roots,
                 write_roots=write_roots,
             ),
@@ -265,7 +268,7 @@ class LoopServices:
 
 __all__ = [
     "PromptConfig",
-    "WorkspaceConfig",
+    "AgentStateConfig",
     "TraceConfig",
     "SubagentLinkage",
     "AgentLoopConfig",

{langchain-agentx-python-0.7.5 → langchain-agentx-python-0.7.7}/langchain_agentx/loop/graph/factory.py

@@ -101,15 +101,15 @@ from ...tools.agent.prompt import build_explore_plan_guidance
 from ..config import ModelContextResolver
 from ..config.loop_config import (
     AgentLoopConfig,
+    AgentStateConfig,
     LoopServices,
     PromptConfig,
-    WorkspaceConfig,
     TraceConfig,
     SubagentLinkage,
 )
 from ..config.runtime_settings import compute_recursion_limit
 from ...provider.model_profile import ModelProfileRegistry  # re-exported for legacy tests
-from ...workspace import resolve_agent_workspace_config
+from ...workspace import resolve_agent_state_config
 from ...tool_runtime.prompt.session_mode import infer_session_headless
 
 logger = logging.getLogger(__name__)
@@ -270,7 +270,7 @@ def _flatten_config_for_runtime(config: AgentLoopConfig) -> _FlatLoopConfig:
         network_access_allowed=config.network_access_allowed,
         permission_mode=config.permission_mode,
         workspace_root=config.workspace.workspace_root,
-        agent_home=config.workspace.agent_home,
+        agent_home_segment=config.workspace.agent_home_segment,
         cwd=None,  # 由 boundary_view.resolve_cwd() 动态计算
         enable_dynamic_root_grant=config.workspace.enable_dynamic_root_grant,
         session_id=config.session_id,
@@ -372,8 +372,8 @@ class LoopGraphBuilder:
             self._services = dataclasses.replace(
                 self._services,
                 capabilities=_Caps.build(
-                    primary_workspace_root=self._workspace_cfg.workspace_root,
-                    primary_agent_home=self._workspace_cfg.agent_home,
+                    resource_root=self._workspace_cfg.workspace_root,
+                    agent_home_segment=self._workspace_cfg.agent_home_segment,
                 ),
             )
         self._model_profile_registry = self._services.capabilities.model_profile_registry
@@ -416,7 +416,7 @@ class LoopGraphBuilder:
         self._dynamic_sections.extend(
             InstructionMemoryBootstrap(
                 workspace_root=Path(self._workspace_root),
-                agent_home=self._agent_home,
+                agent_home_segment=self._agent_home_segment,
                 managed_rules=self._config.managed_rules,
                 active_files_provider=(
                     CallbackActiveFilesProvider(self._services.active_files_getter)
@@ -428,7 +428,7 @@ class LoopGraphBuilder:
         self._dynamic_sections.extend(
             MemoryPromptBootstrap(
                 workspace_root=Path(self._workspace_root),
-                agent_home=self._agent_home,
+                agent_home_segment=self._agent_home_segment,
                 available_tools=self._loader_tools,
             ).build_sections()
         )
@@ -619,9 +619,17 @@ class LoopGraphBuilder:
         if self._services.loader is not None:
             self._loop_loader = self._services.loader.spawn_loop_loader(
                 workspace_root=self._workspace_root,
-                agent_home=self._agent_home,
+                agent_home_segment=self._agent_home_segment,
+            )
+            # 用户已在 loader 上注册自定义 AgentRuntimeTool 时，跳过默认 Agent 注册，
+            # 由后续合并循环把用户实例搬入 loop_loader.registry。
+            user_has_agent_tool = any(
+                tool.__class__.__name__ == "AgentRuntimeTool"
+                for tool in self._services.loader.registry.list()
+            )
+            self._loop_loader.register_default_tools(
+                include_agent=not user_has_agent_tool,
             )
-            self._loop_loader.register_default_tools()
             for tool in self._services.loader.registry.list():
                 if tool.name not in self._loop_loader.registry._tools:
                     self._loop_loader.register(tool)
@@ -636,13 +644,13 @@ class LoopGraphBuilder:
             workspace_root = Path.cwd()
         else:
             workspace_root = Path(raw_workspace_root)
-        workspace_cfg = resolve_agent_workspace_config(
+        workspace_cfg = resolve_agent_state_config(
             workspace_root=workspace_root,
-            agent_home=self._config.workspace.agent_home,
+            agent_home_segment=self._config.workspace.agent_home_segment,
         )
         self._workspace_cfg = workspace_cfg
         self._workspace_root = str(workspace_cfg.workspace_root)
-        self._agent_home = workspace_cfg.agent_home
+        self._agent_home_segment = workspace_cfg.agent_home_segment
         from langchain_agentx.workspace import WorkspaceBoundary
 
         self._workspace_boundary = WorkspaceBoundary.build(
@@ -1005,15 +1013,15 @@ class LoopGraphBuilder:
             rt_skill = self._skill_runtime_tool
             if rt_skill is not None:
                 wr_skill = getattr(rt_skill, "_workspace_root", None) or self._workspace_root
-                ah_skill = getattr(rt_skill, "_agent_home", None) or self._workspace_cfg.agent_home
+                ah_skill = getattr(rt_skill, "_agent_home", None) or self._workspace_cfg.agent_home_segment
             else:
                 wr_skill = self._workspace_root
-                ah_skill = self._workspace_cfg.agent_home
+                ah_skill = self._workspace_cfg.agent_home_segment
             if wr_skill is None:
                 wr_skill = Path.cwd()
             provider_chain.insert(
                 0,
-                SkillPrefetchProvider(workspace_root=wr_skill, agent_home=str(ah_skill)),
+                SkillPrefetchProvider(workspace_root=wr_skill, agent_home_segment=str(ah_skill)),
             )
         if self._task_runtime is not None:
             provider_chain.append(LoopTaskInjectionAdapter(self._task_runtime))

{langchain-agentx-python-0.7.5 → langchain-agentx-python-0.7.7}/langchain_agentx/loop/prompt/session_context.py

@@ -22,7 +22,7 @@ from typing import TYPE_CHECKING
 from .sections import SystemPromptSection, section
 
 if TYPE_CHECKING:
-    from langchain_agentx.workspace import AgentWorkspaceConfig
+    from langchain_agentx.workspace import ResolvedAgentStateConfig
 
 _GIT_STATUS_MAX_CHARS = 2000
 _ENABLE_GIT_SNAPSHOT_ENV = "LANGCHAIN_AGENTX_ENABLE_GIT_SNAPSHOT"
@@ -56,7 +56,7 @@ def date_section() -> SystemPromptSection:
     return section(name="session_date", compute=compute)
 
 
-def env_section(workspace_cfg: AgentWorkspaceConfig) -> SystemPromptSection:
+def env_section(workspace_cfg: ResolvedAgentStateConfig) -> SystemPromptSection:
     """环境信息（session 级缓存）；工作目录使用 workspace_cfg.workspace_root。"""
 
     working_dir = str(Path(workspace_cfg.workspace_root).resolve())
@@ -88,7 +88,7 @@ def git_snapshot_section(workspace_root: Path) -> SystemPromptSection:
 
 
 def get_default_session_context_sections(
-    workspace_cfg: AgentWorkspaceConfig,
+    workspace_cfg: ResolvedAgentStateConfig,
     *,
     container_type: str | None = None,
     is_subagent: bool = False,

{langchain-agentx-python-0.7.5 → langchain-agentx-python-0.7.7}/langchain_agentx/loop/runtime/context_factory.py

@@ -14,10 +14,10 @@ from __future__ import annotations
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
-from langchain_agentx.workspace import resolve_agent_workspace_config
+from langchain_agentx.workspace import resolve_agent_state_config
 from langchain_agentx.loop.config.loop_config import (
     AgentLoopConfig,
-    WorkspaceConfig,
+    AgentStateConfig,
     TraceConfig,
     SubagentLinkage,
 )
@@ -57,8 +57,8 @@ class RuntimeContextFactory:
             subagent_config: SubagentConfig 实例，提供 default_model / default_max_steps。
             agent_id: 子代理 ID（调用方生成）。
             subagent_effective_cwd: 由 ``SubagentExecutionPaths.prepare`` 解析的最终 cwd；
-                非 ``None`` 时写入 ``AgentLoopConfig.cwd``；为 ``None`` 时维持历史行为
-                ``parent_ctx.cwd``（兼容未接 Agent 编排的调用方）。
+                这是运行态数据，由上层 create_subagent_context 写入子会话 session_store.cwd_override，
+                不进入 AgentLoopConfig（编译期配置）。
         """
         # 模型继承：override > config.default_model > parent_ctx.model
         config_model = getattr(subagent_config, "default_model", None)
@@ -78,23 +78,35 @@ class RuntimeContextFactory:
             else list(parent_ctx.available_tools or [])
         )
 
-        # 权限：override > 父 ctx.permission_mode > "default"
+        # 权限：override > 父 ctx.tool_flags["permission_mode"] > "default"
+        parent_permission = (
+            getattr(parent_ctx, "permission_mode", None)
+            or getattr(getattr(parent_ctx, "tool_flags", None), "get", lambda x: None)("permission_mode")
+            or "default"
+        )
         resolved_permission = (
             overrides.permission_mode
-            or getattr(parent_ctx, "permission_mode", "default")
-            or "default"
+            if overrides.permission_mode is not None
+            else parent_permission
         )
         workspace_root = getattr(parent_ctx, "workspace_root", None)
-        parent_agent_home = getattr(parent_ctx, "agent_home", None)
-        workspace_cfg = resolve_agent_workspace_config(
+        parent_agent_home = getattr(parent_ctx, "agent_home_segment", None)
+        workspace_cfg = resolve_agent_state_config(
             workspace_root=workspace_root or Path.cwd(),
-            agent_home=parent_agent_home,
+            agent_home_segment=parent_agent_home,
         )
 
+        # cwd 继承：overrides.cwd > subagent_effective_cwd > parent_ctx.cwd
+        # 注意：resolved_cwd 是运行态数据，不写入 AgentLoopConfig
+        # 真正的 cwd 权威源由上层 create_subagent_context 写入 session_store.cwd_override
         resolved_cwd = (
-            subagent_effective_cwd
-            if subagent_effective_cwd is not None
-            else getattr(parent_ctx, "cwd", None)
+            overrides.cwd
+            if overrides.cwd is not None
+            else (
+                subagent_effective_cwd
+                if subagent_effective_cwd is not None
+                else getattr(parent_ctx, "cwd", None)
+            )
         )
 
         # 构建嵌套子结构 (Phase 3: 新的 frozen AgentLoopConfig)
@@ -114,9 +126,10 @@ class RuntimeContextFactory:
             max_steps=resolved_max_steps,
             permission_mode=resolved_permission,
             # 注意: available_tools 在新 config 中不是字段，由 _flatten_config_for_runtime 注入
-            workspace=WorkspaceConfig(
+            # cwd 是运行态，不进入 AgentLoopConfig（编译期配置），由 session_store.cwd_override 承载
+            workspace=AgentStateConfig(
                 workspace_root=workspace_cfg.workspace_root,
-                agent_home=workspace_cfg.agent_home,
+                agent_home_segment=workspace_cfg.agent_home_segment,
             ),
             trace=TraceConfig(
                 enabled=bool(getattr(parent_ctx, "trace_enabled", True)),

{langchain-agentx-python-0.7.5 → langchain-agentx-python-0.7.7}/langchain_agentx/loop/runtime/subagent_execution_paths.py

@@ -21,7 +21,7 @@ from dataclasses import dataclass
 from typing import Any
 
 from langchain_agentx.loop.runtime.context import SubagentContextOverrides
-from langchain_agentx.workspace import resolve_agent_workspace_config
+from langchain_agentx.workspace import resolve_agent_state_config
 
 
 @dataclass(frozen=True)
@@ -47,14 +47,15 @@ class SubagentExecutionPaths:
         """
         parent_cwd = getattr(parent_ctx, "cwd", None)
         parent_workspace_root = getattr(parent_ctx, "workspace_root", None) or os.getcwd()
-        parent_agent_home = getattr(parent_ctx, "agent_home", ".langchain_agentx")
+        # P0-1 修复：从 agent_home 改为 agent_home_segment（对齐 ToolExecutionContext / SubagentContext 正式字段名）
+        parent_agent_home = getattr(parent_ctx, "agent_home_segment", ".langchain_agentx")
         raw = overrides.cwd
         override_cwd = raw.strip() if isinstance(raw, str) and raw.strip() else None
 
         if overrides.isolation == "worktree":
-            workspace_cfg = resolve_agent_workspace_config(
+            workspace_cfg = resolve_agent_state_config(
                 workspace_root=parent_workspace_root,
-                agent_home=parent_agent_home,
+                agent_home_segment=parent_agent_home,
             )
             workspace_cfg.worktrees_dir.mkdir(parents=True, exist_ok=True)
             worktree_dir = str(

{langchain-agentx-python-0.7.5 → langchain-agentx-python-0.7.7}/langchain_agentx/loop/subagent/context.py

@@ -18,7 +18,7 @@ from typing import Any
 from langchain_agentx.loop.runtime.subagent_execution_paths import PreparedSubagentPaths
 from langchain_agentx.loop.subagent.fork_worktree_notice import build_worktree_notice
 from langchain_agentx.tool_runtime.session_store import AgentSessionStore
-from langchain_agentx.workspace import resolve_agent_workspace_config
+from langchain_agentx.workspace import resolve_agent_state_config
 
 
 @dataclass
@@ -58,8 +58,8 @@ class SubagentContext:
     isolation: str = "none"
     worktree_dir: str | None = None
     workspace_root: str = ""
-    agent_home: str = ".langchain_agentx"
-    cwd: str | None = None
+    agent_home_segment: str = ".langchain_agentx"
+    cwd: str | None = None  # 辅助镜像（用于 prompt/日志/debug）；权威源在 session_store.cwd_override
     capabilities: Any = None  # RuntimeCapabilities，从父会话继承
 
 
@@ -162,7 +162,8 @@ def create_subagent_context(
             initial_messages.append({"role": "user", "content": task})
 
     parent_workspace_root = getattr(parent_ctx, "workspace_root", None) or os.getcwd()
-    parent_agent_home = getattr(parent_ctx, "agent_home", ".langchain_agentx")
+    # P0-1 修复：从 agent_home 改为 agent_home_segment（对齐 ToolExecutionContext / SubagentContext 正式字段名）
+    parent_agent_home = getattr(parent_ctx, "agent_home_segment", ".langchain_agentx")
     worktree_dir: str | None = None
     if path_prep is not None:
         effective_cwd = path_prep.effective_cwd
@@ -170,9 +171,9 @@ def create_subagent_context(
     else:
         effective_cwd = cwd or parent_cwd or os.getcwd()
         if isolation == "worktree":
-            workspace_cfg = resolve_agent_workspace_config(
+            workspace_cfg = resolve_agent_state_config(
                 workspace_root=parent_workspace_root,
-                agent_home=parent_agent_home,
+                agent_home_segment=parent_agent_home,
             )
             workspace_cfg.worktrees_dir.mkdir(parents=True, exist_ok=True)
             worktree_dir = str(
@@ -186,6 +187,12 @@ def create_subagent_context(
     if fork_from_parent and isinstance(parent_store, AgentSessionStore):
         session_store = parent_store.clone(file_state_only=True)
 
+    # 写入 cwd 到子会话 session_store.cwd_override（runtime state SSOT）
+    # 这确保后续 LangChainAdapter.build_tool_execution_context() 和
+    # WorkspaceBoundaryView.resolve_cwd() 能拿到正确的 cwd
+    if isinstance(session_store, AgentSessionStore) and effective_cwd:
+        session_store.set_cwd(effective_cwd)
+
     return SubagentContext(
         agent_id=agent_id,
         initial_messages=initial_messages,
@@ -209,7 +216,7 @@ def create_subagent_context(
         isolation=isolation,
         worktree_dir=worktree_dir,
         workspace_root=str(parent_workspace_root),
-        agent_home=str(parent_agent_home),
+        agent_home_segment=str(parent_agent_home),
         cwd=effective_cwd,
         capabilities=getattr(parent_ctx, "capabilities", None),
         runnable_config=getattr(parent_ctx, "runnable_config", None),

{langchain-agentx-python-0.7.5 → langchain-agentx-python-0.7.7}/langchain_agentx/loop/subagent/graph.py

@@ -46,7 +46,7 @@ def create_subagent_graph(
         AgentLoopConfig,
         LoopServices,
         PromptConfig,
-        WorkspaceConfig,
+        AgentStateConfig,
         TraceConfig,
         SubagentLinkage,
     )
@@ -61,9 +61,9 @@ def create_subagent_graph(
     config = AgentLoopConfig(
         session_id=session_id,
         prompt=PromptConfig(system=ctx.system_prompt or None),
-        workspace=WorkspaceConfig(
+        workspace=AgentStateConfig(
             workspace_root=ctx.workspace_root or None,
-            agent_home=ctx.agent_home,
+            agent_home_segment=ctx.agent_home_segment,
         ),
         trace=TraceConfig(
             enabled=ctx.enable_trace,