baserun-cli 0.1.0__tar.gz → 0.1.2__tar.gz

{baserun_cli-0.1.0 → baserun_cli-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: baserun-cli
-Version: 0.1.0
+Version: 0.1.2
 Summary: BaseRun agent-side daemon (connects to nchan, spawns CLI agents, publishes run events)
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{baserun_cli-0.1.0 → baserun_cli-0.1.2}/baserun_cli/_vendored/cli.py

@@ -24,6 +24,28 @@ from .base import (
 from .parsers import extract_session_id, parse_line
 
 
+_SUBPROCESS_STREAM_LIMIT = 64 * 1024 * 1024
+
+
+async def _iter_lines(reader: asyncio.StreamReader) -> AsyncIterator[bytes]:
+    """Yield newline-delimited output without StreamReader.readline limits."""
+    buf = bytearray()
+    while True:
+        chunk = await reader.read(64 * 1024)
+        if not chunk:
+            if buf:
+                yield bytes(buf)
+            return
+        buf.extend(chunk)
+        while True:
+            pos = buf.find(b"\n")
+            if pos < 0:
+                break
+            line = bytes(buf[:pos])
+            del buf[: pos + 1]
+            yield line
+
+
 class CLIAgentConnector(AgentConnector):
     """The one connector implementation for all spec-compatible CLI agents."""
 
@@ -101,20 +123,37 @@ class CLIAgentConnector(AgentConnector):
     ) -> AsyncIterator[ConnectorEvent]:
         import logging as _log
         _dbg = _log.getLogger("baserun_cli._vendored.cli")
-        cli = shutil.which(self.spec.bin) or (
-            self.spec.bin if os.path.exists(self.spec.bin) else self.spec.bin
-        )
+        cli = shutil.which(self.spec.bin)
+        if not cli:
+            message = f"CLI not found: {self.spec.bin}. Please install it or configure cli_spec.bin with the correct executable path."
+            _dbg.error(message)
+            yield ConnectorEvent(ConnectorEventType.ERROR, {"message": message})
+            return
+
         args = self._build_args(prompt, session_id, fork)
         _dbg.info("spawning: %s %s (cwd=%s)", cli, " ".join(args[:6]) + ("..." if len(args) > 6 else ""), self.spec.workdir)
 
-        proc = await asyncio.create_subprocess_exec(
-            cli,
-            *args,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-            env=self._env(),
-            cwd=self.spec.workdir,
-        )
+        proc = None
+        try:
+            proc = await asyncio.create_subprocess_exec(
+                cli,
+                *args,
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.PIPE,
+                env=self._env(),
+                cwd=self.spec.workdir,
+                limit=_SUBPROCESS_STREAM_LIMIT,
+            )
+        except FileNotFoundError:
+            message = f"CLI not found: {self.spec.bin}. Please install it or configure cli_spec.bin with the correct executable path."
+            _dbg.exception(message)
+            yield ConnectorEvent(ConnectorEventType.ERROR, {"message": message})
+            return
+        except Exception as e:
+            message = f"failed to start CLI {self.spec.bin}: {e}"
+            _dbg.exception(message)
+            yield ConnectorEvent(ConnectorEventType.ERROR, {"message": message})
+            return
         _dbg.info("pid=%s started", proc.pid)
 
         resolved_session_id: str | None = session_id
@@ -136,7 +175,7 @@ class CLIAgentConnector(AgentConnector):
 
         try:
             assert proc.stdout is not None
-            async for raw_line in proc.stdout:
+            async for raw_line in _iter_lines(proc.stdout):
                 line = raw_line.decode(errors="replace").strip()
                 if not line:
                     continue
@@ -196,7 +235,7 @@ class CLIAgentConnector(AgentConnector):
             _dbg.exception("pid=%s _run exception", proc.pid)
             yield ConnectorEvent(ConnectorEventType.ERROR, {"message": str(e)})
         finally:
-            if proc.returncode is None:
+            if proc is not None and proc.returncode is None:
                 _dbg.warning("pid=%s still running, killing", proc.pid)
                 proc.kill()
                 await proc.wait()
@@ -263,6 +302,7 @@ class CLIAgentConnector(AgentConnector):
             stderr=asyncio.subprocess.PIPE,
             env=self._env(),
             cwd=self.spec.workdir,
+            limit=_SUBPROCESS_STREAM_LIMIT,
         )
         try:
             out_b, err_b = await asyncio.wait_for(proc.communicate(), timeout=60.0)
