fix(chat): scope the managed-credential listing to the group's workspace and carry only chat params on the handoff

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/home/hooks/chat-url.test.ts

@@ -0,0 +1,28 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { describe, expect, it } from 'vitest'
+import { chatUrl } from '@/app/workspace/[workspaceId]/home/hooks/chat-url'
+
+function withSearch(search: string) {
+  window.history.replaceState(null, '', `/workspace/ws-1/home${search}`)
+}
+
+describe('chatUrl', () => {
+  it('carries the mode and the open resource onto the chat path', () => {
+    withSearch('?mode=assistant&resource=res-1')
+    expect(chatUrl('ws-1', 'chat-1')).toBe(
+      '/workspace/ws-1/chat/chat-1?mode=assistant&resource=res-1'
+    )
+  })
+
+  it('leaves a search query and its filters behind', () => {
+    withSearch('?q=volvo&source=gmail&updated=7d&mode=assistant')
+    expect(chatUrl('ws-1', 'chat-1')).toBe('/workspace/ws-1/chat/chat-1?mode=assistant')
+  })
+
+  it('produces a clean path when nothing belongs on the chat', () => {
+    withSearch('?q=volvo')
+    expect(chatUrl('ws-1', 'chat-1')).toBe('/workspace/ws-1/chat/chat-1')
+  })
+})

apps/sim/app/workspace/[workspaceId]/home/hooks/chat-url.ts

@@ -1,9 +1,22 @@
+import { modeParam, resourceParam } from '@/app/workspace/[workspaceId]/home/search-params'
+
+/** The composer's URL state that belongs on a chat page: the mode and the open resource. */
+const CHAT_URL_PARAMS = [modeParam.key, resourceParam.key] as const
+
 /**
- * The URL a new chat is handed off to once the server names it. The current
- * query string rides along so the composer's URL-backed state, the mode above
- * all, survives the path swap: the first Assistant message must not bounce the
- * person back to Build.
+ * The URL a new chat is handed off to once the server names it. Only the
+ * params that belong on a chat ride along, so the mode survives the path swap
+ * (the first Assistant message must not bounce the person back to Build) while
+ * a search's `q` and filters, which never join a transcript, are left behind
+ * whatever the URL held at that instant.
  */
 export function chatUrl(workspaceId: string, chatId: string): string {
-  return `/workspace/${workspaceId}/chat/${chatId}${window.location.search}`
+  const current = new URLSearchParams(window.location.search)
+  const carried = new URLSearchParams()
+  for (const key of CHAT_URL_PARAMS) {
+    const value = current.get(key)
+    if (value) carried.set(key, value)
+  }
+  const search = carried.toString()
+  return `/workspace/${workspaceId}/chat/${chatId}${search ? `?${search}` : ''}`
 }

apps/sim/lib/credentials/environment.ts

@@ -876,6 +876,7 @@ export async function getEnrolledManagedOAuthCredentials(
     .where(
       and(
         eq(credential.workspaceId, workspaceId),
+        eq(credentialGroup.workspaceId, workspaceId),
         eq(credential.type, 'managed_oauth'),
         eq(user.id, userId),
         eq(user.emailVerified, true)