refactor(cli): remove unrelated Copilot changes

Author: TheodoreSpeaks

apps/docs/openapi-core.json

@@ -234,16 +234,6 @@ describe('Knowledge Utils', () => {
       expect(result.hasAccess).toBe(false)
       expect('notFound' in result && result.notFound).toBe(true)
     })
-
-    it('treats a knowledge base outside the trusted workspace as not found', async () => {
-      queueTableRows(schemaMock.knowledgeBase, [
-        { id: 'kb1', userId: 'user1', workspaceId: 'workspace-2' },
-      ])
-
-      const result = await checkKnowledgeBaseAccess('kb1', 'user1', 'workspace-1')
-
-      expect(result).toEqual({ hasAccess: false, notFound: true })
-    })
   })
 
   describe('checkDocumentAccess', () => {
@@ -363,17 +353,23 @@ 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])
-      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,
+      // 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')
       })
 
-      await expect(generateEmbeddings(['test text'])).rejects.toThrow(
-        'OPENAI_API_KEY is not configured'
-      )
+      try {
+        await expect(generateEmbeddings(['test text'])).rejects.toThrow(
+          'OPENAI_API_KEY is not configured'
+        )
+      } finally {
+        rotationSpy.mockRestore()
+        vi.unstubAllEnvs()
+      }
     })
   })
 })

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

