langchain-agentx-python 1.0.1__tar.gz → 1.0.2__tar.gz

{langchain-agentx-python-1.0.1 → langchain-agentx-python-1.0.2}/PKG-INFO

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

{langchain-agentx-python-1.0.1 → langchain-agentx-python-1.0.2}/langchain_agentx/__init__.py

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

{langchain-agentx-python-1.0.1 → langchain-agentx-python-1.0.2}/langchain_agentx/tools/bash/backend.py

@@ -594,11 +594,30 @@ class BashBackend:
 
     @staticmethod
     def _spawn_env_with_shell(env: dict[str, str], shell_exe: str) -> dict[str, str]:
-        """子进程 env：对齐 CC 思路，在未显式设置时注入 `SHELL`。"""
+        """子进程 env：对齐 CC 思路，在未显式设置时注入 `SHELL` / 无缓冲 Python。"""
         out = dict(env)
         out.setdefault("SHELL", shell_exe)
+        out.setdefault("PYTHONUNBUFFERED", "1")
         return out
 
+    def _sandbox_violation_message(self, request: SandboxExecutionRequest) -> str | None:
+        backend = self._sandbox_backend
+        if isinstance(backend, ConstrainedSandboxBackend):
+            return backend._violation_for_request(request)
+        return None
+
+    def _sandbox_stream_env(self, request: SandboxExecutionRequest) -> dict[str, str]:
+        backend = self._sandbox_backend
+        delegate = (
+            backend._delegate
+            if isinstance(backend, ConstrainedSandboxBackend)
+            else backend
+        )
+        if not isinstance(delegate, LocalTmpdirSandboxBackend):
+            return dict(request.env)
+        env, _temp_dir = delegate._build_env(request)
+        return env
+
     @staticmethod
     def _win32_creationflags() -> int:
         """可选隐藏控制台：`AGENTX_BASH_CREATE_NO_WINDOW=1`（默认关闭，兼容性风险见 exec-plan）。"""
@@ -1201,22 +1220,44 @@ class BashBackend:
             reason="sandbox_not_requested",
         )
         if decision.use_sandbox:
