Merge remote-tracking branch 'origin/staging' into improvement/mship-tool-access

# Conflicts:
#	apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.tsx
#	apps/sim/app/workspace/[workspaceId]/home/hooks/stream/handle-tool-event.ts
#	apps/sim/app/workspace/[workspaceId]/home/hooks/stream/stream-helpers.ts

Author: Sg312

.gitignore

@@ -9,6 +9,9 @@
 # bun specific
 bun-debug.log*
 
+# cursor debug logs
+.cursor/debug-*.log
+
 # this repo uses bun.lock; package-lock.json files are accidental
 package-lock.json
 
@@ -44,6 +47,11 @@ dump.rdb
 .env.test
 .env.production
 
+# editor swap files
+*.swp
+*.swo
+*.swn
+
 # vercel
 .vercel
 

apps/docs/components/icons.tsx

@@ -1958,6 +1958,24 @@ export function WhatsAppIcon(props: SVGProps<SVGSVGElement>) {
   )
 }
 
+export function SportmonksIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      {...props}
+      viewBox='0 0 25 24'
+      fill='none'
+      fillRule='evenodd'
+      xmlns='http://www.w3.org/2000/svg'
+    >
+      <path
+        d='M11.857 8.546c1.893 0 3.517.678 4.872 2.033 1.355 1.336 2.032 2.96 2.032 4.872 0 1.91-.677 3.535-2.032 4.871-1.355 1.355-2.979 2.032-4.872 2.032H1V17.093h10.857c.446 0 .825-.157 1.142-.473.334-.334.5-.724.5-1.17 0-.445-.166-.835-.5-1.17a1.558 1.558 0 00-1.142-.472H7.905c-1.912 0-3.537-.677-4.873-2.032C1.678 10.421 1 8.796 1 6.903 1 4.993 1.678 3.368 3.033 2.032 4.368.678 5.992 0 7.905 0h10.188V5.263H7.904a1.65 1.65 0 00-1.17.473 1.586 1.586 0 00-.472 1.169c0 .445.157.835.473 1.17.334.315.724.472 1.17.472h3.952z'
+        fill='currentColor'
+      />
+      <circle cx='21.27' cy='20.123' r='2.732' fill='#FF0F50' />
+    </svg>
+  )
+}
+
 export function SquareIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg {...props} viewBox='0 0 501.42 501.42' xmlns='http://www.w3.org/2000/svg'>

apps/docs/components/ui/icon-mapping.ts

