address greptile comments

Author: TheodoreSpeaks

apps/sim/background/cleanup-logs.ts

@@ -10,6 +10,7 @@ import {
 } from '@/lib/billing/cleanup-dispatcher'
 import { snapshotService } from '@/lib/logs/execution/snapshot/service'
 import { isUsingCloudStorage, StorageService } from '@/lib/uploads'
+import { deleteFileMetadata } from '@/lib/uploads/server/metadata'
 
 const logger = createLogger('CleanupLogs')
 
@@ -44,7 +45,6 @@ async function deleteExecutionFiles(files: unknown, results: TierResults): Promi
     results.filesTotal++
     try {
       await StorageService.deleteFile({ key: file.key, context: 'execution' })
-      const { deleteFileMetadata } = await import('@/lib/uploads/server/metadata')
       await deleteFileMetadata(file.key)
       results.filesDeleted++
     } catch (fileError) {

apps/sim/background/cleanup-soft-deletes.ts

@@ -249,6 +249,7 @@ export async function runCleanupSoftDeletes(payload: CleanupJobPayload): Promise
         lt(workflow.archivedAt, retentionDate)
       )
     )
+    .limit(BATCH_SIZE * MAX_BATCHES_PER_TABLE)
 
   const doomedWorkflowIds = doomedWorkflows.map((w) => w.id)
   let chatCleanup: { execute: () => Promise<void> } | null = null

apps/sim/background/cleanup-tasks.ts

@@ -224,33 +224,17 @@ export async function runCleanupTasks(payload: CleanupJobPayload): Promise<void>
     if (r.deleted > 0) logger.info(`[${r.table}] ${r.deleted} deleted`)
   }
 
-  // Delete feedback — no direct workspaceId, find via copilotChats
+  // Delete feedback — no direct workspaceId, reuse chat IDs collected above
   const feedbackResult: TableCleanupResult = {
     table: `${tierLabel}/copilotFeedback`,
     deleted: 0,
     failed: 0,
   }
   try {
-    const chatIds = await db
-      .select({ id: copilotChats.id })
-      .from(copilotChats)
-      .where(
-        and(
-          inArray(copilotChats.workspaceId, workspaceIds),
-          lt(copilotChats.updatedAt, retentionDate)
-        )
-      )
-      .limit(BATCH_SIZE * MAX_BATCHES_PER_TABLE)
-
-    if (chatIds.length > 0) {
+    if (doomedChatIds.length > 0) {
       const deleted = await db
         .delete(copilotFeedback)
-        .where(
-          inArray(
-            copilotFeedback.chatId,
-            chatIds.map((c) => c.id)
-          )
-        )
+        .where(inArray(copilotFeedback.chatId, doomedChatIds))
         .returning({ id: copilotFeedback.feedbackId })
       feedbackResult.deleted = deleted.length
       logger.info(`[${feedbackResult.table}] Deleted ${deleted.length} rows`)

apps/sim/lib/billing/cleanup-dispatcher.ts

@@ -7,6 +7,7 @@ import { sqlIsPaid, sqlIsPro, sqlIsTeam } from '@/lib/billing/plan-helpers'
 import { ENTITLED_SUBSCRIPTION_STATUSES } from '@/lib/billing/subscriptions/utils'
 import { getJobQueue } from '@/lib/core/async-jobs'
 import { shouldExecuteInline } from '@/lib/core/async-jobs/config'
+import { toError } from '@/lib/core/utils/helpers'
 import { isTriggerAvailable } from '@/lib/knowledge/documents/service'
 
 const logger = createLogger('RetentionDispatcher')
@@ -130,7 +131,7 @@ async function runInlineIfNeeded(
       await runner(payload)
       await jobQueue.completeJob(jobId, null)
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error)
+      const errorMessage = toError(error).message
       logger.error(`[${jobType}] Inline job ${jobId} failed`, { error: errorMessage })
       try {
         await jobQueue.markJobFailed(jobId, errorMessage)

…tions/0193_unknown_franklin_richards.sql …igrations/0192_colossal_the_watchers.sqlpackages/db/migrations/0193_unknown_franklin_richards.sql renamed to packages/db/migrations/0192_colossal_the_watchers.sql packages/db/migrations/0193_unknown_franklin_richards.sql renamed to packages/db/migrations/0192_colossal_the_watchers.sql

@@ -1,17 +1,3 @@
-CREATE TABLE "outbox_event" (
-	"id" text PRIMARY KEY NOT NULL,
-	"event_type" text NOT NULL,
-	"payload" json NOT NULL,
-	"status" text DEFAULT 'pending' NOT NULL,
-	"attempts" integer DEFAULT 0 NOT NULL,
-	"max_attempts" integer DEFAULT 10 NOT NULL,
-	"available_at" timestamp DEFAULT now() NOT NULL,
-	"locked_at" timestamp,
-	"last_error" text,
-	"created_at" timestamp DEFAULT now() NOT NULL,
-	"processed_at" timestamp
-);
---> statement-breakpoint
 DROP INDEX "chat_archived_at_idx";--> statement-breakpoint
 DROP INDEX "doc_archived_at_idx";--> statement-breakpoint
 DROP INDEX "doc_deleted_at_idx";--> statement-breakpoint
@@ -22,13 +8,9 @@ DROP INDEX "mcp_servers_workspace_deleted_idx";--> statement-breakpoint
 DROP INDEX "webhook_archived_at_idx";--> statement-breakpoint
 DROP INDEX "workflow_mcp_tool_archived_at_idx";--> statement-breakpoint
 DROP INDEX "workflow_schedule_archived_at_idx";--> statement-breakpoint
-ALTER TABLE "user_stats" ADD COLUMN "pro_period_cost_snapshot_at" timestamp;--> statement-breakpoint
-ALTER TABLE "workspace" ADD COLUMN "logo_url" text;--> statement-breakpoint
 ALTER TABLE "workspace" ADD COLUMN "log_retention_hours" integer;--> statement-breakpoint
 ALTER TABLE "workspace" ADD COLUMN "soft_delete_retention_hours" integer;--> statement-breakpoint
 ALTER TABLE "workspace" ADD COLUMN "task_cleanup_hours" integer;--> statement-breakpoint
-CREATE INDEX "outbox_event_status_available_idx" ON "outbox_event" USING btree ("status","available_at");--> statement-breakpoint
-CREATE INDEX "outbox_event_locked_at_idx" ON "outbox_event" USING btree ("locked_at");--> statement-breakpoint
 CREATE INDEX "a2a_agent_workspace_archived_partial_idx" ON "a2a_agent" USING btree ("workspace_id","archived_at") WHERE "a2a_agent"."archived_at" IS NOT NULL;--> statement-breakpoint
 CREATE INDEX "chat_archived_at_partial_idx" ON "chat" USING btree ("archived_at") WHERE "chat"."archived_at" IS NOT NULL;--> statement-breakpoint
 CREATE INDEX "doc_archived_at_partial_idx" ON "document" USING btree ("archived_at") WHERE "document"."archived_at" IS NOT NULL;--> statement-breakpoint