-            result = self.execute(
+            effective_cwd, reset_prefix = _prepare_spawn_cwd(cwd, fallback=fallback_cwd)
+            if effective_cwd is None and reset_prefix:
+                yield BashStreamEvent(kind="chunk", chunk=reset_prefix)
+                yield BashStreamEvent(
+                    kind="final",
+                    exit_code=126,
+                    interrupted=False,
+                    cwd_after=None,
+                )
+                return
+            if reset_prefix:
+                yield BashStreamEvent(kind="chunk", chunk=reset_prefix)
+            request = SandboxExecutionRequest(
                 command=command,
-                cwd=cwd,
+                cwd=effective_cwd,
                 timeout_sec=timeout_sec,
                 env=effective_env,
-                session_key=session_key,
-                sandbox_decision=decision,
-                fallback_cwd=fallback_cwd,
+                decision=decision,
             )
-            if result.stdout:
-                yield BashStreamEvent(kind="chunk", chunk=result.stdout)
-            yield BashStreamEvent(
-                kind="final",
-                exit_code=result.exit_code,
-                interrupted=result.interrupted,
-                cwd_after=result.cwd_after,
+            violation = self._sandbox_violation_message(request)
+            if violation is not None:
+                yield BashStreamEvent(kind="chunk", chunk=violation + "\n")
+                yield BashStreamEvent(
+                    kind="final",
+                    exit_code=126,
+                    interrupted=False,
+                    cwd_after=None,
+                )
+                return
+            stream_env = self._sandbox_stream_env(request)
+            wrapped = self._build_stream_wrapper(self._preprocess_shell_command(command))
+            yield from self._stream_execute_raw_iter(
+                wrapped_command=wrapped,
+                cwd=effective_cwd,
+                timeout_sec=timeout_sec,
+                env=stream_env,
+                cancel_event=cancel_event,
+                fallback_cwd=fallback_cwd,
             )
             return
 
@@ -1305,42 +1346,88 @@ class BashBackend:
                 )
                 return
             raise
-        selector = selectors.DefaultSelector()
         assert proc.stdout is not None
-        selector.register(proc.stdout, selectors.EVENT_READ)
-
         started = time.time()
         interrupted = False
         chunks: list[str] = []
+        stdout = proc.stdout
         try:
-            while True:
-                if cancel_event is not None and cancel_event.is_set():
-                    interrupted = True
-                    proc.kill()
-                    break
-                if time.time() - started > timeout_sec:
-                    interrupted = True
-                    proc.kill()
-                    break
-                if proc.poll() is not None and not selector.get_map():
-                    break
-                events = selector.select(timeout=0.1)
-                if not events:
-                    if proc.poll() is not None:
+            if sys.platform == "win32":
+                out_q: queue.Queue[bytes | None] = queue.Queue()
+
+                def _reader() -> None:
+                    try:
+                        while True:
+                            raw = stdout.read(4096)
+                            if not raw:
+                                break
+                            out_q.put(raw)
+                    finally:
+                        out_q.put(None)
+
+                threading.Thread(
+                    target=_reader,
+                    daemon=True,
+                    name="bash-stdout-reader",
+                ).start()
+                while True:
+                    if cancel_event is not None and cancel_event.is_set():
+                        interrupted = True
+                        proc.kill()
+                        break
+                    if time.time() - started > timeout_sec:
+                        interrupted = True
+                        proc.kill()
                         break
-                    yield BashStreamEvent(kind="tick")
-                    continue
-                for key, _ in events:
-                    raw = key.fileobj.read1(4096) if hasattr(key.fileobj, "read1") else key.fileobj.read(4096)
-                    if not raw:
-                        selector.unregister(key.fileobj)
+                    try:
+                        raw = out_q.get(timeout=0.1)
+                    except queue.Empty:
+                        if proc.poll() is not None:
+                            break
+                        yield BashStreamEvent(kind="tick")
                         continue
+                    if raw is None:
+                        break
                     text = raw.decode("utf-8", errors="replace")
                     chunks.append(text)
                     yield BashStreamEvent(kind="chunk", chunk=text)
+            else:
+                selector = selectors.DefaultSelector()
+                selector.register(stdout, selectors.EVENT_READ)
+                try:
+                    while True:
+                        if cancel_event is not None and cancel_event.is_set():
+                            interrupted = True
+                            proc.kill()
+                            break
+                        if time.time() - started > timeout_sec:
+                            interrupted = True
+                            proc.kill()
+                            break
+                        if proc.poll() is not None and not selector.get_map():
+                            break
+                        events = selector.select(timeout=0.1)
+                        if not events:
+                            if proc.poll() is not None:
+                                break
+                            yield BashStreamEvent(kind="tick")
+                            continue
+                        for key, _ in events:
+                            raw = (
+                                key.fileobj.read1(4096)
+                                if hasattr(key.fileobj, "read1")
+                                else key.fileobj.read(4096)
+                            )
+                            if not raw:
+                                selector.unregister(key.fileobj)
+                                continue
+                            text = raw.decode("utf-8", errors="replace")
+                            chunks.append(text)
+                            yield BashStreamEvent(kind="chunk", chunk=text)
+                finally:
+                    selector.close()
             proc.wait(timeout=1)
         finally:
-            selector.close()
             if proc.poll() is None:
                 proc.kill()
 

{langchain-agentx-python-1.0.1 → langchain-agentx-python-1.0.2}/langchain_agentx/tools/bash/tool.py

@@ -612,32 +612,20 @@ class BashRuntimeTool(RuntimeTool):
             )
 
         # ------------------------------------------------------------------
-        # 同步执行路径
+        # 同步执行路径（sandbox / 非 sandbox 均走 stream_execute_iter + 进度心跳）
         # ------------------------------------------------------------------
