fix(release): harden Entra sync against mid-read drift, keep loaded People views on refresh errors, refuse credentialed citation URLs

Author: waleedlatif1

apps/sim/app/o/[organizationId]/people/[memberId]/person.tsx

@@ -100,7 +100,10 @@ export function Person({ organizationId, memberId }: PersonProps) {
   const [editing, setEditing] = useState(false)
   const routes = organizationRoutes(organizationId)
   const originQuery = serializePeopleView({ ...origin, view: origin.view ?? 'directory' })
-  const data = query.isError ? undefined : query.data
+  const notFound = isApiClientError(query.error) && query.error.status === 404
+  // A failed background refresh keeps the loaded profile, and any edit open on it.
+  const loadError = query.data && !notFound ? null : query.error
+  const data = loadError ? undefined : query.data
 
   const chartHref = serializePeopleView(routes.people, {
     ...origin,
@@ -129,14 +132,14 @@ export function Person({ organizationId, memberId }: PersonProps) {
         ) : undefined
       }
     >
-      {query.error ? (
-        isApiClientError(query.error) && query.error.status === 404 ? (
+      {loadError ? (
+        notFound ? (
           <SettingsEmptyState variant='inline'>
             This person isn't in your organization.
           </SettingsEmptyState>
         ) : (
           <SettingsQueryErrorState
-            error={query.error}
+            error={loadError}
             fallback='Could not load this person'
             isRetrying={query.isFetching}
             onRetry={() => void query.refetch()}

apps/sim/app/o/[organizationId]/people/people-chart.tsx

@@ -102,7 +102,9 @@ export function PeopleChart({ organizationId, viewSwitch, onImport, onSync }: Pe
   const { focus, page } = origin
   const size = useIsMobile() ? 1 : 4
   const chart = usePeopleChart(organizationId, focus, Math.max(1, Math.min(page, 1_000_000)), size)
-  const branch = chart.isError ? undefined : chart.data
+  const notFound = isApiClientError(chart.error) && chart.error.status === 404
+  // A failed background refresh keeps the chart on screen; only a missing person replaces it.
+  const branch = notFound ? undefined : chart.data
   const profileQuery = serializePeopleView({
     ...origin,
     view: 'chart',
@@ -264,7 +266,7 @@ export function PeopleChart({ organizationId, viewSwitch, onImport, onSync }: Pe
           </div>
         </>
       ) : chart.error ? (
-        isApiClientError(chart.error) && chart.error.status === 404 ? (
+        notFound ? (
           <EmptyState
             title='Person unavailable'
             description='This person is no longer in your organization’s directory.'

apps/sim/app/o/[organizationId]/people/people-directory.tsx

@@ -190,7 +190,7 @@ export function PeopleDirectory({ organizationId }: PeopleProps) {
         rows={rows}
         onRowClick={(memberId) => router.push(profileHref(memberId))}
         onLoadMore={() => void people.fetchNextPage()}
-        hasMore={people.hasNextPage}
+        hasMore={people.hasNextPage && !changingFilter}
         isLoadingMore={people.isFetchingNextPage}
         isFetching={people.isFetching}
         loadMoreFailed={people.isFetchNextPageError}

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

@@ -167,7 +167,7 @@ function OrganizationSearchContent({ userId, chatId }: OrganizationSearchProps)
   const { recordQuery } = useSearchHistoryActions()
   const router = useRouter()
   const pathname = usePathname()
-  const hasSearchParams = useSearchParams().size > 0
+  const hasSearchParams = useSearchParams().toString() !== ''
   const routes = organizationRoutes(organization.id)
   const hasConversation = Boolean(chatId) || pathname.startsWith(`${routes.search}/chat/`)
   const queryClient = useQueryClient()
@@ -187,11 +187,7 @@ function OrganizationSearchContent({ userId, chatId }: OrganizationSearchProps)
     []
   )
   useEffect(() => {
-    if (!mothershipAvailable) return
-    if (routeMode) {
-      BrowserStorage.setItem(preferenceKey, routeMode)
-      return
-    }
+    if (!mothershipAvailable || routeMode) return
     const savedMode = BrowserStorage.getItem<unknown>(preferenceKey, null)
     // Pin the mode to this history entry so Back survives a later preference change.
     void setParams({ mode: savedMode === 'assistant' ? 'assistant' : 'search' })
@@ -200,6 +196,7 @@ function OrganizationSearchContent({ userId, chatId }: OrganizationSearchProps)
   if (activeMode === 'assistant' && !assistantOpened) setAssistantOpened(true)
 
   const changeMode = (next: 'search' | 'assistant') => {
+    BrowserStorage.setItem(preferenceKey, next)
     void setParams({ mode: next }, { history: 'push' })
   }
   const startNew = () => {

apps/sim/app/workspace/[workspaceId]/home/components/message-content/resolve-citations.test.ts

@@ -160,6 +160,13 @@ describe('evidence-linked citations', () => {
       true
     )
     expect(persisted.sources).toEqual(live.sources)
+    const disguised = {
+      ...webOutput,
+      results: [{ ...webOutput.results[0], url: 'https://docs.example.test@attacker.test/cli' }],
+    }
+    expect(
+      resolveMessageCitations(webBlocks('success', true, disguised), '', true).sources
+    ).toEqual([])
     expect(
       resolveMessageCitations(webBlocks('error', false, webOutput), '', true).blocks[1].content
     ).toBe('Install it ')

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts

@@ -1076,7 +1076,7 @@ export function useWorkflowExecution() {
       selectedOutputs = chatStore.getState().getSelectedWorkflowOutput(activeWorkflowId)
     }
 
-    let startBlockId: string | undefined
+    let startBlockId: string
     let finalWorkflowInput = workflowInput
 
     if (isExecutingFromChat) {
@@ -1128,18 +1128,6 @@ export function useWorkflowExecution() {
       }
     }
 
-    if (!startBlockId) {
-      const error = new WorkflowValidationError(
-        'No valid trigger block found to start execution',
-        'validation',
-        'validation',
-        'Workflow Validation'
-      )
-      logger.error('No startBlockId found after trigger search')
-      if (activeWorkflowId) finishOwnedExecution(activeWorkflowId, persistenceExecution)
-      throw error
-    }
-
     logger.info('Final execution setup:', {
       startBlockId,
       isExecutingFromChat,

apps/sim/lib/mcp/utils.ts

@@ -189,8 +189,8 @@ export function categorizeMcpServerError(
 }
 
 /**
- * Enhanced error categorization for more specific HTTP status codes.
- * Returns safe, generic messages to prevent leaking internal details.
+ * HTTP status and safe, generic message for any error: Sim's own MCP error classes
+ * first, then message matching for SDK and third-party errors.
  */
 export function categorizeError(error: unknown): { message: string; status: number } {
   if (!(error instanceof Error)) {

apps/sim/lib/mothership/chat/citation-evidence.ts

@@ -14,8 +14,8 @@ type RetrievalCitationSource = {
   snippet?: string
 }
 
-/** Tools whose successful results supply sources: connected-source retrieval and public web research. */
 const WEB_TOOLS = new Set(['web_search', 'web_fetch'])
+/** Tools whose successful results supply sources: connected-source retrieval and public web research. */
 const CITATION_TOOLS = new Set(['search_workspace', 'read_document', ...WEB_TOOLS])
 
 /** Whether a successful result of this tool may supply source destinations. */
@@ -80,7 +80,9 @@ export function collectRetrievalCitationEvidence(blocks: readonly RetrievalCitat
         continue
       try {
         const url = new URL(result.citationUrl)
+        // A web page can steer a fetched URL, so `https://trusted.example@other.example` never cites.
         if (url.protocol !== 'https:' && url.protocol !== 'http:') continue
+        if (url.username || url.password) continue
       } catch {
         continue
       }

apps/sim/lib/people/sync/entra.ts

@@ -101,6 +101,8 @@ async function readReportPages(
     const timing = { get: (name: string) => headers.get(name) ?? null }
     const retryAfterMs = directoryRetryDelay(response.status, timing)
     if (retryAfterMs !== null) return { managerId: page.managerId, retryAfterMs }
+    // A user deleted after the users phase has no reports left to read.
+    if (response.status === 404) return { managerId: page.managerId, reportIds: [], next: null }
     requireDirectorySuccess(response.status, timing)
     const parsedReports = reportsResponse.safeParse(response.body)
     if (!parsedReports.success)

apps/sim/lib/people/sync/large-directory.integration.ts

@@ -312,7 +312,7 @@ it('rotates credentials without bypassing a provider cooldown or publishing the
   expect(rows).toEqual([{ id: director, title: 'President' }])
 })
 
-it('resumes a large Entra hierarchy without replaying successful batch siblings or creating accounts', async () => {
+it('resumes a large Entra hierarchy past a user deleted mid-read without replaying successful batch siblings or creating accounts', async () => {
   const total = 10007
   const tenantId = generateId()
   const graphConfig = {
@@ -378,6 +378,12 @@ it('resumes a large Entra hierarchy without replaying successful batch siblings
           body: { error: graphConfig.clientSecret },
         }
       }
+      if (managerId === employee(2))
+        return {
+          id: request.id,
+          status: 404,
+          body: { error: { code: 'Request_ResourceNotFound' } },
+        }
       if (managerId !== lead) return { id: request.id, status: 200, body: { value: [] } }
       const offset = Number(target.searchParams.get('$skiptoken') || 0)
       const length = Math.min(1000, total - 1 - offset)