glaip-sdk 0.6.1__py3-none-any.whl → 0.6.3__py3-none-any.whl

glaip_sdk/cli/slash/accounts_shared.py

@@ -6,14 +6,70 @@ Authors:
 
 from __future__ import annotations
 
+import os
 from typing import Any
 
+from glaip_sdk.cli.masking import mask_api_key_display
+
 
 def build_account_status_string(row: dict[str, Any], *, use_markup: bool = False) -> str:
-    """Build status string for an account row (active/env-lock)."""
+    """Build status string for an account row (active/env-lock).
+
+    When `use_markup` is True, returns Rich markup strings for Textual/Rich rendering;
+    when False, returns plain text for console output.
+
+    Example:
+        build_account_status_string({"active": True, "env_lock": True}, use_markup=True)
+        returns "[bold green]● active[/] · [yellow]🔒 env-lock[/]"
+        use_markup=False returns "● active · 🔒 env-lock"
+    """
     status_parts: list[str] = []
     if row.get("active"):
         status_parts.append("[bold green]● active[/]" if use_markup else "● active")
     if row.get("env_lock"):
         status_parts.append("[yellow]🔒 env-lock[/]" if use_markup else "🔒 env-lock")
     return " · ".join(status_parts)
+
+
+def env_credentials_present(*, partial: bool = False) -> bool:
+    """Return True when env credentials are present.
+
+    Args:
+        partial: When True, treat either AIP_API_URL or AIP_API_KEY as present
+            (used by UIs that should lock on any env override). When False,
+            require both to be non-empty (used for context display).
+    """
+    api_url = (os.getenv("AIP_API_URL") or "").strip()
+    api_key = (os.getenv("AIP_API_KEY") or "").strip()
+    if partial:
+        return bool(api_url or api_key)
+    return bool(api_url and api_key)
+
+
+def build_account_rows(
+    accounts: dict[str, dict[str, str]],
+    active_account: str | None,
+    env_lock: bool,
+) -> list[dict[str, str | bool]]:
+    """Build account rows for display from accounts dict.
+
+    Args:
+        accounts: Dictionary mapping account names to account data.
+        active_account: Name of the currently active account.
+        env_lock: Whether environment credentials are locking account switching.
+
+    Returns:
+        List of account row dictionaries with name, api_url, masked_key, active, and env_lock.
+    """
+    rows: list[dict[str, str | bool]] = []
+    for name, account in sorted(accounts.items()):
+        rows.append(
+            {
+                "name": name,
+                "api_url": account.get("api_url", ""),
+                "masked_key": mask_api_key_display(account.get("api_key", "")),
+                "active": name == active_account,
+                "env_lock": env_lock,
+            }
+        )
+    return rows

glaip_sdk/cli/slash/session.py

@@ -41,6 +41,7 @@ from glaip_sdk.cli.commands.update import update_command
 from glaip_sdk.cli.hints import format_command_hint
 from glaip_sdk.cli.slash.accounts_controller import AccountsController
 from glaip_sdk.cli.slash.agent_session import AgentRunSession
