Skip to content

Commit ae0664a

Browse files
committed
Merge branch 'feat/table-fks' into feat/reference-row-preview
# Conflicts: # apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/cells/cell-content.tsx # apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/data-row.tsx # apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table-grid/table-grid.tsx # apps/sim/lib/copilot/generated/tool-catalog-v1.ts # apps/sim/lib/copilot/generated/tool-schemas-v1.ts # apps/sim/lib/table/service.test.ts
2 parents 32536a5 + cc000c2 commit ae0664a

2,455 files changed

Lines changed: 296968 additions & 47927 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.agents/skills/add-block-preview/SKILL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ A revealed block that is not globally GA (`enabled !== true`, or env-revealed) r
4141
- GA via config (code cleanup pending): `{ "enabled": true }` — suffix disappears everywhere within ~30s (AppConfig TTL) + client refetch.
4242

4343
Same runbook as `feature-flags`: edit the hosted document, `aws appconfig start-deployment` with the `sim-<env>-fast` strategy (see the infra README).
44-
5. **GA cleanup:** delete `preview: true` from the block (now visible to self-hosters on their next upgrade), add its `BlockMeta` + regen docs, and drop the AppConfig entry. For a v2 upgrade, this is also when v1 gets `hideFromToolbar: true` (the superseded-version paradigm).
44+
5. **GA cleanup:** delete `preview: true` from the block (now visible to self-hosters on their next upgrade), add its `BlockMeta` + regen docs, and drop the AppConfig entry. For a v2 upgrade, this is also when v1 gets `hideFromToolbar: true` **and** `sunset: { status: 'legacy', replacedBy: '<v2-type>' }` (the superseded-version paradigm). Both edits must land in the **same commit** as the `preview: true` removal — `check-block-registry` fails a sunset block whose `replacedBy` is still `preview`, so splitting them breaks the build in between. Also move the block's `BLOCK_DISPLAY_WORKFLOWS` entry (`apps/docs/components/workflow-preview/block-display-workflows.ts`) to the new type, or `BlockPreview` silently renders nothing on the docs page.
4545

4646
## Kill switch (shipped blocks)
4747

.agents/skills/add-block/SKILL.md

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ silently available.
207207
id: 'channel',
208208
title: 'Channel',
209209
type: 'channel-selector',
210+
selectorKey: '{service}.channels',
210211
serviceId: '{service}',
211212
placeholder: 'Select channel',
212213
dependsOn: ['credential'],
@@ -217,6 +218,7 @@ silently available.
217218
id: 'project',
218219
title: 'Project',
219220
type: 'project-selector',
221+
selectorKey: '{service}.projects',
220222
serviceId: '{service}',
221223
dependsOn: ['credential'],
222224
}
@@ -226,6 +228,7 @@ silently available.
226228
id: 'file',
227229
title: 'File',
228230
type: 'file-selector',
231+
selectorKey: '{service}.files',
229232
serviceId: '{service}',
230233
mimeType: 'application/pdf',
231234
dependsOn: ['credential'],
@@ -236,6 +239,7 @@ silently available.
236239
id: 'user',
237240
title: 'User',
238241
type: 'user-selector',
242+
selectorKey: '{service}.users',
239243
serviceId: '{service}',
240244
dependsOn: ['credential'],
241245
}
@@ -691,6 +695,10 @@ export const ServiceBlock: BlockConfig = {
691695
type: 'service',
692696
name: 'Service (Legacy)',
693697
hideFromToolbar: true, // Hide from toolbar
698+
// Required: drives the amber legacy badge and its click-to-upgrade action.
699+
// `check-block-registry` fails a legacy block with no `replacedBy`, one whose
700+
// target does not exist, or one whose target is itself sunset or still `preview`.
701+
sunset: { status: 'legacy', replacedBy: 'service_v2' },
694702
// ... rest of config
695703
}
696704

@@ -1065,7 +1073,11 @@ After creating the block, you MUST validate it against every tool it references:
10651073

10661074
A sub-block gets its choices from exactly one of two places. There is no third.
10671075

