@rubixkube/rubix 0.0.3 → 0.0.4

package/dist/ui/App.js

@@ -8,12 +8,12 @@ import { Select, Spinner, StatusMessage } from "@inkjs/ui";
 import { clearAuthConfig, loadAuthConfig, saveAuthConfig } from "../core/auth-store.js";
 import { authenticateWithDeviceFlow, isTokenNearExpiry } from "../core/device-auth.js";
 import { isFolderTrusted, trustFolder, untrustFolder } from "../core/trust-store.js";
-import { clearLocalSessions, loadLocalSessions, saveLocalSessions } from "../core/session-store.js";
+import { clearLocalSessions, saveLocalSessions } from "../core/session-store.js";
 import { loadSettings, saveSettings } from "../core/settings.js";
 import { loadWhatsNew } from "../core/whats-new.js";
 import { checkForUpdate } from "../core/update-check.js";
 import { VERSION } from "../version.js";
-import { createSession, fetchChatHistory, firstHealthyCluster, getOrCreateSession, listClusters, listModels, listSessions, listApps, refreshAndUpdateAuth, streamChat, StreamError, updateSessionState, } from "../core/rubix-api.js";
+import { createSession, fetchChatHistory, fetchSystemStats, firstHealthyEnvironment, getOrCreateSession, listEnvironments, listModels, listSessions, listApps, refreshAndUpdateAuth, streamChat, StreamError, updateSessionState, } from "../core/rubix-api.js";
 import { readFileContext, fetchUrlContext, formatContextBlock, } from "../core/file-context.js";
 import { ChatTranscript } from "./components/ChatTranscript.js";
 import { Composer } from "./components/Composer.js";
@@ -21,7 +21,7 @@ import { DashboardPanel } from "./components/DashboardPanel.js";
 import { SplashScreen } from "./components/SplashScreen.js";
 import { TrustDisclaimer } from "./components/TrustDisclaimer.js";
 import { getConfig } from "../config/env.js";
