langchain-agentx-python 2.3.0__tar.gz → 2.3.1__tar.gz

{langchain-agentx-python-2.3.0/langchain_agentx_python.egg-info → langchain-agentx-python-2.3.1}/PKG-INFO

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

{langchain-agentx-python-2.3.0 → langchain-agentx-python-2.3.1}/langchain_agentx/__init__.py

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

{langchain-agentx-python-2.3.0 → langchain-agentx-python-2.3.1}/langchain_agentx/loop/graph/factory.py

@@ -756,8 +756,17 @@ class LoopGraphBuilder:
                 include_agent=not user_has_agent_tool,
             )
             for tool in self._services.loader.registry.list():
-                if tool.name not in self._loop_loader.registry._tools:
-                    self._loop_loader.register(tool)
+                if tool.name in self._loop_loader.registry._tools:
+                    existing = self._loop_loader.registry.get(tool.name)
+                    if existing is not tool:
+                        logger.warning(
+                            "Host loader tool %r not merged into loop; "
+                            "register_default_tools already registered %r (S-4)",
+                            tool.name,
+                            tool.name,
+                        )
+                    continue
+                self._loop_loader.register(tool)
             self._runtime_tools = self._loop_loader.registry.list()
             from ...loop.prompt.tool_aware_sections import collect_enabled_tool_names
 

{langchain-agentx-python-2.3.0 → langchain-agentx-python-2.3.1}/langchain_agentx/tool_runtime/loader.py

@@ -155,6 +155,7 @@ class ToolRuntimeLoader:
         目的：为 subagent 组装“过滤后的工具池”而不丢失权限/管控语义。
         """
         child = ToolRuntimeLoader(
+            policy_config=self._process.policy_config,
             policy_engine=self._process.policy,
             headless=self._process.headless if headless is None else headless,
             prompt_handler=self._process.prompt_handler,

{langchain-agentx-python-2.3.0 → langchain-agentx-python-2.3.1}/langchain_agentx/tool_runtime/loop_loader.py

@@ -107,6 +107,7 @@ class LoopLoader:
             agent_home_segment=self._agent_home,
             session_cwd=effective_cwd,
         )
+        self._merge_skill_read_roots_policy(cfg)
         self._inject_project_memory_policy(cfg)
         plugin_ex = PluginCacheGlobExclusions(
             cache_root=str(cfg.plugin_cache_dir.resolve()),
@@ -210,11 +211,21 @@ class LoopLoader:
                 setter(patterns)
         return patterns
 
+    def _merge_skill_read_roots_policy(self, workspace_cfg: Any) -> 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)
+        if not roots:
+            return
+        base = self._process.effective_policy_config()
+        self._process.apply_policy_config(base.with_merged_read_roots(roots))
+
     def _inject_project_memory_policy(self, workspace_cfg: Any) -> None:
         """Per-loop 注入 CC projects 树读写根与 path_safety layout。"""
         layout = workspace_cfg.project_memory_layout
         workspace_root = str(Path(self._workspace_root).resolve())
-        base = self._process.policy_config or ToolPolicyConfig()
+        base = self._process.effective_policy_config()
         if not base.read_roots:
             base = replace(base, read_roots=[workspace_root])
         if not base.write_roots:

{langchain-agentx-python-2.3.0 → langchain-agentx-python-2.3.1}/langchain_agentx/tool_runtime/policy.py

@@ -45,9 +45,11 @@ from __future__ import annotations
 import fnmatch
 import os
 import sys
+from pathlib import Path
 import warnings
 from abc import ABC, abstractmethod
 from dataclasses import dataclass, field, replace
+from collections.abc import Iterable
 from typing import TYPE_CHECKING, Any
 
 from .models import AuthorizationDecision, ToolExecutionContext
@@ -123,6 +125,20 @@ class ToolPolicyConfig:
             normalize_tool_name_set(self.cli_allow_tools),
         )
 
+    def with_merged_read_roots(
+        self,
+        extra: Iterable[str | os.PathLike[str]],
+    ) -> "ToolPolicyConfig":
+        """Union ``read_roots``；保留 cliArg / rules 等字段（Phase 2 skill 发现根）。"""
+        merged: list[str] = []
+        seen: set[str] = set()
+        for raw in (*self.read_roots, *(str(Path(p).expanduser().resolve()) for p in extra)):
+            if not raw or raw in seen:
+                continue
+            seen.add(raw)
+            merged.append(raw)
+        return replace(self, read_roots=merged)
+
     def with_project_memory_layout(
         self,
         layout: "ProjectMemoryLayout",
@@ -313,11 +329,16 @@ class DefaultPolicyEngine(PolicyEngine):
             config: 策略配置
             auto_mode_hook: Auto Mode 授权 Hook（可选，Phase 1 集成）
         """
