From 5ec9ffab02a13f666b0440023fee6ccb2e1ab316 Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 10 Nov 2026 06:32:39 -0800 Subject: [PATCH] feat(cloud): Sleep and Delete in the team list row menu (control plane for workspaces this desktop does not run, confirm before delete), Running filter on Home; limit errors open Mine + Running (DS-12) --- .../cloud-workspaces-client.ts | 12 ++++ .../cloud-workspaces-service.ts | 2 + src/main/ipc/cloud-workspaces.ts | 7 ++ src/preload/api/cloud-workspaces-api.ts | 3 + src/preload/api/cloud-workspaces-bridge.ts | 2 + .../CloudWorkspaceConfirmDialog.fixture.tsx | 16 +++++ .../CloudWorkspaceConfirmDialog.tsx | 38 +++++++--- .../CloudWorkspaceRow.fixture.tsx | 4 +- .../CloudWorkspaceRowMenu.tsx | 16 +++++ .../cloud-workspaces/CloudWorkspacesHome.tsx | 27 ++++--- .../CloudWorkspacesStates.tsx | 2 +- .../CloudWorkspacesToolbar.tsx | 18 +++++ .../cloud-workspace-home-archive.test.ts | 23 ++++++ .../cloud-workspace-home-archive.ts | 71 ++++++++++++++++++- .../cloud-workspaces-home-nav.ts | 2 +- .../worktree-creation/VmBuildSheet.tsx | 2 +- src/renderer/src/i18n/locales/en.json | 11 ++- .../preload-api/web-cloud-workspaces-api.ts | 2 + 18 files changed, 227 insertions(+), 31 deletions(-) diff --git a/src/main/cloud-workspaces/cloud-workspaces-client.ts b/src/main/cloud-workspaces/cloud-workspaces-client.ts index 94f16ecfdd1..5cffe9f3bdd 100644 --- a/src/main/cloud-workspaces/cloud-workspaces-client.ts +++ b/src/main/cloud-workspaces/cloud-workspaces-client.ts @@ -173,6 +173,18 @@ export function createCloudWorkspacesClient(options: CloudWorkspacesClientOption GRANT_TIMEOUT_MS ) }, + /** Owner or team admin: put the sandbox to sleep (counts as a person choosing to sleep it). */ + async sleep(id: string): Promise { + await call( + 'POST', + `/v1/sandboxes/${encodeURIComponent(id)}/suspend`, + NoteSentSchema.passthrough() + ) + }, + /** Owner or team admin: delete the sandbox and its disk (grants revoked server-side). */ + async destroy(id: string): Promise { + await call('DELETE', `/v1/sandboxes/${encodeURIComponent(id)}`, NoteSentSchema.passthrough()) + }, async listGrants(id: string) { return (await call('GET', `${ws(id)}/grants`, CloudWorkspaceGrantListSchema)).grants }, diff --git a/src/main/cloud-workspaces/cloud-workspaces-service.ts b/src/main/cloud-workspaces/cloud-workspaces-service.ts index 564fed8a6a4..b11ebde4099 100644 --- a/src/main/cloud-workspaces/cloud-workspaces-service.ts +++ b/src/main/cloud-workspaces/cloud-workspaces-service.ts @@ -164,6 +164,8 @@ export function createCloudWorkspacesService(deps: { wrap(() => client.putOrgPrompts(document, revision)), localWorkspaces: () => localWorkspaces(), noteSent: (id: string) => wrap(() => client.noteSent(id)), + sleep: (id: string) => wrap(() => client.sleep(id)), + destroy: (id: string) => wrap(() => client.destroy(id)), /** * A per-device credential for a workspace this desktop does not own: a fresh X25519 key lives diff --git a/src/main/ipc/cloud-workspaces.ts b/src/main/ipc/cloud-workspaces.ts index 67fc4eb7201..1aa5060e4aa 100644 --- a/src/main/ipc/cloud-workspaces.ts +++ b/src/main/ipc/cloud-workspaces.ts @@ -248,6 +248,13 @@ export function registerCloudWorkspacesHandlers(): void { ? s.revokeGrant(parsed.data.id, parsed.data.grantId) : INVALID }) + for (const action of ['sleep', 'destroy'] as const) { + handle(`cloudWorkspaces:${action}`, async (args) => { + const parsed = z.object({ id: Id }).safeParse(args) + const s = await getService() + return !s ? NOT_CONFIGURED : parsed.success ? s[action](parsed.data.id) : INVALID + }) + } handle( 'cloudWorkspaces:localWorkspaces', async () => (await getService())?.localWorkspaces() ?? [] diff --git a/src/preload/api/cloud-workspaces-api.ts b/src/preload/api/cloud-workspaces-api.ts index 0e419815469..3b2f55788dc 100644 --- a/src/preload/api/cloud-workspaces-api.ts +++ b/src/preload/api/cloud-workspaces-api.ts @@ -39,6 +39,9 @@ export type CloudWorkspacesApi = { listGrants: (id: string) => Promise> revokeGrant: (id: string, grantId: string) => Promise> localWorkspaces: () => Promise + /** Owner or team admin, from the team list: sleep or delete a workspace this desktop doesn't run. */ + sleep: (id: string) => Promise> + destroy: (id: string) => Promise> /** "I just sent a message here" (opens my git-as-sender window on the control plane). */ noteSent: (id: string) => Promise /** Remembers which local runtime environment a granted workspace was added as. */ diff --git a/src/preload/api/cloud-workspaces-bridge.ts b/src/preload/api/cloud-workspaces-bridge.ts index a8ea180d427..43d0b5c7aa6 100644 --- a/src/preload/api/cloud-workspaces-bridge.ts +++ b/src/preload/api/cloud-workspaces-bridge.ts @@ -12,6 +12,8 @@ export const cloudWorkspacesApi = { readSnapshot: (id) => ipcRenderer.invoke('cloudWorkspaces:readSnapshot', { id }), listGrants: (id) => ipcRenderer.invoke('cloudWorkspaces:listGrants', { id }), revokeGrant: (id, grantId) => ipcRenderer.invoke('cloudWorkspaces:revokeGrant', { id, grantId }), + sleep: (id) => ipcRenderer.invoke('cloudWorkspaces:sleep', { id }), + destroy: (id) => ipcRenderer.invoke('cloudWorkspaces:destroy', { id }), localWorkspaces: () => ipcRenderer.invoke('cloudWorkspaces:localWorkspaces'), noteSent: (id) => ipcRenderer.invoke('cloudWorkspaces:noteSent', { id }), bindEnvironment: (sandboxId, runtimeEnvironmentId, grantId) => diff --git a/src/renderer/src/components/cloud-workspaces/CloudWorkspaceConfirmDialog.fixture.tsx b/src/renderer/src/components/cloud-workspaces/CloudWorkspaceConfirmDialog.fixture.tsx index ee915e435e5..85570599f08 100644 --- a/src/renderer/src/components/cloud-workspaces/CloudWorkspaceConfirmDialog.fixture.tsx +++ b/src/renderer/src/components/cloud-workspaces/CloudWorkspaceConfirmDialog.fixture.tsx @@ -115,3 +115,19 @@ export const archiveTeammateRunning = defineFixture({ /> ) }) + +/** Deleting a workspace from the team list (one this computer doesn't run): DS-07 copy. */ +export const deleteFromTeamList = defineFixture({ + width: 640, + render: () => + frame( + {}} + onConfirm={() => {}} + /> + ) +}) diff --git a/src/renderer/src/components/cloud-workspaces/CloudWorkspaceConfirmDialog.tsx b/src/renderer/src/components/cloud-workspaces/CloudWorkspaceConfirmDialog.tsx index ed37b4ff7ec..580f7089832 100644 --- a/src/renderer/src/components/cloud-workspaces/CloudWorkspaceConfirmDialog.tsx +++ b/src/renderer/src/components/cloud-workspaces/CloudWorkspaceConfirmDialog.tsx @@ -21,6 +21,8 @@ export type PendingConfirm = | { kind: 'owner'; workspace: CloudWorkspace; ownerUserId: string } /** Archiving a teammate's running workspace stops their agents. */ | { kind: 'archive'; workspace: CloudWorkspace } + /** Deleting from the team list: the sandbox and its disk go (DS-07 copy). */ + | { kind: 'delete'; workspace: CloudWorkspace } /** Teammates who would lose access: here now, or holding an active device grant. */ function useConnectedTeammates(workspace: CloudWorkspace, selfId: string | null): string[] { @@ -103,16 +105,20 @@ export function CloudWorkspaceConfirmDialog({ ? t('auto.components.cloudWorkspaces.makePrivateTitle', 'Make {{title}} private?', { title: cloudWorkspaceTitle(w, t) }) - : pending.kind === 'archive' - ? t('auto.components.cloudWorkspaces.archiveConfirmTitle', 'Archive {{name}}?', { - name: cloudWorkspaceTitle(w, t) - }) + : pending.kind === 'archive' || pending.kind === 'delete' + ? pending.kind === 'archive' + ? t('auto.components.cloudWorkspaces.archiveConfirmTitle', 'Archive {{name}}?', { + name: cloudWorkspaceTitle(w, t) + }) + : t('auto.components.cloudWorkspaces.deleteConfirmTitle', 'Delete {{name}}?', { + name: cloudWorkspaceTitle(w, t) + }) : t('auto.components.cloudWorkspaces.reassignTitle', 'Make {{name}} the owner?', { name: memberName(directory, pending.ownerUserId, selfId, t) }) const losesManagement = pending.kind === 'owner' && w.ownerUserId === selfId && !canAdmin // Destructive for someone else (their agents stop, or you lose access): focus starts on Cancel. - const focusCancel = losesManagement || pending.kind === 'archive' + const focusCancel = losesManagement || pending.kind === 'archive' || pending.kind === 'delete' return ( !next && onCancel()}> @@ -120,6 +126,13 @@ export function CloudWorkspaceConfirmDialog({ {title} {pending.kind === 'private' ? ( + ) : pending.kind === 'delete' ? ( + + {t( + 'auto.components.sidebar.DeleteCloudWorkspace.body', + "Deletes the sandbox and its disk, including chats, terminals and uncommitted changes. This can't be undone. To keep a snapshot, archive it instead." + )} + ) : pending.kind === 'archive' ? ( {t( @@ -147,12 +160,19 @@ export function CloudWorkspaceConfirmDialog({ - diff --git a/src/renderer/src/components/cloud-workspaces/CloudWorkspaceRow.fixture.tsx b/src/renderer/src/components/cloud-workspaces/CloudWorkspaceRow.fixture.tsx index 2475fb18c3e..9c1843e848a 100644 --- a/src/renderer/src/components/cloud-workspaces/CloudWorkspaceRow.fixture.tsx +++ b/src/renderer/src/components/cloud-workspaces/CloudWorkspaceRow.fixture.tsx @@ -19,7 +19,9 @@ const ACTIONS: RowActions = { goToChat: () => {}, patch: () => {}, archive: () => {}, - unarchive: () => {} + unarchive: () => {}, + sleep: () => {}, + remove: () => {} } const SECTIONS = ['Payments', 'Platform'] const MEMBERS = [...DIRECTORY.entries()].map(([userId, m]) => ({ userId, name: m.name })) diff --git a/src/renderer/src/components/cloud-workspaces/CloudWorkspaceRowMenu.tsx b/src/renderer/src/components/cloud-workspaces/CloudWorkspaceRowMenu.tsx index b5fa3c75bd0..42b3eba01f9 100644 --- a/src/renderer/src/components/cloud-workspaces/CloudWorkspaceRowMenu.tsx +++ b/src/renderer/src/components/cloud-workspaces/CloudWorkspaceRowMenu.tsx @@ -2,6 +2,8 @@ import React, { useRef } from 'react' import { Archive, ArchiveRestore, + Moon, + Trash2, ArrowUpRight, BookOpen, FolderInput, @@ -52,6 +54,10 @@ export type RowActions = { /** Sleep and archive with a snapshot (Undo for 5 s); never just a label. */ archive: (w: CloudWorkspace) => void unarchive: (w: CloudWorkspace) => void + /** Put a running sandbox to sleep (frees a running slot). */ + sleep: (w: CloudWorkspace) => void + /** Delete the sandbox and its disk, after a confirmation. */ + remove: (w: CloudWorkspace) => void } /** Placeholder replaced by the inline section editor in CloudWorkspacesHome. */ @@ -267,6 +273,12 @@ export function CloudWorkspaceRowMenu({ )} + {w.status === 'running' && w.archivedAt === null ? ( + actions.sleep(w)}> + + {t('auto.components.cloudWorkspaces.sleep', 'Sleep')} + + ) : null} {w.archivedAt === null ? ( actions.archive(w)}> @@ -278,6 +290,10 @@ export function CloudWorkspaceRowMenu({ {t('auto.components.cloudWorkspaces.unarchive', 'Unarchive')} )} + actions.remove(w)}> + + {t('auto.components.cloudWorkspaces.deleteWorkspace', 'Delete…')} + )} diff --git a/src/renderer/src/components/cloud-workspaces/CloudWorkspacesHome.tsx b/src/renderer/src/components/cloud-workspaces/CloudWorkspacesHome.tsx index edd92995a22..c9f462f2084 100644 --- a/src/renderer/src/components/cloud-workspaces/CloudWorkspacesHome.tsx +++ b/src/renderer/src/components/cloud-workspaces/CloudWorkspacesHome.tsx @@ -14,7 +14,12 @@ import type { import { useOrgRoster } from '../billing/team/use-org-roster' import { CloudWorkspaceRow } from './CloudWorkspaceRow' import { NEW_SECTION } from './CloudWorkspaceRowMenu' -import { ANY, CloudWorkspacesToolbar, type CloudWorkspacesFilters } from './CloudWorkspacesToolbar' +import { + ANY, + CloudWorkspacesToolbar, + INITIAL_CLOUD_WORKSPACE_FILTERS, + type CloudWorkspacesFilters +} from './CloudWorkspacesToolbar' import { EmptyState, ErrorState, NewSectionDialog, SkeletonRows } from './CloudWorkspacesStates' import { CloudWorkspaceConfirmDialog, type PendingConfirm } from './CloudWorkspaceConfirmDialog' import { CloudReadSnapshotSheet } from './CloudReadSnapshotSheet' @@ -33,13 +38,6 @@ import { import { useCloudWorkspaces, useCloudWorkspacesAvailable } from './use-cloud-workspaces' import { useOrcaAccountKey } from '@/hooks/use-orca-account-key' -const INITIAL_FILTERS: CloudWorkspacesFilters = { - scope: 'team', - by: ANY, - repo: ANY, - archived: false -} - function useMemberDirectory(orgId: string | undefined, workspaces: readonly CloudWorkspace[]) { const roster = useOrgRoster(orgId ?? '') return useMemo(() => { @@ -85,13 +83,13 @@ export function CloudWorkspacesHome({ const orgId = cloud?.activeOrgId const selfId = cloud?.userId ?? null const account = useOrcaAccountKey() - const [filters, setFilters] = useState(INITIAL_FILTERS) + const [filters, setFilters] = useState(INITIAL_CLOUD_WORKSPACE_FILTERS) homeArchive.usePendingHomeFilters(setFilters) // Owner and repo filters name the previous team's people and repos; a team switch starts over. const [filtersAccount, setFiltersAccount] = useState(account) if (filtersAccount !== account) { setFiltersAccount(account) - setFilters(INITIAL_FILTERS) + setFilters(INITIAL_CLOUD_WORKSPACE_FILTERS) } const [opening, setOpening] = useState(null) const [now, setNow] = useState(() => Date.now()) @@ -150,9 +148,10 @@ export function CloudWorkspacesHome({ (w) => w.id === highlightId || ((by === ANY || w.ownerUserId === by || w.createdBy === by) && - (repo === ANY || w.repo?.url === repo)) + (repo === ANY || w.repo?.url === repo) && + (!filters.running || w.status === 'running')) ), - [all, by, repo, highlightId] + [all, by, repo, highlightId, filters.running] ) const highlighted = highlightId ? visible.find((w) => w.id === highlightId) : undefined const groups = useMemo(() => { @@ -407,9 +406,9 @@ export function CloudWorkspacesHome({ canAdmin={canAdmin} onCancel={() => setConfirm(null)} onConfirm={() => { - if (confirm.kind === 'archive') { + if (confirm.kind === 'archive' || confirm.kind === 'delete') { setConfirm(null) - homeArchive.runHomeArchive(confirm.workspace, t, refresh) + homeArchive.runConfirmed(confirm, t, refresh) return } const change: CloudWorkspacePatch = diff --git a/src/renderer/src/components/cloud-workspaces/CloudWorkspacesStates.tsx b/src/renderer/src/components/cloud-workspaces/CloudWorkspacesStates.tsx index 3d47983ac18..51619f9045e 100644 --- a/src/renderer/src/components/cloud-workspaces/CloudWorkspacesStates.tsx +++ b/src/renderer/src/components/cloud-workspaces/CloudWorkspacesStates.tsx @@ -48,7 +48,7 @@ export function ErrorState({ : t('orcaCloudWorkspace.tryAgain', 'Try again') } retrying={retrying} - onRetry={atLimit ? () => openCloudWorkspacesHome() : onRetry} + onRetry={atLimit ? () => openCloudWorkspacesHome({ running: true }) : onRetry} /> ) } diff --git a/src/renderer/src/components/cloud-workspaces/CloudWorkspacesToolbar.tsx b/src/renderer/src/components/cloud-workspaces/CloudWorkspacesToolbar.tsx index 605130b4307..0f1d264476b 100644 --- a/src/renderer/src/components/cloud-workspaces/CloudWorkspacesToolbar.tsx +++ b/src/renderer/src/components/cloud-workspaces/CloudWorkspacesToolbar.tsx @@ -29,6 +29,16 @@ export type CloudWorkspacesFilters = { by: string repo: string archived: boolean + /** Only sandboxes that are running now (where the team's running slots go). */ + running?: boolean +} + +export const INITIAL_CLOUD_WORKSPACE_FILTERS: CloudWorkspacesFilters = { + scope: 'team', + by: ANY, + repo: ANY, + archived: false, + running: false } /** Row 1: title, count and cost, refresh. Row 2: whose, by whom, which repo, archived. */ @@ -165,6 +175,14 @@ export function CloudWorkspacesToolbar({ +