qbraid-cli 0.16.4__tar.gz → 0.16.5__tar.gz

{qbraid_cli-0.16.4/qbraid_cli.egg-info → qbraid_cli-0.16.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qbraid-cli
-Version: 0.16.4
+Version: 0.16.5
 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
@@ -30,11 +30,11 @@ Requires-Dist: typer>=0.12.1
 Requires-Dist: rich>=10.11.0
 Requires-Dist: click<=8.5.0
 Requires-Dist: questionary>=2.0.0
-Requires-Dist: qbraid-core>=0.6.11
+Requires-Dist: qbraid-core>=0.6.12
 Provides-Extra: compute
-Requires-Dist: qbraid-core[compute]>=0.6.11; extra == "compute"
+Requires-Dist: qbraid-core[compute]>=0.6.12; extra == "compute"
 Provides-Extra: envs
-Requires-Dist: qbraid-core[environments]>=0.6.11; extra == "envs"
+Requires-Dist: qbraid-core[environments]>=0.6.12; extra == "envs"
 Provides-Extra: dev
 Requires-Dist: isort; extra == "dev"
 Requires-Dist: black; extra == "dev"

{qbraid_cli-0.16.4 → qbraid_cli-0.16.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qbraid-cli"
-version = "0.16.4"
+version = "0.16.5"
 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" }]
@@ -32,7 +32,7 @@ dependencies = [
     "rich>=10.11.0",
     "click<=8.5.0",
     "questionary>=2.0.0",
-    "qbraid-core>=0.6.11",
+    "qbraid-core>=0.6.12",
 ]
 requires-python = ">= 3.10"
 
@@ -43,8 +43,8 @@ Documentation = "https://docs.qbraid.com/v2/cli/api-reference/qbraid"
 Discord = "https://discord.gg/KugF6Cnncm"
 
 [project.optional-dependencies]
-compute = ["qbraid-core[compute]>=0.6.11"]
-envs = ["qbraid-core[environments]>=0.6.11"]
+compute = ["qbraid-core[compute]>=0.6.12"]
+envs = ["qbraid-core[environments]>=0.6.12"]
 dev = ["isort", "black", "pytest", "pytest-cov", "pytest-asyncio"]
 
 [project.scripts]

{qbraid_cli-0.16.4 → qbraid_cli-0.16.5}/qbraid_cli/agents/app.py

@@ -985,6 +985,13 @@ def agents_kill(
         session = matches[0]
         pid = session.pid
 
+        if session.metadata.get("terminal_backend") == "jupyter":
+            from qbraid_core.services.agents import AgentLauncher
+
+            AgentLauncher().kill_bound(session.session_id)
+            console.print("[green]Stopped native Lab agent.[/green]")
+            return
+
         # For tmux-managed sessions, kill the tmux window
         if session.tmux_session and session.tmux_window:
             try:
@@ -1155,7 +1162,11 @@ def _interactive_attach(console_: Console) -> str:
     sessions = registry.get_active_sessions()
 
     # Only show sessions with tmux info (attachable)
-    tmux_sessions = [s for s in sessions if s.tmux_session and s.tmux_window]
+    tmux_sessions = [
+        s
+        for s in sessions
+        if (s.tmux_session and s.tmux_window) or s.metadata.get("terminal_backend") == "jupyter"
+    ]
 
     if not tmux_sessions:
         non_tmux_count = len(sessions) - len(tmux_sessions)
@@ -1199,6 +1210,24 @@ class ApprovalMode(str, Enum):
     AUTO = "auto"
 
 
+class TerminalBackend(str, Enum):
+    """Terminal transport used to host an agent session."""
+
+    AUTO = "auto"
+    JUPYTER = "jupyter"
+    TMUX = "tmux"
+
+
+def _backend_launcher(backend):
+    from qbraid_core.services.agents import AgentLauncher, AgentLauncherError
+
+    if backend == TerminalBackend.AUTO:
+        return AgentLauncher()
+    if "backend" not in inspect.signature(AgentLauncher).parameters:
+        raise AgentLauncherError("Explicit terminal backends require a newer qbraid-core.")
+    return AgentLauncher(backend=backend.value)
+
+
 class ExecutionMode(str, Enum):
     """Codex command isolation, independent of approval prompts."""
 
@@ -1399,6 +1428,11 @@ def agents_settings(
 
 @agents_app.command("launch")
 def agents_launch(
+    backend: TerminalBackend = typer.Option(
+        TerminalBackend.AUTO,
+        "--backend",
+        help="auto: prefer the owning Lab terminal; jupyter: require Lab; tmux: run independently.",
+    ),
     tool: Optional[str] = typer.Option(
         None, "--tool", "-t", help="Agent tool (claude, codeq, codex; claude-auto = claude --approval auto)"
     ),
@@ -1437,7 +1471,7 @@ def agents_launch(
 ):
     """Launch an AI coding agent.
 
-    Starts the agent in a managed tmux session.
+    Uses the owning Lab terminal when available; otherwise starts in tmux.
 
     Detached agents may wait for approval until you open their terminal or dashboard.
     Approval and execution mode are independent and remembered for resume.
@@ -1446,7 +1480,7 @@ def agents_launch(
     Choose it only where you trust the surrounding machine/container isolation.
     """
     try:
-        from qbraid_core.services.agents import AgentLauncher, AgentLauncherError
+        from qbraid_core.services.agents import AgentLauncherError
 
         # Interactive mode if no tool specified
         if tool is None:
@@ -1465,7 +1499,9 @@ def agents_launch(
             if not compute or str(uuid.UUID(request_id)) != request_id:
                 raise AgentLauncherError("--request-id requires --compute and a canonical UUID.")
 
-        launcher = AgentLauncher()
+        if compute and backend != TerminalBackend.AUTO:
+            raise AgentLauncherError("Remote launches select the backend on the destination; omit --backend.")
+        launcher = _backend_launcher(backend)
 
         # Remote launch via SSH
         if compute:
@@ -1511,6 +1547,8 @@ def agents_launch(
         lines.append(f"[bold]Status:[/bold]        [{style}]{status_val}[/{style}]")
         if session.compute_id:
             lines.append(f"[bold]Compute:[/bold]       {session.compute_id}")
+        if session.metadata.get("terminal_backend") == "jupyter":
+            lines.append("[bold]Backend:[/bold] Jupyter (lifetime of the owning Lab server)")
         lines.append(f"[bold]Tmux Session:[/bold] {session.tmux_session or '-'}")
         lines.append(f"[bold]Tmux Window:[/bold]  {session.tmux_window or '-'}")
         lines.append(f"[bold]PID:[/bold]           {session.pid or '-'}")
@@ -1525,8 +1563,8 @@ def agents_launch(
         )
         console.print(panel)
         console.print()
-        console.print("[dim]Attach to the tmux session with:[/dim]")
-        console.print(f"  tmux attach -t {session.tmux_session}")
+        console.print("[dim]Open from the Agent Dashboard or attach with:[/dim]")
+        console.print(f"  qbraid agents attach {session.session_id}")
 
     except AgentLauncherError as e:
         console.print(
@@ -1614,6 +1652,11 @@ def _interactive_resume(console_: Console) -> str:
 
 @agents_app.command("resume")
 def agents_resume(
+    backend: TerminalBackend = typer.Option(
+        TerminalBackend.AUTO,
+        "--backend",
+        help="auto: prefer the owning Lab terminal; jupyter: require Lab; tmux: run independently.",
+    ),
     session_id: Optional[str] = typer.Argument(
         None, help="Session ID, prefix, or name. Omit for interactive picker."
     ),
@@ -1625,13 +1668,15 @@ def agents_resume(
 ):
     """Resume a previous agent session.
 
-    Resumes in a managed tmux window. With ``--compute`` the session is resumed
+    Resumes with the selected terminal backend. 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
+        from qbraid_core.services.agents import AgentLauncherError
 
+        if compute and backend != TerminalBackend.AUTO:
+            raise AgentLauncherError("Remote resumes select the backend on the destination; omit --backend.")
         if compute:
             if session_id is None:
                 console.print(
@@ -1658,7 +1703,7 @@ def agents_resume(
         if session_id is None:
             session_id = _interactive_resume(console)
 
-        launcher = AgentLauncher()
+        launcher = _backend_launcher(backend)
 
         # Try resume — handle active session and ambiguous matches
         try:
@@ -1792,6 +1837,8 @@ def agents_resume(
         lines.append(f"[bold]Session ID:[/bold]    {session.session_id}")
         lines.append(f"[bold]Tool:[/bold]          {session.tool.value if session.tool else '-'}")
         lines.append(f"[bold]Status:[/bold]        [{style}]{status_val}[/{style}]")
+        if session.metadata.get("terminal_backend") == "jupyter":
+            lines.append("[bold]Backend:[/bold] Jupyter (lifetime of the owning Lab server)")
         lines.append(f"[bold]Tmux Session:[/bold] {session.tmux_session or '-'}")
         lines.append(f"[bold]Tmux Window:[/bold]  {session.tmux_window or '-'}")
         lines.append(f"[bold]CWD:[/bold]           {session.cwd or '-'}")
@@ -2485,29 +2532,14 @@ def agents_attach(
 ):
     """Attach to an agent's terminal.
 
-    Opens an interactive tmux window for the agent session.
+    Reconnects to its recorded native terminal or tmux window.
     """
     try:
-        # Remote attach: SSH + tmux attach
         if compute:
             import shlex
 
-            if session_id:
-                # Attach to specific window
-                console.print(f"[dim]Attaching to {session_id} on {compute}... (Ctrl+b d to detach)[/dim]")
-                os.execvp(
-                    "ssh",
-                    [
-                        "ssh",
-                        "-t",
-                        compute,
-                        f"tmux attach -t qbraid-agents:{shlex.quote(session_id)}",
-                    ],
-                )
-            else:
-                # Attach to the tmux session (user picks window)
-                console.print(f"[dim]Attaching to qbraid-agents on {compute}... (Ctrl+b d to detach)[/dim]")
-                os.execvp("ssh", ["ssh", "-t", compute, "tmux attach -t qbraid-agents"])
+            command = "qbraid agents attach" + (" -- " + shlex.quote(session_id) if session_id else "")
+            os.execvp("ssh", ["ssh", "-t", "--", compute, command])
             return
 
         # Interactive mode if no session_id provided
@@ -2522,6 +2554,23 @@ def agents_attach(
             console.print("[dim]Use 'qbraid agents list' to see active sessions.[/dim]")
             raise typer.Exit(code=1)
 
+        if session.compute_id:
+            import shlex
+
+            remote_id = session.metadata.get("remote_session_id") or session.session_id
+            command = "qbraid agents attach -- " + shlex.quote(remote_id)
+            os.execvp("ssh", ["ssh", "-t", "--", session.compute_id, command])
+            return
+        if session.machine_id:
+            raise ValueError("Attach on the recorded machine; no SSH alias was recorded.")
+
+        if session.metadata.get("terminal_backend") == "jupyter":
+            from qbraid_core.services.agents.jupyter_runtime import JupyterRuntimeClient
+
+            console.print("[dim]Attaching to native Lab terminal. Ctrl-] detaches.[/dim]")
+            JupyterRuntimeClient(session.metadata["jupyter_server_id"]).attach(session)
+            return
+
         tmux_session = session.tmux_session
         tmux_window = session.tmux_window
 
@@ -2549,12 +2598,7 @@ def agents_attach(
 
         console.print(f"[dim]Attaching to {target}... (Ctrl+b d to detach)[/dim]")
 
-        # For remote sessions (has compute_id), SSH into the machine first
-        if session.compute_id:
-            alias = session.compute_id
-            os.execvp("ssh", ["ssh", "-t", alias, f"tmux attach -t {target}"])
-        else:
-            os.execvp("tmux", ["tmux", "attach", "-t", target])
+        os.execvp("tmux", ["tmux", "attach", "-t", target])
 
     except (typer.Exit, SystemExit):
         raise

{qbraid_cli-0.16.4 → qbraid_cli-0.16.5/qbraid_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qbraid-cli
-Version: 0.16.4
+Version: 0.16.5
 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
@@ -30,11 +30,11 @@ Requires-Dist: typer>=0.12.1
 Requires-Dist: rich>=10.11.0
 Requires-Dist: click<=8.5.0
 Requires-Dist: questionary>=2.0.0
-Requires-Dist: qbraid-core>=0.6.11
+Requires-Dist: qbraid-core>=0.6.12
 Provides-Extra: compute
-Requires-Dist: qbraid-core[compute]>=0.6.11; extra == "compute"
+Requires-Dist: qbraid-core[compute]>=0.6.12; extra == "compute"
 Provides-Extra: envs
-Requires-Dist: qbraid-core[environments]>=0.6.11; extra == "envs"
+Requires-Dist: qbraid-core[environments]>=0.6.12; extra == "envs"
 Provides-Extra: dev
 Requires-Dist: isort; extra == "dev"
 Requires-Dist: black; extra == "dev"

{qbraid_cli-0.16.4 → qbraid_cli-0.16.5}/qbraid_cli.egg-info/requires.txt

@@ -2,10 +2,10 @@ typer>=0.12.1
 rich>=10.11.0
 click<=8.5.0
 questionary>=2.0.0
-qbraid-core>=0.6.11
+qbraid-core>=0.6.12
 
 [compute]
-qbraid-core[compute]>=0.6.11
+qbraid-core[compute]>=0.6.12
 
 [dev]
 isort
@@ -15,4 +15,4 @@ pytest-cov
 pytest-asyncio
 
 [envs]
-qbraid-core[environments]>=0.6.11
+qbraid-core[environments]>=0.6.12