1068-
**`selectorKey` — every remote list.** Register the list in `hooks/selectors/providers/<service>/selectors.ts`, add its key to `SelectorKey`, and point the sub-block at it. A selector is parameterized by an explicit `SelectorContext`, so the same definition serves the canvas, the workspace-fork sync modal, and anything added later.
1076+
**`selectorKey` — every remote list.** Use the `add-selector` skill to add browser-safe metadata in
1077+
`apps/sim/lib/selectors/manifest.ts`. Attach `provider-server` selectors under
1078+
`apps/sim/lib/selectors/server/providers/` and `internal-server` selectors in
1079+
`apps/sim/lib/selectors/server/internal.ts`. Point the sub-block at that key. All remote selectors
1080+
execute through `selectors.execute`; never add a client provider module or selector-only fetch route.
10691081

10701082
```ts
10711083
{ id: 'triggerCredentials', type: 'oauth-input', canonicalParamId: 'oauthCredential', mode: 'trigger' },
@@ -1074,7 +1086,13 @@ A sub-block gets its choices from exactly one of two places. There is no third.
10741086
{ id: 'manualLabelIds', type: 'short-input', mode: 'trigger-advanced' },
10751087
```
10761088

1077-
`canonicalParamId: 'oauthCredential'` on the credential sub-block is the line people forget. `buildSelectorContextFromBlock` keys the context on a sub-block's CANONICAL id, so without it `context.oauthCredential` is never set and the picker looks unfixable without reading the store. (A credential field is also recognised by its `oauth-input` TYPE as a fallback, so a block whose shipped param is already named something else does not have to rename it.)
1089+
`canonicalParamId: 'oauthCredential'` on the credential sub-block is the line people forget. The
1090+
shared context builder projects only active `dependsOn` values and keys canonical pairs by their
1091+
canonical id. Exact environment references such as `{{GMAIL_CREDENTIAL_ID}}` stay unresolved in the
1092+
browser and are resolved only by the authorized server executor. The builder does not infer a
1093+
nonstandard credential id from `type: 'oauth-input'`; give it
1094+
`canonicalParamId: 'oauthCredential'`, or declare an explicit manifest `sourceFields` alias when a
1095+
legacy source id must be retained.
10781096

10791097
**`options` — everything else.** A static array, or a pure function of the block's own values for a list that narrows to a sibling's selection. No I/O.
10801098

