langchain-agentx-python 1.2.9__tar.gz → 1.3.0__tar.gz

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/PKG-INFO

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

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/langchain_agentx/__init__.py

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

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/langchain_agentx/loop/graph/factory.py

@@ -724,6 +724,7 @@ class LoopGraphBuilder:
             self._loop_loader = self._services.loader.spawn_loop_loader(
                 workspace_root=self._workspace_root,
                 agent_home_segment=self._agent_home_segment,
+                session_cwd=self._workspace_cfg.session_cwd or self._workspace_cfg.workspace_root,
             )
             # 用户已在 loader 上注册自定义 AgentRuntimeTool 时，跳过默认 Agent 注册，
             # 由后续合并循环把用户实例搬入 loop_loader.registry。
@@ -1017,9 +1018,11 @@ class LoopGraphBuilder:
             workspace_root = Path.cwd()
         else:
             workspace_root = Path(raw_workspace_root)
+        session_cwd = self._config.workspace.runtime_cwd or workspace_root
         workspace_cfg = resolve_agent_state_config(
             workspace_root=workspace_root,
             agent_home_segment=self._config.workspace.agent_home_segment,
+            session_cwd=session_cwd,
         )
         self._workspace_cfg = workspace_cfg
         self._workspace_root = str(workspace_cfg.workspace_root)

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/langchain_agentx/loop/subagent/transcript.py

@@ -117,7 +117,7 @@ class JsonlTranscriptStore:
     @classmethod
     def from_layout(cls, layout: object, session_id: str) -> JsonlTranscriptStore:
         """从 ProjectMemoryLayout 构造 store。"""
-        return cls(layout.project_dir, session_id)
+        return cls(layout.sess_project_dir, session_id)
 
     def write_transcript(
         self,

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/langchain_agentx/memory/migrate_layout.py

@@ -148,7 +148,7 @@ class ProjectMemoryLayoutMigrator:
                     continue
                 dest = self._layout.transcript_path(session_id)
             elif len(parts) == 3 and parts[1] == "subagents":
-                dest = self._layout.project_dir / parts[0] / "subagents" / parts[2]
+                dest = self._layout.sess_project_dir / parts[0] / "subagents" / parts[2]
             else:
                 continue
             self._copy_file(

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/langchain_agentx/tool_runtime/loader.py

@@ -130,12 +130,14 @@ class ToolRuntimeLoader:
         *,
         workspace_root: str,
         agent_home_segment: str = ".langchain_agentx",
+        session_cwd: str | Path | None = None,
     ) -> LoopLoader:
         """构造独立的 per-loop 工具注册表（不污染 loader 主 registry）。"""
         return LoopLoader(
             self._process,
             workspace_root=workspace_root,
             agent_home_segment=agent_home_segment,
+            session_cwd=session_cwd,
         )
 
     def create_session(self, session_id: str | None = None) -> AgentSessionStore:

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/langchain_agentx/tool_runtime/loop_loader.py

@@ -33,10 +33,12 @@ class LoopLoader:
         *,
         workspace_root: str,
         agent_home_segment: str = ".langchain_agentx",
+        session_cwd: str | Path | None = None,
     ) -> None:
         self._process = process
         self._workspace_root = workspace_root
         self._agent_home = agent_home_segment
+        self._session_cwd = session_cwd
         self._registry = RuntimeToolRegistry(
             pipeline=process.pipeline,
             adapter=process.adapter,
@@ -95,16 +97,22 @@ class LoopLoader:
         from langchain_agentx.workspace import resolve_agent_state_config
 
         wr = Path(self._workspace_root).resolve()
+        effective_cwd = (
+            Path(self._session_cwd).resolve()
+            if self._session_cwd is not None
+            else wr
+        )
         cfg = resolve_agent_state_config(
             workspace_root=wr,
             agent_home_segment=self._agent_home,
+            session_cwd=effective_cwd,
         )
         self._inject_project_memory_policy(cfg)
         plugin_ex = PluginCacheGlobExclusions(
             cache_root=str(cfg.plugin_cache_dir.resolve()),
         )
 
-        shared_bridge = ToolStateBridge(initial_cwd=str(wr))
+        shared_bridge = ToolStateBridge(initial_cwd=str(effective_cwd))
         search_ignore_patterns = self._collect_search_ignore_patterns()
 
         settings_validator = SettingsValidator(agent_home_segment=cfg.agent_home_dir.name)

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/langchain_agentx/tool_runtime/policy.py

@@ -126,13 +126,16 @@ class ToolPolicyConfig:
         layout: "ProjectMemoryLayout",
     ) -> "ToolPolicyConfig":
         """追加 CC projects 树读写根与 path_safety layout（替代旧 infra paths）。"""