+        self._auto_mode_hook = auto_mode_hook
+        self._internal_paths = InternalPathEvaluator()
+        self._agent_home_bypass = AgentHomeSessionBypassEvaluator()
+        self.replace_policy_config(config)
+
+    def replace_policy_config(self, config: ToolPolicyConfig) -> None:
+        """原地更新 config 与派生 roots/authorizer（loop project memory 注入）。"""
         self._config = config
         self._read_roots = [os.path.realpath(r) for r in config.read_roots]
         self._write_roots = [os.path.realpath(r) for r in config.write_roots]
-        self._auto_mode_hook = auto_mode_hook
-        self._internal_paths = InternalPathEvaluator()
         self._path_safety: PathSafetyEvaluator | None = None
         if config.enable_path_safety and config.path_safety is not None:
             self._path_safety = PathSafetyEvaluator(
@@ -341,7 +362,6 @@ class DefaultPolicyEngine(PolicyEngine):
                 self._within_root(real_path, r) for r in self._read_roots
             ),
         )
-        self._agent_home_bypass = AgentHomeSessionBypassEvaluator()
 
     def authorize(
         self,

{langchain-agentx-python-2.3.0 → langchain-agentx-python-2.3.1}/langchain_agentx/tool_runtime/process_loader.py

@@ -50,14 +50,21 @@ class ProcessLoader:
             permission_resolver=permission_resolver,
         )
         self._adapter = LangChainAdapter()
-        self._policy_config = policy_config
         if policy_engine is not None:
             self._policy: PolicyEngine | None = policy_engine
+            if policy_config is not None:
+                self._policy_config = policy_config
+            elif isinstance(policy_engine, DefaultPolicyEngine):
+                self._policy_config = policy_engine._config
+            else:
+                self._policy_config = None
         elif policy_config is not None:
+            self._policy_config = policy_config
             self._policy = DefaultPolicyEngine(policy_config)
         else:
