langchain-agentx-python 2.3.2__tar.gz → 2.3.3__tar.gz

{langchain-agentx-python-2.3.2/langchain_agentx_python.egg-info → langchain-agentx-python-2.3.3}/PKG-INFO

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

{langchain-agentx-python-2.3.2 → langchain-agentx-python-2.3.3}/langchain_agentx/__init__.py

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

{langchain-agentx-python-2.3.2 → langchain-agentx-python-2.3.3}/langchain_agentx/loop/config/__init__.py

@@ -4,6 +4,7 @@ from .loop_config import (
     AgentStateConfig,
     LoopServices,
     PromptConfig,
+    SkillDiscoveryConfig,
     TraceConfig,
     SubagentLinkage,
 )
@@ -25,6 +26,7 @@ from .runtime_settings import (
 __all__ = [
     "AgentLoopConfig",
     "AgentStateConfig",
+    "SkillDiscoveryConfig",
     "LoopServices",
     "PromptConfig",
     "TraceConfig",

{langchain-agentx-python-2.3.2 → langchain-agentx-python-2.3.3}/langchain_agentx/loop/config/loop_config.py

@@ -52,6 +52,16 @@ class PromptConfig:
     thinking_generation_enabled: bool = True  # 是否启用 request-side thinking 生成（对齐 CC thinkingConfig）
 
 
+@dataclass(frozen=True)
+class SkillDiscoveryConfig:
+    """Workflow / 双 workspace 节点的 Skill 发现层级（对齐 bug.md ComponentScan）。"""
+
+    project_skills_dir: str | Path | None = None
+    global_skills_dir: str | Path | None = None
+    include_managed: bool = False
+    include_user_home: bool = False
+
+
 @dataclass(frozen=True)
 class AgentStateConfig:
     """Agent 状态配置（Agent 状态目录落点 / 派生目录视图）。
@@ -64,6 +74,7 @@ class AgentStateConfig:
         runtime_cwd: 工具运行时 cwd / 相对路径展开基准（None 时回退到 workspace_root）
         read_roots: 只读根目录
         write_roots: 只写根目录
+        skill_discovery: 可选项目级 / 全局 skill 目录（覆盖 legacy 三源）
 
     CC 对照：无直接对应，SDK 特化的状态层配置。
     """
@@ -74,6 +85,7 @@ class AgentStateConfig:
     write_roots: tuple[str, ...] = ()
     workspace_trust_accepted: bool | None = None
     enable_dynamic_root_grant: bool = False
+    skill_discovery: SkillDiscoveryConfig | None = None
 
 
 @dataclass(frozen=True)

{langchain-agentx-python-2.3.2 → langchain-agentx-python-2.3.3}/langchain_agentx/loop/graph/factory.py

@@ -585,7 +585,10 @@ class LoopGraphBuilder:
             session_store.hooks_snapshot = self._hook_snapshot
             from langchain_agentx.tools.skill.repository_factory import build_skill_repository
 
-            session_store.skill_repository = build_skill_repository(self._workspace_cfg)
+            session_store.skill_repository = build_skill_repository(
+                self._workspace_cfg,
+                discovery=self._skill_discovery_layout,
+            )
         self._trace_callback_handler: TraceCallbackHandler | None = None
         self._trace_tool_callback_handler: TraceCallbackHandler | None = None
         hook_event_emitter = None
@@ -745,6 +748,7 @@ class LoopGraphBuilder:
                 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,
+                skill_discovery=self._skill_discovery_layout,
             )
             # 用户已在 loader 上注册自定义 AgentRuntimeTool 时，跳过默认 Agent 注册，
             # 由后续合并循环把用户实例搬入 loop_loader.registry。
@@ -1080,6 +1084,7 @@ class LoopGraphBuilder:
         self._workspace_cfg = workspace_cfg
         self._workspace_root = str(workspace_cfg.workspace_root)
         self._agent_home_segment = workspace_cfg.agent_home_segment
+        self._skill_discovery_layout = self._resolve_skill_discovery_layout()
         from langchain_agentx.workspace import WorkspaceBoundary
 
         self._workspace_boundary = WorkspaceBoundary.build(
@@ -1088,6 +1093,27 @@ class LoopGraphBuilder:
             write_roots=list(self._config.workspace.write_roots) or None,
         )
 
+    def _resolve_skill_discovery_layout(self) -> Any | None:
+        from langchain_agentx.tools.skill.source_paths import SkillDiscoveryLayout
+
+        sd = self._config.workspace.skill_discovery
+        if sd is None:
+            return None
+        return SkillDiscoveryLayout(
+            project_skills_dir=(
+                Path(sd.project_skills_dir).expanduser()
+                if sd.project_skills_dir is not None
+                else None
+            ),
+            global_skills_dir=(
+                Path(sd.global_skills_dir).expanduser()
+                if sd.global_skills_dir is not None
+                else None
+            ),
+            include_managed=sd.include_managed,
+            include_user_home=sd.include_user_home,
+        )
+
     def _sync_tool_policy_roots_from_workspace(self) -> None:
         """挂载 A：compile 后以 AgentLoopConfig.workspace 刷新 loader policy roots。"""
         loader = self._services.loader

{langchain-agentx-python-2.3.2 → langchain-agentx-python-2.3.3}/langchain_agentx/tool_runtime/loader.py

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

{langchain-agentx-python-2.3.2 → langchain-agentx-python-2.3.3}/langchain_agentx/tool_runtime/loop_loader.py

@@ -34,11 +34,13 @@ class LoopLoader:
         workspace_root: str,
         agent_home_segment: str = ".langchain_agentx",
         session_cwd: str | Path | None = None,
+        skill_discovery: Any | None = None,
     ) -> None:
         self._process = process
         self._workspace_root = workspace_root
         self._agent_home = agent_home_segment
         self._session_cwd = session_cwd
