PyPI - langchain-agentx-python - Versions diffs - 1.2.1__tar.gz → 1.2.2__tar.gz - Mend

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

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

@@ -249,6 +249,9 @@ class BackgroundTask:
     pid: int
     """后台进程 PID。"""
+    command: str = ""
+    """原始命令（用于终态语义解析；亦持久化至 task_dir/command.txt）。"""
     sandboxed: bool = False
     """后台任务是否在沙箱模式下执行。"""
@@ -365,6 +368,7 @@ class LocalTmpdirSandboxBackend:
             task_id=task.task_id,
             output_path=task.output_path,
             pid=task.pid,
+            command=request.command,
             sandboxed=True,
             sandbox_temp_dir=temp_dir,
         )
@@ -1556,12 +1560,17 @@ class BashBackend:
         with open(pid_path, "w") as f:
             f.write(str(proc.pid))
+        command_path = os.path.join(task_dir, "command.txt")
+        with open(command_path, "w", encoding="utf-8") as f:
+            f.write(command)
         output_file.close()
         return BackgroundTask(
             task_id=task_id,
             output_path=output_path,
             pid=proc.pid,
+            command=command,
         )
     def get_background_status(self, task: BackgroundTask) -> BackgroundTaskStatus:
@@ -1619,23 +1628,25 @@ class BashBackend:
         )
     @staticmethod
-    def build_foreground_snapshot(result: ExecuteResult) -> BashTaskSnapshot:
+    def build_foreground_snapshot(
+        result: ExecuteResult,
+        *,
+        terminal_status: str,
+    ) -> BashTaskSnapshot:
+        """构建 foreground 快照；终态由 semantics.resolve_terminal_task_status 决定。"""
         t0 = time.time()
         sm = BashTaskStateMachine(task_id="foreground", task_mode="foreground")
         sm.created_ts = t0
         sm.transition_to("running")
         sm.started_ts = time.time()
-        if result.interrupted:
-            sm.transition_to("interrupted")
-        elif result.exit_code == 0:
-            sm.transition_to("completed")
-        else:
-            sm.transition_to("failed")
+        sm.transition_to(terminal_status)
         sm.ended_ts = time.time()
         sm.exit_code = result.exit_code
         return sm.to_snapshot()
     def build_background_snapshot(self, task: BackgroundTask) -> BashTaskSnapshot:
+        from .semantics import resolve_background_terminal_status
         status = self.get_background_status(task)
         sm = BashTaskStateMachine(task_id=task.task_id, task_mode="background")
         sm.created_ts = time.time()
@@ -1647,17 +1658,36 @@ class BashBackend:
         if status.running:
             return sm.to_snapshot()
         sm.ended_ts = time.time()
-        if status.exit_code == -2:
-            sm.transition_to("cancelled")
-        elif status.exit_code == 0:
-            sm.transition_to("completed")
-        elif status.exit_code is None:
-            sm.transition_to("interrupted")
-        else:
-            sm.transition_to("failed")
+        command = task.command or self._read_persisted_background_command(task)
+        stdout = self._read_background_output_text(task.output_path)
+        terminal_status = resolve_background_terminal_status(
+            exit_code=status.exit_code,
+            command=command,
+            stdout=stdout,
+        )
+        sm.transition_to(terminal_status)
         sm.exit_code = status.exit_code
         return sm.to_snapshot()
