diff --git a/components/AppNavbar.vue b/components/AppNavbar.vue
index 0571576f..bd3218bb 100644
--- a/components/AppNavbar.vue
+++ b/components/AppNavbar.vue
@@ -57,9 +57,11 @@
             >Dashboard</nuxt-link>
           </li>
           <li class="nav-item">
+            <!-- Use document navigation to avoid overlapping with unresolved dashboard setup. -->
             <nuxt-link
               class="nav-link nav-link-item"
               to="/workspace/create"
+              external
               @click="closeOnMobile"
             >Create Workspace</nuxt-link>
           </li>
diff --git a/components/dashboard/WorkspaceJobFailureDialog.vue b/components/dashboard/WorkspaceJobFailureDialog.vue
index 6e5c38a9..2093ac12 100644
--- a/components/dashboard/WorkspaceJobFailureDialog.vue
+++ b/components/dashboard/WorkspaceJobFailureDialog.vue
@@ -191,6 +191,7 @@ import { BModal } from 'bootstrap-vue-next/components/BModal';
 import type { ComponentExposed } from 'vue-component-type-helpers';
 import { workspacesClient } from '~/services/index';
 import { resolveHttpErrorMessage } from '~/services/http';
+import { findFailedImportJob } from '~/util/workspace-jobs';
 
 import type { WorkspaceId, WorkspaceJob } from '~/types/workspaces';
 
