qbraid-cli 0.16.1__tar.gz → 0.16.3__tar.gz

{qbraid_cli-0.16.1/qbraid_cli.egg-info → qbraid_cli-0.16.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qbraid-cli
-Version: 0.16.1
+Version: 0.16.3
 Summary: Command Line Interface for interacting with all parts of the qBraid platform.
 Author-email: qBraid Development Team <contact@qbraid.com>
 License-Expression: LicenseRef-Proprietary

{qbraid_cli-0.16.1 → qbraid_cli-0.16.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qbraid-cli"
-version = "0.16.1"
+version = "0.16.3"
 description = "Command Line Interface for interacting with all parts of the qBraid platform."
 readme = "README.md"
 authors = [{ name = "qBraid Development Team", email = "contact@qbraid.com" }]

{qbraid_cli-0.16.1 → qbraid_cli-0.16.3}/qbraid_cli/agents/app.py

@@ -89,13 +89,43 @@ def _ssh_cmd(ssh_alias: str, remote_cmd: str, timeout: int = 30) -> str:
         text=True,
         check=False,
         timeout=timeout,
+        # ssh reads stdin unless told otherwise, so inside a script or a
+        # `while read` loop it swallowed the caller's remaining input.
+        stdin=_sp.DEVNULL,
     )
     if result.returncode != 0:
-        console.print(f"[red]Remote command failed: {result.stderr.strip()}[/red]")
+        console.print(
+            f"[red]Remote command failed: {_remote_failure(result.stdout, result.stderr)}[/red]",
+            markup=True,
+        )
         raise typer.Exit(code=1)
     return result.stdout
 
 
+# ssh's own chatter, which says nothing about why the remote command failed.
+_SSH_NOISE = ("Warning: Permanently added", "Connection to ", "Shared connection to ")
+
+
+def _remote_failure(stdout: str, stderr: str) -> str:
+    """Say why a remote qbraid command failed.
+
+    The remote CLI prints its errors through Rich on *stdout*; stderr usually
+    holds only ssh's known-hosts warning. Reporting stderr alone turned
+    "Session not found" into "Warning: Permanently added ... to the list of
+    known hosts", which names the one thing that went right.
+    """
+    from rich.markup import escape
+
+    def useful(text: str) -> list[str]:
+        # The remote's Rich error panel arrives as box-drawing borders around
+        # the message; keep the message, drop the frame.
+        lines = [line.strip().strip("│╭╮╰╯─ ") for line in (text or "").splitlines()]
+        return [line for line in lines if line and not line.startswith(_SSH_NOISE)]
+
+    lines = useful(stdout)[-3:] or useful(stderr)[-3:]
+    return escape(" / ".join(lines)) if lines else "no output from the remote command"
+
+
 def _status_style(status_value: str) -> str:
     """Return a rich style string for a given agent status."""
     styles = {
@@ -339,6 +369,7 @@ def agents_list(
                 text=True,
                 check=False,
                 timeout=30,
+                stdin=subprocess.DEVNULL,
             )
             if result.returncode == 0:
                 if json_output:
@@ -357,12 +388,18 @@ def agents_list(
                         raise typer.Exit(code=1)
                     print(payload)
                 else:
-                    console.print(result.stdout)
+                    # markup=False -- see agents_status. Pre-existing on this
+                    # branch; the --json path above already bypasses Rich.
+                    console.print(result.stdout, markup=False)
             else:
+                reason = _remote_failure(result.stdout, result.stderr)
                 if json_output:
-                    typer.echo(f"Failed: {result.stderr.strip()}", err=True)
-                    raise typer.Exit(code=1)
-                console.print(f"[red]Failed: {result.stderr.strip()}[/red]")
+                    typer.echo(f"Failed: {reason}", err=True)
+                else:
+                    console.print(f"[red]Failed: {reason}[/red]")
+                # Both branches fail. The human-readable one used to print
+                # "Failed" and exit 0, so a script could not tell.
+                raise typer.Exit(code=1)
             return
 
         registry = _get_registry()
@@ -614,11 +651,28 @@ def agents_discover(
 @agents_app.command("status")
 def agents_status(
     session_id: str = typer.Argument(..., help="Session ID (full or prefix)"),
+    compute: Optional[str] = typer.Option(None, "--compute", "-c", help="SSH alias for remote compute"),
 ):
-    """Show detailed status for an agent session."""
+    """Show detailed status for an agent session.
+
+    Without ``--compute`` this reads the local registry, which is per-host: an
+    agent on another machine is simply absent and reports as not found.
+    """
     try:
         from qbraid_core.services.agents import AgentSessionRegistryManager
 
+        if compute:
+            import shlex
+
+            # markup=False: remote output is already rendered, and Rich would
+            # read square brackets in it -- a branch name, a path -- as markup
+            # and silently drop them.
+            console.print(
+                _ssh_cmd(compute, f"qbraid agents status {shlex.quote(session_id)}"),
+                markup=False,
+            )
+            return
+
         registry = AgentSessionRegistryManager()
 
         # Support prefix and name matching
@@ -1567,14 +1621,39 @@ def agents_resume(
     execution_mode: Optional[ExecutionMode] = typer.Option(
         None, "--execution-mode", help="Override the recorded Codex execution mode for this resume."
     ),
+    compute: Optional[str] = typer.Option(None, "--compute", "-c", help="SSH alias for remote compute"),
 ):
     """Resume a previous agent session.
 
-    Resumes in a managed tmux window.
+    Resumes in a managed tmux window. With ``--compute`` the session is resumed
+    on that machine, and a session id is required -- the interactive picker
+    reads the local registry and cannot see another host's sessions.
     """
     try:
         from qbraid_core.services.agents import AgentLauncher, AgentLauncherError
 
+        if compute:
+            if session_id is None:
+                console.print(
+                    "[red]--compute needs an explicit session id.[/red] The picker "
+                    "lists this host's sessions only; use 'qbraid agents list "
+                    f"--compute {compute}' to find one."
+                )
+                raise typer.Exit(code=2)
+            import shlex
+
+            flags = ""
+            if name:
+                flags += f" --name {shlex.quote(name)}"
+            if execution_mode:
+                flags += f" --execution-mode {shlex.quote(execution_mode.value)}"
+            # markup=False -- see agents_status.
+            console.print(
+                _ssh_cmd(compute, f"qbraid agents resume {shlex.quote(session_id)}{flags}"),
+                markup=False,
+            )
+            return
+
         # Interactive mode if no session_id provided
         if session_id is None:
             session_id = _interactive_resume(console)
@@ -1800,7 +1879,9 @@ def agents_read(
             import shlex
 
             output = _ssh_cmd(compute, f"qbraid agents read {shlex.quote(session_id)} --lines {lines}")
-            console.print(output)
+            # markup=False -- see agents_status. Terminal output is exactly
+            # where square brackets are most likely, and this was dropping them.
+            console.print(output, markup=False)
             return
 
         launcher = AgentLauncher()
@@ -1822,17 +1903,66 @@ def agents_read(
 # =============================================================================
 
 
+@agents_app.command("notifier")
+def agents_notifier(
+    interval: float = typer.Option(4.0, "--interval", "-i", min=1.0, help="Seconds between checks"),
+    once: bool = typer.Option(False, "--once", help="Check once, print who was nudged, and exit"),
+):
+    """Wake idle agents when inbox mail arrives.
+
+    Inbox delivery is passive: an agent parked at its prompt never notices a
+    message. This watches the inboxes of this machine's managed agents and
+    types a one-line nudge into an idle agent's pane. Busy agents are left
+    alone until they go idle, and a burst of messages is one nudge.
+
+    qBraid Lab runs this for you. Use it on a machine reached only over SSH.
+    Same-host: it watches the inboxes on the machine it runs on.
+    """
+    try:
+        try:
+            from qbraid_core.services.agents.inbox_watcher import InboxWatcher, watch
+        except ImportError:
+            console.print("[red]This needs a newer qbraid-core.[/red] Run: pip install -U qbraid-core")
+            raise typer.Exit(code=1)  # pylint: disable=raise-missing-from
+
+        watcher = InboxWatcher()
+        if once:
+            nudged = watcher.poll_once()
+            console.print(f"Nudged: {', '.join(nudged) if nudged else 'nobody'}", markup=False)
+            return
+        console.print(f"[dim]Watching inboxes every {interval:g}s... (Ctrl+C to stop)[/dim]")
+        watch(interval=interval, watcher=watcher)
+    except KeyboardInterrupt:
+        console.print("[dim]Stopped.[/dim]")
+    except (typer.Exit, SystemExit):
+        raise
+    except Exception as e:  # pylint: disable=broad-exception-caught
+        handle_error(message=str(e))
+        raise typer.Exit(code=1)
+
+
 @agents_app.command("approve")
 def agents_approve(
     session_id: str = typer.Argument(..., help="Session ID (prefix match)"),
+    compute: Optional[str] = typer.Option(None, "--compute", "-c", help="SSH alias for remote compute"),
 ):
     """Approve a tool-use prompt.
 
-    Sends 'y' + Enter to the agent's terminal.
+    Sends 'y' + Enter to the agent's terminal. With ``--compute`` the approval
+    is sent on that machine.
     """
     try:
+        # Bound before the --compute branch below, which can raise: evaluating
+        # the `except AgentLauncherError` clause needs the name.
         from qbraid_core.services.agents import AgentLauncher, AgentLauncherError
 
+        if compute:
+            import shlex
+
+            _ssh_cmd(compute, f"qbraid agents approve {shlex.quote(session_id)}")
+            console.print(f"[green]Approval sent to session {session_id} on {compute}.[/green]")
+            return
+
         launcher = AgentLauncher()
         launcher.approve(session_id)
         console.print(f"[green]Approval sent to session {session_id}.[/green]")
@@ -1957,6 +2087,7 @@ def agents_watch(
                 ["ssh", "-o", "ConnectTimeout=10", compute, remote_flags],
                 stdout=_sp.PIPE,
                 stderr=_sp.PIPE,
+                stdin=_sp.DEVNULL,
                 text=True,
             )
             try:
@@ -2837,6 +2968,11 @@ def agents_send_to(
 
     For multi-recipient / team broadcast, use ``qbraid agents broadcast``.
 
+    Same-host only: an inbox is a JSONL file under ``~/.qbraid/inboxes/`` on
+    the machine that owns it, so there is no ``--compute``. Cross-host
+    messaging needs a transport, tracked in qBraid-CLI#328 / qbraid-core#307.
+
+
     Delivery is a JSONL append at ~/.qbraid/inboxes/<to-session-id>.jsonl
     (local host only — cross-host messaging isn't yet supported and will raise
     a clear error). Permission rules (leader/worker/observer/reviewer) are
@@ -2904,6 +3040,10 @@ def agents_broadcast(
 ) -> None:
     """Broadcast to multiple agent inboxes.
 
+    Same-host only: an inbox is a JSONL file under ``~/.qbraid/inboxes/`` on
+    the machine that owns it, so there is no ``--compute``. Cross-host
+    messaging needs a transport, tracked in qBraid-CLI#328 / qbraid-core#307.
+
     Two selectors — pick exactly one:
       * ``--team <team_id>``  — every session with that team_id (except sender)
       * ``--to A,B,C``        — explicit id/prefix/name list
@@ -3031,6 +3171,10 @@ def inbox_default(  # pylint: disable=too-many-arguments
 
     Without a subcommand this reads the inbox (optionally streams with
     --follow). Use ``qbraid agents inbox mark-read`` to mark manually.
+
+    Same-host only: an inbox is a JSONL file under ``~/.qbraid/inboxes/`` on
+    the machine that owns it, so there is no ``--compute``. Cross-host
+    messaging needs a transport, tracked in qBraid-CLI#328 / qbraid-core#307.
     """
     if ctx.invoked_subcommand is not None:
         return
@@ -3138,6 +3282,10 @@ def agents_team(
 ) -> None:
     """Show a team roster with unread counts.
 
+    Same-host only: an inbox is a JSONL file under ``~/.qbraid/inboxes/`` on
+    the machine that owns it, so there is no ``--compute``. Cross-host
+    messaging needs a transport, tracked in qBraid-CLI#328 / qbraid-core#307.
+
     Answers the leader-orchestrator question "who is on my team, how many
     unread messages do they have, and what was the last thing they heard from
     anyone?" — which today requires peeking each worker's inbox individually.

{qbraid_cli-0.16.1 → qbraid_cli-0.16.3/qbraid_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qbraid-cli
-Version: 0.16.1
+Version: 0.16.3
 Summary: Command Line Interface for interacting with all parts of the qBraid platform.
 Author-email: qBraid Development Team <contact@qbraid.com>
 License-Expression: LicenseRef-Proprietary