langchain-agentx-python 1.1.7__tar.gz → 1.1.9__tar.gz

{langchain-agentx-python-1.1.7/langchain_agentx_python.egg-info → langchain-agentx-python-1.1.9}/PKG-INFO

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

{langchain-agentx-python-1.1.7 → langchain-agentx-python-1.1.9}/langchain_agentx/__init__.py

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

{langchain-agentx-python-1.1.7 → langchain-agentx-python-1.1.9}/langchain_agentx/command/allowed_tools.py

@@ -2,7 +2,7 @@
 command/allowed_tools.py — CC 风格 allowed_tools 解析与应用。
 
 职责：
-    解析 Bash(git add:*) / read_file 等条目，写入 session 权限上下文。
+    解析 Bash(git add:*) / Read 等条目，写入 session 权限上下文。
 
 链路位置：
     Session run_slash_command → apply_command_tool_scope。
@@ -20,6 +20,7 @@ from ..tool_runtime.permission_context import (
     set_command_bash_allow_rules,
 )
 from ..tool_runtime.session_store import AgentSessionStore
+from ..tool_runtime.tool_name_constants import Bash
 
 _ALLOWED_TOOL_RE = re.compile(r"^([A-Za-z][A-Za-z0-9_-]*)(?:\((.*)\))?$")
 
@@ -38,7 +39,7 @@ def parse_allowed_tool_rule(entry: str) -> ParsedAllowedToolRule | None:
     match = _ALLOWED_TOOL_RE.fullmatch(text)
     if match is None:
         return None
-    tool_name = match.group(1).lower()
+    tool_name = match.group(1)
     raw_content = match.group(2)
     rule_content = None if raw_content is None else raw_content.strip()
     if rule_content == "" or rule_content == "*":