-        project_dir = str(layout.project_dir.resolve())
+        sess_project_dir = str(layout.sess_project_dir.resolve())
+        l2_project_dir = str(layout.l2_project_dir.resolve())
         l2_dir = str(layout.l2_memory_dir.resolve())
 
         new_read = list(self.read_roots)
         new_write = list(self.write_roots)
-        if project_dir not in new_read:
-            new_read.append(project_dir)
+        if sess_project_dir not in new_read:
+            new_read.append(sess_project_dir)
+        if l2_project_dir not in new_read and l2_project_dir != sess_project_dir:
+            new_read.append(l2_project_dir)
         if l2_dir not in new_write:
             new_write.append(l2_dir)
 

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/langchain_agentx/utils/cwd.py

@@ -16,8 +16,18 @@ from contextlib import contextmanager
 from contextvars import ContextVar
 from typing import Generator
 
+def _bootstrap_process_cwd() -> str:
+    """导入时固定进程 cwd；对齐 CC getInitialState（MSYS /c/ → native + realpath + NFC）。"""
+    from langchain_agentx.utils.windows_paths import normalize_subprocess_cwd
+    from langchain_agentx.workspace.path_key_normalizer import normalize_path_key
+
+    raw = os.getcwd()
+    normalized = normalize_subprocess_cwd(raw) or raw
+    return normalize_path_key(os.path.realpath(normalized))
+
+
 # 与历史模块级实现一致：在**导入时**固定进程 cwd，供默认 CwdContext 使用。
-_MODULE_PROCESS_CWD: str = os.path.realpath(os.getcwd())
+_MODULE_PROCESS_CWD: str = _bootstrap_process_cwd()
 
 _default_ctx: CwdContext | None = None
 

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/langchain_agentx/workspace/__init__.py

@@ -28,6 +28,7 @@ from .project_memory_layout import (
     ProjectMemoryLayoutResolver,
     resolve_project_memory_layout,
 )