@@ -195,6 +195,7 @@ import {
   SixtyfourIcon,
   SlackIcon,
   SmtpIcon,
+  SportmonksIcon,
   SQSIcon,
   SquareIcon,
   SshIcon,
@@ -449,6 +450,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   sixtyfour: SixtyfourIcon,
   slack: SlackIcon,
   smtp: SmtpIcon,
+  sportmonks: SportmonksIcon,
   sqs: SQSIcon,
   square: SquareIcon,
   ssh: SshIcon,

apps/docs/content/docs/en/integrations/meta.json

@@ -196,6 +196,7 @@
     "sixtyfour",
     "slack",
     "smtp",
+    "sportmonks",
     "sqs",
     "square",
     "ssh",

apps/docs/content/docs/en/integrations/sportmonks.mdx

@@ -13,13 +13,15 @@ const {
   mockDispatchAfterBatchInsert,
   mockMarkTableImporting,
   mockReleaseImportClaim,
+  mockGetMaxRowsPerTable,
 } = vi.hoisted(() => ({
   mockCheckAccess: vi.fn(),
   mockImportAppendRows: vi.fn(),
   mockImportReplaceRows: vi.fn(),
   mockDispatchAfterBatchInsert: vi.fn(),
   mockMarkTableImporting: vi.fn(),
   mockReleaseImportClaim: vi.fn(),
+  mockGetMaxRowsPerTable: vi.fn(),
 }))
 
 vi.mock('@sim/utils/id', () => ({
@@ -65,6 +67,13 @@ vi.mock('@/lib/table/rows/service', () => ({
   dispatchAfterBatchInsert: mockDispatchAfterBatchInsert,
 }))
 
+/** The append pre-check reads the workspace's current plan row limit, not the frozen `table.maxRows`. */
+vi.mock('@/lib/table/billing', () => ({
+  getMaxRowsPerTable: mockGetMaxRowsPerTable,
+  wouldExceedRowLimit: (limit: number, current: number, added: number) =>
+    limit >= 0 && current + added > limit,
+}))
+
 import { POST } from '@/app/api/table/[tableId]/import/route'
 
 function createCsvFile(contents: string, name = 'data.csv', type = 'text/csv'): File {
@@ -167,6 +176,7 @@ describe('POST /api/table/[tableId]/import', () => {
     mockImportReplaceRows.mockResolvedValue({ deletedCount: 0, insertedCount: 0 })
     mockMarkTableImporting.mockResolvedValue(true)
     mockReleaseImportClaim.mockResolvedValue(undefined)
+    mockGetMaxRowsPerTable.mockResolvedValue(1_000_000)
   })
 
   it('returns 401 when the user is not authenticated', async () => {
@@ -288,11 +298,9 @@ describe('POST /api/table/[tableId]/import', () => {
     expect(mockImportAppendRows).toHaveBeenCalledTimes(1)
   })
 
-  it('rejects append when it would exceed maxRows', async () => {
-    mockCheckAccess.mockResolvedValueOnce({
-      ok: true,
-      table: buildTable({ rowCount: 99, maxRows: 100 }),
-    })
+  it('rejects append when it would exceed the current plan row limit', async () => {
+    mockCheckAccess.mockResolvedValueOnce({ ok: true, table: buildTable({ rowCount: 99 }) })
+    mockGetMaxRowsPerTable.mockResolvedValueOnce(100)
     const response = await callPost(
       createFormData(createCsvFile('name,age\nAlice,30\nBob,40'), { mode: 'append' })
     )

apps/sim/app/api/table/[tableId]/import/route.test.ts

@@ -25,13 +25,15 @@ import {
   createCsvParser,
   dispatchAfterBatchInsert,
   generateColumnId,
+  getMaxRowsPerTable,
   inferColumnType,
   markTableJobRunning,
   releaseJobClaim,
   sanitizeName,
   type TableDefinition,
   type TableSchema,
   validateMapping,
+  wouldExceedRowLimit,
 } from '@/lib/table'
 import { importAppendRows, importReplaceRows } from '@/lib/table/import-data'
 import {
@@ -264,11 +266,12 @@ export const POST = withRouteHandler(async (request: NextRequest, { params }: Ro
     claimedImportId = syncImportId
 
     if (mode === 'append') {
-      if (prospectiveTable.rowCount + coerced.length > prospectiveTable.maxRows) {
-        const deficit = prospectiveTable.rowCount + coerced.length - prospectiveTable.maxRows
+      const maxRows = await getMaxRowsPerTable(workspaceId)
+      if (wouldExceedRowLimit(maxRows, prospectiveTable.rowCount, coerced.length)) {
+        const deficit = prospectiveTable.rowCount + coerced.length - maxRows
         return NextResponse.json(
           {
-            error: `Append would exceed table row limit (${prospectiveTable.maxRows}). Currently ${prospectiveTable.rowCount} rows, ${coerced.length} new rows, ${deficit} over.`,
+            error: `Append would exceed table row limit (${maxRows}). Currently ${prospectiveTable.rowCount} rows, ${coerced.length} new rows, ${deficit} over.`,
           },
           { status: 400 }
         )

apps/sim/app/api/table/[tableId]/import/route.ts

@@ -38,7 +38,7 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
 
   const parsed = await parseRequest(importTableAsyncContract, request, {})
   if (!parsed.success) return parsed.response
-  const { workspaceId, fileKey, fileName } = parsed.data.body
+  const { workspaceId, fileKey, fileName, deleteSourceFile } = parsed.data.body
 
   const permission = await getUserEntityPermissions(userId, 'workspace', workspaceId)
   if (permission !== 'write' && permission !== 'admin') {
@@ -84,7 +84,6 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
         schema: { columns: [{ name: 'column_1', type: 'string' }] },
         workspaceId,
         userId,
-        maxRows: planLimits.maxRowsPerTable,
         maxTables: planLimits.maxTables,
         jobStatus: 'running',
         jobType: 'import',
@@ -111,6 +110,7 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
     fileName,
     delimiter,
     mode: 'create',
+    deleteSourceFile,
   }
   if (isTriggerDevEnabled) {
     // Trigger.dev runs the import outside the web container, so it survives app deploys.

apps/sim/app/api/table/import-async/route.ts

@@ -39,6 +39,12 @@ vi.mock('@/app/api/table/utils', async () => {
         { error: error.message },
         { status: error.code === 'FILE_TOO_LARGE' ? 413 : 400 }
       ),
+    rowWriteErrorResponse: (error: unknown) => {
+      const message = error instanceof Error ? error.message : String(error)
+      return message.includes('row limit')
+        ? NextResponse.json({ error: message }, { status: 400 })
+        : null
+    },
   }
 })
 vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock)
@@ -175,6 +181,17 @@ describe('POST /api/table/import-csv', () => {
     expect(mockCreateTable).not.toHaveBeenCalled()
   })
 
+  it('returns 400 with the reason when an insert exceeds the plan row limit', async () => {
+    mockBatchInsertRows.mockRejectedValueOnce(
+      new Error('This table has reached its row limit (1,000 rows) on your current plan.')
+    )
+    const response = await POST(makeRequest(uploadParts(csvWithRows(250))))
+    const data = await response.json()
+
+    expect(response.status).toBe(400)
+    expect(data.error).toMatch(/row limit/)
+  })
+
   it('rolls back the created table when a batch insert fails mid-stream', async () => {
     mockBatchInsertRows
       .mockResolvedValueOnce(Array.from({ length: 100 }, () => ({ id: 'row' })))

apps/sim/app/api/table/import-csv/route.test.ts

@@ -30,6 +30,7 @@ import {
   csvProxyBodyCapResponse,
   multipartErrorResponse,
   normalizeColumn,
+  rowWriteErrorResponse,
 } from '@/app/api/table/utils'
 
 const logger = createLogger('TableImportCSV')
@@ -105,12 +106,18 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       headerToColumn: Map<string, string>
     }
 
-    const insertRows = async (rows: Record<string, unknown>[], state: ImportState) => {
+    const insertRows = async (
+      rows: Record<string, unknown>[],
+      state: ImportState,
+      currentRowCount: number
+    ) => {
       if (rows.length === 0) return 0
       const coerced = coerceRowsForTable(rows, state.schema, state.headerToColumn)
       const result = await batchInsertRows(
         { tableId: state.table.id, rows: coerced, workspaceId, userId },
-        state.table,
+        // The created table's rowCount is frozen at 0; pass the running total so the
+        // per-batch capacity check sees cumulative rows, not an always-empty table.
+        { ...state.table, rowCount: currentRowCount },
         generateId().slice(0, 8)
       )
       return result.length
@@ -132,7 +139,6 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
           schema,
           workspaceId,
           userId,
-          maxRows: planLimits.maxRowsPerTable,
           maxTables: planLimits.maxTables,
         },
         requestId
@@ -153,13 +159,13 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
           sample.push(record)
           if (sample.length >= CSV_SCHEMA_SAMPLE_SIZE) {
             state = await buildTable(sample)
-            inserted += await insertRows(sample, state)
+            inserted += await insertRows(sample, state, inserted)
           }
           continue
         }
         batch.push(record)
         if (batch.length >= CSV_MAX_BATCH_SIZE) {
-          inserted += await insertRows(batch, state)
+          inserted += await insertRows(batch, state, inserted)
           batch = []
         }
       }
@@ -169,9 +175,9 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
           return NextResponse.json({ error: 'CSV file has no data rows' }, { status: 400 })
         }
         state = await buildTable(sample)
-        inserted += await insertRows(sample, state)
+        inserted += await insertRows(sample, state, inserted)
       } else {
-        inserted += await insertRows(batch, state)
+        inserted += await insertRows(batch, state, inserted)
       }
     } catch (streamError) {
       if (state) await deleteTable(state.table.id, requestId).catch(() => {})
@@ -200,9 +206,13 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
   } catch (error) {
     if (isMultipartError(error)) return multipartErrorResponse(error)
 
-    const message = toError(error).message
     logger.error(`[${requestId}] CSV import failed:`, error)
 
+    // Row-write failures (e.g. the plan row-limit check) map to a 400 with the real reason.
+    const rowWriteError = rowWriteErrorResponse(error)
+    if (rowWriteError) return rowWriteError
+
+    const message = toError(error).message
     const isClientError =
       message.includes('maximum table limit') ||
       message.includes('CSV file has no') ||