fix(db): address review feedback (joinedAt backfill, mcp delete error, chatDeploy projection, sql newline)

Author: waleedlatif1

apps/sim/lib/copilot/tools/handlers/deployment/manage.ts

@@ -43,7 +43,17 @@ export async function executeCheckDeploymentStatus(
         .where(eq(workflow.id, workflowId))
         .limit(1),
       db
-        .select()
+        .select({
+          id: chat.id,
+          identifier: chat.identifier,
+          title: chat.title,
+          description: chat.description,
+          authType: chat.authType,
+          allowedEmails: chat.allowedEmails,
+          outputConfigs: chat.outputConfigs,
+          password: chat.password,
+          customizations: chat.customizations,
+        })
         .from(chat)
         .where(and(eq(chat.workflowId, workflowId), isNull(chat.archivedAt)))
         .limit(1),

apps/sim/lib/credentials/environment.ts

@@ -95,7 +95,7 @@ async function ensureWorkspaceCredentialMemberships(
     updatedAt: now,
   }))
 
-  // `joinedAt` is omitted from SET so the original value is preserved on conflict.
+  // `joinedAt` uses COALESCE so a non-null existing value is preserved but null is backfilled.
   await db
     .insert(credentialMember)
     .values(values)
@@ -104,6 +104,7 @@ async function ensureWorkspaceCredentialMemberships(
       set: {
         role: sql`excluded.role`,
         status: 'active',
+        joinedAt: sql`COALESCE(${credentialMember.joinedAt}, excluded.joined_at)`,
         invitedBy: ownerUserId,
         updatedAt: now,
       },

apps/sim/lib/mcp/orchestration/workflow-mcp-lifecycle.ts

@@ -2,7 +2,7 @@ import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
 import { db, workflow, workflowMcpServer, workflowMcpTool } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
-import { and, eq, inArray, isNull, sql } from 'drizzle-orm'
+import { and, eq, inArray, isNull } from 'drizzle-orm'
 import { mcpPubSub } from '@/lib/mcp/pubsub'
 import { generateParameterSchemaForWorkflow } from '@/lib/mcp/workflow-mcp-sync'
 import { sanitizeToolName } from '@/lib/mcp/workflow-tool-schema'
@@ -515,15 +515,25 @@ export async function performDeleteWorkflowMcpTool(
   params: PerformDeleteWorkflowMcpToolParams
 ): Promise<PerformDeleteWorkflowMcpToolResult> {
   try {
-    const [tool] = await db
-      .delete(workflowMcpTool)
+    const [server] = await db
+      .select({ id: workflowMcpServer.id })
+      .from(workflowMcpServer)
       .where(
         and(
-          eq(workflowMcpTool.id, params.toolId),
-          eq(workflowMcpTool.serverId, params.serverId),
-          sql`EXISTS (SELECT 1 FROM ${workflowMcpServer} WHERE ${workflowMcpServer.id} = ${params.serverId} AND ${workflowMcpServer.workspaceId} = ${params.workspaceId} AND ${workflowMcpServer.deletedAt} IS NULL)`
+          eq(workflowMcpServer.id, params.serverId),
+          eq(workflowMcpServer.workspaceId, params.workspaceId),
+          isNull(workflowMcpServer.deletedAt)
         )
       )
+      .limit(1)
+
+    if (!server) return { success: false, error: 'Server not found', errorCode: 'not_found' }
+
+    const [tool] = await db
+      .delete(workflowMcpTool)
+      .where(
+        and(eq(workflowMcpTool.id, params.toolId), eq(workflowMcpTool.serverId, params.serverId))
+      )
       .returning()
 
     if (!tool) return { success: false, error: 'Tool not found', errorCode: 'not_found' }

packages/db/migrations/0211_breezy_cloak.sql

@@ -1,4 +1,4 @@
 CREATE INDEX "idx_chat_on_workflow_id_archived_at" ON "chat" USING btree ("workflow_id","archived_at");--> statement-breakpoint
 CREATE INDEX "idx_webhook_on_provider_is_active_workflow_id_deploym_bdeed5468" ON "webhook" USING btree ("provider","is_active","workflow_id","deployment_version_id");--> statement-breakpoint
 CREATE INDEX "idx_webhook_on_workflow_id_block_id_updated_at_desc" ON "webhook" USING btree ("workflow_id","block_id","updated_at" DESC NULLS LAST);--> statement-breakpoint
-CREATE INDEX "idx_workflow_schedule_on_source_workspace_id_source_t_c07f3bba6" ON "workflow_schedule" USING btree ("source_workspace_id","source_type","archived_at","status");
+CREATE INDEX "idx_workflow_schedule_on_source_workspace_id_source_t_c07f3bba6" ON "workflow_schedule" USING btree ("source_workspace_id","source_type","archived_at","status");