fix(search): remove the extra assistant tools gate (#9468)

Remove the redundant Assistant tool rollout gate while retaining organization access, account ownership, source restrictions, and action approval policies.

Keep Search editing and submission disabled until hydration is ready, then autofocus the field. Cover early edits and draft restoration with a held-script browser regression.

Author: waleedlatif1

.github/scripts/http-e2e.sh

@@ -205,7 +205,6 @@ case "$group" in
     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
     export DB_TX_TRIPWIRE=throw

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

@@ -188,7 +188,6 @@ 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/docs/content/docs/search/ask-questions.mdx

@@ -125,7 +125,7 @@ Copy the reviewed draft into another app, or ask Assistant to create it using yo
 
 ## Review actions
 
-When integration actions are enabled, Assistant can answer questions and take supported actions in the same conversation. For example, ask it to draft an email in Gmail or create a Jira issue using your own connected account.
+Assistant can answer questions and take supported actions in the same conversation. For example, ask it to draft an email in Gmail or create a Jira issue using your own connected account.
 
 Reads run without a prompt by default. Writes wait for review by default. Each proposal appears inline in the conversation with its app, account, destination, and proposed content. Select **Edit** to change supported fields, then choose **Allow** or **Cancel** for each action. After several proposals, **Allow N shown** or **Cancel N shown** applies your choice to that displayed batch. You can approve individual actions first, then cancel the remaining batch.
 

apps/docs/content/docs/search/connect-your-account.mdx

@@ -46,7 +46,7 @@ Creating Jira sprints requires the Jira sprint permission. If your account was c
 
 ## Tool permissions
 
-When Assistant integration actions are enabled, open the app in **Integrations** and select your account. Tool permissions appear in its details when the app has supported Assistant tools available to you. Set a preference for each operation or use the **Read-only tools** and **Write tools** group controls:
+Open the app in **Integrations** and select your account. Tool permissions appear in its details when the app has supported Assistant tools available to you. Set a preference for each operation or use the **Read-only tools** and **Write tools** group controls:
 
 | Preference | Behavior |
 | --- | --- |

apps/sim/app/o/[organizationId]/components/search-input-bar.tsx

@@ -16,6 +16,7 @@ import { InputToolbar } from '@/app/workspace/[workspaceId]/home/components/user
 interface SearchInputBarProps {
   inputRef: RefObject<HTMLTextAreaElement | null>
   value: string
+  disabled?: boolean
   onChange: (value: string) => void
   onSubmit: () => void
   onPaste?: ClipboardEventHandler<HTMLTextAreaElement>
@@ -36,6 +37,7 @@ export function SearchInputBar({
   attachments,
   inputRef,
   value,
+  disabled = false,
   onChange,
   onSubmit,
   onPaste,
@@ -106,6 +108,7 @@ export function SearchInputBar({
             inputRef={inputRef}
             scrollerRef={scrollerRef}
             value={value}
+            disabled={disabled}
             compact={!hasAttachments && !expanded}
             className={hasAttachments ? 'min-h-[56px]' : undefined}
             maxHeight={200}

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

@@ -26,6 +26,7 @@ import { MicButton } from '@/app/workspace/[workspaceId]/home/components/user-in
 import { MicrophonePermissionHelp } from '@/app/workspace/[workspaceId]/home/components/user-input/components/microphone-permission-help/microphone-permission-help'
 import { HomeFallback } from '@/app/workspace/[workspaceId]/home/home-fallback'
 import { knowledgeKeys } from '@/hooks/queries/utils/knowledge-keys'
+import { useHydrated } from '@/hooks/use-hydrated'
 import { useVoiceInput } from '@/hooks/use-voice-input'
 import { useMothershipDraftsStore } from '@/stores/mothership-drafts/store'
 
@@ -54,6 +55,7 @@ interface SearchFieldProps {
 /** Search commits a query on submit while retaining an independent editable draft. */
 function SearchField({ userId, initialValue, onSubmit }: SearchFieldProps) {
   const inputRef = useRef<HTMLTextAreaElement>(null)
+  const hydrated = useHydrated()
   const { organization } = useOrganizationContext()
   const queryClient = useQueryClient()
   const queryKey = knowledgeKeys.searchQuery(
@@ -90,14 +92,17 @@ function SearchField({ userId, initialValue, onSubmit }: SearchFieldProps) {
     getValue: () => value,
     onChange: setValue,
   })
-  const canSubmit = value.trim().length > 0
+  const canSubmit = hydrated && value.trim().length > 0
 
-  useEffect(() => inputRef.current?.focus(), [])
+  useEffect(() => {
+    if (hydrated) inputRef.current?.focus()
+  }, [hydrated])
 
   const field = (
     <SearchInputBar
       inputRef={inputRef}
       value={value}
+      disabled={!hydrated}
       onChange={setValue}
       onSubmit={() => submit()}
       floating={!initialValue.trim()}

apps/sim/lib/assistant-actions/catalog.ts

@@ -7,7 +7,6 @@ import { projectIntegrationToolsForViewer } from '@/lib/integrations/tool-projec
 import { requireOrganizationSearchApproval } from '@/lib/knowledge/search/integration-policy'
 import { projectAssistantConnectedAccountTool } from '@/lib/mothership/assistant/connected-account-tool'
 import { isAssistantIntegrationTool } from '@/lib/mothership/assistant/tool-policy'
-import { isSearchIntegrationToolsEnabled } from '@/lib/mothership/feature-flags'
 import { getUserPermissionConfigForOrganization } from '@/lib/permission-groups/resolve.server'
 import { requiresScopedRetrieval } from '@/lib/sim-search/live/policy-schema'
 import { livePolicyFor, loadLiveSearchPolicies } from '@/lib/sim-search/live/policy-store'
@@ -17,17 +16,16 @@ export async function loadAssistantIntegrationTools(
   scope: { organizationId: string; userId: string },
   executor?: DbOrTx
 ) {
-  const [visibility, config, enabled] = await Promise.all([
+  const [visibility, config] = await Promise.all([
     getBlockVisibility({ userId: scope.userId, orgId: scope.organizationId }),
     getUserPermissionConfigForOrganization(scope.organizationId, executor),
-    isSearchIntegrationToolsEnabled(),
   ])
   const tools = projectIntegrationToolsForViewer(visibility, config)
     .tools.map((entry) => ({
       ...entry,
       config: projectAssistantConnectedAccountTool(entry.config),
     }))
-    .filter(({ config: tool }) => enabled && isAssistantIntegrationTool(tool) && tool.oauth)
+    .filter(({ config: tool }) => isAssistantIntegrationTool(tool) && tool.oauth)
   const providers = [
     ...new Set(
       tools.flatMap(({ config: tool }) => {

apps/sim/lib/assistant-actions/tool-permissions.integration.ts

@@ -74,7 +74,6 @@ import { getToolMetadata } from '@/tools/metadata'
 
 vi.hoisted(() => {
   Object.assign(process.env, {
-    MSHIP_SEARCH_INTEGRATION_TOOLS: 'true',
     JIRA_CLIENT_ID: 'assistant-fixture-client',
     JIRA_CLIENT_SECRET: 'assistant-fixture-client-secret',
     GOOGLE_CLIENT_ID: 'assistant-google-fixture-client',

apps/sim/lib/core/config/env.ts

@@ -606,7 +606,6 @@ export const env = createEnv({
     DASHBOARDS: z.boolean().optional(),
     PROJECTS:                              z.boolean().optional(),                 // Fallback for the `projects` feature flag off AppConfig
     MSHIP_COMPUTER_USE: z.boolean().optional(),
-    MSHIP_SEARCH_INTEGRATION_TOOLS: z.boolean().optional(),
     WORKFLOW_TESTS:                        z.boolean().optional(),                 // Fallback for the `workflow-tests` feature flag off AppConfig
     CHANGELOG:                             z.boolean().optional(),                 // Fallback for the `changelog` feature flag off AppConfig
     MSHIP_MODEL_SELECTOR: z.boolean().optional(),

apps/sim/lib/core/config/feature-flags.ts

@@ -57,11 +57,6 @@ const FEATURE_FLAGS = {
       'personal workspaces follow the global switch. Each device must also opt in.',
     fallback: 'MSHIP_COMPUTER_USE',
   },
-  'mothership-search-integration-tools': {
-    description:
-      'Enable personal-account integration reads and reviewed actions in Search Assistant. Global rollout with MSHIP_SEARCH_INTEGRATION_TOOLS fallback when AppConfig is unavailable; disabled by default.',
-    fallback: 'MSHIP_SEARCH_INTEGRATION_TOOLS',
-  },
   'workflow-tests': {
     description:
       'Enable workflow tests: the workspace Tests page, tests/<name>.test.js files, and the Sim tests tool. Supports global and organization rollout; disabled by default.',