fix(sim-links): scope result shortcuts to the organization sim/ resolves, hide on failed lookups

Author: waleedlatif1

apps/sim/app/o/[organizationId]/layout.tsx

@@ -14,12 +14,14 @@ import { organizationRoutes, WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/pa
 import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
 import { canBrowsePeople } from '@/lib/people/feature-flag'
 import { isProjectsEnabled } from '@/lib/projects/rollout.server'
+import { resolveSimLinkOrganization } from '@/lib/sim-links/application/organization'
 import { isSimLinksEnabled } from '@/lib/sim-links/feature-flag'
 import { isWorkflowTestsEnabled } from '@/lib/workflow-tests/feature-flag'
 import { getQueryClient } from '@/app/_shell/providers/get-query-client'
 import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect'
 import { OrganizationAccessDenied } from '@/app/o/[organizationId]/components/organization-access-denied'
 import { OrganizationSidebar } from '@/app/o/[organizationId]/components/organization-sidebar'
+import { SimLinkOrganizationProvider } from '@/app/o/[organizationId]/links/sim-link-organization-provider'
 import { prefetchOrganizationSidebar } from '@/app/o/[organizationId]/prefetch'
 import { OrganizationProvider } from '@/app/o/[organizationId]/providers/organization-provider'
 import { ImpersonationBanner } from '@/app/workspace/[workspaceId]/components/impersonation-banner'
@@ -86,6 +88,7 @@ export default async function OrganizationLayout({
     projectsEnabled,
     simLinksEnabled,
     peopleEnabled,
+    simLinkOrganizationId,
   ] = await Promise.all([
     prefetchOrganizationSidebar(
       queryClient,
@@ -105,6 +108,11 @@ export default async function OrganizationLayout({
     isProjectsEnabled(),
     simLinksEnabledLookup,
     peopleEnabledLookup,
+    resolveSimLinkOrganization({
+      kind: 'session',
+      userId: session.user.id,
+      sessionId: session.session.id,
+    }),
   ])
   const initialSidebarCollapsed = cookieStore.get('sidebar_collapsed')?.value === '1'
 
@@ -120,30 +128,31 @@ export default async function OrganizationLayout({
           'mothership-plan-mode': benchmarkEnabled,
           'mothership-memory-spaces': benchmarkEnabled,
           projects: projectsEnabled,
-          'sim-links': simLinksEnabled,
         }}
       >
         <OrganizationProvider context={context}>
-          <GlobalCommandsProvider>
-            <WorkspaceViewport className='workspace-root'>
-              <ImpersonationBanner />
-              <SessionExpired />
-              <SettingsNavigationProvider>
-                <WorkspaceChrome
-                  sidebar={
-                    <OrganizationSidebar
-                      benchmarkEnabled={benchmarkEnabled}
-                      simLinksEnabled={simLinksEnabled}
-                      peopleEnabled={peopleEnabled}
-                    />
-                  }
-                  initialSidebarCollapsed={initialSidebarCollapsed}
-                >
-                  {children}
-                </WorkspaceChrome>
-              </SettingsNavigationProvider>
-            </WorkspaceViewport>
-          </GlobalCommandsProvider>
+          <SimLinkOrganizationProvider organizationId={simLinkOrganizationId}>
+            <GlobalCommandsProvider>
+              <WorkspaceViewport className='workspace-root'>
+                <ImpersonationBanner />
+                <SessionExpired />
+                <SettingsNavigationProvider>
+                  <WorkspaceChrome
+                    sidebar={
+                      <OrganizationSidebar
+                        benchmarkEnabled={benchmarkEnabled}
+                        simLinksEnabled={simLinksEnabled}
+                        peopleEnabled={peopleEnabled}
+                      />
+                    }
+                    initialSidebarCollapsed={initialSidebarCollapsed}
+                  >
+                    {children}
+                  </WorkspaceChrome>
+                </SettingsNavigationProvider>
+              </WorkspaceViewport>
+            </GlobalCommandsProvider>
+          </SimLinkOrganizationProvider>
         </OrganizationProvider>
       </FeatureFlagsProvider>
     </HydrationBoundary>

apps/sim/app/o/[organizationId]/links/sim-link-organization-provider.tsx

@@ -0,0 +1,28 @@
+'use client'
+
+import { createContext, type ReactNode, useContext } from 'react'
+
+const SimLinkOrganizationContext = createContext<string | null>(null)
+
+interface SimLinkOrganizationProviderProps {
+  /** Where `sim/<name>` resolves for this session, or null when it resolves nowhere. */
+  organizationId: string | null
+  children: ReactNode
+}
+
+/** Scopes Sim link shortcuts to the organization whose links `sim/` opens for the viewer. */
+export function SimLinkOrganizationProvider({
+  organizationId,
+  children,
+}: SimLinkOrganizationProviderProps) {
+  return (
+    <SimLinkOrganizationContext.Provider value={organizationId}>
+      {children}
+    </SimLinkOrganizationContext.Provider>
+  )
+}
+
+/** The organization a new or copied Sim link belongs to; null hides every Sim link shortcut. */
+export function useSimLinkOrganizationId(): string | null {
+  return useContext(SimLinkOrganizationContext)
+}

apps/sim/app/o/[organizationId]/links/sim-link-shortcut.tsx

@@ -6,23 +6,9 @@ import { Check, Link, Plus } from '@sim/emcn/icons'
 import { simLinkUrl } from '@/lib/navigation/paths'
 import { suggestSimLinkName } from '@/lib/sim-links/validation'
 import { SimLinkModal } from '@/app/o/[organizationId]/links/sim-link-modal'
-import { useOptionalOrganizationContext } from '@/app/o/[organizationId]/providers/organization-provider'
-import { useOptionalFeatureFlag } from '@/app/workspace/[workspaceId]/providers/feature-flags-provider'
-import { useOptionalWorkspaceHostContext } from '@/app/workspace/[workspaceId]/providers/workspace-host-provider'
+import { useSimLinkOrganizationId } from '@/app/o/[organizationId]/links/sim-link-organization-provider'
 import { useSimLinksForUrl } from '@/hooks/queries/sim-links'
 
-/**
- * The organization a Sim link made on this surface belongs to: the organization being viewed, or
- * the one that owns the current workspace. Null where Sim links are off, so the action is hidden.
- */
-function useSimLinkOrganizationId(): string | null {
-  const enabled = useOptionalFeatureFlag('sim-links')
-  const organization = useOptionalOrganizationContext()
-  const host = useOptionalWorkspaceHostContext()
-  if (!enabled) return null
-  return organization?.organization.id ?? host?.hostOrganizationId ?? null
-}
-
 interface SimLinkCreator {
   /** Null where Sim links are off; render no shortcut then. */
   organizationId: string | null
@@ -52,7 +38,7 @@ export function useSimLinkCreator(url: string, title: string): SimLinkCreator {
 
 /** The first link that already opens `url`, and a copy of its address. */
 function useExistingSimLink(organizationId: string, url: string) {
-  const { data, isPending } = useSimLinksForUrl(organizationId, url)
+  const { data, isPending, isError } = useSimLinksForUrl(organizationId, url)
   const { copied, copy } = useCopyToClipboard({ resetMs: 1500 })
   const existing = data?.at(0)
   const copyExisting = async () => {
@@ -61,7 +47,7 @@ function useExistingSimLink(organizationId: string, url: string) {
     if (!done) toast.error('Unable to copy Sim link')
     return done
   }
-  return { existing, isPending, copied, copyExisting }
+  return { existing, isPending, isError, copied, copyExisting }
 }
 
 interface SimLinkShortcutProps {
@@ -72,10 +58,12 @@ interface SimLinkShortcutProps {
 
 /**
  * The Sim link entry of an actions menu: copies the link that already opens this address, so a
- * menu never offers a duplicate, or offers to create one. It looks up when the menu opens.
+ * menu never offers a duplicate, or offers to create one. It looks up when the menu opens, and
+ * offers nothing when the lookup fails rather than risk a duplicate.
  */
 export function SimLinkMenuItem({ organizationId, url, onCreate }: SimLinkShortcutProps) {
-  const { existing, isPending, copyExisting } = useExistingSimLink(organizationId, url)
+  const { existing, isPending, isError, copyExisting } = useExistingSimLink(organizationId, url)
+  if (isError) return null
   if (existing) {
     return (
       <DropdownMenuItem
@@ -97,7 +85,11 @@ export function SimLinkMenuItem({ organizationId, url, onCreate }: SimLinkShortc
 }
 
 function ShortcutChip({ organizationId, url, onCreate }: SimLinkShortcutProps) {
-  const { existing, isPending, copied, copyExisting } = useExistingSimLink(organizationId, url)
+  const { existing, isPending, isError, copied, copyExisting } = useExistingSimLink(
+    organizationId,
+    url
+  )
+  if (isError) return null
   if (existing) {
     return (
       <Chip leftIcon={copied ? Check : Link} onClick={() => void copyExisting()}>

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

@@ -16,10 +16,11 @@ import {
 import { isMothershipModelSelectorEnabled, isPlanModeEnabled } from '@/lib/mothership/feature-flags'
 import { resolveOrganizationEntryPath } from '@/lib/navigation/resolve-app-entry'
 import { isProjectsEnabled } from '@/lib/projects/rollout.server'
-import { isSimLinksEnabled } from '@/lib/sim-links/feature-flag'
+import { resolveSimLinkOrganization } from '@/lib/sim-links/application/organization'
 import { isWorkflowTestsEnabled } from '@/lib/workflow-tests/feature-flag'
 import { ApplicationLoading } from '@/app/_shell/application-loading'
 import { getQueryClient } from '@/app/_shell/providers/get-query-client'
+import { SimLinkOrganizationProvider } from '@/app/o/[organizationId]/links/sim-link-organization-provider'
 import { ImpersonationBanner } from '@/app/workspace/[workspaceId]/components/impersonation-banner'
 import { SessionExpired } from '@/app/workspace/[workspaceId]/components/session-expired'
 import { WorkspaceAccessDenied } from '@/app/workspace/[workspaceId]/components/workspace-access-denied'
@@ -135,7 +136,7 @@ async function WorkspaceContent({
     desktopExecutorRegistered,
     computerUseEnabled,
     projectsEnabled,
-    simLinksEnabled,
+    simLinkOrganizationId,
   ] = await Promise.all([
     cookies(),
     orgSettings,
@@ -155,9 +156,7 @@ async function WorkspaceContent({
     hasDesktopBackgroundExecutor(session.user.id),
     isComputerUseAvailable(hostContext.hostOrganizationId),
     isProjectsEnabled(),
-    hostContext.hostOrganizationId
-      ? isSimLinksEnabled(hostContext.hostOrganizationId)
-      : Promise.resolve(false),
+    resolveSimLinkOrganization(principal),
     prefetchWorkspaceAccess(queryClient, workspaceId, principal),
     prefetchWorkspaceForkAvailability(queryClient, workspaceId, principal, hostContext),
   ])
@@ -174,47 +173,48 @@ async function WorkspaceContent({
           'mothership-computer-use': computerUseEnabled,
           'mothership-plan-mode': planModeEnabled,
           projects: projectsEnabled,
-          'sim-links': simLinksEnabled,
         }}
       >
         <WorkspaceHostProvider workspaceId={workspaceId} initialContext={hostContext}>
-          <BrandingProvider
-            hostOrganizationId={hostContext.hostOrganizationId}
-            viewerIsHostOrganizationMember={hostContext.viewer.isHostOrganizationMember}
-            initialOrgSettings={initialOrgSettings}
-          >
-            <DesktopOAuthConnectListener />
-            <InFlightUploadGuard />
-            <SettingsLoader />
-            <ProviderModelsLoader />
-            <CustomBlocksLoader />
-            <BlockVisibilityLoader />
-            <GlobalCommandsProvider>
-              <WorkspaceViewport>
-                <ImpersonationBanner />
-                <SessionExpired />
-                <WorkspacePermissionsProvider>
-                  <WorkspaceScopeSync />
-                  <SettingsNavigationProvider>
-                    <WorkspaceChrome
-                      sidebar={
-                        <Sidebar
-                          organizationHref={organizationHref}
-                          desktopExecutor={{
-                            available: isDesktopBackgroundExecutorAvailable(),
-                            registered: desktopExecutorRegistered,
-                          }}
-                        />
-                      }
-                      initialSidebarCollapsed={initialSidebarCollapsed}
-                    >
-                      {children}
-                    </WorkspaceChrome>
-                  </SettingsNavigationProvider>
-                </WorkspacePermissionsProvider>
-              </WorkspaceViewport>
-            </GlobalCommandsProvider>
-          </BrandingProvider>
+          <SimLinkOrganizationProvider organizationId={simLinkOrganizationId}>
+            <BrandingProvider
+              hostOrganizationId={hostContext.hostOrganizationId}
+              viewerIsHostOrganizationMember={hostContext.viewer.isHostOrganizationMember}
+              initialOrgSettings={initialOrgSettings}
+            >
+              <DesktopOAuthConnectListener />
+              <InFlightUploadGuard />
+              <SettingsLoader />
+              <ProviderModelsLoader />
+              <CustomBlocksLoader />
+              <BlockVisibilityLoader />
+              <GlobalCommandsProvider>
+                <WorkspaceViewport>
+                  <ImpersonationBanner />
+                  <SessionExpired />
+                  <WorkspacePermissionsProvider>
+                    <WorkspaceScopeSync />
+                    <SettingsNavigationProvider>
+                      <WorkspaceChrome
+                        sidebar={
+                          <Sidebar
+                            organizationHref={organizationHref}
+                            desktopExecutor={{
+                              available: isDesktopBackgroundExecutorAvailable(),
+                              registered: desktopExecutorRegistered,
+                            }}
+                          />
+                        }
+                        initialSidebarCollapsed={initialSidebarCollapsed}
+                      >
+                        {children}
+                      </WorkspaceChrome>
+                    </SettingsNavigationProvider>
+                  </WorkspacePermissionsProvider>
+                </WorkspaceViewport>
+              </GlobalCommandsProvider>
+            </BrandingProvider>
+          </SimLinkOrganizationProvider>
         </WorkspaceHostProvider>
       </FeatureFlagsProvider>
     </HydrationBoundary>

apps/sim/app/workspace/[workspaceId]/providers/feature-flags-provider.tsx

@@ -11,7 +11,6 @@ export interface WorkspaceFeatureFlags {
   'mothership-computer-use'?: boolean
   'mothership-memory-spaces'?: boolean
   projects?: boolean
-  'sim-links'?: boolean
 }
 
 const FeatureFlagsContext = createContext<WorkspaceFeatureFlags | null>(null)
@@ -32,8 +31,3 @@ export function useFeatureFlag(name: keyof WorkspaceFeatureFlags): boolean {
   if (!flags) throw new Error('useFeatureFlag must be used within FeatureFlagsProvider')
   return flags[name] ?? false
 }
-
-/** The same flag for shared components that also render outside one, where every flag is off. */
-export function useOptionalFeatureFlag(name: keyof WorkspaceFeatureFlags): boolean {
-  return useContext(FeatureFlagsContext)?.[name] ?? false
-}

apps/sim/lib/api/contracts/sim-links.ts

@@ -39,7 +39,7 @@ export const listSimLinksQuerySchema = z
   .object({
     search: z.string().max(200).optional(),
     /** Only links whose destination is exactly this URL, such as one shown in a search result. */
-    url: z.string().max(2048).optional(),
+    url: z.string().min(1).max(2048).optional(),
     cursor: z.string().min(1).max(128).optional(),
     sort: z.enum(SIM_LINK_SORTS).optional(),
     dir: z.enum(SORT_DIRECTIONS).optional(),

apps/sim/lib/sim-links/validation.test.ts

@@ -16,7 +16,8 @@ describe('suggestSimLinkName', () => {
     expect(simLinkNameSchema.safeParse(name).success).toBe(true)
   })
 
-  it('suggests nothing when the title has no character a name can hold', () => {
+  it('suggests nothing when no letter or digit survives', () => {
     expect(suggestSimLinkName('「年度計画」')).toBe('')
+    expect(suggestSimLinkName('... _-_ ...')).toBe('')
   })
 })

apps/sim/lib/sim-links/validation.ts

@@ -36,14 +36,15 @@ export function toSimLinkName(input: string): string {
 
 /**
  * A starting name for a link made from a page's title: lower case, words joined by single hyphens,
- * cut to the name length limit. Empty when the title has no character a name can hold, so the
- * person types one instead.
+ * cut to the name length limit. Empty when no letter or digit survives, so the person types one
+ * instead of being handed a name that is only punctuation.
  */
 export function suggestSimLinkName(title: string): string {
-  return toSimLinkName(title.trim().toLowerCase())
+  const name = toSimLinkName(title.trim().toLowerCase())
     .replace(/-{2,}/g, '-')
     .slice(0, SIM_LINK_NAME_MAX_LENGTH)
     .replace(/^-+|-+$/g, '')
+  return /[a-z0-9]/.test(name) ? name : ''
 }
 
 /** Sentence punctuation and closing quotes or brackets that follow a link pasted from prose. */