@shipfox/client-onboarding 12.0.2 → 14.0.0

package/dist/workspace-setup-route.d.ts

@@ -1,9 +1,4 @@
-import { type WorkspaceSetupState } from '@shipfox/client-shell/runtime';
-import type { QueryClient } from '@tanstack/react-query';
-export interface WorkspaceSetupRouteOptions {
-    queryClient: QueryClient;
-    workspaceId: string;
-    pathname: string;
-}
-export declare function loadWorkspaceSetupRoute({ queryClient, workspaceId, pathname, }: WorkspaceSetupRouteOptions): Promise<WorkspaceSetupState>;
+import { type WorkspaceSetupRouteOptions, type WorkspaceSetupState } from '@shipfox/client-shell/runtime';
+export type { WorkspaceSetupRouteOptions } from '@shipfox/client-shell/runtime';
+export declare function loadWorkspaceSetupRoute({ queryClient, workspaceId, workspaceSlug, pathname, }: WorkspaceSetupRouteOptions): Promise<WorkspaceSetupState>;
 //# sourceMappingURL=workspace-setup-route.d.ts.map

package/dist/workspace-setup-route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-setup-route.d.ts","sourceRoot":"","sources":["../src/workspace-setup-route.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,KAAK,mBAAmB,EACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAKvD,MAAM,WAAW,0BAA0B;IACzC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,uBAAuB,CAAC,EAC5C,WAAW,EACX,WAAW,EACX,QAAQ,GACT,EAAE,0BAA0B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAsE3D"}
+{"version":3,"file":"workspace-setup-route.d.ts","sourceRoot":"","sources":["../src/workspace-setup-route.ts"],"names":[],"mappings":"AASA,OAAO,EAGL,KAAK,0BAA0B,EAC/B,KAAK,mBAAmB,EACzB,MAAM,+BAA+B,CAAC;AAMvC,YAAY,EAAC,0BAA0B,EAAC,MAAM,+BAA+B,CAAC;AAE9E,wBAAsB,uBAAuB,CAAC,EAC5C,WAAW,EACX,WAAW,EACX,aAAa,EACb,QAAQ,GACT,EAAE,0BAA0B,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAsE3D"}

package/dist/workspace-setup-route.js

@@ -4,7 +4,7 @@ import { projectExistenceQueryOptions } from '@shipfox/client-projects';
 import { userWorkspacesQueryOptions, WorkspaceSetupLoadError } from '@shipfox/client-shell/runtime';
 import { redirect } from '@tanstack/react-router';
 const TRAILING_SLASHES_RE = /\/+$/u;