+from .path_canonical import canonicalize_workspace_path
 from .resolver import (
     AgentStateResolver,
     resolve_agent_home_string,
@@ -73,6 +74,7 @@ __all__ = [
     "WorkspaceDefaults",
     "assert_agent_home_matches_capabilities",
     "assert_capabilities_match_state_config",
+    "canonicalize_workspace_path",
     "dedupe_nested",
     "is_descendant_or_eq",
     "normalize_path_key",

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/langchain_agentx/workspace/config.py

@@ -66,6 +66,7 @@ class ResolvedAgentStateConfig:
     """
     workspace_root: Path
     agent_home_segment: str = ".langchain_agentx"
+    session_cwd: Path | None = None
     plugins_enabled: bool = True
     workspace_trust_accepted: bool = False
     _defaults: Optional["WorkspaceDefaults"] = field(default=None, repr=False, compare=False)
@@ -149,6 +150,7 @@ class ResolvedAgentStateConfig:
         return resolve_project_memory_layout(
             agent_home_segment=self.agent_home_segment,
             workspace_root=self.workspace_root,
+            session_cwd=self.session_cwd,
         )
 
     @property
@@ -176,8 +178,8 @@ class ResolvedAgentStateConfig:
 
     @property
     def transcripts_dir(self) -> Path:
-        """Transcript 搜索根（grep 示例）；delegate layout.project_dir（M6）。"""
-        return self.project_memory_layout.project_dir
+        """Transcript 搜索根（grep 示例）；delegate layout.sess_project_dir（M6）。"""
+        return self.project_memory_layout.sess_project_dir
 
     @property
     def workspace_config_path(self) -> Path:

langchain-agentx-python-1.3.0/langchain_agentx/workspace/path_canonical.py

@@ -0,0 +1,24 @@
+"""
+workspace/path_canonical.py — workspace 绝对路径 CC 对齐规范化
+
+职责：expandPath → realpath → NFC，供 project_key / resolve_workspace_root_path 共用。
+链路位置：resolver.resolve_workspace_root_path、ProjectMemoryLayoutResolver、sanitize_project_key。
+"""
+
+from __future__ import annotations
+
+import os
+from pathlib import Path
+
+from langchain_agentx.utils.path import expand_path
+from langchain_agentx.workspace.path_key_normalizer import normalize_path_key
+
+
+def canonicalize_workspace_path(path: str | Path) -> Path:
+    """对齐 CC ``setCwd`` / ``getInitialState``：expandPath → realpath → NFC。"""
+    expanded = expand_path(str(path))
+    physical = os.path.realpath(expanded)
+    return Path(normalize_path_key(physical))
+
+
+__all__ = ["canonicalize_workspace_path"]

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/langchain_agentx/workspace/project_key.py

@@ -17,7 +17,6 @@ import re
 from dataclasses import dataclass
 from pathlib import Path
 
-from langchain_agentx.utils.path import expand_path
 from langchain_agentx.workspace.path_key_normalizer import normalize_path_key
 
 # 对齐 CC sessionStoragePortable.ts MAX_SANITIZED_LENGTH
@@ -72,9 +71,11 @@ def _to_base36(value: int) -> str:
 
 
 def sanitize_project_key(project_root: str) -> str:
-    """薄封装：expand + resolve 后 sanitize（输入可为相对或绝对路径）。"""
-    abs_root = expand_path(project_root)
-    return ProjectKeySanitizer().sanitize(abs_root)
+    """薄封装：canonicalize 后 sanitize（输入可为相对或绝对路径）。"""
+    from langchain_agentx.workspace.path_canonical import canonicalize_workspace_path
+
+    canonical = canonicalize_workspace_path(project_root)
+    return ProjectKeySanitizer().sanitize(str(canonical))
 
 
 def resolve_config_home_dir(agent_home_segment: str) -> Path:

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/langchain_agentx/workspace/project_memory_layout.py

@@ -9,7 +9,7 @@ workspace/project_memory_layout.py — L2/L3 记忆路径 SSOT（CC projects 树
     resolve_project_memory_layout → memdir / session / tool_runtime / factory（M1+）。
 
 当前裁剪范围：
-    M0 仅路径 SSOT + ensure mkdir；不迁移 config.memory_dir delegate（M2）。
+    一致化算法：唯一 brand 分支为 config_home；L2 用 git_root key，L3/transcript 用 session_cwd key。
 """
 
 from __future__ import annotations
@@ -21,6 +21,7 @@ from pathlib import Path
 from langchain_agentx.utils.git_roots import find_canonical_git_root
 from langchain_agentx.utils.path import expand_path
 from langchain_agentx.workspace.boundary import is_descendant_or_eq, paths_equal
+from langchain_agentx.workspace.path_canonical import canonicalize_workspace_path
 from langchain_agentx.workspace.path_key_normalizer import normalize_path_key
 from langchain_agentx.workspace.project_key import ProjectKeySanitizer
 
@@ -38,16 +39,29 @@ class ProjectMemoryLayout:
 
     agent_home_segment: str
     config_home_dir: Path
-    project_key: str
-    project_dir: Path
+    l2_project_key: str
+    sess_project_key: str
+    l2_project_dir: Path
+    sess_project_dir: Path
     project_root: Path
+    session_cwd: Path
     l2_memory_dir_override: Path | None = None
 
+    @property
+    def project_key(self) -> str:
+        """L2 project key（git_root basis）；兼容旧字段名。"""
+        return self.l2_project_key
+
+    @property
+    def project_dir(self) -> Path:
+        """Session 域 project 目录（session_cwd basis）；兼容旧字段名。"""
+        return self.sess_project_dir
+
     @property
     def l2_memory_dir(self) -> Path:
         if self.l2_memory_dir_override is not None:
             return self.l2_memory_dir_override
-        return self.project_dir / _L2_DIRNAME
+        return self.l2_project_dir / _L2_DIRNAME
 
     @property
     def l2_entrypoint(self) -> Path:
@@ -60,21 +74,21 @@ class ProjectMemoryLayout:
 
     def l3_session_memory_dir(self, session_id: str) -> Path:
         sid = _normalize_session_id(session_id)
-        return self.project_dir / sid / _L3_SESSION_MEMORY_DIRNAME
+        return self.sess_project_dir / sid / _L3_SESSION_MEMORY_DIRNAME
 
     def l3_summary_path(self, session_id: str) -> Path:
         return self.l3_session_memory_dir(session_id) / _L3_SUMMARY_NAME
 
     def transcript_path(self, session_id: str) -> Path:
-        """主 session transcript：{project_dir}/{sessionId}.jsonl（CC 对齐 · M6）。"""
+        """主 session transcript：{sess_project_dir}/{sessionId}.jsonl（CC 对齐 · M6）。"""
         sid = _normalize_session_id(session_id)
-        return self.project_dir / f"{sid}.jsonl"
+        return self.sess_project_dir / f"{sid}.jsonl"
 
     def subagent_transcript_path(self, session_id: str, agent_id: str) -> Path:
-        """Sidechain transcript：{project_dir}/{sessionId}/subagents/{agentId}.jsonl。"""
+        """Sidechain transcript：{sess_project_dir}/{sessionId}/subagents/{agentId}.jsonl。"""
         sid = _normalize_session_id(session_id)
         safe_agent = agent_id.replace("/", "-").replace("\\", "-").strip() or "agent"
-        return self.project_dir / sid / "subagents" / f"{safe_agent}.jsonl"
+        return self.sess_project_dir / sid / "subagents" / f"{safe_agent}.jsonl"
 
     def ensure_l2_ready(self) -> None:
         self.l2_memory_dir.mkdir(parents=True, exist_ok=True)
@@ -88,18 +102,21 @@ class ProjectMemoryLayout:
 
     def is_l3_session_memory_path(self, candidate: str | Path) -> bool:
         resolved = _resolve_candidate_path(candidate)
-        if not is_descendant_or_eq(resolved, self.project_dir):
+        if not is_descendant_or_eq(resolved, self.sess_project_dir):
             return False
         try:
-            rel = resolved.resolve().relative_to(self.project_dir.resolve())
+            rel = resolved.resolve().relative_to(self.sess_project_dir.resolve())
         except ValueError:
             return False
         parts = rel.parts
         return len(parts) >= 2 and parts[1] == _L3_SESSION_MEMORY_DIRNAME
 
     def is_project_dir_path(self, candidate: str | Path) -> bool:
+        """L2 或 session 域 project 目录下的路径（权限 read_roots 判定）。"""
         resolved = _resolve_candidate_path(candidate)
-        return is_descendant_or_eq(resolved, self.project_dir)
+        return is_descendant_or_eq(resolved, self.l2_project_dir) or is_descendant_or_eq(
+            resolved, self.sess_project_dir
+        )
 
     def is_l3_summary_path(self, candidate: str | Path, session_id: str) -> bool:
         return paths_equal(
@@ -119,22 +136,29 @@ class ProjectMemoryLayoutResolver:
         *,
         agent_home_segment: str,
         workspace_root: str | Path,
+        session_cwd: str | Path | None = None,
         session_id: str | None = None,
         memory_dir_override: str | Path | None = None,
     ) -> ProjectMemoryLayout:
-        del session_id  # M0：session_id 仅用于 l3_* 方法入参，不参与 layout 构造
+        del session_id  # session_id 仅用于 l3_* 方法入参，不参与 layout 构造
         config_home = self.sanitizer.config_home_dir(agent_home_segment)
-        workspace = Path(expand_path(str(workspace_root))).resolve()
-        canonical = find_canonical_git_root(workspace) or workspace
-        project_key = self.sanitizer.sanitize(str(canonical.resolve()))
-        project_dir = config_home / _PROJECTS_DIRNAME / project_key
+        workspace = canonicalize_workspace_path(workspace_root)
+        cwd = canonicalize_workspace_path(session_cwd or workspace_root)
+        git_root = find_canonical_git_root(workspace) or workspace
+        key_l2 = self.sanitizer.sanitize(str(git_root))
+        key_sess = self.sanitizer.sanitize(str(cwd))
+        l2_project_dir = config_home / _PROJECTS_DIRNAME / key_l2
+        sess_project_dir = config_home / _PROJECTS_DIRNAME / key_sess
         override = _resolve_memory_dir_override(memory_dir_override)
         return ProjectMemoryLayout(
             agent_home_segment=agent_home_segment.strip(),
             config_home_dir=config_home,
-            project_key=project_key,
-            project_dir=project_dir,
+            l2_project_key=key_l2,
+            sess_project_key=key_sess,
+            l2_project_dir=l2_project_dir,
+            sess_project_dir=sess_project_dir,
             project_root=workspace,
+            session_cwd=cwd,
             l2_memory_dir_override=override,
         )
 
@@ -143,12 +167,14 @@ def resolve_project_memory_layout(
     *,
     agent_home_segment: str,
     workspace_root: str | Path,
+    session_cwd: str | Path | None = None,
     session_id: str | None = None,
     memory_dir_override: str | Path | None = None,
 ) -> ProjectMemoryLayout:
     return ProjectMemoryLayoutResolver().resolve(
         agent_home_segment=agent_home_segment,
         workspace_root=workspace_root,
+        session_cwd=session_cwd,
         session_id=session_id,
         memory_dir_override=memory_dir_override,
     )

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/langchain_agentx/workspace/resolver.py

@@ -38,15 +38,17 @@ def resolve_workspace_root_path(
     """解析 workspace 根路径，与 ``AgentWorkspaceResolver.resolve`` 内默认链一致。
 
     优先级：显式 ``workspace_root`` → 环境变量 ``LANGCHAIN_AGENTX_WORKSPACE_ROOT`` → 进程 cwd（CLI 入口），
-    再 ``expanduser().resolve()``。供 ``RuntimeCapabilities.build``、``BaseWorkflow`` 等与
+    再 ``canonicalize_workspace_path``（CC 对齐）。供 ``RuntimeCapabilities.build``、``BaseWorkflow`` 等与
     ``resolve_agent_state_config`` 对齐，避免各入口分叉。
     """
+    from langchain_agentx.workspace.path_canonical import canonicalize_workspace_path
+
     root_raw = (
         workspace_root
         or os.getenv(env_workspace_root)
         or os.getcwd()  # noqa: workspace-boundary reason="CLI entry when workspace_root unset"
     )
-    return Path(root_raw).expanduser().resolve()
+    return canonicalize_workspace_path(root_raw)
 
 
 def resolve_agent_home_string(
@@ -96,6 +98,7 @@ class AgentStateResolver:
         *,
         workspace_root: str | Path | None = None,
         agent_home_segment: str | None = None,
+        session_cwd: str | Path | None = None,
         defaults: WorkspaceDefaults | None = None,
         overrides: NodeWorkspaceOverrides | None = None,
     ) -> ResolvedAgentStateConfig:
@@ -111,9 +114,13 @@ class AgentStateResolver:
         )
         if overrides is not None:
             overrides.validate(root)
+        effective_session_cwd = (
+            Path(session_cwd).resolve() if session_cwd is not None else None
+        )
         cfg = ResolvedAgentStateConfig(
             workspace_root=root,
             agent_home_segment=home,
+            session_cwd=effective_session_cwd,
             _defaults=defaults,
             _overrides=overrides,
         )
@@ -146,6 +153,7 @@ def resolve_agent_state_config(
     *,
     workspace_root: str | Path | None = None,
     agent_home_segment: str | None = None,
+    session_cwd: str | Path | None = None,
     defaults: WorkspaceDefaults | None = None,
     overrides: NodeWorkspaceOverrides | None = None,
 ) -> ResolvedAgentStateConfig:
@@ -153,6 +161,7 @@ def resolve_agent_state_config(
     return _DEFAULT_RESOLVER.resolve(
         workspace_root=workspace_root,
         agent_home_segment=agent_home_segment,
+        session_cwd=session_cwd,
         defaults=defaults,
         overrides=overrides,
     )

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/langchain_agentx_python.egg-info/PKG-INFO

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

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/langchain_agentx_python.egg-info/SOURCES.txt

@@ -667,6 +667,7 @@ langchain_agentx/workspace/config.py
 langchain_agentx/workspace/errors.py
 langchain_agentx/workspace/grant.py
 langchain_agentx/workspace/l3_root_grant.py
+langchain_agentx/workspace/path_canonical.py
 langchain_agentx/workspace/path_key_normalizer.py
 langchain_agentx/workspace/plans.py
 langchain_agentx/workspace/project_key.py

{langchain-agentx-python-1.2.9 → langchain-agentx-python-1.3.0}/pyproject.toml

@@ -4,7 +4,7 @@
 
  [project]
  name = "langchain-agentx-python"
- version = "1.2.9"
+ version = "1.3.0"
  description = "LangChain/LangGraph-based agent utilities for CodeBaseX."
  readme = "README.md"
  requires-python = ">=3.11"