-            self._policy = DefaultPolicyEngine(ToolPolicyConfig())
-            self._policy_config = ToolPolicyConfig()
+            empty = ToolPolicyConfig()
+            self._policy_config = empty
+            self._policy = DefaultPolicyEngine(empty)
 
     def set_permission_resolver(
         self,
@@ -141,12 +148,22 @@ class ProcessLoader:
     def permission_resolver(self) -> PermissionResolver | None:
         return self._permission_resolver
 
+    def effective_policy_config(self) -> ToolPolicyConfig:
+        """policy_config → DefaultPolicyEngine._config → 空配置（loop 注入 SSOT）。"""
+        if self._policy_config is not None:
+            return self._policy_config
+        policy = self._policy
+        if isinstance(policy, DefaultPolicyEngine):
+            return policy._config
+        return ToolPolicyConfig()
+
     def apply_policy_config(self, policy_config: ToolPolicyConfig) -> None:
-        """替换策略配置并重建 DefaultPolicyEngine（保留 auto_mode hook）。"""
-        auto_hook = None
-        if isinstance(self._policy, DefaultPolicyEngine):
-            auto_hook = self._policy._auto_mode_hook
+        """替换策略配置；DefaultPolicyEngine 原地 rebind，保留 engine 实例 id。"""
         self._policy_config = policy_config
+        if isinstance(self._policy, DefaultPolicyEngine):
+            self._policy.replace_policy_config(policy_config)
+            return
+        auto_hook = None
         self._policy = DefaultPolicyEngine(policy_config, auto_mode_hook=auto_hook)
 
     def sync_permission_rules_from_disk(

{langchain-agentx-python-2.3.0 → langchain-agentx-python-2.3.1}/langchain_agentx/tools/bash/command_allow_rules.py

@@ -24,6 +24,8 @@ from langchain_agentx.tool_runtime.permission_rules import (
 )
 from langchain_agentx.tools.bash.read_only_validation import BashReadOnlyClassifier
 
+from langchain_agentx.tool_runtime.policy import PolicyEngine, resolve_default_policy_engine
+
 if TYPE_CHECKING:
     from langchain_agentx.tool_runtime.policy import DefaultPolicyEngine
 
@@ -80,13 +82,14 @@ def cliarg_bash_has_content_allow_without_bare_tool(
 def try_registry_bash_content_allow_decision(
     command: str,
     ctx: ToolExecutionContext,
-    policy_engine: DefaultPolicyEngine | None,
+    policy_engine: PolicyEngine | None,
 ) -> AuthorizationDecision | None:
     """cliArg/settings 等内容级 Bash allow（CC bashPermissions prefix allow，path 通过后）。"""
-    if policy_engine is None:
+    engine = resolve_default_policy_engine(policy_engine)
+    if engine is None:
         return None
     registry = build_permission_rule_registry(
-        policy_config=policy_engine._config,
+        policy_config=engine._config,
         session_store=ctx.session_store,
         workspace_root=ctx.workspace_root,
         agent_home_segment=ctx.agent_home_segment,
@@ -107,10 +110,11 @@ def promote_unscoped_bash_passthrough_to_ask(
     *,
     command: str,
     ctx: ToolExecutionContext,
-    policy_engine: DefaultPolicyEngine | None,
+    policy_engine: PolicyEngine | None,
 ) -> AuthorizationDecision:
     """无 cliArg Bash allow 时，write_roots 静默 allow → ask（对齐 CC passthrough）。"""
-    if policy_engine is None or decision.behavior != "allow":
+    engine = resolve_default_policy_engine(policy_engine)
+    if engine is None or decision.behavior != "allow":
         return decision
     if _READ_ONLY_CLASSIFIER.classify(
         command.strip(),
@@ -120,7 +124,7 @@ def promote_unscoped_bash_passthrough_to_ask(
     if decision.policy_id != "write_roots":
         return decision
     registry = build_permission_rule_registry(
-        policy_config=policy_engine._config,
+        policy_config=engine._config,
         session_store=ctx.session_store,
         workspace_root=ctx.workspace_root,
         agent_home_segment=ctx.agent_home_segment,
@@ -145,13 +149,14 @@ def promote_unmatched_cliarg_content_only_allow_to_ask(
     *,
     command: str,
     ctx: ToolExecutionContext,
-    policy_engine: DefaultPolicyEngine | None,
+    policy_engine: PolicyEngine | None,
 ) -> AuthorizationDecision:
     """roots 内 silent allow → ask（仅 cliArg 有 Bash(pattern) 且无裸 Bash 时）。"""
-    if policy_engine is None or decision.behavior != "allow" or decision.policy_id:
+    engine = resolve_default_policy_engine(policy_engine)
+    if engine is None or decision.behavior != "allow" or decision.policy_id:
         return decision
     registry = build_permission_rule_registry(
-        policy_config=policy_engine._config,
+        policy_config=engine._config,
         session_store=ctx.session_store,
         workspace_root=ctx.workspace_root,
         agent_home_segment=ctx.agent_home_segment,

{langchain-agentx-python-2.3.0 → langchain-agentx-python-2.3.1}/langchain_agentx/tools/skill/source_paths.py

@@ -61,6 +61,26 @@ def resolve_managed_skills_dir(agent_home_segment: str) -> Path:
     return resolve_managed_settings_root() / segment / "skills"
 
 
+def resolve_skill_read_roots(
+    workspace_cfg: ResolvedAgentStateConfig,
+    *,
+    project_skills_dir: Path | None = None,
+) -> tuple[Path, ...]:
+    """Skill 发现目录绝对路径（与 ``resolve_skill_source_specs`` 同源，去重保序）。"""
+    seen: set[Path] = set()
+    roots: list[Path] = []
+    for spec in resolve_skill_source_specs(
+        workspace_cfg,
+        project_skills_dir=project_skills_dir,
+    ):
+        resolved = spec.skills_dir.expanduser().resolve()
+        if resolved in seen:
+            continue
+        seen.add(resolved)
+        roots.append(resolved)
+    return tuple(roots)
+
+
 def resolve_skill_source_specs(
     workspace_cfg: ResolvedAgentStateConfig,
     *,
@@ -83,6 +103,7 @@ __all__ = [
     "SourcedSkillEntry",
     "policy_skills_disabled",
     "resolve_managed_skills_dir",
+    "resolve_skill_read_roots",
     "resolve_skill_source_specs",
     "resolve_user_skills_dir",
 ]

{langchain-agentx-python-2.3.0 → langchain-agentx-python-2.3.1/langchain_agentx_python.egg-info}/PKG-INFO

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

{langchain-agentx-python-2.3.0 → langchain-agentx-python-2.3.1}/pyproject.toml

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