Merge remote-tracking branch 'origin/staging' into codex/remove-indexed-enterprise-search

Author: icecrasher321

.github/workflows/desktop-e2e.yml

@@ -11,6 +11,14 @@ on:
       - '.github/workflows/desktop-release.yml'
       - 'apps/desktop/**'
       - 'apps/sim/app/_shell/desktop-update-*.tsx'
+      - 'apps/sim/app/workspace/**/home/hooks/use-mothership-resize.ts'
+      - 'apps/sim/app/workspace/**/home/hooks/use-resource-panel.ts'
+      - 'apps/sim/app/workspace/**/home/components/chat-panel-layout.tsx'
+      - 'apps/sim/stores/chat-panel/**'
+      - 'apps/sim/stores/constants.ts'
+      - 'apps/sim/lib/browser-agent/transport.ts'
+      - 'apps/sim/lib/core/utils/separator-keys.ts'
+      - 'apps/sim/scripts/fixtures/chat-panel.tsx'
       - 'apps/sim/app/layout.tsx'
       - 'apps/sim/hooks/use-desktop-update-state.ts'
       - 'apps/sim/lib/desktop/**'

apps/desktop/e2e/chat-panel.spec.ts

@@ -3,8 +3,8 @@
 import { useEffect, useState } from 'react'
 import { cn } from '@sim/emcn'
 import { ArrowRight } from '@sim/emcn/icons'
-import Link from 'next/link'
 import { HomeSection } from '@/components/home/home-section'
+import { SettingsGuardedLink } from '@/components/settings/settings-guarded-link'
 import { OAUTH_SEARCH_READ_SCOPE, oauthScopeSatisfies } from '@/lib/auth/oauth-provider'
 import { organizationRoutes } from '@/lib/navigation/paths'
 import {
@@ -194,7 +194,11 @@ export function GetStarted() {
       {steps.map((step, i) => {
         const complete = completed[step.id]
         return (
-          <Link key={step.id} href={hrefs[step.id]} className={cn(ROW_CLASS, i > 0 && 'border-t')}>
+          <SettingsGuardedLink
+            key={step.id}
+            href={hrefs[step.id]}
+            className={cn(ROW_CLASS, i > 0 && 'border-t')}
+          >
             <StepMark complete={complete} />
             <span
               className={cn(
@@ -205,7 +209,7 @@ export function GetStarted() {
               {step.label}
             </span>
             <ArrowRight className='size-[16px] shrink-0 text-[var(--text-icon)]' />
-          </Link>
+          </SettingsGuardedLink>
         )
       })}
     </HomeSection>

apps/sim/app/o/[organizationId]/home/components/get-started/get-started.tsx

@@ -139,7 +139,7 @@ function OrganizationHomeContent({
   const canSelectMode =
     !hasChat && mothershipAvailable && canBuild && (searchAccess.memberScoped || planEnabled)
   const assistantSearchLevel = 'fast'
-  const panel = useChatResourcePanel(chat, controller)
+  const panel = useChatResourcePanel(chat, controller, userId)
   const addResource = panel.addResourceFromUser
   /** Restore only an explicitly selected results tab on an empty Home; closing it clears the URL. */
   useEffect(() => {

apps/sim/app/o/[organizationId]/home/organization-home.tsx

@@ -1,6 +1,7 @@
 'use client'
 
 import { createContext, type ReactNode, useContext } from 'react'
+import { SettingsGuardedLink } from '@/components/settings/settings-guarded-link'
 import { ApiClientError } from '@/lib/api/client/errors'
 import { useSession } from '@/lib/auth/auth-client'
 import { organizationRoutes } from '@/lib/navigation/paths'
@@ -75,12 +76,12 @@ export function OrganizationSecretInputHost({
         {organizationContext.viewer.isAdmin ? (
           <>
             Enable Generic Secrets in{' '}
-            <a
+            <SettingsGuardedLink
               className='underline'
               href={organizationRoutes(organizationId).settingsSection('integrations')}
             >
               organization Integrations settings
-            </a>
+            </SettingsGuardedLink>
             , then return here to enter the keys.
           </>
         ) : (

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/organization-secret-input.tsx

@@ -53,6 +53,7 @@ import {
   parseSearchConnectionBody,
   searchConnectionTargetSchema,
 } from '@/lib/knowledge/search/connection-target'
+import { rememberSettingsReturnUrl } from '@/lib/navigation/settings-return'
 import { OAUTH_PROVIDERS } from '@/lib/oauth/oauth'
 import { getServiceConfigByProviderId } from '@/lib/oauth/utils'
 import { organizationSecretNameSchema } from '@/lib/organization-secrets/validation'
@@ -3488,6 +3489,7 @@ function UsageUpgradeDisplay({ data }: { data: UsageUpgradeTagData }) {
         {canManageBilling ? (
           <ChipLink
             href={href}
+            onNavigate={() => rememberSettingsReturnUrl(href)}
             variant='border'
             rightIcon={hosted ? ArrowRight : SquareArrowUpRight}
             target={hosted ? undefined : '_blank'}

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.tsx

@@ -178,7 +178,7 @@ function HomeContent({ chatId, userName, userId }: HomeProps) {
     dispatchingHeadId,
     getCurrentRequestId,
   } = chat
-  const panel = useChatResourcePanel(chat, controller)
+  const panel = useChatResourcePanel(chat, controller, userId)
   const {
     isResourceCollapsed,
     skipResourceTransition,

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

@@ -125,6 +125,7 @@ import { getWorkflowById, getWorkflows } from '@/hooks/queries/utils/workflow-ca
 import { getWorkflowListQueryOptions } from '@/hooks/queries/utils/workflow-list-query'
 import { workflowKeys } from '@/hooks/queries/workflows'
 import { snapAllSmoothText } from '@/hooks/use-smooth-text'
+import { useChatPanelStore } from '@/stores/chat-panel/store'
 import { useMothershipEffortStore } from '@/stores/mothership-effort/store'
 import { useMothershipQueueStore } from '@/stores/mothership-queue/store'
 import type {
@@ -1182,6 +1183,9 @@ export function useChat(
           : pendingChatKeyRef.current
       chatIdRef.current = chatId
       const resolvedDesktopScopeId = desktopChatScopeId(scopeKey, chatId)
+      if (wasPending) {
+        useChatPanelStore.getState().migrate(pendingDesktopScopeId, resolvedDesktopScopeId)
+      }
       const activeActivityTracker = resourceActivityTrackerRef.current
       if (activeActivityTracker?.generation === streamGenRef.current) {
         if (wasPending) {
@@ -1752,6 +1756,7 @@ export function useChat(
               return
             }
 
+            useChatPanelStore.getState().migrate(previousDesktopScopeId, resolvedChatId)
             await migrateDesktopChatScopes(previousDesktopScopeId, resolvedChatId)
             if (pendingChatKey) {
               useMothershipQueueStore.getState().migrate(pendingChatKey, resolvedChatId)