Align scoped discovery, original reads, and workflow output contracts

Author: Sg312

apps/sim/app/api/table/utils.ts

@@ -2,7 +2,6 @@ import { createLogger } from '@sim/logger'
 import { permissionSatisfies } from '@sim/platform-authz/workspace'
 import { toError } from '@sim/utils/errors'
 import { NextResponse } from 'next/server'
-import { isFeatureEnabled } from '@/lib/core/config/feature-flags'
 import {
   asOrchestrationError,
   messageForOrchestrationError,
@@ -20,6 +19,10 @@ import type { ColumnDefinition, Filter, TableDefinition, TablePredicate } from '
 import { buildFilterClause, getTableById, TableQueryValidationError } from '@/lib/table'
 import { USER_TABLE_ROWS_SQL_NAME } from '@/lib/table/constants'
 import { TableLockedError } from '@/lib/table/mutation-locks'
+import {
+  getTableQueryAvailability,
+  TABLE_QUERY_UNAVAILABLE_REASON,
+} from '@/lib/table/query-availability'
 import { isTablePredicate } from '@/lib/table/query-builder/converters'
 import { validateStoragePredicate } from '@/lib/table/query-builder/validate'
 import type { TableLockKind } from '@/lib/table/types'
@@ -40,10 +43,10 @@ export async function tablesV2GateError(
   workspaceId: string
 ): Promise<NextResponse | null> {
   const orgId = await getWorkspaceOrganizationId(workspaceId)
-  if (await isFeatureEnabled('tables-v2-api', { userId, orgId })) return null
+  if ((await getTableQueryAvailability({ userId, orgId })).enabled) return null
   return NextResponse.json(
     {
-      error: 'The v2 table query API is not enabled for this workspace',
+      error: TABLE_QUERY_UNAVAILABLE_REASON,
       code: 'tables_v2_disabled',
     },
     { status: 403 }

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

@@ -24,6 +24,7 @@ import {
   isFileFieldType,
   parseInputFormatFiles,
 } from '@/lib/workflows/input-format'
+import type { InputFormatFieldState } from '@/lib/workflows/input-format-schema'
 import { FileUpload } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-upload/file-upload'
 import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import {
@@ -39,14 +40,8 @@ import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/c
 import { useActiveSearchTarget } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/providers/active-search-target-provider'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 
-interface Field {
-  id: string
-  name: string
-  type?: 'string' | 'number' | 'boolean' | 'object' | 'array' | 'file[]'
-  value?: string
-  description?: string
-  collapsed?: boolean
-}
+type Field = Pick<InputFormatFieldState, 'id' | 'name'> &
+  Partial<Omit<InputFormatFieldState, 'id' | 'name'>>
 
 interface FieldFormatProps {
   blockId: string

apps/sim/blocks/blocks/table.ts

@@ -4,6 +4,7 @@ import { TABLE_LIMITS } from '@/lib/table/constants'
 import { filterRulesToFilter, sortRulesToSort } from '@/lib/table/query-builder/converters'
 import type { BlockConfig } from '@/blocks/types'
 import { parseOptionalNumberInput } from '@/blocks/utils'
+import { TABLE_ID_PARAM } from '@/tools/table/params'
 import type { TableQueryResponse } from '@/tools/table/types'
 import { getTrigger } from '@/triggers'
 
@@ -735,7 +736,7 @@ Return ONLY the sort JSON:`,
 
   inputs: {
     operation: { type: 'string', description: 'Table operation to perform' },
-    tableId: { type: 'string', description: 'Table identifier' },
+    tableId: { type: 'string', description: TABLE_ID_PARAM.description },
     data: { type: 'json', description: 'Row data for insert/update' },
     rows: { type: 'array', description: 'Array of row data for batch insert' },
     rowId: { type: 'string', description: 'Row identifier for ID-based operations' },

apps/sim/blocks/blocks/table_v2.ts

@@ -12,6 +12,7 @@ import type {
   TablePredicateInput,
 } from '@/lib/table/types'
 import type { BlockConfig } from '@/blocks/types'
+import { TABLE_ID_PARAM } from '@/tools/table/params'
 import type { TableQueryV2Response } from '@/tools/table/types'
 import { getTrigger } from '@/triggers'
 
@@ -586,7 +587,7 @@ Return ONLY the JSON object:`,
 
   inputs: {
     operation: { type: 'string', description: 'Table operation to perform' },
-    tableId: { type: 'string', description: 'Table identifier' },
+    tableId: { type: 'string', description: TABLE_ID_PARAM.description },
     data: { type: 'json', description: 'Row data for insert/update' },
     rows: { type: 'array', description: 'Array of row data for batch insert' },
     rowId: { type: 'string', description: 'Row identifier for ID-based operations' },

apps/sim/executor/handlers/generic/generic-handler.test.ts

@@ -8,11 +8,13 @@ import { getBlock } from '@/blocks/index'
 import { BlockType } from '@/executor/constants'
 import { GenericBlockHandler } from '@/executor/handlers/generic/generic-handler'
 import type { ExecutionContext } from '@/executor/types'
+import { resolveBlockReference } from '@/executor/utils/block-reference'
 import { ResolvedSecretTraceRegistry } from '@/executor/utils/resolved-secret-trace-registry'
 import type { SerializedBlock } from '@/serializer/types'
 import { executeTool } from '@/tools'
 import { selectKnowledgeDocumentWriteSecretProvenance } from '@/tools/knowledge/secret-provenance'
 import { mcpRunOperationTool } from '@/tools/mcp/run-operation'
+import { tableQueryRowsV2Tool } from '@/tools/table/query_rows_v2'
 import type { ToolConfig } from '@/tools/types'
 import { getTool } from '@/tools/utils'
 
@@ -107,6 +109,33 @@ describe('GenericBlockHandler', () => {
     expect(result).toEqual(expectedOutput)
   })
 
+  it('exposes the Table success field used by downstream workflow references', async () => {
+    const rows = [{ id: 'row-1', data: { amount: 17 }, executions: {} }]
+    const tableResponse = await tableQueryRowsV2Tool.transformResponse!(
+      Response.json({ data: { rows, rowCount: 1, totalCount: 1, limit: 10, nextCursor: null } })
+    )
+    mockGetTool.mockReturnValue(tableQueryRowsV2Tool)
+    mockExecuteTool.mockResolvedValue(tableResponse)
+    const block: SerializedBlock = {
+      ...mockBlock,
+      metadata: { id: 'table_v2', name: 'Read open items' },
+      config: { tool: tableQueryRowsV2Tool.id, params: {} },
+    }
+    const output = await handler.execute(mockContext, block, { tableId: 'table-1' })
+    const resolved = resolveBlockReference('readopenitems', ['success'], {
+      blockNameMapping: { readopenitems: block.id },
+      blockData: { [block.id]: output },
+      blockOutputSchemas: { [block.id]: tableQueryRowsV2Tool.outputs ?? {} },
+    })
+    expect(resolved?.value).toBe(true)
+    expect(output.rows).toEqual(rows)
+
+    mockExecuteTool.mockResolvedValue({ success: false, error: 'Table access denied', output: {} })
+    await expect(handler.execute(mockContext, block, { tableId: 'table-1' })).rejects.toThrow(
+      'Table access denied'
+    )
+  })
+
   it('executes the standalone stable MCP action after argument resolution with trusted block scope', async () => {
     mockGetBlock.mockReturnValue(McpBlock)
     mockGetTool.mockReturnValue(mcpRunOperationTool)

apps/sim/lib/api/contracts/mothership-catalog.ts

@@ -3,6 +3,7 @@ import { v2BlockDetailSchema, v2BlockFieldSchema } from '@/lib/api/contracts/v2/
 
 /** Internal discovery adds compact catalog hints without changing the public v2 response. */
 const mothershipBlockFieldSchema = v2BlockFieldSchema.extend({
+  valueSchema: z.record(z.string(), z.unknown()).optional(),
   optionsAvailability: z.string().optional(),
   options: z
     .array(
@@ -17,5 +18,8 @@ const mothershipBlockFieldSchema = v2BlockFieldSchema.extend({
 
 export const mothershipBlockDetailSchema = v2BlockDetailSchema.extend({
   inputSchema: z.array(mothershipBlockFieldSchema),
+  operationAvailability: z
+    .record(z.string(), z.object({ enabled: z.boolean(), reason: z.string().optional() }))
+    .optional(),
 })
 export type MothershipBlockDetail = z.infer<typeof mothershipBlockDetailSchema>

apps/sim/lib/catalog/application/list-blocks.ts

@@ -64,9 +64,10 @@ function matchesFilters(block: CatalogBlockSummary, input: ListCatalogBlocksInpu
  * blocks that can start a workflow rather than needing a second endpoint.
  *
  * A sunset block (`legacy` or `deprecated`) is left out unless `includeSunset`
- * is set: it stays readable by id and keeps executing where it is already
- * placed, but a list of "what may I place?" must not offer a superseded block
- * alongside its replacement.
+ * is set. Existing placements keep executing, but a toolbar-hidden sunset
+ * block is not returned by the default detail read. The explicit sunset list
+ * exposes accessible lifecycle and replacement metadata without offering a
+ * superseded block for new authoring.
  *
  * No audit is projected — reading a catalog is not a semantic event, and no
  * shipped v2 read records one.

apps/sim/lib/embeddings/client.ts

@@ -31,6 +31,7 @@ import {
   ollamaEmbeddingModelName,
   resolveDimensions,
 } from '@/lib/embeddings/catalog'
+import { EmbeddingConfigurationError } from '@/lib/embeddings/configuration-error'
 import { resolveProviderKey } from '@/lib/embeddings/keys'
 import { isOllamaServerConfigured } from '@/lib/embeddings/ollama-model-catalog.server'
 import { DEFAULT_OPENROUTER_EMBEDDING_MODEL } from '@/lib/embeddings/openrouter-models'
@@ -384,7 +385,7 @@ async function resolveProvider(
       throw new Error(`OpenRouter transport does not support catalog provider: ${info.provider}`)
     }
     if (!options.apiKey) {
-      throw new Error('OPENROUTER_API_KEY is not configured')
+      throw new EmbeddingConfigurationError()
     }
     return {
       adapter: getAdapterFactory('openrouter')({
@@ -413,7 +414,7 @@ async function resolveProvider(
    */
   if (info.provider === 'ollama') {
     if (!isOllamaServerConfigured()) {
-      throw new Error('OLLAMA_URL must be configured for Ollama embeddings')
+      throw new EmbeddingConfigurationError()
     }
     const baseUrl = getOllamaUrl().replace(/\/+$/, '')
     const modelName = ollamaEmbeddingModelName(model)

apps/sim/lib/embeddings/configuration-error.test.ts

@@ -0,0 +1,51 @@
+/** @vitest-environment node */
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const mocks = vi.hoisted(() => ({ byok: vi.fn(), rotation: vi.fn() }))
+vi.mock('@/lib/api-key/byok', () => ({ getBYOKKey: mocks.byok }))
+vi.mock('@/lib/core/config/api-keys', () => ({ getRotatingApiKey: mocks.rotation }))
+vi.mock('@/lib/core/config/env', () => ({ env: {} }))
+
+import { EmbeddingConfigurationError } from '@/lib/embeddings/configuration-error'
+import { resolveProviderKey } from '@/lib/embeddings/keys'
+import { messageForCopilotApplicationError } from '@/lib/mothership/application/error'
+
+describe('embedding configuration capability failure', () => {
+  beforeEach(() => {
+    mocks.byok.mockReset().mockResolvedValue(null)
+    mocks.rotation.mockReset().mockImplementation(() => {
+      throw new Error('private provider setup details')
+    })
+  })
+  it.each(['openai', 'gemini', 'cohere', 'mistral'] as const)(
+    'classifies missing %s configuration without returning provider internals',
+    async (provider) => {
+      const error = await resolveProviderKey(provider, 'workspace').catch((error: unknown) => error)
+      expect(error).toBeInstanceOf(EmbeddingConfigurationError)
+      expect(error).toMatchObject({
+        code: 'conflict',
+        capability: 'semantic_retrieval',
+        reason: 'provider_not_configured',
+        retryable: false,
+      })
+      expect(messageForCopilotApplicationError(error, 'generic')).toContain(
+        'embedding provider is not configured'
+      )
+      expect(JSON.stringify(error)).not.toContain('private provider')
+    }
+  )
+  it('preserves usable BYOK and does not probe platform rotation', async () => {
+    mocks.byok.mockResolvedValue({ apiKey: 'test-provider-key', scope: 'workspace' })
+    expect(await resolveProviderKey('openai', 'workspace')).toEqual({
+      apiKey: 'test-provider-key',
+      isBYOK: true,
+    })
+    expect(mocks.rotation).not.toHaveBeenCalled()
+  })
+  it('does not relabel authorization or infrastructure failures as missing configuration', async () => {
+    const error = new Error('private database details')
+    mocks.byok.mockRejectedValue(error)
+    await expect(resolveProviderKey('openai', 'workspace')).rejects.toBe(error)
+    expect(messageForCopilotApplicationError(error, 'generic')).toBe('generic')
+  })
+})

apps/sim/lib/embeddings/configuration-error.ts

@@ -0,0 +1,18 @@
+import { OrchestrationError } from '@/lib/core/orchestration/types'
+
+/** Safe deployment capability failure, separate from absent results or caller permissions. */
+export class EmbeddingConfigurationError extends OrchestrationError {
+  readonly capability = 'semantic_retrieval'
+  readonly reason = 'provider_not_configured'
+  readonly retryable = false
+  readonly recovery =
+    'Configure an embedding provider, or read authorized original documents directly.'
+
+  constructor() {
+    super(
+      'conflict',
+      'Semantic retrieval is unavailable because its embedding provider is not configured.'
+    )
+    this.name = 'EmbeddingConfigurationError'
+  }
+}