fix(search): preserve drafts and harden reviewed action delivery

Author: waleedlatif1

.github/scripts/http-e2e.sh

@@ -204,6 +204,7 @@ case "$group" in
     export NEXT_PUBLIC_FORCE_HOSTED=false
     export COPILOT_TOOL_PERMISSIONS_ENABLED=true
     export KNOWLEDGE_MEMBER_ACCESS=true CREDENTIAL_GROUPS=true ACCESS_CONTROL_ENABLED=true
+    export NEXT_PUBLIC_ACCESS_CONTROL_ENABLED=true NEXT_PUBLIC_ORGANIZATIONS_ENABLED=true
     export MSHIP_SEARCH_INTEGRATION_TOOLS=true
     bunx --no-install playwright install --with-deps chromium
     export INTERNAL_API_SECRET=desktop-inbox-http-ci-local-secret-at-least-32-characters
@@ -220,6 +221,11 @@ case "$group" in
     ASSISTANT_ACTIONS_E2E_AUTH_SECRET="$BETTER_AUTH_SECRET" \
     ASSISTANT_ACTIONS_E2E_REPORT_PATH="$report_dir/assistant-actions-ui-report.json" \
       bun --no-env-file scripts/test-assistant-actions-e2e.ts
+    ORGANIZATION_SEARCH_E2E_BASE_URL="$local_app_url" \
+    ORGANIZATION_SEARCH_E2E_DATABASE_URL="$DATABASE_URL" \
+    ORGANIZATION_SEARCH_E2E_AUTH_SECRET="$BETTER_AUTH_SECRET" \
+    ORGANIZATION_SEARCH_E2E_REPORT_PATH="$report_dir/organization-search-ui-report.json" \
+      bun --no-env-file scripts/test-organization-search-e2e.ts
     ;;
 
   project-files)

apps/docs/content/docs/integrations/jira.mdx

@@ -380,6 +380,7 @@ Create a future sprint on a Jira Software board
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
+| `warning` | string | Creation succeeded but sprint details are unavailable |
 | `sprint` | json | Created sprint with id, self, state, name, originBoardId, and optional goal, startDate, endDate |
 |   ↳ `id` | number | Sprint ID |
 |   ↳ `self` | string | Sprint REST URL |

apps/docs/content/docs/platform/self-hosting/environment-variables.mdx

@@ -188,6 +188,7 @@ Plain JavaScript without imports runs in isolated-vm within Node child workers i
 | Variable | Description |
 |----------|-------------|
 | `COPILOT_API_KEY` | API key for the default Sim service. Required for Chat, the Sim Chat workflow block, and Inbox operations that use that service |
+| `MSHIP_SEARCH_INTEGRATION_TOOLS` | Opt in to personal-account reads and reviewed actions in Search Assistant. Off by default. Applies when AppConfig is disabled or no feature-flags document is available; an available AppConfig document takes precedence. Requires organization account setup and configured provider credentials. Tool permissions and source restrictions still apply. See [Connect your account](/search/connect-your-account) |
 | `NEXT_PUBLIC_CHAT_DISABLED` | Set to `true` to hide the Chat module: the workspace lands on your first workflow, with no chats list or editor Chat panel. Chat is shown when unset; `bunx sim-setup` sets it for you if you skip the chat key |
 | `PII_URL` | Base URL of the Presidio service backing PII detection and redaction. The Helm chart wires it to its own `pii` Service when `pii.enabled`; on Compose point it at the PII service on your network. Local development and the Helm fallback use `http://localhost:5001`; that address works only when the service is reachable there. Point production at a running service to use redaction |
 | `ADMIN_API_KEY` | Admin API key for GitOps operations and organization provisioning |

apps/sim/app/o/[organizationId]/components/organization-conversation.test.tsx