-        if sandbox_decision.use_sandbox:
-            accum = BashProgressAccumulator(timeout_ms=timeout_sec * 1000)
+        accum = BashProgressAccumulator(timeout_ms=timeout_sec * 1000)
 
-            def _emit_sandbox_progress(payload) -> None:
-                ctx.emit_progress(
-                    phase="running",
-                    data=bash_progress_emit_data(payload),
-                )
+        def _emit_progress(payload) -> None:
+            ctx.emit_progress(
+                phase="running",
+                data=bash_progress_emit_data(payload),
+            )
 
-            with bash_progress_heartbeat(accum, _emit_sandbox_progress):
-                result = self._backend.execute(
-                    command=command,
-                    cwd=cwd,
-                    timeout_sec=timeout_sec,
-                    sandbox_decision=sandbox_decision,
-                    fallback_cwd=fallback_cwd,
-                )
-            if result.stdout:
-                accum.append(result.stdout)
-        else:
-            final_exit_code = 0
-            final_interrupted = False
-            final_cwd_after: str | None = None
-            accum = BashProgressAccumulator(timeout_ms=timeout_sec * 1000)
+        final_exit_code = 0
+        final_interrupted = False
+        final_cwd_after: str | None = None
+        with bash_progress_heartbeat(accum, _emit_progress):
             for event in self._backend.stream_execute_iter(
                 command=command,
                 cwd=cwd,
@@ -654,18 +642,20 @@ class BashRuntimeTool(RuntimeTool):
                     final_exit_code = event.exit_code or 0
                     final_interrupted = bool(event.interrupted)
                     final_cwd_after = event.cwd_after
-            raw_stream = accum.full_stdout()
-            merged_stdout, parsed_cwd_after = _strip_stream_cwd_marker(raw_stream)
-            _, cwd_warning = extract_cwd_warning(raw_stream)
-            result = ExecuteResult(
-                stdout=merged_stdout,
-                exit_code=final_exit_code,
-                interrupted=final_interrupted,
-                cwd_after=parsed_cwd_after or final_cwd_after,
-                sandboxed=False,
-                sandbox_bypass_reason=sandbox_decision.reason,
-                cwd_warning=cwd_warning,
-            )
+        raw_stream = accum.full_stdout()
+        merged_stdout, parsed_cwd_after = _strip_stream_cwd_marker(raw_stream)
+        _, cwd_warning = extract_cwd_warning(raw_stream)
+        result = ExecuteResult(
+            stdout=merged_stdout,
+            exit_code=final_exit_code,
+            interrupted=final_interrupted,
+            cwd_after=parsed_cwd_after or final_cwd_after,
+            sandboxed=sandbox_decision.use_sandbox,
+            sandbox_bypass_reason=(
+                None if sandbox_decision.use_sandbox else sandbox_decision.reason
+            ),
+            cwd_warning=cwd_warning,
+        )
 
         spawn_cwd_was_invalid = _cwd_invalid_reason(cwd) is not None
         cwd_commit_allowed = (
@@ -721,14 +711,13 @@ class BashRuntimeTool(RuntimeTool):
             mode="foreground",
             timeout_sec=timeout_sec,
         )
-        if not sandbox_decision.use_sandbox:
-            stdout_for_trace = accum.full_stdout()
-            if stdout_for_trace:
-                ev.add(
-                    "stdout_stream",
-                    total_bytes=len(stdout_for_trace),
-                    chunk_preview=stdout_for_trace[:120],
-                )
+        stdout_for_trace = accum.full_stdout()
+        if stdout_for_trace:
+            ev.add(
+                "stdout_stream",
+                total_bytes=len(stdout_for_trace),
+                chunk_preview=stdout_for_trace[:120],
+            )
         ev.add(
             "command_completed",
             mode="foreground",

{langchain-agentx-python-1.0.1 → langchain-agentx-python-1.0.2}/langchain_agentx_python.egg-info/PKG-INFO

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

{langchain-agentx-python-1.0.1 → langchain-agentx-python-1.0.2}/pyproject.toml

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