langchain-agentx-python 2.3.7__tar.gz → 2.3.8__tar.gz

{langchain-agentx-python-2.3.7/langchain_agentx_python.egg-info → langchain-agentx-python-2.3.8}/PKG-INFO

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

{langchain-agentx-python-2.3.7 → langchain-agentx-python-2.3.8}/langchain_agentx/__init__.py

@@ -11,7 +11,7 @@ from langchain_agentx import create_loop_agent
 ```
 """
 
-__version__ = "2.3.7"
+__version__ = "2.3.8"
 
 from .mcp.call import McpToolCaller
 from .mcp.client_manager import McpClientManager, McpConnectedClient

{langchain-agentx-python-2.3.7 → langchain-agentx-python-2.3.8}/langchain_agentx/loop/subagent/context.py

@@ -127,6 +127,11 @@ class SubagentContext:
     inherit_hooks: bool | frozenset[HookEvent] | None = True
     """True/None → DEFAULT_SUBAGENT_INHERITED_EVENTS；False → 不继承；frozenset → 自定义事件集。"""
 
+    progress_host_kind: str | None = None
+    """Skill fork：``skill_progress`` 时 runner 只冒泡 CC 同构 skill progress，不发 subagent 双通道。"""
+    skill_prompt: str = ""
+    """Skill fork：↔ CC ``onProgress`` ``data.prompt``（skill 正文）。"""
+
 
 @dataclass
 class SubagentResult:

{langchain-agentx-python-2.3.7 → langchain-agentx-python-2.3.8}/langchain_agentx/loop/subagent/orchestrator.py

@@ -25,7 +25,7 @@ from langchain_agentx.loop.runtime.subagent_execution_paths import (
     resolve_subagent_effective_cwd,
     resolve_subagent_workspace_root,
 )
-from langchain_agentx.loop.subagent.context import create_subagent_context
+from langchain_agentx.loop.subagent.context import SubagentContext, create_subagent_context
 from langchain_agentx.loop.subagent.hooks_pipeline import (
     _apply_agent_frontmatter_hooks as _pipeline_apply_agent_hooks,
     _apply_skill_fork_hooks as _pipeline_apply_skill_hooks,
@@ -54,6 +54,23 @@ from langchain_agentx.observability.logging import ObservabilityLoggerAdapter, b
 from langchain_agentx.workspace import resolve_agent_state_config
 from langchain_agentx.loop.config.thinking_config import ThinkingConfig
 
+
+def _apply_skill_fork_progress_host(
+    subagent_ctx: SubagentContext,
+    *,
+    skill_hook_frontmatter: dict[str, Any] | None,
+    skill_prompt: str,
+) -> None:
+    """Skill fork：注入 CC 同构 skill_progress 冒泡上下文（Phase A · L8/L9）。"""
+    if skill_hook_frontmatter is None:
+        return
+    from langchain_agentx.tools.skill.fork import is_fork_execution_context
+
+    if is_fork_execution_context(skill_hook_frontmatter):
+        subagent_ctx.progress_host_kind = "skill_progress"
+        subagent_ctx.skill_prompt = skill_prompt or ""
+
+
 if TYPE_CHECKING:
     from langchain_agentx.loop.runtime import AgentLoopConfig
     from langchain_agentx.tool_runtime.models import ToolExecutionContext
@@ -344,6 +361,11 @@ class SubagentOrchestrator:
                 is_builtin_subagent=getattr(subagent_config, "is_builtin", False),
                 inherit_hooks=True if inherit_hooks is None else inherit_hooks,
             )
+            _apply_skill_fork_progress_host(
+                subagent_ctx,
+                skill_hook_frontmatter=skill_hook_frontmatter,
+                skill_prompt=inp.prompt or "",
+            )
             subagent_ctx.mcp_child_session = mcp_child
             scope = propagate_subagent_tool_scope(
                 parent_ctx=ctx,
@@ -564,6 +586,11 @@ class SubagentOrchestrator:
                 is_builtin_subagent=getattr(subagent_config, "is_builtin", False),
                 inherit_hooks=True if inherit_hooks is None else inherit_hooks,
             )
+            _apply_skill_fork_progress_host(
+                subagent_ctx,
+                skill_hook_frontmatter=skill_hook_frontmatter,
+                skill_prompt=inp.prompt or "",
+            )
             subagent_ctx.mcp_child_session = mcp_child
             scope = propagate_subagent_tool_scope(
                 parent_ctx=ctx,

{langchain-agentx-python-2.3.7 → langchain-agentx-python-2.3.8}/langchain_agentx/loop/subagent/progress.py

@@ -8,6 +8,8 @@ CC 对照：src/agent/subagent/progress.ts onProgress 回调参数类型
 
 # transcript lane 在 tool_progress custom event 上的 phase 值（与 adapter mapper 冻结一致）
 SUBAGENT_TRANSCRIPT_PHASE = "transcript_message"
+# Skill fork CC 对齐：Typed Tool Progress（↔ CC data.type === 'skill_progress'）
+SKILL_PROGRESS_PHASE = "skill_progress"
 
 from dataclasses import dataclass, field
 from typing import Any, Literal

{langchain-agentx-python-2.3.7 → langchain-agentx-python-2.3.8}/langchain_agentx/loop/subagent/progress_dispatcher.py

@@ -14,6 +14,7 @@ from typing import Any
 
 from langchain_agentx.loop.subagent.context import SubagentContext
 from langchain_agentx.loop.subagent.progress import (
+    SKILL_PROGRESS_PHASE,
     SUBAGENT_TRANSCRIPT_PHASE,
     SubagentProgressEvent,
 )
@@ -46,6 +47,31 @@ class SubagentProgressDispatcher:
             event_data["tool_input"] = dict(event.tool_call_detail.tool_input)
         return event_data
 
+    @staticmethod
+    def build_skill_progress_payload(
+        ctx: SubagentContext,
+        *,
+        message_kind: str,
+        message: dict[str, Any],
+        step: int,
+        tool_name: str,
+        agent_id: str,
+    ) -> dict[str, Any]:
+        return {
+            "tool_call_id": ctx.parent_tool_call_id,
+            "agent_id": agent_id,
+            "phase": SKILL_PROGRESS_PHASE,
+            "step": step,
+            "tool_name": tool_name,
+            "message_kind": message_kind,
+            "message": dict(message),
+            "prompt": str(getattr(ctx, "skill_prompt", "") or ""),
+            "data": {
+                "subagent_type": ctx.subagent_type,
+                "type": "skill_progress",
+            },
+        }
+
     @staticmethod
     def build_transcript_payload(
         ctx: SubagentContext,

{langchain-agentx-python-2.3.7 → langchain-agentx-python-2.3.8}/langchain_agentx/loop/subagent/runner.py

@@ -265,6 +265,35 @@ async def _emit_progress(
     await SubagentProgressDispatcher.dispatch_async(parent_config, payload)
 
 
+def _uses_skill_progress_host(ctx: SubagentContext) -> bool:
+    return getattr(ctx, "progress_host_kind", None) == "skill_progress"
+
+
+async def _emit_skill_progress(
+    ctx: SubagentContext,
+    *,
+    message_kind: str,
+    message: dict[str, Any],
+    step: int,
+    tool_name: str,
+) -> None:
+    """Skill fork：单帧 CC 同构 skill_progress（L9 · 不发 subagent 双通道）。"""
+    parent_config = getattr(ctx, "runnable_config", None)
+    if parent_config is None:
+        return
+    payload = SubagentProgressDispatcher.build_skill_progress_payload(
+        ctx,
+        message_kind=message_kind,
+        message=message,
+        step=step,
+        tool_name=tool_name,
+        agent_id=ctx.agent_id,
+    )
+    if SubagentProgressDispatcher.dispatch_sync(parent_config, payload):
+        return
+    await SubagentProgressDispatcher.dispatch_async(parent_config, payload)
+
+
 async def _emit_transcript_progress(
     ctx: SubagentContext,
     event: SubagentProgressEvent,
@@ -322,6 +351,21 @@ async def _handle_tool_start_event(
     if not tool_call_id:
         tool_call_id = f"{SYNTHETIC_TRANSCRIPT_TOOL_ID_PREFIX}{ctx.agent_id}:{next_step}"
 
+    message_kind, normalized = SubagentTranscriptMessageBuilder.build_tool_use(
+        tool_name=tool_name,
+        tool_input=tool_input if isinstance(tool_input, dict) else None,
+        tool_call_id=tool_call_id,
+    )
+    if _uses_skill_progress_host(ctx):
+        await _emit_skill_progress(
+            ctx,
+            message_kind=message_kind,
+            message=normalized,
+            step=next_step,
+            tool_name=tool_name,
+        )
+        return next_step, tool_name
+
     await _emit_progress(
         ctx,
         SubagentProgressEvent(
@@ -335,12 +379,6 @@ async def _handle_tool_start_event(
             trace=trace,
         ),
     )
-
-    message_kind, normalized = SubagentTranscriptMessageBuilder.build_tool_use(
-        tool_name=tool_name,
-        tool_input=tool_input if isinstance(tool_input, dict) else None,
-        tool_call_id=tool_call_id,
-    )
     await _emit_transcript_progress(
         ctx,
         SubagentProgressEvent(
@@ -419,6 +457,23 @@ async def _handle_tool_end_event(
         synthetic=synthetic,
     )
     transcript.append(msg_dict)
+
+    message_kind, normalized = SubagentTranscriptMessageBuilder.build_tool_result(
+        tool_name=tool_name,
+        content=transcript_text,
+        tool_call_id=tool_call_id,
+        synthetic=synthetic,
+    )
+    if _uses_skill_progress_host(ctx):
+        await _emit_skill_progress(
+            ctx,
+            message_kind=message_kind,
+            message=normalized,
+            step=step,
+            tool_name=tool_name,
+        )
+        return
+
     await _emit_progress(
         ctx,
         SubagentProgressEvent(
@@ -430,13 +485,6 @@ async def _handle_tool_end_event(
             summary=summary[:200] if summary else "",
         ),
     )
-
-    message_kind, normalized = SubagentTranscriptMessageBuilder.build_tool_result(
-        tool_name=tool_name,
-        content=transcript_text,
-        tool_call_id=tool_call_id,
-        synthetic=synthetic,
-    )
     await _emit_transcript_progress(
         ctx,
         SubagentProgressEvent(

{langchain-agentx-python-2.3.7 → langchain-agentx-python-2.3.8}/langchain_agentx/observability/events/agent_event_projector.py

@@ -38,6 +38,9 @@ from langchain_agentx.observability.events.model_end_text_backfill import (
     BackfillKind,
     ModelEndTextBackfillPolicy,
 )
+from langchain_agentx.observability.events.skill_progress_event_mapper import (
+    SkillProgressEventMapper,
+)
 from langchain_agentx.observability.events.subagent_event_mapper import (
     SubagentBoundaryPayloadBuilder,
     SubagentProgressEventMapper,
@@ -136,6 +139,7 @@ class LangchainAgentEventType(Enum):
     SUBAGENT_TOOL_RESULT = "subagent-tool-result"
     SUBAGENT_TRANSCRIPT_MESSAGE = "subagent-transcript-message"
     SUBAGENT_MODEL_STEP = "subagent-model-step"
+    SKILL_PROGRESS = "skill-progress"
     ERROR = "error"
     API_RETRY = "api-retry"
     ASSISTANT_TURN_SUPERSEDED = "assistant-turn-superseded"
@@ -1553,6 +1557,16 @@ class AgentEventProjector:
             if not isinstance(data, dict):
                 return
 
+            skill_mapped = SkillProgressEventMapper.map_custom_tool_progress(data)
+            if skill_mapped is not None:
+                yield self._event(
+                    event_type=skill_mapped.event_type,
+                    data=skill_mapped.data,
+                    step_index=self.state.step_index,
+                    tool_name=skill_mapped.tool_name,
+                )
+                return
+
             if self.enable_subagent_events:
                 mapped = SubagentProgressEventMapper.map_custom_tool_progress(data)
                 if mapped is not None:

langchain-agentx-python-2.3.8/langchain_agentx/observability/events/skill_progress_event_mapper.py

@@ -0,0 +1,87 @@
+"""
+skill_progress_event_mapper.py — Skill fork tool_progress → skill-progress SSE
+
+职责：将 custom event ``tool_progress``（phase skill_progress）映射为 LangchainAgentEventType.SKILL_PROGRESS。
+链路位置：AgentEventProjector._handle_custom_event，优先于 SubagentProgressEventMapper。
+当前裁剪范围：仅 Skill fork progress；不含 Agent agent_progress（另轨 subagent-*）。
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any, TYPE_CHECKING
+
+# 与 loop.subagent.progress.SKILL_PROGRESS_PHASE 同值；此处不 import loop，避免 observability↔loop 循环依赖
+_SKILL_PROGRESS_PHASE = "skill_progress"
+
+if TYPE_CHECKING:
+    from langchain_agentx.observability.events.langchain_agentx_event_adapter import (
+        LangchainAgentEventType,
+    )
+
+
+@dataclass(frozen=True)
+class MappedSkillProgress:
+    event_type: "LangchainAgentEventType"
+    data: dict[str, Any]
+    tool_name: str | None
+
+
+class SkillProgressEventMapper:
+    """Skill fork progress → ``skill-progress`` 公共协议。"""
+
+    @classmethod
+    def is_skill_progress_payload(cls, data: dict[str, Any]) -> bool:
+        if not isinstance(data, dict):
+            return False
+        phase = data.get("phase")
+        return isinstance(phase, str) and phase == _SKILL_PROGRESS_PHASE
+
+    @classmethod
+    def map_custom_tool_progress(
+        cls,
+        data: dict[str, Any],
+    ) -> MappedSkillProgress | None:
+        from langchain_agentx.observability.events.langchain_agentx_event_adapter import (
+            LangchainAgentEventType,
+        )
+
+        if not cls.is_skill_progress_payload(data):
+            return None
+
+        message = data.get("message")
+        if not isinstance(message, dict):
+            return None
+
+        message_kind = data.get("message_kind")
+        if message_kind not in ("assistant", "user"):
+            return None
+
+        agent_id = data.get("agent_id")
+        if not isinstance(agent_id, str) or not agent_id.strip():
+            return None
+
+        step_raw = data.get("step", 0)
+        step = int(step_raw) if isinstance(step_raw, (int, float)) else 0
+
+        event_data: dict[str, Any] = {
+            "tool_call_id": str(data.get("tool_call_id") or ""),
+            "agent_id": agent_id,
+            "type": "skill_progress",
+            "prompt": str(data.get("prompt") or ""),
+            "message_kind": message_kind,
+            "message": dict(message),
+            "step": step,
+        }
+        tool_name = str(data.get("tool_name") or "")
+        if tool_name:
+            event_data["tool_name"] = tool_name
+
+        return MappedSkillProgress(
+            event_type=LangchainAgentEventType.SKILL_PROGRESS,
+            data=event_data,
+            tool_name=tool_name or None,
+        )
+
+
+__all__ = ["MappedSkillProgress", "SkillProgressEventMapper"]

{langchain-agentx-python-2.3.7 → langchain-agentx-python-2.3.8}/langchain_agentx/observability/events/subagent_event_mapper.py

@@ -12,6 +12,8 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Any, TYPE_CHECKING
 
+_SKILL_PROGRESS_PHASE = "skill_progress"
+
 if TYPE_CHECKING:
     from langchain_agentx.observability.events.langchain_agentx_event_adapter import (
         LangchainAgentEventType,
@@ -21,7 +23,11 @@ _SUBAGENT_TRANSCRIPT_PHASE = "transcript_message"
 
 _SUBAGENT_TEASER_PHASES = frozenset({"tool_use", "tool_result"})
 _SUBAGENT_DROP_PHASES = frozenset({"model_step"})
-_SUBAGENT_KNOWN_PHASES = _SUBAGENT_TEASER_PHASES | _SUBAGENT_DROP_PHASES | {_SUBAGENT_TRANSCRIPT_PHASE}
+_SUBAGENT_KNOWN_PHASES = (
+    _SUBAGENT_TEASER_PHASES
+    | _SUBAGENT_DROP_PHASES
+    | {_SUBAGENT_TRANSCRIPT_PHASE, _SKILL_PROGRESS_PHASE}
+)
 
 
 @dataclass(frozen=True)
@@ -109,6 +115,9 @@ class SubagentProgressEventMapper:
         if not isinstance(phase, str):
             return None
 
+        if phase == _SKILL_PROGRESS_PHASE:
+            return None
+
         if phase == _SUBAGENT_TRANSCRIPT_PHASE:
             return cls._map_transcript(data, LangchainAgentEventType)
 

{langchain-agentx-python-2.3.7 → langchain-agentx-python-2.3.8/langchain_agentx_python.egg-info}/PKG-INFO

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

{langchain-agentx-python-2.3.7 → langchain-agentx-python-2.3.8}/langchain_agentx_python.egg-info/SOURCES.txt

@@ -277,6 +277,7 @@ langchain_agentx/observability/events/langchain_agentx_event_adapter.py
 langchain_agentx/observability/events/mcp_event_sink.py
 langchain_agentx/observability/events/model_end_text_backfill.py
 langchain_agentx/observability/events/oob_event_sink.py
+langchain_agentx/observability/events/skill_progress_event_mapper.py
 langchain_agentx/observability/events/subagent_event_mapper.py
 langchain_agentx/observability/events/subagent_window_text_guard.py
 langchain_agentx/observability/events/tool_call_id_resolver.py

{langchain-agentx-python-2.3.7 → langchain-agentx-python-2.3.8}/pyproject.toml

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