-export async function loadWorkspaceSetupRoute({ queryClient, workspaceId, pathname }) {
+export async function loadWorkspaceSetupRoute({ queryClient, workspaceId, workspaceSlug, pathname }) {
     const workspace = await fetchWorkspaceSummary(queryClient, workspaceId);
     const workspaceStatus = workspace?.status;
     switch(workspaceStatus){
@@ -23,11 +23,11 @@ export async function loadWorkspaceSetupRoute({ queryClient, workspaceId, pathna
     const projects = await fetchWorkspaceProjectExistence(queryClient, workspaceId);
     const normalizedPathname = normalizePath(pathname);
     if (projects.projects.length > 0) {
-        if (isIntegrationsIndexPath(normalizedPathname, workspaceId)) {
+        if (isIntegrationsIndexPath(normalizedPathname, workspaceSlug)) {
             throw redirect({
-                to: '/workspaces/$wid/settings/integrations',
+                to: '/w/$workspaceSlug/settings/integrations',
                 params: {
-                    wid: workspaceId
+                    workspaceSlug
                 },
                 replace: true
             });
@@ -39,48 +39,48 @@ export async function loadWorkspaceSetupRoute({ queryClient, workspaceId, pathna
     const sourceConnections = await fetchWorkspaceSourceConnections(queryClient, workspaceId);
     const hasSourceConnection = sourceConnections.length > 0;
     if (!hasSourceConnection) {
-        if (isIntegrationSetupPath(normalizedPathname, workspaceId)) {
+        if (isIntegrationSetupPath(normalizedPathname, workspaceSlug)) {
             return {
                 hideProjectNavigation: true
             };
         }
         throw redirect({
-            to: '/workspaces/$wid/integrations',
+            to: '/w/$workspaceSlug/integrations',
             params: {
-                wid: workspaceId
+                workspaceSlug
             },
             replace: true
         });
     }
-    if (isAgentSettingsPath(normalizedPathname, workspaceId)) {
+    if (isAgentSettingsPath(normalizedPathname, workspaceSlug)) {
         return {
             hideProjectNavigation: true
         };
     }
     const providerHandled = await hasHandledModelProviderOnboarding(queryClient, workspaceId);
     if (!providerHandled) {
-        if (isModelProviderOnboardingPath(normalizedPathname, workspaceId)) {
+        if (isModelProviderOnboardingPath(normalizedPathname, workspaceSlug)) {
             return {
                 hideProjectNavigation: true
             };
         }
         throw redirect({
-            to: '/workspaces/$wid/model-provider',
+            to: '/w/$workspaceSlug/model-provider',
             params: {
-                wid: workspaceId
+                workspaceSlug
             },
             replace: true
         });
     }
-    if (isProjectCreationPath(normalizedPathname, workspaceId)) {
+    if (isProjectCreationPath(normalizedPathname, workspaceSlug)) {
         return {
             hideProjectNavigation: true
         };
     }
     throw redirect({
-        to: '/workspaces/$wid/projects/new',
+        to: '/w/$workspaceSlug/projects/new',
         params: {
-            wid: workspaceId
+            workspaceSlug
         },
         replace: true
     });
@@ -131,24 +131,24 @@ function normalizePath(pathname) {
     if (pathname === '/') return pathname;
     return pathname.replace(TRAILING_SLASHES_RE, '');
 }
-function workspacePath(workspaceId, suffix) {
-    return `/workspaces/${workspaceId}${suffix}`;
+function workspacePath(workspaceSlug, suffix) {
+    return `/w/${workspaceSlug}${suffix}`;
 }
-function isIntegrationsIndexPath(pathname, workspaceId) {
-    return pathname === workspacePath(workspaceId, '/integrations');
+function isIntegrationsIndexPath(pathname, workspaceSlug) {
+    return pathname === workspacePath(workspaceSlug, '/integrations');
 }
-function isIntegrationSetupPath(pathname, workspaceId) {
-    const basePath = workspacePath(workspaceId, '/integrations');
-    return pathname === basePath || pathname.startsWith(`${basePath}/`) || pathname === workspacePath(workspaceId, '/settings/integrations');
+function isIntegrationSetupPath(pathname, workspaceSlug) {
+    const basePath = workspacePath(workspaceSlug, '/integrations');
+    return pathname === basePath || pathname.startsWith(`${basePath}/`) || pathname === workspacePath(workspaceSlug, '/settings/integrations');
 }
-function isProjectCreationPath(pathname, workspaceId) {
-    return pathname === workspacePath(workspaceId, '/projects/new');
+function isProjectCreationPath(pathname, workspaceSlug) {
+    return pathname === workspacePath(workspaceSlug, '/projects/new');
 }
-function isModelProviderOnboardingPath(pathname, workspaceId) {
-    return pathname === workspacePath(workspaceId, '/model-provider');
+function isModelProviderOnboardingPath(pathname, workspaceSlug) {
+    return pathname === workspacePath(workspaceSlug, '/model-provider');
 }
-function isAgentSettingsPath(pathname, workspaceId) {
-    return pathname === workspacePath(workspaceId, '/settings/agents');
+function isAgentSettingsPath(pathname, workspaceSlug) {
+    return pathname === workspacePath(workspaceSlug, '/settings/agents');
 }
 
 //# sourceMappingURL=workspace-setup-route.js.map

package/dist/workspace-setup-route.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/workspace-setup-route.ts"],"sourcesContent":["import {\n  isModelProviderOnboardingDismissed,\n  modelProviderConfigsQueryOptions,\n} from '@shipfox/client-agent';\nimport {\n  type IntegrationConnection,\n  sourceConnectionsQueryOptions,\n} from '@shipfox/client-integrations';\nimport {projectExistenceQueryOptions} from '@shipfox/client-projects';\nimport {\n  userWorkspacesQueryOptions,\n  WorkspaceSetupLoadError,\n  type WorkspaceSetupState,\n} from '@shipfox/client-shell/runtime';\nimport type {QueryClient} from '@tanstack/react-query';\nimport {redirect} from '@tanstack/react-router';\n\nconst TRAILING_SLASHES_RE = /\\/+$/u;\n\nexport interface WorkspaceSetupRouteOptions {\n  queryClient: QueryClient;\n  workspaceId: string;\n  pathname: string;\n}\n\nexport async function loadWorkspaceSetupRoute({\n  queryClient,\n  workspaceId,\n  pathname,\n}: WorkspaceSetupRouteOptions): Promise<WorkspaceSetupState> {\n  const workspace = await fetchWorkspaceSummary(queryClient, workspaceId);\n  const workspaceStatus = workspace?.status;\n  switch (workspaceStatus) {\n    case undefined:\n    case 'active':\n      break;\n    case 'suspended':\n    case 'deleted':\n      return {hideProjectNavigation: true, unavailable: true};\n    default:\n      return assertNever(workspaceStatus);\n  }\n\n  const projects = await fetchWorkspaceProjectExistence(queryClient, workspaceId);\n  const normalizedPathname = normalizePath(pathname);\n\n  if (projects.projects.length > 0) {\n    if (isIntegrationsIndexPath(normalizedPathname, workspaceId)) {\n      throw redirect({\n        to: '/workspaces/$wid/settings/integrations',\n        params: {wid: workspaceId},\n        replace: true,\n      });\n    }\n\n    return {hideProjectNavigation: false};\n  }\n\n  const sourceConnections = await fetchWorkspaceSourceConnections(queryClient, workspaceId);\n  const hasSourceConnection = sourceConnections.length > 0;\n\n  if (!hasSourceConnection) {\n    if (isIntegrationSetupPath(normalizedPathname, workspaceId)) {\n      return {hideProjectNavigation: true};\n    }\n\n    throw redirect({\n      to: '/workspaces/$wid/integrations',\n      params: {wid: workspaceId},\n      replace: true,\n    });\n  }\n\n  if (isAgentSettingsPath(normalizedPathname, workspaceId)) {\n    return {hideProjectNavigation: true};\n  }\n\n  const providerHandled = await hasHandledModelProviderOnboarding(queryClient, workspaceId);\n  if (!providerHandled) {\n    if (isModelProviderOnboardingPath(normalizedPathname, workspaceId)) {\n      return {hideProjectNavigation: true};\n    }\n\n    throw redirect({\n      to: '/workspaces/$wid/model-provider',\n      params: {wid: workspaceId},\n      replace: true,\n    });\n  }\n\n  if (isProjectCreationPath(normalizedPathname, workspaceId)) {\n    return {hideProjectNavigation: true};\n  }\n\n  throw redirect({\n    to: '/workspaces/$wid/projects/new',\n    params: {wid: workspaceId},\n    replace: true,\n  });\n}\n\nfunction assertNever(value: never): never {\n  throw new Error(`Unhandled workspace status: ${JSON.stringify(value)}`);\n}\n\nasync function fetchWorkspaceSummary(queryClient: QueryClient, workspaceId: string) {\n  try {\n    const result = await queryClient.fetchQuery(userWorkspacesQueryOptions());\n    return result.memberships.find((workspace) => workspace.id === workspaceId);\n  } catch (error) {\n    throw new WorkspaceSetupLoadError(error);\n  }\n}\n\nasync function fetchWorkspaceProjectExistence(queryClient: QueryClient, workspaceId: string) {\n  const options = projectExistenceQueryOptions(workspaceId);\n\n  try {\n    return await queryClient.fetchQuery(options);\n  } catch (error) {\n    const cached = queryClient.getQueryData<{projects: unknown[]}>(options.queryKey);\n    if (cached !== undefined) return cached;\n    throw new WorkspaceSetupLoadError(error);\n  }\n}\n\nasync function fetchWorkspaceSourceConnections(queryClient: QueryClient, workspaceId: string) {\n  const options = sourceConnectionsQueryOptions(workspaceId);\n\n  try {\n    return await queryClient.fetchQuery(options);\n  } catch (error) {\n    const cached = queryClient.getQueryData<IntegrationConnection[]>(options.queryKey);\n    if (cached !== undefined) return cached;\n    throw new WorkspaceSetupLoadError(error);\n  }\n}\n\nasync function hasHandledModelProviderOnboarding(\n  queryClient: QueryClient,\n  workspaceId: string,\n): Promise<boolean> {\n  if (isModelProviderOnboardingDismissed(workspaceId)) return true;\n\n  const options = modelProviderConfigsQueryOptions(workspaceId);\n  try {\n    const configs = await queryClient.fetchQuery(options);\n    return configs.configs.length > 0;\n  } catch {\n    const cached = queryClient.getQueryData<{configs: unknown[]}>(options.queryKey);\n    return cached?.configs.length !== 0;\n  }\n}\n\nfunction normalizePath(pathname: string) {\n  if (pathname === '/') return pathname;\n  return pathname.replace(TRAILING_SLASHES_RE, '');\n}\n\nfunction workspacePath(workspaceId: string, suffix: string) {\n  return `/workspaces/${workspaceId}${suffix}`;\n}\n\nfunction isIntegrationsIndexPath(pathname: string, workspaceId: string) {\n  return pathname === workspacePath(workspaceId, '/integrations');\n}\n\nfunction isIntegrationSetupPath(pathname: string, workspaceId: string) {\n  const basePath = workspacePath(workspaceId, '/integrations');\n  return (\n    pathname === basePath ||\n    pathname.startsWith(`${basePath}/`) ||\n    pathname === workspacePath(workspaceId, '/settings/integrations')\n  );\n}\n\nfunction isProjectCreationPath(pathname: string, workspaceId: string) {\n  return pathname === workspacePath(workspaceId, '/projects/new');\n}\n\nfunction isModelProviderOnboardingPath(pathname: string, workspaceId: string) {\n  return pathname === workspacePath(workspaceId, '/model-provider');\n}\n\nfunction isAgentSettingsPath(pathname: string, workspaceId: string) {\n  return pathname === workspacePath(workspaceId, '/settings/agents');\n}\n"],"names":["isModelProviderOnboardingDismissed","modelProviderConfigsQueryOptions","sourceConnectionsQueryOptions","projectExistenceQueryOptions","userWorkspacesQueryOptions","WorkspaceSetupLoadError","redirect","TRAILING_SLASHES_RE","loadWorkspaceSetupRoute","queryClient","workspaceId","pathname","workspace","fetchWorkspaceSummary","workspaceStatus","status","undefined","hideProjectNavigation","unavailable","assertNever","projects","fetchWorkspaceProjectExistence","normalizedPathname","normalizePath","length","isIntegrationsIndexPath","to","params","wid","replace","sourceConnections","fetchWorkspaceSourceConnections","hasSourceConnection","isIntegrationSetupPath","isAgentSettingsPath","providerHandled","hasHandledModelProviderOnboarding","isModelProviderOnboardingPath","isProjectCreationPath","value","Error","JSON","stringify","result","fetchQuery","memberships","find","id","error","options","cached","getQueryData","queryKey","configs","workspacePath","suffix","basePath","startsWith"],"mappings":"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"}
+{"version":3,"sources":["../src/workspace-setup-route.ts"],"sourcesContent":["import {\n  isModelProviderOnboardingDismissed,\n  modelProviderConfigsQueryOptions,\n} from '@shipfox/client-agent';\nimport {\n  type IntegrationConnection,\n  sourceConnectionsQueryOptions,\n} from '@shipfox/client-integrations';\nimport {projectExistenceQueryOptions} from '@shipfox/client-projects';\nimport {\n  userWorkspacesQueryOptions,\n  WorkspaceSetupLoadError,\n  type WorkspaceSetupRouteOptions,\n  type WorkspaceSetupState,\n} from '@shipfox/client-shell/runtime';\nimport type {QueryClient} from '@tanstack/react-query';\nimport {redirect} from '@tanstack/react-router';\n\nconst TRAILING_SLASHES_RE = /\\/+$/u;\n\nexport type {WorkspaceSetupRouteOptions} from '@shipfox/client-shell/runtime';\n\nexport async function loadWorkspaceSetupRoute({\n  queryClient,\n  workspaceId,\n  workspaceSlug,\n  pathname,\n}: WorkspaceSetupRouteOptions): Promise<WorkspaceSetupState> {\n  const workspace = await fetchWorkspaceSummary(queryClient, workspaceId);\n  const workspaceStatus = workspace?.status;\n  switch (workspaceStatus) {\n    case undefined:\n    case 'active':\n      break;\n    case 'suspended':\n    case 'deleted':\n      return {hideProjectNavigation: true, unavailable: true};\n    default:\n      return assertNever(workspaceStatus);\n  }\n\n  const projects = await fetchWorkspaceProjectExistence(queryClient, workspaceId);\n  const normalizedPathname = normalizePath(pathname);\n\n  if (projects.projects.length > 0) {\n    if (isIntegrationsIndexPath(normalizedPathname, workspaceSlug)) {\n      throw redirect({\n        to: '/w/$workspaceSlug/settings/integrations',\n        params: {workspaceSlug},\n        replace: true,\n      });\n    }\n\n    return {hideProjectNavigation: false};\n  }\n\n  const sourceConnections = await fetchWorkspaceSourceConnections(queryClient, workspaceId);\n  const hasSourceConnection = sourceConnections.length > 0;\n\n  if (!hasSourceConnection) {\n    if (isIntegrationSetupPath(normalizedPathname, workspaceSlug)) {\n      return {hideProjectNavigation: true};\n    }\n\n    throw redirect({\n      to: '/w/$workspaceSlug/integrations',\n      params: {workspaceSlug},\n      replace: true,\n    });\n  }\n\n  if (isAgentSettingsPath(normalizedPathname, workspaceSlug)) {\n    return {hideProjectNavigation: true};\n  }\n\n  const providerHandled = await hasHandledModelProviderOnboarding(queryClient, workspaceId);\n  if (!providerHandled) {\n    if (isModelProviderOnboardingPath(normalizedPathname, workspaceSlug)) {\n      return {hideProjectNavigation: true};\n    }\n\n    throw redirect({\n      to: '/w/$workspaceSlug/model-provider',\n      params: {workspaceSlug},\n      replace: true,\n    });\n  }\n\n  if (isProjectCreationPath(normalizedPathname, workspaceSlug)) {\n    return {hideProjectNavigation: true};\n  }\n\n  throw redirect({\n    to: '/w/$workspaceSlug/projects/new',\n    params: {workspaceSlug},\n    replace: true,\n  });\n}\n\nfunction assertNever(value: never): never {\n  throw new Error(`Unhandled workspace status: ${JSON.stringify(value)}`);\n}\n\nasync function fetchWorkspaceSummary(queryClient: QueryClient, workspaceId: string) {\n  try {\n    const result = await queryClient.fetchQuery(userWorkspacesQueryOptions());\n    return result.memberships.find((workspace) => workspace.id === workspaceId);\n  } catch (error) {\n    throw new WorkspaceSetupLoadError(error);\n  }\n}\n\nasync function fetchWorkspaceProjectExistence(queryClient: QueryClient, workspaceId: string) {\n  const options = projectExistenceQueryOptions(workspaceId);\n\n  try {\n    return await queryClient.fetchQuery(options);\n  } catch (error) {\n    const cached = queryClient.getQueryData<{projects: unknown[]}>(options.queryKey);\n    if (cached !== undefined) return cached;\n    throw new WorkspaceSetupLoadError(error);\n  }\n}\n\nasync function fetchWorkspaceSourceConnections(queryClient: QueryClient, workspaceId: string) {\n  const options = sourceConnectionsQueryOptions(workspaceId);\n\n  try {\n    return await queryClient.fetchQuery(options);\n  } catch (error) {\n    const cached = queryClient.getQueryData<IntegrationConnection[]>(options.queryKey);\n    if (cached !== undefined) return cached;\n    throw new WorkspaceSetupLoadError(error);\n  }\n}\n\nasync function hasHandledModelProviderOnboarding(\n  queryClient: QueryClient,\n  workspaceId: string,\n): Promise<boolean> {\n  if (isModelProviderOnboardingDismissed(workspaceId)) return true;\n\n  const options = modelProviderConfigsQueryOptions(workspaceId);\n  try {\n    const configs = await queryClient.fetchQuery(options);\n    return configs.configs.length > 0;\n  } catch {\n    const cached = queryClient.getQueryData<{configs: unknown[]}>(options.queryKey);\n    return cached?.configs.length !== 0;\n  }\n}\n\nfunction normalizePath(pathname: string) {\n  if (pathname === '/') return pathname;\n  return pathname.replace(TRAILING_SLASHES_RE, '');\n}\n\nfunction workspacePath(workspaceSlug: string, suffix: string) {\n  return `/w/${workspaceSlug}${suffix}`;\n}\n\nfunction isIntegrationsIndexPath(pathname: string, workspaceSlug: string) {\n  return pathname === workspacePath(workspaceSlug, '/integrations');\n}\n\nfunction isIntegrationSetupPath(pathname: string, workspaceSlug: string) {\n  const basePath = workspacePath(workspaceSlug, '/integrations');\n  return (\n    pathname === basePath ||\n    pathname.startsWith(`${basePath}/`) ||\n    pathname === workspacePath(workspaceSlug, '/settings/integrations')\n  );\n}\n\nfunction isProjectCreationPath(pathname: string, workspaceSlug: string) {\n  return pathname === workspacePath(workspaceSlug, '/projects/new');\n}\n\nfunction isModelProviderOnboardingPath(pathname: string, workspaceSlug: string) {\n  return pathname === workspacePath(workspaceSlug, '/model-provider');\n}\n\nfunction isAgentSettingsPath(pathname: string, workspaceSlug: string) {\n  return pathname === workspacePath(workspaceSlug, '/settings/agents');\n}\n"],"names":["isModelProviderOnboardingDismissed","modelProviderConfigsQueryOptions","sourceConnectionsQueryOptions","projectExistenceQueryOptions","userWorkspacesQueryOptions","WorkspaceSetupLoadError","redirect","TRAILING_SLASHES_RE","loadWorkspaceSetupRoute","queryClient","workspaceId","workspaceSlug","pathname","workspace","fetchWorkspaceSummary","workspaceStatus","status","undefined","hideProjectNavigation","unavailable","assertNever","projects","fetchWorkspaceProjectExistence","normalizedPathname","normalizePath","length","isIntegrationsIndexPath","to","params","replace","sourceConnections","fetchWorkspaceSourceConnections","hasSourceConnection","isIntegrationSetupPath","isAgentSettingsPath","providerHandled","hasHandledModelProviderOnboarding","isModelProviderOnboardingPath","isProjectCreationPath","value","Error","JSON","stringify","result","fetchQuery","memberships","find","id","error","options","cached","getQueryData","queryKey","configs","workspacePath","suffix","basePath","startsWith"],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/client-onboarding",
   "license": "MIT",
-  "version": "12.0.2",
+  "version": "14.0.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -18,10 +18,10 @@
   },
   "dependencies": {
     "@swc/helpers": "^0.5.17",
-    "@shipfox/client-agent": "12.0.2",
-    "@shipfox/client-integrations": "12.0.2",
-    "@shipfox/client-projects": "12.0.2",
-    "@shipfox/client-shell": "12.0.2"
+    "@shipfox/client-agent": "14.0.0",
+    "@shipfox/client-integrations": "14.0.0",
+    "@shipfox/client-projects": "14.0.0",
+    "@shipfox/client-shell": "14.0.0"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.101.0",

package/src/workspace-setup-route.test.tsx

@@ -28,6 +28,7 @@ import {act, cleanup, fireEvent, render, screen, waitFor} from '@testing-library
 import {loadWorkspaceSetupRoute} from './workspace-setup-route.js';
 
 const WORKSPACE_ID = '11111111-1111-4111-8111-111111111111';
+const WORKSPACE_SLUG = 'acme';
 const MEMBERSHIP_ID = '44444444-4444-4444-8444-444444444444';
 const USER_ID = '55555555-5555-4555-8555-555555555555';
 
@@ -56,7 +57,7 @@ function sourceConnection(overrides: {lifecycle_status?: string} = {}) {
 }
 
 // The query cache stores the mapped domain shape (camelCase), not the wire
-// DTO `sourceConnection()` mocks for fetch responses — keep this seed in sync
+// DTO `sourceConnection()` mocks for fetch responses: keep this seed in sync
 // with `toIntegrationConnection` in client-integrations.
 function cachedSourceConnection() {
   return {
@@ -109,6 +110,7 @@ function setupFetch(options: SetupFetchOptions = {}) {
               user_id: USER_ID,
               workspace_id: WORKSPACE_ID,
               workspace_name: 'Workspace',
+              workspace_slug: 'workspace',
               workspace_status: workspaceStatus,
               created_at: new Date().toISOString(),
               updated_at: new Date().toISOString(),
@@ -160,7 +162,8 @@ function renderSetupRoute(
       beforeLoad: ({context, location, params}) =>
         loadWorkspaceSetupRoute({
           queryClient: context.queryClient,
-          workspaceId: (params as {wid: string}).wid,
+          workspaceId: WORKSPACE_ID,
+          workspaceSlug: (params as {workspaceSlug: string}).workspaceSlug,
           pathname: location.pathname,
         }),
       pendingComponent: FullPageLoader,
@@ -168,13 +171,13 @@ function renderSetupRoute(
       component: () => <GuardedRoute label={label} />,
     });
   const routeTree = rootRoute.addChildren([
-    guardedRoute('/workspaces/$wid', 'Workspace home'),
-    guardedRoute('/workspaces/$wid/model-provider', 'Model provider onboarding'),
-    guardedRoute('/workspaces/$wid/integrations', 'VCS onboarding'),
-    guardedRoute('/workspaces/$wid/integrations/gitea', 'Gitea install'),
-    guardedRoute('/workspaces/$wid/projects/new', 'Create project'),
-    guardedRoute('/workspaces/$wid/settings/agents', 'Settings agents'),
-    guardedRoute('/workspaces/$wid/settings/integrations', 'Settings integrations'),
+    guardedRoute('/w/$workspaceSlug', 'Workspace home'),
+    guardedRoute('/w/$workspaceSlug/model-provider', 'Model provider onboarding'),
+    guardedRoute('/w/$workspaceSlug/integrations', 'VCS onboarding'),
+    guardedRoute('/w/$workspaceSlug/integrations/gitea', 'Gitea install'),
+    guardedRoute('/w/$workspaceSlug/projects/new', 'Create project'),
+    guardedRoute('/w/$workspaceSlug/settings/agents', 'Settings agents'),
+    guardedRoute('/w/$workspaceSlug/settings/integrations', 'Settings integrations'),
   ]);
   const router = createRouter({
     defaultPendingMs: 0,
@@ -210,6 +213,7 @@ function projectStub() {
     id: '22222222-2222-4222-8222-222222222222',
     workspace_id: WORKSPACE_ID,
     name: 'Platform',
+    slug: 'platform',
     source: {
       connection_id: '33333333-3333-4333-8333-333333333333',
       external_repository_id: 'platform',
@@ -243,14 +247,14 @@ describe('workspace setup route hook', () => {
   });
 
   test('renders a loader while the project existence query is pending', async () => {
-    renderSetupRoute(`/workspaces/${WORKSPACE_ID}`, setupFetch({projectsPending: true}));
+    renderSetupRoute(`/w/${WORKSPACE_SLUG}`, setupFetch({projectsPending: true}));
 
     expect(await screen.findByRole('status', {name: 'Loading'})).toBeInTheDocument();
     expect(screen.queryByText('Workspace home')).not.toBeInTheDocument();
   });
 
   test('renders a retryable setup-status error when the project query fails', async () => {
-    renderSetupRoute(`/workspaces/${WORKSPACE_ID}`, setupFetch({projectsFail: true}));
+    renderSetupRoute(`/w/${WORKSPACE_SLUG}`, setupFetch({projectsFail: true}));
 
     expect(await screen.findByText('Could not load workspace setup')).toBeInTheDocument();
     expect(screen.getByRole('button', {name: 'Retry'})).toBeInTheDocument();
@@ -263,7 +267,7 @@ describe('workspace setup route hook', () => {
   ] as const)('stops workspace setup for a %s workspace before loading workspace data', async (workspaceStatus) => {
     const fetchImpl = setupFetch({workspaceStatus, projectsPending: true});
 
-    renderSetupRoute(`/workspaces/${WORKSPACE_ID}`, fetchImpl);
+    renderSetupRoute(`/w/${WORKSPACE_SLUG}`, fetchImpl);
 
     expect(await screen.findByText('Workspace unavailable')).toBeInTheDocument();
     expect(screen.getByTestId('project-navigation')).toHaveTextContent('hidden');
@@ -273,7 +277,7 @@ describe('workspace setup route hook', () => {
   test('allows normal workspace content and skips source connections when a project exists', async () => {
     const fetchImpl = setupFetch({projects: [projectStub()]});
 
-    renderSetupRoute(`/workspaces/${WORKSPACE_ID}`, fetchImpl);
+    renderSetupRoute(`/w/${WORKSPACE_SLUG}`, fetchImpl);
 
     expect(await screen.findByText('Workspace home')).toBeInTheDocument();
     expect(screen.getByTestId('project-navigation')).toHaveTextContent('visible');
@@ -285,7 +289,7 @@ describe('workspace setup route hook', () => {
   test('keeps cached completed-workspace state when the project refetch fails', async () => {
     const fetchImpl = setupFetch({projectsFail: true});
 
-    renderSetupRoute(`/workspaces/${WORKSPACE_ID}`, fetchImpl, {
+    renderSetupRoute(`/w/${WORKSPACE_SLUG}`, fetchImpl, {
       seedQueryClient: (queryClient) => {
         queryClient.setQueryData(projectExistenceQueryOptions(WORKSPACE_ID).queryKey, {
           projects: [projectStub()] as never,
@@ -312,17 +316,14 @@ describe('workspace setup route hook', () => {
       connections: [sourceConnection({lifecycle_status: 'disabled'})],
     });
 
-    renderSetupRoute(`/workspaces/${WORKSPACE_ID}`, fetchImpl);
+    renderSetupRoute(`/w/${WORKSPACE_SLUG}`, fetchImpl);
 
     expect(await screen.findByText('VCS onboarding')).toBeInTheDocument();
     expect(screen.getByTestId('project-navigation')).toHaveTextContent('hidden');
   });
 
   test('keeps integrations settings available before source-control onboarding', async () => {
-    renderSetupRoute(
-      `/workspaces/${WORKSPACE_ID}/settings/integrations`,
-      setupFetch({connections: []}),
-    );
+    renderSetupRoute(`/w/${WORKSPACE_SLUG}/settings/integrations`, setupFetch({connections: []}));
 
     expect(await screen.findByText('Settings integrations')).toBeInTheDocument();
     expect(screen.getByTestId('project-navigation')).toHaveTextContent('hidden');
@@ -330,7 +331,7 @@ describe('workspace setup route hook', () => {
 
   test('sends a workspace with active VCS and no project to project creation', async () => {
     renderSetupRoute(
-      `/workspaces/${WORKSPACE_ID}/integrations`,
+      `/w/${WORKSPACE_SLUG}/integrations`,
       setupFetch({connections: [sourceConnection()]}),
     );
 
@@ -340,7 +341,7 @@ describe('workspace setup route hook', () => {
 
   test('sends a source-connected workspace with no provider config to provider onboarding', async () => {
     renderSetupRoute(
-      `/workspaces/${WORKSPACE_ID}/integrations`,
+      `/w/${WORKSPACE_SLUG}/integrations`,
       setupFetch({
         connections: [sourceConnection()],
         providerConfigs: [],
@@ -354,7 +355,7 @@ describe('workspace setup route hook', () => {
 
   test('keeps the provider onboarding route available while provider setup is pending', async () => {
     renderSetupRoute(
-      `/workspaces/${WORKSPACE_ID}/model-provider`,
+      `/w/${WORKSPACE_SLUG}/model-provider`,
       setupFetch({
         connections: [sourceConnection()],
         providerConfigs: [],
@@ -368,7 +369,7 @@ describe('workspace setup route hook', () => {
 
   test('keeps model provider settings available before first project creation', async () => {
     renderSetupRoute(
-      `/workspaces/${WORKSPACE_ID}/settings/agents`,
+      `/w/${WORKSPACE_SLUG}/settings/agents`,
       setupFetch({
         connections: [sourceConnection()],
         providerConfigs: [],
@@ -384,7 +385,7 @@ describe('workspace setup route hook', () => {
     const fetchImpl = setupFetch({connections: [sourceConnection()]});
     dismissModelProviderOnboarding(WORKSPACE_ID);
 
-    renderSetupRoute(`/workspaces/${WORKSPACE_ID}`, fetchImpl);
+    renderSetupRoute(`/w/${WORKSPACE_SLUG}`, fetchImpl);
 
     expect(await screen.findByText('Create project')).toBeInTheDocument();
     expect(calledUrls(fetchImpl).some((url) => url.endsWith('/agent/model-providers'))).toBe(false);
@@ -393,7 +394,7 @@ describe('workspace setup route hook', () => {
   test('uses cached provider config state when the provider config refetch fails', async () => {
     const fetchImpl = setupFetch({connections: [sourceConnection()], providerConfigsFail: true});
 
-    renderSetupRoute(`/workspaces/${WORKSPACE_ID}`, fetchImpl, {
+    renderSetupRoute(`/w/${WORKSPACE_SLUG}`, fetchImpl, {
       seedQueryClient: (queryClient) => {
         queryClient.setQueryData(modelProviderConfigsQueryOptions(WORKSPACE_ID).queryKey, {
           configs: [
@@ -422,7 +423,7 @@ describe('workspace setup route hook', () => {
 
   test('fails open to project creation when provider configs cannot load without cache', async () => {
     renderSetupRoute(
-      `/workspaces/${WORKSPACE_ID}`,
+      `/w/${WORKSPACE_SLUG}`,
       setupFetch({connections: [sourceConnection()], providerConfigsFail: true}),
     );
 
@@ -433,7 +434,7 @@ describe('workspace setup route hook', () => {
   test('keeps cached source-connection state when the source refetch fails', async () => {
     const fetchImpl = setupFetch({connectionsFail: true});
 
-    renderSetupRoute(`/workspaces/${WORKSPACE_ID}`, fetchImpl, {
+    renderSetupRoute(`/w/${WORKSPACE_SLUG}`, fetchImpl, {
       seedQueryClient: (queryClient) => {
         queryClient.setQueryData(sourceConnectionsQueryOptions(WORKSPACE_ID).queryKey, [
           cachedSourceConnection(),
@@ -452,10 +453,7 @@ describe('workspace setup route hook', () => {
   });
 
   test('redirects the completed workspace integrations index to settings integrations', async () => {
-    renderSetupRoute(
-      `/workspaces/${WORKSPACE_ID}/integrations`,
-      setupFetch({projects: [projectStub()]}),
-    );
+    renderSetupRoute(`/w/${WORKSPACE_SLUG}/integrations`, setupFetch({projects: [projectStub()]}));
 
     expect(await screen.findByText('Settings integrations')).toBeInTheDocument();
     expect(screen.getByTestId('project-navigation')).toHaveTextContent('visible');
@@ -463,7 +461,7 @@ describe('workspace setup route hook', () => {
 
   test('keeps completed workspace integration install routes available', async () => {
     renderSetupRoute(
-      `/workspaces/${WORKSPACE_ID}/integrations/gitea`,
+      `/w/${WORKSPACE_SLUG}/integrations/gitea`,
       setupFetch({projects: [projectStub()]}),
     );
 
@@ -472,7 +470,7 @@ describe('workspace setup route hook', () => {
   });
 
   test('renders a retryable setup-status error when the source connection query fails', async () => {
-    renderSetupRoute(`/workspaces/${WORKSPACE_ID}`, setupFetch({connectionsFail: true}));
+    renderSetupRoute(`/w/${WORKSPACE_SLUG}`, setupFetch({connectionsFail: true}));
 
     expect(await screen.findByText('Could not load workspace setup')).toBeInTheDocument();
     expect(screen.getByRole('button', {name: 'Retry'})).toBeInTheDocument();
@@ -492,6 +490,7 @@ describe('workspace setup route hook', () => {
                 user_id: USER_ID,
                 workspace_id: WORKSPACE_ID,
                 workspace_name: 'Workspace',
+                workspace_slug: 'workspace',
                 workspace_status: 'active',
                 created_at: new Date().toISOString(),
                 updated_at: new Date().toISOString(),
@@ -509,7 +508,7 @@ describe('workspace setup route hook', () => {
       return Promise.resolve(jsonResponse({}, {status: 404}));
     });
 
-    renderSetupRoute(`/workspaces/${WORKSPACE_ID}`, fetchImpl);
+    renderSetupRoute(`/w/${WORKSPACE_SLUG}`, fetchImpl);
 
     fireEvent.click(await screen.findByRole('button', {name: 'Retry'}));
 
@@ -519,14 +518,14 @@ describe('workspace setup route hook', () => {
 
   test('re-evaluates the guard on navigation between children without refetching fresh existence', async () => {
     const fetchImpl = setupFetch({projects: [projectStub()]});
-    const {router} = renderSetupRoute(`/workspaces/${WORKSPACE_ID}`, fetchImpl);
+    const {router} = renderSetupRoute(`/w/${WORKSPACE_SLUG}`, fetchImpl);
 
     expect(await screen.findByText('Workspace home')).toBeInTheDocument();
 
     await act(async () => {
       await router.navigate({
-        to: '/workspaces/$wid/integrations',
-        params: {wid: WORKSPACE_ID},
+        to: '/w/$workspaceSlug/integrations',
+        params: {workspaceSlug: WORKSPACE_SLUG},
       });
     });
 
@@ -548,6 +547,7 @@ describe('workspace setup route hook', () => {
                 user_id: USER_ID,
                 workspace_id: WORKSPACE_ID,
                 workspace_name: 'Workspace',
+                workspace_slug: 'workspace',
                 workspace_status: 'active',
                 created_at: new Date().toISOString(),
                 updated_at: new Date().toISOString(),
@@ -564,7 +564,7 @@ describe('workspace setup route hook', () => {
       }
       return Promise.resolve(jsonResponse({}, {status: 404}));
     });
-    const {queryClient, router} = renderSetupRoute(`/workspaces/${WORKSPACE_ID}`, fetchImpl);
+    const {queryClient, router} = renderSetupRoute(`/w/${WORKSPACE_SLUG}`, fetchImpl);
 
     expect(await screen.findByText('Create project')).toBeInTheDocument();
     projects = [projectStub()];
@@ -576,8 +576,8 @@ describe('workspace setup route hook', () => {
 
     await act(async () => {
       await router.navigate({
-        to: '/workspaces/$wid',
-        params: {wid: WORKSPACE_ID},
+        to: '/w/$workspaceSlug',
+        params: {workspaceSlug: WORKSPACE_SLUG},
       });
     });
 
@@ -592,14 +592,14 @@ describe('workspace setup route hook', () => {
     });
     const throwingRoute = createRoute({
       getParentRoute: () => rootRoute,
-      path: '/workspaces/$wid',
+      path: '/w/$workspaceSlug',
       beforeLoad: () => ({hideProjectNavigation: false}),
       errorComponent: WorkspaceLayoutErrorRoute,
       component: ThrowingWorkspaceRoute,
     });
     const router = createRouter({
       defaultPendingMs: 0,
-      history: createMemoryHistory({initialEntries: [`/workspaces/${WORKSPACE_ID}`]}),
+      history: createMemoryHistory({initialEntries: [`/w/${WORKSPACE_SLUG}`]}),
       routeTree: rootRoute.addChildren([throwingRoute]),
       context: {queryClient},
     });
@@ -617,13 +617,13 @@ describe('workspace setup route hook', () => {
     });
     const layoutRoute = createRoute({
       getParentRoute: () => rootRoute,
-      path: '/workspaces/$wid',
+      path: '/w/$workspaceSlug',
       beforeLoad: () => undefined,
       component: WorkspaceLayoutParity,
     });
     const router = createRouter({
       defaultPendingMs: 0,
-      history: createMemoryHistory({initialEntries: [`/workspaces/${WORKSPACE_ID}`]}),
+      history: createMemoryHistory({initialEntries: [`/w/${WORKSPACE_SLUG}`]}),
       routeTree: rootRoute.addChildren([layoutRoute]),
       context: {queryClient},
     });