feat(workspace): add workspaceId to url

apps/sim/.env.example

@@ -0,0 +1,19 @@
+# Database (Required)
+DATABASE_URL="postgresql://postgres:password@localhost:5432/postgres"
+
+# Authentication (Required)
+BETTER_AUTH_SECRET=your_secret_key  # Use `openssl rand -hex 32` to generate, or visit https://www.better-auth.com/docs/installation
+BETTER_AUTH_URL=http://localhost:3000
+
+# NextJS (Required)
+NEXT_PUBLIC_APP_URL=http://localhost:3000
+
+# Security (Required)
+ENCRYPTION_KEY=your_encryption_key  # Use `openssl rand -hex 32` to generate
+
+# Email Provider (Optional)
+# RESEND_API_KEY=  # Uncomment and add your key from https://resend.com to send actual emails
+                   # If left commented out, emails will be logged to console instead
+
+# Freestyle API Key (Required for sandboxed code execution for functions/custom-tools)
+# FREESTYLE_API_KEY= # Uncomment and add your key from https://docs.freestyle.sh/Getting-Started/run

apps/sim/app/(auth)/components/social-login-buttons.tsx

@@ -17,7 +17,7 @@ interface SocialLoginButtonsProps {
 export function SocialLoginButtons({
   githubAvailable,
   googleAvailable,
-  callbackURL = '/w',
+  callbackURL = '/workspace',
   isProduction,
 }: SocialLoginButtonsProps) {
   const [isGithubLoading, setIsGithubLoading] = useState(false)

apps/sim/app/(auth)/layout.tsx

@@ -3,7 +3,7 @@
 import Image from 'next/image'
 import Link from 'next/link'
 import { GridPattern } from '../(landing)/components/grid-pattern'
-import { NotificationList } from '../w/[id]/components/notifications/notifications'
+import { NotificationList } from '../workspace/[workspaceId]/w/[workflowId]/components/notifications/notifications'
 
 export default function AuthLayout({ children }: { children: React.ReactNode }) {
   return (

apps/sim/app/(auth)/login/login-form.test.tsx

@@ -149,7 +149,7 @@ describe('LoginPage', () => {
           {
             email: 'test@example.com',
             password: 'password123',
-            callbackURL: '/w',
+            callbackURL: '/workspace',
           },
           expect.objectContaining({
             onError: expect.any(Function),

apps/sim/app/(auth)/login/login-form.tsx

@@ -125,7 +125,7 @@ export default function LoginPage({
   const [showValidationError, setShowValidationError] = useState(false)
 
   // Initialize state for URL parameters
-  const [callbackUrl, setCallbackUrl] = useState('/w')
+  const [callbackUrl, setCallbackUrl] = useState('/workspace')
   const [isInviteFlow, setIsInviteFlow] = useState(false)
 
   // Forgot password states
@@ -155,7 +155,7 @@ export default function LoginPage({
           setCallbackUrl(callback)
         } else {
           logger.warn('Invalid callback URL detected and blocked:', { url: callback })
-          // Keep the default safe value ('/w')
+          // Keep the default safe value ('/workspace')
         }
       }
 
@@ -222,7 +222,7 @@ export default function LoginPage({
 
     try {
       // Final validation before submission
-      const safeCallbackUrl = validateCallbackUrl(callbackUrl) ? callbackUrl : '/w'
+      const safeCallbackUrl = validateCallbackUrl(callbackUrl) ? callbackUrl : '/workspace'
 
       const result = await client.signIn.email(
         {

apps/sim/app/(auth)/signup/signup-form.tsx

@@ -410,7 +410,7 @@ function SignupFormContent({
           <SocialLoginButtons
             githubAvailable={githubAvailable}
             googleAvailable={googleAvailable}
-            callbackURL={redirectUrl || '/w'}
+            callbackURL={redirectUrl || '/workspace'}
             isProduction={isProduction}
           />
 

apps/sim/app/(auth)/verify/use-verification.ts

@@ -148,7 +148,7 @@ export function useVerification({
             router.push(redirectUrl)
           } else {
             // Default redirect to dashboard
-            router.push('/w')
+            router.push('/workspace')
           }
         }, 2000)
       } else {
@@ -233,7 +233,7 @@ export function useVerification({
       if (isDevOrDocker || !hasResendKey) {
         setIsVerified(true)
         const timeoutId = setTimeout(() => {
-          router.push('/w')
+          router.push('/workspace')
         }, 1000)
 
         return () => clearTimeout(timeoutId)

apps/sim/app/(landing)/components/sections/footer.tsx

@@ -21,7 +21,7 @@ function Footer() {
     if (typeof window !== 'undefined') {
       // Check if user has an active session
       if (isAuthenticated) {
-        router.push('/w')
+        router.push('/workspace')
       } else {
         // Check if user has logged in before
         const hasLoggedInBefore =

apps/sim/app/(landing)/components/sections/hero.tsx

@@ -18,7 +18,7 @@ function Hero() {
     if (typeof window !== 'undefined') {
       // Check if user has an active session
       if (isAuthenticated) {
-        router.push('/w')
+        router.push('/workspace')
       } else {
         // Check if user has logged in before
         const hasLoggedInBefore =

apps/sim/app/api/marketplace/workflows/route.ts

@@ -2,7 +2,7 @@ import { desc, eq, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createLogger } from '@/lib/logs/console-logger'
 import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'
-import { CATEGORIES } from '@/app/w/marketplace/constants/categories'
+import { CATEGORIES } from '@/app/workspace/[workspaceId]/marketplace/constants/categories'
 import { db } from '@/db'
 import * as schema from '@/db/schema'
 

apps/sim/app/api/workspaces/invitations/accept/route.ts

@@ -149,7 +149,10 @@ export async function GET(req: NextRequest) {
         .where(eq(workspaceInvitation.id, invitation.id))
 
       return NextResponse.redirect(
-        new URL(`/w/${invitation.workspaceId}`, env.NEXT_PUBLIC_APP_URL || 'https://simstudio.ai')
+        new URL(
+          `/workspace/${invitation.workspaceId}/w`,
+          env.NEXT_PUBLIC_APP_URL || 'https://simstudio.ai'
+        )
       )
     }
 
@@ -194,7 +197,10 @@ export async function GET(req: NextRequest) {
 
     // Redirect to the workspace
     return NextResponse.redirect(
-      new URL(`/w/${invitation.workspaceId}`, env.NEXT_PUBLIC_APP_URL || 'https://simstudio.ai')
+      new URL(
+        `/workspace/${invitation.workspaceId}/w`,
+        env.NEXT_PUBLIC_APP_URL || 'https://simstudio.ai'
+      )
     )
   } catch (error) {
     console.error('Error accepting invitation:', error)

apps/sim/app/invite/[id]/invite.tsx

@@ -131,7 +131,7 @@ export default function Invite() {
 
         // Redirect to workspace after a brief delay
         setTimeout(() => {
-          router.push('/w')
+          router.push('/workspace')
         }, 2000)
       } else {
         // For organization invites, use the client API
@@ -153,7 +153,7 @@ export default function Invite() {
 
         // Redirect to workspace after a brief delay
         setTimeout(() => {
-          router.push('/w')
+          router.push('/workspace')
         }, 2000)
       }
     } catch (err: any) {

apps/sim/app/invite/invite-error/invite-error.tsx

@@ -54,7 +54,7 @@ export default function InviteError() {
           <p className='mb-6 text-muted-foreground'>{displayMessage}</p>
 
           <div className='flex w-full flex-col gap-4'>
-            <Link href='/w' passHref>
+            <Link href='/workspace' passHref>
               <Button variant='default' className='w-full'>
                 Go to Dashboard
               </Button>

apps/sim/app/workspace/[workspaceId]/error.tsx

@@ -0,0 +1,5 @@
+'use client'
+
+import { NextError } from './w/[workflowId]/components/error'
+
+export default NextError

apps/sim/app/workspace/[workspaceId]/global-error.tsx

@@ -0,0 +1,5 @@
+'use client'
+
+import { NextGlobalError } from './w/[workflowId]/components/error'
+
+export default NextGlobalError

apps/sim/app/w/knowledge/[id]/[documentId]/components/document-loading.tsx → apps/sim/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/components/document-loading.tsx

@@ -25,12 +25,12 @@ export function DocumentLoading({
     {
       id: 'knowledge-root',
       label: 'Knowledge',
-      href: '/w/knowledge',
+      href: '/knowledge',
     },
     {
       id: `knowledge-base-${knowledgeBaseId}`,
       label: knowledgeBaseName,
-      href: `/w/knowledge/${knowledgeBaseId}`,
+      href: `/knowledge/${knowledgeBaseId}`,
     },
     {
       id: `document-${knowledgeBaseId}-${documentName}`,

apps/sim/app/w/knowledge/[id]/[documentId]/document.tsx → apps/sim/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/document.tsx

@@ -16,7 +16,7 @@ import { Button } from '@/components/ui/button'
 import { Checkbox } from '@/components/ui/checkbox'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { createLogger } from '@/lib/logs/console-logger'
-import { ActionBar } from '@/app/w/knowledge/[id]/components/action-bar/action-bar'
+import { ActionBar } from '@/app/workspace/[workspaceId]/knowledge/[id]/components/action-bar/action-bar'
 import { useDocumentChunks } from '@/hooks/use-knowledge'
 import { type ChunkData, type DocumentData, useKnowledgeStore } from '@/stores/knowledge/store'
 import { useSidebarStore } from '@/stores/sidebar/store'
@@ -170,10 +170,10 @@ export function Document({
   const effectiveDocumentName = document?.filename || documentName || 'Document'
 
   const breadcrumbs = [
-    { label: 'Knowledge', href: '/w/knowledge' },
+    { label: 'Knowledge', href: '/knowledge' },
     {
       label: effectiveKnowledgeBaseName,
-      href: `/w/knowledge/${knowledgeBaseId}`,
+      href: `/knowledge/${knowledgeBaseId}`,
     },
     { label: effectiveDocumentName },
   ]
@@ -360,10 +360,10 @@ export function Document({
 
   if (combinedError && !isLoadingChunks) {
     const errorBreadcrumbs = [
-      { label: 'Knowledge', href: '/w/knowledge' },
+      { label: 'Knowledge', href: '/knowledge' },
       {
         label: effectiveKnowledgeBaseName,
-        href: `/w/knowledge/${knowledgeBaseId}`,
+        href: `/knowledge/${knowledgeBaseId}`,
       },
       { label: 'Error' },
     ]

apps/sim/app/w/knowledge/[id]/base.tsx → apps/sim/app/workspace/[workspaceId]/knowledge/[id]/base.tsx

@@ -13,7 +13,7 @@ import {
   Trash2,
   X,
 } from 'lucide-react'
-import { useRouter } from 'next/navigation'
+import { useParams, useRouter } from 'next/navigation'
 import {
   AlertDialog,
   AlertDialogAction,
@@ -28,10 +28,10 @@ import { Button } from '@/components/ui/button'
 import { Checkbox } from '@/components/ui/checkbox'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { createLogger } from '@/lib/logs/console-logger'
-import { ActionBar } from '@/app/w/knowledge/[id]/components/action-bar/action-bar'
-import { getDocumentIcon } from '@/app/w/knowledge/components/icons/document-icons'
-import { PrimaryButton } from '@/app/w/knowledge/components/primary-button/primary-button'
-import { SearchInput } from '@/app/w/knowledge/components/search-input/search-input'
+import { ActionBar } from '@/app/workspace/[workspaceId]/knowledge/[id]/components/action-bar/action-bar'
+import { getDocumentIcon } from '@/app/workspace/[workspaceId]/knowledge/components/icons/document-icons'
+import { PrimaryButton } from '@/app/workspace/[workspaceId]/knowledge/components/primary-button/primary-button'
+import { SearchInput } from '@/app/workspace/[workspaceId]/knowledge/components/search-input/search-input'
 import { useKnowledgeBase, useKnowledgeBaseDocuments } from '@/hooks/use-knowledge'
 import { type DocumentData, useKnowledgeStore } from '@/stores/knowledge/store'
 import { useSidebarStore } from '@/stores/sidebar/store'
@@ -122,6 +122,8 @@ export function KnowledgeBase({
 }: KnowledgeBaseProps) {
   const { mode, isExpanded } = useSidebarStore()
   const { removeKnowledgeBase } = useKnowledgeStore()
+  const params = useParams()
+  const workspaceId = params.workspaceId as string
   const {
     knowledgeBase,
     isLoading: isLoadingKnowledgeBase,
@@ -402,11 +404,11 @@ export function KnowledgeBase({
   const handleDocumentClick = (docId: string) => {
     // Find the document to get its filename
     const document = documents.find((doc) => doc.id === docId)
-    const params = new URLSearchParams({
+    const urlParams = new URLSearchParams({
       kbName: knowledgeBaseName, // Use the instantly available name
       docName: document?.filename || 'Document',
     })
-    router.push(`/w/knowledge/${id}/${docId}?${params.toString()}`)
+    router.push(`/workspace/${workspaceId}/knowledge/${id}/${docId}?${urlParams.toString()}`)
   }
 
   const handleDeleteKnowledgeBase = async () => {
@@ -428,7 +430,7 @@ export function KnowledgeBase({
       if (result.success) {
         // Remove from store and redirect to knowledge bases list
         removeKnowledgeBase(id)
-        router.push('/w/knowledge')
+        router.push(`/workspace/${workspaceId}/knowledge`)
       } else {
         throw new Error(result.error || 'Failed to delete knowledge base')
       }
@@ -741,7 +743,7 @@ export function KnowledgeBase({
     {
       id: 'knowledge-root',
       label: 'Knowledge',
-      href: '/w/knowledge',
+      href: '/knowledge',
     },
     {
       id: `knowledge-base-${id}`,
@@ -760,7 +762,7 @@ export function KnowledgeBase({
       {
         id: 'knowledge-root',
         label: 'Knowledge',
-        href: '/w/knowledge',
+        href: '/knowledge',
       },
       {
         id: 'error',

apps/sim/app/w/knowledge/[id]/components/knowledge-base-loading/knowledge-base-loading.tsx → apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/knowledge-base-loading/knowledge-base-loading.tsx

@@ -19,7 +19,7 @@ export function KnowledgeBaseLoading({ knowledgeBaseName }: KnowledgeBaseLoading
     {
       id: 'knowledge-root',
       label: 'Knowledge',
-      href: '/w/knowledge',
+      href: '/knowledge',
     },
     {
       id: 'knowledge-base-loading',

apps/sim/app/w/knowledge/components/base-overview/base-overview.tsx → apps/sim/app/workspace/[workspaceId]/knowledge/components/base-overview/base-overview.tsx

@@ -18,7 +18,7 @@ export function BaseOverview({ id, title, docCount, description }: BaseOverviewP
   const params = new URLSearchParams({
     kbName: title,
   })
-  const href = `/w/knowledge/${id || title.toLowerCase().replace(/\s+/g, '-')}?${params.toString()}`
+  const href = `/knowledge/${id || title.toLowerCase().replace(/\s+/g, '-')}?${params.toString()}`
 
   const handleCopy = async (e: React.MouseEvent) => {
     e.preventDefault()

apps/sim/app/w/knowledge/components/create-modal/create-modal.tsx → apps/sim/app/workspace/[workspaceId]/knowledge/components/create-modal/create-modal.tsx

@@ -12,7 +12,7 @@ import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import { Textarea } from '@/components/ui/textarea'
 import { createLogger } from '@/lib/logs/console-logger'
-import { getDocumentIcon } from '@/app/w/knowledge/components/icons/document-icons'
+import { getDocumentIcon } from '@/app/workspace/[workspaceId]/knowledge/components/icons/document-icons'
 import type { DocumentData, KnowledgeBaseData } from '@/stores/knowledge/store'
 import { useKnowledgeStore } from '@/stores/knowledge/store'
 

apps/sim/app/w/layout.tsx → apps/sim/app/workspace/[workspaceId]/layout.tsx

@@ -1,6 +1,6 @@
 import { WorkspaceProvider } from '@/providers/workspace-provider'
-import Providers from './components/providers/providers'
-import { Sidebar } from './components/sidebar/sidebar'
+import Providers from './w/components/providers/providers'
+import { Sidebar } from './w/components/sidebar/sidebar'
 
 export default function WorkspaceLayout({ children }: { children: React.ReactNode }) {
   return (