@@ -216,7 +217,7 @@ async function show(workspaceId: WorkspaceId): Promise<void> {
   try {
     const jobs = await workspacesClient.getWorkspaceJobs(workspaceId);
     if (activeRequestId === requestId) {
-      job.value = jobs[0] ?? null;
+      job.value = findFailedImportJob(jobs) ?? jobs[0] ?? null;
     }
   }
   catch (error: unknown) {
diff --git a/components/review/Overlay.vue b/components/review/Overlay.vue
index e840c0f1..890e5327 100644
--- a/components/review/Overlay.vue
+++ b/components/review/Overlay.vue
@@ -4,6 +4,7 @@
       v-model:show-details="showDetails"
       v-model:show-discussion="showDiscussion"
       :item="item"
+      :workspace-type="workspaceType"
       @edit="props.onEdit"
       @resolve="$emit('resolve')"
       @back="emit('back')"
@@ -24,10 +25,14 @@
 
 <script setup lang="ts">
 import type { ReviewListItem } from '~/services/review';
+import type { WorkspaceType } from '~/types/workspaces';
+
+type RapidEditor = 'rapid' | 'rapid3';
 
 interface Props {
   item: ReviewListItem;
-  onEdit: () => void;
+  workspaceType: WorkspaceType;
+  onEdit: (editor?: RapidEditor) => void;
 }
 
 const props = defineProps<Props>();
diff --git a/components/review/Toolbar.vue b/components/review/Toolbar.vue
index 03663044..b241aa59 100644
--- a/components/review/Toolbar.vue
+++ b/components/review/Toolbar.vue
@@ -17,9 +17,35 @@
         :class="typeClass"
       /><span class="d-none d-sm-inline fw-bold text-uppercase">{{ props.item.displayType }}:</span> #{{ props.item.id }}
     </span>
+    <b-dropdown
+      v-if="isOsw && rapid3Available"
+      split
+      size="sm"
+      split-variant="primary"
+      variant="primary"
+      class="review-editor-dropdown"
+      teleport-to="body"
+      strategy="fixed"
+      @split-click="edit()"
+    >
+      <template #button-content>
+        <app-icon
+          variant="edit_location_alt"
+          no-margin
+        />
+        <span class="d-none d-sm-inline ms-2">Edit Here</span>
+      </template>
+      <b-dropdown-item @click="edit('rapid')">
+        Rapid 2 (default)
+      </b-dropdown-item>
+      <b-dropdown-item @click="edit('rapid3')">
+        Rapid 3 (beta)
+      </b-dropdown-item>
+    </b-dropdown>
     <button
+      v-else
       class="btn btn-sm btn-primary"
-      @click="edit"
+      @click="edit()"
     >
       <app-icon
         variant="edit_location_alt"
@@ -105,24 +131,31 @@
 </template>
 
 <script setup lang="ts">
+import { rapid3Manager } from '~/services/index';
 import type { ReviewListItem } from '~/services/review';
+import type { WorkspaceType } from '~/types/workspaces';
+
+type RapidEditor = 'rapid' | 'rapid3';
 
 interface Props {
   item: ReviewListItem;
+  workspaceType: WorkspaceType;
 }
 
 const props = defineProps<Props>();
 const emit = defineEmits(['back', 'edit', 'resolve']);
 
 const { isValidator } = useWorkspaceRole();
+const rapid3Available = Boolean(rapid3Manager);
+const isOsw = computed(() => props.workspaceType === 'osw');
 
 const typeClass = computed(() => props.item.badgeClass.replace('bg-', 'text-'));
 
 const showDetails = defineModel<boolean>('showDetails');
 const showDiscussion = defineModel<boolean>('showDiscussion');
 
-function edit() {
-  emit('edit');
+function edit(editor: RapidEditor = 'rapid') {
+  emit('edit', editor);
 }
 
 function resolveChangeset() {
@@ -156,4 +189,8 @@ function toggleDiscussion() {
     & { padding: 0.5rem; }
   }
 }
+
+.review-editor-dropdown {
+  flex-shrink: 0;
+}
 </style>
diff --git a/components/settings/panel/Delete.vue b/components/settings/panel/Delete.vue
index 679a246d..e8edb929 100644
--- a/components/settings/panel/Delete.vue
+++ b/components/settings/panel/Delete.vue
@@ -96,7 +96,15 @@ async function submitDelete() {
   isDeleting.value = true;
 
   try {
-    await workspacesClient.deleteWorkspace(workspace.id);
+    const { osmRequestSucceeded: osmCleanupSucceeded } = await workspacesClient.deleteWorkspace(workspace.id);
+
+    if (!osmCleanupSucceeded) {
+      toast.info(
+        'The workspace has been deleted, but the data may persist for some more time.',
+        { clearOnUrlChange: false }
+      );
+    }
+
     await navigateTo('/dashboard');
   }
   catch (error) {
diff --git a/pages/dashboard.vue b/pages/dashboard.vue
index 8a34ea28..af27f4aa 100644
--- a/pages/dashboard.vue
+++ b/pages/dashboard.vue
@@ -279,6 +279,7 @@ import {
 import { toast } from 'vue3-toastify';
 import 'vue3-toastify/dist/index.css';
 import { parsePositiveIntegerQuery } from '~/util/route-query';
+import { findFailedImportJob } from '~/util/workspace-jobs';
 
 import type { Workspace, WorkspaceCenter } from '~/types/workspaces';
 
@@ -313,6 +314,7 @@ const workspaceSearch = ref('');
 const pinnedWorkspaceIds = ref<Set<number>>(new Set());
 const refreshingWorkspaces = ref(false);
 const jobFailureDialog = useTemplateRef<JobFailureDialog>('jobFailureDialog');
+const verifiedCompletedImports = new Set<number>();
 
 const currentWorkspaces = computed<Workspace[]>(() =>
   currentProjectGroup.value
@@ -435,6 +437,7 @@ function selectWorkspace(
   updateRoute: boolean = true
 ): void {
   currentWorkspace.value = workspace;
+  void verifyCompletedImport(workspace);
 
   if (
     updateRoute
@@ -450,6 +453,27 @@ function selectWorkspace(
   }
 }
 
+async function verifyCompletedImport(workspace: Workspace): Promise<void> {
+  if (
+    workspace.importStatus !== 'completed'
+    || verifiedCompletedImports.has(workspace.id)
+  ) {
+    return;
+  }
+
+  verifiedCompletedImports.add(workspace.id);
+
+  try {
+    const jobs = await workspacesClient.getWorkspaceJobs(workspace.id);
+    if (findFailedImportJob(jobs)) {
+      workspace.importStatus = 'failed';
+    }
+  }
+  catch {
+    verifiedCompletedImports.delete(workspace.id);
+  }
+}
+
 function loadWorkspacePins(): void {
   if (!tdeiAuth.subject) {
     return;
@@ -498,6 +522,7 @@ async function refreshWorkspaces(): Promise<void> {
 
   try {
     const refreshedWorkspaces = await workspacesClient.getMyWorkspaces();
+    verifiedCompletedImports.clear();
     const existingWorkspaces = new Map(
       workspaces.value.map(workspace => [workspace.id, workspace])
     );
diff --git a/pages/workspace/[id]/export/index.vue b/pages/workspace/[id]/export/index.vue
index 73e98f41..e86ed806 100644
--- a/pages/workspace/[id]/export/index.vue
+++ b/pages/workspace/[id]/export/index.vue
@@ -61,7 +61,7 @@
             </p>
             <p>
               <em>
-                Note: press the "Start Preparing File for Download" button to prepare the download which may take a minute; when it's ready, the button will change to "Start", when you can then press again to download the file to your device.
+                Note: press the "Start Preparing File for Download" button to prepare the download which may take a minute; when it's ready, the button will change to "Save", which you can then press again to download the file to your device.
               </em>
             </p>
           </div>
diff --git a/pages/workspace/[id]/review.vue b/pages/workspace/[id]/review.vue
index ac572b46..94b4b4f8 100644
--- a/pages/workspace/[id]/review.vue
+++ b/pages/workspace/[id]/review.vue
@@ -80,6 +80,7 @@ shows the proper details in the map and attribute diff panel (playwright snapsho
       <review-overlay
         v-if="currentItem"
         :item="currentItem"
+        :workspace-type="workspace.type"
         @edit="openEditor"
         @resolve="resolveCurrentChangeset"
         @back="selectedItem = undefined"
@@ -297,7 +298,7 @@ async function resolveCurrentChangeset() {
   }
 }
 
-async function openEditor() {
+async function openEditor(editor: 'rapid' | 'rapid3' = 'rapid') {
   if (!map.value) {
     return;
   }
@@ -306,7 +307,10 @@ async function openEditor() {
 
   await navigateTo({
     path: `/workspace/${workspaceId}/edit`,
-    query: { datatype: reviewList.workspace?.type },
+    query: {
+      datatype: reviewList.workspace?.type,
+      ...(reviewList.workspace?.type === 'osw' ? { editor } : {})
+    },
     hash: `#map=${zoom}/${lat}/${lon}`,
   });
 }
diff --git a/services/workspaces.ts b/services/workspaces.ts
index c2032c2f..e6d03d0f 100644
--- a/services/workspaces.ts
+++ b/services/workspaces.ts
@@ -79,6 +79,10 @@ export class WorkspacesClientError extends Error {
   }
 }
 
+export interface DeleteWorkspaceResult {
+  osmRequestSucceeded: boolean;
+}
+
 export class WorkspacesClient extends BaseHttpClient implements ICancelableClient {
   #tdeiClient: TdeiClient;
   #osmClient: OsmApiClient;
@@ -241,11 +245,15 @@ export class WorkspacesClient extends BaseHttpClient implements ICancelableClien
     );
   }
 
-  async deleteWorkspace(id: WorkspaceId): Promise<void> {
-    await Promise.all([
+  async deleteWorkspace(id: WorkspaceId): Promise<DeleteWorkspaceResult> {
+    const [workspaceDelete, osmDelete] = await Promise.allSettled([
       this._delete(`workspaces/${id}`),
       this.#osmClient.deleteWorkspace(id),
     ]);
+    if (workspaceDelete.status === 'rejected') {
+      throw workspaceDelete.reason;
+    }
+    return { osmRequestSucceeded: osmDelete.status === 'fulfilled' };
   }
 
   async getLongFormQuestSettings(id: WorkspaceId): Promise<QuestSettings> {
diff --git a/test/e2e/dashboard.spec.ts b/test/e2e/dashboard.spec.ts
index afa818d6..df98d7e0 100644
--- a/test/e2e/dashboard.spec.ts
+++ b/test/e2e/dashboard.spec.ts
@@ -340,7 +340,7 @@ test.describe('dashboard', () => {
     expect(bboxRequestCount).toBe(1);
   });
 
-  test('clicking a failed import status loads the latest job and shows its failure response', async ({ page }) => {
+  test('treats a completed import with an unsuccessful response as failed', async ({ page }) => {
     const failedWorkspace = {
       id: 1769,
       type: 'osw',
@@ -357,10 +357,9 @@ test.describe('dashboard', () => {
       externalAppAccess: 0,
       kartaViewToken: null,
       role: 'lead',
-      importStatus: 'failed'
+      importStatus: 'completed'
     };
     const failureMessage = 'Step \'Create Changeset\' failed: no input file was found';
-    let jobsRequestCount = 0;
 
     await seedAuthenticatedSession(page);
     await seedProjectGroupSelection(page, { id: PROJECT_GROUP_ID, name: 'Puget Sound' });
@@ -368,7 +367,6 @@ test.describe('dashboard', () => {
     await page.route('**/project-group-roles/**', route => route.fulfill({ json: projectGroups }));
     await page.route('**/workspaces/1769/bbox', route => route.fulfill({ status: 204 }));
     await page.route('**/workspaces/1769/jobs', (route) => {
-      jobsRequestCount++;
       return route.fulfill({
         json: [{
           id: 2,
@@ -390,10 +388,12 @@ test.describe('dashboard', () => {
     });
 
     await page.goto('/dashboard');
-    await expect(page.locator('.workspace-card-updated')).toContainText('Updated');
-    await expect(page.locator('.dashboard-workspace-updated')).toContainText('Updated');
-    await expect(page.getByText('Updated At', { exact: true })).toBeVisible();
-    await page.getByRole('button', { name: 'View import failure details' }).click();
+    const failedBadge = page.getByRole('button', { name: 'View import failure details' });
+    await expect(failedBadge).toContainText(
+      'Setup failed. Select to view details',
+      { timeout: 30_000 }
+    );
+    await failedBadge.click();
 
     const dialog = page.getByRole('dialog', { name: 'Workspace import failed' });
     await expect(dialog).toBeVisible();
@@ -401,9 +401,72 @@ test.describe('dashboard', () => {
     await expect(dialog).toContainText('STEP_EXECUTION_FAILED');
     await expect(dialog).toContainText('Create Changeset');
     await expect(dialog).not.toContainText('must-not-be-rendered');
-    expect(jobsRequestCount).toBe(1);
   });
+  test('navigates to Create Workspace while a large dashboard is loading', async ({ page }) => {
+    await seedAuthenticatedSession(page);
+
+    const largeWorkspaceList = Array.from({ length: 1_500 }, (_, index) => ({
+      ...aWorkspace,
+      id: index + 1,
+      title: `Workspace ${index + 1}`,
+      createdAt: new Date(
+        Date.UTC(2026, 0, 1, 0, 0, index)
+      ).toISOString()
+    }));
+
+    let notifyMineStarted!: () => void;
+    const mineStarted = new Promise<void>((resolve) => {
+      notifyMineStarted = resolve;
+    });
+
+    await page.route(`${TEST_API_BASE}workspaces/mine`, async (route) => {
+      notifyMineStarted();
+
+      await new Promise(resolve => setTimeout(resolve, 3_000));
+      await route.fulfill({ json: largeWorkspaceList }).catch(() => {});
+    });
+
+    await page.route(
+      `${TEST_API_BASE}tdei-user/project-group-roles/**`,
+      route => route.fulfill({ json: projectGroups })
+    );
+
+    await page.goto('/');
+
+    await page
+      .locator('.app-navbar')
+      .getByRole('link', { name: 'Dashboard', exact: true })
+      .click();
 
+    await mineStarted;
+
+    const createWorkspaceLink = page
+      .locator('.app-navbar')
+      .getByRole('link', {
+        name: 'Create Workspace',
+        exact: true
+      });
+
+    await expect(createWorkspaceLink).toBeVisible();
+    await createWorkspaceLink.click();
+
+    await expect(page).toHaveURL('/workspace/create');
+    await expect(
+      page.getByRole('heading', { name: 'Create a Workspace' })
+    ).toBeVisible();
+
+    await expect(
+      page.getByText('Blank Workspace', { exact: true })
+    ).toBeVisible();
+
+    await expect(
+      page.getByText('From TDEI', { exact: true })
+    ).toBeVisible();
+
+    await expect(
+      page.getByText('From File', { exact: true })
+    ).toBeVisible();
+  });
   // @test e2e: clicking on a dataset updates the metadata panel on the right and shows the data extent in the map
   // BLOCKED: needs the details panel + maplibre map to render. The map calls
   // getWorkspaceBbox (OSM API) and inits maplibre-gl, which requires WebGL in
diff --git a/test/e2e/export-index.spec.ts-snapshots/workspace-export-landing-page-shows-the-Uploa-1641c-Download-boxes-with-their-buttons-snapshot-1.aria.yml b/test/e2e/export-index.spec.ts-snapshots/workspace-export-landing-page-shows-the-Uploa-1641c-Download-boxes-with-their-buttons-snapshot-1.aria.yml
index 049b8694..f35121fe 100644
--- a/test/e2e/export-index.spec.ts-snapshots/workspace-export-landing-page-shows-the-Uploa-1641c-Download-boxes-with-their-buttons-snapshot-1.aria.yml
+++ b/test/e2e/export-index.spec.ts-snapshots/workspace-export-landing-page-shows-the-Uploa-1641c-Download-boxes-with-their-buttons-snapshot-1.aria.yml
@@ -7,5 +7,5 @@
 - heading "Download" [level=2]
 - paragraph: Save the workspace data to your device.
 - paragraph:
-  - emphasis: "Note: press the \"Start Preparing File for Download\" button to prepare the download which may take a minute; when it's ready, the button will change to \"Start\", when you can then press again to download the file to your device."
-- button "Start Preparing File for Download "
\ No newline at end of file
+  - emphasis: "Note: press the \"Start Preparing File for Download\" button to prepare the download which may take a minute; when it's ready, the button will change to \"Save\", which you can then press again to download the file to your device."
+- button "Start Preparing File for Download "
diff --git a/test/e2e/review.spec.ts b/test/e2e/review.spec.ts
index cc8396fa..86d5e418 100644
--- a/test/e2e/review.spec.ts
+++ b/test/e2e/review.spec.ts
@@ -436,6 +436,7 @@ test.describe('workspace review', () => {
     }, { timeout: 30_000 }).toBe(true);
 
     const url = new URL(page.url());
+    expect(url.searchParams.get('editor')).toBe('rapid');
     // Verify that Edit Here targets the selected feedback.
     const [zoom, lat, lon] = url.hash.slice('#map='.length).split('/').map(Number);
     expect(zoom).toBeCloseTo(18);
@@ -443,6 +444,39 @@ test.describe('workspace review', () => {
     expect(lon).toBeCloseTo(selectedFeedback.location_longitude);
   });
 
+  test('selecting Rapid 3 opens that editor at the reviewed location', async ({ page }) => {
+    await seedAuthenticatedSession(page);
+    await stubReviewApis(page);
+    await page.route('https://ecn.*.tiles.virtualearth.net/**', route => route.abort());
+
+    await page.goto('/workspace/1/review');
+
+    const feedbackItem = sidebar(page)
+      .locator('.review-item', { hasText: 'This crossing is hard to navigate' });
+    await feedbackItem.click();
+
+    await expect(page.locator('.maplibregl-popup')).toContainText(selectedFeedback.feedback_text);
+    await expect(page.locator('.map-loading-overlay')).toBeHidden();
+
+    const editorDropdown = page.locator('.review-editor-dropdown');
+    await editorDropdown.locator('.dropdown-toggle').click();
+    await page.getByRole('menuitem', { name: 'Rapid 3 (beta)' }).click();
+
+    await expect.poll(() => {
+      const url = new URL(page.url());
+      return url.pathname === '/workspace/1/edit'
+        && url.searchParams.get('datatype') === 'osw'
+        && url.searchParams.get('editor') === 'rapid3'
+        && /^#map=[^/]+\/[^/]+\/[^/]+$/.test(url.hash);
+    }, { timeout: 30_000 }).toBe(true);
+
+    const url = new URL(page.url());
+    const [zoom, lat, lon] = url.hash.slice('#map='.length).split('/').map(Number);
+    expect(zoom).toBeCloseTo(18);
+    expect(lat).toBeCloseTo(selectedFeedback.location_latitude);
+    expect(lon).toBeCloseTo(selectedFeedback.location_longitude);
+  });
+
   // @test e2e: while the data is loading on the map a spinner appears (assert() this is true)
   test('shows a spinner on the map while data is loading', async ({ page }) => {
     await seedAuthenticatedSession(page);
diff --git a/test/e2e/review.spec.ts-snapshots/workspace-review-clicking-an-item-shows-its-details-and-an-attribute-diff-panel-1.aria.yml b/test/e2e/review.spec.ts-snapshots/workspace-review-clicking-an-item-shows-its-details-and-an-attribute-diff-panel-1.aria.yml
index cab60f3d..3c3a30ed 100644
--- a/test/e2e/review.spec.ts-snapshots/workspace-review-clicking-an-item-shows-its-details-and-an-attribute-diff-panel-1.aria.yml
+++ b/test/e2e/review.spec.ts-snapshots/workspace-review-clicking-an-item-shows-its-details-and-an-attribute-diff-panel-1.aria.yml
@@ -1,5 +1,6 @@
 - navigation:
   - text: "/Feedback: #\\d+/"
   - button " Edit Here"
+  - button "Toggle dropdown"
   - button ""
-  - button " Mark as Resolved"
\ No newline at end of file
+  - button " Mark as Resolved"
diff --git a/test/e2e/settings.spec.ts b/test/e2e/settings.spec.ts
index 46abcd4f..d283fdf1 100644
--- a/test/e2e/settings.spec.ts
+++ b/test/e2e/settings.spec.ts
@@ -104,6 +104,9 @@ function successToast(page: Page) {
 function errorToast(page: Page) {
   return page.locator('.Toastify__toast--error');
 }
+function infoToast(page: Page) {
+  return page.locator('.Toastify__toast--info');
+}
 
 test.describe('workspace settings', () => {
   // @test e2e: the workspace can be renamed with the "Workspace Title" field, then clicking "Rename";
@@ -433,6 +436,34 @@ test.describe('workspace settings', () => {
     await expect(page).toHaveURL(/\/dashboard$/);
   });
 
+  test('shows an info toast when deletion succeeds but OSM cleanup fails', async ({ page }) => {
+    await seedAuthenticatedSession(page);
+    await stubSettings(page);
+
+    await page.route('**/workspaces/1', async (route) => {
+      if (route.request().method() === 'DELETE') {
+        return route.fulfill({ status: 204, body: '' });
+      }
+      return route.fallback();
+    });
+    await page.route('**/osm/**', (route) => {
+      return route.fulfill({ status: 403, body: 'Forbidden' });
+    });
+
+    await page.goto('/workspace/1/settings');
+
+    const del = page.locator('div.card', { hasText: 'Delete Workspace' });
+    await del.getByRole('button', { name: /^I understand/ }).click();
+    await del.getByRole('textbox').fill('delete');
+    await del.getByRole('button', { name: 'Delete this workspace', exact: true }).click();
+
+    await expect(page).toHaveURL(/\/dashboard$/);
+    await expect(infoToast(page)).toContainText(
+      'The workspace has been deleted, but the data may persist for some more time.'
+    );
+    await expect(errorToast(page)).toHaveCount(0);
+  });
+
   // @test e2e: validate that all the API calls used on this page match the Swagger spec and that
   //            success and error states are handled properly with toasts (snapshot these).
   test('all API calls conform to the OpenAPI spec', async ({ page }) => {
diff --git a/test/unit/components/ReviewToolbar.test.ts b/test/unit/components/ReviewToolbar.test.ts
new file mode 100644
index 00000000..5efb49b9
--- /dev/null
+++ b/test/unit/components/ReviewToolbar.test.ts
@@ -0,0 +1,65 @@
+// @vitest-environment nuxt
+
+import { mountSuspended } from '@nuxt/test-utils/runtime';
+import { describe, expect, it, vi } from 'vitest';
+import ReviewToolbar from '~/components/review/Toolbar.vue';
+
+import type { ReviewListItem } from '~/services/review';
+import type { Workspace } from '~/types/workspaces';
+
+vi.mock('~/services/index', () => ({
+  rapid3Manager: {}
+}));
+
+const item = {
+  id: 555,
+  badgeIcon: 'chat_bubble',
+  badgeClass: 'bg-danger',
+  displayType: 'Feedback',
+  isChangeset: false,
+  isFeedback: true,
+  isNote: false,
+  isResolved: false,
+  hasComments: false,
+  commentCount: 0,
+  needsReview: false
+} as ReviewListItem;
+
+const workspace = { role: 'lead' } as Workspace;
+
+describe('ReviewToolbar', () => {
+  it('offers Rapid 2 and Rapid 3 for an OSW workspace', async () => {
+    const wrapper = await mountSuspended(ReviewToolbar, {
+      props: { item, workspaceType: 'osw' },
+      global: { provide: { workspace } }
+    });
+
+    expect(document.body.textContent).toContain('Rapid 2 (default)');
+    expect(document.body.textContent).toContain('Rapid 3 (beta)');
+
+    const buttons = Array.from(document.body.querySelectorAll('button'));
+    const rapid2Button = buttons
+      .find(button => button.textContent?.includes('Rapid 2 (default)'));
+    const rapid3Button = buttons
+      .find(button => button.textContent?.includes('Rapid 3 (beta)'));
+    rapid2Button?.click();
+    rapid3Button?.click();
+    await nextTick();
+
+    expect(wrapper.emitted('edit')).toContainEqual(['rapid']);
+    expect(wrapper.emitted('edit')).toContainEqual(['rapid3']);
+  });
+
+  it('keeps the primary Edit Here action on Rapid 2', async () => {
+    const wrapper = await mountSuspended(ReviewToolbar, {
+      props: { item, workspaceType: 'osw' },
+      global: { provide: { workspace } }
+    });
+
+    const editButton = wrapper.findAll('button')
+      .find(button => button.text().includes('Edit Here'));
+    await editButton?.trigger('click');
+
+    expect(wrapper.emitted('edit')).toContainEqual(['rapid']);
+  });
+});
diff --git a/test/unit/services/workspaces.test.ts b/test/unit/services/workspaces.test.ts
index bfeade8a..cff1cccf 100644
--- a/test/unit/services/workspaces.test.ts
+++ b/test/unit/services/workspaces.test.ts
@@ -174,6 +174,49 @@ describe('WorkspacesClient.createBlankWorkspace', () => {
   });
 });
 
+describe('WorkspacesClient.deleteWorkspace', () => {
+  it('reports failed OSM cleanup after the workspace record is deleted', async () => {
+    const deleteOsmWorkspace = vi.fn().mockRejectedValue(new Error('Forbidden'));
+    const client = new WorkspacesClient(
+      TEST_API_BASE,
+      TEST_API_BASE,
+      tdeiClient,
+      { deleteWorkspace: deleteOsmWorkspace } as unknown as OsmApiClient
+    );
+
+    server.use(
+      http.delete(`${TEST_API_BASE}workspaces/1`, () => {
+        return new HttpResponse(null, { status: 204 });
+      })
+    );
+
+    await expect(client.deleteWorkspace(1)).resolves.toEqual({
+      osmRequestSucceeded: false
+    });
+    expect(deleteOsmWorkspace).toHaveBeenCalledWith(1);
+  });
+
+  it('still rejects when the workspace record cannot be deleted', async () => {
+    const deleteOsmWorkspace = vi.fn().mockResolvedValue(undefined);
+    const client = new WorkspacesClient(
+      TEST_API_BASE,
+      TEST_API_BASE,
+      tdeiClient,
+      { deleteWorkspace: deleteOsmWorkspace } as unknown as OsmApiClient
+    );
+
+    server.use(
+      http.delete(`${TEST_API_BASE}workspaces/1`, () => {
+        return new HttpResponse(null, { status: 500, statusText: 'Server Error' });
+      })
+    );
+
+    await expect(client.deleteWorkspace(1)).rejects.toBeInstanceOf(
+      WorkspacesClientError
+    );
+  });
+});
+
 describe('WorkspacesClient.checkWorkspaceTitleAvailability', () => {
   const LEGACY_API_BASE = 'http://legacy-api.test/';
   const NEW_API_BASE = 'http://new-api.test/';
diff --git a/test/unit/util/workspace-jobs.test.ts b/test/unit/util/workspace-jobs.test.ts
new file mode 100644
index 00000000..a3ed284c
--- /dev/null
+++ b/test/unit/util/workspace-jobs.test.ts
@@ -0,0 +1,77 @@
+import { describe, expect, it } from 'vitest';
+import { findFailedImportJob } from '~/util/workspace-jobs';
+
+import type { WorkspaceJob } from '~/types/workspaces';
+
+function makeJob(overrides: Partial<WorkspaceJob> = {}): WorkspaceJob {
+  return {
+    id: 1,
+    workspace_id: 2632,
+    job_type: 'workspace-import-file',
+    request: {},
+    current_task: 'Create Changeset',
+    response: {
+      success: true,
+      messageCode: 'SUCCESS',
+      message: 'Import completed'
+    },
+    created_at: '2026-10-02T00:00:00Z',
+    updated_at: '2026-10-02T00:00:00Z',
+    status: 'completed',
+    current_task_status: null,
+    ...overrides
+  };
+}
+
+describe('findFailedImportJob', () => {
+  it('treats a completed import with success false as failed', () => {
+    const failedJob = makeJob({
+      response: {
+        success: false,
+        messageCode: 'STEP_EXECUTION_FAILED',
+        message: 'Create Changeset failed'
+      }
+    });
+
+    expect(findFailedImportJob([failedJob])).toBe(failedJob);
+  });
+
+  it('recognizes an explicitly failed import', () => {
+    const failedJob = makeJob({ status: 'failed', response: null });
+
+    expect(findFailedImportJob([failedJob])).toBe(failedJob);
+  });
+
+  it('ignores successful imports and failed non-import jobs', () => {
+    const jobs = [
+      makeJob(),
+      makeJob({
+        id: 2,
+        job_type: 'workspace-export',
+        response: {
+          success: false,
+          messageCode: 'EXPORT_FAILED',
+          message: 'Export failed'
+        }
+      })
+    ];
+
+    expect(findFailedImportJob(jobs)).toBeUndefined();
+  });
+
+  it('does not let an older failed import override the latest successful import', () => {
+    const jobs = [
+      makeJob({ id: 2 }),
+      makeJob({
+        id: 1,
+        response: {
+          success: false,
+          messageCode: 'STEP_EXECUTION_FAILED',
+          message: 'An older import failed'
+        }
+      })
+    ];
+
+    expect(findFailedImportJob(jobs)).toBeUndefined();
+  });
+});
diff --git a/util/workspace-jobs.ts b/util/workspace-jobs.ts
new file mode 100644
index 00000000..997ba71a
--- /dev/null
+++ b/util/workspace-jobs.ts
@@ -0,0 +1,10 @@
+import type { WorkspaceJob } from '~/types/workspaces';
+
+export function findFailedImportJob(jobs: WorkspaceJob[]): WorkspaceJob | undefined {
+  const latestImportJob = jobs.find(job => job.job_type.startsWith('workspace-import'));
+
+  return latestImportJob
+    && (latestImportJob.status === 'failed' || latestImportJob.response?.success === false)
+    ? latestImportJob
+    : undefined;
+}