@@ -163,8 +163,7 @@ export type ChunkAccessCheck = ChunkAccessResult | ChunkAccessDenied
 async function resolveKnowledgeBaseAccess(
   knowledgeBaseId: string,
   userId: string,
-  requireWrite: boolean,
-  workspaceId?: string
+  requireWrite: boolean
 ): Promise<KnowledgeBaseAccessCheck> {
   const kb = await db
     .select({
@@ -184,10 +183,6 @@ async function resolveKnowledgeBaseAccess(
 
   const kbData = kb[0]
 
-  if (workspaceId && kbData.workspaceId !== workspaceId) {
-    return { hasAccess: false, notFound: true }
-  }
-
   if (kbData.workspaceId) {
     // Workspace KB: use workspace permissions only
     const userPermission = await getUserEntityPermissions(userId, 'workspace', kbData.workspaceId)
@@ -210,10 +205,9 @@ async function resolveKnowledgeBaseAccess(
  */
 export async function checkKnowledgeBaseAccess(
   knowledgeBaseId: string,
-  userId: string,
-  workspaceId?: string
+  userId: string
 ): Promise<KnowledgeBaseAccessCheck> {
-  return resolveKnowledgeBaseAccess(knowledgeBaseId, userId, false, workspaceId)
+  return resolveKnowledgeBaseAccess(knowledgeBaseId, userId, false)
 }
 
 /**
@@ -225,10 +219,9 @@ export async function checkKnowledgeBaseAccess(
  */
 export async function checkKnowledgeBaseWriteAccess(
   knowledgeBaseId: string,
-  userId: string,
-  workspaceId?: string
+  userId: string
 ): Promise<KnowledgeBaseAccessCheck> {
-  return resolveKnowledgeBaseAccess(knowledgeBaseId, userId, true, workspaceId)
+  return resolveKnowledgeBaseAccess(knowledgeBaseId, userId, true)
 }
 
 /**
@@ -239,15 +232,9 @@ async function resolveDocumentAccess(
   knowledgeBaseId: string,
   documentId: string,
   userId: string,
-  requireWrite: boolean,
-  workspaceId?: string
+  requireWrite: boolean
 ): Promise<DocumentAccessCheck> {
-  const kbAccess = await resolveKnowledgeBaseAccess(
-    knowledgeBaseId,
-    userId,
-    requireWrite,
-    workspaceId
-  )
+  const kbAccess = await resolveKnowledgeBaseAccess(knowledgeBaseId, userId, requireWrite)
 
   if (!kbAccess.hasAccess) {
     return {
@@ -275,10 +262,9 @@ async function resolveDocumentAccess(
 export async function checkDocumentAccess(
   knowledgeBaseId: string,
   documentId: string,
-  userId: string,
-  workspaceId?: string
+  userId: string
 ): Promise<DocumentAccessCheck> {
-  return resolveDocumentAccess(knowledgeBaseId, documentId, userId, false, workspaceId)
+  return resolveDocumentAccess(knowledgeBaseId, documentId, userId, false)
 }
 
 /**
@@ -288,10 +274,9 @@ export async function checkDocumentAccess(
 export async function checkDocumentWriteAccess(
   knowledgeBaseId: string,
   documentId: string,
-  userId: string,
-  workspaceId?: string
+  userId: string
 ): Promise<DocumentAccessCheck> {
-  return resolveDocumentAccess(knowledgeBaseId, documentId, userId, true, workspaceId)
+  return resolveDocumentAccess(knowledgeBaseId, documentId, userId, true)
 }
 
 /**

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

@@ -9,7 +9,6 @@ export type {
   MothershipResourceType,
   WorkspaceResourceRef,
 } from '@/lib/copilot/resources/types'
-export { SUBAGENT_LABELS } from '@/lib/copilot/tools/subagent-display'
 
 /** Union of all valid context kind strings, derived from {@link ChatContext}. */
 export type ChatContextKind = ChatContext['kind']
@@ -178,3 +177,24 @@ export interface ChatMessage {
   contexts?: ChatMessageContext[]
   requestId?: string
 }
+
+export const SUBAGENT_LABELS: Record<string, string> = {
+  workflow: 'Workflow Agent',
+  debug: 'Debug Agent',
+  deploy: 'Deploy Agent',
+  auth: 'Auth Agent',
+  research: 'Research Agent',
+  knowledge: 'Knowledge Agent',
+  table: 'Table Agent',
+  custom_tool: 'Custom Tool Agent',
+  scout: 'Scout Agent',
+  search: 'Search Agent',
+  superagent: 'Superagent',
+  run: 'Run Agent',
+  agent: 'Tools Agent',
+  // `job` retained as a backward-compat alias so historical transcripts still render a label.
+  job: 'Job Agent',
+  file: 'File Agent',
+  media: 'Media Agent',
+  browser: 'Browser Agent',
+} as const

apps/sim/app/workspace/[workspaceId]/home/types.ts

@@ -11,7 +11,6 @@ import {
   completeAsyncToolCall,
   detachAsyncToolCall,
   getClaimedWorkflowExecutionId,
-  markAsyncToolRunning,
   recordToolPermissionDecision,
   releaseWorkflowToolExecutionClaim,
   replaceTerminalAsyncToolCallResult,
@@ -133,27 +132,6 @@ describe('async tool repository single-row semantics', () => {
     )
   })
 
-  it('marks a Sim tool running only while its durable row is still live', async () => {
-    dbChainMockFns.returning.mockResolvedValueOnce([
-      {
-        toolCallId: 'sim-tool',
-        status: 'running',
-        claimedBy: 'sim-stream',
-      },
-    ])
-
-    await markAsyncToolRunning('sim-tool', 'sim-stream')
-
-    const predicate = dbChainMockFns.where.mock.calls.at(-1)?.[0]
-    expect(predicate).toEqual({
-      type: 'and',
-      conditions: [
-        expect.objectContaining({ type: 'eq', right: 'sim-tool' }),
-        expect.objectContaining({ type: 'inArray', values: ['pending', 'running'] }),
-      ],
-    })
-  })
-
   it('atomically binds an eligible workflow tool to one execution', async () => {
     dbChainMockFns.returning.mockResolvedValueOnce([
       {

apps/sim/lib/copilot/async-runs/repository.test.ts

@@ -329,10 +329,7 @@ async function markAsyncToolStatus(
 }
 
 export async function markAsyncToolRunning(toolCallId: string, claimedBy: string) {
-  return markAsyncToolStatus(toolCallId, ASYNC_TOOL_STATUS.running, { claimedBy }, [
-    ASYNC_TOOL_STATUS.pending,
-    ASYNC_TOOL_STATUS.running,
-  ])
+  return markAsyncToolStatus(toolCallId, 'running', { claimedBy })
 }
 
 export function getClaimedWorkflowExecutionId(claimedBy: string | null | undefined) {

apps/sim/lib/copilot/async-runs/repository.ts

@@ -21,7 +21,6 @@ vi.mock('@/lib/workspaces/permissions/utils', () => ({
 
 import {
   getAccessibleCopilotChat,
-  getAccessibleCopilotChatContinuationMetadata,
   getAccessibleCopilotChatWithMessages,
   resolveOrCreateChat,
 } from '@/lib/copilot/chat/lifecycle'
@@ -107,59 +106,6 @@ describe('lifecycle copilot chat reads (cutover to copilot_messages)', () => {
     expect(result?.messages).toEqual([])
   })
 
-  it('loads continuation metadata with a one-row probe and contexts-only MCP projection', async () => {
-    const continuationRow = {
-      id: chatRow.id,
-      userId: chatRow.userId,
-      workflowId: chatRow.workflowId,
-      workspaceId: chatRow.workspaceId,
-      type: chatRow.type,
-      title: chatRow.title,
-    }
-    dbChainMockFns.limit
-      .mockResolvedValueOnce([continuationRow])
-      .mockResolvedValueOnce([{ id: 'message-1' }])
-    dbChainMockFns.orderBy.mockResolvedValueOnce([
-      {
-        contexts: [
-          { kind: 'mcp', serverId: 'mcp-docs', label: 'Docs' },
-          { kind: 'skill', skillId: 'skill-review', label: 'Review' },
-        ],
-      },
-      { contexts: [{ kind: 'mcp', serverId: 'mcp-docs', label: 'Docs again' }] },
-      { contexts: [{ kind: 'mcp', serverId: 'mcp-issues', label: 'Issues' }] },
-    ])
-
-    const result = await getAccessibleCopilotChatContinuationMetadata(CHAT_ID, USER_ID)
-
-    expect(result).toEqual({
-      ...continuationRow,
-      hasMessages: true,
-      mcpServerIds: ['mcp-docs', 'mcp-issues'],
-    })
-    expect(dbChainMockFns.limit).toHaveBeenCalledTimes(2)
-    expect(dbChainMockFns.orderBy).toHaveBeenCalledTimes(1)
-    const contextsProjection = dbChainMockFns.select.mock.calls[2]?.[0] as Record<string, unknown>
-    expect(Object.keys(contextsProjection)).toEqual(['contexts'])
-  })
-
-  it('skips the MCP projection for an empty persisted chat', async () => {
-    const continuationRow = {
-      id: chatRow.id,
-      userId: chatRow.userId,
-      workflowId: chatRow.workflowId,
-      workspaceId: chatRow.workspaceId,
-      type: chatRow.type,
-      title: chatRow.title,
-    }
-    dbChainMockFns.limit.mockResolvedValueOnce([continuationRow]).mockResolvedValueOnce([])
-
-    const result = await getAccessibleCopilotChatContinuationMetadata(CHAT_ID, USER_ID)
-
-    expect(result).toEqual({ ...continuationRow, hasMessages: false, mcpServerIds: [] })
-    expect(dbChainMockFns.orderBy).not.toHaveBeenCalled()
-  })
-
   it('returns null and does NOT query messages when the chat is not found', async () => {
     dbChainMockFns.limit.mockResolvedValueOnce([])
 

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

@@ -6,11 +6,7 @@ import {
   getActiveWorkflowRecord,
 } from '@sim/platform-authz/workflow'
 import { and, asc, eq, isNull, sql } from 'drizzle-orm'
-import {
-  collectChatMcpServerIds,
-  type PersistedMessage,
-  stripToolResultOutput,
-} from '@/lib/copilot/chat/persisted-message'
+import { type PersistedMessage, stripToolResultOutput } from '@/lib/copilot/chat/persisted-message'
 import {
   assertActiveWorkspaceAccess,
   checkWorkspaceAccess,
@@ -39,11 +35,6 @@ 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) —
@@ -112,12 +103,6 @@ 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'
@@ -196,57 +181,6 @@ 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`