@@ -304,10 +344,11 @@ class CLIAgentConnector(AgentConnector):
             stderr=asyncio.subprocess.PIPE,
             env=self._env(),
             cwd=self.spec.workdir,
+            limit=_SUBPROCESS_STREAM_LIMIT,
         )
         try:
             assert proc2.stdout is not None
-            async for raw_line in proc2.stdout:
+            async for raw_line in _iter_lines(proc2.stdout):
                 line = raw_line.decode(errors="replace").strip()
                 if not line:
                     continue

{baserun_cli-0.1.0 → baserun_cli-0.1.2}/baserun_cli/channel.py

@@ -133,6 +133,22 @@ class ChannelClient:
                    run_id, payload.get("data", {}).get("seq"), max_retries)
         return False
 
+    async def publish_event_reliably(self, run_id: str, payload: dict[str, Any]) -> bool:
+        """Publish a critical run event, falling back to HTTP if WS fails."""
+        if await self.publish_event(run_id, payload):
+            return True
+        try:
+            await self._http_publish(run_id, payload)
+            return True
+        except Exception as e:
+            log.error(
+                "http publish fallback failed for run %s seq=%s: %s",
+                run_id,
+                payload.get("data", {}).get("seq"),
+                e,
+            )
+            return False
+
     async def _open_run_pub(self, run_id: str) -> Any:
         """Open a WS publisher connection for run:{run_id}."""
         base = self.nchan_url

{baserun_cli-0.1.0 → baserun_cli-0.1.2}/baserun_cli/runner.py

@@ -204,7 +204,10 @@ class TaskRunner:
                     log.debug("run %s event seq=%d kind=%s", run_id, seq, kind)
 
                     # publish
-                    await self.channel.publish_event(run_id, payload)
+                    if is_terminal:
+                        await self.channel.publish_event_reliably(run_id, payload)
+                    else:
+                        await self.channel.publish_event(run_id, payload)
 
                     if is_terminal:
                         saw_terminal = True
@@ -225,9 +228,7 @@ class TaskRunner:
                     }
                     log_file.write(json.dumps(payload["data"], ensure_ascii=False) + "\n")
                     log_file.flush()
-                    ok = await self.channel.publish_event(run_id, payload)
-                    if not ok:
-                        failed_events.append(payload)
+                    await self.channel.publish_event_reliably(run_id, payload)
                     log.info("run %s synthesized terminal (seq=%d)", run_id, seq)
 
                 # verify-and-replay：对比 nchan 实际状态，精确补发缺失事件
@@ -249,7 +250,7 @@ class TaskRunner:
 
         except Exception as e:
             log.exception("run %s failed at seq=%d", run_id, seq)
-            # publish error terminal via HTTP (reliable)
+            # publish error terminal reliably
             seq += 1
             error_payload = {
                 "type": "result",
@@ -266,7 +267,7 @@ class TaskRunner:
                     log_file.write(json.dumps(error_payload["data"], ensure_ascii=False) + "\n")
             except Exception:
                 pass
-            await self.channel.publish_event(run_id, error_payload)
+            await self.channel.publish_event_reliably(run_id, error_payload)
             return True, "error", seq
 
         finally:

{baserun_cli-0.1.0 → baserun_cli-0.1.2}/baserun_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: baserun-cli
-Version: 0.1.0
+Version: 0.1.2
 Summary: BaseRun agent-side daemon (connects to nchan, spawns CLI agents, publishes run events)
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{baserun_cli-0.1.0 → baserun_cli-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "baserun-cli"
-version = "0.1.0"
+version = "0.1.2"
 description = "BaseRun agent-side daemon (connects to nchan, spawns CLI agents, publishes run events)"
 readme = "README.md"
 requires-python = ">=3.11"