-import { RUBIX_THEME } from "./theme.js";
+import { compactSessionId, RUBIX_THEME } from "./theme.js";
 import { useBracketedPaste } from "./hooks/useBracketedPaste.js";
 // Auth | Session | Input | Navigation | Help
 const SLASH_COMMANDS = [
@@ -30,11 +30,11 @@ const SLASH_COMMANDS = [
     { name: "/status", description: "Show auth and session status" },
     { name: "/resume", description: "Resume a previous conversation" },
     { name: "/new", description: "Start a fresh conversation" },
-    { name: "/cluster", description: "Switch active cluster" },
+    { name: "/environments", description: "Switch active environment" },
     { name: "/models", description: "Switch AI model for this session" },
     { name: "/agents", description: "Switch agent (app) for new sessions" },
     { name: "/paste", description: "Insert clipboard content (avoids terminal paste truncation)" },
-    { name: "/send-shell-output", description: "Send last shell command output to Rubix" },
+    { name: "/send", description: "Send last shell output to Rubix" },
     { name: "/clear", description: "Clear current conversation history" },
     { name: "/rename", description: "Rename current session" },
     { name: "/console", description: "Open web dashboard in browser" },
@@ -61,6 +61,21 @@ const SHORTCUT_ROWS = [
 const SESSION_PAGE_SIZE = 100;
 const SESSION_MAX_PAGES = 10;
 const STREAM_THROTTLE_MS = 80;
+const GOODBYE_MESSAGES = [
+    "◈ Watching.",
+    "◈ Rubix continues monitoring in the cloud.",
+    "◈ Bye.",
+    "◈ See you.",
+    "◈ Stay reliable.",
+    "◈ Catch you later.",
+    "◈ Laters.",
+    "◈ Ta.",
+    "◈ Take care.",
+    "◈ Until next time.",
+    "◈ Adios.",
+    "◈ Cheers.",
+    "◈ Out.",
+];
 const IDLE_ACTIVITY_WORDS = [
     "Boogieing",
     "Booping",
@@ -183,8 +198,15 @@ function formatTimeAgo(isoString) {
 }
 export function App({ initialSessionId, seedPrompt }) {
     const { exit } = useApp();
+    const gracefulExit = useCallback(() => {
+        if (typeof process.stdout?.write === "function") {
+            const msg = GOODBYE_MESSAGES[Math.floor(Math.random() * GOODBYE_MESSAGES.length)];
+            process.stdout.write(`\n  \x1b[2m${msg}\x1b[0m\n\n`);
+        }
+        exit();
+    }, [exit]);
     const cwd = useMemo(() => process.cwd(), []);
-    const agentName = useMemo(() => process.env.RUBIX_AGENT_NAME ?? "Rubix Agent", []);
+    const agentName = useMemo(() => process.env.RUBIX_AGENT_NAME ?? "Rubix", []);
     const [authConfig, setAuthConfig] = useState(null);
     const [sessionId, setSessionId] = useState(initialSessionId ?? null);
     const [status, setStatus] = useState("booting");
@@ -211,14 +233,15 @@ export function App({ initialSessionId, seedPrompt }) {
     const [composerResetToken, setComposerResetToken] = useState(0);
     const [lastError, setLastError] = useState(null);
     const [escClearArmed, setEscClearArmed] = useState(false);
+    const [ctrlCArmed, setCtrlCArmed] = useState(false);
     const [messages, setMessages] = useState([]);
     const [recentActivity, setRecentActivity] = useState([]);
-    const [clusters, setClusters] = useState([]);
-    const [selectedCluster, setSelectedCluster] = useState(null);
-    const [showClusterPanel, setShowClusterPanel] = useState(false);
-    const [clusterPanelLoading, setClusterPanelLoading] = useState(false);
-    const [clusterPanelError, setClusterPanelError] = useState(null);
-    const [pendingClusterSwitch, setPendingClusterSwitch] = useState(null);
+    const [environments, setEnvironments] = useState([]);
+    const [selectedEnvironment, setSelectedEnvironment] = useState(null);
+    const [showEnvironmentPanel, setShowEnvironmentPanel] = useState(false);
+    const [environmentPanelLoading, setEnvironmentPanelLoading] = useState(false);
+    const [environmentPanelError, setEnvironmentPanelError] = useState(null);
+    const [pendingEnvironmentSwitch, setPendingEnvironmentSwitch] = useState(null);
     const [availableModels, setAvailableModels] = useState([]);
     const [currentSessionModel, setCurrentSessionModel] = useState(null);
     const [showModelPanel, setShowModelPanel] = useState(false);
@@ -237,6 +260,7 @@ export function App({ initialSessionId, seedPrompt }) {
     const [atFileCurrentDir, setAtFileCurrentDir] = useState(cwd);
     const [atFileList, setAtFileList] = useState([]);
     const [atFileSelectedIndex, setAtFileSelectedIndex] = useState(0);
+    const [systemStats, setSystemStats] = useState(null);
     const [shellMode, setShellMode] = useState(false);
     const [workflowViewMode, setWorkflowViewMode] = useState("minimal");
     const [whatsNew] = useState(() => loadWhatsNew(VERSION));
@@ -272,7 +296,7 @@ export function App({ initialSessionId, seedPrompt }) {
                 setWorkflowViewMode(cfg.workflowViewMode);
             if (cfg.agentId)
                 setCurrentAgent(cfg.agentId);
-            // model and cluster will be applied after their lists are fetched
+            // model and environment will be applied after their lists are fetched
             // Check for updates
             checkForUpdate(VERSION, cfg.lastUpdateCheck)
                 .then((newVer) => {
@@ -430,19 +454,19 @@ export function App({ initialSessionId, seedPrompt }) {
         setSlashSelectedIndex(0);
     }, [visibleSlashCandidates]);
     useEffect(() => {
-        if (slashModeActive && (showSessionsPanel || showClusterPanel || showModelPanel)) {
+        if (slashModeActive && (showSessionsPanel || showEnvironmentPanel || showModelPanel)) {
             setShowSessionsPanel(false);
-            setShowClusterPanel(false);
+            setShowEnvironmentPanel(false);
             setShowModelPanel(false);
         }
-    }, [showSessionsPanel, showClusterPanel, showModelPanel, slashModeActive]);
+    }, [showSessionsPanel, showEnvironmentPanel, showModelPanel, slashModeActive]);
     useEffect(() => {
-        if (atModeActive && (showSessionsPanel || showClusterPanel || showModelPanel)) {
+        if (atModeActive && (showSessionsPanel || showEnvironmentPanel || showModelPanel)) {
             setShowSessionsPanel(false);
-            setShowClusterPanel(false);
+            setShowEnvironmentPanel(false);
             setShowModelPanel(false);
         }
-    }, [atModeActive, showSessionsPanel, showClusterPanel, showModelPanel]);
+    }, [atModeActive, showSessionsPanel, showEnvironmentPanel, showModelPanel]);
     const prevShowSetupSplash = useRef(showSetupSplash);
     useEffect(() => {
         if (showSetupSplash && !prevShowSetupSplash.current) {
@@ -490,15 +514,15 @@ export function App({ initialSessionId, seedPrompt }) {
         setLastError(message);
         addSystemMessage(message);
     }, [addSystemMessage, updateAssistantMessage]);
-    const ensureSession = useCallback(async (config, preferredId, clusterIdOverride) => {
-        const clusterId = clusterIdOverride ?? selectedCluster?.cluster_id;
-        const resolved = await getOrCreateSession(config, preferredId, clusterId, currentAgent);
+    const ensureSession = useCallback(async (config, preferredId, environmentIdOverride) => {
+        const envId = environmentIdOverride ?? selectedEnvironment?.environment_id;
+        const resolved = await getOrCreateSession(config, preferredId, envId, currentAgent);
         setSessionId(resolved);
         return resolved;
-    }, [selectedCluster?.cluster_id, currentAgent]);
+    }, [selectedEnvironment?.environment_id, currentAgent]);
     const openSessionsPanel = useCallback(async () => {
         if (!authConfig || !isAuthenticated) {
-            addSystemMessage("Not authenticated. Run /login first.");
+            addSystemMessage("Not logged in. /login to connect.");
             return;
         }
         setShowHelp(false);
@@ -540,63 +564,63 @@ export function App({ initialSessionId, seedPrompt }) {
             setSessionsPanelLoading(false);
         }
     }, [addSystemMessage, authConfig, isAuthenticated]);
-    const openClusterPanel = useCallback(async () => {
+    const openEnvironmentPanel = useCallback(async () => {
         if (!authConfig || !isAuthenticated) {
-            addSystemMessage("Not authenticated. Run /login first.");
+            addSystemMessage("Not logged in. /login to connect.");
             return;
         }
         setShowHelp(false);
         setShowSessionsPanel(false);
-        setShowClusterPanel(true);
-        setClusterPanelLoading(true);
-        setClusterPanelError(null);
+        setShowEnvironmentPanel(true);
+        setEnvironmentPanelLoading(true);
+        setEnvironmentPanelError(null);
         try {
-            const loaded = await listClusters(authConfig);
-            setClusters(loaded);
-            setClusterPanelError(null);
+            const loaded = await listEnvironments(authConfig);
+            setEnvironments(loaded);
+            setEnvironmentPanelError(null);
         }
         catch (error) {
-            setClusterPanelError(error instanceof Error ? error.message : String(error));
+            setEnvironmentPanelError(error instanceof Error ? error.message : String(error));
         }
         finally {
-            setClusterPanelLoading(false);
+            setEnvironmentPanelLoading(false);
         }
     }, [authConfig, isAuthenticated, addSystemMessage]);
-    const confirmClusterSwitch = useCallback(async () => {
-        if (!pendingClusterSwitch || !authConfig)
+    const confirmEnvironmentSwitch = useCallback(async () => {
+        if (!pendingEnvironmentSwitch || !authConfig)
             return;
-        const cluster = pendingClusterSwitch;
-        setPendingClusterSwitch(null);
-        setSelectedCluster(cluster);
-        void updateSetting({ clusterId: cluster.cluster_id });
+        const env = pendingEnvironmentSwitch;
+        setPendingEnvironmentSwitch(null);
+        setSelectedEnvironment(env);
+        void updateSetting({ environmentId: env.environment_id });
         setStatus("creating session");
         try {
-            const nextSession = await createSession(authConfig, currentAgent, cluster.cluster_id, currentSessionModel?.modelId);
+            const nextSession = await createSession(authConfig, currentAgent, env.environment_id, currentSessionModel?.modelId);
             setSessionId(nextSession);
             setSessionTitle(null);
             const latestSessions = await listSessions(authConfig, 20, 0).catch(() => []);
             setRecentSessions(latestSessions.slice(0, 2));
             setMessages([]);
             setStatus("ready");
-            addSystemMessage(`Switched to cluster ${cluster.name}. Started new session.`);
+            addSystemMessage(`Now on ${env.name}. New session started.`);
         }
         catch (error) {
             setStatus("ready");
-            addSystemMessage(`Failed to start session for cluster: ${error instanceof Error ? error.message : String(error)}`);
+            addSystemMessage(`Couldn't start session for environment: ${error instanceof Error ? error.message : String(error)}`);
         }
-    }, [pendingClusterSwitch, authConfig, addSystemMessage, currentAgent, currentSessionModel]);
+    }, [pendingEnvironmentSwitch, authConfig, addSystemMessage, currentAgent, currentSessionModel]);
     const openModelPanel = useCallback(async () => {
         if (!authConfig || !isAuthenticated) {
-            addSystemMessage("Not authenticated. Run /login first.");
+            addSystemMessage("Not logged in. /login to connect.");
             return;
         }
         if (!sessionId) {
-            addSystemMessage("No active session. Use /new or /resume to start a conversation first.");
+            addSystemMessage("No active session. /new or /resume to start.");
             return;
         }
         setShowHelp(false);
         setShowSessionsPanel(false);
-        setShowClusterPanel(false);
+        setShowEnvironmentPanel(false);
         setShowModelPanel(true);
         setModelPanelLoading(true);
         setModelPanelError(null);
@@ -615,7 +639,7 @@ export function App({ initialSessionId, seedPrompt }) {
     }, [authConfig, isAuthenticated, sessionId, addSystemMessage]);
     const handleModelChange = useCallback((modelId) => {
         if (!sessionId) {
-            addSystemMessage("No active session. Cannot switch model.");
+            addSystemMessage("No active session. Can't switch model.");
             return;
         }
         const selected = availableModels.find((m) => m.id === modelId);
@@ -636,12 +660,12 @@ export function App({ initialSessionId, seedPrompt }) {
     }, [sessionId, availableModels, addSystemMessage]);
     const openAgentPanel = useCallback(async () => {
         if (!authConfig || !isAuthenticated) {
-            addSystemMessage("Not authenticated. Run /login first.");
+            addSystemMessage("Not logged in. /login to connect.");
             return;
         }
         setShowHelp(false);
         setShowSessionsPanel(false);
-        setShowClusterPanel(false);
+        setShowEnvironmentPanel(false);
         setShowModelPanel(false);
         setShowAgentPanel(true);
         setAgentPanelLoading(true);
@@ -663,7 +687,7 @@ export function App({ initialSessionId, seedPrompt }) {
         setShowAgentPanel(false);
         setCurrentAgent(agent);
         void updateSetting({ agentId: agent });
-        addSystemMessage(`Switched agent to: ${agent}. Starting new session.`);
+        addSystemMessage(`Switched to ${agent}. New session starting.`);
         setSessionId(null);
         setSessionTitle(null);
         setMessages([]);
@@ -671,7 +695,7 @@ export function App({ initialSessionId, seedPrompt }) {
             return;
         try {
             setStatus("creating session");
-            const nextSession = await createSession(authConfig, agent, selectedCluster?.cluster_id, currentSessionModel?.modelId);
+            const nextSession = await createSession(authConfig, agent, selectedEnvironment?.environment_id, currentSessionModel?.modelId);
             setSessionId(nextSession);
             const latestSessions = await listSessions(authConfig, 20, 0).catch(() => []);
             setRecentSessions(latestSessions.slice(0, 2));
@@ -681,7 +705,7 @@ export function App({ initialSessionId, seedPrompt }) {
             setStatus("ready");
             addSystemMessage(`Failed to create session with agent ${agent}: ` + String(err));
         }
-    }, [authConfig, selectedCluster, currentSessionModel, addSystemMessage]);
+    }, [authConfig, selectedEnvironment, currentSessionModel, addSystemMessage]);
     const activateSessionById = useCallback((selectedId) => {
         const selected = sessionItems.find((item) => item.id === selectedId);
         if (!selected)
@@ -699,16 +723,14 @@ export function App({ initialSessionId, seedPrompt }) {
                 .then((history) => {
                 setMessages(history.length > 0 ? history : []);
                 setStatus("ready");
-                addSystemMessage(`Session ${sessionLabel(selected.id)}${selected.title ? ` — ${selected.title}` : ""}${history.length > 0 ? ` · ${history.length} messages loaded` : ""}`);
             })
                 .catch((err) => {
                 setStatus("ready");
-                addSystemMessage(`Switched to session ${sessionLabel(selected.id)} (history unavailable: ${err instanceof Error ? err.message : String(err)})`);
+                addSystemMessage(`History unavailable: ${err instanceof Error ? err.message : String(err)}`);
             });
         }
         else {
             setStatus("ready");
-            addSystemMessage(`Switched to session ${sessionLabel(selected.id)}${selected.title ? ` — ${selected.title}` : ""}`);
         }
     }, [addSystemMessage, authConfig, sessionItems]);
     useEffect(() => {
@@ -739,18 +761,13 @@ export function App({ initialSessionId, seedPrompt }) {
                 setIsAuthenticated(loggedIn);
                 setActiveUser(cfg?.userName ?? cfg?.userEmail ?? null);
                 if (loggedIn && cfg) {
-                    setStatus("loading clusters");
+                    setStatus("loading environments");
                     try {
-                        const localSess = await loadLocalSessions().catch(() => []);
-                        if (!cancelled && localSess.length > 0) {
-                            setRecentSessions(localSess.slice(0, 2));
-                            setSessionItems(localSess);
-                        }
-                        // Load clusters and recent sessions for dashboard display
-                        const [clusterList, recentList, appList] = await Promise.all([
-                            listClusters(cfg).catch((err) => {
+                        // Don't pre-populate from local cache — wait for API so Recent is never stale
+                        const [envList, recentList, appList, stats] = await Promise.all([
+                            listEnvironments(cfg).catch((err) => {
                                 if (!cancelled) {
-                                    addSystemMessage(`Could not load clusters: ${err instanceof Error ? err.message : String(err)}`);
+                                    addSystemMessage(`Could not load environments: ${err instanceof Error ? err.message : String(err)}`);
                                 }
                                 return [];
                             }),
@@ -761,29 +778,30 @@ export function App({ initialSessionId, seedPrompt }) {
                                 return [];
                             }),
                             listApps(cfg).catch(() => []),
+                            fetchSystemStats(cfg),
                         ]);
-                        const firstCluster = firstHealthyCluster(clusterList);
+                        const firstEnv = firstHealthyEnvironment(envList);
                         if (!cancelled) {
                             setRecentSessions(recentList.slice(0, 2));
                             setSessionItems(recentList);
                             void saveLocalSessions(recentList);
                             if (appList && appList.length > 0) {
                                 setAvailableAgents(appList);
-                                // Prefer saved agentId from settings, then SRI Agent, then first available
                                 const saved = currentSettingsRef.current;
                                 const savedAgent = saved.agentId && appList.includes(saved.agentId) ? saved.agentId : null;
                                 const preferApp = savedAgent ?? (appList.includes("SRI Agent") ? "SRI Agent" : appList[0]);
                                 if (preferApp)
                                     setCurrentAgent(preferApp);
                             }
-                            // Apply saved cluster preference from settings
-                            const savedClusterId = currentSettingsRef.current.clusterId;
-                            const preferredCluster = savedClusterId
-                                ? clusterList.find((c) => c.cluster_id === savedClusterId) ?? firstCluster
-                                : firstCluster;
+                            const savedEnvId = currentSettingsRef.current.environmentId;
+                            const preferredEnv = savedEnvId
+                                ? envList.find((c) => c.environment_id === savedEnvId) ?? firstEnv
+                                : firstEnv;
                             if (!cancelled) {
-                                setClusters(clusterList);
-                                setSelectedCluster(preferredCluster);
+                                setEnvironments(envList);
+                                setSelectedEnvironment(preferredEnv);
+                                if (stats)
+                                    setSystemStats(stats);
                             }
                             setStatus("ready");
                         }
@@ -791,7 +809,7 @@ export function App({ initialSessionId, seedPrompt }) {
                     catch (error) {
                         if (!cancelled) {
                             setStatus("ready");
-                            addSystemMessage(`Failed to load clusters: ${error instanceof Error ? error.message : String(error)}`);
+                            addSystemMessage(`Failed to load environments: ${error instanceof Error ? error.message : String(error)}`);
                         }
                     }
                 }
@@ -819,6 +837,25 @@ export function App({ initialSessionId, seedPrompt }) {
             cancelled = true;
         };
     }, [addSystemMessage, ensureSession, initialSessionId]);
+    // Fetch sessions when dashboard is first shown (ensures Recent has fresh API data)
+    const hasFetchedSessionsForDashboard = useRef(false);
+    useEffect(() => {
+        if (!authConfig || !isAuthenticated || !showDashboard || showTrustDisclaimer || messages.length > 0)
+            return;
+        if (hasFetchedSessionsForDashboard.current)
+            return;
+        let cancelled = false;
+        hasFetchedSessionsForDashboard.current = true;
+        listSessions(authConfig, 20, 0)
+            .then((list) => {
+            if (!cancelled) {
+                setRecentSessions(list.slice(0, 2));
+                void saveLocalSessions(list.slice(0, 20));
+            }
+        })
+            .catch(() => { });
+        return () => { cancelled = true; };
+    }, [authConfig, isAuthenticated, showDashboard, showTrustDisclaimer, messages.length]);
     // Check folder trust status after authentication
     useEffect(() => {
         if (!isAuthenticated || folderTrustCheckComplete)
@@ -903,13 +940,13 @@ export function App({ initialSessionId, seedPrompt }) {
                 return;
             case "/exit":
             case "/quit":
-                exit();
+                gracefulExit();
                 return;
             case "/status": {
                 const workspace = cwd.replace(process.env.HOME ?? "", "~");
-                const clusterStr = selectedCluster
-                    ? `${selectedCluster.name} (${selectedCluster.status})`
-                    : "no cluster selected";
+                const envStr = selectedEnvironment
+                    ? `${selectedEnvironment.name} (${selectedEnvironment.status})`
+                    : "none selected";
                 const modelStr = currentSessionModel
                     ? `${currentSessionModel.displayName}${currentSessionModel.thinkingSupported ? " (thinking supported)" : ""}`
                     : "default";
@@ -918,7 +955,7 @@ export function App({ initialSessionId, seedPrompt }) {
                     `Workspace: ${workspace}`,
                     `Auth: ${isAuthenticated ? `logged in as ${activeUser ?? "unknown user"}` : "not logged in"}`,
                     `Agent: ${currentAgent}`,
-                    `Cluster: ${clusterStr}`,
+                    `Environment: ${envStr}`,
                     `Model: ${modelStr}`,
                     `Session: ${sessionId ?? "no session"}`,
                     `State: ${status}`,
@@ -938,29 +975,29 @@ export function App({ initialSessionId, seedPrompt }) {
                 setSessionTitle(null);
                 setStatus("setup");
                 setMessages([]);
-                addSystemMessage("Logged out. Type /login to set up again.");
+                addSystemMessage("Logged out. /login when you're ready.");
                 return;
             case "/login": {
                 if (isAuthenticated && authConfig) {
-                    addSystemMessage(`Already logged in as ${activeUser ?? "user"}. Type /logout first to switch accounts.`);
+                    addSystemMessage(`Already in as ${activeUser ?? "user"}. /logout to switch.`);
                     return;
                 }
                 setStatus("auth");
-                addSystemMessage("Starting login flow...");
+                addSystemMessage("Starting login...");
                 try {
                     const nextAuth = await authenticateWithDeviceFlow((message) => addSystemMessage(message));
                     await saveAuthConfig(nextAuth);
                     setAuthConfig(nextAuth);
                     setIsAuthenticated(true);
                     setActiveUser(nextAuth.userName ?? nextAuth.userEmail ?? null);
-                    const clusterList = await listClusters(nextAuth).catch((err) => {
-                        addSystemMessage(`Could not load clusters: ${err instanceof Error ? err.message : String(err)}`);
+                    const envList = await listEnvironments(nextAuth).catch((err) => {
+                        addSystemMessage(`Could not load environments: ${err instanceof Error ? err.message : String(err)}`);
                         return [];
                     });
-                    const firstCluster = firstHealthyCluster(clusterList);
-                    setClusters(clusterList);
-                    setSelectedCluster(firstCluster);
-                    const resolved = await ensureSession(nextAuth, undefined, firstCluster?.cluster_id);
+                    const firstEnv = firstHealthyEnvironment(envList);
+                    setEnvironments(envList);
+                    setSelectedEnvironment(firstEnv);
+                    const resolved = await ensureSession(nextAuth, undefined, firstEnv?.environment_id);
                     const latestSessions = await listSessions(nextAuth, 20, 0).catch((err) => {
                         addSystemMessage(`Could not load recent sessions: ${err instanceof Error ? err.message : String(err)}`);
                         return [];
@@ -972,7 +1009,6 @@ export function App({ initialSessionId, seedPrompt }) {
                         setSessionTitle(currentSession.title);
                     setStatus("ready");
                     setMessages([]);
-                    addSystemMessage(`Login successful${nextAuth.userName ? `, ${nextAuth.userName}` : ""}. Session ${sessionLabel(resolved)}.`);
                 }
                 catch (error) {
                     setStatus("setup");
@@ -986,12 +1022,12 @@ export function App({ initialSessionId, seedPrompt }) {
             }
             case "/new": {
                 if (!authConfig || !isAuthenticated) {
-                    addSystemMessage("Not authenticated. Run /login first.");
+                    addSystemMessage("Not logged in. /login to connect.");
                     return;
                 }
                 setStatus("creating session");
                 try {
-                    const nextSession = await createSession(authConfig, currentAgent, selectedCluster?.cluster_id, currentSessionModel?.modelId);
+                    const nextSession = await createSession(authConfig, currentAgent, selectedEnvironment?.environment_id, currentSessionModel?.modelId);
                     setSessionId(nextSession);
                     setSessionTitle(null);
                     setMessages([]);
@@ -1006,20 +1042,19 @@ export function App({ initialSessionId, seedPrompt }) {
                         return [next, ...prev.filter((s) => s.id !== nextSession)].slice(0, 2);
                     });
                     setStatus("ready");
-                    addSystemMessage(`Started new conversation ${sessionLabel(nextSession)}.`);
                 }
                 catch (error) {
                     setStatus("ready");
-                    addSystemMessage(`Failed to start session: ${error instanceof Error ? error.message : String(error)}`);
+                    addSystemMessage(`Couldn't start a session: ${error instanceof Error ? error.message : String(error)}`);
                 }
                 return;
             }
-            case "/cluster": {
-                await openClusterPanel();
+            case "/environments": {
+                await openEnvironmentPanel();
                 return;
             }
             case "/models": {
-                addSystemMessage("Opening model selector...");
+                addSystemMessage("Loading models...");
                 await openModelPanel();
                 return;
             }
@@ -1029,11 +1064,11 @@ export function App({ initialSessionId, seedPrompt }) {
             }
             case "/rename": {
                 if (!authConfig || !isAuthenticated) {
-                    addSystemMessage("Not authenticated. Run /login first.");
+                    addSystemMessage("Not logged in. /login to connect.");
                     return;
                 }
                 if (!sessionId) {
-                    addSystemMessage("No active session. Use /new or /resume.");
+                    addSystemMessage("No active session. /new or /resume to start.");
                     return;
                 }
                 const rest = text.slice(rawCommand.length).trim();
@@ -1045,7 +1080,7 @@ export function App({ initialSessionId, seedPrompt }) {
                     await updateSessionState(authConfig, sessionId, { session_title: rest });
                     setSessionTitle(rest);
                     setRecentSessions((prev) => prev.map((s) => (s.id === sessionId ? { ...s, title: rest } : s)));
-                    addSystemMessage(`Session renamed to: ${rest}`);
+                    addSystemMessage(`Renamed: ${rest}`);
                 }
                 catch (error) {
                     addSystemMessage(`Rename failed: ${error instanceof Error ? error.message : String(error)}`);
@@ -1054,7 +1089,7 @@ export function App({ initialSessionId, seedPrompt }) {
             }
             case "/untrust": {
                 if (!authConfig || !isAuthenticated) {
-                    addSystemMessage("Not authenticated. Run /login first.");
+                    addSystemMessage("Not logged in. /login to connect.");
                     return;
                 }
                 await untrustFolder(cwd);
@@ -1063,7 +1098,7 @@ export function App({ initialSessionId, seedPrompt }) {
                 addSystemMessage("Folder untrusted. You'll be prompted to trust again next time.");
                 return;
             }
-            case "/send-shell-output": {
+            case "/send": {
                 const last = lastShellRef.current;
                 const streamFn = streamAssistantRef.current;
                 if (last && authConfig && isAuthenticated && sessionId && streamFn) {
@@ -1134,7 +1169,7 @@ export function App({ initialSessionId, seedPrompt }) {
                 return;
             }
             default:
-                addSystemMessage(`Unknown command: ${command}. Use /help.`);
+                addSystemMessage(`Unknown: ${command} — try /help`);
         }
     }, [
         activeUser,
@@ -1142,15 +1177,15 @@ export function App({ initialSessionId, seedPrompt }) {
         authConfig,
         cwd,
         ensureSession,
-        exit,
+        gracefulExit,
         isAuthenticated,
-        openClusterPanel,
+        openEnvironmentPanel,
         openSessionsPanel,
         openAgentPanel,
         openModelPanel,
         currentAgent,
         currentSessionModel,
-        selectedCluster,
+        selectedEnvironment,
         recordActivity,
         resetComposer,
         sessionId,
@@ -1171,7 +1206,7 @@ export function App({ initialSessionId, seedPrompt }) {
     }, [exit, handleSlashCommand]);
     const streamAssistant = useCallback(async (prompt, assistantId, messageParts) => {
         if (!authConfig || !isAuthenticated) {
-            failAssistantMessage(assistantId, "Not authenticated. Run /login first.");
+            failAssistantMessage(assistantId, "Not logged in. /login to connect.");
             return;
         }
         let resolvedSession = sessionId;
@@ -1179,11 +1214,6 @@ export function App({ initialSessionId, seedPrompt }) {
             try {
                 resolvedSession = await ensureSession(authConfig);
                 setSessionId(resolvedSession);
-                // If we created a brand‑new session (not the most recent empty one), inform the user.
-                const prevRecent = recentSessions[0];
-                if (!prevRecent || prevRecent.id !== resolvedSession) {
-                    addSystemMessage(`New session ${sessionLabel(resolvedSession)} started.`);
-                }
             }
             catch (error) {
                 failAssistantMessage(assistantId, `Failed to initialize session: ${error instanceof Error ? error.message : String(error)}`);
@@ -1271,11 +1301,6 @@ export function App({ initialSessionId, seedPrompt }) {
                     }));
                 },
                 onSessionMetadata: (metadata) => {
-                    if (metadata.title || metadata.description || metadata.category) {
-                        const meta = [metadata.title, metadata.description, metadata.category].filter(Boolean).join(" · ");
-                        if (meta)
-                            addSystemMessage(`Session updated: ${meta}`);
-                    }
                     if (metadata.title && sessionId) {
                         setSessionTitle(metadata.title);
                         setRecentSessions((prev) => {
@@ -1306,15 +1331,15 @@ export function App({ initialSessionId, seedPrompt }) {
             if (!(result.text ?? "").trim()) {
                 const fallback = sawWorkflowEvent
                     ? "The agent processed your request but didn't produce a final response. Check the workflow above."
-                    : "No response text was returned. Please try again.";
+                    : "Backend went quiet. Try again?";
                 updateAssistantMessage(assistantId, (message) => ({
                     ...message,
                     content: message.content.trim().length > 0 ? message.content : fallback,
                     isAccumulating: false,
                 }));
                 if (!sawWorkflowEvent) {
-                    setLastError("No response text was returned by the backend.");
-                    addSystemMessage("No response text was returned by the backend.");
+                    setLastError("Backend went quiet. Try again?");
+                    addSystemMessage("Backend went quiet. Try again?");
                 }
             }
         }
@@ -1325,7 +1350,7 @@ export function App({ initialSessionId, seedPrompt }) {
                     ...message,
                     isAccumulating: false,
                 }));
-                setLastError("Conversation paused.");
+                setLastError("Paused.");
             }
             else {
                 const reason = didTimeOut
@@ -1387,7 +1412,7 @@ export function App({ initialSessionId, seedPrompt }) {
             return;
         }
         if (!isAuthenticated) {
-            addSystemMessage("Setup required. Type /login.");
+            addSystemMessage("Not logged in. /login to get started.");
             return;
         }
         if (trimmed.startsWith("@")) {
@@ -1480,7 +1505,7 @@ export function App({ initialSessionId, seedPrompt }) {
                 const errOut = (stderr ?? "").trim();
                 const output = err ? errOut || out || err.message : out || "(no output)";
                 lastShellRef.current = { cmd, output };
-                const hint = "· /send-shell-output to send to Rubix";
+                const hint = "· /send to send to Rubix";
                 addSystemMessage(`$ ${cmd}\n${output}\n\n${hint}`);
             });
             return;
@@ -1576,6 +1601,9 @@ export function App({ initialSessionId, seedPrompt }) {
         if (!key.escape) {
             setEscClearArmed(false);
         }
+        if (!(key.ctrl && input === "c")) {
+            setCtrlCArmed(false);
+        }
         // Arrow navigation for slash panel
         if (showSlashPanel && visibleSlashCandidates.length > 0) {
             if (key.downArrow) {
@@ -1628,7 +1656,7 @@ export function App({ initialSessionId, seedPrompt }) {
         }
         // Arrow navigation for sessions panel
         const isShowingSlashPanel = slashModeActive && !slashPanelDismissed;
-        if (showSessionsPanel && !isShowingSlashPanel && !showClusterPanel && !showModelPanel) {
+        if (showSessionsPanel && !isShowingSlashPanel && !showEnvironmentPanel && !showModelPanel) {
             const query = sessionsSearchQuery.toLowerCase();
             const filtered = sessionItems.filter((item) => {
                 const title = (item.title ?? "").toLowerCase();
@@ -1662,7 +1690,7 @@ export function App({ initialSessionId, seedPrompt }) {
             return;
         }
         // Up/Down: prompt history when composer empty, no interactive panels
-        const hasInteractivePanelOpen = showHelp || (slashModeActive && !slashPanelDismissed) || showAtFilePanel || showSessionsPanel || showClusterPanel || showModelPanel;
+        const hasInteractivePanelOpen = showHelp || (slashModeActive && !slashPanelDismissed) || showAtFilePanel || showSessionsPanel || showEnvironmentPanel || showModelPanel;
         if (!hasInteractivePanelOpen &&
             composer.trim().length === 0 &&
             messageQueue.length === 0 &&
@@ -1686,17 +1714,17 @@ export function App({ initialSessionId, seedPrompt }) {
                 return;
             }
         }
-        // Pending cluster switch: only Enter to confirm or Esc to cancel
-        if (pendingClusterSwitch) {
+        // Pending environment switch: only Enter to confirm or Esc to cancel
+        if (pendingEnvironmentSwitch) {
             if (key.return) {
-                confirmClusterSwitch().catch((error) => {
-                    addSystemMessage(`Cluster switch failed: ${error instanceof Error ? error.message : String(error)}`);
+                confirmEnvironmentSwitch().catch((error) => {
+                    addSystemMessage(`Environment switch failed: ${error instanceof Error ? error.message : String(error)}`);
                 });
                 return;
             }
             if (key.escape) {
-                setPendingClusterSwitch(null);
-                addSystemMessage("Cluster switch cancelled.");
+                setPendingEnvironmentSwitch(null);
+                addSystemMessage("Environment switch cancelled.");
                 return;
             }
             return;
@@ -1712,7 +1740,7 @@ export function App({ initialSessionId, seedPrompt }) {
                 return;
             }
             if (input === "q") {
-                exit();
+                gracefulExit();
                 return;
             }
         }
@@ -1720,10 +1748,16 @@ export function App({ initialSessionId, seedPrompt }) {
             if (isStreaming) {
                 streamController.current?.abort();
                 streamController.current = null;
-                addSystemMessage("Stream cancelled. Press Ctrl+C again to exit.");
+                setCtrlCArmed(true);
+                addSystemMessage("Interrupted. Ask something else, or Ctrl+C to leave.");
                 return;
             }
-            exit();
+            if (ctrlCArmed) {
+                gracefulExit();
+                return;
+            }
+            setCtrlCArmed(true);
+            addSystemMessage("Press Ctrl+C again to exit.");
             return;
         }
         if (key.ctrl && input === "l") {
@@ -1733,7 +1767,7 @@ export function App({ initialSessionId, seedPrompt }) {
             return;
         }
         if (key.ctrl && input === "d" && composer.trim().length === 0) {
-            exit();
+            gracefulExit();
             return;
         }
         if (key.ctrl && input === "o") {
@@ -1760,7 +1794,7 @@ export function App({ initialSessionId, seedPrompt }) {
                 return;
             }
             const hasOverlayOpen = showHelp || (slashModeActive && !slashPanelDismissed) || showAtFilePanel;
-            const hasInteractivePanelOpen = hasOverlayOpen || showSessionsPanel || showClusterPanel || showModelPanel;
+            const hasInteractivePanelOpen = hasOverlayOpen || showSessionsPanel || showEnvironmentPanel || showModelPanel;
             if (hasInteractivePanelOpen) {
                 setShowHelp(false);
                 setSlashPanelDismissed(true);
@@ -1768,7 +1802,7 @@ export function App({ initialSessionId, seedPrompt }) {
                 setShowSessionsPanel(false);
                 setSessionsSearchQuery("");
                 setSessionsSelectedIndex(0);
-                setShowClusterPanel(false);
+                setShowEnvironmentPanel(false);
                 setEscClearArmed(true);
                 return;
             }
@@ -1808,15 +1842,16 @@ export function App({ initialSessionId, seedPrompt }) {
         atFileFiltered,
         cwd,
         composer,
-        confirmClusterSwitch,
+        confirmEnvironmentSwitch,
+        ctrlCArmed,
         escClearArmed,
-        exit,
+        gracefulExit,
         historyIndex,
         isStreaming,
         leaderMode,
         messageQueue,
         messages,
-        pendingClusterSwitch,
+        pendingEnvironmentSwitch,
         promptHistory,
         resetComposer,
         selectedAtFile,
@@ -1831,17 +1866,17 @@ export function App({ initialSessionId, seedPrompt }) {
         setHistoryIndex,
         setLeaderMode,
         setMessages,
-        setPendingClusterSwitch,
+        setPendingEnvironmentSwitch,
         setShowHelp,
         setSlashPanelDismissed,
         setSlashSelectedIndex,
         setSessionsSelectedIndex,
-        setShowClusterPanel,
+        setShowEnvironmentPanel,
         setShowSessionsPanel,
         setWorkflowExpandedIds,
         showAtFilePanel,
         showHelp,
-        showClusterPanel,
+        showEnvironmentPanel,
         showSessionsPanel,
         shellMode,
         slashModeActive,
@@ -1856,10 +1891,10 @@ export function App({ initialSessionId, seedPrompt }) {
         return !showDashboard || messages.length > 0;
     }, [messages.length, showDashboard, showSetupSplash]);
     const showSlashPanel = slashModeActive && !slashPanelDismissed;
-    const showClusterInteractivePanel = showClusterPanel && !showSlashPanel;
-    const showSessionsInteractivePanel = showSessionsPanel && !showSlashPanel && !showClusterInteractivePanel;
-    const showModelInteractivePanel = showModelPanel && !showSlashPanel && !showSessionsInteractivePanel && !showClusterInteractivePanel;
-    const showShortcutPanel = showHelp && !showSlashPanel && !showSessionsInteractivePanel && !showClusterInteractivePanel && !showModelInteractivePanel;
+    const showEnvironmentInteractivePanel = showEnvironmentPanel && !showSlashPanel;
+    const showSessionsInteractivePanel = showSessionsPanel && !showSlashPanel && !showEnvironmentInteractivePanel;
+    const showModelInteractivePanel = showModelPanel && !showSlashPanel && !showSessionsInteractivePanel && !showEnvironmentInteractivePanel;
+    const showShortcutPanel = showHelp && !showSlashPanel && !showSessionsInteractivePanel && !showEnvironmentInteractivePanel && !showModelInteractivePanel;
     const latestAssistantMessage = useMemo(() => {
         for (let index = messages.length - 1; index >= 0; index -= 1) {
             const message = messages[index];
@@ -1944,10 +1979,10 @@ export function App({ initialSessionId, seedPrompt }) {
         };
     }, [idleActivityTick, isCommandRunning, isStreaming, lastError, latestAssistantMessage, status]);
     const composerSuggestions = useMemo(() => (slashModeActive ? visibleSlashCandidates.map((item) => item.name) : []), [slashModeActive, visibleSlashCandidates]);
-    const clusterSelectOptions = useMemo(() => clusters.map((c) => ({
-        label: `${c.name}  ${c.status}${c.region ? ` · ${c.region}` : ""}${c.cluster_id !== c.name ? ` · ${c.cluster_id}` : ""}`,
-        value: c.cluster_id,
-    })), [clusters]);
+    const environmentSelectOptions = useMemo(() => environments.map((c) => ({
+        label: `${c.name}  ${c.status}${c.region ? ` · ${c.region}` : ""}${c.environment_id !== c.name ? ` · ${c.environment_id}` : ""}`,
+        value: c.environment_id,
+    })), [environments]);
     const modelSelectOptions = useMemo(() => availableModels.map((m) => ({
         label: `${m.default ? "●" : " "} ${m.display_name}  ${m.thinking_supported ? "·thinking" : ""}${m.experimental ? " ·experimental" : ""}`,
         value: m.id,
@@ -1975,6 +2010,17 @@ export function App({ initialSessionId, seedPrompt }) {
             setSessionsSelectedIndex(0);
         }
     }, [sessionSelectOptions.length, sessionsSelectedIndex]);
+    const dynamicPlaceholder = useMemo(() => {
+        if (isStreaming)
+            return "Type to queue (Enter to add)";
+        if (!isAuthenticated)
+            return "/login to get started";
+        if (messages.length === 0)
+            return "What's on your mind?";
+        if (lastError && lastError !== "Paused.")
+            return "Let's try that again.";
+        return "Ask anything, / for commands, @ for files, ! for shell";
+    }, [isStreaming, isAuthenticated, messages.length, lastError]);
     const composerStatusBusy = false;
     const composerRightStatus = liveActivity
         ? ""
@@ -1989,7 +2035,7 @@ export function App({ initialSessionId, seedPrompt }) {
                         : currentSessionModel
                             ? `model: ${currentSessionModel.displayName}`
                             : "";
-    return (_jsxs(Box, { flexDirection: "column", children: [showSetupSplash ? (_jsx(SplashScreen, { agentName: agentName, cwd: cwd, whatsNew: whatsNew, onActionSelect: handleSplashAction, selectDisabled: splashSelectionMade })) : null, showTrustDisclaimer ? (_jsx(TrustDisclaimer, { folderPath: cwd, onActionSelect: handleTrustDisclaimer })) : null, showDashboard && !showTrustDisclaimer ? (_jsxs(_Fragment, { children: [_jsx(DashboardPanel, { user: activeUser, agentName: agentName, cwd: cwd, recentSessions: recentSessions, selectedCluster: selectedCluster }), updateVersion && (_jsx(Box, { marginTop: 1, paddingX: 3, children: _jsxs(Box, { paddingX: 1, borderStyle: "round", borderColor: "yellow", children: [_jsx(Text, { color: "yellow", bold: true, children: "Update Available!" }), _jsxs(Text, { children: [" v", updateVersion, " (current: v", VERSION, ")"] }), _jsx(Text, { dimColor: true, children: " \u00B7 run " }), _jsx(Text, { color: "cyan", children: "npm i -g @rubixkube/rubix" })] }) }))] })) : null, showTranscript ? (_jsx(Box, { marginTop: 1, children: _jsx(ChatTranscript, { messages: messages, workflowViewMode: workflowViewMode }) })) : null, !showTrustDisclaimer ? (_jsx(Box, { marginTop: 1, paddingX: 1, gap: 1, minHeight: 1, children: liveActivity ? (_jsxs(_Fragment, { children: [liveActivity.spinning ? _jsx(Spinner, {}) : _jsx(Text, { color: liveActivity.color ?? "red", children: "!" }), _jsx(Text, { color: liveActivity.color ?? RUBIX_THEME.colors.assistantText, children: liveActivity.text }), liveActivity.detail ? _jsxs(Text, { dimColor: true, children: [" ", liveActivity.detail] }) : null] })) : (_jsx(Text, { dimColor: true, children: " " })) })) : null, lastError ? (_jsx(Box, { marginTop: 1, paddingX: 1, children: _jsx(StatusMessage, { variant: lastError === "Conversation paused." ? "info" : "error", children: lastError }) })) : null, !showSetupSplash && !showTrustDisclaimer ? (_jsx(Box, { marginTop: 1, children: _jsx(Composer, { value: composer, resetToken: composerResetToken, disabled: isCommandRunning || isAuthLoading || !!pendingClusterSwitch || showTrustDisclaimer, placeholder: isStreaming ? "Type to queue (Enter to add)" : "What would you like to do today?", shellMode: shellMode, captureArrowKeys: showAtFilePanel, onChange: handleComposerChange, onSubmit: submitComposer, suggestions: composerSuggestions, busy: composerStatusBusy, rightStatus: composerRightStatus, suggestion: slashModeActive
+    return (_jsxs(Box, { flexDirection: "column", children: [showSetupSplash ? (_jsx(SplashScreen, { agentName: agentName, cwd: cwd, whatsNew: whatsNew, onActionSelect: handleSplashAction, selectDisabled: splashSelectionMade })) : null, showTrustDisclaimer ? (_jsx(TrustDisclaimer, { folderPath: cwd, onActionSelect: handleTrustDisclaimer })) : null, showDashboard && !showTrustDisclaimer ? (_jsxs(_Fragment, { children: [_jsx(DashboardPanel, { user: activeUser, agentName: agentName, cwd: cwd, recentSessions: recentSessions, selectedEnvironment: selectedEnvironment, stats: systemStats }), updateVersion && (_jsx(Box, { marginTop: 1, paddingX: 3, children: _jsxs(Box, { paddingX: 1, borderStyle: "round", borderColor: "yellow", children: [_jsx(Text, { color: "yellow", bold: true, children: "Update Available!" }), _jsxs(Text, { children: [" v", updateVersion, " (current: v", VERSION, ")"] }), _jsx(Text, { dimColor: true, children: " \u00B7 run " }), _jsx(Text, { color: "cyan", children: "npm i -g @rubixkube/rubix" })] }) }))] })) : null, showTranscript ? (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [sessionId ? (_jsx(Box, { paddingX: 1, marginBottom: 1, children: _jsxs(Text, { dimColor: true, children: ["Session ", compactSessionId(sessionId), sessionTitle ? ` — ${sessionTitle}` : "", " · ", messages.filter((m) => m.role === "user" || m.role === "assistant").length, " messages"] }) })) : null, _jsx(ChatTranscript, { messages: messages, workflowViewMode: workflowViewMode })] })) : null, !showTrustDisclaimer ? (_jsx(Box, { marginTop: 1, paddingX: 1, gap: 1, minHeight: 1, children: liveActivity ? (_jsxs(_Fragment, { children: [liveActivity.spinning ? _jsx(Spinner, {}) : _jsx(Text, { color: liveActivity.color ?? "red", children: "!" }), _jsx(Text, { color: liveActivity.color ?? RUBIX_THEME.colors.assistantText, children: liveActivity.text }), liveActivity.detail ? _jsxs(Text, { dimColor: true, children: [" ", liveActivity.detail] }) : null] })) : (_jsx(Text, { dimColor: true, children: " " })) })) : null, lastError ? (_jsx(Box, { marginTop: 1, paddingX: 1, children: _jsx(StatusMessage, { variant: lastError === "Paused." ? "info" : "error", children: lastError }) })) : null, !showSetupSplash && !showTrustDisclaimer ? (_jsx(Box, { marginTop: 1, children: _jsx(Composer, { value: composer, resetToken: composerResetToken, disabled: isCommandRunning || isAuthLoading || !!pendingEnvironmentSwitch || showTrustDisclaimer, placeholder: dynamicPlaceholder, shellMode: shellMode, captureArrowKeys: showAtFilePanel, onChange: handleComposerChange, onSubmit: submitComposer, suggestions: composerSuggestions, busy: composerStatusBusy, rightStatus: composerRightStatus, suggestion: slashModeActive
                         ? selectedSlashCandidate
                             ? `${selectedSlashCandidate.name}  ${selectedSlashCandidate.description}`
                             : "No matching command"
@@ -2017,16 +2063,16 @@ export function App({ initialSessionId, seedPrompt }) {
                                 const subtitle = `${formatTimeAgo(sessionItem?.updatedAt ?? new Date().toISOString())}${sessionItem?.clusterId ? ` · ${sessionItem.clusterId}` : ""}`;
                                 return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: [_jsx(Text, { color: isSelected ? RUBIX_THEME.colors.brand : undefined, children: isSelected ? "› " : "  " }), _jsx(Text, { bold: isSelected, color: isSelected ? RUBIX_THEME.colors.brand : undefined, children: title })] }), _jsxs(Text, { dimColor: true, children: ["    ", subtitle] })] }, option.value));
                             });
-                        })() })), _jsxs(Text, { dimColor: true, children: [sessionSelectOptions.length, " session", sessionSelectOptions.length === 1 ? "" : "s", " shown", sessionsHasMore ? " (more available)" : ""] }), _jsx(Text, { dimColor: true, children: "Type to search \u2022 \u2191\u2193 navigate \u2022 Enter switch \u2022 Esc close" })] })) : null, pendingClusterSwitch ? (_jsxs(Box, { borderStyle: "single", borderColor: "yellow", paddingX: 1, flexDirection: "column", children: [_jsxs(Text, { color: "yellow", children: ["Switch to cluster: ", pendingClusterSwitch.name] }), _jsx(Text, { dimColor: true, children: "This will start a new session with cluster context." }), _jsx(Text, { dimColor: true, children: "Press Enter to confirm \u00B7 Esc to cancel" })] })) : null, showClusterInteractivePanel ? (_jsxs(Box, { borderStyle: "single", borderColor: RUBIX_THEME.colors.brand, paddingX: 1, flexDirection: "column", children: [_jsxs(Text, { color: RUBIX_THEME.colors.brand, children: ["Clusters", selectedCluster ? ` · active: ${selectedCluster.name}` : ""] }), clusterPanelLoading ? (_jsx(Spinner, { label: "loading clusters..." })) : clusterPanelError ? (_jsxs(Text, { color: "red", children: ["Failed to load clusters: ", clusterPanelError] })) : clusters.length === 0 ? (_jsx(Text, { dimColor: true, children: "No clusters found. Register a cluster via the console." })) : (_jsx(Select, { options: clusterSelectOptions, visibleOptionCount: 7, onChange: (value) => {
-                            const cluster = clusters.find((c) => c.cluster_id === value);
-                            if (!cluster)
+                        })() })), _jsxs(Text, { dimColor: true, children: [sessionSelectOptions.length, " session", sessionSelectOptions.length === 1 ? "" : "s", " shown", sessionsHasMore ? " (more available)" : ""] }), _jsx(Text, { dimColor: true, children: "Type to search \u2022 \u2191\u2193 navigate \u2022 Enter switch \u2022 Esc close" })] })) : null, pendingEnvironmentSwitch ? (_jsxs(Box, { borderStyle: "single", borderColor: "yellow", paddingX: 1, flexDirection: "column", children: [_jsxs(Text, { color: "yellow", children: ["Switch to environment: ", pendingEnvironmentSwitch.name] }), _jsx(Text, { dimColor: true, children: "This will start a new session with this environment." }), _jsx(Text, { dimColor: true, children: "Press Enter to confirm \u00B7 Esc to cancel" })] })) : null, showEnvironmentInteractivePanel ? (_jsxs(Box, { borderStyle: "single", borderColor: RUBIX_THEME.colors.brand, paddingX: 1, flexDirection: "column", children: [_jsxs(Text, { color: RUBIX_THEME.colors.brand, children: ["Environments", selectedEnvironment ? ` · active: ${selectedEnvironment.name}` : ""] }), environmentPanelLoading ? (_jsx(Spinner, { label: "loading environments..." })) : environmentPanelError ? (_jsxs(Text, { color: "red", children: ["Failed to load environments: ", environmentPanelError] })) : environments.length === 0 ? (_jsx(Text, { dimColor: true, children: "No environments found. Register one via the console." })) : (_jsx(Select, { options: environmentSelectOptions, visibleOptionCount: 7, onChange: (value) => {
+                            const env = environments.find((c) => c.environment_id === value);
+                            if (!env)
                                 return;
-                            setShowClusterPanel(false);
-                            setPendingClusterSwitch(cluster);
-                        } })), _jsxs(Text, { dimColor: true, children: [clusters.length, " cluster", clusters.length === 1 ? "" : "s", " \u00B7 \u2191\u2193 navigate \u00B7 Enter select \u00B7 Esc close"] })] })) : null, showModelInteractivePanel ? (_jsxs(Box, { borderStyle: "single", borderColor: RUBIX_THEME.colors.brand, paddingX: 1, flexDirection: "column", children: [_jsxs(Text, { color: RUBIX_THEME.colors.brand, children: ["Models", currentSessionModel ? ` · active: ${currentSessionModel.displayName}` : ""] }), modelPanelLoading ? (_jsx(Spinner, { label: "loading models..." })) : modelPanelError ? (_jsxs(Text, { color: "red", children: ["Failed to load models: ", modelPanelError] })) : availableModels.length === 0 ? (_jsx(Text, { dimColor: true, children: "No models available." })) : (_jsx(Select, { options: modelSelectOptions, visibleOptionCount: 7, onChange: (value) => {
+                            setShowEnvironmentPanel(false);
+                            setPendingEnvironmentSwitch(env);
+                        } })), _jsxs(Text, { dimColor: true, children: [environments.length, " environment", environments.length === 1 ? "" : "s", " \u00B7 \u2191\u2193 navigate \u00B7 Enter select \u00B7 Esc close"] })] })) : null, showModelInteractivePanel ? (_jsxs(Box, { borderStyle: "single", borderColor: RUBIX_THEME.colors.brand, paddingX: 1, flexDirection: "column", children: [_jsxs(Text, { color: RUBIX_THEME.colors.brand, children: ["Models", currentSessionModel ? ` · active: ${currentSessionModel.displayName}` : ""] }), modelPanelLoading ? (_jsx(Spinner, { label: "loading models..." })) : modelPanelError ? (_jsxs(Text, { color: "red", children: ["Failed to load models: ", modelPanelError] })) : availableModels.length === 0 ? (_jsx(Text, { dimColor: true, children: "No models available." })) : (_jsx(Select, { options: modelSelectOptions, visibleOptionCount: 7, onChange: (value) => {
                             setShowModelPanel(false);
                             handleModelChange(value);
                         } })), _jsxs(Text, { dimColor: true, children: [availableModels.length, " model", availableModels.length === 1 ? "" : "s", " \u00B7 \u2191\u2193 navigate \u00B7 Enter select \u00B7 Esc close"] })] })) : null, showAgentPanel ? (_jsxs(Box, { borderStyle: "single", borderColor: RUBIX_THEME.colors.brand, paddingX: 1, flexDirection: "column", children: [_jsxs(Text, { color: RUBIX_THEME.colors.brand, children: ["Agents", " · active: " + currentAgent] }), agentPanelLoading ? (_jsx(Spinner, { label: "loading agents..." })) : agentPanelError ? (_jsxs(Text, { color: "red", children: ["Failed to load agents: ", agentPanelError] })) : availableAgents.length === 0 ? (_jsx(Text, { dimColor: true, children: "No agents available." })) : (_jsx(Select, { options: availableAgents.map((a) => ({ label: a, value: a })), visibleOptionCount: 7, onChange: (value) => {
                             void handleAgentChange(value);
-                        } })), _jsxs(Text, { dimColor: true, children: [availableAgents.length, " agent", availableAgents.length === 1 ? "" : "s", " \u00B7 \u2191\u2193 navigate \u00B7 Enter select \u00B7 Esc close"] })] })) : null, showShortcutPanel ? (_jsxs(Box, { borderStyle: "single", borderColor: RUBIX_THEME.colors.brand, paddingX: 1, flexDirection: "column", children: [_jsx(Text, { color: RUBIX_THEME.colors.brand, children: "Shortcuts" }), SHORTCUT_ROWS.map((row) => (_jsxs(Text, { dimColor: true, children: [row.key.padEnd(24), " ", row.action] }, row.key))), _jsx(Text, { dimColor: true, children: "/login /logout /status /resume /new /cluster /models /paste /send-shell-output /clear /rename /console /docs /help /exit /quit" })] })) : null] }));
+                        } })), _jsxs(Text, { dimColor: true, children: [availableAgents.length, " agent", availableAgents.length === 1 ? "" : "s", " \u00B7 \u2191\u2193 navigate \u00B7 Enter select \u00B7 Esc close"] })] })) : null, showShortcutPanel ? (_jsxs(Box, { borderStyle: "single", borderColor: RUBIX_THEME.colors.brand, paddingX: 1, flexDirection: "column", children: [_jsx(Text, { color: RUBIX_THEME.colors.brand, children: "Shortcuts" }), SHORTCUT_ROWS.map((row) => (_jsxs(Text, { dimColor: true, children: [row.key.padEnd(24), " ", row.action] }, row.key))), _jsx(Text, { dimColor: true, children: "/login /logout /status /resume /new /environments /models /paste /send /clear /rename /console /docs /help /exit /quit" })] })) : null] }));
 }