+from glaip_sdk.cli.slash.accounts_shared import env_credentials_present
 from glaip_sdk.cli.slash.prompt import (
     FormattedText,
     PromptSession,
@@ -284,39 +285,124 @@ class SlashSession:
             if not self.handle_command(raw):
                 break
 
+    def _handle_account_selection(self) -> bool:
+        """Handle account selection when accounts exist but none are active.
+
+        Returns:
+            True if configuration is ready after selection, False if user aborted.
+        """
+        self.console.print(f"[{INFO_STYLE}]No active account selected. Please choose an account:[/]")
+        try:
+            self._cmd_accounts([], False)
+            self._config_cache = None
+            return self._check_configuration_after_selection()
+        except KeyboardInterrupt:
+            self.console.print(f"[{ERROR_STYLE}]Account selection aborted. Closing the command palette.[/]")
+            return False
+
+    def _check_configuration_after_selection(self) -> bool:
+        """Check if configuration is ready after account selection.
+
+        Returns:
+            True if configuration is ready, False otherwise.
+        """
+        return self._configuration_ready()
+
+    def _handle_new_account_creation(self) -> bool:
+        """Handle new account creation when no accounts exist.
+
+        Returns:
+            True if configuration succeeded, False if user aborted.
+        """
+        previous_tip_env = os.environ.get("AIP_SUPPRESS_CONFIGURE_TIP")
+        os.environ["AIP_SUPPRESS_CONFIGURE_TIP"] = "1"
+        self._suppress_login_layout = True
+        try:
+            self._cmd_login([], False)
+            return True
+        except KeyboardInterrupt:
+            self.console.print(f"[{ERROR_STYLE}]Configuration aborted. Closing the command palette.[/]")
+            return False
+        finally:
+            self._suppress_login_layout = False
+            if previous_tip_env is None:
+                os.environ.pop("AIP_SUPPRESS_CONFIGURE_TIP", None)
+            else:
+                os.environ["AIP_SUPPRESS_CONFIGURE_TIP"] = previous_tip_env
+
     def _ensure_configuration(self) -> bool:
         """Ensure the CLI has both API URL and credentials before continuing."""
         while not self._configuration_ready():
-            previous_tip_env = os.environ.get("AIP_SUPPRESS_CONFIGURE_TIP")
-            os.environ["AIP_SUPPRESS_CONFIGURE_TIP"] = "1"
-            self._suppress_login_layout = True
-            try:
-                self._cmd_login([], False)
-            except KeyboardInterrupt:
-                self.console.print(f"[{ERROR_STYLE}]Configuration aborted. Closing the command palette.[/]")
+            store = get_account_store()
+            accounts = store.list_accounts()
+            active_account = store.get_active_account()
+
+            # If accounts exist but none are active, show accounts list first
+            if accounts and (not active_account or active_account not in accounts):
+                if not self._handle_account_selection():
+                    return False
+                continue
+
+            # No accounts exist - prompt for configuration
+            if not self._handle_new_account_creation():
                 return False
-            finally:
-                self._suppress_login_layout = False
-                if previous_tip_env is None:
-                    os.environ.pop("AIP_SUPPRESS_CONFIGURE_TIP", None)
-                else:
-                    os.environ["AIP_SUPPRESS_CONFIGURE_TIP"] = previous_tip_env
 
         return True
 
+    def _get_credentials_from_context_and_env(self) -> tuple[str, str]:
+        """Get credentials from context and environment variables.
+
+        Returns:
+            Tuple of (api_url, api_key) from context/env overrides.
+        """
+        api_url = ""
+        api_key = ""
+        if isinstance(self.ctx.obj, dict):
+            api_url = self.ctx.obj.get("api_url", "")
+            api_key = self.ctx.obj.get("api_key", "")
+        # Environment variables take precedence
+        env_url = os.getenv("AIP_API_URL", "")
+        env_key = os.getenv("AIP_API_KEY", "")
+        return (env_url or api_url, env_key or api_key)
+
+    def _get_credentials_from_account_store(self) -> tuple[str, str] | None:
+        """Get credentials from the active account in account store.
+
+        Returns:
+            Tuple of (api_url, api_key) if active account exists, None otherwise.
+        """
+        store = get_account_store()
+        active_account = store.get_active_account()
+        if not active_account:
+            return None
+
+        account = store.get_account(active_account)
+        if not account:
+            return None
+
+        api_url = account.get("api_url", "")
+        api_key = account.get("api_key", "")
+        return (api_url, api_key)
+
     def _configuration_ready(self) -> bool:
         """Check whether API URL and credentials are available."""
-        config = self._load_config()
-        api_url = self._get_api_url(config)
-        if not api_url:
+        # Check for explicit overrides in context/env first
+        override_url, override_key = self._get_credentials_from_context_and_env()
+        if override_url and override_key:
+            return True
+
+        # Read from account store directly to avoid stale cache
+        account_creds = self._get_credentials_from_account_store()
+        if account_creds is None:
             return False
 
-        api_key: str | None = None
-        if isinstance(self.ctx.obj, dict):
-            api_key = self.ctx.obj.get("api_key")
+        store_url, store_key = account_creds
+
+        # Use override values if available, otherwise use store values
+        api_url = override_url or store_url
+        api_key = override_key or store_key
 
-        api_key = api_key or config.get("api_key") or os.getenv("AIP_API_KEY")
-        return bool(api_key)
+        return bool(api_url and api_key)
 
     def handle_command(self, raw: str, *, invoked_from_agent: bool = False) -> bool:
         """Parse and execute a single slash command string."""
@@ -1339,11 +1425,10 @@ class SlashSession:
             host = ""
             if account:
                 host = account.get("api_url", "")
-            env_lock = bool(os.getenv("AIP_API_URL") or os.getenv("AIP_API_KEY"))
+            env_lock = env_credentials_present()
             return active, host, env_lock
         except Exception:
-            env_lock = bool(os.getenv("AIP_API_URL") or os.getenv("AIP_API_KEY"))
-            return "default", "", env_lock
+            return "default", "", env_credentials_present()
 
     def _build_agent_status_line(self, active_agent: Any | None) -> str | None:
         """Return a short status line about the active or recent agent."""

glaip_sdk/cli/slash/tui/accounts.tcss

@@ -19,16 +19,26 @@
     padding: 0 1 0 1;
     margin: 0 0 0 0;
     height: auto;
+    align: center middle;
 }
 
 #filter-label {
-    height: 1;
+    height: 3;
+    width: 12;
+    content-align: left middle;
 }
 
 #filter-input {
     padding: 0 1 0 1;
     margin: 0;
     height: 3;
+    width: 1fr;
+}
+
+#filter-clear {
+    padding: 0 1;
+    min-width: 12;
+    margin-left: 1;
 }
 
 #accounts-table {
@@ -52,3 +62,25 @@
     margin: 0;
     color: cyan;
 }
+
+.form-label {
+    padding: 0 1 0 1;
+}
+
+#form-actions, #form-key-actions, #confirm-actions {
+    padding: 0 1;
+}
+
+#form-status, #confirm-status {
+    padding: 0 1;
+    color: yellow;
+}
+
+#form-test {
+    margin: 0 1 0 1;
+    padding: 0 1;
+}
+
+#form-actions {
+    margin: 0 1 0 1;
+}