@@ -1089,5 +1107,6 @@ options: (params) => {
10891107

10901108
Two rules the checks enforce:
10911109

1092-
- **A secret never enters a selector's `getQueryKey`.** A query key identifies a resource; a credential authorizes access to it. A credential *id* is fine; a typed password is not (see `imap.mailboxes`).
1110+
- **Selector query keys contain no context values.** This includes credential IDs, raw secrets,
1111+
unresolved references, and hashes of those values; the shared facade uses an opaque local revision.
10931112
- **A sub-block that `dependsOn` a credential / knowledge-base / table selector must be reconfigurable at fork-sync time** — a `selectorKey`, a canonical pair whose basic member is a selector, or a `short-input`/`long-input`. `bun run check:fork-dependent-coverage` fails otherwise, because a fork sync clears those fields on every push and an unofferable one can never be set anywhere that sticks.

.agents/skills/add-connector/SKILL.md

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,14 @@ Three field types are supported: `short-input`, `dropdown`, and `selector`.
197197

198198
## Dynamic Selectors (Canonical Pairs)
199199

200-
Use `type: 'selector'` to fetch options dynamically from the existing selector registry (`hooks/selectors/registry.ts`). Selectors are always paired with a manual fallback input using the **canonical pair** pattern — a `selector` field (basic mode) and a `short-input` field (advanced mode) linked by `canonicalParamId`.
200+
Use `type: 'selector'` for a key declared in the browser-safe selector manifest at
201+
`apps/sim/lib/selectors/manifest.ts`. Remote selectors execute through the authorized
202+
`selectors.execute` server operation and a server attachment; connectors never call providers or
203+
resolve credentials in the browser. Apply the `add-selector` skill when the key does not exist.
204+
205+
Selectors are paired with a manual fallback input using the **canonical pair** pattern — a
206+
`selector` field (basic mode) and a `short-input` field (advanced mode) linked by
207+
`canonicalParamId`.
201208

202209
The user sees a toggle button (ArrowLeftRight) to switch between the selector dropdown and manual text input. On submit, the modal resolves each canonical pair to the active mode's value, keyed by `canonicalParamId`.
203210

@@ -217,7 +224,7 @@ configFields: [
217224
id: 'baseSelector',
218225
title: 'Base',
219226
type: 'selector',
220-
selectorKey: 'airtable.bases', // Must exist in hooks/selectors/registry.ts
227+
selectorKey: 'airtable.bases', // Must exist in lib/selectors/manifest.ts
221228
canonicalParamId: 'baseId',
222229
mode: 'basic',
223230
placeholder: 'Select a base',
@@ -260,7 +267,9 @@ configFields: [
260267

261268
### Selector with domain dependency (Jira/Confluence pattern)
262269

263-
When a selector depends on a plain `short-input` field (no canonical pair), `dependsOn` references that field's `id` directly. The `domain` field's value maps to `SelectorContext.domain` automatically via `SELECTOR_CONTEXT_FIELDS`.
270+
When a selector depends on a plain `short-input` field (no canonical pair), `dependsOn` references
271+
that field's `id` directly. Exact references such as `{{JIRA_DOMAIN}}` remain unresolved in the
272+
browser and are resolved only after workspace authorization on the server.
264273

265274
```typescript
266275
configFields: [
@@ -296,16 +305,16 @@ configFields: [
296305

297306
### How `dependsOn` maps to `SelectorContext`
298307

299-
The connector selector field builds a `SelectorContext` from dependency values. For the mapping to work, each dependency's `canonicalParamId` (or field `id` for non-canonical fields) must exist in `SELECTOR_CONTEXT_FIELDS` (`lib/workflows/subblocks/context.ts`):
300-
301-
```
302-
oauthCredential, domain, teamId, projectId, knowledgeBaseId, planId,
303-
siteId, collectionId, spreadsheetId, fileId, baseId, datasetId, serviceDeskId
304-
```
308+
The shared connector context builder projects only active dependencies. A canonical dependency uses
309+
its active basic or advanced value under `canonicalParamId`; a non-canonical dependency uses its
310+
field `id`. The resulting key must be a `SelectorContextKey` in
311+
`apps/sim/lib/selectors/types.ts` and must be explicitly allowed by that selector's manifest entry.
312+
The browser sends the connector's workspace scope, not the complete connector configuration.
305313

306314
### Available selector keys
307315

308-
Check `hooks/selectors/types.ts` for the full `SelectorKey` union. Common ones for connectors:
316+
Check `apps/sim/lib/selectors/manifest.ts` for the exhaustive selector keys. Common ones for
317+
connectors:
309318

310319
| SelectorKey | Context Deps | Returns |
311320
|-------------|-------------|---------|
@@ -607,9 +616,13 @@ export const CONNECTOR_META_REGISTRY: ConnectorMetaRegistry = {
607616
- [ ] **Selector fields configured correctly (if applicable):**
608617
- Every `type: 'selector'` field has a canonical pair (`short-input` or `dropdown` with same `canonicalParamId` and `mode: 'advanced'`)
609618
- `required` is identical on both fields in each canonical pair
610-
- `selectorKey` exists in `hooks/selectors/registry.ts`
619+
- `selectorKey` exists in `apps/sim/lib/selectors/manifest.ts`
611620
- `dependsOn` references selector field IDs (not `canonicalParamId`)
612-
- Dependency `canonicalParamId` values exist in `SELECTOR_CONTEXT_FIELDS`
621+
- Each projected dependency key is a `SelectorContextKey` allowed by the selector manifest
622+
- Every remote key has one server attachment with credential provider binding and a reviewed
623+
`fixed`, `credential-bound`, or `user-controlled` destination policy
624+
- No connector selector adds a client provider module, browser token request, or selector-only
625+
API route
613626
- [ ] `listDocuments` handles pagination with metadata-based content hashes
614627
- [ ] `syncContext.listingCapped = true` set whenever the listing is truncated (max-items cap or transient per-item error) — required to prevent the engine's deletion reconciliation from removing unseen documents
615628
- [ ] `contentDeferred: true` used if content requires per-doc API calls (file download, export, blocks fetch)

.agents/skills/add-integration/SKILL.md

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,15 +270,24 @@ export const {Service}Block: BlockConfig = {
270270
{
271271
id: 'project',
272272
type: 'project-selector',
273+
selectorKey: '{service}.projects',
273274
dependsOn: ['credential'],
274275
},
275276
{
276277
id: 'issue',
277278
type: 'file-selector',
279+
selectorKey: '{service}.issues',
278280
dependsOn: ['credential', 'project'],
279281
}
280282
```
281283

284+
Every remote `selectorKey` must use the unified server selector path. Apply the `add-selector` skill:
285+
add browser-safe metadata to `apps/sim/lib/selectors/manifest.ts`, reuse or extract a server-only
286+
provider listing primitive, and add a credential- and destination-bound server attachment. Do not
287+
add code under `hooks/selectors/providers`, a provider-specific query key, browser token acquisition,
288+
or a selector-only API route. The shared context builder sends only active `dependsOn` values and
289+
preserves exact `{{KEY}}` environment references for server-side resolution.
290+
282291
**Basic/Advanced mode for dual UX:**
283292
```typescript
284293
// Basic: Visual selector
@@ -589,7 +598,15 @@ If creating V2 versions (API-aligned outputs):
589598

590599
1. **V2 Tools** - Add `_v2` suffix, version `2.0.0`, flat outputs
591600
2. **V2 Block** - Add `_v2` type, use `createVersionedToolSelector`
592-
3. **V1 Block** - Add `(Legacy)` to name, set `hideFromToolbar: true`
601+
3. **V1 Block** - Add `(Legacy)` to name, set `hideFromToolbar: true`, and add
602+
`sunset: { status: 'legacy', replacedBy: '{service}_v2' }``check-block-registry`
603+
fails a legacy block with no `replacedBy`, and the amber legacy badge plus its
604+
click-to-upgrade action read from that field.
605+
606+
**Only add `replacedBy` once the target is GA.** The same check also fails when
607+
the target is unregistered, itself sunset, or still `preview: true`. If v2 is
608+
preview-gated, leave v1 alone until GA and drop `preview` in the *same commit*
609+
that adds the sunset — splitting them breaks the build in between.
593610
4. **Registry** - Register both versions
594611

595612
```typescript
@@ -630,6 +647,10 @@ If creating V2 versions (API-aligned outputs):
630647
- [ ] Added credential field with `requiredScopes: getScopesForService('{service}')`
631648
- [ ] Added conditional fields per operation
632649
- [ ] Set up dependsOn for cascading selectors
650+
- [ ] Every remote `selectorKey` exists in the shared manifest and has one server attachment with
651+
trusted credential provider binding and a fixed, credential-bound, or explicitly reviewed
652+
user-controlled destination policy
653+
- [ ] No selector provider logic, credential resolution, or provider route call runs in the browser
633654
- [ ] Configured tools.access with all tool IDs
634655
- [ ] Configured tools.config.tool selector
635656
- [ ] Defined outputs matching tool outputs
@@ -922,7 +943,8 @@ requiredScopes: getScopesForService('{service}'),
922943
3. **Block type is snake_case** - `type: 'stripe'`, not `type: 'Stripe'`
923944
4. **Alphabetical ordering** - Keep imports and registry entries alphabetically sorted
924945
5. **Required can be conditional** - Use `required: { field: 'op', value: 'create' }` instead of always true
925-
6. **DependsOn clears options** - When a dependency changes, selector options are refetched
946+
6. **DependsOn clears options** - When an active dependency changes, the shared selector facade
947+
refetches with an opaque query revision; dependency values and references never enter query keys
926948
7. **Never pass Buffer directly to fetch** - Convert to `new Uint8Array(buffer)` for TypeScript compatibility
927949
8. **Always handle legacy file params** - Keep hidden `fileContent` params for backwards compatibility
928950
9. **Optional fields use advanced mode** - Set `mode: 'advanced'` on rarely-used optional fields

0 commit comments

Comments
 (0)