virtuai-cli 0.2.1__tar.gz → 0.3.0__tar.gz

{virtuai_cli-0.2.1 → virtuai_cli-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: virtuai-cli
-Version: 0.2.1
+Version: 0.3.0
 Summary: Run VirtuAI deep agents on your local machine
 Author-email: uCloudStore <lmoreno@ucloudstore.com>
 License: Proprietary

{virtuai_cli-0.2.1 → virtuai_cli-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "virtuai-cli"
-version = "0.2.1"
+version = "0.3.0"
 description = "Run VirtuAI deep agents on your local machine"
 readme = "README.md"
 requires-python = ">=3.11"

{virtuai_cli-0.2.1 → virtuai_cli-0.3.0}/src/virtuai_cli/__init__.py

@@ -1,2 +1,2 @@
 """VirtuAI local CLI."""
-__version__ = "0.2.1"
+__version__ = "0.3.0"

{virtuai_cli-0.2.1 → virtuai_cli-0.3.0}/src/virtuai_cli/chat/command.py

@@ -92,6 +92,7 @@ def run_chat(
         agent_id=picked["agent_id"],
         agent_name=picked["name"],
         workspace_name=info["workspace_name"],
-        default_model_id=picked.get("default_model_id"),
+        default_model_id=picked.get("default_model_id") or None,
+        allowed_models=picked.get("allowed_models") or [],
     )
     app.run()

{virtuai_cli-0.2.1 → virtuai_cli-0.3.0}/src/virtuai_cli/chat/tui.py

@@ -22,22 +22,20 @@ class ChatApp(App):
     CSS = """
     Screen { background: $surface; }
 
-    #conversation {
-        height: 1fr;
-        padding: 0 1;
-        scrollbar-gutter: stable;
-    }
-
     #status {
-        dock: top;
         height: 1;
         padding: 0 1;
         background: $panel;
         color: $text-muted;
     }
 
+    #conversation {
+        height: 1fr;
+        padding: 0 1;
+        scrollbar-gutter: stable;
+    }
+
     #input {
-        dock: bottom;
         height: 3;
         border: round $primary;
         margin: 0 1 1 1;
@@ -66,6 +64,7 @@ class ChatApp(App):
         agent_name: str,
         workspace_name: str,
         default_model_id: Optional[str] = None,
+        allowed_models: Optional[list[dict]] = None,
     ) -> None:
         super().__init__()
         self.server_url = server_url
@@ -75,6 +74,8 @@ class ChatApp(App):
         self.agent_name = agent_name
         self.workspace_name = workspace_name
         self.default_model_id = default_model_id
+        self.current_model_id = default_model_id
+        self.allowed_models = list(allowed_models or [])
 
         self.session_id: Optional[str] = None
         self._stream_task: Optional[asyncio.Task] = None
@@ -96,7 +97,7 @@ class ChatApp(App):
         yield Footer()
 
     def _initial_status(self) -> str:
-        model = f" · {self.default_model_id}" if self.default_model_id else ""
+        model = f" · {self.current_model_id}" if self.current_model_id else ""
         return f"{self.workspace_name} · {self.agent_name}{model} · connecting…"
 
     # ── Mount: start the WS runner in the background ──────────────────────
@@ -108,18 +109,26 @@ class ChatApp(App):
 
     async def _run_ws(self) -> None:
         def on_status(level: str, msg: str) -> None:
-            # Called from the runner; mutate the status bar safely.
-            self.call_from_thread(self._set_status, f"{msg}")
+            # Runner runs on the same event loop, so call directly.
+            self._set_status(msg)
 
         try:
             await ws_runner.run_forever(self.server_url, self.token, self.workdir, on_status=on_status)
+        except asyncio.CancelledError:
+            raise
         except Exception as exc:
-            self.call_from_thread(self._set_status, f"runner error: {exc}")
+            self._set_status(f"runner error: {exc}")
 
     def _set_status(self, text: str) -> None:
-        self.query_one("#status", Static).update(
-            f"{self.workspace_name} · {self.agent_name} · {text}"
-        )
+        # The status widget may have been torn down during app shutdown —
+        # swallow the lookup error so we don't surface a NoMatches on exit.
+        model = f" · {self.current_model_id}" if self.current_model_id else ""
+        try:
+            self.query_one("#status", Static).update(
+                f"{self.workspace_name} · {self.agent_name}{model} · {text}"
+            )
+        except Exception:
+            pass
 
     # ── Input submission ──────────────────────────────────────────────────
     @on(Input.Submitted, "#input")
@@ -155,20 +164,72 @@ class ChatApp(App):
     async def _handle_slash(self, cmd: str) -> None:
         parts = cmd.split(None, 1)
         head = parts[0].lower()
+        arg = parts[1].strip() if len(parts) > 1 else ""
         if head in ("/exit", "/quit"):
             self.exit()
         elif head in ("/clear", "/new"):
             await self.action_clear_conversation()
+        elif head == "/models":
+            await self._show_models()
+        elif head == "/model":
+            await self._set_model(arg)
         elif head == "/help":
             await self._append(Static(
                 "[b]Commands[/b]\n"
-                "  /help          this list\n"
-                "  /clear, /new   start a fresh conversation\n"
-                "  /exit, /quit   close the TUI\n"
-                "  Esc            cancel current response\n"
+                "  /help              this list\n"
+                "  /clear, /new       start a fresh conversation\n"
+                "  /models            list models available for this agent\n"
+                "  /model <id>        switch the model for the next message\n"
+                "  /exit, /quit       close the TUI\n"
+                "  Esc                cancel current response\n"
             ))
         else:
-            await self._append(Static(f"[red]Unknown command: {head}[/red]"))
+            await self._append(Static(f"[red]Unknown command: {head}[/red]  (try /help)"))
+
+    async def _show_models(self) -> None:
+        if not self.allowed_models:
+            await self._append(Static(
+                "[yellow]No model catalog available for this agent.[/yellow]"
+            ))
+            return
+        lines = ["[b]Available models[/b]"]
+        for m in self.allowed_models:
+            marker = "•" if m["id"] != self.current_model_id else "[green]✓[/green]"
+            label = m.get("label") or m["id"]
+            provider = f" [dim]({m['provider']})[/dim]" if m.get("provider") else ""
+            lines.append(f"  {marker} [bold]{m['id']}[/bold] — {label}{provider}")
+        lines.append("\n[dim]Use [/dim][b]/model <id>[/b][dim] to switch.[/dim]")
+        await self._append(Static("\n".join(lines)))
+
+    async def _set_model(self, requested: str) -> None:
+        if not requested:
+            current = self.current_model_id or "(none)"
+            await self._append(Static(
+                f"Current model: [b]{current}[/b]\n"
+                f"Usage: [b]/model <id>[/b]  (see [b]/models[/b] for the list)"
+            ))
+            return
+        if self._stream_task and not self._stream_task.done():
+            await self._append(Static(
+                "[yellow]Cancel the in-flight response (Esc) before switching models.[/yellow]"
+            ))
+            return
+        if self.allowed_models:
+            valid_ids = {m["id"] for m in self.allowed_models}
+            if requested not in valid_ids:
+                # Loose match by label too
+                by_label = {m.get("label", ""): m["id"] for m in self.allowed_models}
+                if requested in by_label:
+                    requested = by_label[requested]
+                else:
+                    await self._append(Static(
+                        f"[red]'{requested}' is not in this agent's catalog.[/red]  "
+                        f"Run [b]/models[/b] to see valid IDs."
+                    ))
+                    return
+        self.current_model_id = requested
+        self._set_status(f"model set to {requested}")
+        await self._append(Static(f"[green]✓[/green] Model switched to [b]{requested}[/b]."))
 
     async def action_clear_conversation(self) -> None:
         self.session_id = None
@@ -195,19 +256,25 @@ class ChatApp(App):
                 self.agent_id,
                 message,
                 session_id=self.session_id,
-                model_id=self.default_model_id,
+                model_id=self.current_model_id,
             ):
                 await self._handle_event(event, turn)
         except asyncio.CancelledError:
-            self._set_status("response cancelled")
+            # App may be shutting down — don't touch widgets here.
             raise
         except Exception as exc:
-            await turn.append_token(f"\n\n*[error: {exc}]*")
-            self._set_status(f"stream error: {exc}")
+            try:
+                await turn.append_token(f"\n\n*[error: {exc}]*")
+                self._set_status(f"stream error: {exc}")
+            except Exception:
+                pass
         finally:
             turn.mark_final()
-            scroll = self.query_one("#conversation", VerticalScroll)
-            scroll.scroll_end(animate=False)
+            try:
+                scroll = self.query_one("#conversation", VerticalScroll)
+                scroll.scroll_end(animate=False)
+            except Exception:
+                pass
 
     async def _handle_event(self, event: dict, turn: AssistantTurn) -> None:
         etype = event.get("type")

{virtuai_cli-0.2.1 → virtuai_cli-0.3.0}/src/virtuai_cli/chat/widgets.py

@@ -72,9 +72,9 @@ class ToolCallCard(Static):
         self.input_str = input_str or ""
         self.output_preview: Optional[str] = None
         self.add_class("-running")
-        self._render()
+        self._redraw()
 
-    def _render(self) -> None:
+    def _redraw(self) -> None:
         marker = "✓" if "-done" in self.classes else ("✗" if "-error" in self.classes else "▶")
         head = Text(f"{marker} {self.tool_name}", style="bold")
         if self.input_str:
@@ -90,7 +90,7 @@ class ToolCallCard(Static):
         self.output_preview = output_preview
         self.remove_class("-running")
         self.add_class("-error" if errored else "-done")
-        self._render()
+        self._redraw()
 
 
 class TodoList(Static):

{virtuai_cli-0.2.1 → virtuai_cli-0.3.0}/src/virtuai_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: virtuai-cli
-Version: 0.2.1
+Version: 0.3.0
 Summary: Run VirtuAI deep agents on your local machine
 Author-email: uCloudStore <lmoreno@ucloudstore.com>
 License: Proprietary