+        self._skill_discovery = skill_discovery
         self._registry = RuntimeToolRegistry(
             pipeline=process.pipeline,
             adapter=process.adapter,
@@ -107,7 +109,7 @@ class LoopLoader:
             agent_home_segment=self._agent_home,
             session_cwd=effective_cwd,
         )
-        self._merge_skill_read_roots_policy(cfg)
+        self._merge_skill_read_roots_policy(cfg, discovery=self._skill_discovery)
         self._inject_project_memory_policy(cfg)
         plugin_ex = PluginCacheGlobExclusions(
             cache_root=str(cfg.plugin_cache_dir.resolve()),
@@ -211,11 +213,19 @@ class LoopLoader:
                 setter(patterns)
         return patterns
 
-    def _merge_skill_read_roots_policy(self, workspace_cfg: Any) -> None:
+    def _merge_skill_read_roots_policy(
+        self,
+        workspace_cfg: Any,
+        *,
+        discovery: Any | None = None,
+    ) -> None:
         """G-2：skill 发现目录并入 read_roots（在 project_memory 注入之前）。"""
         from langchain_agentx.tools.skill.source_paths import resolve_skill_read_roots
 
-        roots = resolve_skill_read_roots(workspace_cfg)
+        roots = resolve_skill_read_roots(
+            workspace_cfg,
+            discovery=discovery if discovery is not None else self._skill_discovery,
+        )
         if not roots:
             return
         base = self._process.effective_policy_config()

{langchain-agentx-python-2.3.2 → langchain-agentx-python-2.3.3}/langchain_agentx/tools/skill/catalog.py

@@ -35,7 +35,7 @@ if TYPE_CHECKING:
     from langchain_agentx.plugin.registries import SkillRegistry
     from langchain_agentx.workspace.config import ResolvedAgentStateConfig
 
-SkillLoadedFrom = Literal["bundled", "plugin", "managed", "user", "project", "dynamic"]
+SkillLoadedFrom = Literal["bundled", "plugin", "managed", "user", "project", "global", "dynamic"]
 
 
 @dataclass(frozen=True, slots=True)

{langchain-agentx-python-2.3.2 → langchain-agentx-python-2.3.3}/langchain_agentx/tools/skill/multi_source_repository.py

@@ -57,6 +57,8 @@ class MultiSourceSkillCommandRepository:
 
         for spec in self._sources:
             skills_dir = spec.skills_dir
+            if not skills_dir.expanduser().resolve().is_dir():
+                continue
             if self._gitignore_guard.should_skip_skills_dir(skills_dir, cwd=self._cwd):
                 continue
             for cmd in self._dir_loader.load_commands_from_dir(skills_dir):

{langchain-agentx-python-2.3.2 → langchain-agentx-python-2.3.3}/langchain_agentx/tools/skill/repository_factory.py

@@ -17,7 +17,7 @@ from langchain_agentx.workspace.config import ResolvedAgentStateConfig
 
 from .loader import SkillCommandRepository
 from .multi_source_repository import MultiSourceSkillCommandRepository
-from .source_paths import resolve_skill_source_specs
+from .source_paths import SkillDiscoveryLayout, resolve_skill_source_specs
 
 SkillRepository = Union[SkillCommandRepository, MultiSourceSkillCommandRepository]
 
@@ -26,13 +26,15 @@ def build_skill_repository(
     workspace_cfg: ResolvedAgentStateConfig,
     *,
     skills_root: Path | None = None,
+    discovery: SkillDiscoveryLayout | None = None,
 ) -> SkillRepository:
     if skills_root is not None:
         return SkillCommandRepository(Path(skills_root).expanduser().resolve())
+    cwd = workspace_cfg.session_cwd or workspace_cfg.workspace_root
     return MultiSourceSkillCommandRepository(
-        resolve_skill_source_specs(workspace_cfg),
+        resolve_skill_source_specs(workspace_cfg, discovery=discovery),
         workspace_root=workspace_cfg.workspace_root,
-        cwd=workspace_cfg.workspace_root,
+        cwd=cwd,
     )
 
 

{langchain-agentx-python-2.3.2 → langchain-agentx-python-2.3.3}/langchain_agentx/tools/skill/source_paths.py

@@ -26,7 +26,21 @@ from langchain_agentx.workspace.project_key import resolve_config_home_dir
 if TYPE_CHECKING:
     from .models import SkillCommand
 
-DiskSkillSource = Literal["managed", "user", "project"]
+DiskSkillSource = Literal["managed", "user", "project", "global"]
+
+
+@dataclass(frozen=True, slots=True)
+class SkillDiscoveryLayout:
+    """显式 skill 发现层级（Workflow 节点 / 双 workspace 宿主）。
+
+    first-wins 顺序：project → global → user → managed（与 CC 项目覆盖全局一致）。
+    未设 ``discovery`` 时保留 legacy：managed → user → project。
+    """
+
+    project_skills_dir: Path | None = None
+    global_skills_dir: Path | None = None
+    include_managed: bool = False
+    include_user_home: bool = False
 
 
 @dataclass(frozen=True, slots=True)
@@ -61,23 +75,35 @@ def resolve_managed_skills_dir(agent_home_segment: str) -> Path:
     return resolve_managed_settings_root() / segment / "skills"
 
 
+def _existing_skills_dir(path: Path) -> Path | None:
+    try:
+        resolved = path.expanduser().resolve()
+    except OSError:
+        return None
+    if resolved.is_dir():
+        return resolved
+    return None
+
+
 def resolve_skill_read_roots(
     workspace_cfg: ResolvedAgentStateConfig,
     *,
     project_skills_dir: Path | None = None,
+    discovery: SkillDiscoveryLayout | None = None,
 ) -> tuple[Path, ...]:
-    """Skill 发现目录绝对路径（与 ``resolve_skill_source_specs`` 同源，去重保序）。"""
+    """Skill 可读根（仅 **已存在** 的目录；S-5 发现语义，非 boundary 错误）。"""
     seen: set[Path] = set()
     roots: list[Path] = []
     for spec in resolve_skill_source_specs(
         workspace_cfg,
         project_skills_dir=project_skills_dir,
+        discovery=discovery,
     ):
-        resolved = spec.skills_dir.expanduser().resolve()
-        if resolved in seen:
+        existing = _existing_skills_dir(spec.skills_dir)
+        if existing is None or existing in seen:
             continue
-        seen.add(resolved)
-        roots.append(resolved)
+        seen.add(existing)
+        roots.append(existing)
     return tuple(roots)
 
 
@@ -85,20 +111,44 @@ def resolve_skill_source_specs(
     workspace_cfg: ResolvedAgentStateConfig,
     *,
     project_skills_dir: Path | None = None,
+    discovery: SkillDiscoveryLayout | None = None,
 ) -> list[SkillSourceSpec]:
-    """managed → user → project（first-wins 由 repository 执行）。"""
+    """Skill 源列表；repository first-wins 按列表顺序。"""
     segment = workspace_cfg.agent_home_segment
-    project_dir = project_skills_dir or workspace_cfg.skills_dir
-    specs: list[SkillSourceSpec] = []
-    if not policy_skills_disabled():
+    if discovery is None:
+        project_dir = project_skills_dir or workspace_cfg.skills_dir
+        specs: list[SkillSourceSpec] = []
+        if not policy_skills_disabled():
+            specs.append(SkillSourceSpec(resolve_managed_skills_dir(segment), "managed"))
+        specs.append(SkillSourceSpec(resolve_user_skills_dir(segment), "user"))
+        specs.append(SkillSourceSpec(Path(project_dir).expanduser().resolve(), "project"))
+        return specs
+
+    project_dir = (
+        discovery.project_skills_dir
+        or project_skills_dir
+        or workspace_cfg.skills_dir
+    )
+    specs = [
+        SkillSourceSpec(Path(project_dir).expanduser().resolve(), "project"),
+    ]
+    if discovery.global_skills_dir is not None:
+        specs.append(
+            SkillSourceSpec(
+                Path(discovery.global_skills_dir).expanduser().resolve(),
+                "global",
+            )
+        )
+    if discovery.include_user_home:
+        specs.append(SkillSourceSpec(resolve_user_skills_dir(segment), "user"))
+    if not policy_skills_disabled() and discovery.include_managed:
         specs.append(SkillSourceSpec(resolve_managed_skills_dir(segment), "managed"))
-    specs.append(SkillSourceSpec(resolve_user_skills_dir(segment), "user"))
-    specs.append(SkillSourceSpec(Path(project_dir).expanduser().resolve(), "project"))
     return specs
 
 
 __all__ = [
     "DiskSkillSource",
+    "SkillDiscoveryLayout",
     "SkillSourceSpec",
     "SourcedSkillEntry",
     "policy_skills_disabled",

{langchain-agentx-python-2.3.2 → langchain-agentx-python-2.3.3}/langchain_agentx/workspace/project_memory_layout.py

@@ -149,6 +149,10 @@ class ProjectMemoryLayoutResolver:
         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
+        # SSOT：布局解析即保证 projects/{key} 存在，避免启动链路先读/扫描 transcript 时
+        # FileNotFoundError（子目录首次启动、key_sess 全新时必现）。
+        l2_project_dir.mkdir(parents=True, exist_ok=True)
+        sess_project_dir.mkdir(parents=True, exist_ok=True)
         override = _resolve_memory_dir_override(memory_dir_override)
         return ProjectMemoryLayout(
             agent_home_segment=agent_home_segment.strip(),

{langchain-agentx-python-2.3.2 → langchain-agentx-python-2.3.3/langchain_agentx_python.egg-info}/PKG-INFO

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

{langchain-agentx-python-2.3.2 → langchain-agentx-python-2.3.3}/pyproject.toml

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