improvement(tables): unique-column picker for upsert + richer get-schema (counts, ids, live plan row limit)

Author: TheodoreSpeaks

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

@@ -8,6 +8,7 @@ import { generateRequestId } from '@/lib/core/utils/request'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { captureServerEvent } from '@/lib/posthog/server'
 import { deleteTable, renameTable, TableConflictError, type TableSchema } from '@/lib/table'
+import { getWorkspaceTableLimits } from '@/lib/table/billing'
 import { accessError, checkAccess, normalizeColumn } from '@/app/api/table/utils'
 
 const logger = createLogger('TableDetailAPI')
@@ -46,6 +47,10 @@ export const GET = withRouteHandler(async (request: NextRequest, { params }: Tab
 
     const schemaData = table.schema as TableSchema
 
+    // Source the row cap from the workspace's live plan, not the value stored on
+    // the table at creation time (which goes stale when the plan changes).
+    const { maxRowsPerTable } = await getWorkspaceTableLimits(table.workspaceId)
+
     return NextResponse.json({
       success: true,
       data: {
@@ -59,7 +64,7 @@ export const GET = withRouteHandler(async (request: NextRequest, { params }: Tab
           },
           metadata: table.metadata ?? null,
           rowCount: table.rowCount,
-          maxRows: table.maxRows,
+          maxRows: maxRowsPerTable,
           createdAt:
             table.createdAt instanceof Date
               ? table.createdAt.toISOString()

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx

@@ -929,6 +929,7 @@ function SubBlockComponent({
       case 'file-selector':
       case 'sheet-selector':
       case 'project-selector':
+      case 'column-selector':
         return (
           <SelectorInput
             blockId={blockId}

apps/sim/blocks/blocks.test.ts

@@ -580,6 +580,7 @@ describe.concurrent('Blocks Module', () => {
         'text',
         'router-input',
         'table-selector',
+        'column-selector',
         'filter-builder',
         'sort-builder',
         'skill-input',

apps/sim/blocks/blocks/table.ts

@@ -278,12 +278,26 @@ Return ONLY the data JSON:`,
       },
     },
 
-    // Upsert - which unique column to match on (defaults to the first unique column)
+    // Upsert - which unique column to match on (required when 2+ unique columns)
+    // Basic: pick a unique column. Advanced: enter the column id directly.
     {
-      id: 'conflictColumn',
+      id: 'conflictColumnSelector',
+      title: 'Conflict Column',
+      type: 'column-selector',
+      canonicalParamId: 'conflictColumn',
+      mode: 'basic',
+      selectorKey: 'table.columns',
+      placeholder: 'Select a unique column',
+      dependsOn: ['tableSelector'],
+      condition: { field: 'operation', value: 'upsert_row' },
+    },
+    {
+      id: 'manualConflictColumn',
       title: 'Conflict Column',
       type: 'short-input',
-      placeholder: 'Unique column to match on (required if the table has multiple unique columns)',
+      canonicalParamId: 'conflictColumn',
+      mode: 'advanced',
+      placeholder: 'Enter the column id',
       dependsOn: ['tableId'],
       condition: { field: 'operation', value: 'upsert_row' },
     },
@@ -673,8 +687,8 @@ Return ONLY the sort JSON:`,
     },
     rowCount: {
       type: 'number',
-      description: 'Number of rows returned',
-      condition: { field: 'operation', value: 'query_rows' },
+      description: 'Rows returned (query) or total rows in the table (get schema)',
+      condition: { field: 'operation', value: ['query_rows', 'get_schema'] },
     },
     totalCount: {
       type: 'number',
@@ -713,7 +727,17 @@ Return ONLY the sort JSON:`,
     },
     columns: {
       type: 'array',
-      description: 'Column definitions',
+      description: 'Column definitions (each includes its stable id)',
+      condition: { field: 'operation', value: 'get_schema' },
+    },
+    columnCount: {
+      type: 'number',
+      description: 'Number of columns',
+      condition: { field: 'operation', value: 'get_schema' },
+    },
+    maxRows: {
+      type: 'number',
+      description: "Max rows per table for the workspace's plan",
       condition: { field: 'operation', value: 'get_schema' },
     },
     message: { type: 'string', description: 'Operation status message' },

apps/sim/hooks/queries/tables.ts

@@ -266,6 +266,18 @@ export function useTable(workspaceId: string | undefined, tableId: string | unde
   })
 }
 
+/**
+ * Shared table-detail query options so non-component callers (e.g. selector
+ * providers) can `ensureQueryData` the same cache entry `useTable` populates.
+ */
+export function getTableDetailQueryOptions(workspaceId: string, tableId: string) {
+  return {
+    queryKey: tableKeys.detail(tableId),
+    queryFn: ({ signal }: { signal?: AbortSignal }) => fetchTable(workspaceId, tableId, signal),
+    staleTime: 30 * 1000,
+  }
+}
+
 export interface TableRunState {
   dispatches: ActiveDispatch[]
   runningCellCount: number

apps/sim/hooks/selectors/providers/sim/selectors.ts

@@ -1,4 +1,6 @@
+import { getColumnId } from '@/lib/table/column-keys'
 import { getQueryClient } from '@/app/_shell/providers/get-query-client'
+import { getTableDetailQueryOptions } from '@/hooks/queries/tables'
 import { getFolderMap } from '@/hooks/queries/utils/folder-cache'
 import { getFolderPath } from '@/hooks/queries/utils/folder-tree'
 import { getWorkflowById, getWorkflows } from '@/hooks/queries/utils/workflow-cache'
@@ -12,6 +14,7 @@ import type {
   SelectorQueryArgs,
 } from '@/hooks/selectors/types'
 import type { WorkflowFolder } from '@/stores/folders/types'
+import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import type { WorkflowMetadata } from '@/stores/workflows/registry/types'
 
 /**
@@ -85,4 +88,34 @@ export const simSelectors = {
       }
     },
   },
-} satisfies Record<Extract<SelectorKey, 'sim.workflows'>, SelectorDefinition>
+  'table.columns': {
+    key: 'table.columns',
+    staleTime: SELECTOR_STALE,
+    getQueryKey: ({ context, search }: SelectorQueryArgs) => [
+      ...selectorKeys.all,
+      'table.columns',
+      context.tableId ?? 'none',
+      search ?? '',
+    ],
+    enabled: ({ context }) => Boolean(context.tableId),
+    fetchList: async ({ context }: SelectorQueryArgs): Promise<SelectorOption[]> => {
+      const workspaceId = useWorkflowRegistry.getState().hydration.workspaceId
+      if (!workspaceId || !context.tableId) return []
+      const table = await getQueryClient().ensureQueryData(
+        getTableDetailQueryOptions(workspaceId, context.tableId)
+      )
+      return (table.schema?.columns ?? [])
+        .filter((col) => col.unique)
+        .map((col) => ({ id: getColumnId(col), label: col.name }))
+    },
+    fetchById: async ({ context, detailId }: SelectorQueryArgs): Promise<SelectorOption | null> => {
+      const workspaceId = useWorkflowRegistry.getState().hydration.workspaceId
+      if (!detailId || !workspaceId || !context.tableId) return null
+      const table = await getQueryClient().ensureQueryData(
+        getTableDetailQueryOptions(workspaceId, context.tableId)
+      )
+      const col = (table.schema?.columns ?? []).find((c) => getColumnId(c) === detailId)
+      return col ? { id: getColumnId(col), label: col.name } : null
+    },
+  },
+} satisfies Record<Extract<SelectorKey, 'sim.workflows' | 'table.columns'>, SelectorDefinition>

apps/sim/hooks/selectors/types.ts

@@ -56,6 +56,7 @@ export type SelectorKey =
   | 'monday.boards'
   | 'monday.groups'
   | 'sim.workflows'
+  | 'table.columns'
 
 export interface SelectorOption {
   id: string
@@ -91,6 +92,7 @@ export interface SelectorContext {
   awsRegion?: string
   logGroupName?: string
   mcpServerId?: string
+  tableId?: string
 }
 
 export interface SelectorQueryArgs {

apps/sim/lib/workflows/subblocks/context.ts

@@ -28,6 +28,7 @@ export const SELECTOR_CONTEXT_FIELDS = new Set<keyof SelectorContext>([
   'awsSecretAccessKey',
   'awsRegion',
   'logGroupName',
+  'tableId',
 ])
 
 /**

apps/sim/tools/table/get_schema.ts

@@ -1,3 +1,5 @@
+import { getColumnId } from '@/lib/table/column-keys'
+import type { ColumnDefinition } from '@/lib/table/types'
 import type { TableGetSchemaParams, TableGetSchemaResponse } from '@/tools/table/types'
 import type { ToolConfig } from '@/tools/types'
 
@@ -35,11 +37,21 @@ export const tableGetSchemaTool: ToolConfig<TableGetSchemaParams, TableGetSchema
     const result = await response.json()
     const data = result.data || result
 
+    // Always surface a usable `id` per column. Legacy columns predating the id
+    // backfill have no stored id; their storage key is the name, so project that
+    // as the id rather than leaving it undefined.
+    const columns: ColumnDefinition[] = (
+      (data.table.schema.columns ?? []) as ColumnDefinition[]
+    ).map((col) => ({ ...col, id: getColumnId(col) }))
+
     return {
       success: true,
       output: {
         name: data.table.name,
-        columns: data.table.schema.columns,
+        columns,
+        columnCount: columns.length,
+        rowCount: data.table.rowCount ?? 0,
+        maxRows: data.table.maxRows ?? 0,
         message: data.message || 'Schema retrieved successfully',
       },
     }
@@ -48,7 +60,13 @@ export const tableGetSchemaTool: ToolConfig<TableGetSchemaParams, TableGetSchema
   outputs: {
     success: { type: 'boolean', description: 'Whether schema was retrieved' },
     name: { type: 'string', description: 'Table name' },
-    columns: { type: 'array', description: 'Column definitions' },
+    columns: { type: 'array', description: 'Column definitions (each includes its stable id)' },
+    columnCount: { type: 'number', description: 'Number of columns' },
+    rowCount: { type: 'number', description: 'Number of rows in the table' },
+    maxRows: {
+      type: 'number',
+      description: "Max rows per table for the workspace's plan",
+    },
     message: { type: 'string', description: 'Status message' },
   },
 }

apps/sim/tools/table/types.ts

@@ -142,6 +142,9 @@ export interface TableGetSchemaResponse extends ToolResponse {
   output: {
     name: string
     columns: ColumnDefinition[]
+    columnCount: number
+    rowCount: number
+    maxRows: number
     message: string
   }
 }