langchain-agentx-python 0.2.8__tar.gz → 0.3.0__tar.gz

{langchain-agentx-python-0.2.8/langchain_agentx_python.egg-info → langchain-agentx-python-0.3.0}/PKG-INFO

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

{langchain-agentx-python-0.2.8 → langchain-agentx-python-0.3.0}/langchain_agentx/loop/config/__init__.py

@@ -1,4 +1,4 @@
-from .agent_config import build_agent_config
+from .agent_config import build_agent_config, merge_run_config
 from .agent_loop_config import AgentLoopConfig
 from .model_context_resolver import ModelContextResolver
 from .token_estimator import TokenEstimator
@@ -13,6 +13,7 @@ __all__ = [
     "ModelContextResolver",
     "TokenEstimator",
     "build_agent_config",
+    "merge_run_config",
     "compute_recursion_limit",
     "materialize_max_steps",
     "resolve_max_steps",

{langchain-agentx-python-0.2.8 → langchain-agentx-python-0.3.0}/langchain_agentx/loop/config/agent_config.py

@@ -14,6 +14,24 @@ from __future__ import annotations
 from typing import Any
 
 
+def merge_run_config(
+    graph: Any,
+    caller: dict[str, Any] | None = None,
+) -> dict[str, Any]:
+    """合并 graph 绑定的 recursion_limit 与调用方 config。
+
+    与 ``create_loop_agent(max_steps=...)`` 经 ``compute_recursion_limit`` 写入 graph 的上限对齐；
+    ``caller`` 中的同名字段可覆盖。
+    """
+    bound_raw = getattr(graph, "config", None)
+    bound: dict[str, Any] = bound_raw if isinstance(bound_raw, dict) else {}
+    limit = bound.get("recursion_limit", 9_999)
+    merged = build_agent_config(recursion_limit=limit)
+    if caller:
+        merged.update(caller)
+    return merged
+
+
 def build_agent_config(
     *,
     recursion_limit: int = 9_999,
@@ -60,7 +78,7 @@ def build_agent_config(
     return config
 
 
-__all__ = ["build_agent_config"]
+__all__ = ["build_agent_config", "merge_run_config"]
 
 
 

{langchain-agentx-python-0.2.8 → langchain-agentx-python-0.3.0}/langchain_agentx/loop/graph/factory.py

@@ -98,6 +98,7 @@ from ...memory.session import (
     make_session_memory_section,
 )
 from ..prompt import SystemPromptSection, build_effective_system_prompt
+from ..prompt.session_context import get_default_session_context_sections
 from ...tools.agent.prompt import build_explore_plan_guidance
 from ..config import AgentLoopConfig, ModelContextResolver
 from ..config.runtime_settings import compute_recursion_limit
@@ -191,6 +192,8 @@ class LoopGraphBuilder:
         raw_hooks: "HookRegistry | None" = None,
         enable_session_memory: bool = False,
         capabilities: "RuntimeCapabilities | None" = None,
+        enable_git_snapshot: bool | None = None,
+        include_default_session_context: bool = True,
     ) -> None:
         self._raw_model = model
         self._raw_system_prompt = system_prompt
@@ -230,6 +233,8 @@ class LoopGraphBuilder:
         self._raw_hooks = raw_hooks
         self._raw_enable_session_memory = enable_session_memory
         self._raw_capabilities = capabilities
+        self._raw_enable_git_snapshot = enable_git_snapshot
+        self._raw_include_default_session_context = include_default_session_context
 
         self._prepared = False
 
@@ -272,6 +277,15 @@ class LoopGraphBuilder:
                 extraction_state=self._session_memory_manager.extraction_state,
             )
             self._dynamic_sections.append(make_session_memory_section(session_memory_path))
+        if self._raw_include_default_session_context:
+            self._dynamic_sections.extend(
+                get_default_session_context_sections(
+                    self._workspace_cfg,
+                    container_type=self._raw_container_type,
+                    is_subagent=self._raw_is_subagent,
+                    enable_git_snapshot=self._raw_enable_git_snapshot,
+                )
+            )
         self._dynamic_sections.extend(
             InstructionMemoryBootstrap(
                 workspace_root=Path(self._workspace_root),
@@ -1369,6 +1383,8 @@ def create_loop_agent(
     hooks: "HookRegistry | None" = None,
     enable_session_memory: bool = False,
     capabilities: "RuntimeCapabilities | None" = None,
+    enable_git_snapshot: bool | None = None,
+    include_default_session_context: bool = True,
 ) -> CompiledStateGraph[
     AgentState[ResponseT], ContextT, _InputAgentState, _OutputAgentState[ResponseT]
 ]:
@@ -1413,6 +1429,8 @@ def create_loop_agent(
         raw_hooks=hooks,
         enable_session_memory=enable_session_memory,
         capabilities=capabilities,
+        enable_git_snapshot=enable_git_snapshot,
+        include_default_session_context=include_default_session_context,
     )
     tool_node = builder._build_tool_node()
     model_node = builder._build_model_nodes(tool_node)

{langchain-agentx-python-0.2.8 → langchain-agentx-python-0.3.0}/langchain_agentx/loop/prompt/__init__.py

@@ -15,9 +15,12 @@
     build_effective_system_prompt() — 优先级链构建器
 
     # 内置 section 工厂
-    env_section()        — 环境信息（OS/Python/工作目录）
+    env_section(workspace_cfg) — 环境信息（workspace_root / OS / Python）
+    date_section()       — 当前日期（session 级，对齐 CC currentDate）
+    get_default_session_context_sections() — create_loop_agent 默认注入组合
+    git_snapshot_section(workspace_root) — Git 启动快照（可选）
     language_section()   — 语言偏好
-    time_section()       — 当前时间（volatile）
+    time_section()       — 当前时间（volatile，非默认）
     token_budget_section() — Token 预算提示
     git_safety_section() — Git 安全红线（禁止 force-push 等危险操作）
     tool_routing_guard_section() — 专用工具优先（系统级冗余强化）
@@ -49,6 +52,13 @@ from .builtin import (
     tool_routing_guard_section,
     tools_summary_section,
 )
+from .session_context import (
+    date_section,
+    get_default_session_context_sections,
+    git_snapshot_section,
+    local_iso_date,
+    resolve_enable_git_snapshot,
+)
 from .compact import (
     AutocompactLlmPromptKind,
     PartialCompactDirection,
@@ -74,8 +84,13 @@ __all__ = [
     "build_effective_system_prompt",
     # 内置 section 工厂
     "actions_safety_section",
+    "date_section",
     "env_section",
     "failure_diagnosis_section",
+    "get_default_session_context_sections",
+    "git_snapshot_section",
+    "local_iso_date",
+    "resolve_enable_git_snapshot",
     "get_coding_sections",
     "git_safety_section",
     "language_section",

{langchain-agentx-python-0.2.8 → langchain-agentx-python-0.3.0}/langchain_agentx/loop/prompt/builtin.py

@@ -21,23 +21,14 @@ if TYPE_CHECKING:
     from typing import Any
 
 
-def env_section() -> SystemPromptSection:
+def env_section(workspace_cfg: Any) -> SystemPromptSection:
     """环境信息 section（session 级缓存）。
 
-    包含：操作系统、Python 版本、工作目录。
+    工作目录取自 ``AgentWorkspaceConfig.workspace_root``（见 ``session_context.env_section``）。
     """
+    from .session_context import env_section as _env_section
 
-    def compute() -> str:
-        import os
-
-        return f"""# Environment
-You have been invoked in the following environment:
- - Platform: {platform.system().lower()}
- - OS Version: {platform.platform()}
- - Python: {platform.python_version()}
- - Working Directory: {os.getcwd()}"""
-
-    return section(name="env_info", compute=compute)
+    return _env_section(workspace_cfg)
 
 
 def language_section(lang: str = "en") -> SystemPromptSection:

langchain-agentx-python-0.3.0/langchain_agentx/loop/prompt/session_context.py

@@ -0,0 +1,182 @@
+"""session_context.py — 会话级默认上下文 SystemPromptSection（date / env / git 快照）。
+
+职责：
+    为 create_loop_agent 提供与 CC 对齐的默认 session 上下文段；工作目录取自 AgentWorkspaceConfig。
+
+链路位置：
+    LoopGraphBuilder._prepare_compile_context → get_default_session_context_sections()。
+
+当前裁剪范围：
+    git 快照为可选（默认关）；子代理不注入 git 段。
+"""
+
+from __future__ import annotations
+
+import os
+import platform
+import subprocess
+from datetime import date
+from pathlib import Path
+from typing import TYPE_CHECKING
+
+from .sections import SystemPromptSection, section
+
+if TYPE_CHECKING:
+    from langchain_agentx.workspace import AgentWorkspaceConfig
+
+_GIT_STATUS_MAX_CHARS = 2000
+_ENABLE_GIT_SNAPSHOT_ENV = "LANGCHAIN_AGENTX_ENABLE_GIT_SNAPSHOT"
+
+
+def local_iso_date() -> str:
+    """本地时区 ISO 日期（YYYY-MM-DD），对齐 CC getLocalISODate。"""
+    override = os.environ.get("LANGCHAIN_AGENTX_OVERRIDE_DATE")
+    if override:
+        return override.strip()
+    return date.today().isoformat()
+
+
+def resolve_enable_git_snapshot(explicit: bool | None = None) -> bool:
+    if explicit is not None:
+        return bool(explicit)
+    return os.environ.get(_ENABLE_GIT_SNAPSHOT_ENV, "").strip().lower() in {
+        "1",
+        "true",
+        "yes",
+        "on",
+    }
+
+
+def date_section() -> SystemPromptSection:
+    """当前日期（session 级缓存，对齐 CC currentDate 文案）。"""
+
+    def compute() -> str:
+        return f"Today's date is {local_iso_date()}."
+
+    return section(name="session_date", compute=compute)
+
+
+def env_section(workspace_cfg: AgentWorkspaceConfig) -> SystemPromptSection:
+    """环境信息（session 级缓存）；工作目录使用 workspace_cfg.workspace_root。"""
+
+    working_dir = str(Path(workspace_cfg.workspace_root).resolve())
+    is_git = _is_git_repository(Path(workspace_cfg.workspace_root))
+
+    def compute() -> str:
+        return (
+            "# Environment\n"
+            "You have been invoked in the following environment:\n"
+            f" - Primary working directory: {working_dir}\n"
+            f" - Is a git repository: {'Yes' if is_git else 'No'}\n"
+            f" - Platform: {platform.system().lower()}\n"
+            f" - OS Version: {platform.platform()}\n"
+            f" - Python: {platform.python_version()}"
+        )
+
+    return section(name="env_info", compute=compute)
+
+
+def git_snapshot_section(workspace_root: Path) -> SystemPromptSection:
+    """Git 仓库启动快照（session 级缓存，对齐 CC getGitStatus）。"""
+
+    root = workspace_root.resolve()
+
+    def compute() -> str | None:
+        return collect_git_snapshot_text(root)
+
+    return section(name="git_snapshot", compute=compute)
+
+
+def get_default_session_context_sections(
+    workspace_cfg: AgentWorkspaceConfig,
+    *,
+    container_type: str | None = None,
+    is_subagent: bool = False,
+    enable_git_snapshot: bool | None = None,
+) -> list[SystemPromptSection]:
+    """按容器类型装配默认 session 上下文段（Loop 层单一装配入口）。"""
+    del container_type  # 预留：后续可按 workflow_task / sdk 等细分策略
+    sections: list[SystemPromptSection] = [
+        date_section(),
+        env_section(workspace_cfg),
+    ]
+    if not is_subagent and resolve_enable_git_snapshot(enable_git_snapshot):
+        sections.append(git_snapshot_section(Path(workspace_cfg.workspace_root)))
+    return sections
+
+
+def collect_git_snapshot_text(workspace_root: Path) -> str | None:
+    """收集 git 快照文本；非 git 仓库或命令失败时返回 None。"""
+    root = workspace_root.resolve()
+    if not _is_git_repository(root):
+        return None
+    branch = _git_output(["rev-parse", "--abbrev-ref", "HEAD"], root) or "unknown"
+    main_branch = _resolve_default_branch(root)
+    status = _git_output(["--no-optional-locks", "status", "--short"], root) or ""
+    log = _git_output(["--no-optional-locks", "log", "--oneline", "-n", "5"], root) or ""
+    user_name = _git_output(["config", "user.name"], root)
+
+    truncated_status = status
+    if len(status) > _GIT_STATUS_MAX_CHARS:
+        truncated_status = (
+            status[:_GIT_STATUS_MAX_CHARS]
+            + '\n... (truncated because it exceeds 2k characters. If you need more '
+            'information, run "git status" using BashTool)'
+        )
+
+    lines = [
+        "This is the git status at the start of the conversation. Note that this status "
+        "is a snapshot in time, and will not update during the conversation.",
+        f"Current branch: {branch}",
+        f"Main branch (you will usually use this for PRs): {main_branch}",
+    ]
+    if user_name:
+        lines.append(f"Git user: {user_name}")
+    lines.append(f"Status:\n{truncated_status or '(clean)'}")
+    lines.append(f"Recent commits:\n{log}")
+    return "\n\n".join(lines)
+
+
+def _is_git_repository(workspace_root: Path) -> bool:
+    return (workspace_root / ".git").exists()
+
+
+def _resolve_default_branch(workspace_root: Path) -> str:
+    origin_head = _git_output(["symbolic-ref", "refs/remotes/origin/HEAD"], workspace_root)
+    if origin_head:
+        prefix = "refs/remotes/origin/"
+        if origin_head.startswith(prefix):
+            return origin_head[len(prefix) :]
+        return origin_head
+    for candidate in ("main", "master"):
+        if _git_output(["rev-parse", "--verify", f"refs/heads/{candidate}"], workspace_root):
+            return candidate
+    return "main"
+
+
+def _git_output(args: list[str], cwd: Path) -> str | None:
+    try:
+        completed = subprocess.run(
+            ["git", *args],
+            cwd=cwd,
+            capture_output=True,
+            text=True,
+            timeout=30,
+            check=False,
+        )
+    except (OSError, subprocess.TimeoutExpired):
+        return None
+    if completed.returncode != 0:
+        return None
+    return completed.stdout.strip() or None
+
+
+__all__ = [
+    "collect_git_snapshot_text",
+    "date_section",
+    "env_section",
+    "get_default_session_context_sections",
+    "git_snapshot_section",
+    "local_iso_date",
+    "resolve_enable_git_snapshot",
+]

{langchain-agentx-python-0.2.8 → langchain-agentx-python-0.3.0}/langchain_agentx/session/agent_session.py

@@ -29,6 +29,7 @@ from ..command.builtin import (
     make_memory_command,
     make_reload_plugins_command,
 )
+from ..loop.config import merge_run_config
 from ..loop.context.compaction_service import default_loop_context_compaction
 from ..loop.context.message_utils import total_estimated_tokens_for_messages
 from ..loop.hook.types import HookContext, HookEvent
@@ -122,12 +123,14 @@ class AgentSession:
         appended_message = HumanMessage(content=user_input)
         self._messages.append(appended_message)
         baseline_count = len(self._messages)
+        run_config = merge_run_config(self._graph, None)
         try:
             result = await self._graph.ainvoke(
                 {
                     "messages": list(self._messages),
                     "_session_id": self._session_id,
-                }
+                },
+                config=run_config,
             )
         except Exception:
             # 回滚本轮 append，避免异常路径重复累积 user 消息。
@@ -162,13 +165,14 @@ class AgentSession:
         self._messages.append(appended_message)
         baseline_count = len(self._messages)
         output_messages: list[Any] | None = None
+        run_config = merge_run_config(self._graph, config)
         try:
             async for event in self._graph.astream_events(
                 {
                     "messages": list(self._messages),
                     "_session_id": self._session_id,
                 },
-                config=config,
+                config=run_config,
                 version="v2",
             ):
                 if event.get("event") == "on_chain_end" and event.get("name") == "LangGraph":

{langchain-agentx-python-0.2.8 → langchain-agentx-python-0.3.0/langchain_agentx_python.egg-info}/PKG-INFO

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

{langchain-agentx-python-0.2.8 → langchain-agentx-python-0.3.0}/langchain_agentx_python.egg-info/SOURCES.txt

@@ -78,6 +78,7 @@ langchain_agentx/loop/prompt/builder.py
 langchain_agentx/loop/prompt/builtin.py
 langchain_agentx/loop/prompt/compact.py
 langchain_agentx/loop/prompt/sections.py
+langchain_agentx/loop/prompt/session_context.py
 langchain_agentx/loop/runtime/__init__.py
 langchain_agentx/loop/runtime/context.py
 langchain_agentx/loop/runtime/context_factory.py

{langchain-agentx-python-0.2.8 → langchain-agentx-python-0.3.0}/pyproject.toml

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