fix(extension): preserve capture focus and Sim Link routes

Author: waleedlatif1

apps/extension/src/background.ts

@@ -55,7 +55,6 @@ function open(tab: chrome.tabs.Tab, trigger: 'page' | 'selection' | 'keyboard')
         active instanceof HTMLElement &&
         (active.isContentEditable ||
           active.matches('iframe,frame,input,textarea,select') ||
-          active.localName.includes('-') ||
           Boolean(chrome.dom.openOrClosedShadowRoot(active)?.activeElement))
       return {
         href: location.href,

apps/extension/src/extract.ts

@@ -21,7 +21,6 @@ export function extractPageText(
     active instanceof HTMLElement &&
     (active.isContentEditable ||
       active.matches('input,textarea,select') ||
-      active.localName.includes('-') ||
       chrome.dom.openOrClosedShadowRoot(active)?.activeElement)
   )
     return { error: 'Select text outside an editable or embedded field.' }

apps/sim/app/o/[organizationId]/home/components/composer/composer.tsx

@@ -203,7 +203,8 @@ export function Composer({
         history.reset()
         editor.clear()
       },
-      () => editorRef.current.getValue() === raw && attachedFilesRef.current === filesAtSend
+      () => editorRef.current.getValue() === raw && attachedFilesRef.current === filesAtSend,
+      textareaRef.current
     )
   }
 

apps/sim/app/sim-links/[organizationId]/[name]/page.tsx

@@ -13,7 +13,8 @@ interface OrganizationLinkPageProps {
 
 /** Bookmarks stay in their exporting organization even after the browser's active team changes. */
 export default async function OrganizationLinkPage({ params }: OrganizationLinkPageProps) {
-  const { organizationId, name } = await params
+  const { organizationId, name: encodedName } = await params
+  const name = decodeURIComponent(encodedName)
   if (!simLinkNameSchema.safeParse(name).success) notFound()
   const routes = organizationRoutes(organizationId)
   const session = await getSession()

apps/sim/app/workspace/[workspaceId]/home/components/user-input/user-input.tsx

@@ -574,7 +574,8 @@ const UserInputImpl = forwardRef<UserInputHandle, UserInputProps>(function UserI
       clearComposer,
       () =>
         editorRef.current.getValue() === raw &&
-        filesRef.current.attachedFiles === currentFiles.attachedFiles
+        filesRef.current.attachedFiles === currentFiles.attachedFiles,
+      currentEditor.textareaRef.current
     )
   }, [chatPlanRequired, workspaceId, onSubmit, clearComposer, acceptSubmission])
 

apps/sim/hooks/use-composer-submission.ts

@@ -26,37 +26,41 @@ interface UseComposerSubmissionProps {
 
 export function useComposerSubmission({ scope, mode }: UseComposerSubmissionProps) {
   const active = useRef<PendingComposerSubmission | null>(null)
-  const focusBeforeSend = useRef<HTMLElement | null>(null)
+  const focusAfterSend = useRef<HTMLTextAreaElement | null>(null)
   const [pending, setPending] = useState(false)
 
   useLayoutEffect(() => {
     setPending(false)
     return () => {
       active.current = null
-      focusBeforeSend.current = null
+      focusAfterSend.current = null
     }
   }, [scope, mode])
 
   useLayoutEffect(() => {
     if (pending) return
-    const previous = focusBeforeSend.current
-    focusBeforeSend.current = null
-    if (previous?.isConnected && document.hasFocus() && document.activeElement === document.body) {
-      previous.focus({ preventScroll: true })
+    const input = focusAfterSend.current
+    focusAfterSend.current = null
+    if (input?.isConnected && document.hasFocus() && document.activeElement === document.body) {
+      input.focus({ preventScroll: true })
     }
   }, [pending])
 
   const accept = useCallback(
-    (submit: () => unknown, clear: () => void, unchanged: () => boolean) => {
+    (
+      submit: () => unknown,
+      clear: () => void,
+      unchanged: () => boolean,
+      input: HTMLTextAreaElement | null
+    ) => {
       if (active.current) return
       const result = submit()
       if (!(result instanceof PendingComposerSubmission)) {
         if (result !== false) clear()
         return
       }
       active.current = result
-      focusBeforeSend.current =
-        document.activeElement instanceof HTMLElement ? document.activeElement : null
+      focusAfterSend.current = input
       setPending(true)
       void result.ready
         .then((commit) => {

apps/sim/proxy.ts

@@ -233,14 +233,20 @@ const SUSPICIOUS_UA_PATTERNS = [
 ] as const
 
 /**
- * Handles authentication-based redirects for root paths
+ * Resolves legacy homepage aliases and authentication-based root redirects.
  */
 function handleRootPathRedirects(
   request: NextRequest,
   hasActiveSession: boolean
 ): NextResponse | null {
   const url = request.nextUrl
 
+  if (url.pathname !== '/sim' && url.pathname.toLowerCase() === '/sim') {
+    const destination = url.clone()
+    destination.pathname = '/'
+    return NextResponse.redirect(destination, 308)
+  }
+
   if (url.pathname !== '/' || url.searchParams.has('home')) {
     return null
   }