fix(mothership): stop orphaned job runs at their limit and skip any number of deleted occurrences

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.test.tsx

@@ -544,8 +544,6 @@ describe('UsageUpgradeDisplay', () => {
       )
     })
 
-    expect(container.textContent).toContain('Run Spend Limit Reached')
-    expect(container.textContent).toContain('This scheduled job run reached its $5.00 spend limit.')
     expect(container.querySelector('a')).toBeNull()
     act(() => root.unmount())
   })

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/special-tags/special-tags.tsx

@@ -3454,7 +3454,11 @@ function UsageUpgradeDisplay({ data }: { data: UsageUpgradeTagData }) {
  * A scheduled job's run reached its own spend cap. The cap belongs to the job, not to the
  * account, so the card offers no billing action: the next run starts with a fresh cap.
  */
-function JobRunBudgetDisplay({ message }: { message: string }) {
+interface JobRunBudgetDisplayProps {
+  message: string
+}
+
+function JobRunBudgetDisplay({ message }: JobRunBudgetDisplayProps) {
   return (
     <InteractionCard
       title={

apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx

@@ -192,15 +192,17 @@ interface UserMessageRowProps {
  * with one line. A background-task notification (mothership 21-background-tasks.md §6.4) shows
  * its outcome line; a scheduled job's run shows the brief's first line (the job and its run).
  */
+interface AutomatedTurnRowProps {
+  origin: TurnOrigin
+  content: string
+  rowClassName: string
+}
+
 const AutomatedTurnRow = memo(function AutomatedTurnRow({
   origin,
   content,
   rowClassName,
-}: {
-  origin: TurnOrigin
-  content: string
-  rowClassName: string
-}) {
+}: AutomatedTurnRowProps) {
   const lines = content.split('\n').filter((line) => line.length > 0)
   const summary =
     origin === 'task'

apps/sim/lib/mothership/jobs/occurrence.test.ts

@@ -33,4 +33,16 @@ describe('nextJobOccurrence', () => {
       new Date('2026-10-22T10:15:00Z')
     )
   })
+
+  it('skips any number of deleted occurrences instead of ending the job', () => {
+    const everyMinute = { ...quarterHourly, cronExpression: '* * * * *' }
+    const occurrenceAt = new Date('2026-10-22T10:00:00Z')
+    const firstSlot = new Date('2026-10-22T10:15:00Z').getTime()
+    const excludedDates = Array.from({ length: 1_500 }, (_, minute) =>
+      new Date(firstSlot + minute * 60_000).toISOString()
+    )
+    expect(
+      nextJobOccurrence({ ...everyMinute, excludedDates }, occurrenceAt, occurrenceAt)
+    ).toEqual(new Date(firstSlot + 1_500 * 60_000))
+  })
 })

apps/sim/lib/mothership/jobs/occurrence.ts

@@ -45,10 +45,9 @@ export function nextJobOccurrence(cadence: JobCadence, occurrenceAt: Date, now:
     )
   )
   let next = cron.nextRun(earliest)
-  for (let skipped = 0; next && excluded.has(next.toISOString()) && skipped < 1_000; skipped++) {
-    next = cron.nextRun(next)
-  }
-  if (!next || excluded.has(next.toISOString())) return null
+  /** Each step consumes one excluded instant, so this ends. */
+  while (next && excluded.has(next.toISOString())) next = cron.nextRun(next)
+  if (!next) return null
   if (cadence.endsAt && next.getTime() > cadence.endsAt.getTime()) return null
   return next
 }

apps/sim/lib/mothership/jobs/reconcile.ts

@@ -1,4 +1,4 @@
-import { copilotRuns, db, jobExecutionLogs, workflowSchedule } from '@sim/db'
+import { copilotRuns, db, jobExecutionLogs } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { getErrorMessage } from '@sim/utils/errors'
 import { and, asc, eq, inArray, isNotNull, isNull, lte, or, sql } from 'drizzle-orm'
@@ -73,12 +73,11 @@ function openJobRuns(status: OpenJobRunStatus, now: Date) {
       admittedBillingRequestId,
       scheduleId: jobExecutionLogs.scheduleId,
       runStatus: copilotRuns.status,
-      userId: workflowSchedule.sourceUserId,
-      workspaceId: workflowSchedule.sourceWorkspaceId,
+      userId: copilotRuns.userId,
+      workspaceId: copilotRuns.workspaceId,
       chatId: copilotRuns.chatId,
     })
     .from(jobExecutionLogs)
-    .leftJoin(workflowSchedule, eq(workflowSchedule.id, jobExecutionLogs.scheduleId))
     .leftJoin(copilotRuns, eq(copilotRuns.streamId, jobExecutionLogs.executionId))
     .where(and(openJobRun([status]), needsAction))
     .orderBy(asc(jobExecutionLogs.startedAt))