fix(cli): harden login and credentialless chat

Author: TheodoreSpeaks

apps/sim/app/api/knowledge/search/utils.test.ts

@@ -666,23 +666,17 @@ describe('Knowledge Search Utils', () => {
     it('should throw error when no API configuration provided', async () => {
       const { env } = await import('@/lib/core/config/env')
       Object.keys(env).forEach((key) => delete (env as any)[key])
-      // The env object lazily reads process.env, so a developer's local .env
-      // keys survive the deletion above — stub the direct key empty and fail
-      // the hosted rotation fallback for hermeticity on any machine.
-      vi.stubEnv('OPENAI_API_KEY', '')
-      const apiKeysModule = await import('@/lib/core/config/api-keys')
-      const rotationSpy = vi.spyOn(apiKeysModule, 'getRotatingApiKey').mockImplementation(() => {
-        throw new Error('No rotation keys configured')
+      Object.assign(env, {
+        OPENAI_API_KEY: undefined,
+        OPENAI_API_KEY_1: undefined,
+        OPENAI_API_KEY_2: undefined,
+        OPENAI_API_KEY_3: undefined,
+        OPENROUTER_API_KEY: undefined,
       })
 
-      try {
-        await expect(generateSearchEmbedding('test query')).rejects.toThrow(
-          'OPENAI_API_KEY is not configured'
-        )
-      } finally {
-        rotationSpy.mockRestore()
-        vi.unstubAllEnvs()
-      }
+      await expect(generateSearchEmbedding('test query')).rejects.toThrow(
+        'OPENAI_API_KEY is not configured'
+      )
     })
 
     it('should handle Azure OpenAI API errors properly', async () => {
@@ -713,6 +707,7 @@ describe('Knowledge Search Utils', () => {
       Object.keys(env).forEach((key) => delete (env as any)[key])
       Object.assign(env, {
         OPENAI_API_KEY: 'test-openai-key',
+        OPENROUTER_API_KEY: undefined,
       })
 
       mockNextFetchResponse({

apps/sim/app/api/knowledge/utils.test.ts

@@ -363,23 +363,17 @@ describe('Knowledge Utils', () => {
     it('should throw error when no API configuration provided', async () => {
       const { env } = await import('@/lib/core/config/env')
       Object.keys(env).forEach((key) => delete (env as any)[key])
-      // The env object lazily reads process.env, so a developer's local .env
-      // keys survive the deletion above — stub the direct key empty and fail
-      // the hosted rotation fallback for hermeticity on any machine.
-      vi.stubEnv('OPENAI_API_KEY', '')
-      const apiKeysModule = await import('@/lib/core/config/api-keys')
-      const rotationSpy = vi.spyOn(apiKeysModule, 'getRotatingApiKey').mockImplementation(() => {
-        throw new Error('No rotation keys configured')
+      Object.assign(env, {
+        OPENAI_API_KEY: undefined,
+        OPENAI_API_KEY_1: undefined,
+        OPENAI_API_KEY_2: undefined,
+        OPENAI_API_KEY_3: undefined,
+        OPENROUTER_API_KEY: undefined,
       })
 
-      try {
-        await expect(generateEmbeddings(['test text'])).rejects.toThrow(
-          'OPENAI_API_KEY is not configured'
-        )
-      } finally {
-        rotationSpy.mockRestore()
-        vi.unstubAllEnvs()
-      }
+      await expect(generateEmbeddings(['test text'])).rejects.toThrow(
+        'OPENAI_API_KEY is not configured'
+      )
     })
   })
 })

apps/sim/lib/api/server/routes/v2-resource-concealment.test.ts

@@ -6,7 +6,11 @@ import {
   getActiveWorkflowRecord,
 } from '@sim/platform-authz/workflow'
 import { and, asc, eq, isNull, sql } from 'drizzle-orm'
-import { type PersistedMessage, stripToolResultOutput } from '@/lib/copilot/chat/persisted-message'
+import {
+  collectChatMcpServerIds,
+  type PersistedMessage,
+  stripToolResultOutput,
+} from '@/lib/copilot/chat/persisted-message'
 import {
   assertActiveWorkspaceAccess,
   checkWorkspaceAccess,
@@ -35,6 +39,11 @@ const copilotChatAuthColumns = {
   type: copilotChats.type,
 } as const
 
+const copilotChatContinuationColumns = {
+  ...copilotChatAuthColumns,
+  title: copilotChats.title,
+} as const
+
 /**
  * Column set for chat-detail callers that need chat metadata. The conversation
  * transcript is no longer selected from `copilot_chats.messages` (JSONB) —
@@ -103,6 +112,12 @@ type CopilotChatAuthRow = Pick<
   'id' | 'userId' | 'workflowId' | 'workspaceId' | 'type'
 >
 
+export type CopilotChatContinuationMetadata = CopilotChatAuthRow & {
+  title: string | null
+  hasMessages: boolean
+  mcpServerIds: string[]
+}
+
 export type CopilotChatDetailRow = Pick<
   typeof copilotChats.$inferSelect,
   | 'id'
@@ -181,6 +196,57 @@ export async function getAccessibleCopilotChatAuth(
   return authorizeCopilotChatRow(chat, chatId, userId)
 }
 
+/**
+ * Loads only the authorized metadata needed to continue a persisted chat. The
+ * one-row existence probe preserves first-turn title behavior, while the MCP
+ * query projects only user-message context arrays. Assistant/tool content is
+ * never loaded or normalized.
+ */
+export async function getAccessibleCopilotChatContinuationMetadata(
+  chatId: string,
+  userId: string
+): Promise<CopilotChatContinuationMetadata | null> {
+  const [chat] = await db
+    .select(copilotChatContinuationColumns)
+    .from(copilotChats)
+    .where(ownedLiveChatWhere(chatId, userId))
+    .limit(1)
+
+  const authorized = await authorizeCopilotChatRow(chat, chatId, userId)
+  if (!authorized) return null
+
+  const [message] = await db
+    .select({ id: copilotMessages.id })
+    .from(copilotMessages)
+    .where(and(eq(copilotMessages.chatId, chatId), isNull(copilotMessages.deletedAt)))
+    .limit(1)
+
+  if (!message) return { ...authorized, hasMessages: false, mcpServerIds: [] }
+
+  const contextRows = await db
+    .select({ contexts: sql<unknown>`${copilotMessages.content} -> 'contexts'` })
+    .from(copilotMessages)
+    .where(
+      and(
+        eq(copilotMessages.chatId, chatId),
+        eq(copilotMessages.role, 'user'),
+        isNull(copilotMessages.deletedAt),
+        sql`${copilotMessages.content} ? 'contexts'`
+      )
+    )
+    .orderBy(
+      sql`${copilotMessages.seq} asc nulls last`,
+      asc(copilotMessages.createdAt),
+      asc(copilotMessages.id)
+    )
+
+  return {
+    ...authorized,
+    hasMessages: true,
+    mcpServerIds: collectChatMcpServerIds(contextRows),
+  }
+}
+
 /**
  * Load a copilot chat row for the legacy chat detail endpoint, including the
  * transcript plus `model` and `config`. Drops `previewYaml`

apps/sim/lib/api/server/routes/v2-resource-concealment.ts

@@ -127,6 +127,36 @@ export interface PersistedMessage {
   contexts?: PersistedMessageContext[]
 }
 
+/**
+ * Collect the append-only MCP enablement carried by explicitly tagged user
+ * message contexts. Only ids move between turns: inherited contexts are not
+ * re-expanded into the prompt or persisted again as chips on later messages.
+ */
+export function collectChatMcpServerIds(
+  conversationHistory: readonly unknown[],
+  currentContexts?: unknown
+): string[] {
+  const serverIds = new Set<string>()
+
+  const collect = (contexts: unknown) => {
+    if (!Array.isArray(contexts)) return
+    for (const context of contexts) {
+      if (!context || typeof context !== 'object') continue
+      const { kind, serverId } = context as { kind?: unknown; serverId?: unknown }
+      if (kind === 'mcp' && typeof serverId === 'string' && serverId) {
+        serverIds.add(serverId)
+      }
+    }
+  }
+
+  for (const message of conversationHistory) {
+    collect((message as { contexts?: unknown } | null)?.contexts)
+  }
+  collect(currentContexts)
+
+  return Array.from(serverIds)
+}
+
 /**
  * Drop persisted tool outputs, keeping `success` and `error`. The one narrow
  * UI-state exception is a browser takeover's user-authored instruction, which

apps/sim/lib/copilot/chat/lifecycle.ts

@@ -16,6 +16,7 @@ import { buildCopilotRequestPayload } from '@/lib/copilot/chat/payload'
 import {
   buildPersistedAssistantMessage,
   buildPersistedUserMessage,
+  collectChatMcpServerIds,
   withStoppedContentBlock,
 } from '@/lib/copilot/chat/persisted-message'
 import {
@@ -416,44 +417,6 @@ function normalizeContexts(contexts: UnifiedChatRequest['contexts']) {
   })
 }
 
-/**
- * An MCP server tagged with `/name` stays enabled for the rest of the chat, not
- * just the turn it was tagged on. Persisted user messages already carry their
- * `mcp` contexts, so the transcript is the source of truth — enablement survives
- * reloads and reopened chats with no extra state to keep in sync. There is
- * deliberately no off switch: history is append-only.
- *
- * Only the ids travel forward, not the contexts themselves. The tools ride the
- * tool array on every turn, so the model always sees their names and schemas;
- * re-expanding the prompt listing each turn would just duplicate that. Keeping
- * inherited servers out of the persisted contexts also keeps the `/name` chips
- * on a sent message showing only what the user actually typed that turn.
- */
-function collectChatMcpServerIds(
-  conversationHistory: unknown[],
-  currentContexts: UnifiedChatRequest['contexts']
-): string[] {
-  const serverIds = new Set<string>()
-
-  const collect = (contexts: unknown) => {
-    if (!Array.isArray(contexts)) return
-    for (const ctx of contexts) {
-      if (!ctx || typeof ctx !== 'object') continue
-      const { kind, serverId } = ctx as { kind?: unknown; serverId?: unknown }
-      if (kind === 'mcp' && typeof serverId === 'string' && serverId) {
-        serverIds.add(serverId)
-      }
-    }
-  }
-
-  for (const message of conversationHistory) {
-    collect((message as { contexts?: unknown } | null)?.contexts)
-  }
-  collect(currentContexts)
-
-  return Array.from(serverIds)
-}
-
 async function resolveAgentContexts(params: {
   contexts?: UnifiedChatRequest['contexts']
   resourceAttachments?: UnifiedChatRequest['resourceAttachments']