+    @staticmethod
+    def _read_persisted_background_command(task: BackgroundTask) -> str:
+        command_path = os.path.join(os.path.dirname(task.output_path), "command.txt")
+        try:
+            with open(command_path, encoding="utf-8") as f:
+                return f.read().strip()
+        except OSError:
+            return ""
+    @staticmethod
+    def _read_background_output_text(output_path: str) -> str:
+        if not os.path.exists(output_path):
+            return ""
+        try:
+            with open(output_path, encoding="utf-8", errors="replace") as f:
+                return f.read()
+        except OSError:
+            return ""
     def cancel_background_task(self, task: BackgroundTask) -> bool:
         """
         取消后台任务：发信号终止进程，并标记为 cancelled（exit_code 文件写 -2）。

@@ -143,16 +143,10 @@ class BashResultPresenter:
             )
         summary = description_text or f"Ran: {command[:60]}"
-        # 构建 payload：合并 stdout 和 stderr（与 CC mapToolResultToToolResultBlockParam 对齐）
         stdout_text = result.stdout or ""
         stderr_text = result.stderr or ""
-        if stdout_text and stderr_text:
-            payload = f"{stdout_text}\n{stderr_text}"
-        elif stderr_text:
-            payload = stderr_text
-        else:
-            payload = stdout_text or "(No output)"
-        hints = self._build_hints(result)
+        payload, skip_interpretation_hint = self._resolve_foreground_payload(result)
+        hints = self._build_hints(result, skip_interpretation=skip_interpretation_hint)
         if result.output_truncated and result.overflow_file:
             import os
@@ -200,14 +194,7 @@ class BashResultPresenter:
             tool_name=tool_name,
             summary=summary,
             payload=payload,
-            blocks=[
-                ToolContentBlock(
-                    type="status",
-                    text=f"task:{result.task_status}",
-                    meta={"task_mode": result.task_mode, "task_exit_code": result.task_exit_code},
-                ),
-                ToolContentBlock(type="text", text=payload),
-            ],
+            blocks=[ToolContentBlock(type="text", text=payload)],
             hints=hints or None,
             meta=self._attach_observability({
                 "exit_code": result.exit_code,
@@ -316,10 +303,36 @@ class BashResultPresenter:
             meta=self._attach_observability({"exit_code": result.exit_code, "command": command}, result),
         )
-    def _build_hints(self, result: BashToolOutput) -> list[ToolHint]:
-        hints: list[ToolHint] = []
+    def _resolve_foreground_payload(self, result: BashToolOutput) -> tuple[str, bool]:
+        """
+        CC BashToolResultMessage：空输出时优先展示 returnCodeInterpretation。
+        Returns:
+            (payload, skip_interpretation_hint) — payload 已含 interpretation 时不再重复 hint。
+        """
+        stdout_text = result.stdout or ""
+        stderr_text = result.stderr or ""
+        if stdout_text.strip() or stderr_text.strip():
+            if stdout_text and stderr_text:
+                return f"{stdout_text}\n{stderr_text}", False
+            if stderr_text:
+                return stderr_text, False
+            return stdout_text, False
         if result.return_code_interpretation:
+            return result.return_code_interpretation, True
+        if result.no_output_expected:
+            return "Done", False
+        return "(No output)", False
+    def _build_hints(
+        self,
+        result: BashToolOutput,
+        *,
+        skip_interpretation: bool = False,
+    ) -> list[ToolHint]:
+        hints: list[ToolHint] = []
+        if result.return_code_interpretation and not skip_interpretation:
             hints.append(ToolHint(message=result.return_code_interpretation))
         if result.destructive_warning:

@@ -17,7 +17,8 @@ from __future__ import annotations
 import re
 from dataclasses import dataclass
-# tree/find/ls 在 Windows Git Bash 等环境常不可用（exit 127）；CC 引导用 Glob 专用工具。
+# tree/find/ls 在 Windows Git Bash 等环境常不可用（exit 127）。
+# SDK 扩展（相对 CC DEFAULT_SEMANTIC 硬失败）：软成功 + Glob hint，便于跨平台引导。
 _FILE_LISTING_COMMANDS = re.compile(r"^(?:tree|find|ls)\b")
 _FILE_LISTING_EXIT_127_HINT = (
     "Command not found (exit 127). "
@@ -86,6 +87,46 @@ class CommandResult:
     message: str | None = None
+def resolve_terminal_task_status(
+    *,
+    interrupted: bool,
+    exit_code: int,
+    semantic: CommandResult,
+) -> str:
+    """
+    由 interpret_command_result 派生任务终态（SSOT）。
+    对应 CC BashTool.call：interpretCommandResult → throw ShellError 或成功返回；
+    SDK 额外保留 task_status 供 observability，但不得再用 raw exit_code 独立判定。
+    """
+    if interrupted:
+        return "interrupted"
+    if semantic.is_error and exit_code != 0:
+        return "failed"
+    return "completed"
+def resolve_background_terminal_status(
+    *,
+    exit_code: int | None,
+    command: str,
+    stdout: str = "",
+) -> str:
+    """
+    后台任务终态：cancelled/interrupted 走协议码；其余与 foreground 共用 semantics SSOT。
+    """
+    if exit_code == -2:
+        return "cancelled"
+    if exit_code is None:
+        return "interrupted"
+    semantic = interpret_command_result(command, exit_code, stdout)
+    return resolve_terminal_task_status(
+        interrupted=False,
+        exit_code=exit_code,
+        semantic=semantic,
+    )
 def interpret_command_result(
     command: str,
     exit_code: int,

@@ -67,7 +67,7 @@ from .security import (
     detect_infinite_output,
     detect_sleep_block,
 )
-from .semantics import interpret_command_result
+from .semantics import interpret_command_result, resolve_terminal_task_status
 def _as_bash_input_dict(data: dict[str, Any] | BashToolInput) -> dict[str, Any]:
@@ -728,12 +728,20 @@ class BashRuntimeTool(RuntimeTool):
         # 危险命令警告（非阻断）
         destructive_warning = detect_destructive_patterns(command)
-        snapshot = self._backend.build_foreground_snapshot(result)
-        # 退出码语义解析
+        # 退出码语义（SSOT：与 CC interpretCommandResult 一致，驱动 ok/error 与 task_status）
         cmd_result = interpret_command_result(
             command, result.exit_code, result.stdout
         )
+        terminal_status = resolve_terminal_task_status(
+            interrupted=result.interrupted,
+            exit_code=result.exit_code,
+            semantic=cmd_result,
+        )
+        snapshot = self._backend.build_foreground_snapshot(
+            result,
+            terminal_status=terminal_status,
+        )
         # 真正错误时抛异常（pipeline 捕获 → error envelope）
         if cmd_result.is_error and result.exit_code != 0 and not result.sandbox_violation_message:
@@ -881,6 +889,8 @@ class BashRuntimeTool(RuntimeTool):
             "interrupted": result.interrupted,
             "task_mode": result.task_mode,
             "task_status": result.task_status,
+            "return_code_interpretation": result.return_code_interpretation,
+            "no_output_expected": result.no_output_expected,
         }
     def to_auto_classifier_input(self, data: dict[str, Any]) -> str | None:

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

langchain-agentx-python 1.2.1__tar.gz → 1.2.2__tar.gz

langchain-agentx-python 1.2.1tar.gz → 1.2.2tar.gz