@@ -59,15 +60,15 @@ def partition_allowed_tools(
         parsed = parse_allowed_tool_rule(entry)
         if parsed is None:
             continue
-        if parsed.tool_name == "bash":
+        if parsed.tool_name == Bash:
             if parsed.rule_content is not None:
                 key = parsed.rule_content.lower()
                 if key not in seen_patterns:
                     seen_patterns.add(key)
                     bash_patterns.append(parsed.rule_content)
-            elif "bash" not in seen_tools:
-                seen_tools.add("bash")
-                tool_names.append("bash")
+            elif Bash not in seen_tools:
+                seen_tools.add(Bash)
+                tool_names.append(Bash)
         else:
             if parsed.tool_name not in seen_tools:
                 seen_tools.add(parsed.tool_name)

{langchain-agentx-python-1.1.7 → langchain-agentx-python-1.1.9}/langchain_agentx/command/fork_executor.py

@@ -21,7 +21,7 @@ from langchain_agentx.workspace.config import ResolvedAgentStateConfig
 
 
 def _bash_only_tool_filter(all_tools: list[Any]) -> list[Any]:
-    return [tool for tool in all_tools if getattr(tool, "name", "") == "bash"]
+    return [tool for tool in all_tools if getattr(tool, "name", "") == "Bash"]
 
 
 def _commit_fork_subagent_config() -> SubagentConfig:
@@ -32,7 +32,7 @@ def _commit_fork_subagent_config() -> SubagentConfig:
         description="Isolated slash-command fork worker",
         when_to_use="Internal fork execution for slash commands",
         tool_filter=_bash_only_tool_filter,
-        tools_description="bash",
+        tools_description="Bash",
         default_max_steps=8,
         allow_async=False,
         tags={"fork", "slash-command"},

{langchain-agentx-python-1.1.7 → langchain-agentx-python-1.1.9}/langchain_agentx/command/prompt_shell.py

@@ -1,123 +1,123 @@
-"""
-command/prompt_shell.py — Prompt 内嵌 shell 命令执行（CC executeShellCommandsInPrompt 对齐）。
-
-职责：
-    解析并执行 prompt 中的 !`command` 占位，将输出内联替换；执行前走路由权限检查。
-
-链路位置：
-    由 command/builtin/commit* 在展开 prompt 前调用。
-"""
-
-from __future__ import annotations
-
-import re
-from collections.abc import Callable, Sequence
-from pathlib import Path
-from typing import Protocol
-
-from langchain_agentx.tool_runtime.models import ToolExecutionContext
-from langchain_agentx.tool_runtime.permission_context import set_command_bash_allow_rules
-from langchain_agentx.tool_runtime.session_store import AgentSessionStore
-from langchain_agentx.utils.subprocess_text import TextSubprocessRunner, default_text_subprocess_runner
-
-_INLINE_PATTERN = re.compile(r"!`([^`]+)`")
-
-
-class PromptShellPermissionError(RuntimeError):
-    """prompt 内嵌 shell 命令未通过 Bash 权限检查。"""
-
-
-class _ShellRunner(Protocol):
-    def run_text(
-        self,
-        argv: list[str],
-        *,
-        cwd: str | Path | None = None,
-        timeout_sec: float | None = None,
-    ) -> tuple[int, str, str]: ...
-
-
-def _default_runner_call(
-    runner: TextSubprocessRunner,
-    command: str,
-    *,
-    cwd: str | Path | None,
-) -> tuple[int, str, str]:
-    completed = runner.run(
-        ["bash", "-lc", command],
-        cwd=cwd,
-        timeout=30.0,
-        capture_output=True,
-    )
-    stdout = completed.stdout or ""
-    stderr = completed.stderr or ""
-    if completed.returncode != 0 and not stdout.strip():
-        return completed.returncode, "", stderr.strip() or f"exit {completed.returncode}"
-    return completed.returncode, stdout, stderr
-
-
-def _assert_prompt_shell_permission(
-    command: str,
-    *,
-    bash_allow_rules: Sequence[str] | None,
-    cwd: str | Path | None,
-) -> None:
-    from langchain_agentx.tools.bash.tool import BashRuntimeTool
-
-    store = AgentSessionStore("prompt-shell")
-    if bash_allow_rules:
-        set_command_bash_allow_rules(store, bash_allow_rules)
-    workspace_root = str(cwd) if cwd is not None else None
-    ctx = ToolExecutionContext(
-        tool_name="bash",
-        tool_call_id="prompt-shell",
-        input_args={"command": command},
-        state={},
-        session_store=store,
-        workspace_root=workspace_root,
-        cwd=workspace_root,
-    )
-    decision = BashRuntimeTool().check_permissions({"command": command}, ctx)
-    if decision.behavior == "deny":
-        message = decision.message or "Permission denied"
-        raise PromptShellPermissionError(
-            f'Shell command permission check failed for "!`{command}`": {message}',
-        )
-
-
-async def execute_shell_commands_in_prompt(
-    text: str,
-    *,
-    cwd: str | Path | None = None,
-    runner: TextSubprocessRunner | None = None,
-    shell_runner: Callable[[str], tuple[int, str, str]] | None = None,
-    bash_allow_rules: Sequence[str] | None = None,
-    check_permissions: bool = True,
-) -> str:
-    """将 text 中所有 !`command` 替换为命令 stdout（失败时内联 stderr/exit）。"""
-    if "!`" not in text:
-        return text
-
-    text_runner = runner or default_text_subprocess_runner()
-    result = text
-
-    for match in list(_INLINE_PATTERN.finditer(text)):
-        command = match.group(1).strip()
-        if not command:
-            continue
-        if check_permissions and shell_runner is None:
-            _assert_prompt_shell_permission(
-                command,
-                bash_allow_rules=bash_allow_rules,
-                cwd=cwd,
-            )
-        if shell_runner is not None:
-            _code, stdout, stderr = shell_runner(command)
-        else:
-            _code, stdout, stderr = _default_runner_call(text_runner, command, cwd=cwd)
-        replacement = stdout.strip() if stdout.strip() else stderr.strip()
-        if not replacement:
-            replacement = "(no output)"
-        result = result.replace(match.group(0), replacement, 1)
-
-    return result
+"""
+command/prompt_shell.py — Prompt 内嵌 shell 命令执行（CC executeShellCommandsInPrompt 对齐）。
+
+职责：
+    解析并执行 prompt 中的 !`command` 占位，将输出内联替换；执行前走路由权限检查。
+
+链路位置：
+    由 command/builtin/commit* 在展开 prompt 前调用。
+"""
+
+from __future__ import annotations
+
+import re
+from collections.abc import Callable, Sequence
+from pathlib import Path
+from typing import Protocol
+
+from langchain_agentx.tool_runtime.models import ToolExecutionContext
+from langchain_agentx.tool_runtime.permission_context import set_command_bash_allow_rules
+from langchain_agentx.tool_runtime.session_store import AgentSessionStore
+from langchain_agentx.utils.subprocess_text import TextSubprocessRunner, default_text_subprocess_runner
+
+_INLINE_PATTERN = re.compile(r"!`([^`]+)`")
+
+
+class PromptShellPermissionError(RuntimeError):
+    """prompt 内嵌 shell 命令未通过 Bash 权限检查。"""
+
+
+class _ShellRunner(Protocol):
+    def run_text(
+        self,
+        argv: list[str],
+        *,
+        cwd: str | Path | None = None,
+        timeout_sec: float | None = None,
+    ) -> tuple[int, str, str]: ...
+
+
+def _default_runner_call(
+    runner: TextSubprocessRunner,
+    command: str,
+    *,
+    cwd: str | Path | None,
+) -> tuple[int, str, str]:
+    completed = runner.run(
+        ["bash", "-lc", command],
+        cwd=cwd,
+        timeout=30.0,
+        capture_output=True,
+    )
+    stdout = completed.stdout or ""
+    stderr = completed.stderr or ""
+    if completed.returncode != 0 and not stdout.strip():
+        return completed.returncode, "", stderr.strip() or f"exit {completed.returncode}"
+    return completed.returncode, stdout, stderr
+
+
+def _assert_prompt_shell_permission(
+    command: str,
+    *,
+    bash_allow_rules: Sequence[str] | None,
+    cwd: str | Path | None,
+) -> None:
+    from langchain_agentx.tools.bash.tool import BashRuntimeTool
+
+    store = AgentSessionStore("prompt-shell")
+    if bash_allow_rules:
+        set_command_bash_allow_rules(store, bash_allow_rules)
+    workspace_root = str(cwd) if cwd is not None else None
+    ctx = ToolExecutionContext(
+        tool_name="Bash",
+        tool_call_id="prompt-shell",
+        input_args={"command": command},
+        state={},
+        session_store=store,
+        workspace_root=workspace_root,
+        cwd=workspace_root,
+    )
+    l1 = BashRuntimeTool().run_l1_permission_check({"command": command}, ctx)
+    if l1.outcome == "deny":
+        message = (l1.decision.message if l1.decision else None) or "Permission denied"
+        raise PromptShellPermissionError(
+            f'Shell command permission check failed for "!`{command}`": {message}',
+        )
+
+
+async def execute_shell_commands_in_prompt(
+    text: str,
+    *,
+    cwd: str | Path | None = None,
+    runner: TextSubprocessRunner | None = None,
+    shell_runner: Callable[[str], tuple[int, str, str]] | None = None,
+    bash_allow_rules: Sequence[str] | None = None,
+    check_permissions: bool = True,
+) -> str:
+    """将 text 中所有 !`command` 替换为命令 stdout（失败时内联 stderr/exit）。"""
+    if "!`" not in text:
+        return text
+
+    text_runner = runner or default_text_subprocess_runner()
+    result = text
+
+    for match in list(_INLINE_PATTERN.finditer(text)):
+        command = match.group(1).strip()
+        if not command:
+            continue
+        if check_permissions and shell_runner is None:
+            _assert_prompt_shell_permission(
+                command,
+                bash_allow_rules=bash_allow_rules,
+                cwd=cwd,
+            )
+        if shell_runner is not None:
+            _code, stdout, stderr = shell_runner(command)
+        else:
+            _code, stdout, stderr = _default_runner_call(text_runner, command, cwd=cwd)
+        replacement = stdout.strip() if stdout.strip() else stderr.strip()
+        if not replacement:
+            replacement = "(no output)"
+        result = result.replace(match.group(0), replacement, 1)
+
+    return result

{langchain-agentx-python-1.1.7 → langchain-agentx-python-1.1.9}/langchain_agentx/loop/config/__init__.py

@@ -13,6 +13,7 @@ from .interaction_profile import (
     normalize_config,
     sanity_check_profile,
 )
+from .loop_runtime_overlay import LoopRuntimeOverlay
 from .model_context_resolver import ModelContextResolver
 from .token_estimator import TokenEstimator
 from .runtime_settings import (
@@ -32,6 +33,7 @@ __all__ = [
     "assemble_services",
     "normalize_config",
     "sanity_check_profile",
+    "LoopRuntimeOverlay",
     "ModelContextResolver",
     "TokenEstimator",
     "build_agent_config",

{langchain-agentx-python-1.1.7 → langchain-agentx-python-1.1.9}/langchain_agentx/loop/config/interaction_profile.py

@@ -211,6 +211,8 @@ def assemble_services(
     if loader is None:
         return replace(svcs, prompt_handler=handler)
 
+    apply_profile_policy_defaults(cfg, loader)
+
     if _loader_headless(loader) != bool(cfg.headless):
         loader.sync_headless(bool(cfg.headless))
     loader.set_prompt_handler(handler)
@@ -218,6 +220,45 @@ def assemble_services(
     return replace(svcs, loader=loader, prompt_handler=handler)
 
 
+def apply_profile_policy_defaults(
+    config: AgentLoopConfig,
+    loader: Any,
+) -> None:
+    """HITL 剖面（code-interactive / code-plan）默认启用 GAP-7 denial tracking。
+
+    库级 ``ToolPolicyConfig.denial_tracking`` 默认 None/off；interactive REPL 产品剖面
+    在 ``assemble_services`` 注入 ``enabled=True``。显式 ``denial_tracking`` 不覆盖。
+    """
+    profile_id = InteractionProfileResolver().resolve_profile_id(config)
+    if profile_id not in _HITL_PROFILE_IDS:
+        return
+
+    from langchain_agentx.tool_runtime.denial_tracking import DenialTrackingConfig
+    from langchain_agentx.tool_runtime.policy import ToolPolicyConfig
+
+    process = getattr(loader, "process_loader", None) or getattr(loader, "process", None)
+    if process is None:
+        return
+
+    current = process.policy_config
+    if current is not None and current.denial_tracking is not None:
+        return
+
+    base = current or ToolPolicyConfig()
+    updated = replace(base, denial_tracking=DenialTrackingConfig(enabled=True))
+    process.apply_policy_config(updated)
+
+    policy = process.policy
+    if policy is None:
+        return
+    registry = getattr(loader, "registry", None)
+    if registry is None:
+        return
+    for tool in registry.list():
+        if getattr(tool, "_policy", None) is not None:
+            tool._policy = policy
+
+
 def sanity_check_profile(
     config: AgentLoopConfig,
     services: LoopServices,
@@ -239,6 +280,7 @@ def sanity_check_profile(
 
 __all__ = [
     "InteractionProfileResolver",
+    "apply_profile_policy_defaults",
     "assemble_services",
     "normalize_config",
     "sanity_check_profile",

langchain-agentx-python-1.1.9/langchain_agentx/loop/config/loop_runtime_overlay.py

@@ -0,0 +1,66 @@
+"""
+loop_runtime_overlay.py — L4 graph_factory 运行期 overlay（IF-G6）
+
+职责：
+    统一三 L4 工厂 graph_factory 的可变字段；禁止 overlay permission / container 剖面。
+
+链路位置：
+    create_agent_session / create_conversation_session / make_workflow_graph_factory
+    → graph_factory(overlay) → apply_to(AgentLoopConfig) → create_loop_agent
+
+当前裁剪范围：
+    仅 session_id、trace 父链、subagent 标记、capabilities、enable_trace；不含 container_type。
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass, replace
+from typing import Any, Callable
+
+from langchain_agentx.loop.config.loop_config import AgentLoopConfig
+
+
+@dataclass(frozen=True)
+class LoopRuntimeOverlay:
+    """运行期 overlay：per-invoke 字段，不含 permission / container_type。"""
+
+    session_id: str | None = None
+    enable_trace: bool | None = None
+    capabilities: Any = None
+    parent_conversation_session_id: str | None = None
+    is_subagent: bool | None = None
+
+    def apply_to(self, base: AgentLoopConfig) -> AgentLoopConfig:
+        """把 overlay 合并到静态 config（不触碰 container_type / permission_mode）。"""
+        cfg = base
+        if self.session_id is not None:
+            cfg = replace(cfg, session_id=self.session_id)
+
+        trace = cfg.trace
+        trace_changed = False
+        if self.enable_trace is not None:
+            trace = replace(trace, enabled=self.enable_trace)
+            trace_changed = True
+        if self.parent_conversation_session_id is not None:
+            trace = replace(trace, parent_conversation_session_id=self.parent_conversation_session_id)
+            trace_changed = True
+        if trace_changed:
+            cfg = replace(cfg, trace=trace)
+
+        if self.is_subagent is not None:
+            cfg = replace(
+                cfg,
+                subagent=replace(cfg.subagent, is_subagent=self.is_subagent),
+            )
+        return cfg
+
+
+ConversationGraphFactory = Callable[[LoopRuntimeOverlay], Any]
+AgentGraphFactory = Callable[..., Any]
+"""AgentSession：``(overlay, *, active_files_getter=...)``。"""
+
+__all__ = [
+    "LoopRuntimeOverlay",
+    "ConversationGraphFactory",
+    "AgentGraphFactory",
+]