replicas-cli 0.2.171 → 0.2.173

package/dist/index.mjs

@@ -7842,9 +7842,9 @@ import chalk5 from "chalk";
 // src/lib/ssh.ts
 import { spawn } from "child_process";
 var SSH_OPTIONS = ["-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null"];
-async function connectSSH(token, host) {
+async function connectSSH(token, host, proxyCommand) {
   return new Promise((resolve, reject) => {
-    const sshArgs = [...SSH_OPTIONS, `${token}@${host}`];
+    const sshArgs = proxyCommand ? [...SSH_OPTIONS, "-o", `ProxyCommand=${proxyCommand}`, `${token}@${host}`] : [...SSH_OPTIONS, `${token}@${host}`];
     const ssh = spawn("ssh", sshArgs, {
       stdio: "inherit"
     });
@@ -7949,6 +7949,7 @@ Found ${response.workspaces.length} workspaces matching "${workspaceName}":`));
     workspace: selectedWorkspace,
     sshToken: tokenResponse.token,
     sshHost: tokenResponse.host,
+    sshProxyCommand: tokenResponse.proxyCommand,
     repoName
   };
 }
@@ -7960,13 +7961,13 @@ async function connectCommand(workspaceName) {
     process.exit(1);
   }
   try {
-    const { workspace, sshToken, sshHost } = await prepareWorkspaceConnection(workspaceName);
+    const { workspace, sshToken, sshHost, sshProxyCommand } = await prepareWorkspaceConnection(workspaceName);
     console.log(chalk5.blue(`
 Connecting to ${workspace.name}...`));
     const sshCommand = `ssh ${sshToken}@${sshHost}`;
     console.log(chalk5.gray(`SSH command: ${sshCommand}`));
     console.log(chalk5.gray("\nPress Ctrl+D to disconnect.\n"));
-    await connectSSH(sshToken, sshHost);
+    await connectSSH(sshToken, sshHost, sshProxyCommand);
     console.log(chalk5.green("\n\u2713 Disconnected from workspace.\n"));
   } catch (error) {
     console.error(chalk5.red(`
@@ -8065,8 +8066,7 @@ var SANDBOX_PATHS = {
   REPLICAS_DIR: "/home/ubuntu/.replicas",
   REPLICAS_FILES_DIR: "/home/ubuntu/.replicas/files",
   REPLICAS_FILES_DISPLAY_DIR: "~/.replicas/files",
-  REPLICAS_RUNTIME_ENV_FILE: "/home/ubuntu/.replicas/runtime-env.sh",
-  REPLICAS_PREVIEW_PORTS_FILE: "/home/ubuntu/.replicas/preview-ports.json"
+  REPLICAS_RUNTIME_ENV_FILE: "/home/ubuntu/.replicas/runtime-env.sh"
 };
 
 // ../shared/src/urls.ts
@@ -8174,6 +8174,7 @@ function workspaceConfigWithPrFollowups(config2, prFollowups = config2?.capabili
 }
 var WORKSPACE_FILE_UPLOAD_MAX_SIZE_BYTES = 20 * 1024 * 1024;
 var WORKSPACE_FILE_CONTENT_MAX_SIZE_BYTES = 1 * 1024 * 1024;
+var WORKSPACE_SIDEBAR_VIEWS = ["owned", "shared", "team", "automation", "integrations", "api"];
 
 // ../shared/src/audit-log.ts
 var AUDIT_LOG_ACTION = {
@@ -9211,74 +9212,8 @@ var SOURCE_CONFIG = {
   merged: { label: "Merged", color: "#a78bfa" }
 };
 
-// ../shared/src/placeholder-names.ts
-var FRUITS = [
-  "apple",
-  "banana",
-  "cherry",
-  "fig",
-  "grape",
-  "kiwi",
-  "lemon",
-  "lime",
-  "mango",
-  "melon",
-  "olive",
-  "orange",
-  "peach",
-  "pear",
-  "plum",
-  "guava",
-  "papaya",
-  "lychee",
-  "coconut",
-  "apricot",
-  "avocado",
-  "berry",
-  "kumquat",
-  "nectarine",
-  "tangerine",
-  "dragonfruit"
-];
-var TTC_STATIONS = [
-  "kipling",
-  "islington",
-  "royal-york",
-  "old-mill",
-  "jane",
-  "runnymede",
-  "high-park",
-  "keele",
-  "dundas-west",
-  "lansdowne",
-  "dufferin",
-  "ossington",
-  "christie",
-  "bathurst",
-  "spadina",
-  "st-george",
-  "bay",
-  "bloor-yonge",
-  "sherbourne",
-  "castle-frank",
-  "broadview",
-  "chester",
-  "pape",
-  "donlands",
-  "greenwood",
-  "woodbine",
-  "warden",
-  "kennedy"
-];
-function randomElement(arr) {
-  return arr[Math.floor(Math.random() * arr.length)];
-}
-function generatePlaceholderName() {
-  return `${randomElement(FRUITS)}-${randomElement(TTC_STATIONS)}`;
-}
-
 // ../shared/src/workspace-groups.ts
-function buildGroups(workspaces, _workspacesData, environments, _repositorySets, mockGroupAssignments) {
+function buildGroups(workspaces, _workspacesData, environments, _repositorySets) {
   const groupMap = /* @__PURE__ */ new Map();
   for (const env of environments) {
     groupMap.set(env.id, {
@@ -9311,41 +9246,10 @@ function buildGroups(workspaces, _workspacesData, environments, _repositorySets,
       groupMap.get(workspace.environment_id).workspaces.push(workspace);
       continue;
     }
-    const assignedGroup = mockGroupAssignments.get(workspace.id);
-    if (assignedGroup && groupMap.has(assignedGroup)) {
-      groupMap.get(assignedGroup).workspaces.push(workspace);
-      continue;
-    }
     placeUngrouped(workspace);
   }
   return Array.from(groupMap.values()).sort((a, b) => a.name.localeCompare(b.name));
 }
-function createMockWorkspaceRecord(organizationId, name, environmentId) {
-  const id = "mock-" + Array.from(
-    { length: 4 },
-    () => Math.random().toString(36).slice(2, 6)
-  ).join("-");
-  return {
-    id,
-    user_id: null,
-    organization_id: organizationId,
-    name: name || generatePlaceholderName(),
-    sandbox_id: "",
-    engine_url: null,
-    engine_secret: "",
-    github_installation_id: null,
-    last_activity_at: null,
-    created_at: (/* @__PURE__ */ new Date()).toISOString(),
-    status: "preparing",
-    creation_source: "dashboard",
-    creator_email: null,
-    soft_delete: false,
-    lifecycle_policy: "default",
-    auto_stop_minutes: null,
-    config: {},
-    environment_id: environmentId ?? null
-  };
-}
 
 // ../shared/src/object-store/types.ts
 var MEDIA_KIND = {
@@ -9395,15 +9299,25 @@ function writeSSHConfig(content) {
   ensureSSHDir();
   fs2.writeFileSync(SSH_CONFIG_PATH, content, { mode: 384 });
 }
+function sanitizeSSHConfigValue(value) {
+  return value.replace(/[\r\n]+/g, " ").trim();
+}
 function generateConfigBlock(entry) {
+  const host = sanitizeSSHConfigValue(entry.host);
+  const hostname = sanitizeSSHConfigValue(entry.hostname);
+  const user = sanitizeSSHConfigValue(entry.user);
+  const proxyCommand = entry.proxyCommand ? sanitizeSSHConfigValue(entry.proxyCommand) : void 0;
   const lines = [
     REPLICAS_MARKER_START,
-    `Host ${entry.host}`,
-    `  HostName ${entry.hostname}`,
-    `  User ${entry.user}`,
+    `Host ${host}`,
+    `  HostName ${hostname}`,
+    `  User ${user}`,
     `  StrictHostKeyChecking no`,
     `  UserKnownHostsFile /dev/null`
   ];
+  if (proxyCommand) {
+    lines.push(`  ProxyCommand ${proxyCommand}`);
+  }
   lines.push(REPLICAS_MARKER_END);
   return lines.join("\n");
 }
@@ -9456,13 +9370,14 @@ async function codeCommand(workspaceName) {
     process.exit(1);
   }
   try {
-    const { workspace, sshToken, sshHost, repoName } = await prepareWorkspaceConnection(workspaceName);
+    const { workspace, sshToken, sshHost, sshProxyCommand, repoName } = await prepareWorkspaceConnection(workspaceName);
     const hostAlias = getWorkspaceHostAlias(workspace.name);
     console.log(chalk6.blue("\nConfiguring SSH connection..."));
     addOrUpdateSSHConfigEntry({
       host: hostAlias,
       hostname: sshHost,
-      user: sshToken
+      user: sshToken,
+      proxyCommand: sshProxyCommand
     });
     console.log(chalk6.green(`\u2713 SSH config entry created: ${hostAlias}`));
     const remotePath = repoName ? `${SANDBOX_PATHS.WORKSPACES_DIR}/${repoName}` : SANDBOX_PATHS.HOME_DIR;
@@ -11427,7 +11342,7 @@ import { createCliRenderer } from "@opentui/core";
 import { createRoot } from "@opentui/react";
 
 // src/interactive/App.tsx
-import { useState as useState8, useEffect as useEffect3, useMemo as useMemo6, useCallback as useCallback7, useRef as useRef5 } from "react";
+import { useState as useState8, useEffect as useEffect3, useMemo as useMemo6, useCallback as useCallback8, useRef as useRef5 } from "react";
 import { useKeyboard as useKeyboard5, useRenderer, useTerminalDimensions as useTerminalDimensions3 } from "@opentui/react";
 import { QueryClient } from "@tanstack/react-query";
 
@@ -11515,14 +11430,16 @@ function useRawOrgFetch() {
 }
 
 // ../shared/src/hooks/useWorkspaces.ts
+import { useCallback as useCallback2 } from "react";
 import { useQuery, useMutation } from "@tanstack/react-query";
-function useWorkspaces(page = 1, limit = 100, scope = "organization") {
+function useWorkspaces(viewModes, page = 1, limit = 100) {
   const auth = useReplicasAuth();
   const orgFetch = useOrgFetch();
   const orgId = auth.getOrganizationId();
+  const sortedKey = [...viewModes].sort().join(",");
   return useQuery({
-    queryKey: ["workspaces", orgId, scope, page, limit],
-    queryFn: () => orgFetch(`/v1/workspaces?scope=${scope}&page=${page}&limit=${limit}`),
+    queryKey: ["workspaces", orgId, sortedKey, page, limit],
+    queryFn: () => orgFetch(`/v1/workspaces?viewModes=${sortedKey}&page=${page}&limit=${limit}`),
     enabled: !!orgId,
     staleTime: 1e4
   }, auth.queryClient);
@@ -11531,16 +11448,55 @@ function useCreateWorkspace() {
   const auth = useReplicasAuth();
   const orgFetch = useOrgFetch();
   const orgId = auth.getOrganizationId();
+  const waitForWorkspaceActive = useWaitForWorkspaceActive();
   return useMutation({
     mutationFn: (request) => orgFetch("/v1/workspaces", {
       method: "POST",
       body: request
     }),
+    onSuccess: (data) => {
+      const workspace = data?.workspace;
+      if (!workspace) return;
+      auth.queryClient.setQueriesData(
+        { queryKey: ["workspaces", orgId] },
+        (current) => {
+          if (!current) return current;
+          if (current.workspaces.some((w) => w.id === workspace.id)) return current;
+          return {
+            ...current,
+            workspaces: [workspace, ...current.workspaces],
+            total: (current.total ?? current.workspaces.length) + 1
+          };
+        }
+      );
+      void waitForWorkspaceActive(workspace.id);
+    },
     onSettled: () => {
       auth.queryClient.invalidateQueries({ queryKey: ["workspaces", orgId] });
     }
   }, auth.queryClient);
 }
+function useWaitForWorkspaceActive() {
+  const auth = useReplicasAuth();
+  const orgFetch = useOrgFetch();
+  const orgId = auth.getOrganizationId();
+  return useCallback2(async (workspaceId) => {
+    try {
+      const result = await auth.queryClient.fetchQuery({
+        queryKey: ["workspace-wait-active", orgId, workspaceId],
+        queryFn: () => orgFetch(
+          `/v1/workspaces/${workspaceId}/wait-active`,
+          { method: "POST" }
+        ),
+        staleTime: Infinity
+      });
+      auth.queryClient.invalidateQueries({ queryKey: ["workspaces", orgId] });
+      return result.workspace;
+    } catch {
+      return null;
+    }
+  }, [auth, orgFetch, orgId]);
+}
 function useDeleteWorkspace() {
   const auth = useReplicasAuth();
   const orgFetch = useOrgFetch();
@@ -11588,7 +11544,7 @@ function useGenerateWorkspaceName() {
 }
 
 // ../shared/src/hooks/useWorkspaceEngine.ts
-import { useCallback as useCallback2, useEffect, useMemo, useState } from "react";
+import { useCallback as useCallback3, useEffect, useMemo, useState } from "react";
 import { useQuery as useQuery2, useMutation as useMutation2 } from "@tanstack/react-query";
 function upsertChat(chats, chat) {
   const existingIndex = chats.findIndex((item) => item.id === chat.id);
@@ -11713,7 +11669,7 @@ function useWorkspaceEvents(workspaceId, enabled = true) {
   const rawFetch = useRawOrgFetch();
   const qc = auth.queryClient;
   const [connected, setConnected] = useState(false);
-  const handleEvent = useCallback2((event) => {
+  const handleEvent = useCallback3((event) => {
     if (!workspaceId) return;
     const chatsKey = ["workspace-chats", workspaceId];
     if (event.type === "chat.created" || event.type === "chat.updated") {
@@ -11916,7 +11872,7 @@ function StatusBar({ focusPanel, viewingDiff, hasDiffAvailable }) {
 }
 
 // src/interactive/components/WorkspaceSidebar.tsx
-import { useState as useState2, useMemo as useMemo2, useCallback as useCallback3 } from "react";
+import { useState as useState2, useMemo as useMemo2, useCallback as useCallback4 } from "react";
 import { useKeyboard, useTerminalDimensions } from "@opentui/react";
 import { jsx as jsx2, jsxs as jsxs2 } from "@opentui/react/jsx-runtime";
 function flattenGroups(groups, collapsedGroups) {
@@ -11937,8 +11893,7 @@ function flattenGroups(groups, collapsedGroups) {
           type: "workspace",
           workspaceId: ws.id,
           name: ws.name,
-          status: ws.status,
-          isMock: ws.status === "preparing"
+          status: ws.status
         });
       }
       if (group.id !== "__ungrouped__") {
@@ -11954,7 +11909,6 @@ function truncate3(text, maxLen) {
 function WorkspaceSidebar({
   groups,
   selectedWorkspaceId,
-  mockIds,
   onSelectWorkspace,
   onCreateWorkspace,
   onDeleteWorkspace,
@@ -11974,7 +11928,7 @@ function WorkspaceSidebar({
     setCursorIndex(clampedCursor);
   }
   const visibleHeight = Math.max(1, termHeight - 4);
-  const adjustScroll = useCallback3(
+  const adjustScroll = useCallback4(
     (newCursor) => {
       let newOffset = scrollOffset;
       if (newCursor < newOffset) {
@@ -11986,7 +11940,7 @@ function WorkspaceSidebar({
     },
     [scrollOffset, visibleHeight]
   );
-  const moveCursor = useCallback3(
+  const moveCursor = useCallback4(
     (next) => {
       const len = items.length;
       if (len === 0) return;
@@ -11996,7 +11950,7 @@ function WorkspaceSidebar({
     },
     [items.length, adjustScroll]
   );
-  const handleAction = useCallback3(
+  const handleAction = useCallback4(
     (item) => {
       if (item.type === "group") {
         setCollapsedGroups((prev) => {
@@ -12016,10 +11970,9 @@ function WorkspaceSidebar({
     },
     [onSelectWorkspace, onCreateWorkspace]
   );
-  const handleDelete = useCallback3(() => {
+  const handleDelete = useCallback4(() => {
     const item = items[cursorIndex];
     if (!item || item.type !== "workspace") return;
-    if (item.isMock) return;
     if (confirmDelete === item.workspaceId) {
       onDeleteWorkspace(item.workspaceId);
       setConfirmDelete(null);
@@ -12027,7 +11980,7 @@ function WorkspaceSidebar({
       setConfirmDelete(item.workspaceId);
     }
   }, [items, cursorIndex, confirmDelete, onDeleteWorkspace]);
-  const moveCursorAndClearConfirm = useCallback3(
+  const moveCursorAndClearConfirm = useCallback4(
     (next) => {
       setConfirmDelete(null);
       moveCursor(next);
@@ -12095,7 +12048,7 @@ function WorkspaceSidebar({
       return;
     }
   });
-  const handleItemClick = useCallback3(
+  const handleItemClick = useCallback4(
     (globalIndex) => {
       setConfirmDelete(null);
       setCursorIndex(globalIndex);
@@ -12104,7 +12057,7 @@ function WorkspaceSidebar({
     },
     [items, handleAction]
   );
-  const handleDeleteClick = useCallback3(
+  const handleDeleteClick = useCallback4(
     (workspaceId, e) => {
       e?.preventDefault?.();
       if (confirmDelete === workspaceId) {
@@ -12209,7 +12162,7 @@ function WorkspaceSidebar({
                     ] }),
                     /* @__PURE__ */ jsx2("span", { fg: nameColor, children: truncate3(item.name, 17) })
                   ] }),
-                  !item.isMock && /* @__PURE__ */ jsx2("box", { onMouseDown: (e) => handleDeleteClick(item.workspaceId, e), children: /* @__PURE__ */ jsx2("text", { children: /* @__PURE__ */ jsx2("span", { fg: isCursor ? "#ff4444" : "#222222", children: "\u2717" }) }) })
+                  /* @__PURE__ */ jsx2("box", { onMouseDown: (e) => handleDeleteClick(item.workspaceId, e), children: /* @__PURE__ */ jsx2("text", { children: /* @__PURE__ */ jsx2("span", { fg: isCursor ? "#ff4444" : "#222222", children: "\u2717" }) }) })
                 ]
               },
               `w-${item.workspaceId}`
@@ -12264,7 +12217,7 @@ function SpinnerLabel({ color, label }) {
 import { useState as useState4 } from "react";
 
 // src/interactive/components/diff-utils.tsx
-import React2, { useState as useState3, useMemo as useMemo3, useCallback as useCallback4, useRef } from "react";
+import React2, { useState as useState3, useMemo as useMemo3, useCallback as useCallback5, useRef } from "react";
 import { SyntaxStyle } from "@opentui/core";
 import { useKeyboard as useKeyboard2 } from "@opentui/react";
 import { Fragment, jsx as jsx4, jsxs as jsxs4 } from "@opentui/react/jsx-runtime";
@@ -12532,12 +12485,12 @@ function DiffViewer({ diff, repoName, focused }) {
     return result;
   }, [tree, collapsedFolders]);
   const safeCursorIndex = Math.min(cursorIndex, Math.max(0, visibleTree.length - 1));
-  const scrollCursorIntoView = useCallback4((treeIdx) => {
+  const scrollCursorIntoView = useCallback5((treeIdx) => {
     const node = visibleTree[treeIdx];
     if (!node) return;
     fileTreeScrollRef.current?.scrollChildIntoView(`tree-${node.path}`);
   }, [visibleTree]);
-  const moveCursor = useCallback4((next) => {
+  const moveCursor = useCallback5((next) => {
     const len = visibleTree.length;
     if (len === 0) return;
     const wrapped = (next % len + len) % len;
@@ -12548,7 +12501,7 @@ function DiffViewer({ diff, repoName, focused }) {
       setSelectedFileIndex(node.fileIndex);
     }
   }, [visibleTree, scrollCursorIntoView]);
-  const toggleFolder = useCallback4((folderPath) => {
+  const toggleFolder = useCallback5((folderPath) => {
     setCollapsedFolders((prev) => {
       const next = new Set(prev);
       if (next.has(folderPath)) next.delete(folderPath);
@@ -12556,7 +12509,7 @@ function DiffViewer({ diff, repoName, focused }) {
       return next;
     });
   }, []);
-  const selectFile = useCallback4((fileIndex, treeIndex) => {
+  const selectFile = useCallback5((fileIndex, treeIndex) => {
     setSelectedFileIndex(fileIndex);
     setCursorIndex(treeIndex);
     scrollCursorIntoView(treeIndex);
@@ -13406,7 +13359,7 @@ function ChatArea({
 }
 
 // src/interactive/components/WorkspaceInfo.tsx
-import React6, { useState as useState6, useMemo as useMemo5, useCallback as useCallback5, useRef as useRef3 } from "react";
+import React6, { useState as useState6, useMemo as useMemo5, useCallback as useCallback6, useRef as useRef3 } from "react";
 import open4 from "open";
 import { useKeyboard as useKeyboard4 } from "@opentui/react";
 import { Fragment as Fragment4, jsx as jsx8, jsxs as jsxs8 } from "@opentui/react/jsx-runtime";
@@ -13603,7 +13556,7 @@ function WorkspaceInfo({ status, workspaceName, workspaceId, focused, loading, a
   const hasAnyDiff = diffItems.length > 0;
   const safeCursor = interactiveItems.length > 0 ? Math.min(cursorIndex, interactiveItems.length - 1) : 0;
   const scrollboxRef = useRef3(null);
-  const moveCursor = useCallback5(
+  const moveCursor = useCallback6(
     (next) => {
       const len = interactiveItems.length;
       if (len === 0) return;
@@ -13614,7 +13567,7 @@ function WorkspaceInfo({ status, workspaceName, workspaceId, focused, loading, a
     },
     [interactiveItems]
   );
-  const handleAction = useCallback5(
+  const handleAction = useCallback6(
     (item) => {
       if (!item) return;
       switch (item.type) {
@@ -13683,7 +13636,7 @@ function WorkspaceInfo({ status, workspaceName, workspaceId, focused, loading, a
       return;
     }
   });
-  const isHighlighted = useCallback5(
+  const isHighlighted = useCallback6(
     (item) => {
       if (!focused) return false;
       const idx = interactiveItems.indexOf(item);
@@ -13691,7 +13644,7 @@ function WorkspaceInfo({ status, workspaceName, workspaceId, focused, loading, a
     },
     [focused, interactiveItems, safeCursor]
   );
-  const findItem = useCallback5(
+  const findItem = useCallback6(
     (type, key) => {
       return interactiveItems.find((item) => {
         if (item.type !== type) return false;
@@ -13980,7 +13933,7 @@ function WorkspaceInfo({ status, workspaceName, workspaceId, focused, loading, a
 import { useTerminalDimensions as useTerminalDimensions2 } from "@opentui/react";
 
 // src/interactive/toast-context.tsx
-import { createContext as createContext2, useContext as useContext2, useState as useState7, useCallback as useCallback6, useRef as useRef4 } from "react";
+import { createContext as createContext2, useContext as useContext2, useState as useState7, useCallback as useCallback7, useRef as useRef4 } from "react";
 import { jsx as jsx9 } from "@opentui/react/jsx-runtime";
 var ToastContext = createContext2(null);
 function useToast() {
@@ -13991,7 +13944,7 @@ function useToast() {
 function ToastProvider({ children }) {
   const [current, setCurrent] = useState7(null);
   const timeoutRef = useRef4(null);
-  const show = useCallback6((options) => {
+  const show = useCallback7((options) => {
     const { message, variant = "info", duration = 3e3 } = options;
     setCurrent({ message, variant });
     if (timeoutRef.current) clearTimeout(timeoutRef.current);
@@ -13999,7 +13952,7 @@ function ToastProvider({ children }) {
       setCurrent(null);
     }, duration);
   }, []);
-  const error = useCallback6((err) => {
+  const error = useCallback7((err) => {
     const message = err instanceof Error ? err.message : "An error occurred";
     show({ message, variant: "error", duration: 5e3 });
   }, [show]);
@@ -14098,29 +14051,17 @@ function AppInner() {
   const [selectedChatId, setSelectedChatId] = useState8(null);
   const [focusPanel, setFocusPanel] = useState8("sidebar");
   const [taskMode, setTaskMode] = useState8("build");
-  const [mockWorkspaces, setMockWorkspaces] = useState8([]);
-  const mockToRealRef = useRef5(/* @__PURE__ */ new Map());
-  const mockGroupRef = useRef5(/* @__PURE__ */ new Map());
-  const mockPollingRef = useRef5(null);
-  if (mockWorkspaces.length > 0 && !mockPollingRef.current) {
-    mockPollingRef.current = setInterval(() => {
-      queryClient.invalidateQueries({ queryKey: ["workspaces"] });
-      rendererRef.current.requestRender();
-    }, 5e3);
-  } else if (mockWorkspaces.length === 0 && mockPollingRef.current) {
-    clearInterval(mockPollingRef.current);
-    mockPollingRef.current = null;
-  }
   const [mockMessages, setMockMessages] = useState8([]);
   const [mockThinking, setMockThinking] = useState8(false);
   const pendingMessageRef = useRef5(/* @__PURE__ */ new Map());
   const [viewingDiff, setViewingDiff] = useState8(null);
   const [lastViewedDiff, setLastViewedDiff] = useState8(null);
-  const mockIds = useMemo6(() => new Set(mockWorkspaces.map((m) => m.id)), [mockWorkspaces]);
-  const isMockSelected = selectedWorkspaceId ? mockIds.has(selectedWorkspaceId) : false;
-  const { data: workspacesData, isLoading: loadingWorkspaces } = useWorkspaces(1, 100, "organization");
+  const { data: workspacesData, isLoading: loadingWorkspaces } = useWorkspaces(WORKSPACE_SIDEBAR_VIEWS);
   const { data: setsData } = useRepositorySets();
   const { data: envsData } = useEnvironments();
+  const workspaces = workspacesData?.workspaces ?? [];
+  const selectedWorkspace = workspaces.find((ws) => ws.id === selectedWorkspaceId) ?? null;
+  const isMockSelected = selectedWorkspace?.status === "preparing";
   const { data: statusData, isLoading: loadingStatus } = useWorkspaceStatus(
     isMockSelected ? null : selectedWorkspaceId,
     { includeDiffs: true }
@@ -14149,16 +14090,13 @@ function AppInner() {
   const [wakingWorkspaceId, setWakingWorkspaceId] = useState8(null);
   const sendMessageMutation = useSendChatMessage(selectedWorkspaceId, resolvedChatId);
   const interruptMutation = useInterruptChat(selectedWorkspaceId, resolvedChatId);
-  const workspaces = workspacesData?.workspaces ?? [];
   const repositorySets = setsData?.repository_sets ?? [];
   const environments = envsData?.environments ?? [];
   const previews = previewsData?.previews ?? [];
-  const allWorkspaces = useMemo6(() => [...mockWorkspaces, ...workspaces], [mockWorkspaces, workspaces]);
   const groups = useMemo6(
-    () => buildGroups(allWorkspaces, workspacesData, environments, repositorySets, mockGroupRef.current),
-    [allWorkspaces, workspacesData, environments, repositorySets]
+    () => buildGroups(workspaces, workspacesData, environments, repositorySets),
+    [workspaces, workspacesData, environments, repositorySets]
   );
-  const selectedWorkspace = allWorkspaces.find((ws) => ws.id === selectedWorkspaceId) ?? null;
   const selectedChat = chats.find((c) => c.id === resolvedChatId) ?? null;
   const isProcessing = mockThinking || (selectedChat?.processing ?? false);
   const selectedAgent = selectedChat?.provider ?? "claude";
@@ -14180,33 +14118,15 @@ function AppInner() {
       setSelectedWorkspaceId(workspaces[0].id);
     }
   }, [workspaces, selectedWorkspaceId]);
-  useEffect3(() => {
-    if (mockWorkspaces.length === 0) return;
-    const realIds = new Set(workspaces.map((w) => w.id));
-    let changed = false;
-    const remaining = mockWorkspaces.filter((mock) => {
-      const realId = mockToRealRef.current.get(mock.id);
-      if (realId && realIds.has(realId)) {
-        if (selectedWorkspaceId === mock.id) {
-          setSelectedWorkspaceId(realId);
-        }
-        const pending = pendingMessageRef.current.get(mock.id);
-        if (pending) {
-          pendingMessageRef.current.delete(mock.id);
-          pendingMessageRef.current.set(realId, pending);
-        }
-        mockToRealRef.current.delete(mock.id);
-        mockGroupRef.current.delete(mock.id);
-        setSelectedChatId(null);
-        setMockMessages([]);
-        setMockThinking(false);
-        changed = true;
-        return false;
-      }
-      return true;
-    });
-    if (changed) setMockWorkspaces(remaining);
-  }, [workspaces, mockWorkspaces, selectedWorkspaceId]);
+  const [prevIsMockSelected, setPrevIsMockSelected] = useState8(isMockSelected);
+  if (prevIsMockSelected !== isMockSelected) {
+    setPrevIsMockSelected(isMockSelected);
+    if (prevIsMockSelected && !isMockSelected) {
+      setSelectedChatId(null);
+      setMockMessages([]);
+      setMockThinking(false);
+    }
+  }
   useEffect3(() => {
     if (!selectedWorkspaceId || isMockSelected) return;
     if (!resolvedChatId || resolvedChatId.startsWith("mock-")) return;
@@ -14221,7 +14141,7 @@ function AppInner() {
     }
     sendMessageMutation.mutate({ message: pending });
   }, [selectedWorkspaceId, resolvedChatId, isMockSelected, statusData?.status]);
-  const handleSelectWorkspace = useCallback7((workspaceId) => {
+  const handleSelectWorkspace = useCallback8((workspaceId) => {
     setSelectedWorkspaceId(workspaceId);
     setSelectedChatId(null);
     setMockMessages([]);
@@ -14230,55 +14150,32 @@ function AppInner() {
     setLastViewedDiff(null);
     setFocusPanel("chat-input");
   }, []);
-  const handleFocus = useCallback7((panel) => {
+  const handleFocus = useCallback8((panel) => {
     if (panel === "sidebar") {
       queryClient.invalidateQueries({ queryKey: ["workspaces"] });
     }
     setFocusPanel(panel);
   }, []);
-  const handleCreateWorkspace = useCallback7(
+  const handleCreateWorkspace = useCallback8(
     async (group) => {
       if (group.id === "__ungrouped__") {
         toast.error("Cannot create a workspace in the Other / Ungrouped folder");
         return;
       }
-      const orgId = getOrganizationId() ?? "";
-      const mock = createMockWorkspaceRecord(orgId);
-      mockGroupRef.current.set(mock.id, group.id);
-      setMockWorkspaces((prev) => [mock, ...prev]);
-      setSelectedWorkspaceId(mock.id);
       setViewingDiff(null);
       setLastViewedDiff(null);
       setFocusPanel("chat-input");
       try {
-        const request = {
-          environment_id: group.environmentId,
-          name: mock.name,
-          placeholder: true
-        };
-        const result = await createWorkspaceMutation.mutateAsync(request);
-        mockToRealRef.current.set(mock.id, result.workspace.id);
+        const result = await createWorkspaceMutation.mutateAsync({ environment_id: group.environmentId });
+        setSelectedWorkspaceId(result.workspace.id);
       } catch (err) {
-        mockGroupRef.current.delete(mock.id);
-        setMockWorkspaces((prev) => prev.filter((m) => m.id !== mock.id));
         toast.error(err);
       }
     },
     [createWorkspaceMutation, toast]
   );
-  const handleDeleteWorkspace = useCallback7(
+  const handleDeleteWorkspace = useCallback8(
     async (workspaceId) => {
-      if (mockIds.has(workspaceId)) {
-        mockGroupRef.current.delete(workspaceId);
-        mockToRealRef.current.delete(workspaceId);
-        setMockWorkspaces((prev) => prev.filter((m) => m.id !== workspaceId));
-        if (selectedWorkspaceId === workspaceId) {
-          setSelectedWorkspaceId(null);
-          setViewingDiff(null);
-          setLastViewedDiff(null);
-        }
-        return;
-      }
       try {
         await deleteWorkspaceMutation.mutateAsync(workspaceId);
         if (selectedWorkspaceId === workspaceId) {
@@ -14291,9 +14188,9 @@ function AppInner() {
         toast.error(err);
       }
     },
-    [mockIds, selectedWorkspaceId, deleteWorkspaceMutation]
+    [selectedWorkspaceId, deleteWorkspaceMutation]
   );
-  const handleWakeWorkspace = useCallback7(
+  const handleWakeWorkspace = useCallback8(
     async (workspaceId) => {
       setWakingWorkspaceId(workspaceId);
       try {
@@ -14307,7 +14204,7 @@ function AppInner() {
     },
     [wakeWorkspaceMutation, toast]
   );
-  const handleSelectChat = useCallback7((chatId) => {
+  const handleSelectChat = useCallback8((chatId) => {
     setSelectedChatId(chatId);
   }, []);
   useKeyboard5((key) => {
@@ -14365,12 +14262,12 @@ function AppInner() {
     }
     if (focusPanel === "chat-input") return;
   });
-  const handleViewDiff = useCallback7((diff, repoName) => {
+  const handleViewDiff = useCallback8((diff, repoName) => {
     setViewingDiff({ diff, repoName });
     setLastViewedDiff({ diff, repoName });
     setFocusPanel("chat-history");
   }, []);
-  const handleSelectChatMode = useCallback7(() => {
+  const handleSelectChatMode = useCallback8(() => {
     setViewingDiff(null);
     setFocusPanel("chat-history");
   }, []);
@@ -14384,14 +14281,14 @@ function AppInner() {
     }
     return null;
   }, [lastViewedDiff, statusData?.repoStatuses]);
-  const handleSelectDiffMode = useCallback7(() => {
+  const handleSelectDiffMode = useCallback8(() => {
     if (firstAvailableDiff) {
       setViewingDiff(firstAvailableDiff);
       setLastViewedDiff(firstAvailableDiff);
       setFocusPanel("chat-history");
     }
   }, [firstAvailableDiff]);
-  const handleSendMessage = useCallback7(
+  const handleSendMessage = useCallback8(
     async (message) => {
       if (!selectedWorkspaceId || !resolvedChatId) return;
       if (isMockSelected) {
@@ -14419,7 +14316,6 @@ function AppInner() {
         {
           groups,
           selectedWorkspaceId,
-          mockIds,
           onSelectWorkspace: handleSelectWorkspace,
           onCreateWorkspace: handleCreateWorkspace,
           onDeleteWorkspace: handleDeleteWorkspace,
@@ -14927,7 +14823,7 @@ Deleted file ${pathOrId}.
 }
 
 // src/index.ts
-var CLI_VERSION = "0.2.171";
+var CLI_VERSION = "0.2.173";
 function parseBooleanOption(value) {
   if (value === "true") return true;
   if (value === "false") return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "replicas-cli",
-  "version": "0.2.171",
+  "version": "0.2.173",
   "description": "CLI for managing Replicas workspaces - SSH into cloud dev environments with automatic port forwarding",
   "main": "dist/index.mjs",
   "bin": {