@@ -35,7 +35,6 @@ const mocks = vi.hoisted(() => ({
   renderer: vi.fn(),
   markRead: vi.fn(),
   send: vi.fn(),
-  consume: vi.fn(),
   apiKeys: vi.fn(),
   authorizedApps: vi.fn(),
   fetchNextPage: vi.fn(),
@@ -69,9 +68,6 @@ vi.mock('@/app/workspace/[workspaceId]/home/components/chat-resource-panel', ()
 }))
 vi.mock('@/lib/auth/client', () => authClientMock)
 vi.mock('@/lib/uploads/client/session-upload', () => ({ uploadInternalFileSession: mocks.upload }))
-vi.mock('@/lib/core/utils/browser-storage', () => ({
-  MothershipHandoffStorage: { consume: mocks.consume },
-}))
 vi.mock('@/app/o/[organizationId]/providers/organization-provider', () => organizationProviderMock)
 vi.mock('@/app/workspace/[workspaceId]/home/hooks/use-chat', () => ({
   getMothershipUseChatOptions: (options: object) => ({ ...options, mothership: true }),

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

@@ -2,6 +2,7 @@
 
 import { useCallback, useEffect, useState } from 'react'
 import { toast } from '@sim/emcn'
+import { toRecord } from '@sim/utils/object'
 import { useQueryClient } from '@tanstack/react-query'
 import { useQueryStates } from 'nuqs'
 import {
@@ -12,7 +13,7 @@ import { requestJson } from '@/lib/api/client/request'
 import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge'
 import { getWorkspaceHostContextContract } from '@/lib/api/contracts/workspaces'
 import { useSession } from '@/lib/auth/client'
-import { MothershipHandoffStorage } from '@/lib/core/utils/browser-storage'
+import { BrowserStorage, MothershipHandoffStorage } from '@/lib/core/utils/browser-storage'
 import {
   getMothershipAttachmentPreviewUrl,
   getMothershipAttachmentUrl,
@@ -113,13 +114,31 @@ function OrganizationConversationContent({
       activeResourceState: controller.activeResourceState,
     })
   )
-  const newDraftId = requestMode === 'assistant' ? 'search-assistant' : 'new'
+  const newDraftId = destinationMode === 'assistant' ? 'search-assistant' : 'home'
   const initialDraftKey = `${userId}:organization:${organization.id}:${chatId ?? newDraftId}`
   const draftKey = `${userId}:organization:${organization.id}:${chat.resolvedChatId ?? chatId ?? newDraftId}`
+  const [legacyDraftKey] = useState(() => {
+    if (chatId) return null
+    const key = `${userId}:organization:${organization.id}:new`
+    if (!useMothershipDraftsStore.getState().drafts[key]) return null
+    const persisted = toRecord(BrowserStorage.getItem<unknown>('organization-chat-mode', null))
+    const modes = toRecord(toRecord(persisted.state).modes)
+    const legacyMode =
+      !canBuild || modes[`${userId}:${organization.id}`] === 'assistant' ? 'assistant' : 'agent'
+    return legacyMode === destinationMode ? key : null
+  })
   const savedDraft = useMothershipDraftsStore.getState().drafts
-  const initialDraft = savedDraft[draftKey] ?? savedDraft[initialDraftKey]
+  const initialDraft =
+    savedDraft[draftKey] ??
+    savedDraft[initialDraftKey] ??
+    (legacyDraftKey ? savedDraft[legacyDraftKey] : undefined)
   const draft = useMothershipDraftsStore(
-    (state) => (state.drafts[draftKey] ?? state.drafts[initialDraftKey])?.text ?? ''
+    (state) =>
+      (
+        state.drafts[draftKey] ??
+        state.drafts[initialDraftKey] ??
+        (legacyDraftKey ? state.drafts[legacyDraftKey] : undefined)
+      )?.text ?? ''
   )
   const setDraft = useCallback(
     (text: string, contexts?: ChatContext[]) => {
@@ -132,8 +151,10 @@ function OrganizationConversationContent({
     () => initialDraft?.contexts ?? []
   )
   useEffect(() => {
-    useMothershipDraftsStore.getState().migrateDraft(initialDraftKey, draftKey)
-  }, [initialDraftKey, draftKey])
+    const store = useMothershipDraftsStore.getState()
+    if (legacyDraftKey) store.migrateDraft(legacyDraftKey, initialDraftKey)
+    store.migrateDraft(initialDraftKey, draftKey)
+  }, [initialDraftKey, draftKey, legacyDraftKey])
   const hasChat = Boolean(chatId || chat.messages.length)
   const assistantSearchLevel = 'fast'
   const panel = useChatResourcePanel(chat, controller, userId)

apps/sim/app/o/[organizationId]/integrations/live-member-integrations.tsx

@@ -53,7 +53,8 @@ export function LiveMemberIntegrations({ organizationId, search }: LiveMemberInt
   if (!inventory.data)
     return <SettingsEmptyState variant='inline'>Loading your connections</SettingsEmptyState>
   const data = inventory.data
-  const approvals = new Map(policies.data?.map((policy) => [policy.connectorType, policy]))
+  const loadedPolicies = policies.isSuccess ? policies.data : undefined
+  const approvals = new Map(loadedPolicies?.map((policy) => [policy.connectorType, policy]))
   const group = data.credentialGroup
   const mcpProviders = new Map(
     group?.mcpServers.map((server) => [server.id, server.managedConnectorId])
@@ -98,7 +99,7 @@ export function LiveMemberIntegrations({ organizationId, search }: LiveMemberInt
         organizationId={organizationId}
         search={search}
         data={data}
-        policies={policies.data}
+        policies={loadedPolicies}
       />
       <div className='flex flex-col gap-3'>
         {policies.error && (
@@ -169,8 +170,9 @@ export function LiveMemberIntegrations({ organizationId, search }: LiveMemberInt
             approval?.policy?.accessMode === 'service_account'
               ? 'Selected resources you can access'
               : 'All accessible content'
-          const state =
-            approval?.available === false
+          const state = !loadedPolicies
+            ? undefined
+            : approval?.available === false
               ? 'Currently unavailable'
               : !approved
                 ? 'Disabled by your organization'
@@ -255,7 +257,7 @@ export function LiveMemberIntegrations({ organizationId, search }: LiveMemberInt
         {!visible.length &&
           !showSecrets &&
           !assistantAccountOptions(data, search).visible.length &&
-          policies.data &&
+          loadedPolicies &&
           secrets.data &&
           query && (
             <SettingsEmptyState variant='inline'>No matching integrations</SettingsEmptyState>

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-session-event.test.ts

@@ -1,3 +1,4 @@
+/** @vitest-environment jsdom */
 import { describe, expect, it, vi } from 'vitest'
 import { MothershipStreamV1SessionKind } from '@/lib/mothership/generated/mothership-stream-v1'
 import type { PersistedStreamEventEnvelope } from '@/lib/mothership/request/session/contract'
@@ -17,6 +18,20 @@ function chatSessionEvent(chatId: string): PersistedStreamEventEnvelope {
 }
 
 describe('handleSessionEvent', () => {
+  it.each([
+    ['assistant', '/o/organization-1/search/chat/chat-new'],
+    ['agent', '/o/organization-1/chat/chat-new'],
+    ['plan', '/o/organization-1/chat/chat-new'],
+  ] as const)(
+    'keeps a newly created %s conversation on its owning surface',
+    (requestMode, path) => {
+      window.history.replaceState(null, '', '/o/organization-1/search?view=assistant')
+      const deps = { ...makeStreamLoopDeps(), organizationId: 'organization-1', requestMode }
+      handleSessionEvent({ deps } as StreamLoopContext, chatSessionEvent('chat-new') as never)
+      expect(window.location.pathname).toBe(path)
+    }
+  )
+
   it('adopts a newly assigned chat before chatIdRef is written', () => {
     const deps = makeStreamLoopDeps()
     deps.workflowIdRef.current = 'workflow-1'

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-session-event.ts

@@ -66,7 +66,8 @@ export function handleSessionEvent(ctx: StreamLoopContext, parsed: SessionEvent)
           '',
           chatUrl(
             deps.organizationId ? { organizationId: deps.organizationId } : deps.workspaceId!,
-            payloadChatId
+            payloadChatId,
+            deps.requestMode
           )
         )
       }

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/stream-context.ts

@@ -21,6 +21,7 @@ import {
 import type { ResourceEventHandler } from '@/app/workspace/[workspaceId]/home/hooks/use-chat'
 import type {
   ChatMessage,
+  ChatRequestMode,
   ContentBlock,
   MothershipResource,
 } from '@/app/workspace/[workspaceId]/home/types'
@@ -99,6 +100,7 @@ export interface StreamEventScope {
 }
 
 export interface StreamLoopDeps {
+  requestMode: ChatRequestMode
   viewerId?: string
   citedSourcesEnabled?: boolean
   workspaceId?: string

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/stream-test-helpers.ts

@@ -22,6 +22,7 @@ export function ref<T>(current: T): MutableRefObject<T> {
 export function makeStreamLoopDeps(overrides: Partial<StreamLoopDeps> = {}): StreamLoopDeps {
   return {
     workspaceId: 'ws-1',
+    requestMode: 'agent',
     queryClient: {
       invalidateQueries: vi.fn(),
       cancelQueries: vi.fn(),